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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs.
Revision 1.104 by root, Tue Jan 19 00:31:13 2010 UTC

…		…
12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
13	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
14	#endif	14	#endif
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
20	#endif	20	#endif
21		21
		22	// three extra for rounding, sign, and end of string
22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23		24
24	#define F_ASCII 0x00000001UL	25	#define F_ASCII 0x00000001UL
25	#define F_LATIN1 0x00000002UL	26	#define F_LATIN1 0x00000002UL
26	#define F_UTF8 0x00000004UL	27	#define F_UTF8 0x00000004UL
27	#define F_INDENT 0x00000008UL	28	#define F_INDENT 0x00000008UL
…		…
31	#define F_ALLOW_NONREF 0x00000100UL	32	#define F_ALLOW_NONREF 0x00000100UL
32	#define F_SHRINK 0x00000200UL	33	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	34	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	35	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	36	#define F_RELAXED 0x00001000UL
36		37	#define F_ALLOW_UNKNOWN 0x00002000UL
37	#define F_MAXDEPTH 0xf8000000UL
38	#define S_MAXDEPTH 27
39	#define F_MAXSIZE 0x01f00000UL
40	#define S_MAXSIZE 20
41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42		39
43	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
47	#define F_DEFAULT (9UL << S_MAXDEPTH)
48		41
49	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
50	#define INDENT_STEP 3 // spaces per indentation level	43	#define INDENT_STEP 3 // spaces per indentation level
51		44
52	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
…		…
67		60
68	#define IN_RANGE_INC(type,val,beg,end) \	61	#define IN_RANGE_INC(type,val,beg,end) \
69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	62	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	63	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71		64
		65	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		66
72	#ifdef USE_ITHREADS	67	#ifdef USE_ITHREADS
73	# define JSON_SLOW 1	68	# define JSON_SLOW 1
74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	69	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75	#else	70	#else
76	# define JSON_SLOW 0	71	# define JSON_SLOW 0
…		…
82		77
83	enum {	78	enum {
84	INCR_M_WS = 0, // initial whitespace skipping, must be 0	79	INCR_M_WS = 0, // initial whitespace skipping, must be 0
85	INCR_M_STR, // inside string	80	INCR_M_STR, // inside string
86	INCR_M_BS, // inside backslash	81	INCR_M_BS, // inside backslash
		82	INCR_M_C0, // inside comment in initial whitespace sequence
		83	INCR_M_C1, // inside comment in other places
87	INCR_M_JSON // outside anything, count nesting	84	INCR_M_JSON // outside anything, count nesting
88	};	85	};
89		86
90	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	87	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91		88
92	typedef struct {	89	typedef struct {
93	U32 flags;	90	U32 flags;
		91	U32 max_depth;
		92	STRLEN max_size;
		93
94	SV *cb_object;	94	SV *cb_object;
95	HV *cb_sk_object;	95	HV *cb_sk_object;
96		96
97	// for the incremental parser	97	// for the incremental parser
98	SV *incr_text; // the source text so far	98	SV *incr_text; // the source text so far
99	STRLEN incr_pos; // the current offset into the text	99	STRLEN incr_pos; // the current offset into the text
100	int incr_nest; // {[]}-nesting level	100	int incr_nest; // {[]}-nesting level
101	int incr_mode;	101	unsigned char incr_mode;
102	} JSON;	102	} JSON;
		103
		104	INLINE void
		105	json_init (JSON *json)
		106	{
		107	Zero (json, 1, JSON);
		108	json->max_depth = 512;
		109	}
103		110
104	/////////////////////////////////////////////////////////////////////////////	111	/////////////////////////////////////////////////////////////////////////////
105	// utility functions	112	// utility functions
106		113
107	INLINE SV *	114	INLINE SV *
…		…
117		124
118	INLINE void	125	INLINE void
119	shrink (SV *sv)	126	shrink (SV *sv)
120	{	127	{
121	sv_utf8_downgrade (sv, 1);	128	sv_utf8_downgrade (sv, 1);
		129
122	if (SvLEN (sv) > SvCUR (sv) + 1)	130	if (SvLEN (sv) > SvCUR (sv) + 1)
123	{	131	{
124	#ifdef SvPV_shrink_to_cur	132	#ifdef SvPV_shrink_to_cur
125	SvPV_shrink_to_cur (sv);	133	SvPV_shrink_to_cur (sv);
126	#elif defined (SvPV_renew)	134	#elif defined (SvPV_renew)
…		…
170	*s++ = 0x80 \| ( ch & 0x3f);	178	*s++ = 0x80 \| ( ch & 0x3f);
171		179
172	return s;	180	return s;
173	}	181	}
174		182
		183	// convert offset pointer to character index, sv must be string
		184	static STRLEN
		185	ptr_to_index (SV sv, char offset)
		186	{
		187	return SvUTF8 (sv)
		188	? utf8_distance (offset, SvPVX (sv))
		189	: offset - SvPVX (sv);
		190	}
		191
		192	/////////////////////////////////////////////////////////////////////////////
		193	// fp hell
		194
		195	// scan a group of digits, and a trailing exponent
		196	static void
		197	json_atof_scan1 (const char s, NV accum, int *expo, int postdp)
		198	{
		199	UV uaccum = 0;
		200	int eaccum = 0;
		201
		202	for (;;)
		203	{
		204	U8 dig = (U8)*s - '0';
		205
		206	if (expect_false (dig >= 10))
		207	{
		208	if (dig == (U8)((U8)'.' - (U8)'0'))
		209	{
		210	++s;
		211	json_atof_scan1 (s, accum, expo, 1);
		212	}
		213	else if ((dig \| ' ') == 'e' - '0')
		214	{
		215	int exp2 = 0;
		216	int neg = 0;
		217
		218	++s;
		219
		220	if (*s == '-')
		221	{
		222	++s;
		223	neg = 1;
		224	}
		225	else if (*s == '+')
		226	++s;
		227
		228	while ((dig = (U8)*s - '0') < 10)
		229	exp2 = exp2 * 10 + *s++ - '0';
		230
		231	*expo += neg ? -exp2 : exp2;
		232	}
		233
		234	break;
		235	}
		236
		237	++s;
		238
		239	uaccum = uaccum * 10 + dig;
		240	++eaccum;
		241
		242	// if we have too many digits, then recurse for more
		243	// we actually do this for rather few digits
		244	if (uaccum >= (UV_MAX - 9) / 10)
		245	{
		246	if (postdp) *expo -= eaccum;
		247	json_atof_scan1 (s, accum, expo, postdp);
		248	if (postdp) *expo += eaccum;
		249
		250	break;
		251	}
		252	}
		253
		254	if (postdp) *expo -= eaccum;
		255	accum += uaccum pow (10., *expo);
		256	*expo += eaccum;
		257	}
		258
		259	static NV
		260	json_atof (const char *s)
		261	{
		262	NV accum = 0.;
		263	int expo = 0;
		264	int neg = 0;
		265
		266	if (*s == '-')
		267	{
		268	++s;
		269	neg = 1;
		270	}
		271
		272	json_atof_scan1 (s, &accum, &expo, 0);
		273
		274	return neg ? -accum : accum;
		275	}
175	/////////////////////////////////////////////////////////////////////////////	276	/////////////////////////////////////////////////////////////////////////////
176	// encoder	277	// encoder
177		278
178	// structure used for encoding JSON	279	// structure used for encoding JSON
179	typedef struct	280	typedef struct
…		…
181	char *cur; // SvPVX (sv) + current output position	282	char *cur; // SvPVX (sv) + current output position
182	char *end; // SvEND (sv)	283	char *end; // SvEND (sv)
183	SV *sv; // result scalar	284	SV *sv; // result scalar
184	JSON json;	285	JSON json;
185	U32 indent; // indentation level	286	U32 indent; // indentation level
186	U32 maxdepth; // max. indentation/recursion level
187	UV limit; // escape character values >= this value when encoding	287	UV limit; // escape character values >= this value when encoding
188	} enc_t;	288	} enc_t;
189		289
190	INLINE void	290	INLINE void
191	need (enc_t *enc, STRLEN len)	291	need (enc_t *enc, STRLEN len)
192	{	292	{
193	if (expect_false (enc->cur + len >= enc->end))	293	if (expect_false (enc->cur + len >= enc->end))
194	{	294	{
195	STRLEN cur = enc->cur - SvPVX (enc->sv);	295	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
196	SvGROW (enc->sv, cur + len + 1);	296	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
197	enc->cur = SvPVX (enc->sv) + cur;	297	enc->cur = SvPVX (enc->sv) + cur;
198	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	298	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
199	}	299	}
200	}	300	}
201		301
…		…
276	(int)((uch - 0x10000) % 0x400 + 0xDC00));	376	(int)((uch - 0x10000) % 0x400 + 0xDC00));
277	enc->cur += 12;	377	enc->cur += 12;
278	}	378	}
279	else	379	else
280	{	380	{
281	static char hexdigit [16] = "0123456789abcdef";
282	need (enc, len += 5);	381	need (enc, len += 5);
283	*enc->cur++ = '\\';	382	*enc->cur++ = '\\';
284	*enc->cur++ = 'u';	383	*enc->cur++ = 'u';
285	*enc->cur++ = hexdigit [ uch >> 12 ];	384	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
286	*enc->cur++ = hexdigit [(uch >> 8) & 15];	385	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
287	*enc->cur++ = hexdigit [(uch >> 4) & 15];	386	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
288	*enc->cur++ = hexdigit [(uch >> 0) & 15];	387	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
289	}	388	}
290		389
291	str += clen;	390	str += clen;
292	}	391	}
293	else if (enc->json.flags & F_LATIN1)	392	else if (enc->json.flags & F_LATIN1)
…		…
364	static void	463	static void
365	encode_av (enc_t enc, AV av)	464	encode_av (enc_t enc, AV av)
366	{	465	{
367	int i, len = av_len (av);	466	int i, len = av_len (av);
368		467
369	if (enc->indent >= enc->maxdepth)	468	if (enc->indent >= enc->json.max_depth)
370	croak ("data structure too deep (hit recursion limit)");	469	croak (ERR_NESTING_EXCEEDED);
371		470
372	encode_ch (enc, '[');	471	encode_ch (enc, '[');
373		472
374	if (len >= 0)	473	if (len >= 0)
375	{	474	{
…		…
450	static void	549	static void
451	encode_hv (enc_t enc, HV hv)	550	encode_hv (enc_t enc, HV hv)
452	{	551	{
453	HE *he;	552	HE *he;
454		553
455	if (enc->indent >= enc->maxdepth)	554	if (enc->indent >= enc->json.max_depth)
456	croak ("data structure too deep (hit recursion limit)");	555	croak (ERR_NESTING_EXCEEDED);
457		556
458	encode_ch (enc, '{');	557	encode_ch (enc, '{');
459		558
460	// for canonical output we have to sort by keys first	559	// for canonical output we have to sort by keys first
461	// actually, this is mostly due to the stupid so-called	560	// actually, this is mostly due to the stupid so-called
462	// security workaround added somewhere in 5.8.x.	561	// security workaround added somewhere in 5.8.x
463	// that randomises hash orderings	562	// that randomises hash orderings
464	if (enc->json.flags & F_CANONICAL)	563	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
465	{	564	{
466	int count = hv_iterinit (hv);	565	int count = hv_iterinit (hv);
467		566
468	if (SvMAGICAL (hv))	567	if (SvMAGICAL (hv))
469	{	568	{
…		…
642		741
643	if (len == 1 && *pv == '1')	742	if (len == 1 && *pv == '1')
644	encode_str (enc, "true", 4, 0);	743	encode_str (enc, "true", 4, 0);
645	else if (len == 1 && *pv == '0')	744	else if (len == 1 && *pv == '0')
646	encode_str (enc, "false", 5, 0);	745	encode_str (enc, "false", 5, 0);
		746	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		747	encode_str (enc, "null", 4, 0);
647	else	748	else
648	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	749	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
649	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	750	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
650	}	751	}
		752	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		753	encode_str (enc, "null", 4, 0);
651	else	754	else
652	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	755	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
653	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	756	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
654	}	757	}
655		758
…		…
717	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	820	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
718	}	821	}
719	}	822	}
720	else if (SvROK (sv))	823	else if (SvROK (sv))
721	encode_rv (enc, SvRV (sv));	824	encode_rv (enc, SvRV (sv));
722	else if (!SvOK (sv))	825	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
723	encode_str (enc, "null", 4, 0);	826	encode_str (enc, "null", 4, 0);
724	else	827	else
725	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	828	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
726	SvPV_nolen (sv), SvFLAGS (sv));	829	SvPV_nolen (sv), SvFLAGS (sv));
727	}	830	}
…		…
737	enc.json = *json;	840	enc.json = *json;
738	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	841	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
739	enc.cur = SvPVX (enc.sv);	842	enc.cur = SvPVX (enc.sv);
740	enc.end = SvEND (enc.sv);	843	enc.end = SvEND (enc.sv);
741	enc.indent = 0;	844	enc.indent = 0;
742	enc.maxdepth = DEC_DEPTH (enc.json.flags);
743	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	845	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
744	: enc.json.flags & F_LATIN1 ? 0x000100UL	846	: enc.json.flags & F_LATIN1 ? 0x000100UL
745	: 0x110000UL;	847	: 0x110000UL;
746		848
747	SvPOK_only (enc.sv);	849	SvPOK_only (enc.sv);
748	encode_sv (&enc, scalar);	850	encode_sv (&enc, scalar);
		851	encode_nl (&enc);
749		852
750	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	853	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
751	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	854	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
752		855
753	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	856	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
814	if (*dec->cur != ch) \	917	if (*dec->cur != ch) \
815	ERR (# ch " expected"); \	918	ERR (# ch " expected"); \
816	++dec->cur; \	919	++dec->cur; \
817	SE	920	SE
818		921
819	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	922	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
820	#define DEC_DEC_DEPTH --dec->depth	923	#define DEC_DEC_DEPTH --dec->depth
821		924
822	static SV decode_sv (dec_t dec);	925	static SV decode_sv (dec_t dec);
823		926
824	static signed char decode_hexdigit[256];	927	static signed char decode_hexdigit[256];
…		…
933	else if (expect_true (ch >= 0x20 && ch < 0x80))	1036	else if (expect_true (ch >= 0x20 && ch < 0x80))
934	*cur++ = ch;	1037	*cur++ = ch;
935	else if (ch >= 0x80)	1038	else if (ch >= 0x80)
936	{	1039	{
937	STRLEN clen;	1040	STRLEN clen;
938	UV uch;
939		1041
940	--dec_cur;	1042	--dec_cur;
941		1043
942	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1044	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
943	if (clen == (STRLEN)-1)	1045	if (clen == (STRLEN)-1)
944	ERR ("malformed UTF-8 character in JSON string");	1046	ERR ("malformed UTF-8 character in JSON string");
945		1047
946	do	1048	do
947	cur++ = dec_cur++;	1049	cur++ = dec_cur++;
…		…
964	{	1066	{
965	STRLEN len = cur - buf;	1067	STRLEN len = cur - buf;
966		1068
967	if (sv)	1069	if (sv)
968	{	1070	{
969	SvGROW (sv, SvCUR (sv) + len + 1);	1071	STRLEN cur = SvCUR (sv);
		1072
		1073	if (SvLEN (sv) <= cur + len)
		1074	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1075
970	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1076	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
971	SvCUR_set (sv, SvCUR (sv) + len);	1077	SvCUR_set (sv, SvCUR (sv) + len);
972	}	1078	}
973	else	1079	else
974	sv = newSVpvn (buf, len);	1080	sv = newSVpvn (buf, len);
…		…
1065		1171
1066	// special case the rather common 1..5-digit-int case	1172	// special case the rather common 1..5-digit-int case
1067	if (*start == '-')	1173	if (*start == '-')
1068	switch (len)	1174	switch (len)
1069	{	1175	{
1070	case 2: return newSViv (-( start [1] - '0' * 1));	1176	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1071	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1177	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1072	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1178	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1073	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1179	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1074	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1180	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1075	}	1181	}
1076	else	1182	else
1077	switch (len)	1183	switch (len)
1078	{	1184	{
1079	case 1: return newSViv ( start [0] - '0' * 1);	1185	case 1: return newSViv ( start [0] - '0' * 1);
1080	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1186	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1081	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1187	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1082	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1188	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1083	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1189	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1084	}	1190	}
1085		1191
1086	{	1192	{
1087	UV uv;	1193	UV uv;
1088	int numtype = grok_number (start, len, &uv);	1194	int numtype = grok_number (start, len, &uv);
…		…
1097	}	1203	}
1098		1204
1099	len -= *start == '-' ? 1 : 0;	1205	len -= *start == '-' ? 1 : 0;
1100		1206
1101	// does not fit into IV or UV, try NV	1207	// does not fit into IV or UV, try NV
1102	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1208	if (len <= NV_DIG)
1103	#if defined (LDBL_DIG)
1104	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1105	#endif
1106	)
1107	// fits into NV without loss of precision	1209	// fits into NV without loss of precision
1108	return newSVnv (Atof (start));	1210	return newSVnv (json_atof (start));
1109		1211
1110	// everything else fails, convert it to a string	1212	// everything else fails, convert it to a string
1111	return newSVpvn (start, dec->cur - start);	1213	return newSVpvn (start, dec->cur - start);
1112	}	1214	}
1113		1215
1114	// loss of precision here	1216	// loss of precision here
1115	return newSVnv (Atof (start));	1217	return newSVnv (json_atof (start));
1116		1218
1117	fail:	1219	fail:
1118	return 0;	1220	return 0;
1119	}	1221	}
1120		1222
…		…
1398	fail:	1500	fail:
1399	return 0;	1501	return 0;
1400	}	1502	}
1401		1503
1402	static SV *	1504	static SV *
1403	decode_json (SV string, JSON json, STRLEN *offset_return)	1505	decode_json (SV string, JSON json, char **offset_return)
1404	{	1506	{
1405	dec_t dec;	1507	dec_t dec;
1406	STRLEN offset;
1407	SV *sv;	1508	SV *sv;
1408		1509
		1510	/* work around bugs in 5.10 where manipulating magic values
		1511	* will perl ignore the magic in subsequent accesses
		1512	*/
1409	SvGETMAGIC (string);	1513	/SvGETMAGIC (string);/
		1514	if (SvMAGICAL (string))
		1515	string = sv_2mortal (newSVsv (string));
		1516
1410	SvUPGRADE (string, SVt_PV);	1517	SvUPGRADE (string, SVt_PV);
1411		1518
1412	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1519	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1520	* assertion with -DDEBUGGING, although SvCUR is documented to
		1521	* return the xpv_cur field which certainly exists after upgrading.
		1522	* according to nicholas clark, calling SvPOK fixes this.
		1523	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1524	* and hope for the best.
		1525	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1526	* assertion business is seriously broken, try yet another workaround
		1527	* for the broken -DDEBUGGING.
		1528	*/
		1529	{
		1530	#ifdef DEBUGGING
		1531	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1532	#else
		1533	STRLEN offset = SvCUR (string);
		1534	#endif
		1535
		1536	if (offset > json->max_size && json->max_size)
1413	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1537	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1414	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1538	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1539	}
1415		1540
1416	if (json->flags & F_UTF8)	1541	if (json->flags & F_UTF8)
1417	sv_utf8_downgrade (string, 0);	1542	sv_utf8_downgrade (string, 0);
1418	else	1543	else
1419	sv_utf8_upgrade (string);	1544	sv_utf8_upgrade (string);
1420		1545
1421	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1546	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1422		1547
1423	dec.json = *json;	1548	dec.json = *json;
1424	dec.cur = SvPVX (string);	1549	dec.cur = SvPVX (string);
1425	dec.end = SvEND (string);	1550	dec.end = SvEND (string);
1426	dec.err = 0;	1551	dec.err = 0;
1427	dec.depth = 0;	1552	dec.depth = 0;
1428	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1429		1553
1430	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1554	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1431	dec.json.flags \|= F_HOOK;	1555	dec.json.flags \|= F_HOOK;
1432		1556
1433	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1557	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1434		1558
1435	decode_ws (&dec);	1559	decode_ws (&dec);
1436	sv = decode_sv (&dec);	1560	sv = decode_sv (&dec);
		1561
		1562	if (offset_return)
		1563	*offset_return = dec.cur;
1437		1564
1438	if (!(offset_return \|\| !sv))	1565	if (!(offset_return \|\| !sv))
1439	{	1566	{
1440	// check for trailing garbage	1567	// check for trailing garbage
1441	decode_ws (&dec);	1568	decode_ws (&dec);
…		…
1444	{	1571	{
1445	dec.err = "garbage after JSON object";	1572	dec.err = "garbage after JSON object";
1446	SvREFCNT_dec (sv);	1573	SvREFCNT_dec (sv);
1447	sv = 0;	1574	sv = 0;
1448	}	1575	}
1449	}
1450
1451	if (offset_return \|\| !sv)
1452	{
1453	offset = dec.json.flags & F_UTF8
1454	? dec.cur - SvPVX (string)
1455	: utf8_distance (dec.cur, SvPVX (string));
1456
1457	if (offset_return)
1458	*offset_return = offset;
1459	}	1576	}
1460		1577
1461	if (!sv)	1578	if (!sv)
1462	{	1579	{
1463	SV *uni = sv_newmortal ();	1580	SV *uni = sv_newmortal ();
…		…
1469	SAVEVPTR (PL_curcop);	1586	SAVEVPTR (PL_curcop);
1470	PL_curcop = &cop;	1587	PL_curcop = &cop;
1471	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1588	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1472	LEAVE;	1589	LEAVE;
1473		1590
1474	croak ("%s, at character offset %d [\"%s\"]",	1591	croak ("%s, at character offset %d (before \"%s\")",
1475	dec.err,	1592	dec.err,
1476	(int)offset,	1593	ptr_to_index (string, dec.cur),
1477	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1594	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1478	}	1595	}
1479		1596
1480	sv = sv_2mortal (sv);	1597	sv = sv_2mortal (sv);
1481		1598
…		…
1490		1607
1491	static void	1608	static void
1492	incr_parse (JSON *self)	1609	incr_parse (JSON *self)
1493	{	1610	{
1494	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1611	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1612
		1613	// the state machine here is a bit convoluted and could be simplified a lot
		1614	// but this would make it slower, so...
1495		1615
1496	for (;;)	1616	for (;;)
1497	{	1617	{
1498	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D	1618	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D
1499	switch (self->incr_mode)	1619	switch (self->incr_mode)
1500	{	1620	{
1501	// only used for intiial whitespace skipping	1621	// only used for initial whitespace skipping
1502	case INCR_M_WS:	1622	case INCR_M_WS:
1503	for (;;)	1623	for (;;)
1504	{	1624	{
1505	if (*p > 0x20)	1625	if (*p > 0x20)
1506	{	1626	{
		1627	if (*p == '#')
		1628	{
		1629	self->incr_mode = INCR_M_C0;
		1630	goto incr_m_c;
		1631	}
		1632	else
		1633	{
1507	self->incr_mode = INCR_M_JSON;	1634	self->incr_mode = INCR_M_JSON;
1508	goto incr_m_json;	1635	goto incr_m_json;
		1636	}
1509	}	1637	}
1510	else if (!*p)	1638	else if (!*p)
1511	goto interrupt;	1639	goto interrupt;
1512		1640
1513	++p;	1641	++p;
…		…
1519	goto interrupt;	1647	goto interrupt;
1520		1648
1521	++p;	1649	++p;
1522	self->incr_mode = INCR_M_STR;	1650	self->incr_mode = INCR_M_STR;
1523	goto incr_m_str;	1651	goto incr_m_str;
		1652
		1653	// inside #-style comments
		1654	case INCR_M_C0:
		1655	case INCR_M_C1:
		1656	incr_m_c:
		1657	for (;;)
		1658	{
		1659	if (*p == '\n')
		1660	{
		1661	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1662	break;
		1663	}
		1664	else if (!*p)
		1665	goto interrupt;
		1666
		1667	++p;
		1668	}
		1669
		1670	break;
1524		1671
1525	// inside a string	1672	// inside a string
1526	case INCR_M_STR:	1673	case INCR_M_STR:
1527	incr_m_str:	1674	incr_m_str:
1528	for (;;)	1675	for (;;)
…		…
1579	self->incr_mode = INCR_M_STR;	1726	self->incr_mode = INCR_M_STR;
1580	goto incr_m_str;	1727	goto incr_m_str;
1581		1728
1582	case '[':	1729	case '[':
1583	case '{':	1730	case '{':
1584	++self->incr_nest;	1731	if (++self->incr_nest > self->max_depth)
		1732	croak (ERR_NESTING_EXCEEDED);
1585	break;	1733	break;
1586		1734
1587	case ']':	1735	case ']':
1588	case '}':	1736	case '}':
1589	if (!--self->incr_nest)	1737	if (--self->incr_nest <= 0)
1590	goto interrupt;	1738	goto interrupt;
		1739	break;
		1740
		1741	case '#':
		1742	self->incr_mode = INCR_M_C1;
		1743	goto incr_m_c;
1591	}	1744	}
1592	}	1745	}
1593	}	1746	}
1594		1747
1595	modechange:	1748	modechange:
1596	;	1749	;
1597	}	1750	}
1598		1751
1599	interrupt:	1752	interrupt:
1600	self->incr_pos = p - SvPVX (self->incr_text);	1753	self->incr_pos = p - SvPVX (self->incr_text);
		1754	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1601	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1755	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1602	}	1756	}
1603		1757
1604	/////////////////////////////////////////////////////////////////////////////	1758	/////////////////////////////////////////////////////////////////////////////
1605	// XS interface functions	1759	// XS interface functions
…		…
1620	json_stash = gv_stashpv ("JSON::XS" , 1);	1774	json_stash = gv_stashpv ("JSON::XS" , 1);
1621	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1775	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1622		1776
1623	json_true = get_bool ("JSON::XS::true");	1777	json_true = get_bool ("JSON::XS::true");
1624	json_false = get_bool ("JSON::XS::false");	1778	json_false = get_bool ("JSON::XS::false");
		1779
		1780	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1625	}	1781	}
1626		1782
1627	PROTOTYPES: DISABLE	1783	PROTOTYPES: DISABLE
1628		1784
1629	void CLONE (...)	1785	void CLONE (...)
…		…
1634	void new (char *klass)	1790	void new (char *klass)
1635	PPCODE:	1791	PPCODE:
1636	{	1792	{
1637	SV *pv = NEWSV (0, sizeof (JSON));	1793	SV *pv = NEWSV (0, sizeof (JSON));
1638	SvPOK_only (pv);	1794	SvPOK_only (pv);
1639	Zero (SvPVX (pv), 1, JSON);	1795	json_init ((JSON *)SvPVX (pv));
1640	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1641	XPUSHs (sv_2mortal (sv_bless (	1796	XPUSHs (sv_2mortal (sv_bless (
1642	newRV_noinc (pv),	1797	newRV_noinc (pv),
1643	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1798	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1644	)));	1799	)));
1645	}	1800	}
…		…
1657	allow_nonref = F_ALLOW_NONREF	1812	allow_nonref = F_ALLOW_NONREF
1658	shrink = F_SHRINK	1813	shrink = F_SHRINK
1659	allow_blessed = F_ALLOW_BLESSED	1814	allow_blessed = F_ALLOW_BLESSED
1660	convert_blessed = F_CONV_BLESSED	1815	convert_blessed = F_CONV_BLESSED
1661	relaxed = F_RELAXED	1816	relaxed = F_RELAXED
		1817	allow_unknown = F_ALLOW_UNKNOWN
1662	PPCODE:	1818	PPCODE:
1663	{	1819	{
1664	if (enable)	1820	if (enable)
1665	self->flags \|= ix;	1821	self->flags \|= ix;
1666	else	1822	else
…		…
1681	get_allow_nonref = F_ALLOW_NONREF	1837	get_allow_nonref = F_ALLOW_NONREF
1682	get_shrink = F_SHRINK	1838	get_shrink = F_SHRINK
1683	get_allow_blessed = F_ALLOW_BLESSED	1839	get_allow_blessed = F_ALLOW_BLESSED
1684	get_convert_blessed = F_CONV_BLESSED	1840	get_convert_blessed = F_CONV_BLESSED
1685	get_relaxed = F_RELAXED	1841	get_relaxed = F_RELAXED
		1842	get_allow_unknown = F_ALLOW_UNKNOWN
1686	PPCODE:	1843	PPCODE:
1687	XPUSHs (boolSV (self->flags & ix));	1844	XPUSHs (boolSV (self->flags & ix));
1688		1845
1689	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1846	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1690	PPCODE:	1847	PPCODE:
1691	{	1848	self->max_depth = max_depth;
1692	UV log2 = 0;
1693
1694	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1695
1696	while ((1UL << log2) < max_depth)
1697	++log2;
1698
1699	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1700
1701	XPUSHs (ST (0));	1849	XPUSHs (ST (0));
1702	}
1703		1850
1704	U32 get_max_depth (JSON *self)	1851	U32 get_max_depth (JSON *self)
1705	CODE:	1852	CODE:
1706	RETVAL = DEC_DEPTH (self->flags);	1853	RETVAL = self->max_depth;
1707	OUTPUT:	1854	OUTPUT:
1708	RETVAL	1855	RETVAL
1709		1856
1710	void max_size (JSON *self, UV max_size = 0)	1857	void max_size (JSON *self, U32 max_size = 0)
1711	PPCODE:	1858	PPCODE:
1712	{	1859	self->max_size = max_size;
1713	UV log2 = 0;
1714
1715	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1716	if (max_size == 1) max_size = 2;
1717
1718	while ((1UL << log2) < max_size)
1719	++log2;
1720
1721	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1722
1723	XPUSHs (ST (0));	1860	XPUSHs (ST (0));
1724	}
1725		1861
1726	int get_max_size (JSON *self)	1862	int get_max_size (JSON *self)
1727	CODE:	1863	CODE:
1728	RETVAL = DEC_SIZE (self->flags);	1864	RETVAL = self->max_size;
1729	OUTPUT:	1865	OUTPUT:
1730	RETVAL	1866	RETVAL
1731		1867
1732	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1868	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1733	PPCODE:	1869	PPCODE:
…		…
1769	XPUSHs (decode_json (jsonstr, self, 0));	1905	XPUSHs (decode_json (jsonstr, self, 0));
1770		1906
1771	void decode_prefix (JSON self, SV jsonstr)	1907	void decode_prefix (JSON self, SV jsonstr)
1772	PPCODE:	1908	PPCODE:
1773	{	1909	{
1774	STRLEN offset;	1910	char *offset;
1775	EXTEND (SP, 2);	1911	EXTEND (SP, 2);
1776	PUSHs (decode_json (jsonstr, self, &offset));	1912	PUSHs (decode_json (jsonstr, self, &offset));
1777	PUSHs (sv_2mortal (newSVuv (offset)));	1913	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1778	}	1914	}
1779		1915
1780	void incr_parse (JSON self, SV jsonstr = 0)	1916	void incr_parse (JSON self, SV jsonstr = 0)
1781	PPCODE:	1917	PPCODE:
1782	{	1918	{
…		…
1784	self->incr_text = newSVpvn ("", 0);	1920	self->incr_text = newSVpvn ("", 0);
1785		1921
1786	// append data, if any	1922	// append data, if any
1787	if (jsonstr)	1923	if (jsonstr)
1788	{	1924	{
1789	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1925	if (SvUTF8 (jsonstr))
1790	{	1926	{
		1927	if (!SvUTF8 (self->incr_text))
		1928	{
1791	/* utf-8-ness differs, need to upgrade */	1929	/* utf-8-ness differs, need to upgrade */
1792	sv_utf8_upgrade (self->incr_text);	1930	sv_utf8_upgrade (self->incr_text);
1793		1931
1794	if (self->incr_pos)	1932	if (self->incr_pos)
1795	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)	1933	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1796	- (U8 *)SvPVX (self->incr_text);	1934	- (U8 *)SvPVX (self->incr_text);
		1935	}
1797	}	1936	}
		1937	else if (SvUTF8 (self->incr_text))
		1938	sv_utf8_upgrade (jsonstr);
1798		1939
1799	{	1940	{
1800	STRLEN len;	1941	STRLEN len;
1801	const char *str = SvPV (jsonstr, len);	1942	const char *str = SvPV (jsonstr, len);
1802	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	1943	STRLEN cur = SvCUR (self->incr_text);
		1944
		1945	if (SvLEN (self->incr_text) <= cur + len)
		1946	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1947
1803	Move (str, SvEND (self->incr_text), len, char);	1948	Move (str, SvEND (self->incr_text), len, char);
1804	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1949	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1805	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	1950	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1806	}	1951	}
1807	}	1952	}
1808		1953
1809	if (GIMME_V != G_VOID)	1954	if (GIMME_V != G_VOID)
1810	do	1955	do
1811	{	1956	{
1812	STRLEN offset;	1957	char *offset;
1813		1958
1814	if (!INCR_DONE (self))	1959	if (!INCR_DONE (self))
1815	{	1960	{
1816	incr_parse (self);	1961	incr_parse (self);
		1962
		1963	if (self->incr_pos > self->max_size && self->max_size)
		1964	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1965	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1966
1817	if (!INCR_DONE (self))	1967	if (!INCR_DONE (self))
1818	break;	1968	break;
1819	}	1969	}
1820		1970
1821	XPUSHs (decode_json (self->incr_text, self, &offset));	1971	XPUSHs (decode_json (self->incr_text, self, &offset));
1822		1972
1823	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1824	self->incr_pos -= offset;	1973	self->incr_pos -= offset - SvPVX (self->incr_text);
1825	self->incr_nest = 0;	1974	self->incr_nest = 0;
1826	self->incr_mode = 0;	1975	self->incr_mode = 0;
		1976
		1977	sv_chop (self->incr_text, offset);
1827	}	1978	}
1828	while (GIMME_V == G_ARRAY);	1979	while (GIMME_V == G_ARRAY);
1829	}	1980	}
1830		1981
1831	SV incr_text (JSON self)	1982	SV incr_text (JSON self)
…		…
1850	self->incr_nest = 0;	2001	self->incr_nest = 0;
1851	self->incr_mode = 0;	2002	self->incr_mode = 0;
1852	}	2003	}
1853	}	2004	}
1854		2005
		2006	void incr_reset (JSON *self)
		2007	CODE:
		2008	{
		2009	SvREFCNT_dec (self->incr_text);
		2010	self->incr_text = 0;
		2011	self->incr_pos = 0;
		2012	self->incr_nest = 0;
		2013	self->incr_mode = 0;
		2014	}
		2015
1855	void DESTROY (JSON *self)	2016	void DESTROY (JSON *self)
1856	CODE:	2017	CODE:
1857	SvREFCNT_dec (self->cb_sk_object);	2018	SvREFCNT_dec (self->cb_sk_object);
1858	SvREFCNT_dec (self->cb_object);	2019	SvREFCNT_dec (self->cb_object);
1859	SvREFCNT_dec (self->incr_text);	2020	SvREFCNT_dec (self->incr_text);
…		…
1864	ALIAS:	2025	ALIAS:
1865	to_json_ = 0	2026	to_json_ = 0
1866	encode_json = F_UTF8	2027	encode_json = F_UTF8
1867	PPCODE:	2028	PPCODE:
1868	{	2029	{
1869	JSON json = { F_DEFAULT \| ix };	2030	JSON json;
		2031	json_init (&json);
		2032	json.flags \|= ix;
1870	XPUSHs (encode_json (scalar, &json));	2033	XPUSHs (encode_json (scalar, &json));
1871	}	2034	}
1872		2035
1873	void decode_json (SV *jsonstr)	2036	void decode_json (SV *jsonstr)
1874	ALIAS:	2037	ALIAS:
1875	from_json_ = 0	2038	from_json_ = 0
1876	decode_json = F_UTF8	2039	decode_json = F_UTF8
1877	PPCODE:	2040	PPCODE:
1878	{	2041	{
1879	JSON json = { F_DEFAULT \| ix };	2042	JSON json;
		2043	json_init (&json);
		2044	json.flags \|= ix;
1880	XPUSHs (decode_json (jsonstr, &json, 0));	2045	XPUSHs (decode_json (jsonstr, &json, 0));
1881	}	2046	}
1882		2047
1883

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs. Revision 1.104 by root, Tue Jan 19 00:31:13 2010 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs.
Revision 1.104 by root, Tue Jan 19 00:31:13 2010 UTC