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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC vs.
Revision 1.71 by root, Wed Mar 19 03:17:38 2008 UTC

…		…
27	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
28	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
29	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
30	#define F_ALLOW_BLESSED 0x00000400UL	30	#define F_ALLOW_BLESSED 0x00000400UL
31	#define F_CONV_BLESSED 0x00000800UL	31	#define F_CONV_BLESSED 0x00000800UL
		32	#define F_RELAXED 0x00001000UL
		33
32	#define F_MAXDEPTH 0xf8000000UL	34	#define F_MAXDEPTH 0xf8000000UL
33	#define S_MAXDEPTH 27	35	#define S_MAXDEPTH 27
34	#define F_MAXSIZE 0x01f00000UL	36	#define F_MAXSIZE 0x01f00000UL
35	#define S_MAXSIZE 20	37	#define S_MAXSIZE 20
36	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
…		…
48		50
49	#define SB do {	51	#define SB do {
50	#define SE } while (0)	52	#define SE } while (0)
51		53
52	#if __GNUC__ >= 3	54	#if __GNUC__ >= 3
53	# define expect(expr,value) __builtin_expect ((expr),(value))	55	# define expect(expr,value) __builtin_expect ((expr), (value))
54	# define inline inline	56	# define INLINE static inline
55	#else	57	#else
56	# define expect(expr,value) (expr)	58	# define expect(expr,value) (expr)
57	# define inline static	59	# define INLINE static
58	#endif	60	#endif
59		61
60	#define expect_false(expr) expect ((expr) != 0, 0)	62	#define expect_false(expr) expect ((expr) != 0, 0)
61	#define expect_true(expr) expect ((expr) != 0, 1)	63	#define expect_true(expr) expect ((expr) != 0, 1)
		64
		65	#ifdef USE_ITHREADS
		66	# define JSON_SLOW 1
		67	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		68	#else
		69	# define JSON_SLOW 0
		70	# define JSON_STASH json_stash
		71	#endif
62		72
63	static HV json_stash, json_boolean_stash; // JSON::XS::	73	static HV json_stash, json_boolean_stash; // JSON::XS::
64	static SV json_true, json_false;	74	static SV json_true, json_false;
65		75
66	typedef struct {	76	typedef struct {
…		…
70	} JSON;	80	} JSON;
71		81
72	/////////////////////////////////////////////////////////////////////////////	82	/////////////////////////////////////////////////////////////////////////////
73	// utility functions	83	// utility functions
74		84
75	inline void	85	INLINE void
76	shrink (SV *sv)	86	shrink (SV *sv)
77	{	87	{
78	sv_utf8_downgrade (sv, 1);	88	sv_utf8_downgrade (sv, 1);
79	if (SvLEN (sv) > SvCUR (sv) + 1)	89	if (SvLEN (sv) > SvCUR (sv) + 1)
80	{	90	{
…		…
89	// decode an utf-8 character and return it, or (UV)-1 in	99	// decode an utf-8 character and return it, or (UV)-1 in
90	// case of an error.	100	// case of an error.
91	// we special-case "safe" characters from U+80 .. U+7FF,	101	// we special-case "safe" characters from U+80 .. U+7FF,
92	// but use the very good perl function to parse anything else.	102	// but use the very good perl function to parse anything else.
93	// note that we never call this function for a ascii codepoints	103	// note that we never call this function for a ascii codepoints
94	inline UV	104	INLINE UV
95	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	105	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
96	{	106	{
97	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))	107	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))
98	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	108	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
99	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	109	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
…		…
118	char *end; // SvEND (sv)	128	char *end; // SvEND (sv)
119	SV *sv; // result scalar	129	SV *sv; // result scalar
120	JSON json;	130	JSON json;
121	U32 indent; // indentation level	131	U32 indent; // indentation level
122	U32 maxdepth; // max. indentation/recursion level	132	U32 maxdepth; // max. indentation/recursion level
		133	UV limit; // escape character values >= this value when encoding
123	} enc_t;	134	} enc_t;
124		135
125	inline void	136	INLINE void
126	need (enc_t *enc, STRLEN len)	137	need (enc_t *enc, STRLEN len)
127	{	138	{
128	if (expect_false (enc->cur + len >= enc->end))	139	if (expect_false (enc->cur + len >= enc->end))
129	{	140	{
130	STRLEN cur = enc->cur - SvPVX (enc->sv);	141	STRLEN cur = enc->cur - SvPVX (enc->sv);
…		…
132	enc->cur = SvPVX (enc->sv) + cur;	143	enc->cur = SvPVX (enc->sv) + cur;
133	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	144	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
134	}	145	}
135	}	146	}
136		147
137	inline void	148	INLINE void
138	encode_ch (enc_t *enc, char ch)	149	encode_ch (enc_t *enc, char ch)
139	{	150	{
140	need (enc, 1);	151	need (enc, 1);
141	*enc->cur++ = ch;	152	*enc->cur++ = ch;
142	}	153	}
…		…
196	{	207	{
197	uch = ch;	208	uch = ch;
198	clen = 1;	209	clen = 1;
199	}	210	}
200		211
201	if (uch > 0x10FFFFUL)	212	if (uch < 0x20 \|\| uch >= enc->limit)
202	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
203
204	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
205	{	213	{
206	if (uch > 0xFFFFUL)	214	if (uch > 0xFFFFUL)
207	{	215	{
		216	if (uch > 0x10FFFFUL)
		217	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		218
208	need (enc, len += 11);	219	need (enc, len += 11);
209	sprintf (enc->cur, "\\u%04x\\u%04x",	220	sprintf (enc->cur, "\\u%04x\\u%04x",
210	(int)((uch - 0x10000) / 0x400 + 0xD800),	221	(int)((uch - 0x10000) / 0x400 + 0xD800),
211	(int)((uch - 0x10000) % 0x400 + 0xDC00));	222	(int)((uch - 0x10000) % 0x400 + 0xDC00));
212	enc->cur += 12;	223	enc->cur += 12;
…		…
251		262
252	--len;	263	--len;
253	}	264	}
254	}	265	}
255		266
256	inline void	267	INLINE void
257	encode_indent (enc_t *enc)	268	encode_indent (enc_t *enc)
258	{	269	{
259	if (enc->json.flags & F_INDENT)	270	if (enc->json.flags & F_INDENT)
260	{	271	{
261	int spaces = enc->indent * INDENT_STEP;	272	int spaces = enc->indent * INDENT_STEP;
…		…
264	memset (enc->cur, ' ', spaces);	275	memset (enc->cur, ' ', spaces);
265	enc->cur += spaces;	276	enc->cur += spaces;
266	}	277	}
267	}	278	}
268		279
269	inline void	280	INLINE void
270	encode_space (enc_t *enc)	281	encode_space (enc_t *enc)
271	{	282	{
272	need (enc, 1);	283	need (enc, 1);
273	encode_ch (enc, ' ');	284	encode_ch (enc, ' ');
274	}	285	}
275		286
276	inline void	287	INLINE void
277	encode_nl (enc_t *enc)	288	encode_nl (enc_t *enc)
278	{	289	{
279	if (enc->json.flags & F_INDENT)	290	if (enc->json.flags & F_INDENT)
280	{	291	{
281	need (enc, 1);	292	need (enc, 1);
282	encode_ch (enc, '\n');	293	encode_ch (enc, '\n');
283	}	294	}
284	}	295	}
285		296
286	inline void	297	INLINE void
287	encode_comma (enc_t *enc)	298	encode_comma (enc_t *enc)
288	{	299	{
289	encode_ch (enc, ',');	300	encode_ch (enc, ',');
290		301
291	if (enc->json.flags & F_INDENT)	302	if (enc->json.flags & F_INDENT)
…		…
302	int i, len = av_len (av);	313	int i, len = av_len (av);
303		314
304	if (enc->indent >= enc->maxdepth)	315	if (enc->indent >= enc->maxdepth)
305	croak ("data structure too deep (hit recursion limit)");	316	croak ("data structure too deep (hit recursion limit)");
306		317
307	encode_ch (enc, '['); encode_nl (enc);	318	encode_ch (enc, '[');
308	++enc->indent;	319
		320	if (len >= 0)
		321	{
		322	encode_nl (enc); ++enc->indent;
309		323
310	for (i = 0; i <= len; ++i)	324	for (i = 0; i <= len; ++i)
311	{	325	{
312	SV **svp = av_fetch (av, i, 0);	326	SV **svp = av_fetch (av, i, 0);
313		327
314	encode_indent (enc);	328	encode_indent (enc);
315		329
316	if (svp)	330	if (svp)
317	encode_sv (enc, *svp);	331	encode_sv (enc, *svp);
318	else	332	else
319	encode_str (enc, "null", 4, 0);	333	encode_str (enc, "null", 4, 0);
320		334
321	if (i < len)	335	if (i < len)
322	encode_comma (enc);	336	encode_comma (enc);
323	}	337	}
324		338
		339	encode_nl (enc); --enc->indent; encode_indent (enc);
		340	}
		341
325	encode_nl (enc);	342	encode_ch (enc, ']');
326
327	--enc->indent;
328	encode_indent (enc); encode_ch (enc, ']');
329	}	343	}
330		344
331	static void	345	static void
332	encode_he (enc_t enc, HE he)	346	encode_hk (enc_t enc, HE he)
333	{	347	{
334	encode_ch (enc, '"');	348	encode_ch (enc, '"');
335		349
336	if (HeKLEN (he) == HEf_SVKEY)	350	if (HeKLEN (he) == HEf_SVKEY)
337	{	351	{
…		…
350	encode_ch (enc, '"');	364	encode_ch (enc, '"');
351		365
352	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	366	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
353	encode_ch (enc, ':');	367	encode_ch (enc, ':');
354	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	368	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
355	encode_sv (enc, HeVAL (he));
356	}	369	}
357		370
358	// compare hash entries, used when all keys are bytestrings	371	// compare hash entries, used when all keys are bytestrings
359	static int	372	static int
360	he_cmp_fast (const void a_, const void b_)	373	he_cmp_fast (const void a_, const void b_)
…		…
365	HE b = (HE **)b_;	378	HE b = (HE **)b_;
366		379
367	STRLEN la = HeKLEN (a);	380	STRLEN la = HeKLEN (a);
368	STRLEN lb = HeKLEN (b);	381	STRLEN lb = HeKLEN (b);
369		382
370	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	383	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
371	cmp = la - lb;	384	cmp = lb - la;
372		385
373	return cmp;	386	return cmp;
374	}	387	}
375		388
376	// compare hash entries, used when some keys are sv's or utf-x	389	// compare hash entries, used when some keys are sv's or utf-x
377	static int	390	static int
378	he_cmp_slow (const void a, const void b)	391	he_cmp_slow (const void a, const void b)
379	{	392	{
380	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	393	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
381	}	394	}
382		395
383	static void	396	static void
384	encode_hv (enc_t enc, HV hv)	397	encode_hv (enc_t enc, HV hv)
385	{	398	{
		399	HE *he;
386	int count, i;	400	int count;
387		401
388	if (enc->indent >= enc->maxdepth)	402	if (enc->indent >= enc->maxdepth)
389	croak ("data structure too deep (hit recursion limit)");	403	croak ("data structure too deep (hit recursion limit)");
390		404
391	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	405	encode_ch (enc, '{');
392		406
393	if ((count = hv_iterinit (hv)))
394	{
395	// for canonical output we have to sort by keys first	407	// for canonical output we have to sort by keys first
396	// actually, this is mostly due to the stupid so-called	408	// actually, this is mostly due to the stupid so-called
397	// security workaround added somewhere in 5.8.x.	409	// security workaround added somewhere in 5.8.x.
398	// that randomises hash orderings	410	// that randomises hash orderings
399	if (enc->json.flags & F_CANONICAL)	411	if (enc->json.flags & F_CANONICAL)
		412	{
		413	int count = hv_iterinit (hv);
		414
		415	if (SvMAGICAL (hv))
400	{	416	{
		417	// need to count by iterating. could improve by dynamically building the vector below
		418	// but I don't care for the speed of this special case.
		419	// note also that we will run into undefined behaviour when the two iterations
		420	// do not result in the same count, something I might care for in some later release.
		421
		422	count = 0;
		423	while (hv_iternext (hv))
		424	++count;
		425
		426	hv_iterinit (hv);
		427	}
		428
		429	if (count)
		430	{
401	int fast = 1;	431	int i, fast = 1;
402	HE *he;
403	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	432	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
404	HE *hes = _alloca (count sizeof (HE));	433	HE *hes = _alloca (count sizeof (HE));
405	#else	434	#else
406	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	435	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
407	#endif	436	#endif
…		…
434		463
435	FREETMPS;	464	FREETMPS;
436	LEAVE;	465	LEAVE;
437	}	466	}
438		467
439	for (i = 0; i < count; ++i)	468	encode_nl (enc); ++enc->indent;
		469
		470	while (count--)
440	{	471	{
441	encode_indent (enc);	472	encode_indent (enc);
		473	he = hes [count];
442	encode_he (enc, hes [i]);	474	encode_hk (enc, he);
		475	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
443		476
444	if (i < count - 1)	477	if (count)
445	encode_comma (enc);	478	encode_comma (enc);
446	}	479	}
447		480
448	encode_nl (enc);	481	encode_nl (enc); --enc->indent; encode_indent (enc);
449	}	482	}
		483	}
450	else	484	else
		485	{
		486	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		487	if ((he = hv_iternext (hv)))
451	{	488	{
452	HE *he = hv_iternext (hv);	489	encode_nl (enc); ++enc->indent;
453		490
454	for (;;)	491	for (;;)
455	{	492	{
456	encode_indent (enc);	493	encode_indent (enc);
457	encode_he (enc, he);	494	encode_hk (enc, he);
		495	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
458		496
459	if (!(he = hv_iternext (hv)))	497	if (!(he = hv_iternext (hv)))
460	break;	498	break;
461		499
462	encode_comma (enc);	500	encode_comma (enc);
463	}	501	}
464		502
465	encode_nl (enc);	503	encode_nl (enc); --enc->indent; encode_indent (enc);
466	}	504	}
467	}	505	}
468		506
469	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	507	encode_ch (enc, '}');
470	}	508	}
471		509
472	// encode objects, arrays and special \0=false and \1=true values.	510	// encode objects, arrays and special \0=false and \1=true values.
473	static void	511	static void
474	encode_rv (enc_t enc, SV sv)	512	encode_rv (enc_t enc, SV sv)
…		…
478	SvGETMAGIC (sv);	516	SvGETMAGIC (sv);
479	svt = SvTYPE (sv);	517	svt = SvTYPE (sv);
480		518
481	if (expect_false (SvOBJECT (sv)))	519	if (expect_false (SvOBJECT (sv)))
482	{	520	{
		521	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		522	? json_boolean_stash
		523	: gv_stashpv ("JSON::XS::Boolean", 1);
		524
483	if (SvSTASH (sv) == json_boolean_stash)	525	if (SvSTASH (sv) == stash)
484	{	526	{
485	if (SvIV (sv))	527	if (SvIV (sv))
486	encode_str (enc, "true", 4, 0);	528	encode_str (enc, "true", 4, 0);
487	else	529	else
488	encode_str (enc, "false", 5, 0);	530	encode_str (enc, "false", 5, 0);
…		…
500	// we re-bless the reference to get overload and other niceties right	542	// we re-bless the reference to get overload and other niceties right
501	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);	543	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
502		544
503	if (to_json)	545	if (to_json)
504	{	546	{
505	int count;
506	dSP;	547	dSP;
507		548
508	ENTER; SAVETMPS; PUSHMARK (SP);	549	ENTER; SAVETMPS; PUSHMARK (SP);
509	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	550	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
510		551
…		…
640	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	681	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
641	enc.cur = SvPVX (enc.sv);	682	enc.cur = SvPVX (enc.sv);
642	enc.end = SvEND (enc.sv);	683	enc.end = SvEND (enc.sv);
643	enc.indent = 0;	684	enc.indent = 0;
644	enc.maxdepth = DEC_DEPTH (enc.json.flags);	685	enc.maxdepth = DEC_DEPTH (enc.json.flags);
		686	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
		687	: enc.json.flags & F_LATIN1 ? 0x000100UL
		688	: 0x10FFFFUL;
645		689
646	SvPOK_only (enc.sv);	690	SvPOK_only (enc.sv);
647	encode_sv (&enc, scalar);	691	encode_sv (&enc, scalar);
648		692
649	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	693	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
670	JSON json;	714	JSON json;
671	U32 depth; // recursion depth	715	U32 depth; // recursion depth
672	U32 maxdepth; // recursion depth limit	716	U32 maxdepth; // recursion depth limit
673	} dec_t;	717	} dec_t;
674		718
675	inline void	719	INLINE void
		720	decode_comment (dec_t *dec)
		721	{
		722	// only '#'-style comments allowed a.t.m.
		723
		724	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		725	++dec->cur;
		726	}
		727
		728	INLINE void
676	decode_ws (dec_t *dec)	729	decode_ws (dec_t *dec)
677	{	730	{
678	for (;;)	731	for (;;)
679	{	732	{
680	char ch = *dec->cur;	733	char ch = *dec->cur;
681		734
682	if (ch > 0x20	735	if (ch > 0x20)
		736	{
		737	if (expect_false (ch == '#'))
		738	{
		739	if (dec->json.flags & F_RELAXED)
		740	decode_comment (dec);
		741	else
		742	break;
		743	}
		744	else
		745	break;
		746	}
683	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	747	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
684	break;	748	break; // parse error, but let higher level handle it, gives better error messages
685		749
686	++dec->cur;	750	++dec->cur;
687	}	751	}
688	}	752	}
689		753
…		…
940		1004
941	if (!is_nv)	1005	if (!is_nv)
942	{	1006	{
943	int len = dec->cur - start;	1007	int len = dec->cur - start;
944		1008
945	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1009	// special case the rather common 1..5-digit-int case
946	if (*start == '-')	1010	if (*start == '-')
947	switch (len)	1011	switch (len)
948	{	1012	{
949	case 2: return newSViv (-( start [1] - '0' * 1));	1013	case 2: return newSViv (-( start [1] - '0' * 1));
950	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1014	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
951	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1015	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
952	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1016	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
		1017	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
953	}	1018	}
954	else	1019	else
955	switch (len)	1020	switch (len)
956	{	1021	{
957	case 1: return newSViv ( start [0] - '0' * 1);	1022	case 1: return newSViv ( start [0] - '0' * 1);
958	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1023	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
959	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1024	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
960	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1025	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		1026	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
961	}	1027	}
962		1028
963	{	1029	{
964	UV uv;	1030	UV uv;
965	int numtype = grok_number (start, len, &uv);	1031	int numtype = grok_number (start, len, &uv);
…		…
1026		1092
1027	if (*dec->cur != ',')	1093	if (*dec->cur != ',')
1028	ERR (", or ] expected while parsing array");	1094	ERR (", or ] expected while parsing array");
1029		1095
1030	++dec->cur;	1096	++dec->cur;
		1097
		1098	decode_ws (dec);
		1099
		1100	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1101	{
		1102	++dec->cur;
		1103	break;
		1104	}
1031	}	1105	}
1032		1106
1033	DEC_DEC_DEPTH;	1107	DEC_DEC_DEPTH;
1034	return newRV_noinc ((SV *)av);	1108	return newRV_noinc ((SV *)av);
1035		1109
…		…
1051	if (*dec->cur == '}')	1125	if (*dec->cur == '}')
1052	++dec->cur;	1126	++dec->cur;
1053	else	1127	else
1054	for (;;)	1128	for (;;)
1055	{	1129	{
1056	decode_ws (dec); EXPECT_CH ('"');	1130	EXPECT_CH ('"');
1057		1131
1058	// heuristic: assume that	1132	// heuristic: assume that
1059	// a) decode_str + hv_store_ent are abysmally slow.	1133	// a) decode_str + hv_store_ent are abysmally slow.
1060	// b) most hash keys are short, simple ascii text.	1134	// b) most hash keys are short, simple ascii text.
1061	// => try to "fast-match" such strings to avoid	1135	// => try to "fast-match" such strings to avoid
…		…
1075	if (!key)	1149	if (!key)
1076	goto fail;	1150	goto fail;
1077		1151
1078	decode_ws (dec); EXPECT_CH (':');	1152	decode_ws (dec); EXPECT_CH (':');
1079		1153
		1154	decode_ws (dec);
1080	value = decode_sv (dec);	1155	value = decode_sv (dec);
1081	if (!value)	1156	if (!value)
1082	{	1157	{
1083	SvREFCNT_dec (key);	1158	SvREFCNT_dec (key);
1084	goto fail;	1159	goto fail;
…		…
1096	int len = p - key;	1171	int len = p - key;
1097	dec->cur = p + 1;	1172	dec->cur = p + 1;
1098		1173
1099	decode_ws (dec); EXPECT_CH (':');	1174	decode_ws (dec); EXPECT_CH (':');
1100		1175
		1176	decode_ws (dec);
1101	value = decode_sv (dec);	1177	value = decode_sv (dec);
1102	if (!value)	1178	if (!value)
1103	goto fail;	1179	goto fail;
1104		1180
1105	hv_store (hv, key, len, value, 0);	1181	hv_store (hv, key, len, value, 0);
…		…
1121		1197
1122	if (*dec->cur != ',')	1198	if (*dec->cur != ',')
1123	ERR (", or } expected while parsing object/hash");	1199	ERR (", or } expected while parsing object/hash");
1124		1200
1125	++dec->cur;	1201	++dec->cur;
		1202
		1203	decode_ws (dec);
		1204
		1205	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1206	{
		1207	++dec->cur;
		1208	break;
		1209	}
1126	}	1210	}
1127		1211
1128	DEC_DEC_DEPTH;	1212	DEC_DEC_DEPTH;
1129	sv = newRV_noinc ((SV *)hv);	1213	sv = newRV_noinc ((SV *)hv);
1130		1214
…		…
1195	}	1279	}
1196		1280
1197	static SV *	1281	static SV *
1198	decode_sv (dec_t *dec)	1282	decode_sv (dec_t *dec)
1199	{	1283	{
1200	decode_ws (dec);
1201
1202	// the beauty of JSON: you need exactly one character lookahead	1284	// the beauty of JSON: you need exactly one character lookahead
1203	// to parse anything.	1285	// to parse anything.
1204	switch (*dec->cur)	1286	switch (*dec->cur)
1205	{	1287	{
1206	case '"': ++dec->cur; return decode_str (dec);	1288	case '"': ++dec->cur; return decode_str (dec);
…		…
1214		1296
1215	case 't':	1297	case 't':
1216	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1298	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1217	{	1299	{
1218	dec->cur += 4;	1300	dec->cur += 4;
		1301	#if JSON_SLOW
		1302	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1303	#endif
1219	return SvREFCNT_inc (json_true);	1304	return SvREFCNT_inc (json_true);
1220	}	1305	}
1221	else	1306	else
1222	ERR ("'true' expected");	1307	ERR ("'true' expected");
1223		1308
…		…
1225		1310
1226	case 'f':	1311	case 'f':
1227	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1312	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1228	{	1313	{
1229	dec->cur += 5;	1314	dec->cur += 5;
		1315	#if JSON_SLOW
		1316	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1317	#endif
1230	return SvREFCNT_inc (json_false);	1318	return SvREFCNT_inc (json_false);
1231	}	1319	}
1232	else	1320	else
1233	ERR ("'false' expected");	1321	ERR ("'false' expected");
1234		1322
…		…
1284		1372
1285	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1373	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1286	dec.json.flags \|= F_HOOK;	1374	dec.json.flags \|= F_HOOK;
1287		1375
1288	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1376	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1377
		1378	decode_ws (&dec);
1289	sv = decode_sv (&dec);	1379	sv = decode_sv (&dec);
1290		1380
1291	if (!(offset_return \|\| !sv))	1381	if (!(offset_return \|\| !sv))
1292	{	1382	{
1293	// check for trailing garbage	1383	// check for trailing garbage
…		…
1361	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1451	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1362	}	1452	}
1363		1453
1364	PROTOTYPES: DISABLE	1454	PROTOTYPES: DISABLE
1365		1455
		1456	void CLONE (...)
		1457	CODE:
		1458	json_stash = 0;
		1459	json_boolean_stash = 0;
		1460
1366	void new (char *klass)	1461	void new (char *klass)
1367	PPCODE:	1462	PPCODE:
1368	{	1463	{
1369	SV *pv = NEWSV (0, sizeof (JSON));	1464	SV *pv = NEWSV (0, sizeof (JSON));
1370	SvPOK_only (pv);	1465	SvPOK_only (pv);
1371	Zero (SvPVX (pv), 1, JSON);	1466	Zero (SvPVX (pv), 1, JSON);
1372	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1467	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1373	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1468	XPUSHs (sv_2mortal (sv_bless (
		1469	newRV_noinc (pv),
		1470	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		1471	)));
1374	}	1472	}
1375		1473
1376	void ascii (JSON *self, int enable = 1)	1474	void ascii (JSON *self, int enable = 1)
1377	ALIAS:	1475	ALIAS:
1378	ascii = F_ASCII	1476	ascii = F_ASCII
…		…
1385	pretty = F_PRETTY	1483	pretty = F_PRETTY
1386	allow_nonref = F_ALLOW_NONREF	1484	allow_nonref = F_ALLOW_NONREF
1387	shrink = F_SHRINK	1485	shrink = F_SHRINK
1388	allow_blessed = F_ALLOW_BLESSED	1486	allow_blessed = F_ALLOW_BLESSED
1389	convert_blessed = F_CONV_BLESSED	1487	convert_blessed = F_CONV_BLESSED
		1488	relaxed = F_RELAXED
1390	PPCODE:	1489	PPCODE:
1391	{	1490	{
1392	if (enable)	1491	if (enable)
1393	self->flags \|= ix;	1492	self->flags \|= ix;
1394	else	1493	else
1395	self->flags &= ~ix;	1494	self->flags &= ~ix;
1396		1495
1397	XPUSHs (ST (0));	1496	XPUSHs (ST (0));
1398	}	1497	}
1399		1498
		1499	void get_ascii (JSON *self)
		1500	ALIAS:
		1501	get_ascii = F_ASCII
		1502	get_latin1 = F_LATIN1
		1503	get_utf8 = F_UTF8
		1504	get_indent = F_INDENT
		1505	get_canonical = F_CANONICAL
		1506	get_space_before = F_SPACE_BEFORE
		1507	get_space_after = F_SPACE_AFTER
		1508	get_allow_nonref = F_ALLOW_NONREF
		1509	get_shrink = F_SHRINK
		1510	get_allow_blessed = F_ALLOW_BLESSED
		1511	get_convert_blessed = F_CONV_BLESSED
		1512	get_relaxed = F_RELAXED
		1513	PPCODE:
		1514	XPUSHs (boolSV (self->flags & ix));
		1515
1400	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1516	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1401	PPCODE:	1517	PPCODE:
1402	{	1518	{
1403	UV log2 = 0;	1519	UV log2 = 0;
1404		1520
…		…
1410	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1526	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1411		1527
1412	XPUSHs (ST (0));	1528	XPUSHs (ST (0));
1413	}	1529	}
1414		1530
		1531	U32 get_max_depth (JSON *self)
		1532	CODE:
		1533	RETVAL = DEC_DEPTH (self->flags);
		1534	OUTPUT:
		1535	RETVAL
		1536
1415	void max_size (JSON *self, UV max_size = 0)	1537	void max_size (JSON *self, UV max_size = 0)
1416	PPCODE:	1538	PPCODE:
1417	{	1539	{
1418	UV log2 = 0;	1540	UV log2 = 0;
1419		1541
…		…
1425		1547
1426	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1548	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1427		1549
1428	XPUSHs (ST (0));	1550	XPUSHs (ST (0));
1429	}	1551	}
		1552
		1553	int get_max_size (JSON *self)
		1554	CODE:
		1555	RETVAL = DEC_SIZE (self->flags);
		1556	OUTPUT:
		1557	RETVAL
1430		1558
1431	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1559	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1432	PPCODE:	1560	PPCODE:
1433	{	1561	{
1434	SvREFCNT_dec (self->cb_object);	1562	SvREFCNT_dec (self->cb_object);
…		…
1481	SvREFCNT_dec (self->cb_sk_object);	1609	SvREFCNT_dec (self->cb_sk_object);
1482	SvREFCNT_dec (self->cb_object);	1610	SvREFCNT_dec (self->cb_object);
1483		1611
1484	PROTOTYPES: ENABLE	1612	PROTOTYPES: ENABLE
1485		1613
1486	void to_json (SV *scalar)	1614	void encode_json (SV *scalar)
1487	PPCODE:	1615	PPCODE:
1488	{	1616	{
1489	JSON json = { F_DEFAULT \| F_UTF8 };	1617	JSON json = { F_DEFAULT \| F_UTF8 };
1490	XPUSHs (encode_json (scalar, &json));	1618	XPUSHs (encode_json (scalar, &json));
1491	}	1619	}
1492		1620
1493	void from_json (SV *jsonstr)	1621	void decode_json (SV *jsonstr)
1494	PPCODE:	1622	PPCODE:
1495	{	1623	{
1496	JSON json = { F_DEFAULT \| F_UTF8 };	1624	JSON json = { F_DEFAULT \| F_UTF8 };
1497	XPUSHs (decode_json (jsonstr, &json, 0));	1625	XPUSHs (decode_json (jsonstr, &json, 0));
1498	}	1626	}

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC vs. Revision 1.71 by root, Wed Mar 19 03:17:38 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC vs.
Revision 1.71 by root, Wed Mar 19 03:17:38 2008 UTC