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

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

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.12 by root, Sat Mar 24 22:10:08 2007 UTC vs. Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.12 by root, Sat Mar 24 22:10:08 2007 UTC vs.
Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC