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

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

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.19 by root, Sun Mar 25 21:52:47 2007 UTC vs. Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.19 by root, Sun Mar 25 21:52:47 2007 UTC vs.
Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC