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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC vs.
Revision 1.72 by root, Wed Mar 19 04:08:22 2008 UTC

…		…
1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
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	#include <stdio.h>
		9	#include <float.h>
9		10
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	12	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	13	#endif
13		14
26	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
27	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
28	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
29	#define F_ALLOW_BLESSED 0x00000400UL	30	#define F_ALLOW_BLESSED 0x00000400UL
30	#define F_CONV_BLESSED 0x00000800UL	31	#define F_CONV_BLESSED 0x00000800UL
		32	#define F_RELAXED 0x00001000UL
		33
31	#define F_MAXDEPTH 0xf8000000UL	34	#define F_MAXDEPTH 0xf8000000UL
32	#define S_MAXDEPTH 27	35	#define S_MAXDEPTH 27
33	#define F_MAXSIZE 0x01f00000UL	36	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	37	#define S_MAXSIZE 20
35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
…		…
47		50
48	#define SB do {	51	#define SB do {
49	#define SE } while (0)	52	#define SE } while (0)
50		53
51	#if __GNUC__ >= 3	54	#if __GNUC__ >= 3
52	# define expect(expr,value) __builtin_expect ((expr),(value))	55	# define expect(expr,value) __builtin_expect ((expr), (value))
53	# define inline inline	56	# define INLINE static inline
54	#else	57	#else
55	# define expect(expr,value) (expr)	58	# define expect(expr,value) (expr)
56	# define inline static	59	# define INLINE static
57	#endif	60	#endif
58		61
59	#define expect_false(expr) expect ((expr) != 0, 0)	62	#define expect_false(expr) expect ((expr) != 0, 0)
60	#define expect_true(expr) expect ((expr) != 0, 1)	63	#define expect_true(expr) expect ((expr) != 0, 1)
		64
		65	#define IN_RANGE_INC(type,val,beg,end) \
		66	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
		67	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
		68
		69	#ifdef USE_ITHREADS
		70	# define JSON_SLOW 1
		71	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		72	#else
		73	# define JSON_SLOW 0
		74	# define JSON_STASH json_stash
		75	#endif
61		76
62	static HV json_stash, json_boolean_stash; // JSON::XS::	77	static HV json_stash, json_boolean_stash; // JSON::XS::
63	static SV json_true, json_false;	78	static SV json_true, json_false;
64		79
65	typedef struct {	80	typedef struct {
…		…
69	} JSON;	84	} JSON;
70		85
71	/////////////////////////////////////////////////////////////////////////////	86	/////////////////////////////////////////////////////////////////////////////
72	// utility functions	87	// utility functions
73		88
74	inline void	89	INLINE void
75	shrink (SV *sv)	90	shrink (SV *sv)
76	{	91	{
77	sv_utf8_downgrade (sv, 1);	92	sv_utf8_downgrade (sv, 1);
78	if (SvLEN (sv) > SvCUR (sv) + 1)	93	if (SvLEN (sv) > SvCUR (sv) + 1)
79	{	94	{
…		…
88	// decode an utf-8 character and return it, or (UV)-1 in	103	// decode an utf-8 character and return it, or (UV)-1 in
89	// case of an error.	104	// case of an error.
90	// we special-case "safe" characters from U+80 .. U+7FF,	105	// we special-case "safe" characters from U+80 .. U+7FF,
91	// but use the very good perl function to parse anything else.	106	// but use the very good perl function to parse anything else.
92	// note that we never call this function for a ascii codepoints	107	// note that we never call this function for a ascii codepoints
93	inline UV	108	INLINE UV
94	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	109	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
95	{	110	{
96	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))	111	if (expect_true (len >= 2
97	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	112	&& IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
98	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	113	&& IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
99	{	114	{
100	*clen = 2;	115	*clen = 2;
101	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	116	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
102	}	117	}
103	else	118	else
104	{	119	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
105	*clen = (STRLEN)-1;	120	}
106	return (UV)-1;	121
		122	// likewise for encoding, also never called for ascii codepoints
		123	// this function takes advantage of this fact, although current gccs
		124	// seem to optimise the check for >= 0x80 away anyways
		125	INLINE unsigned char *
		126	encode_utf8 (unsigned char *s, UV ch)
		127	{
		128	if (ch <= 0x7FF)
107	}	129	{
		130	*s++ = (ch >> 6) \| 0xc0;
		131	*s++ = (ch & 0x3f) \| 0x80;
		132	}
		133	else
		134	s = uvuni_to_utf8_flags (s, ch, 0);
		135
		136	return s;
108	}	137	}
109		138
110	/////////////////////////////////////////////////////////////////////////////	139	/////////////////////////////////////////////////////////////////////////////
111	// encoder	140	// encoder
112		141
…		…
117	char *end; // SvEND (sv)	146	char *end; // SvEND (sv)
118	SV *sv; // result scalar	147	SV *sv; // result scalar
119	JSON json;	148	JSON json;
120	U32 indent; // indentation level	149	U32 indent; // indentation level
121	U32 maxdepth; // max. indentation/recursion level	150	U32 maxdepth; // max. indentation/recursion level
		151	UV limit; // escape character values >= this value when encoding
122	} enc_t;	152	} enc_t;
123		153
124	inline void	154	INLINE void
125	need (enc_t *enc, STRLEN len)	155	need (enc_t *enc, STRLEN len)
126	{	156	{
127	if (expect_false (enc->cur + len >= enc->end))	157	if (expect_false (enc->cur + len >= enc->end))
128	{	158	{
129	STRLEN cur = enc->cur - SvPVX (enc->sv);	159	STRLEN cur = enc->cur - SvPVX (enc->sv);
…		…
131	enc->cur = SvPVX (enc->sv) + cur;	161	enc->cur = SvPVX (enc->sv) + cur;
132	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	162	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
133	}	163	}
134	}	164	}
135		165
136	inline void	166	INLINE void
137	encode_ch (enc_t *enc, char ch)	167	encode_ch (enc_t *enc, char ch)
138	{	168	{
139	need (enc, 1);	169	need (enc, 1);
140	*enc->cur++ = ch;	170	*enc->cur++ = ch;
141	}	171	}
…		…
195	{	225	{
196	uch = ch;	226	uch = ch;
197	clen = 1;	227	clen = 1;
198	}	228	}
199		229
200	if (uch > 0x10FFFFUL)	230	if (uch < 0x80/0x20/ \|\| uch >= enc->limit)
201	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
202
203	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
204	{	231	{
205	if (uch > 0xFFFFUL)	232	if (uch > 0xFFFFUL)
206	{	233	{
		234	if (uch > 0x10FFFFUL)
		235	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		236
207	need (enc, len += 11);	237	need (enc, len += 11);
208	sprintf (enc->cur, "\\u%04x\\u%04x",	238	sprintf (enc->cur, "\\u%04x\\u%04x",
209	(int)((uch - 0x10000) / 0x400 + 0xD800),	239	(int)((uch - 0x10000) / 0x400 + 0xD800),
210	(int)((uch - 0x10000) % 0x400 + 0xDC00));	240	(int)((uch - 0x10000) % 0x400 + 0xDC00));
211	enc->cur += 12;	241	enc->cur += 12;
…		…
239	while (--clen);	269	while (--clen);
240	}	270	}
241	else	271	else
242	{	272	{
243	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed	273	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
244	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);	274	enc->cur = encode_utf8 (enc->cur, uch);
245	++str;	275	++str;
246	}	276	}
247	}	277	}
248	}	278	}
249	}	279	}
250		280
251	--len;	281	--len;
252	}	282	}
253	}	283	}
254		284
255	inline void	285	INLINE void
256	encode_indent (enc_t *enc)	286	encode_indent (enc_t *enc)
257	{	287	{
258	if (enc->json.flags & F_INDENT)	288	if (enc->json.flags & F_INDENT)
259	{	289	{
260	int spaces = enc->indent * INDENT_STEP;	290	int spaces = enc->indent * INDENT_STEP;
…		…
263	memset (enc->cur, ' ', spaces);	293	memset (enc->cur, ' ', spaces);
264	enc->cur += spaces;	294	enc->cur += spaces;
265	}	295	}
266	}	296	}
267		297
268	inline void	298	INLINE void
269	encode_space (enc_t *enc)	299	encode_space (enc_t *enc)
270	{	300	{
271	need (enc, 1);	301	need (enc, 1);
272	encode_ch (enc, ' ');	302	encode_ch (enc, ' ');
273	}	303	}
274		304
275	inline void	305	INLINE void
276	encode_nl (enc_t *enc)	306	encode_nl (enc_t *enc)
277	{	307	{
278	if (enc->json.flags & F_INDENT)	308	if (enc->json.flags & F_INDENT)
279	{	309	{
280	need (enc, 1);	310	need (enc, 1);
281	encode_ch (enc, '\n');	311	encode_ch (enc, '\n');
282	}	312	}
283	}	313	}
284		314
285	inline void	315	INLINE void
286	encode_comma (enc_t *enc)	316	encode_comma (enc_t *enc)
287	{	317	{
288	encode_ch (enc, ',');	318	encode_ch (enc, ',');
289		319
290	if (enc->json.flags & F_INDENT)	320	if (enc->json.flags & F_INDENT)
…		…
301	int i, len = av_len (av);	331	int i, len = av_len (av);
302		332
303	if (enc->indent >= enc->maxdepth)	333	if (enc->indent >= enc->maxdepth)
304	croak ("data structure too deep (hit recursion limit)");	334	croak ("data structure too deep (hit recursion limit)");
305		335
306	encode_ch (enc, '['); encode_nl (enc);	336	encode_ch (enc, '[');
307	++enc->indent;	337
		338	if (len >= 0)
		339	{
		340	encode_nl (enc); ++enc->indent;
308		341
309	for (i = 0; i <= len; ++i)	342	for (i = 0; i <= len; ++i)
310	{	343	{
311	SV **svp = av_fetch (av, i, 0);	344	SV **svp = av_fetch (av, i, 0);
312		345
313	encode_indent (enc);	346	encode_indent (enc);
314		347
315	if (svp)	348	if (svp)
316	encode_sv (enc, *svp);	349	encode_sv (enc, *svp);
317	else	350	else
318	encode_str (enc, "null", 4, 0);	351	encode_str (enc, "null", 4, 0);
319		352
320	if (i < len)	353	if (i < len)
321	encode_comma (enc);	354	encode_comma (enc);
322	}	355	}
323		356
		357	encode_nl (enc); --enc->indent; encode_indent (enc);
		358	}
		359
324	encode_nl (enc);	360	encode_ch (enc, ']');
325
326	--enc->indent;
327	encode_indent (enc); encode_ch (enc, ']');
328	}	361	}
329		362
330	static void	363	static void
331	encode_he (enc_t enc, HE he)	364	encode_hk (enc_t enc, HE he)
332	{	365	{
333	encode_ch (enc, '"');	366	encode_ch (enc, '"');
334		367
335	if (HeKLEN (he) == HEf_SVKEY)	368	if (HeKLEN (he) == HEf_SVKEY)
336	{	369	{
…		…
349	encode_ch (enc, '"');	382	encode_ch (enc, '"');
350		383
351	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	384	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
352	encode_ch (enc, ':');	385	encode_ch (enc, ':');
353	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	386	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
354	encode_sv (enc, HeVAL (he));
355	}	387	}
356		388
357	// compare hash entries, used when all keys are bytestrings	389	// compare hash entries, used when all keys are bytestrings
358	static int	390	static int
359	he_cmp_fast (const void a_, const void b_)	391	he_cmp_fast (const void a_, const void b_)
…		…
364	HE b = (HE **)b_;	396	HE b = (HE **)b_;
365		397
366	STRLEN la = HeKLEN (a);	398	STRLEN la = HeKLEN (a);
367	STRLEN lb = HeKLEN (b);	399	STRLEN lb = HeKLEN (b);
368		400
369	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	401	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
370	cmp = la - lb;	402	cmp = lb - la;
371		403
372	return cmp;	404	return cmp;
373	}	405	}
374		406
375	// compare hash entries, used when some keys are sv's or utf-x	407	// compare hash entries, used when some keys are sv's or utf-x
376	static int	408	static int
377	he_cmp_slow (const void a, const void b)	409	he_cmp_slow (const void a, const void b)
378	{	410	{
379	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	411	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
380	}	412	}
381		413
382	static void	414	static void
383	encode_hv (enc_t enc, HV hv)	415	encode_hv (enc_t enc, HV hv)
384	{	416	{
		417	HE *he;
385	int count, i;	418	int count;
386		419
387	if (enc->indent >= enc->maxdepth)	420	if (enc->indent >= enc->maxdepth)
388	croak ("data structure too deep (hit recursion limit)");	421	croak ("data structure too deep (hit recursion limit)");
389		422
390	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	423	encode_ch (enc, '{');
391		424
392	if ((count = hv_iterinit (hv)))
393	{
394	// for canonical output we have to sort by keys first	425	// for canonical output we have to sort by keys first
395	// actually, this is mostly due to the stupid so-called	426	// actually, this is mostly due to the stupid so-called
396	// security workaround added somewhere in 5.8.x.	427	// security workaround added somewhere in 5.8.x.
397	// that randomises hash orderings	428	// that randomises hash orderings
398	if (enc->json.flags & F_CANONICAL)	429	if (enc->json.flags & F_CANONICAL)
		430	{
		431	int count = hv_iterinit (hv);
		432
		433	if (SvMAGICAL (hv))
399	{	434	{
		435	// need to count by iterating. could improve by dynamically building the vector below
		436	// but I don't care for the speed of this special case.
		437	// note also that we will run into undefined behaviour when the two iterations
		438	// do not result in the same count, something I might care for in some later release.
		439
		440	count = 0;
		441	while (hv_iternext (hv))
		442	++count;
		443
		444	hv_iterinit (hv);
		445	}
		446
		447	if (count)
		448	{
400	int fast = 1;	449	int i, fast = 1;
401	HE *he;
402	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	450	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
403	HE *hes = _alloca (count sizeof (HE));	451	HE *hes = _alloca (count sizeof (HE));
404	#else	452	#else
405	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	453	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
406	#endif	454	#endif
…		…
433		481
434	FREETMPS;	482	FREETMPS;
435	LEAVE;	483	LEAVE;
436	}	484	}
437		485
438	for (i = 0; i < count; ++i)	486	encode_nl (enc); ++enc->indent;
		487
		488	while (count--)
439	{	489	{
440	encode_indent (enc);	490	encode_indent (enc);
		491	he = hes [count];
441	encode_he (enc, hes [i]);	492	encode_hk (enc, he);
		493	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
442		494
443	if (i < count - 1)	495	if (count)
444	encode_comma (enc);	496	encode_comma (enc);
445	}	497	}
446		498
447	encode_nl (enc);	499	encode_nl (enc); --enc->indent; encode_indent (enc);
448	}	500	}
		501	}
449	else	502	else
		503	{
		504	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		505	if ((he = hv_iternext (hv)))
450	{	506	{
451	HE *he = hv_iternext (hv);	507	encode_nl (enc); ++enc->indent;
452		508
453	for (;;)	509	for (;;)
454	{	510	{
455	encode_indent (enc);	511	encode_indent (enc);
456	encode_he (enc, he);	512	encode_hk (enc, he);
		513	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
457		514
458	if (!(he = hv_iternext (hv)))	515	if (!(he = hv_iternext (hv)))
459	break;	516	break;
460		517
461	encode_comma (enc);	518	encode_comma (enc);
462	}	519	}
463		520
464	encode_nl (enc);	521	encode_nl (enc); --enc->indent; encode_indent (enc);
465	}	522	}
466	}	523	}
467		524
468	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	525	encode_ch (enc, '}');
469	}	526	}
470		527
471	// encode objects, arrays and special \0=false and \1=true values.	528	// encode objects, arrays and special \0=false and \1=true values.
472	static void	529	static void
473	encode_rv (enc_t enc, SV sv)	530	encode_rv (enc_t enc, SV sv)
…		…
477	SvGETMAGIC (sv);	534	SvGETMAGIC (sv);
478	svt = SvTYPE (sv);	535	svt = SvTYPE (sv);
479		536
480	if (expect_false (SvOBJECT (sv)))	537	if (expect_false (SvOBJECT (sv)))
481	{	538	{
		539	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		540	? json_boolean_stash
		541	: gv_stashpv ("JSON::XS::Boolean", 1);
		542
482	if (SvSTASH (sv) == json_boolean_stash)	543	if (SvSTASH (sv) == stash)
483	{	544	{
484	if (SvIV (sv))	545	if (SvIV (sv))
485	encode_str (enc, "true", 4, 0);	546	encode_str (enc, "true", 4, 0);
486	else	547	else
487	encode_str (enc, "false", 5, 0);	548	encode_str (enc, "false", 5, 0);
…		…
499	// we re-bless the reference to get overload and other niceties right	560	// we re-bless the reference to get overload and other niceties right
500	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);	561	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501		562
502	if (to_json)	563	if (to_json)
503	{	564	{
504	int count;
505	dSP;	565	dSP;
506		566
507	ENTER; SAVETMPS; PUSHMARK (SP);	567	ENTER; SAVETMPS; PUSHMARK (SP);
508	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	568	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509		569
…		…
639	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	699	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
640	enc.cur = SvPVX (enc.sv);	700	enc.cur = SvPVX (enc.sv);
641	enc.end = SvEND (enc.sv);	701	enc.end = SvEND (enc.sv);
642	enc.indent = 0;	702	enc.indent = 0;
643	enc.maxdepth = DEC_DEPTH (enc.json.flags);	703	enc.maxdepth = DEC_DEPTH (enc.json.flags);
		704	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
		705	: enc.json.flags & F_LATIN1 ? 0x000100UL
		706	: 0x10FFFFUL;
644		707
645	SvPOK_only (enc.sv);	708	SvPOK_only (enc.sv);
646	encode_sv (&enc, scalar);	709	encode_sv (&enc, scalar);
647		710
648	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	711	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
669	JSON json;	732	JSON json;
670	U32 depth; // recursion depth	733	U32 depth; // recursion depth
671	U32 maxdepth; // recursion depth limit	734	U32 maxdepth; // recursion depth limit
672	} dec_t;	735	} dec_t;
673		736
674	inline void	737	INLINE void
		738	decode_comment (dec_t *dec)
		739	{
		740	// only '#'-style comments allowed a.t.m.
		741
		742	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		743	++dec->cur;
		744	}
		745
		746	INLINE void
675	decode_ws (dec_t *dec)	747	decode_ws (dec_t *dec)
676	{	748	{
677	for (;;)	749	for (;;)
678	{	750	{
679	char ch = *dec->cur;	751	char ch = *dec->cur;
680		752
681	if (ch > 0x20	753	if (ch > 0x20)
		754	{
		755	if (expect_false (ch == '#'))
		756	{
		757	if (dec->json.flags & F_RELAXED)
		758	decode_comment (dec);
		759	else
		760	break;
		761	}
		762	else
		763	break;
		764	}
682	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	765	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
683	break;	766	break; // parse error, but let higher level handle it, gives better error messages
684		767
685	++dec->cur;	768	++dec->cur;
686	}	769	}
687	}	770	}
688		771
…		…
794		877
795	if (hi >= 0x80)	878	if (hi >= 0x80)
796	{	879	{
797	utf8 = 1;	880	utf8 = 1;
798		881
799	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);	882	cur = encode_utf8 (cur, hi);
800	}	883	}
801	else	884	else
802	*cur++ = hi;	885	*cur++ = hi;
803	}	886	}
804	break;	887	break;
…		…
937	is_nv = 1;	1020	is_nv = 1;
938	}	1021	}
939		1022
940	if (!is_nv)	1023	if (!is_nv)
941	{	1024	{
		1025	int len = dec->cur - start;
		1026
942	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1027	// special case the rather common 1..5-digit-int case
943	if (*start == '-')	1028	if (*start == '-')
944	switch (dec->cur - start)	1029	switch (len)
945	{	1030	{
946	case 2: return newSViv (-( start [1] - '0' * 1));	1031	case 2: return newSViv (-( start [1] - '0' * 1));
947	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1032	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
948	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1033	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
949	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1034	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
		1035	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
950	}	1036	}
951	else	1037	else
952	switch (dec->cur - start)	1038	switch (len)
953	{	1039	{
954	case 1: return newSViv ( start [0] - '0' * 1);	1040	case 1: return newSViv ( start [0] - '0' * 1);
955	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1041	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
956	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1042	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
957	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1043	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		1044	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
958	}	1045	}
959		1046
960	{	1047	{
961	UV uv;	1048	UV uv;
962	int numtype = grok_number (start, dec->cur - start, &uv);	1049	int numtype = grok_number (start, len, &uv);
963	if (numtype & IS_NUMBER_IN_UV)	1050	if (numtype & IS_NUMBER_IN_UV)
964	if (numtype & IS_NUMBER_NEG)	1051	if (numtype & IS_NUMBER_NEG)
965	{	1052	{
966	if (uv < (UV)IV_MIN)	1053	if (uv < (UV)IV_MIN)
967	return newSViv (-(IV)uv);	1054	return newSViv (-(IV)uv);
968	}	1055	}
969	else	1056	else
970	return newSVuv (uv);	1057	return newSVuv (uv);
971
972	// here would likely be the place for bigint support
973	}	1058	}
974	}
975		1059
976	// if we ever support bigint or bigfloat, this is the place for bigfloat	1060	len -= *start == '-' ? 1 : 0;
		1061
		1062	// does not fit into IV or UV, try NV
		1063	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1064	#if defined (LDBL_DIG)
		1065	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1066	#endif
		1067	)
		1068	// fits into NV without loss of precision
		1069	return newSVnv (Atof (start));
		1070
		1071	// everything else fails, convert it to a string
		1072	return newSVpvn (start, dec->cur - start);
		1073	}
		1074
		1075	// loss of precision here
977	return newSVnv (Atof (start));	1076	return newSVnv (Atof (start));
978		1077
979	fail:	1078	fail:
980	return 0;	1079	return 0;
981	}	1080	}
…		…
1011		1110
1012	if (*dec->cur != ',')	1111	if (*dec->cur != ',')
1013	ERR (", or ] expected while parsing array");	1112	ERR (", or ] expected while parsing array");
1014		1113
1015	++dec->cur;	1114	++dec->cur;
		1115
		1116	decode_ws (dec);
		1117
		1118	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1119	{
		1120	++dec->cur;
		1121	break;
		1122	}
1016	}	1123	}
1017		1124
1018	DEC_DEC_DEPTH;	1125	DEC_DEC_DEPTH;
1019	return newRV_noinc ((SV *)av);	1126	return newRV_noinc ((SV *)av);
1020		1127
…		…
1036	if (*dec->cur == '}')	1143	if (*dec->cur == '}')
1037	++dec->cur;	1144	++dec->cur;
1038	else	1145	else
1039	for (;;)	1146	for (;;)
1040	{	1147	{
1041	decode_ws (dec); EXPECT_CH ('"');	1148	EXPECT_CH ('"');
1042		1149
1043	// heuristic: assume that	1150	// heuristic: assume that
1044	// a) decode_str + hv_store_ent are abysmally slow.	1151	// a) decode_str + hv_store_ent are abysmally slow.
1045	// b) most hash keys are short, simple ascii text.	1152	// b) most hash keys are short, simple ascii text.
1046	// => try to "fast-match" such strings to avoid	1153	// => try to "fast-match" such strings to avoid
…		…
1060	if (!key)	1167	if (!key)
1061	goto fail;	1168	goto fail;
1062		1169
1063	decode_ws (dec); EXPECT_CH (':');	1170	decode_ws (dec); EXPECT_CH (':');
1064		1171
		1172	decode_ws (dec);
1065	value = decode_sv (dec);	1173	value = decode_sv (dec);
1066	if (!value)	1174	if (!value)
1067	{	1175	{
1068	SvREFCNT_dec (key);	1176	SvREFCNT_dec (key);
1069	goto fail;	1177	goto fail;
…		…
1081	int len = p - key;	1189	int len = p - key;
1082	dec->cur = p + 1;	1190	dec->cur = p + 1;
1083		1191
1084	decode_ws (dec); EXPECT_CH (':');	1192	decode_ws (dec); EXPECT_CH (':');
1085		1193
		1194	decode_ws (dec);
1086	value = decode_sv (dec);	1195	value = decode_sv (dec);
1087	if (!value)	1196	if (!value)
1088	goto fail;	1197	goto fail;
1089		1198
1090	hv_store (hv, key, len, value, 0);	1199	hv_store (hv, key, len, value, 0);
…		…
1106		1215
1107	if (*dec->cur != ',')	1216	if (*dec->cur != ',')
1108	ERR (", or } expected while parsing object/hash");	1217	ERR (", or } expected while parsing object/hash");
1109		1218
1110	++dec->cur;	1219	++dec->cur;
		1220
		1221	decode_ws (dec);
		1222
		1223	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1224	{
		1225	++dec->cur;
		1226	break;
		1227	}
1111	}	1228	}
1112		1229
1113	DEC_DEC_DEPTH;	1230	DEC_DEC_DEPTH;
1114	sv = newRV_noinc ((SV *)hv);	1231	sv = newRV_noinc ((SV *)hv);
1115		1232
…		…
1180	}	1297	}
1181		1298
1182	static SV *	1299	static SV *
1183	decode_sv (dec_t *dec)	1300	decode_sv (dec_t *dec)
1184	{	1301	{
1185	decode_ws (dec);
1186
1187	// the beauty of JSON: you need exactly one character lookahead	1302	// the beauty of JSON: you need exactly one character lookahead
1188	// to parse anything.	1303	// to parse anything.
1189	switch (*dec->cur)	1304	switch (*dec->cur)
1190	{	1305	{
1191	case '"': ++dec->cur; return decode_str (dec);	1306	case '"': ++dec->cur; return decode_str (dec);
…		…
1199		1314
1200	case 't':	1315	case 't':
1201	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1316	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1202	{	1317	{
1203	dec->cur += 4;	1318	dec->cur += 4;
		1319	#if JSON_SLOW
		1320	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1321	#endif
1204	return SvREFCNT_inc (json_true);	1322	return SvREFCNT_inc (json_true);
1205	}	1323	}
1206	else	1324	else
1207	ERR ("'true' expected");	1325	ERR ("'true' expected");
1208		1326
…		…
1210		1328
1211	case 'f':	1329	case 'f':
1212	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1330	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1213	{	1331	{
1214	dec->cur += 5;	1332	dec->cur += 5;
		1333	#if JSON_SLOW
		1334	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1335	#endif
1215	return SvREFCNT_inc (json_false);	1336	return SvREFCNT_inc (json_false);
1216	}	1337	}
1217	else	1338	else
1218	ERR ("'false' expected");	1339	ERR ("'false' expected");
1219		1340
…		…
1269		1390
1270	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1391	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1271	dec.json.flags \|= F_HOOK;	1392	dec.json.flags \|= F_HOOK;
1272		1393
1273	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1394	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1395
		1396	decode_ws (&dec);
1274	sv = decode_sv (&dec);	1397	sv = decode_sv (&dec);
1275		1398
1276	if (!(offset_return \|\| !sv))	1399	if (!(offset_return \|\| !sv))
1277	{	1400	{
1278	// check for trailing garbage	1401	// check for trailing garbage
…		…
1346	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1469	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1347	}	1470	}
1348		1471
1349	PROTOTYPES: DISABLE	1472	PROTOTYPES: DISABLE
1350		1473
		1474	void CLONE (...)
		1475	CODE:
		1476	json_stash = 0;
		1477	json_boolean_stash = 0;
		1478
1351	void new (char *klass)	1479	void new (char *klass)
1352	PPCODE:	1480	PPCODE:
1353	{	1481	{
1354	SV *pv = NEWSV (0, sizeof (JSON));	1482	SV *pv = NEWSV (0, sizeof (JSON));
1355	SvPOK_only (pv);	1483	SvPOK_only (pv);
1356	Zero (SvPVX (pv), 1, JSON);	1484	Zero (SvPVX (pv), 1, JSON);
1357	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1485	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1358	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1486	XPUSHs (sv_2mortal (sv_bless (
		1487	newRV_noinc (pv),
		1488	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		1489	)));
1359	}	1490	}
1360		1491
1361	void ascii (JSON *self, int enable = 1)	1492	void ascii (JSON *self, int enable = 1)
1362	ALIAS:	1493	ALIAS:
1363	ascii = F_ASCII	1494	ascii = F_ASCII
…		…
1370	pretty = F_PRETTY	1501	pretty = F_PRETTY
1371	allow_nonref = F_ALLOW_NONREF	1502	allow_nonref = F_ALLOW_NONREF
1372	shrink = F_SHRINK	1503	shrink = F_SHRINK
1373	allow_blessed = F_ALLOW_BLESSED	1504	allow_blessed = F_ALLOW_BLESSED
1374	convert_blessed = F_CONV_BLESSED	1505	convert_blessed = F_CONV_BLESSED
		1506	relaxed = F_RELAXED
1375	PPCODE:	1507	PPCODE:
1376	{	1508	{
1377	if (enable)	1509	if (enable)
1378	self->flags \|= ix;	1510	self->flags \|= ix;
1379	else	1511	else
1380	self->flags &= ~ix;	1512	self->flags &= ~ix;
1381		1513
1382	XPUSHs (ST (0));	1514	XPUSHs (ST (0));
1383	}	1515	}
1384		1516
		1517	void get_ascii (JSON *self)
		1518	ALIAS:
		1519	get_ascii = F_ASCII
		1520	get_latin1 = F_LATIN1
		1521	get_utf8 = F_UTF8
		1522	get_indent = F_INDENT
		1523	get_canonical = F_CANONICAL
		1524	get_space_before = F_SPACE_BEFORE
		1525	get_space_after = F_SPACE_AFTER
		1526	get_allow_nonref = F_ALLOW_NONREF
		1527	get_shrink = F_SHRINK
		1528	get_allow_blessed = F_ALLOW_BLESSED
		1529	get_convert_blessed = F_CONV_BLESSED
		1530	get_relaxed = F_RELAXED
		1531	PPCODE:
		1532	XPUSHs (boolSV (self->flags & ix));
		1533
1385	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1534	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1386	PPCODE:	1535	PPCODE:
1387	{	1536	{
1388	UV log2 = 0;	1537	UV log2 = 0;
1389		1538
…		…
1395	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1544	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1396		1545
1397	XPUSHs (ST (0));	1546	XPUSHs (ST (0));
1398	}	1547	}
1399		1548
		1549	U32 get_max_depth (JSON *self)
		1550	CODE:
		1551	RETVAL = DEC_DEPTH (self->flags);
		1552	OUTPUT:
		1553	RETVAL
		1554
1400	void max_size (JSON *self, UV max_size = 0)	1555	void max_size (JSON *self, UV max_size = 0)
1401	PPCODE:	1556	PPCODE:
1402	{	1557	{
1403	UV log2 = 0;	1558	UV log2 = 0;
1404		1559
…		…
1410		1565
1411	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1566	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1412		1567
1413	XPUSHs (ST (0));	1568	XPUSHs (ST (0));
1414	}	1569	}
		1570
		1571	int get_max_size (JSON *self)
		1572	CODE:
		1573	RETVAL = DEC_SIZE (self->flags);
		1574	OUTPUT:
		1575	RETVAL
1415		1576
1416	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1577	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1417	PPCODE:	1578	PPCODE:
1418	{	1579	{
1419	SvREFCNT_dec (self->cb_object);	1580	SvREFCNT_dec (self->cb_object);
…		…
1466	SvREFCNT_dec (self->cb_sk_object);	1627	SvREFCNT_dec (self->cb_sk_object);
1467	SvREFCNT_dec (self->cb_object);	1628	SvREFCNT_dec (self->cb_object);
1468		1629
1469	PROTOTYPES: ENABLE	1630	PROTOTYPES: ENABLE
1470		1631
1471	void to_json (SV *scalar)	1632	void encode_json (SV *scalar)
1472	PPCODE:	1633	PPCODE:
1473	{	1634	{
1474	JSON json = { F_DEFAULT \| F_UTF8 };	1635	JSON json = { F_DEFAULT \| F_UTF8 };
1475	XPUSHs (encode_json (scalar, &json));	1636	XPUSHs (encode_json (scalar, &json));
1476	}	1637	}
1477		1638
1478	void from_json (SV *jsonstr)	1639	void decode_json (SV *jsonstr)
1479	PPCODE:	1640	PPCODE:
1480	{	1641	{
1481	JSON json = { F_DEFAULT \| F_UTF8 };	1642	JSON json = { F_DEFAULT \| F_UTF8 };
1482	XPUSHs (decode_json (jsonstr, &json, 0));	1643	XPUSHs (decode_json (jsonstr, &json, 0));
1483	}	1644	}

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC vs. Revision 1.72 by root, Wed Mar 19 04:08:22 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC vs.
Revision 1.72 by root, Wed Mar 19 04:08:22 2008 UTC