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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.14 by root, Sat Mar 24 22:55:43 2007 UTC vs.
Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC

…		…
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		9
		10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
		11	# define snprintf _snprintf // C compilers have this in stdio.h
		12	#endif
		13
		14	// some old perls do not have this, try to make it work, no
		15	// guarentees, though. if it breaks, you get to keep the pieces.
		16	#ifndef UTF8_MAXBYTES
		17	# define UTF8_MAXBYTES 13
		18	#endif
		19
9	#define F_ASCII 0x00000001	20	#define F_ASCII 0x00000001UL
		21	#define F_LATIN1 0x00000002UL
10	#define F_UTF8 0x00000002	22	#define F_UTF8 0x00000004UL
11	#define F_INDENT 0x00000004	23	#define F_INDENT 0x00000008UL
12	#define F_CANONICAL 0x00000008	24	#define F_CANONICAL 0x00000010UL
13	#define F_SPACE_BEFORE 0x00000010	25	#define F_SPACE_BEFORE 0x00000020UL
14	#define F_SPACE_AFTER 0x00000020	26	#define F_SPACE_AFTER 0x00000040UL
15	#define F_ALLOW_NONREF 0x00000080	27	#define F_ALLOW_NONREF 0x00000100UL
16	#define F_SHRINK 0x00000100	28	#define F_SHRINK 0x00000200UL
		29	#define F_MAXDEPTH 0xf8000000UL
		30	#define S_MAXDEPTH 27
		31
		32	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
		33
		34	// F_SELFCONVERT? <=> to_json/toJson
		35	// F_BLESSED? <=> { $__class__$ => }
17		36
18	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	37	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
19	#define F_DEFAULT 0	38	#define F_DEFAULT (9UL << S_MAXDEPTH)
20		39
21	#define INIT_SIZE 32 // initial scalar size to be allocated	40	#define INIT_SIZE 32 // initial scalar size to be allocated
22	#define INDENT_STEP 3 // spaces per indentation level	41	#define INDENT_STEP 3 // spaces per indentation level
23		42
24	#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
25	#define SHORT_STRING_LEN 512 // special-case strings of up to this size	43	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
26		44
27	#define SB do {	45	#define SB do {
28	#define SE } while (0)	46	#define SE } while (0)
29		47
		48	#if __GNUC__ >= 3
		49	# define expect(expr,value) __builtin_expect ((expr),(value))
		50	# define inline inline
		51	#else
		52	# define expect(expr,value) (expr)
		53	# define inline static
		54	#endif
		55
		56	#define expect_false(expr) expect ((expr) != 0, 0)
		57	#define expect_true(expr) expect ((expr) != 0, 1)
		58
30	static HV *json_stash; // JSON::XS::	59	static HV *json_stash; // JSON::XS::
		60	static SV json_true, json_false;
31		61
32	/////////////////////////////////////////////////////////////////////////////	62	/////////////////////////////////////////////////////////////////////////////
33	// utility functions	63	// utility functions
34		64
35	static UV *	65	static UV *
…		…
58	// decode an utf-8 character and return it, or (UV)-1 in	88	// decode an utf-8 character and return it, or (UV)-1 in
59	// case of an error.	89	// case of an error.
60	// we special-case "safe" characters from U+80 .. U+7FF,	90	// we special-case "safe" characters from U+80 .. U+7FF,
61	// but use the very good perl function to parse anything else.	91	// but use the very good perl function to parse anything else.
62	// note that we never call this function for a ascii codepoints	92	// note that we never call this function for a ascii codepoints
63	static UV	93	inline UV
64	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	94	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
65	{	95	{
66	if (s[0] > 0xdf \|\| s[0] < 0xc2)	96	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))
67	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	97	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
68	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	98	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
69	{	99	{
70	*clen = 2;	100	*clen = 2;
71	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	101	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
72	}	102	}
73	else	103	else
		104	{
		105	*clen = (STRLEN)-1;
74	return (UV)-1;	106	return (UV)-1;
		107	}
75	}	108	}
76		109
77	/////////////////////////////////////////////////////////////////////////////	110	/////////////////////////////////////////////////////////////////////////////
78	// encoder	111	// encoder
79		112
…		…
81	typedef struct	114	typedef struct
82	{	115	{
83	char *cur; // SvPVX (sv) + current output position	116	char *cur; // SvPVX (sv) + current output position
84	char *end; // SvEND (sv)	117	char *end; // SvEND (sv)
85	SV *sv; // result scalar	118	SV *sv; // result scalar
86	UV flags; // F_*	119	U32 flags; // F_*
87	int indent; // indentation level	120	U32 indent; // indentation level
88	int max_depth; // max. recursion level	121	U32 maxdepth; // max. indentation/recursion level
89	} enc_t;	122	} enc_t;
90		123
91	static void	124	inline void
92	need (enc_t *enc, STRLEN len)	125	need (enc_t *enc, STRLEN len)
93	{	126	{
94	if (enc->cur + len >= enc->end)	127	if (expect_false (enc->cur + len >= enc->end))
95	{	128	{
96	STRLEN cur = enc->cur - SvPVX (enc->sv);	129	STRLEN cur = enc->cur - SvPVX (enc->sv);
97	SvGROW (enc->sv, cur + len + 1);	130	SvGROW (enc->sv, cur + len + 1);
98	enc->cur = SvPVX (enc->sv) + cur;	131	enc->cur = SvPVX (enc->sv) + cur;
99	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv);	132	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
100	}	133	}
101	}	134	}
102		135
103	static void	136	inline void
104	encode_ch (enc_t *enc, char ch)	137	encode_ch (enc_t *enc, char ch)
105	{	138	{
106	need (enc, 1);	139	need (enc, 1);
107	*enc->cur++ = ch;	140	*enc->cur++ = ch;
108	}	141	}
…		…
116		149
117	while (str < end)	150	while (str < end)
118	{	151	{
119	unsigned char ch = (unsigned char )str;	152	unsigned char ch = (unsigned char )str;
120		153
121	if (ch >= 0x20 && ch < 0x80) // most common case	154	if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
122	{	155	{
123	if (ch == '"') // but with slow exceptions	156	if (expect_false (ch == '"')) // but with slow exceptions
124	{	157	{
125	need (enc, len += 1);	158	need (enc, len += 1);
126	*enc->cur++ = '\\';	159	*enc->cur++ = '\\';
127	*enc->cur++ = '"';	160	*enc->cur++ = '"';
128	}	161	}
129	else if (ch == '\\')	162	else if (expect_false (ch == '\\'))
130	{	163	{
131	need (enc, len += 1);	164	need (enc, len += 1);
132	*enc->cur++ = '\\';	165	*enc->cur++ = '\\';
133	*enc->cur++ = '\\';	166	*enc->cur++ = '\\';
134	}	167	}
…		…
152	STRLEN clen;	185	STRLEN clen;
153	UV uch;	186	UV uch;
154		187
155	if (is_utf8)	188	if (is_utf8)
156	{	189	{
157	//uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
158	uch = decode_utf8 (str, end - str, &clen);	190	uch = decode_utf8 (str, end - str, &clen);
159	if (clen == (STRLEN)-1)	191	if (clen == (STRLEN)-1)
160	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);	192	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
161	}	193	}
162	else	194	else
…		…
166	}	198	}
167		199
168	if (uch > 0x10FFFFUL)	200	if (uch > 0x10FFFFUL)
169	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	201	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
170		202
171	if (uch < 0x80 \|\| enc->flags & F_ASCII)	203	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))
172	{	204	{
173	if (uch > 0xFFFFUL)	205	if (uch > 0xFFFFUL)
174	{	206	{
175	need (enc, len += 11);	207	need (enc, len += 11);
176	sprintf (enc->cur, "\\u%04x\\u%04x",	208	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
190	*enc->cur++ = hexdigit [(uch >> 0) & 15];	222	*enc->cur++ = hexdigit [(uch >> 0) & 15];
191	}	223	}
192		224
193	str += clen;	225	str += clen;
194	}	226	}
		227	else if (enc->flags & F_LATIN1)
		228	{
		229	*enc->cur++ = uch;
		230	str += clen;
		231	}
195	else if (is_utf8)	232	else if (is_utf8)
196	{	233	{
197	need (enc, len += clen);	234	need (enc, len += clen);
198	do	235	do
199	{	236	{
…		…
201	}	238	}
202	while (--clen);	239	while (--clen);
203	}	240	}
204	else	241	else
205	{	242	{
206	need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed	243	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
207	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);	244	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
208	++str;	245	++str;
209	}	246	}
210	}	247	}
211	}	248	}
…		…
213		250
214	--len;	251	--len;
215	}	252	}
216	}	253	}
217		254
218	static void	255	inline void
219	encode_indent (enc_t *enc)	256	encode_indent (enc_t *enc)
220	{	257	{
221	if (enc->flags & F_INDENT)	258	if (enc->flags & F_INDENT)
222	{	259	{
223	int spaces = enc->indent * INDENT_STEP;	260	int spaces = enc->indent * INDENT_STEP;
…		…
226	memset (enc->cur, ' ', spaces);	263	memset (enc->cur, ' ', spaces);
227	enc->cur += spaces;	264	enc->cur += spaces;
228	}	265	}
229	}	266	}
230		267
231	static void	268	inline void
232	encode_space (enc_t *enc)	269	encode_space (enc_t *enc)
233	{	270	{
234	need (enc, 1);	271	need (enc, 1);
235	encode_ch (enc, ' ');	272	encode_ch (enc, ' ');
236	}	273	}
237		274
238	static void	275	inline void
239	encode_nl (enc_t *enc)	276	encode_nl (enc_t *enc)
240	{	277	{
241	if (enc->flags & F_INDENT)	278	if (enc->flags & F_INDENT)
242	{	279	{
243	need (enc, 1);	280	need (enc, 1);
244	encode_ch (enc, '\n');	281	encode_ch (enc, '\n');
245	}	282	}
246	}	283	}
247		284
248	static void	285	inline void
249	encode_comma (enc_t *enc)	286	encode_comma (enc_t *enc)
250	{	287	{
251	encode_ch (enc, ',');	288	encode_ch (enc, ',');
252		289
253	if (enc->flags & F_INDENT)	290	if (enc->flags & F_INDENT)
…		…
260		297
261	static void	298	static void
262	encode_av (enc_t enc, AV av)	299	encode_av (enc_t enc, AV av)
263	{	300	{
264	int i, len = av_len (av);	301	int i, len = av_len (av);
		302
		303	if (enc->indent >= enc->maxdepth)
		304	croak ("data structure too deep (hit recursion limit)");
265		305
266	encode_ch (enc, '['); encode_nl (enc);	306	encode_ch (enc, '['); encode_nl (enc);
267	++enc->indent;	307	++enc->indent;
268		308
269	for (i = 0; i <= len; ++i)	309	for (i = 0; i <= len; ++i)
…		…
336	static void	376	static void
337	encode_hv (enc_t enc, HV hv)	377	encode_hv (enc_t enc, HV hv)
338	{	378	{
339	int count, i;	379	int count, i;
340		380
		381	if (enc->indent >= enc->maxdepth)
		382	croak ("data structure too deep (hit recursion limit)");
		383
341	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	384	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
342		385
343	if ((count = hv_iterinit (hv)))	386	if ((count = hv_iterinit (hv)))
344	{	387	{
345	// for canonical output we have to sort by keys first	388	// for canonical output we have to sort by keys first
346	// actually, this is mostly due to the stupid so-called	389	// actually, this is mostly due to the stupid so-called
347	// security workaround added somewhere in 5.8.x.	390	// security workaround added somewhere in 5.8.x.
348	// that randomises hash orderings	391	// that randomises hash orderings
349	if (enc->flags & F_CANONICAL)	392	if (enc->flags & F_CANONICAL)
350	{	393	{
351	HE he, hes [count]; // if your compiler dies here, you need to enable C99 mode
352	int fast = 1;	394	int fast = 1;
		395	HE *he;
		396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
		397	HE *hes = _alloca (count sizeof (HE));
		398	#else
		399	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
		400	#endif
353		401
354	i = 0;	402	i = 0;
355	while ((he = hv_iternext (hv)))	403	while ((he = hv_iternext (hv)))
356	{	404	{
357	hes [i++] = he;	405	hes [i++] = he;
…		…
392		440
393	encode_nl (enc);	441	encode_nl (enc);
394	}	442	}
395	else	443	else
396	{	444	{
397	SV *sv;
398	HE *he = hv_iternext (hv);	445	HE *he = hv_iternext (hv);
399		446
400	for (;;)	447	for (;;)
401	{	448	{
402	encode_indent (enc);	449	encode_indent (enc);
…		…
411	encode_nl (enc);	458	encode_nl (enc);
412	}	459	}
413	}	460	}
414		461
415	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	462	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
		463	}
		464
		465	// encode objects, arrays and special \0=false and \1=true values.
		466	static void
		467	encode_rv (enc_t enc, SV sv)
		468	{
		469	svtype svt;
		470
		471	SvGETMAGIC (sv);
		472	svt = SvTYPE (sv);
		473
		474	if (svt == SVt_PVHV)
		475	encode_hv (enc, (HV *)sv);
		476	else if (svt == SVt_PVAV)
		477	encode_av (enc, (AV *)sv);
		478	else if (svt < SVt_PVAV)
		479	{
		480	if (SvNIOK (sv) && SvIV (sv) == 0)
		481	encode_str (enc, "false", 5, 0);
		482	else if (SvNIOK (sv) && SvIV (sv) == 1)
		483	encode_str (enc, "true", 4, 0);
		484	else
		485	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
		486	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		487	}
		488	else
		489	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
		490	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
416	}	491	}
417		492
418	static void	493	static void
419	encode_sv (enc_t enc, SV sv)	494	encode_sv (enc_t enc, SV sv)
420	{	495	{
…		…
428	encode_str (enc, str, len, SvUTF8 (sv));	503	encode_str (enc, str, len, SvUTF8 (sv));
429	encode_ch (enc, '"');	504	encode_ch (enc, '"');
430	}	505	}
431	else if (SvNOKp (sv))	506	else if (SvNOKp (sv))
432	{	507	{
		508	// trust that perl will do the right thing w.r.t. JSON syntax.
433	need (enc, NV_DIG + 32);	509	need (enc, NV_DIG + 32);
434	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	510	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
435	enc->cur += strlen (enc->cur);	511	enc->cur += strlen (enc->cur);
436	}	512	}
437	else if (SvIOKp (sv))	513	else if (SvIOKp (sv))
438	{	514	{
439	need (enc, 64);	515	// we assume we can always read an IV as a UV
		516	if (SvUV (sv) & ~(UV)0x7fff)
		517	{
		518	// large integer, use the (rather slow) snprintf way.
		519	need (enc, sizeof (UV) * 3);
440	enc->cur +=	520	enc->cur +=
441	SvIsUV(sv)	521	SvIsUV(sv)
442	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))	522	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
443	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));	523	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
		524	}
		525	else
		526	{
		527	// optimise the "small number case"
		528	// code will likely be branchless and use only a single multiplication
		529	I32 i = SvIV (sv);
		530	U32 u;
		531	char digit, nz = 0;
		532
		533	need (enc, 6);
		534
		535	*enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
		536	u = i < 0 ? -i : i;
		537
		538	// convert to 4.28 fixed-point representation
		539	u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
		540
		541	// now output digit by digit, each time masking out the integer part
		542	// and multiplying by 5 while moving the decimal point one to the right,
		543	// resulting in a net multiplication by 10.
		544	// we always write the digit to memory but conditionally increment
		545	// the pointer, to ease the usage of conditional move instructions.
		546	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;
		547	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;
		548	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;
		549	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;
		550	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
		551	}
444	}	552	}
445	else if (SvROK (sv))	553	else if (SvROK (sv))
446	{	554	encode_rv (enc, SvRV (sv));
447	SV *rv = SvRV (sv);
448
449	if (enc->indent >= enc->max_depth)
450	croak ("data structure too deep (hit recursion limit)");
451
452	switch (SvTYPE (rv))
453	{
454	case SVt_PVAV: encode_av (enc, (AV *)rv); break;
455	case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
456
457	default:
458	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
459	SvPV_nolen (sv));
460	}
461	}
462	else if (!SvOK (sv))	555	else if (!SvOK (sv))
463	encode_str (enc, "null", 4, 0);	556	encode_str (enc, "null", 4, 0);
464	else	557	else
465	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	558	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
466	SvPV_nolen (sv), SvFLAGS (sv));	559	SvPV_nolen (sv), SvFLAGS (sv));
467	}	560	}
468		561
469	static SV *	562	static SV *
470	encode_json (SV *scalar, UV flags)	563	encode_json (SV *scalar, U32 flags)
471	{	564	{
		565	enc_t enc;
		566
472	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	567	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
473	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	568	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
474		569
475	enc_t enc;
476	enc.flags = flags;	570	enc.flags = flags;
477	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	571	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
478	enc.cur = SvPVX (enc.sv);	572	enc.cur = SvPVX (enc.sv);
479	enc.end = SvEND (enc.sv);	573	enc.end = SvEND (enc.sv);
480	enc.indent = 0;	574	enc.indent = 0;
481	enc.max_depth = 0x7fffffffUL;	575	enc.maxdepth = DEC_DEPTH (flags);
482		576
483	SvPOK_only (enc.sv);	577	SvPOK_only (enc.sv);
484	encode_sv (&enc, scalar);	578	encode_sv (&enc, scalar);
485		579
		580	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
		581	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
		582
486	if (!(flags & (F_ASCII \| F_UTF8)))	583	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
487	SvUTF8_on (enc.sv);	584	SvUTF8_on (enc.sv);
488
489	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
490		585
491	if (enc.flags & F_SHRINK)	586	if (enc.flags & F_SHRINK)
492	shrink (enc.sv);	587	shrink (enc.sv);
493		588
494	return enc.sv;	589	return enc.sv;
…		…
501	typedef struct	596	typedef struct
502	{	597	{
503	char *cur; // current parser pointer	598	char *cur; // current parser pointer
504	char *end; // end of input string	599	char *end; // end of input string
505	const char *err; // parse error, if != 0	600	const char *err; // parse error, if != 0
506	UV flags; // F_*	601	U32 flags; // F_*
		602	U32 depth; // recursion depth
		603	U32 maxdepth; // recursion depth limit
507	} dec_t;	604	} dec_t;
508		605
509	static void	606	inline void
510	decode_ws (dec_t *dec)	607	decode_ws (dec_t *dec)
511	{	608	{
512	for (;;)	609	for (;;)
513	{	610	{
514	char ch = *dec->cur;	611	char ch = *dec->cur;
…		…
520	++dec->cur;	617	++dec->cur;
521	}	618	}
522	}	619	}
523		620
524	#define ERR(reason) SB dec->err = reason; goto fail; SE	621	#define ERR(reason) SB dec->err = reason; goto fail; SE
		622
525	#define EXPECT_CH(ch) SB \	623	#define EXPECT_CH(ch) SB \
526	if (*dec->cur != ch) \	624	if (*dec->cur != ch) \
527	ERR (# ch " expected"); \	625	ERR (# ch " expected"); \
528	++dec->cur; \	626	++dec->cur; \
529	SE	627	SE
530		628
		629	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
		630	#define DEC_DEC_DEPTH --dec->depth
		631
531	static SV decode_sv (dec_t dec);	632	static SV decode_sv (dec_t dec);
532		633
533	static signed char decode_hexdigit[256];	634	static signed char decode_hexdigit[256];
534		635
535	static UV	636	static UV
536	decode_4hex (dec_t *dec)	637	decode_4hex (dec_t *dec)
537	{	638	{
538	signed char d1, d2, d3, d4;	639	signed char d1, d2, d3, d4;
539	unsigned char cur = (unsigned char )dec->cur;	640	unsigned char cur = (unsigned char )dec->cur;
540		641
541	d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");	642	d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
542	d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");	643	d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
543	d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");	644	d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
544	d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");	645	d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
545		646
546	dec->cur += 4;	647	dec->cur += 4;
547		648
548	return ((UV)d1) << 12	649	return ((UV)d1) << 12
549	\| ((UV)d2) << 8	650	\| ((UV)d2) << 8
…		…
557	static SV *	658	static SV *
558	decode_str (dec_t *dec)	659	decode_str (dec_t *dec)
559	{	660	{
560	SV *sv = 0;	661	SV *sv = 0;
561	int utf8 = 0;	662	int utf8 = 0;
		663	char *dec_cur = dec->cur;
562		664
563	do	665	do
564	{	666	{
565	char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];	667	char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
566	char *cur = buf;	668	char *cur = buf;
567		669
568	do	670	do
569	{	671	{
570	unsigned char ch = (unsigned char )dec->cur++;	672	unsigned char ch = (unsigned char )dec_cur++;
571		673
572	if (ch == '"')	674	if (expect_false (ch == '"'))
573	{	675	{
574	--dec->cur;	676	--dec_cur;
575	break;	677	break;
576	}	678	}
577	else if (ch == '\\')	679	else if (expect_false (ch == '\\'))
578	{	680	{
579	switch (*dec->cur)	681	switch (*dec_cur)
580	{	682	{
581	case '\\':	683	case '\\':
582	case '/':	684	case '/':
583	case '"': cur++ = dec->cur++; break;	685	case '"': cur++ = dec_cur++; break;
584		686
585	case 'b': ++dec->cur; *cur++ = '\010'; break;	687	case 'b': ++dec_cur; *cur++ = '\010'; break;
586	case 't': ++dec->cur; *cur++ = '\011'; break;	688	case 't': ++dec_cur; *cur++ = '\011'; break;
587	case 'n': ++dec->cur; *cur++ = '\012'; break;	689	case 'n': ++dec_cur; *cur++ = '\012'; break;
588	case 'f': ++dec->cur; *cur++ = '\014'; break;	690	case 'f': ++dec_cur; *cur++ = '\014'; break;
589	case 'r': ++dec->cur; *cur++ = '\015'; break;	691	case 'r': ++dec_cur; *cur++ = '\015'; break;
590		692
591	case 'u':	693	case 'u':
592	{	694	{
593	UV lo, hi;	695	UV lo, hi;
594	++dec->cur;	696	++dec_cur;
595		697
		698	dec->cur = dec_cur;
596	hi = decode_4hex (dec);	699	hi = decode_4hex (dec);
		700	dec_cur = dec->cur;
597	if (hi == (UV)-1)	701	if (hi == (UV)-1)
598	goto fail;	702	goto fail;
599		703
600	// possibly a surrogate pair	704	// possibly a surrogate pair
601	if (hi >= 0xd800)	705	if (hi >= 0xd800)
602	if (hi < 0xdc00)	706	if (hi < 0xdc00)
603	{	707	{
604	if (dec->cur [0] != '\\' \|\| dec->cur [1] != 'u')	708	if (dec_cur [0] != '\\' \|\| dec_cur [1] != 'u')
605	ERR ("missing low surrogate character in surrogate pair");	709	ERR ("missing low surrogate character in surrogate pair");
606		710
607	dec->cur += 2;	711	dec_cur += 2;
608		712
		713	dec->cur = dec_cur;
609	lo = decode_4hex (dec);	714	lo = decode_4hex (dec);
		715	dec_cur = dec->cur;
610	if (lo == (UV)-1)	716	if (lo == (UV)-1)
611	goto fail;	717	goto fail;
612		718
613	if (lo < 0xdc00 \|\| lo >= 0xe000)	719	if (lo < 0xdc00 \|\| lo >= 0xe000)
614	ERR ("surrogate pair expected");	720	ERR ("surrogate pair expected");
…		…
628	*cur++ = hi;	734	*cur++ = hi;
629	}	735	}
630	break;	736	break;
631		737
632	default:	738	default:
633	--dec->cur;	739	--dec_cur;
634	ERR ("illegal backslash escape sequence in string");	740	ERR ("illegal backslash escape sequence in string");
635	}	741	}
636	}	742	}
637	else if (ch >= 0x20 && ch <= 0x7f)	743	else if (expect_true (ch >= 0x20 && ch <= 0x7f))
638	*cur++ = ch;	744	*cur++ = ch;
639	else if (ch >= 0x80)	745	else if (ch >= 0x80)
640	{	746	{
641	--dec->cur;
642
643	STRLEN clen;	747	STRLEN clen;
		748	UV uch;
		749
		750	--dec_cur;
		751
644	UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);	752	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
645	if (clen == (STRLEN)-1)	753	if (clen == (STRLEN)-1)
646	ERR ("malformed UTF-8 character in JSON string");	754	ERR ("malformed UTF-8 character in JSON string");
647		755
648	do	756	do
649	{
650	cur++ = dec->cur++;	757	cur++ = dec_cur++;
651	}
652	while (--clen);	758	while (--clen);
653		759
654	utf8 = 1;	760	utf8 = 1;
655	}	761	}
656	else if (!ch)
657	ERR ("unexpected end of string while parsing json string");
658	else	762	else
		763	{
		764	--dec_cur;
		765
		766	if (!ch)
		767	ERR ("unexpected end of string while parsing JSON string");
		768	else
659	ERR ("invalid character encountered");	769	ERR ("invalid character encountered while parsing JSON string");
660		770	}
661	}	771	}
662	while (cur < buf + SHORT_STRING_LEN);	772	while (cur < buf + SHORT_STRING_LEN);
663		773
		774	{
664	STRLEN len = cur - buf;	775	STRLEN len = cur - buf;
665		776
666	if (sv)	777	if (sv)
667	{	778	{
668	SvGROW (sv, SvCUR (sv) + len + 1);	779	SvGROW (sv, SvCUR (sv) + len + 1);
669	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	780	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
670	SvCUR_set (sv, SvCUR (sv) + len);	781	SvCUR_set (sv, SvCUR (sv) + len);
671	}	782	}
672	else	783	else
673	sv = newSVpvn (buf, len);	784	sv = newSVpvn (buf, len);
674	}	785	}
		786	}
675	while (*dec->cur != '"');	787	while (*dec_cur != '"');
676		788
677	++dec->cur;	789	++dec_cur;
678		790
679	if (sv)	791	if (sv)
680	{	792	{
681	SvPOK_only (sv);	793	SvPOK_only (sv);
682	*SvEND (sv) = 0;	794	*SvEND (sv) = 0;
…		…
685	SvUTF8_on (sv);	797	SvUTF8_on (sv);
686	}	798	}
687	else	799	else
688	sv = newSVpvn ("", 0);	800	sv = newSVpvn ("", 0);
689		801
		802	dec->cur = dec_cur;
690	return sv;	803	return sv;
691		804
692	fail:	805	fail:
		806	dec->cur = dec_cur;
693	return 0;	807	return 0;
694	}	808	}
695		809
696	static SV *	810	static SV *
697	decode_num (dec_t *dec)	811	decode_num (dec_t *dec)
…		…
755	is_nv = 1;	869	is_nv = 1;
756	}	870	}
757		871
758	if (!is_nv)	872	if (!is_nv)
759	{	873	{
760	UV uv;	874	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
761	int numtype = grok_number (start, dec->cur - start, &uv);	875	if (*start == '-')
762	if (numtype & IS_NUMBER_IN_UV)	876	switch (dec->cur - start)
763	if (numtype & IS_NUMBER_NEG)
764	{	877	{
765	if (uv < (UV)IV_MIN)	878	case 2: return newSViv (-( start [1] - '0' * 1));
766	return newSViv (-(IV)uv);	879	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
		880	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
		881	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
767	}	882	}
		883	else
		884	switch (dec->cur - start)
		885	{
		886	case 1: return newSViv ( start [0] - '0' * 1);
		887	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
		888	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
		889	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		890	}
		891
		892	{
		893	UV uv;
		894	int numtype = grok_number (start, dec->cur - start, &uv);
		895	if (numtype & IS_NUMBER_IN_UV)
		896	if (numtype & IS_NUMBER_NEG)
		897	{
		898	if (uv < (UV)IV_MIN)
		899	return newSViv (-(IV)uv);
		900	}
768	else	901	else
769	return newSVuv (uv);	902	return newSVuv (uv);
		903
		904	// here would likely be the place for bigint support
770	}	905	}
		906	}
771		907
		908	// if we ever support bigint or bigfloat, this is the place for bigfloat
772	return newSVnv (Atof (start));	909	return newSVnv (Atof (start));
773		910
774	fail:	911	fail:
775	return 0;	912	return 0;
776	}	913	}
…		…
778	static SV *	915	static SV *
779	decode_av (dec_t *dec)	916	decode_av (dec_t *dec)
780	{	917	{
781	AV *av = newAV ();	918	AV *av = newAV ();
782		919
		920	DEC_INC_DEPTH;
783	decode_ws (dec);	921	decode_ws (dec);
		922
784	if (*dec->cur == ']')	923	if (*dec->cur == ']')
785	++dec->cur;	924	++dec->cur;
786	else	925	else
787	for (;;)	926	for (;;)
788	{	927	{
…		…
806	ERR (", or ] expected while parsing array");	945	ERR (", or ] expected while parsing array");
807		946
808	++dec->cur;	947	++dec->cur;
809	}	948	}
810		949
		950	DEC_DEC_DEPTH;
811	return newRV_noinc ((SV *)av);	951	return newRV_noinc ((SV *)av);
812		952
813	fail:	953	fail:
814	SvREFCNT_dec (av);	954	SvREFCNT_dec (av);
		955	DEC_DEC_DEPTH;
815	return 0;	956	return 0;
816	}	957	}
817		958
818	static SV *	959	static SV *
819	decode_hv (dec_t *dec)	960	decode_hv (dec_t *dec)
820	{	961	{
821	HV *hv = newHV ();	962	HV *hv = newHV ();
822		963
		964	DEC_INC_DEPTH;
823	decode_ws (dec);	965	decode_ws (dec);
		966
824	if (*dec->cur == '}')	967	if (*dec->cur == '}')
825	++dec->cur;	968	++dec->cur;
826	else	969	else
827	for (;;)	970	for (;;)
828	{	971	{
…		…
841	{	984	{
842	SvREFCNT_dec (key);	985	SvREFCNT_dec (key);
843	goto fail;	986	goto fail;
844	}	987	}
845		988
846	//TODO: optimise
847	hv_store_ent (hv, key, value, 0);	989	hv_store_ent (hv, key, value, 0);
		990	SvREFCNT_dec (key);
848		991
849	decode_ws (dec);	992	decode_ws (dec);
850		993
851	if (*dec->cur == '}')	994	if (*dec->cur == '}')
852	{	995	{
…		…
858	ERR (", or } expected while parsing object/hash");	1001	ERR (", or } expected while parsing object/hash");
859		1002
860	++dec->cur;	1003	++dec->cur;
861	}	1004	}
862		1005
		1006	DEC_DEC_DEPTH;
863	return newRV_noinc ((SV *)hv);	1007	return newRV_noinc ((SV *)hv);
864		1008
865	fail:	1009	fail:
866	SvREFCNT_dec (hv);	1010	SvREFCNT_dec (hv);
		1011	DEC_DEC_DEPTH;
867	return 0;	1012	return 0;
868	}	1013	}
869		1014
870	static SV *	1015	static SV *
871	decode_sv (dec_t *dec)	1016	decode_sv (dec_t *dec)
872	{	1017	{
873	decode_ws (dec);	1018	decode_ws (dec);
		1019
		1020	// the beauty of JSON: you need exactly one character lookahead
		1021	// to parse anything.
874	switch (*dec->cur)	1022	switch (*dec->cur)
875	{	1023	{
876	case '"': ++dec->cur; return decode_str (dec);	1024	case '"': ++dec->cur; return decode_str (dec);
877	case '[': ++dec->cur; return decode_av (dec);	1025	case '[': ++dec->cur; return decode_av (dec);
878	case '{': ++dec->cur; return decode_hv (dec);	1026	case '{': ++dec->cur; return decode_hv (dec);
…		…
884		1032
885	case 't':	1033	case 't':
886	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1034	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
887	{	1035	{
888	dec->cur += 4;	1036	dec->cur += 4;
889	return newSViv (1);	1037	return SvREFCNT_inc (json_true);
890	}	1038	}
891	else	1039	else
892	ERR ("'true' expected");	1040	ERR ("'true' expected");
893		1041
894	break;	1042	break;
895		1043
896	case 'f':	1044	case 'f':
897	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1045	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
898	{	1046	{
899	dec->cur += 5;	1047	dec->cur += 5;
900	return newSViv (0);	1048	return SvREFCNT_inc (json_false);
901	}	1049	}
902	else	1050	else
903	ERR ("'false' expected");	1051	ERR ("'false' expected");
904		1052
905	break;	1053	break;
…		…
914	ERR ("'null' expected");	1062	ERR ("'null' expected");
915		1063
916	break;	1064	break;
917		1065
918	default:	1066	default:
919	ERR ("malformed json string, neither array, object, number, string or atom");	1067	ERR ("malformed JSON string, neither array, object, number, string or atom");
920	break;	1068	break;
921	}	1069	}
922		1070
923	fail:	1071	fail:
924	return 0;	1072	return 0;
925	}	1073	}
926		1074
927	static SV *	1075	static SV *
928	decode_json (SV *string, UV flags)	1076	decode_json (SV string, U32 flags, UV offset_return)
929	{	1077	{
		1078	dec_t dec;
		1079	UV offset;
930	SV *sv;	1080	SV *sv;
		1081
		1082	SvGETMAGIC (string);
		1083	SvUPGRADE (string, SVt_PV);
931		1084
932	if (flags & F_UTF8)	1085	if (flags & F_UTF8)
933	sv_utf8_downgrade (string, 0);	1086	sv_utf8_downgrade (string, 0);
934	else	1087	else
935	sv_utf8_upgrade (string);	1088	sv_utf8_upgrade (string);
936		1089
937	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1090	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
938		1091
939	dec_t dec;
940	dec.flags = flags;	1092	dec.flags = flags;
941	dec.cur = SvPVX (string);	1093	dec.cur = SvPVX (string);
942	dec.end = SvEND (string);	1094	dec.end = SvEND (string);
943	dec.err = 0;	1095	dec.err = 0;
		1096	dec.depth = 0;
		1097	dec.maxdepth = DEC_DEPTH (dec.flags);
944		1098
		1099	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
945	sv = decode_sv (&dec);	1100	sv = decode_sv (&dec);
946		1101
		1102	if (!(offset_return \|\| !sv))
		1103	{
		1104	// check for trailing garbage
		1105	decode_ws (&dec);
		1106
		1107	if (*dec.cur)
		1108	{
		1109	dec.err = "garbage after JSON object";
		1110	SvREFCNT_dec (sv);
		1111	sv = 0;
		1112	}
		1113	}
		1114
		1115	if (offset_return \|\| !sv)
		1116	{
		1117	offset = dec.flags & F_UTF8
		1118	? dec.cur - SvPVX (string)
		1119	: utf8_distance (dec.cur, SvPVX (string));
		1120
		1121	if (offset_return)
		1122	*offset_return = offset;
		1123	}
		1124
947	if (!sv)	1125	if (!sv)
948	{	1126	{
949	IV offset = dec.flags & F_UTF8
950	? dec.cur - SvPVX (string)
951	: utf8_distance (dec.cur, SvPVX (string));
952	SV *uni = sv_newmortal ();	1127	SV *uni = sv_newmortal ();
953		1128
954	// horrible hack to silence warning inside pv_uni_display	1129	// horrible hack to silence warning inside pv_uni_display
955	COP cop = *PL_curcop;	1130	COP cop = *PL_curcop;
956	cop.cop_warnings = pWARN_NONE;	1131	cop.cop_warnings = pWARN_NONE;
…		…
958	SAVEVPTR (PL_curcop);	1133	SAVEVPTR (PL_curcop);
959	PL_curcop = &cop;	1134	PL_curcop = &cop;
960	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1135	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
961	LEAVE;	1136	LEAVE;
962		1137
963	croak ("%s, at character offset %d (%s)",	1138	croak ("%s, at character offset %d [\"%s\"]",
964	dec.err,	1139	dec.err,
965	(int)offset,	1140	(int)offset,
966	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1141	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
967	}	1142	}
968		1143
…		…
981		1156
982	BOOT:	1157	BOOT:
983	{	1158	{
984	int i;	1159	int i;
985		1160
986	memset (decode_hexdigit, 0xff, 256);
987	for (i = 10; i--; )	1161	for (i = 0; i < 256; ++i)
988	decode_hexdigit ['0' + i] = i;	1162	decode_hexdigit [i] =
989		1163	i >= '0' && i <= '9' ? i - '0'
990	for (i = 7; i--; )	1164	: i >= 'a' && i <= 'f' ? i - 'a' + 10
991	{	1165	: i >= 'A' && i <= 'F' ? i - 'A' + 10
992	decode_hexdigit ['a' + i] = 10 + i;	1166	: -1;
993	decode_hexdigit ['A' + i] = 10 + i;
994	}
995		1167
996	json_stash = gv_stashpv ("JSON::XS", 1);	1168	json_stash = gv_stashpv ("JSON::XS", 1);
		1169
		1170	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1171	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
997	}	1172	}
998		1173
999	PROTOTYPES: DISABLE	1174	PROTOTYPES: DISABLE
1000		1175
1001	SV new (char dummy)	1176	SV new (char dummy)
…		…
1005	RETVAL	1180	RETVAL
1006		1181
1007	SV ascii (SV self, int enable = 1)	1182	SV ascii (SV self, int enable = 1)
1008	ALIAS:	1183	ALIAS:
1009	ascii = F_ASCII	1184	ascii = F_ASCII
		1185	latin1 = F_LATIN1
1010	utf8 = F_UTF8	1186	utf8 = F_UTF8
1011	indent = F_INDENT	1187	indent = F_INDENT
1012	canonical = F_CANONICAL	1188	canonical = F_CANONICAL
1013	space_before = F_SPACE_BEFORE	1189	space_before = F_SPACE_BEFORE
1014	space_after = F_SPACE_AFTER	1190	space_after = F_SPACE_AFTER
…		…
1026	RETVAL = newSVsv (self);	1202	RETVAL = newSVsv (self);
1027	}	1203	}
1028	OUTPUT:	1204	OUTPUT:
1029	RETVAL	1205	RETVAL
1030		1206
		1207	SV max_depth (SV self, UV max_depth = 0x80000000UL)
		1208	CODE:
		1209	{
		1210	UV *uv = SvJSON (self);
		1211	UV log2 = 0;
		1212
		1213	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
		1214
		1215	while ((1UL << log2) < max_depth)
		1216	++log2;
		1217
		1218	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
		1219
		1220	RETVAL = newSVsv (self);
		1221	}
		1222	OUTPUT:
		1223	RETVAL
		1224
1031	void encode (SV self, SV scalar)	1225	void encode (SV self, SV scalar)
1032	PPCODE:	1226	PPCODE:
1033	XPUSHs (encode_json (scalar, *SvJSON (self)));	1227	XPUSHs (encode_json (scalar, *SvJSON (self)));
1034		1228
1035	void decode (SV self, SV jsonstr)	1229	void decode (SV self, SV jsonstr)
1036	PPCODE:	1230	PPCODE:
1037	XPUSHs (decode_json (jsonstr, *SvJSON (self)));	1231	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
		1232
		1233	void decode_prefix (SV self, SV jsonstr)
		1234	PPCODE:
		1235	{
		1236	UV offset;
		1237	EXTEND (SP, 2);
		1238	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
		1239	PUSHs (sv_2mortal (newSVuv (offset)));
		1240	}
1038		1241
1039	PROTOTYPES: ENABLE	1242	PROTOTYPES: ENABLE
1040		1243
1041	void to_json (SV *scalar)	1244	void to_json (SV *scalar)
		1245	ALIAS:
		1246	objToJson = 0
1042	PPCODE:	1247	PPCODE:
1043	XPUSHs (encode_json (scalar, F_UTF8));	1248	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));
1044		1249
1045	void from_json (SV *jsonstr)	1250	void from_json (SV *jsonstr)
		1251	ALIAS:
		1252	jsonToObj = 0
1046	PPCODE:	1253	PPCODE:
1047	XPUSHs (decode_json (jsonstr, F_UTF8));	1254	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));
1048		1255

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.14 by root, Sat Mar 24 22:55:43 2007 UTC vs. Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.14 by root, Sat Mar 24 22:55:43 2007 UTC vs.
Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC