[ViewVC] Diff of: cvs/JSON-XS/XS.xs

Comparing JSON-XS/XS.xs (file contents):
Revision 1.38 by root, Mon Jun 11 03:18:07 2007 UTC vs.
Revision 1.58 by root, Mon Aug 13 16:06:25 2007 UTC

…		…
1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#include "assert.h"	5	#include <assert.h>
6	#include "string.h"	6	#include <string.h>
7	#include "stdlib.h"	7	#include <stdlib.h>
8	#include "stdio.h"	8	#include <stdio.h>
		9	#include <float.h>
9		10
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	12	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	13	#endif
13		14
		15	// some old perls do not have this, try to make it work, no
		16	// guarentees, though. if it breaks, you get to keep the pieces.
		17	#ifndef UTF8_MAXBYTES
		18	# define UTF8_MAXBYTES 13
		19	#endif
		20
14	#define F_ASCII 0x00000001UL	21	#define F_ASCII 0x00000001UL
15	#define F_LATIN1 0x00000002UL	22	#define F_LATIN1 0x00000002UL
16	#define F_UTF8 0x00000004UL	23	#define F_UTF8 0x00000004UL
17	#define F_INDENT 0x00000008UL	24	#define F_INDENT 0x00000008UL
18	#define F_CANONICAL 0x00000010UL	25	#define F_CANONICAL 0x00000010UL
19	#define F_SPACE_BEFORE 0x00000020UL	26	#define F_SPACE_BEFORE 0x00000020UL
20	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
21	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
22	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
		30	#define F_ALLOW_BLESSED 0x00000400UL
		31	#define F_CONV_BLESSED 0x00000800UL
23	#define F_MAXDEPTH 0xf8000000UL	32	#define F_MAXDEPTH 0xf8000000UL
24	#define S_MAXDEPTH 27	33	#define S_MAXDEPTH 27
		34	#define F_MAXSIZE 0x01f00000UL
		35	#define S_MAXSIZE 20
		36	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
25		37
26	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	38	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27		39	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28	// F_SELFCONVERT? <=> to_json/toJson
29	// F_BLESSED? <=> { $__class__$ => }
30		40
31	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
32	#define F_DEFAULT (9UL << S_MAXDEPTH)	42	#define F_DEFAULT (9UL << S_MAXDEPTH)
33		43
34	#define INIT_SIZE 32 // initial scalar size to be allocated	44	#define INIT_SIZE 32 // initial scalar size to be allocated
48	#endif	58	#endif
49		59
50	#define expect_false(expr) expect ((expr) != 0, 0)	60	#define expect_false(expr) expect ((expr) != 0, 0)
51	#define expect_true(expr) expect ((expr) != 0, 1)	61	#define expect_true(expr) expect ((expr) != 0, 1)
52		62
		63	#ifdef USE_ITHREADS
		64	# define JSON_SLOW 1
		65	#else
		66	# define JSON_SLOW 0
		67	#endif
		68
53	static HV *json_stash; // JSON::XS::	69	static HV json_stash, json_boolean_stash; // JSON::XS::
		70	static SV json_true, json_false;
		71
		72	typedef struct {
		73	U32 flags;
		74	SV *cb_object;
		75	HV *cb_sk_object;
		76	} JSON;
54		77
55	/////////////////////////////////////////////////////////////////////////////	78	/////////////////////////////////////////////////////////////////////////////
56	// utility functions	79	// utility functions
57		80
58	static UV *	81	inline void
59	SvJSON (SV *sv)
60	{
61	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62	croak ("object is not of type JSON::XS");
63
64	return &SvUVX (SvRV (sv));
65	}
66
67	static void
68	shrink (SV *sv)	82	shrink (SV *sv)
69	{	83	{
70	sv_utf8_downgrade (sv, 1);	84	sv_utf8_downgrade (sv, 1);
71	if (SvLEN (sv) > SvCUR (sv) + 1)	85	if (SvLEN (sv) > SvCUR (sv) + 1)
72	{	86	{
…		…
107	typedef struct	121	typedef struct
108	{	122	{
109	char *cur; // SvPVX (sv) + current output position	123	char *cur; // SvPVX (sv) + current output position
110	char *end; // SvEND (sv)	124	char *end; // SvEND (sv)
111	SV *sv; // result scalar	125	SV *sv; // result scalar
112	U32 flags; // F_*	126	JSON json;
113	U32 indent; // indentation level	127	U32 indent; // indentation level
114	U32 maxdepth; // max. indentation/recursion level	128	U32 maxdepth; // max. indentation/recursion level
115	} enc_t;	129	} enc_t;
116		130
117	inline void	131	inline void
…		…
178	STRLEN clen;	192	STRLEN clen;
179	UV uch;	193	UV uch;
180		194
181	if (is_utf8)	195	if (is_utf8)
182	{	196	{
183	//uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
184	uch = decode_utf8 (str, end - str, &clen);	197	uch = decode_utf8 (str, end - str, &clen);
185	if (clen == (STRLEN)-1)	198	if (clen == (STRLEN)-1)
186	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);	199	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
187	}	200	}
188	else	201	else
…		…
192	}	205	}
193		206
194	if (uch > 0x10FFFFUL)	207	if (uch > 0x10FFFFUL)
195	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	208	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
196		209
197	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	210	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
198	{	211	{
199	if (uch > 0xFFFFUL)	212	if (uch > 0xFFFFUL)
200	{	213	{
201	need (enc, len += 11);	214	need (enc, len += 11);
202	sprintf (enc->cur, "\\u%04x\\u%04x",	215	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
216	*enc->cur++ = hexdigit [(uch >> 0) & 15];	229	*enc->cur++ = hexdigit [(uch >> 0) & 15];
217	}	230	}
218		231
219	str += clen;	232	str += clen;
220	}	233	}
221	else if (enc->flags & F_LATIN1)	234	else if (enc->json.flags & F_LATIN1)
222	{	235	{
223	*enc->cur++ = uch;	236	*enc->cur++ = uch;
224	str += clen;	237	str += clen;
225	}	238	}
226	else if (is_utf8)	239	else if (is_utf8)
…		…
247	}	260	}
248		261
249	inline void	262	inline void
250	encode_indent (enc_t *enc)	263	encode_indent (enc_t *enc)
251	{	264	{
252	if (enc->flags & F_INDENT)	265	if (enc->json.flags & F_INDENT)
253	{	266	{
254	int spaces = enc->indent * INDENT_STEP;	267	int spaces = enc->indent * INDENT_STEP;
255		268
256	need (enc, spaces);	269	need (enc, spaces);
257	memset (enc->cur, ' ', spaces);	270	memset (enc->cur, ' ', spaces);
…		…
267	}	280	}
268		281
269	inline void	282	inline void
270	encode_nl (enc_t *enc)	283	encode_nl (enc_t *enc)
271	{	284	{
272	if (enc->flags & F_INDENT)	285	if (enc->json.flags & F_INDENT)
273	{	286	{
274	need (enc, 1);	287	need (enc, 1);
275	encode_ch (enc, '\n');	288	encode_ch (enc, '\n');
276	}	289	}
277	}	290	}
…		…
279	inline void	292	inline void
280	encode_comma (enc_t *enc)	293	encode_comma (enc_t *enc)
281	{	294	{
282	encode_ch (enc, ',');	295	encode_ch (enc, ',');
283		296
284	if (enc->flags & F_INDENT)	297	if (enc->json.flags & F_INDENT)
285	encode_nl (enc);	298	encode_nl (enc);
286	else if (enc->flags & F_SPACE_AFTER)	299	else if (enc->json.flags & F_SPACE_AFTER)
287	encode_space (enc);	300	encode_space (enc);
288	}	301	}
289		302
290	static void encode_sv (enc_t enc, SV sv);	303	static void encode_sv (enc_t enc, SV sv);
291		304
…		…
300	encode_ch (enc, '['); encode_nl (enc);	313	encode_ch (enc, '['); encode_nl (enc);
301	++enc->indent;	314	++enc->indent;
302		315
303	for (i = 0; i <= len; ++i)	316	for (i = 0; i <= len; ++i)
304	{	317	{
		318	SV **svp = av_fetch (av, i, 0);
		319
305	encode_indent (enc);	320	encode_indent (enc);
306	encode_sv (enc, *av_fetch (av, i, 0));	321
		322	if (svp)
		323	encode_sv (enc, *svp);
		324	else
		325	encode_str (enc, "null", 4, 0);
307		326
308	if (i < len)	327	if (i < len)
309	encode_comma (enc);	328	encode_comma (enc);
310	}	329	}
311		330
…		…
334	else	353	else
335	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	354	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
336		355
337	encode_ch (enc, '"');	356	encode_ch (enc, '"');
338		357
339	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	358	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
340	encode_ch (enc, ':');	359	encode_ch (enc, ':');
341	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	360	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
342	encode_sv (enc, HeVAL (he));	361	encode_sv (enc, HeVAL (he));
343	}	362	}
344		363
345	// compare hash entries, used when all keys are bytestrings	364	// compare hash entries, used when all keys are bytestrings
346	static int	365	static int
…		…
381	{	400	{
382	// for canonical output we have to sort by keys first	401	// for canonical output we have to sort by keys first
383	// actually, this is mostly due to the stupid so-called	402	// actually, this is mostly due to the stupid so-called
384	// security workaround added somewhere in 5.8.x.	403	// security workaround added somewhere in 5.8.x.
385	// that randomises hash orderings	404	// that randomises hash orderings
386	if (enc->flags & F_CANONICAL)	405	if (enc->json.flags & F_CANONICAL)
387	{	406	{
388	int fast = 1;	407	int fast = 1;
389	HE *he;	408	HE *he;
390	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	409	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
391	HE *hes = _alloca (count sizeof (HE));	410	HE *hes = _alloca (count sizeof (HE));
…		…
463	svtype svt;	482	svtype svt;
464		483
465	SvGETMAGIC (sv);	484	SvGETMAGIC (sv);
466	svt = SvTYPE (sv);	485	svt = SvTYPE (sv);
467		486
		487	if (expect_false (SvOBJECT (sv)))
		488	{
		489	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		490	? json_boolean_stash
		491	: gv_stashpv ("JSON::XS::Boolean", 1);
		492
		493	if (SvSTASH (sv) == stash)
		494	{
		495	if (SvIV (sv))
		496	encode_str (enc, "true", 4, 0);
		497	else
		498	encode_str (enc, "false", 5, 0);
		499	}
		500	else
		501	{
		502	#if 0
		503	if (0 && sv_derived_from (rv, "JSON::Literal"))
		504	{
		505	// not yet
		506	}
		507	#endif
		508	if (enc->json.flags & F_CONV_BLESSED)
		509	{
		510	// we re-bless the reference to get overload and other niceties right
		511	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
		512
		513	if (to_json)
		514	{
		515	dSP;
		516
		517	ENTER; SAVETMPS; PUSHMARK (SP);
		518	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		519
		520	// calling with G_SCALAR ensures that we always get a 1 return value
		521	PUTBACK;
		522	call_sv ((SV *)GvCV (to_json), G_SCALAR);
		523	SPAGAIN;
		524
		525	// catch this surprisingly common error
		526	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		527	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		528
		529	sv = POPs;
		530	PUTBACK;
		531
		532	encode_sv (enc, sv);
		533
		534	FREETMPS; LEAVE;
		535	}
		536	else if (enc->json.flags & F_ALLOW_BLESSED)
		537	encode_str (enc, "null", 4, 0);
		538	else
		539	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		540	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		541	}
		542	else if (enc->json.flags & F_ALLOW_BLESSED)
		543	encode_str (enc, "null", 4, 0);
		544	else
		545	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		546	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		547	}
		548	}
468	if (svt == SVt_PVHV)	549	else if (svt == SVt_PVHV)
469	encode_hv (enc, (HV *)sv);	550	encode_hv (enc, (HV *)sv);
470	else if (svt == SVt_PVAV)	551	else if (svt == SVt_PVAV)
471	encode_av (enc, (AV *)sv);	552	encode_av (enc, (AV *)sv);
472	else if (svt < SVt_PVAV)	553	else if (svt < SVt_PVAV)
473	{	554	{
474	if (SvNIOK (sv) && SvIV (sv) == 0)	555	STRLEN len = 0;
		556	char *pv = svt ? SvPV (sv, len) : 0;
		557
		558	if (len == 1 && *pv == '1')
		559	encode_str (enc, "true", 4, 0);
		560	else if (len == 1 && *pv == '0')
475	encode_str (enc, "false", 5, 0);	561	encode_str (enc, "false", 5, 0);
476	else if (SvNIOK (sv) && SvIV (sv) == 1)
477	encode_str (enc, "true", 4, 0);
478	else	562	else
479	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	563	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
480	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	564	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
481	}	565	}
482	else	566	else
…		…
497	encode_str (enc, str, len, SvUTF8 (sv));	581	encode_str (enc, str, len, SvUTF8 (sv));
498	encode_ch (enc, '"');	582	encode_ch (enc, '"');
499	}	583	}
500	else if (SvNOKp (sv))	584	else if (SvNOKp (sv))
501	{	585	{
		586	// trust that perl will do the right thing w.r.t. JSON syntax.
502	need (enc, NV_DIG + 32);	587	need (enc, NV_DIG + 32);
503	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	588	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
504	enc->cur += strlen (enc->cur);	589	enc->cur += strlen (enc->cur);
505	}	590	}
506	else if (SvIOKp (sv))	591	else if (SvIOKp (sv))
507	{	592	{
508	// we assume we can always read an IV as a UV	593	// we assume we can always read an IV as a UV
509	if (SvUV (sv) & ~(UV)0x7fff)	594	if (SvUV (sv) & ~(UV)0x7fff)
510	{	595	{
		596	// large integer, use the (rather slow) snprintf way.
511	need (enc, sizeof (UV) * 3);	597	need (enc, sizeof (UV) * 3);
512	enc->cur +=	598	enc->cur +=
513	SvIsUV(sv)	599	SvIsUV(sv)
514	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))	600	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
515	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));	601	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
…		…
518	{	604	{
519	// optimise the "small number case"	605	// optimise the "small number case"
520	// code will likely be branchless and use only a single multiplication	606	// code will likely be branchless and use only a single multiplication
521	I32 i = SvIV (sv);	607	I32 i = SvIV (sv);
522	U32 u;	608	U32 u;
		609	char digit, nz = 0;
523		610
524	need (enc, 6);	611	need (enc, 6);
525		612
526	*enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;	613	*enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
527	u = i < 0 ? -i : i;	614	u = i < 0 ? -i : i;
528		615
529	// convert to 4.28 fixed-point representation	616	// convert to 4.28 fixed-point representation
530	u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits	617	u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
531		618
532	char digit, nz = 0;	619	// now output digit by digit, each time masking out the integer part
533		620	// and multiplying by 5 while moving the decimal point one to the right,
		621	// resulting in a net multiplication by 10.
		622	// we always write the digit to memory but conditionally increment
		623	// the pointer, to ease the usage of conditional move instructions.
534	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;	624	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;
535	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;	625	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;
536	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;	626	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;
537	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;	627	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;
538	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1;	628	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
539	}	629	}
540	}	630	}
541	else if (SvROK (sv))	631	else if (SvROK (sv))
542	encode_rv (enc, SvRV (sv));	632	encode_rv (enc, SvRV (sv));
543	else if (!SvOK (sv))	633	else if (!SvOK (sv))
…		…
546	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	636	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
547	SvPV_nolen (sv), SvFLAGS (sv));	637	SvPV_nolen (sv), SvFLAGS (sv));
548	}	638	}
549		639
550	static SV *	640	static SV *
551	encode_json (SV *scalar, U32 flags)	641	encode_json (SV scalar, JSON json)
552	{	642	{
553	enc_t enc;	643	enc_t enc;
554		644
555	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	645	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
556	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	646	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
557		647
558	enc.flags = flags;	648	enc.json = *json;
559	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	649	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
560	enc.cur = SvPVX (enc.sv);	650	enc.cur = SvPVX (enc.sv);
561	enc.end = SvEND (enc.sv);	651	enc.end = SvEND (enc.sv);
562	enc.indent = 0;	652	enc.indent = 0;
563	enc.maxdepth = DEC_DEPTH (flags);	653	enc.maxdepth = DEC_DEPTH (enc.json.flags);
564		654
565	SvPOK_only (enc.sv);	655	SvPOK_only (enc.sv);
566	encode_sv (&enc, scalar);	656	encode_sv (&enc, scalar);
567		657
568	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	658	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
569	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	659	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
570		660
571	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	661	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
572	SvUTF8_on (enc.sv);	662	SvUTF8_on (enc.sv);
573		663
574	if (enc.flags & F_SHRINK)	664	if (enc.json.flags & F_SHRINK)
575	shrink (enc.sv);	665	shrink (enc.sv);
576		666
577	return enc.sv;	667	return enc.sv;
578	}	668	}
579		669
…		…
584	typedef struct	674	typedef struct
585	{	675	{
586	char *cur; // current parser pointer	676	char *cur; // current parser pointer
587	char *end; // end of input string	677	char *end; // end of input string
588	const char *err; // parse error, if != 0	678	const char *err; // parse error, if != 0
589	U32 flags; // F_*	679	JSON json;
590	U32 depth; // recursion depth	680	U32 depth; // recursion depth
591	U32 maxdepth; // recursion depth limit	681	U32 maxdepth; // recursion depth limit
592	} dec_t;	682	} dec_t;
593		683
594	inline void	684	inline void
…		…
625	decode_4hex (dec_t *dec)	715	decode_4hex (dec_t *dec)
626	{	716	{
627	signed char d1, d2, d3, d4;	717	signed char d1, d2, d3, d4;
628	unsigned char cur = (unsigned char )dec->cur;	718	unsigned char cur = (unsigned char )dec->cur;
629		719
630	d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("four hexadecimal digits expected");	720	d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
631	d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("four hexadecimal digits expected");	721	d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
632	d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("four hexadecimal digits expected");	722	d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
633	d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("four hexadecimal digits expected");	723	d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
634		724
635	dec->cur += 4;	725	dec->cur += 4;
636		726
637	return ((UV)d1) << 12	727	return ((UV)d1) << 12
638	\| ((UV)d2) << 8	728	\| ((UV)d2) << 8
…		…
857	is_nv = 1;	947	is_nv = 1;
858	}	948	}
859		949
860	if (!is_nv)	950	if (!is_nv)
861	{	951	{
		952	int len = dec->cur - start;
		953
862	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	954	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
863	if (*start == '-')	955	if (*start == '-')
864	switch (dec->cur - start)	956	switch (len)
865	{	957	{
866	case 2: return newSViv (-( start [1] - '0' ));	958	case 2: return newSViv (-( start [1] - '0' * 1));
867	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	959	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
868	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	960	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
869	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	961	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
870	}	962	}
871	else	963	else
872	switch (dec->cur - start)	964	switch (len)
873	{	965	{
874	case 1: return newSViv ( start [0] - '0' );	966	case 1: return newSViv ( start [0] - '0' * 1);
875	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	967	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
876	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	968	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
877	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	969	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
878	}	970	}
879		971
880	{	972	{
881	UV uv;	973	UV uv;
882	int numtype = grok_number (start, dec->cur - start, &uv);	974	int numtype = grok_number (start, len, &uv);
883	if (numtype & IS_NUMBER_IN_UV)	975	if (numtype & IS_NUMBER_IN_UV)
884	if (numtype & IS_NUMBER_NEG)	976	if (numtype & IS_NUMBER_NEG)
885	{	977	{
886	if (uv < (UV)IV_MIN)	978	if (uv < (UV)IV_MIN)
887	return newSViv (-(IV)uv);	979	return newSViv (-(IV)uv);
888	}	980	}
889	else	981	else
890	return newSVuv (uv);	982	return newSVuv (uv);
891	}	983	}
892	}
893		984
		985	len -= *start == '-' ? 1 : 0;
		986
		987	// does not fit into IV or UV, try NV
		988	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		989	#if defined (LDBL_DIG)
		990	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		991	#endif
		992	)
		993	// fits into NV without loss of precision
		994	return newSVnv (Atof (start));
		995
		996	// everything else fails, convert it to a string
		997	return newSVpvn (start, dec->cur - start);
		998	}
		999
		1000	// loss of precision here
894	return newSVnv (Atof (start));	1001	return newSVnv (Atof (start));
895		1002
896	fail:	1003	fail:
897	return 0;	1004	return 0;
898	}	1005	}
…		…
942	}	1049	}
943		1050
944	static SV *	1051	static SV *
945	decode_hv (dec_t *dec)	1052	decode_hv (dec_t *dec)
946	{	1053	{
		1054	SV *sv;
947	HV *hv = newHV ();	1055	HV *hv = newHV ();
948		1056
949	DEC_INC_DEPTH;	1057	DEC_INC_DEPTH;
950	decode_ws (dec);	1058	decode_ws (dec);
951		1059
952	if (*dec->cur == '}')	1060	if (*dec->cur == '}')
953	++dec->cur;	1061	++dec->cur;
954	else	1062	else
955	for (;;)	1063	for (;;)
956	{	1064	{
957	SV key, value;
958
959	decode_ws (dec); EXPECT_CH ('"');	1065	decode_ws (dec); EXPECT_CH ('"');
960		1066
961	key = decode_str (dec);	1067	// heuristic: assume that
962	if (!key)	1068	// a) decode_str + hv_store_ent are abysmally slow.
963	goto fail;	1069	// b) most hash keys are short, simple ascii text.
		1070	// => try to "fast-match" such strings to avoid
		1071	// the overhead of decode_str + hv_store_ent.
		1072	{
		1073	SV *value;
		1074	char *p = dec->cur;
		1075	char *e = p + 24; // only try up to 24 bytes
964		1076
965	decode_ws (dec); EXPECT_CH (':');	1077	for (;;)
966
967	value = decode_sv (dec);
968	if (!value)
969	{	1078	{
		1079	// the >= 0x80 is true on most architectures
		1080	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1081	{
		1082	// slow path, back up and use decode_str
		1083	SV *key = decode_str (dec);
		1084	if (!key)
		1085	goto fail;
		1086
		1087	decode_ws (dec); EXPECT_CH (':');
		1088
		1089	value = decode_sv (dec);
		1090	if (!value)
		1091	{
		1092	SvREFCNT_dec (key);
		1093	goto fail;
		1094	}
		1095
		1096	hv_store_ent (hv, key, value, 0);
970	SvREFCNT_dec (key);	1097	SvREFCNT_dec (key);
		1098
		1099	break;
		1100	}
		1101	else if (*p == '"')
		1102	{
		1103	// fast path, got a simple key
		1104	char *key = dec->cur;
		1105	int len = p - key;
		1106	dec->cur = p + 1;
		1107
		1108	decode_ws (dec); EXPECT_CH (':');
		1109
		1110	value = decode_sv (dec);
		1111	if (!value)
971	goto fail;	1112	goto fail;
		1113
		1114	hv_store (hv, key, len, value, 0);
		1115
		1116	break;
		1117	}
		1118
		1119	++p;
972	}	1120	}
973		1121	}
974	hv_store_ent (hv, key, value, 0);
975	SvREFCNT_dec (key);
976		1122
977	decode_ws (dec);	1123	decode_ws (dec);
978		1124
979	if (*dec->cur == '}')	1125	if (*dec->cur == '}')
980	{	1126	{
…		…
987		1133
988	++dec->cur;	1134	++dec->cur;
989	}	1135	}
990		1136
991	DEC_DEC_DEPTH;	1137	DEC_DEC_DEPTH;
992	return newRV_noinc ((SV *)hv);	1138	sv = newRV_noinc ((SV *)hv);
		1139
		1140	// check filter callbacks
		1141	if (dec->json.flags & F_HOOK)
		1142	{
		1143	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1144	{
		1145	HE cb, he;
		1146
		1147	hv_iterinit (hv);
		1148	he = hv_iternext (hv);
		1149	hv_iterinit (hv);
		1150
		1151	// the next line creates a mortal sv each time its called.
		1152	// might want to optimise this for common cases.
		1153	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1154
		1155	if (cb)
		1156	{
		1157	dSP;
		1158	int count;
		1159
		1160	ENTER; SAVETMPS; PUSHMARK (SP);
		1161	XPUSHs (HeVAL (he));
		1162
		1163	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1164
		1165	if (count == 1)
		1166	{
		1167	sv = newSVsv (POPs);
		1168	FREETMPS; LEAVE;
		1169	return sv;
		1170	}
		1171
		1172	FREETMPS; LEAVE;
		1173	}
		1174	}
		1175
		1176	if (dec->json.cb_object)
		1177	{
		1178	dSP;
		1179	int count;
		1180
		1181	ENTER; SAVETMPS; PUSHMARK (SP);
		1182	XPUSHs (sv_2mortal (sv));
		1183
		1184	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1185
		1186	if (count == 1)
		1187	{
		1188	sv = newSVsv (POPs);
		1189	FREETMPS; LEAVE;
		1190	return sv;
		1191	}
		1192
		1193	SvREFCNT_inc (sv);
		1194	FREETMPS; LEAVE;
		1195	}
		1196	}
		1197
		1198	return sv;
993		1199
994	fail:	1200	fail:
995	SvREFCNT_dec (hv);	1201	SvREFCNT_dec (hv);
996	DEC_DEC_DEPTH;	1202	DEC_DEC_DEPTH;
997	return 0;	1203	return 0;
…		…
999		1205
1000	static SV *	1206	static SV *
1001	decode_sv (dec_t *dec)	1207	decode_sv (dec_t *dec)
1002	{	1208	{
1003	decode_ws (dec);	1209	decode_ws (dec);
		1210
		1211	// the beauty of JSON: you need exactly one character lookahead
		1212	// to parse anything.
1004	switch (*dec->cur)	1213	switch (*dec->cur)
1005	{	1214	{
1006	case '"': ++dec->cur; return decode_str (dec);	1215	case '"': ++dec->cur; return decode_str (dec);
1007	case '[': ++dec->cur; return decode_av (dec);	1216	case '[': ++dec->cur; return decode_av (dec);
1008	case '{': ++dec->cur; return decode_hv (dec);	1217	case '{': ++dec->cur; return decode_hv (dec);
…		…
1014		1223
1015	case 't':	1224	case 't':
1016	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1225	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1017	{	1226	{
1018	dec->cur += 4;	1227	dec->cur += 4;
1019	return newSViv (1);	1228	return SvREFCNT_inc (json_true);
1020	}	1229	}
1021	else	1230	else
1022	ERR ("'true' expected");	1231	ERR ("'true' expected");
1023		1232
1024	break;	1233	break;
1025		1234
1026	case 'f':	1235	case 'f':
1027	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1236	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1028	{	1237	{
1029	dec->cur += 5;	1238	dec->cur += 5;
1030	return newSViv (0);	1239	return SvREFCNT_inc (json_false);
1031	}	1240	}
1032	else	1241	else
1033	ERR ("'false' expected");	1242	ERR ("'false' expected");
1034		1243
1035	break;	1244	break;
…		…
1053	fail:	1262	fail:
1054	return 0;	1263	return 0;
1055	}	1264	}
1056		1265
1057	static SV *	1266	static SV *
1058	decode_json (SV string, U32 flags, UV offset_return)	1267	decode_json (SV string, JSON json, UV *offset_return)
1059	{	1268	{
1060	dec_t dec;	1269	dec_t dec;
1061	UV offset;	1270	UV offset;
1062	SV *sv;	1271	SV *sv;
1063		1272
1064	SvGETMAGIC (string);	1273	SvGETMAGIC (string);
1065	SvUPGRADE (string, SVt_PV);	1274	SvUPGRADE (string, SVt_PV);
1066		1275
		1276	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1277	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1278	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1279
1067	if (flags & F_UTF8)	1280	if (json->flags & F_UTF8)
1068	sv_utf8_downgrade (string, 0);	1281	sv_utf8_downgrade (string, 0);
1069	else	1282	else
1070	sv_utf8_upgrade (string);	1283	sv_utf8_upgrade (string);
1071		1284
1072	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1285	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1073		1286
1074	dec.flags = flags;	1287	dec.json = *json;
1075	dec.cur = SvPVX (string);	1288	dec.cur = SvPVX (string);
1076	dec.end = SvEND (string);	1289	dec.end = SvEND (string);
1077	dec.err = 0;	1290	dec.err = 0;
1078	dec.depth = 0;	1291	dec.depth = 0;
1079	dec.maxdepth = DEC_DEPTH (dec.flags);	1292	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1293
		1294	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1295	dec.json.flags \|= F_HOOK;
1080		1296
1081	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1297	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1082	sv = decode_sv (&dec);	1298	sv = decode_sv (&dec);
1083		1299
1084	if (!(offset_return \|\| !sv))	1300	if (!(offset_return \|\| !sv))
…		…
1094	}	1310	}
1095	}	1311	}
1096		1312
1097	if (offset_return \|\| !sv)	1313	if (offset_return \|\| !sv)
1098	{	1314	{
1099	offset = dec.flags & F_UTF8	1315	offset = dec.json.flags & F_UTF8
1100	? dec.cur - SvPVX (string)	1316	? dec.cur - SvPVX (string)
1101	: utf8_distance (dec.cur, SvPVX (string));	1317	: utf8_distance (dec.cur, SvPVX (string));
1102		1318
1103	if (offset_return)	1319	if (offset_return)
1104	*offset_return = offset;	1320	*offset_return = offset;
…		…
1123	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1339	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1124	}	1340	}
1125		1341
1126	sv = sv_2mortal (sv);	1342	sv = sv_2mortal (sv);
1127		1343
1128	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1344	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1129	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1345	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1130		1346
1131	return sv;	1347	return sv;
1132	}	1348	}
1133		1349
…		…
1137	MODULE = JSON::XS PACKAGE = JSON::XS	1353	MODULE = JSON::XS PACKAGE = JSON::XS
1138		1354
1139	BOOT:	1355	BOOT:
1140	{	1356	{
1141	int i;	1357	int i;
1142
1143	memset (decode_hexdigit, 0xff, 256);
1144		1358
1145	for (i = 0; i < 256; ++i)	1359	for (i = 0; i < 256; ++i)
1146	decode_hexdigit [i] =	1360	decode_hexdigit [i] =
1147	i >= '0' && i <= '9' ? i - '0'	1361	i >= '0' && i <= '9' ? i - '0'
1148	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1362	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1149	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1363	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1150	: -1;	1364	: -1;
1151		1365
1152	json_stash = gv_stashpv ("JSON::XS", 1);	1366	json_stash = gv_stashpv ("JSON::XS" , 1);
		1367	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1368
		1369	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1370	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1153	}	1371	}
1154		1372
1155	PROTOTYPES: DISABLE	1373	PROTOTYPES: DISABLE
1156		1374
1157	SV new (char dummy)	1375	void CLONE (...)
1158	CODE:	1376	CODE:
1159	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1377	json_stash = 0;
1160	OUTPUT:	1378	json_boolean_stash = 0;
1161	RETVAL
1162		1379
		1380	void new (char *klass)
		1381	PPCODE:
		1382	{
		1383	HV *stash = !JSON_SLOW \|\| json_stash
		1384	? json_stash
		1385	: gv_stashpv ("JSON::XS", 1);
		1386	SV *pv = NEWSV (0, sizeof (JSON));
		1387	SvPOK_only (pv);
		1388	Zero (SvPVX (pv), 1, JSON);
		1389	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1390	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), stash)));
		1391	}
		1392
1163	SV ascii (SV self, int enable = 1)	1393	void ascii (JSON *self, int enable = 1)
1164	ALIAS:	1394	ALIAS:
1165	ascii = F_ASCII	1395	ascii = F_ASCII
1166	latin1 = F_LATIN1	1396	latin1 = F_LATIN1
1167	utf8 = F_UTF8	1397	utf8 = F_UTF8
1168	indent = F_INDENT	1398	indent = F_INDENT
1169	canonical = F_CANONICAL	1399	canonical = F_CANONICAL
1170	space_before = F_SPACE_BEFORE	1400	space_before = F_SPACE_BEFORE
1171	space_after = F_SPACE_AFTER	1401	space_after = F_SPACE_AFTER
1172	pretty = F_PRETTY	1402	pretty = F_PRETTY
1173	allow_nonref = F_ALLOW_NONREF	1403	allow_nonref = F_ALLOW_NONREF
1174	shrink = F_SHRINK	1404	shrink = F_SHRINK
		1405	allow_blessed = F_ALLOW_BLESSED
		1406	convert_blessed = F_CONV_BLESSED
1175	CODE:	1407	PPCODE:
1176	{	1408	{
1177	UV *uv = SvJSON (self);
1178	if (enable)	1409	if (enable)
1179	*uv \|= ix;	1410	self->flags \|= ix;
1180	else	1411	else
1181	*uv &= ~ix;	1412	self->flags &= ~ix;
1182		1413
1183	RETVAL = newSVsv (self);	1414	XPUSHs (ST (0));
1184	}	1415	}
1185	OUTPUT:
1186	RETVAL
1187		1416
1188	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1417	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1189	CODE:	1418	PPCODE:
1190	{	1419	{
1191	UV *uv = SvJSON (self);
1192	UV log2 = 0;	1420	UV log2 = 0;
1193		1421
1194	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1422	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1195		1423
1196	while ((1UL << log2) < max_depth)	1424	while ((1UL << log2) < max_depth)
1197	++log2;	1425	++log2;
1198		1426
1199	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1427	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1200		1428
1201	RETVAL = newSVsv (self);	1429	XPUSHs (ST (0));
1202	}	1430	}
1203	OUTPUT:
1204	RETVAL
1205		1431
1206	void encode (SV self, SV scalar)	1432	void max_size (JSON *self, UV max_size = 0)
1207	PPCODE:	1433	PPCODE:
1208	XPUSHs (encode_json (scalar, *SvJSON (self)));	1434	{
		1435	UV log2 = 0;
1209		1436
1210	void decode (SV self, SV jsonstr)	1437	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1438	if (max_size == 1) max_size = 2;
		1439
		1440	while ((1UL << log2) < max_size)
		1441	++log2;
		1442
		1443	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1444
		1445	XPUSHs (ST (0));
		1446	}
		1447
		1448	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1211	PPCODE:	1449	PPCODE:
		1450	{
		1451	SvREFCNT_dec (self->cb_object);
		1452	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1453
		1454	XPUSHs (ST (0));
		1455	}
		1456
		1457	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1458	PPCODE:
		1459	{
		1460	if (!self->cb_sk_object)
		1461	self->cb_sk_object = newHV ();
		1462
		1463	if (SvOK (cb))
		1464	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1465	else
		1466	{
		1467	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1468
		1469	if (!HvKEYS (self->cb_sk_object))
		1470	{
		1471	SvREFCNT_dec (self->cb_sk_object);
		1472	self->cb_sk_object = 0;
		1473	}
		1474	}
		1475
		1476	XPUSHs (ST (0));
		1477	}
		1478
		1479	void encode (JSON self, SV scalar)
		1480	PPCODE:
		1481	XPUSHs (encode_json (scalar, self));
		1482
		1483	void decode (JSON self, SV jsonstr)
		1484	PPCODE:
1212	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1485	XPUSHs (decode_json (jsonstr, self, 0));
1213		1486
1214	void decode_prefix (SV self, SV jsonstr)	1487	void decode_prefix (JSON self, SV jsonstr)
1215	PPCODE:	1488	PPCODE:
1216	{	1489	{
1217	UV offset;	1490	UV offset;
1218	EXTEND (SP, 2);	1491	EXTEND (SP, 2);
1219	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1492	PUSHs (decode_json (jsonstr, self, &offset));
1220	PUSHs (sv_2mortal (newSVuv (offset)));	1493	PUSHs (sv_2mortal (newSVuv (offset)));
1221	}	1494	}
1222		1495
		1496	void DESTROY (JSON *self)
		1497	CODE:
		1498	SvREFCNT_dec (self->cb_sk_object);
		1499	SvREFCNT_dec (self->cb_object);
		1500
1223	PROTOTYPES: ENABLE	1501	PROTOTYPES: ENABLE
1224		1502
1225	void to_json (SV *scalar)	1503	void to_json (SV *scalar)
1226	ALIAS:
1227	objToJson = 0
1228	PPCODE:	1504	PPCODE:
		1505	{
		1506	JSON json = { F_DEFAULT \| F_UTF8 };
1229	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1507	XPUSHs (encode_json (scalar, &json));
		1508	}
1230		1509
1231	void from_json (SV *jsonstr)	1510	void from_json (SV *jsonstr)
1232	ALIAS:
1233	jsonToObj = 0
1234	PPCODE:	1511	PPCODE:
		1512	{
		1513	JSON json = { F_DEFAULT \| F_UTF8 };
1235	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1514	XPUSHs (decode_json (jsonstr, &json, 0));
		1515	}
1236		1516

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing JSON-XS/XS.xs (file contents): Revision 1.38 by root, Mon Jun 11 03:18:07 2007 UTC vs. Revision 1.58 by root, Mon Aug 13 16:06:25 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.38 by root, Mon Jun 11 03:18:07 2007 UTC vs.
Revision 1.58 by root, Mon Aug 13 16:06:25 2007 UTC