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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.5 by root, Thu Mar 22 23:24:18 2007 UTC vs.
Revision 1.23 by root, Tue Apr 3 23:34:17 2007 UTC

…		…
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		8
9	#define F_ASCII 0x00000001	9	#define F_ASCII 0x00000001UL
10	#define F_UTF8 0x00000002	10	#define F_UTF8 0x00000002UL
11	#define F_INDENT 0x00000004	11	#define F_INDENT 0x00000004UL
12	#define F_CANONICAL 0x00000008	12	#define F_CANONICAL 0x00000008UL
13	#define F_SPACE_BEFORE 0x00000010	13	#define F_SPACE_BEFORE 0x00000010UL
14	#define F_SPACE_AFTER 0x00000020	14	#define F_SPACE_AFTER 0x00000020UL
15	#define F_JSON_RPC 0x00000040
16	#define F_ALLOW_NONREF 0x00000080	15	#define F_ALLOW_NONREF 0x00000080UL
		16	#define F_SHRINK 0x00000100UL
		17	#define F_MAXDEPTH 0xf8000000UL
		18	#define S_MAXDEPTH 27
		19
		20	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
		21
		22	// F_SELFCONVERT? <=> to_json/toJson
		23	// F_BLESSED? <=> { $__class__$ => }
17		24
18	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	25	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
19	#define F_DEFAULT 0	26	#define F_DEFAULT (12UL << S_MAXDEPTH)
20		27
21	#define INIT_SIZE 32 // initial scalar size to be allocated	28	#define INIT_SIZE 32 // initial scalar size to be allocated
		29	#define INDENT_STEP 3 // spaces per indentation level
		30
		31	#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
		32	#define SHORT_STRING_LEN 512 // special-case strings of up to this size
22		33
23	#define SB do {	34	#define SB do {
24	#define SE } while (0)	35	#define SE } while (0)
25		36
26	static HV *json_stash;	37	static HV *json_stash; // JSON::XS::
		38
		39	/////////////////////////////////////////////////////////////////////////////
		40	// utility functions
		41
		42	static UV *
		43	SvJSON (SV *sv)
		44	{
		45	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
		46	croak ("object is not of type JSON::XS");
		47
		48	return &SvUVX (SvRV (sv));
		49	}
		50
		51	static void
		52	shrink (SV *sv)
		53	{
		54	sv_utf8_downgrade (sv, 1);
		55	if (SvLEN (sv) > SvCUR (sv) + 1)
		56	{
		57	#ifdef SvPV_shrink_to_cur
		58	SvPV_shrink_to_cur (sv);
		59	#elif defined (SvPV_renew)
		60	SvPV_renew (sv, SvCUR (sv) + 1);
		61	#endif
		62	}
		63	}
		64
		65	// decode an utf-8 character and return it, or (UV)-1 in
		66	// case of an error.
		67	// we special-case "safe" characters from U+80 .. U+7FF,
		68	// but use the very good perl function to parse anything else.
		69	// note that we never call this function for a ascii codepoints
		70	static UV
		71	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
		72	{
		73	if (s[0] > 0xdf \|\| s[0] < 0xc2)
		74	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
		75	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
		76	{
		77	*clen = 2;
		78	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
		79	}
		80	else
		81	{
		82	*clen = (STRLEN)-1;
		83	return (UV)-1;
		84	}
		85	}
		86
		87	/////////////////////////////////////////////////////////////////////////////
		88	// encoder
27		89
28	// structure used for encoding JSON	90	// structure used for encoding JSON
29	typedef struct	91	typedef struct
30	{	92	{
31	char *cur;	93	char *cur; // SvPVX (sv) + current output position
32	STRLEN len; // SvLEN (sv)
33	char *end; // SvEND (sv)	94	char *end; // SvEND (sv)
34	SV *sv;	95	SV *sv; // result scalar
35	UV flags;	96	U32 flags; // F_*
36	int max_recurse;	97	U32 indent; // indentation level
37	int indent;	98	U32 maxdepth; // max. indentation/recursion level
38	} enc_t;	99	} enc_t;
39
40	// structure used for decoding JSON
41	typedef struct
42	{
43	char *cur;
44	char *end;
45	const char *err;
46	UV flags;
47	} dec_t;
48
49	static UV *
50	SvJSON (SV *sv)
51	{
52	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
53	croak ("object is not of type JSON::XS");
54
55	return &SvUVX (SvRV (sv));
56	}
57
58	/////////////////////////////////////////////////////////////////////////////
59		100
60	static void	101	static void
61	need (enc_t *enc, STRLEN len)	102	need (enc_t *enc, STRLEN len)
62	{	103	{
63	if (enc->cur + len >= enc->end)	104	if (enc->cur + len >= enc->end)
…		…
85		126
86	while (str < end)	127	while (str < end)
87	{	128	{
88	unsigned char ch = (unsigned char )str;	129	unsigned char ch = (unsigned char )str;
89		130
90	if (ch == '"')	131	if (ch >= 0x20 && ch < 0x80) // most common case
91	{	132	{
		133	if (ch == '"') // but with slow exceptions
		134	{
92	need (enc, len += 1);	135	need (enc, len += 1);
93	*enc->cur++ = '\\';	136	*enc->cur++ = '\\';
94	*enc->cur++ = '"';	137	*enc->cur++ = '"';
95	++str;
96	}	138	}
97	else if (ch == '\\')	139	else if (ch == '\\')
98	{	140	{
99	need (enc, len += 1);	141	need (enc, len += 1);
100	*enc->cur++ = '\\';	142	*enc->cur++ = '\\';
101	*enc->cur++ = '\\';	143	*enc->cur++ = '\\';
102	++str;
103	}	144	}
104	else if (ch >= 0x20 && ch < 0x80) // most common case	145	else
105	{
106	*enc->cur++ = ch;	146	*enc->cur++ = ch;
107	++str;	147
108	}
109	else if (ch == '\015')
110	{
111	need (enc, len += 1);
112	*enc->cur++ = '\\';
113	*enc->cur++ = 'r';
114	++str;
115	}
116	else if (ch == '\012')
117	{
118	need (enc, len += 1);
119	*enc->cur++ = '\\';
120	*enc->cur++ = 'n';
121	++str;	148	++str;
122	}	149	}
123	else	150	else
124	{	151	{
125	STRLEN clen;	152	switch (ch)
126	UV uch;
127
128	if (is_utf8)
129	{	153	{
130	uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);	154	case '\010': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'b'; ++str; break;
131	if (clen == (STRLEN)-1)	155	case '\011': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 't'; ++str; break;
132	croak ("malformed UTF-8 character in string, cannot convert to JSON");	156	case '\012': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'n'; ++str; break;
133	}	157	case '\014': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'f'; ++str; break;
134	else	158	case '\015': need (enc, len += 1); enc->cur++ = '\\'; enc->cur++ = 'r'; ++str; break;
135	{
136	uch = ch;
137	clen = 1;
138	}
139		159
140	if (uch < 0x80 \|\| enc->flags & F_ASCII)	160	default:
141	{
142	if (uch > 0xFFFFUL)
143	{	161	{
		162	STRLEN clen;
		163	UV uch;
		164
		165	if (is_utf8)
		166	{
		167	//uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
		168	uch = decode_utf8 (str, end - str, &clen);
		169	if (clen == (STRLEN)-1)
		170	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
		171	}
		172	else
		173	{
		174	uch = ch;
		175	clen = 1;
		176	}
		177
		178	if (uch > 0x10FFFFUL)
		179	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		180
		181	if (uch < 0x80 \|\| enc->flags & F_ASCII)
		182	{
		183	if (uch > 0xFFFFUL)
		184	{
144	need (enc, len += 11);	185	need (enc, len += 11);
145	sprintf (enc->cur, "\\u%04x\\u%04x",	186	sprintf (enc->cur, "\\u%04x\\u%04x",
146	(uch - 0x10000) / 0x400 + 0xD800,	187	(int)((uch - 0x10000) / 0x400 + 0xD800),
147	(uch - 0x10000) % 0x400 + 0xDC00);	188	(int)((uch - 0x10000) % 0x400 + 0xDC00));
148	enc->cur += 12;	189	enc->cur += 12;
		190	}
		191	else
		192	{
		193	static char hexdigit [16] = "0123456789abcdef";
		194	need (enc, len += 5);
		195	*enc->cur++ = '\\';
		196	*enc->cur++ = 'u';
		197	*enc->cur++ = hexdigit [ uch >> 12 ];
		198	*enc->cur++ = hexdigit [(uch >> 8) & 15];
		199	*enc->cur++ = hexdigit [(uch >> 4) & 15];
		200	*enc->cur++ = hexdigit [(uch >> 0) & 15];
		201	}
		202
		203	str += clen;
		204	}
		205	else if (is_utf8)
		206	{
		207	need (enc, len += clen);
		208	do
		209	{
		210	enc->cur++ = str++;
		211	}
		212	while (--clen);
		213	}
		214	else
		215	{
		216	need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed
		217	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
		218	++str;
		219	}
149	}	220	}
150	else
151	{
152	static char hexdigit [16] = "0123456789abcdef";
153	need (enc, len += 5);
154	*enc->cur++ = '\\';
155	*enc->cur++ = 'u';
156	*enc->cur++ = hexdigit [ uch >> 12 ];
157	*enc->cur++ = hexdigit [(uch >> 8) & 15];
158	*enc->cur++ = hexdigit [(uch >> 4) & 15];
159	*enc->cur++ = hexdigit [(uch >> 0) & 15];
160	}
161
162	str += clen;
163	}
164	else if (is_utf8)
165	{
166	need (enc, len += clen);
167	do
168	{
169	enc->cur++ = str++;
170	}
171	while (--clen);
172	}
173	else
174	{
175	need (enc, 10); // never more than 11 bytes needed
176	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
177	++str;
178	}	221	}
179	}	222	}
180		223
181	--len;	224	--len;
182	}	225	}
183	}	226	}
184		227
185	#define INDENT SB \	228	static void
		229	encode_indent (enc_t *enc)
		230	{
186	if (enc->flags & F_INDENT) \	231	if (enc->flags & F_INDENT)
187	{ \	232	{
188	int i_; \	233	int spaces = enc->indent * INDENT_STEP;
189	need (enc, enc->indent); \
190	for (i_ = enc->indent * 3; i_--; )\
191	encode_ch (enc, ' '); \
192	} \
193	SE
194		234
195	#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE	235	need (enc, spaces);
196	#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE	236	memset (enc->cur, ' ', spaces);
197	#define COMMA SB \	237	enc->cur += spaces;
		238	}
		239	}
		240
		241	static void
		242	encode_space (enc_t *enc)
		243	{
		244	need (enc, 1);
198	encode_ch (enc, ','); \	245	encode_ch (enc, ' ');
		246	}
		247
		248	static void
		249	encode_nl (enc_t *enc)
		250	{
199	if (enc->flags & F_INDENT) \	251	if (enc->flags & F_INDENT)
200	NL; \	252	{
		253	need (enc, 1);
		254	encode_ch (enc, '\n');
		255	}
		256	}
		257
		258	static void
		259	encode_comma (enc_t *enc)
		260	{
		261	encode_ch (enc, ',');
		262
		263	if (enc->flags & F_INDENT)
		264	encode_nl (enc);
201	else if (enc->flags & F_SPACE_AFTER) \	265	else if (enc->flags & F_SPACE_AFTER)
202	SPACE; \	266	encode_space (enc);
203	SE	267	}
204		268
205	static void encode_sv (enc_t enc, SV sv);	269	static void encode_sv (enc_t enc, SV sv);
206		270
207	static void	271	static void
208	encode_av (enc_t enc, AV av)	272	encode_av (enc_t enc, AV av)
209	{	273	{
210	int i, len = av_len (av);	274	int i, len = av_len (av);
211		275
212	encode_ch (enc, '['); NL;	276	if (enc->indent >= enc->maxdepth)
		277	croak ("data structure too deep (hit recursion limit)");
		278
		279	encode_ch (enc, '['); encode_nl (enc);
213	++enc->indent;	280	++enc->indent;
214		281
215	for (i = 0; i <= len; ++i)	282	for (i = 0; i <= len; ++i)
216	{	283	{
217	INDENT;	284	encode_indent (enc);
218	encode_sv (enc, *av_fetch (av, i, 0));	285	encode_sv (enc, *av_fetch (av, i, 0));
219		286
220	if (i < len)	287	if (i < len)
221	COMMA;	288	encode_comma (enc);
222	}	289	}
223		290
224	NL;	291	encode_nl (enc);
225		292
226	--enc->indent;	293	--enc->indent;
227	INDENT; encode_ch (enc, ']');	294	encode_indent (enc); encode_ch (enc, ']');
228	}	295	}
229		296
230	static void	297	static void
231	encode_he (enc_t enc, HE he)	298	encode_he (enc_t enc, HE he)
232	{	299	{
…		…
246	else	313	else
247	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	314	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
248		315
249	encode_ch (enc, '"');	316	encode_ch (enc, '"');
250		317
251	if (enc->flags & F_SPACE_BEFORE) SPACE;	318	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);
252	encode_ch (enc, ':');	319	encode_ch (enc, ':');
253	if (enc->flags & F_SPACE_AFTER ) SPACE;	320	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);
254	encode_sv (enc, HeVAL (he));	321	encode_sv (enc, HeVAL (he));
255	}	322	}
256		323
257	// compare hash entries, used when all keys are bytestrings	324	// compare hash entries, used when all keys are bytestrings
258	static int	325	static int
…		…
264	HE b = (HE **)b_;	331	HE b = (HE **)b_;
265		332
266	STRLEN la = HeKLEN (a);	333	STRLEN la = HeKLEN (a);
267	STRLEN lb = HeKLEN (b);	334	STRLEN lb = HeKLEN (b);
268		335
269	if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	336	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))
270	cmp = la < lb ? -1 : la == lb ? 0 : 1;	337	cmp = la - lb;
271		338
272	return cmp;	339	return cmp;
273	}	340	}
274		341
275	// compare hash entries, used when some keys are sv's or utf-x	342	// compare hash entries, used when some keys are sv's or utf-x
…		…
282	static void	349	static void
283	encode_hv (enc_t enc, HV hv)	350	encode_hv (enc_t enc, HV hv)
284	{	351	{
285	int count, i;	352	int count, i;
286		353
		354	if (enc->indent >= enc->maxdepth)
		355	croak ("data structure too deep (hit recursion limit)");
		356
287	encode_ch (enc, '{'); NL; ++enc->indent;	357	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
288		358
289	if ((count = hv_iterinit (hv)))	359	if ((count = hv_iterinit (hv)))
290	{	360	{
291	// for canonical output we have to sort by keys first	361	// for canonical output we have to sort by keys first
292	// actually, this is mostly due to the stupid so-called	362	// actually, this is mostly due to the stupid so-called
293	// security workaround added somewhere in 5.8.x.	363	// security workaround added somewhere in 5.8.x.
294	// that randomises hash orderings	364	// that randomises hash orderings
295	if (enc->flags & F_CANONICAL)	365	if (enc->flags & F_CANONICAL)
296	{	366	{
297	HE he, hes [count];	367	HE he, hes [count]; // if your compiler dies here, you need to enable C99 mode
298	int fast = 1;	368	int fast = 1;
299		369
300	i = 0;	370	i = 0;
301	while ((he = hv_iternext (hv)))	371	while ((he = hv_iternext (hv)))
302	{	372	{
…		…
309		379
310	if (fast)	380	if (fast)
311	qsort (hes, count, sizeof (HE *), he_cmp_fast);	381	qsort (hes, count, sizeof (HE *), he_cmp_fast);
312	else	382	else
313	{	383	{
314	// hack to disable "use bytes"	384	// hack to forcefully disable "use bytes"
315	COP *oldcop = PL_curcop, cop;	385	COP cop = *PL_curcop;
316	cop.op_private = 0;	386	cop.op_private = 0;
		387
		388	ENTER;
		389	SAVETMPS;
		390
		391	SAVEVPTR (PL_curcop);
317	PL_curcop = &cop;	392	PL_curcop = &cop;
318		393
319	SAVETMPS;
320	qsort (hes, count, sizeof (HE *), he_cmp_slow);	394	qsort (hes, count, sizeof (HE *), he_cmp_slow);
		395
321	FREETMPS;	396	FREETMPS;
322		397	LEAVE;
323	PL_curcop = oldcop;
324	}	398	}
325		399
326	for (i = 0; i < count; ++i)	400	for (i = 0; i < count; ++i)
327	{	401	{
328	INDENT;	402	encode_indent (enc);
329	encode_he (enc, hes [i]);	403	encode_he (enc, hes [i]);
330		404
331	if (i < count - 1)	405	if (i < count - 1)
332	COMMA;	406	encode_comma (enc);
333	}	407	}
334		408
335	NL;	409	encode_nl (enc);
336	}	410	}
337	else	411	else
338	{	412	{
339	SV *sv;	413	SV *sv;
340	HE *he = hv_iternext (hv);	414	HE *he = hv_iternext (hv);
341		415
342	for (;;)	416	for (;;)
343	{	417	{
344	INDENT;	418	encode_indent (enc);
345	encode_he (enc, he);	419	encode_he (enc, he);
346		420
347	if (!(he = hv_iternext (hv)))	421	if (!(he = hv_iternext (hv)))
348	break;	422	break;
349		423
350	COMMA;	424	encode_comma (enc);
351	}	425	}
352		426
353	NL;	427	encode_nl (enc);
354	}	428	}
355	}	429	}
356		430
357	--enc->indent; INDENT; encode_ch (enc, '}');	431	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
		432	}
		433
		434	// encode objects, arrays and special \0=false and \1=true values.
		435	static void
		436	encode_rv (enc_t enc, SV sv)
		437	{
		438	SvGETMAGIC (sv);
		439
		440	svtype svt = SvTYPE (sv);
		441
		442	if (svt == SVt_PVHV)
		443	encode_hv (enc, (HV *)sv);
		444	else if (svt == SVt_PVAV)
		445	encode_av (enc, (AV *)sv);
		446	else if (svt < SVt_PVAV)
		447	{
		448	if (SvNIOK (sv) && SvIV (sv) == 0)
		449	encode_str (enc, "false", 5, 0);
		450	else if (SvNIOK (sv) && SvIV (sv) == 1)
		451	encode_str (enc, "true", 4, 0);
		452	else
		453	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
		454	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		455	}
		456	else
		457	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
		458	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
358	}	459	}
359		460
360	static void	461	static void
361	encode_sv (enc_t enc, SV sv)	462	encode_sv (enc_t enc, SV sv)
362	{	463	{
…		…
383	SvIsUV(sv)	484	SvIsUV(sv)
384	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))	485	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
385	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));	486	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
386	}	487	}
387	else if (SvROK (sv))	488	else if (SvROK (sv))
388	{	489	encode_rv (enc, SvRV (sv));
389	if (!--enc->max_recurse)
390	croak ("data structure too deep (hit recursion limit)");
391
392	sv = SvRV (sv);
393
394	switch (SvTYPE (sv))
395	{
396	case SVt_PVAV: encode_av (enc, (AV *)sv); break;
397	case SVt_PVHV: encode_hv (enc, (HV *)sv); break;
398
399	default:
400	croak ("JSON can only represent references to arrays or hashes");
401	}
402	}
403	else if (!SvOK (sv))	490	else if (!SvOK (sv))
404	encode_str (enc, "null", 4, 0);	491	encode_str (enc, "null", 4, 0);
405	else	492	else
406	croak ("encountered perl type that JSON cannot handle");	493	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
		494	SvPV_nolen (sv), SvFLAGS (sv));
407	}	495	}
408		496
409	static SV *	497	static SV *
410	encode_json (SV *scalar, UV flags)	498	encode_json (SV *scalar, U32 flags)
411	{	499	{
412	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	500	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
413	croak ("hash- or arraref required (not a simple scalar, use allow_nonref to allow this)");	501	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
414		502
415	enc_t enc;	503	enc_t enc;
416	enc.flags = flags;	504	enc.flags = flags;
417	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	505	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
418	enc.cur = SvPVX (enc.sv);	506	enc.cur = SvPVX (enc.sv);
419	enc.end = SvEND (enc.sv);	507	enc.end = SvEND (enc.sv);
420	enc.max_recurse = 0;
421	enc.indent = 0;	508	enc.indent = 0;
		509	enc.maxdepth = DEC_DEPTH (flags);
422		510
423	SvPOK_only (enc.sv);	511	SvPOK_only (enc.sv);
424	encode_sv (&enc, scalar);	512	encode_sv (&enc, scalar);
425		513
426	if (!(flags & (F_ASCII \| F_UTF8)))	514	if (!(flags & (F_ASCII \| F_UTF8)))
427	SvUTF8_on (enc.sv);	515	SvUTF8_on (enc.sv);
428		516
429	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	517	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
		518
		519	if (enc.flags & F_SHRINK)
		520	shrink (enc.sv);
		521
430	return enc.sv;	522	return enc.sv;
431	}	523	}
432		524
433	/////////////////////////////////////////////////////////////////////////////	525	/////////////////////////////////////////////////////////////////////////////
		526	// decoder
434		527
435	#define WS \	528	// structure used for decoding JSON
		529	typedef struct
		530	{
		531	char *cur; // current parser pointer
		532	char *end; // end of input string
		533	const char *err; // parse error, if != 0
		534	U32 flags; // F_*
		535	U32 depth; // recursion depth
		536	U32 maxdepth; // recursion depth limit
		537	} dec_t;
		538
		539	static void
		540	decode_ws (dec_t *dec)
		541	{
436	for (;;) \	542	for (;;)
437	{ \	543	{
438	char ch = *dec->cur; \	544	char ch = *dec->cur;
		545
439	if (ch > 0x20 \	546	if (ch > 0x20
440	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \	547	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
441	break; \	548	break;
		549
442	++dec->cur; \	550	++dec->cur;
443	}	551	}
		552	}
444		553
445	#define ERR(reason) SB dec->err = reason; goto fail; SE	554	#define ERR(reason) SB dec->err = reason; goto fail; SE
		555
446	#define EXPECT_CH(ch) SB \	556	#define EXPECT_CH(ch) SB \
447	if (*dec->cur != ch) \	557	if (*dec->cur != ch) \
448	ERR (# ch " expected"); \	558	ERR (# ch " expected"); \
449	++dec->cur; \	559	++dec->cur; \
450	SE	560	SE
451		561
		562	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
		563	#define DEC_DEC_DEPTH --dec->depth
		564
452	static SV decode_sv (dec_t dec);	565	static SV decode_sv (dec_t dec);
453		566
454	static signed char decode_hexdigit[256];	567	static signed char decode_hexdigit[256];
455		568
456	static UV	569	static UV
457	decode_4hex (dec_t *dec)	570	decode_4hex (dec_t *dec)
458	{	571	{
459	signed char d1, d2, d3, d4;	572	signed char d1, d2, d3, d4;
		573	unsigned char cur = (unsigned char )dec->cur;
460		574
461	d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]];
462	if (d1 < 0) ERR ("four hexadecimal digits expected");	575	d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");
463	d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]];
464	if (d2 < 0) ERR ("four hexadecimal digits expected");	576	d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");
465	d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
466	if (d3 < 0) ERR ("four hexadecimal digits expected");	577	d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");
467	d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
468	if (d4 < 0) ERR ("four hexadecimal digits expected");	578	d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");
469		579
470	dec->cur += 4;	580	dec->cur += 4;
471		581
472	return ((UV)d1) << 12	582	return ((UV)d1) << 12
473	\| ((UV)d2) << 8	583	\| ((UV)d2) << 8
…		…
476		586
477	fail:	587	fail:
478	return (UV)-1;	588	return (UV)-1;
479	}	589	}
480		590
481	#define APPEND_GROW(n) SB \
482	if (cur + (n) >= end) \
483	{ \
484	STRLEN ofs = cur - SvPVX (sv); \
485	SvGROW (sv, ofs + (n) + 1); \
486	cur = SvPVX (sv) + ofs; \
487	end = SvEND (sv); \
488	} \
489	SE
490
491	#define APPEND_CH(ch) SB \
492	APPEND_GROW (1); \
493	*cur++ = (ch); \
494	SE
495
496	static SV *	591	static SV *
497	decode_str (dec_t *dec)	592	decode_str (dec_t *dec)
498	{	593	{
499	SV *sv = NEWSV (0,2);	594	SV *sv = 0;
500	int utf8 = 0;	595	int utf8 = 0;
501	char *cur = SvPVX (sv);
502	char *end = SvEND (sv);
503		596
504	for (;;)	597	do
505	{	598	{
506	unsigned char ch = (unsigned char )dec->cur;	599	char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];
		600	char *cur = buf;
507		601
508	if (ch == '"')	602	do
509	break;
510	else if (ch == '\\')
511	{	603	{
512	switch (*++dec->cur)	604	unsigned char ch = (unsigned char )dec->cur++;
		605
		606	if (ch == '"')
513	{	607	{
514	case '\\':	608	--dec->cur;
515	case '/':	609	break;
516	case '"': APPEND_CH (*dec->cur++); break;	610	}
517		611	else if (ch == '\\')
518	case 'b': APPEND_CH ('\010'); ++dec->cur; break;	612	{
519	case 't': APPEND_CH ('\011'); ++dec->cur; break;	613	switch (*dec->cur)
520	case 'n': APPEND_CH ('\012'); ++dec->cur; break;
521	case 'f': APPEND_CH ('\014'); ++dec->cur; break;
522	case 'r': APPEND_CH ('\015'); ++dec->cur; break;
523
524	case 'u':
525	{	614	{
526	UV lo, hi;	615	case '\\':
527	++dec->cur;	616	case '/':
		617	case '"': cur++ = dec->cur++; break;
528		618
529	hi = decode_4hex (dec);	619	case 'b': ++dec->cur; *cur++ = '\010'; break;
530	if (hi == (UV)-1)	620	case 't': ++dec->cur; *cur++ = '\011'; break;
531	goto fail;	621	case 'n': ++dec->cur; *cur++ = '\012'; break;
		622	case 'f': ++dec->cur; *cur++ = '\014'; break;
		623	case 'r': ++dec->cur; *cur++ = '\015'; break;
532		624
533	// possibly a surrogate pair	625	case 'u':
534	if (hi >= 0xd800 && hi < 0xdc00)
535	{	626	{
536	if (dec->cur [0] != '\\' \|\| dec->cur [1] != 'u')	627	UV lo, hi;
537	ERR ("missing low surrogate character in surrogate pair");
538
539	dec->cur += 2;	628	++dec->cur;
540		629
541	lo = decode_4hex (dec);	630	hi = decode_4hex (dec);
542	if (lo == (UV)-1)	631	if (hi == (UV)-1)
543	goto fail;	632	goto fail;
544		633
		634	// possibly a surrogate pair
		635	if (hi >= 0xd800)
		636	if (hi < 0xdc00)
		637	{
		638	if (dec->cur [0] != '\\' \|\| dec->cur [1] != 'u')
		639	ERR ("missing low surrogate character in surrogate pair");
		640
		641	dec->cur += 2;
		642
		643	lo = decode_4hex (dec);
		644	if (lo == (UV)-1)
		645	goto fail;
		646
545	if (lo < 0xdc00 \|\| lo >= 0xe000)	647	if (lo < 0xdc00 \|\| lo >= 0xe000)
546	ERR ("surrogate pair expected");	648	ERR ("surrogate pair expected");
547		649
548	hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;	650	hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
		651	}
		652	else if (hi < 0xe000)
		653	ERR ("missing high surrogate character in surrogate pair");
		654
		655	if (hi >= 0x80)
		656	{
		657	utf8 = 1;
		658
		659	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
		660	}
		661	else
		662	*cur++ = hi;
549	}	663	}
550	else if (hi >= 0xdc00 && hi < 0xe000)
551	ERR ("missing high surrogate character in surrogate pair");
552
553	if (hi >= 0x80)
554	{	664	break;
555	utf8 = 1;
556		665
557	APPEND_GROW (4); // at most 4 bytes for 21 bits
558	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
559	}
560	else	666	default:
561	APPEND_CH (hi);	667	--dec->cur;
		668	ERR ("illegal backslash escape sequence in string");
562	}	669	}
563	break;	670	}
564		671	else if (ch >= 0x20 && ch <= 0x7f)
565	default:	672	*cur++ = ch;
		673	else if (ch >= 0x80)
		674	{
566	--dec->cur;	675	--dec->cur;
567	ERR ("illegal backslash escape sequence in string");	676
		677	STRLEN clen;
		678	UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
		679	if (clen == (STRLEN)-1)
		680	ERR ("malformed UTF-8 character in JSON string");
		681
		682	do
		683	cur++ = dec->cur++;
		684	while (--clen);
		685
		686	utf8 = 1;
		687	}
		688	else
		689	{
		690	--dec->cur;
		691
		692	if (!ch)
		693	ERR ("unexpected end of string while parsing json string");
		694	else
		695	ERR ("invalid character encountered while parsing json string");
568	}	696	}
569	}	697	}
570	else if (ch >= 0x20 && ch <= 0x7f)	698	while (cur < buf + SHORT_STRING_LEN);
571	APPEND_CH (*dec->cur++);	699
572	else if (ch >= 0x80)	700	STRLEN len = cur - buf;
		701
		702	if (sv)
573	{	703	{
574	STRLEN clen;	704	SvGROW (sv, SvCUR (sv) + len + 1);
575	UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);	705	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
576	if (clen == (STRLEN)-1)	706	SvCUR_set (sv, SvCUR (sv) + len);
577	ERR ("malformed UTF-8 character in string, cannot convert to JSON");
578
579	APPEND_GROW (clen);
580	do
581	{
582	cur++ = dec->cur++;
583	}
584	while (--clen);
585
586	utf8 = 1;
587	}	707	}
588	else if (dec->cur == dec->end)
589	ERR ("unexpected end of string while parsing json string");
590	else	708	else
591	ERR ("invalid character encountered");	709	sv = newSVpvn (buf, len);
592	}	710	}
		711	while (*dec->cur != '"');
593		712
594	++dec->cur;	713	++dec->cur;
595		714
596	SvCUR_set (sv, cur - SvPVX (sv));	715	if (sv)
597		716	{
598	SvPOK_only (sv);	717	SvPOK_only (sv);
599	*SvEND (sv) = 0;	718	*SvEND (sv) = 0;
600		719
601	if (utf8)	720	if (utf8)
602	SvUTF8_on (sv);	721	SvUTF8_on (sv);
		722	}
		723	else
		724	sv = newSVpvn ("", 0);
603		725
604	return sv;	726	return sv;
605		727
606	fail:	728	fail:
607	SvREFCNT_dec (sv);
608	return 0;	729	return 0;
609	}	730	}
610		731
611	static SV *	732	static SV *
612	decode_num (dec_t *dec)	733	decode_num (dec_t *dec)
…		…
693	static SV *	814	static SV *
694	decode_av (dec_t *dec)	815	decode_av (dec_t *dec)
695	{	816	{
696	AV *av = newAV ();	817	AV *av = newAV ();
697		818
698	WS;	819	DEC_INC_DEPTH;
		820	decode_ws (dec);
		821
699	if (*dec->cur == ']')	822	if (*dec->cur == ']')
700	++dec->cur;	823	++dec->cur;
701	else	824	else
702	for (;;)	825	for (;;)
703	{	826	{
…		…
707	if (!value)	830	if (!value)
708	goto fail;	831	goto fail;
709		832
710	av_push (av, value);	833	av_push (av, value);
711		834
712	WS;	835	decode_ws (dec);
713		836
714	if (*dec->cur == ']')	837	if (*dec->cur == ']')
715	{	838	{
716	++dec->cur;	839	++dec->cur;
717	break;	840	break;
…		…
721	ERR (", or ] expected while parsing array");	844	ERR (", or ] expected while parsing array");
722		845
723	++dec->cur;	846	++dec->cur;
724	}	847	}
725		848
		849	DEC_DEC_DEPTH;
726	return newRV_noinc ((SV *)av);	850	return newRV_noinc ((SV *)av);
727		851
728	fail:	852	fail:
729	SvREFCNT_dec (av);	853	SvREFCNT_dec (av);
		854	DEC_DEC_DEPTH;
730	return 0;	855	return 0;
731	}	856	}
732		857
733	static SV *	858	static SV *
734	decode_hv (dec_t *dec)	859	decode_hv (dec_t *dec)
735	{	860	{
736	HV *hv = newHV ();	861	HV *hv = newHV ();
737		862
738	WS;	863	DEC_INC_DEPTH;
		864	decode_ws (dec);
		865
739	if (*dec->cur == '}')	866	if (*dec->cur == '}')
740	++dec->cur;	867	++dec->cur;
741	else	868	else
742	for (;;)	869	for (;;)
743	{	870	{
744	SV key, value;	871	SV key, value;
745		872
746	WS; EXPECT_CH ('"');	873	decode_ws (dec); EXPECT_CH ('"');
747		874
748	key = decode_str (dec);	875	key = decode_str (dec);
749	if (!key)	876	if (!key)
750	goto fail;	877	goto fail;
751		878
752	WS; EXPECT_CH (':');	879	decode_ws (dec); EXPECT_CH (':');
753		880
754	value = decode_sv (dec);	881	value = decode_sv (dec);
755	if (!value)	882	if (!value)
756	{	883	{
757	SvREFCNT_dec (key);	884	SvREFCNT_dec (key);
758	goto fail;	885	goto fail;
759	}	886	}
760		887
761	//TODO: optimise
762	hv_store_ent (hv, key, value, 0);	888	hv_store_ent (hv, key, value, 0);
		889	SvREFCNT_dec (key);
763		890
764	WS;	891	decode_ws (dec);
765		892
766	if (*dec->cur == '}')	893	if (*dec->cur == '}')
767	{	894	{
768	++dec->cur;	895	++dec->cur;
769	break;	896	break;
…		…
773	ERR (", or } expected while parsing object/hash");	900	ERR (", or } expected while parsing object/hash");
774		901
775	++dec->cur;	902	++dec->cur;
776	}	903	}
777		904
		905	DEC_DEC_DEPTH;
778	return newRV_noinc ((SV *)hv);	906	return newRV_noinc ((SV *)hv);
779		907
780	fail:	908	fail:
781	SvREFCNT_dec (hv);	909	SvREFCNT_dec (hv);
		910	DEC_DEC_DEPTH;
782	return 0;	911	return 0;
783	}	912	}
784		913
785	static SV *	914	static SV *
786	decode_sv (dec_t *dec)	915	decode_sv (dec_t *dec)
787	{	916	{
788	WS;	917	decode_ws (dec);
789	switch (*dec->cur)	918	switch (*dec->cur)
790	{	919	{
791	case '"': ++dec->cur; return decode_str (dec);	920	case '"': ++dec->cur; return decode_str (dec);
792	case '[': ++dec->cur; return decode_av (dec);	921	case '[': ++dec->cur; return decode_av (dec);
793	case '{': ++dec->cur; return decode_hv (dec);	922	case '{': ++dec->cur; return decode_hv (dec);
…		…
829	ERR ("'null' expected");	958	ERR ("'null' expected");
830		959
831	break;	960	break;
832		961
833	default:	962	default:
834	ERR ("malformed json string");	963	ERR ("malformed json string, neither array, object, number, string or atom");
835	break;	964	break;
836	}	965	}
837		966
838	fail:	967	fail:
839	return 0;	968	return 0;
840	}	969	}
841		970
842	static SV *	971	static SV *
843	decode_json (SV *string, UV flags)	972	decode_json (SV *string, U32 flags)
844	{	973	{
845	SV *sv;	974	SV *sv;
		975
		976	SvUPGRADE (string, SVt_PV);
846		977
847	if (flags & F_UTF8)	978	if (flags & F_UTF8)
848	sv_utf8_downgrade (string, 0);	979	sv_utf8_downgrade (string, 0);
849	else	980	else
850	sv_utf8_upgrade (string);	981	sv_utf8_upgrade (string);
851		982
852	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	983	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
853		984
854	dec_t dec;	985	dec_t dec;
855	dec.flags = flags;	986	dec.flags = flags;
856	dec.cur = SvPVX (string);	987	dec.cur = SvPVX (string);
857	dec.end = SvEND (string);	988	dec.end = SvEND (string);
858	dec.err = 0;	989	dec.err = 0;
		990	dec.depth = 0;
		991	dec.maxdepth = DEC_DEPTH (dec.flags);
859		992
		993	*dec.end = 0; // this should basically be a nop, too, but make sure its there
860	sv = decode_sv (&dec);	994	sv = decode_sv (&dec);
861		995
862	if (!sv)	996	if (!sv)
863	{	997	{
		998	IV offset = dec.flags & F_UTF8
		999	? dec.cur - SvPVX (string)
864	IV offset = utf8_distance (dec.cur, SvPVX (string));	1000	: utf8_distance (dec.cur, SvPVX (string));
865	SV *uni = sv_newmortal ();	1001	SV *uni = sv_newmortal ();
		1002
866	// horrible hack to silence warning inside pv_uni_display	1003	// horrible hack to silence warning inside pv_uni_display
867	COP cop;	1004	COP cop = *PL_curcop;
868	memset (&cop, 0, sizeof (cop));
869	cop.cop_warnings = pWARN_NONE;	1005	cop.cop_warnings = pWARN_NONE;
		1006	ENTER;
870	SAVEVPTR (PL_curcop);	1007	SAVEVPTR (PL_curcop);
871	PL_curcop = &cop;	1008	PL_curcop = &cop;
872
873	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1009	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
		1010	LEAVE;
		1011
874	croak ("%s, at character offset %d (%s)",	1012	croak ("%s, at character offset %d [\"%s\"]",
875	dec.err,	1013	dec.err,
876	(int)offset,	1014	(int)offset,
877	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1015	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
878	}	1016	}
879		1017
880	sv = sv_2mortal (sv);	1018	sv = sv_2mortal (sv);
881		1019
882	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1020	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))
883	croak ("JSON object or array expected (but number, string, true, false or null found, use allow_nonref to allow this)");	1021	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
884		1022
885	return sv;	1023	return sv;
886	}	1024	}
887		1025
		1026	/////////////////////////////////////////////////////////////////////////////
		1027	// XS interface functions
		1028
888	MODULE = JSON::XS PACKAGE = JSON::XS	1029	MODULE = JSON::XS PACKAGE = JSON::XS
889		1030
890	BOOT:	1031	BOOT:
891	{	1032	{
892	int i;	1033	int i;
893		1034
894	memset (decode_hexdigit, 0xff, 256);	1035	memset (decode_hexdigit, 0xff, 256);
		1036
895	for (i = 10; i--; )	1037	for (i = 0; i < 256; ++i)
896	decode_hexdigit ['0' + i] = i;	1038	decode_hexdigit [i] =
897		1039	i >= '0' && i <= '9' ? i - '0'
898	for (i = 7; i--; )	1040	: i >= 'a' && i <= 'f' ? i - 'a' + 10
899	{	1041	: i >= 'A' && i <= 'F' ? i - 'A' + 10
900	decode_hexdigit ['a' + i] = 10 + i;	1042	: -1;
901	decode_hexdigit ['A' + i] = 10 + i;
902	}
903		1043
904	json_stash = gv_stashpv ("JSON::XS", 1);	1044	json_stash = gv_stashpv ("JSON::XS", 1);
905	}	1045	}
906		1046
907	PROTOTYPES: DISABLE	1047	PROTOTYPES: DISABLE
…		…
910	CODE:	1050	CODE:
911	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1051	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);
912	OUTPUT:	1052	OUTPUT:
913	RETVAL	1053	RETVAL
914		1054
915	SV ascii (SV self, int enable)	1055	SV ascii (SV self, int enable = 1)
916	ALIAS:	1056	ALIAS:
917	ascii = F_ASCII	1057	ascii = F_ASCII
918	utf8 = F_UTF8	1058	utf8 = F_UTF8
919	indent = F_INDENT	1059	indent = F_INDENT
920	canonical = F_CANONICAL	1060	canonical = F_CANONICAL
921	space_before = F_SPACE_BEFORE	1061	space_before = F_SPACE_BEFORE
922	space_after = F_SPACE_AFTER	1062	space_after = F_SPACE_AFTER
923	json_rpc = F_JSON_RPC
924	pretty = F_PRETTY	1063	pretty = F_PRETTY
925	allow_nonref = F_ALLOW_NONREF	1064	allow_nonref = F_ALLOW_NONREF
		1065	shrink = F_SHRINK
926	CODE:	1066	CODE:
927	{	1067	{
928	UV *uv = SvJSON (self);	1068	UV *uv = SvJSON (self);
929	if (enable)	1069	if (enable)
930	*uv \|= ix;	1070	*uv \|= ix;
…		…
934	RETVAL = newSVsv (self);	1074	RETVAL = newSVsv (self);
935	}	1075	}
936	OUTPUT:	1076	OUTPUT:
937	RETVAL	1077	RETVAL
938		1078
		1079	SV max_depth (SV self, int max_depth = 0x80000000UL)
		1080	CODE:
		1081	{
		1082	UV *uv = SvJSON (self);
		1083	UV log2 = 0;
		1084
		1085	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
		1086
		1087	while ((1UL << log2) < max_depth)
		1088	++log2;
		1089
		1090	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
		1091
		1092	RETVAL = newSVsv (self);
		1093	}
		1094	OUTPUT:
		1095	RETVAL
		1096
939	void encode (SV self, SV scalar)	1097	void encode (SV self, SV scalar)
940	PPCODE:	1098	PPCODE:
941	XPUSHs (encode_json (scalar, *SvJSON (self)));	1099	XPUSHs (encode_json (scalar, *SvJSON (self)));
942		1100
943	void decode (SV self, SV jsonstr)	1101	void decode (SV self, SV jsonstr)
…		…
945	XPUSHs (decode_json (jsonstr, *SvJSON (self)));	1103	XPUSHs (decode_json (jsonstr, *SvJSON (self)));
946		1104
947	PROTOTYPES: ENABLE	1105	PROTOTYPES: ENABLE
948		1106
949	void to_json (SV *scalar)	1107	void to_json (SV *scalar)
		1108	ALIAS:
		1109	objToJson = 0
950	PPCODE:	1110	PPCODE:
951	XPUSHs (encode_json (scalar, F_UTF8));	1111	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));
952		1112
953	void from_json (SV *jsonstr)	1113	void from_json (SV *jsonstr)
		1114	ALIAS:
		1115	jsonToObj = 0
954	PPCODE:	1116	PPCODE:
955	XPUSHs (decode_json (jsonstr, F_UTF8));	1117	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8));
956		1118

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.5 by root, Thu Mar 22 23:24:18 2007 UTC vs. Revision 1.23 by root, Tue Apr 3 23:34:17 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.5 by root, Thu Mar 22 23:24:18 2007 UTC vs.
Revision 1.23 by root, Tue Apr 3 23:34:17 2007 UTC