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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC vs.
Revision 1.121 by root, Tue Oct 29 00:06:40 2013 UTC

…		…
12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
13	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
14	#endif	14	#endif
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
20	#endif	20	#endif
21		21
		22	// three extra for rounding, sign, and end of string
22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23		24
24	#define F_ASCII 0x00000001UL	25	#define F_ASCII 0x00000001UL
25	#define F_LATIN1 0x00000002UL	26	#define F_LATIN1 0x00000002UL
26	#define F_UTF8 0x00000004UL	27	#define F_UTF8 0x00000004UL
27	#define F_INDENT 0x00000008UL	28	#define F_INDENT 0x00000008UL
…		…
32	#define F_SHRINK 0x00000200UL	33	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	34	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	35	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	36	#define F_RELAXED 0x00001000UL
36	#define F_ALLOW_UNKNOWN 0x00002000UL	37	#define F_ALLOW_UNKNOWN 0x00002000UL
37		38	#define F_ALLOW_TAGS 0x00004000UL
38	#define F_MAXDEPTH 0xf8000000UL
39	#define S_MAXDEPTH 27
40	#define F_MAXSIZE 0x01f00000UL
41	#define S_MAXSIZE 20
42	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	39	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
43		40
44	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
45	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
46
47	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
48	#define F_DEFAULT (9UL << S_MAXDEPTH)
49		42
50	#define INIT_SIZE 32 // initial scalar size to be allocated	43	#define INIT_SIZE 32 // initial scalar size to be allocated
51	#define INDENT_STEP 3 // spaces per indentation level	44	#define INDENT_STEP 3 // spaces per indentation level
52		45
53	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	46	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		47
		48	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
54		49
55	#define SB do {	50	#define SB do {
56	#define SE } while (0)	51	#define SE } while (0)
57		52
58	#if __GNUC__ >= 3	53	#if __GNUC__ >= 3
…		…
68		63
69	#define IN_RANGE_INC(type,val,beg,end) \	64	#define IN_RANGE_INC(type,val,beg,end) \
70	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	65	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
71	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	66	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
72		67
		68	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		69
73	#ifdef USE_ITHREADS	70	#ifdef USE_ITHREADS
74	# define JSON_SLOW 1	71	# define JSON_SLOW 1
75	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	72	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
76	#else	73	#else
77	# define JSON_SLOW 0	74	# define JSON_SLOW 0
78	# define JSON_STASH json_stash	75	# define JSON_STASH json_stash
79	#endif	76	#endif
80		77
		78	// the amount of HEs to allocate on the stack, when sorting keys
		79	#define STACK_HES 64
		80
81	static HV json_stash, json_boolean_stash; // JSON::XS::	81	static HV json_stash, types_boolean_stash; // JSON::XS::
82	static SV json_true, json_false;	82	static SV types_true, types_false, *sv_json;
83		83
84	enum {	84	enum {
85	INCR_M_WS = 0, // initial whitespace skipping, must be 0	85	INCR_M_WS = 0, // initial whitespace skipping, must be 0
86	INCR_M_STR, // inside string	86	INCR_M_STR, // inside string
87	INCR_M_BS, // inside backslash	87	INCR_M_BS, // inside backslash
		88	INCR_M_C0, // inside comment in initial whitespace sequence
		89	INCR_M_C1, // inside comment in other places
88	INCR_M_JSON // outside anything, count nesting	90	INCR_M_JSON // outside anything, count nesting
89	};	91	};
90		92
91	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	93	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
92		94
93	typedef struct {	95	typedef struct {
94	U32 flags;	96	U32 flags;
		97	U32 max_depth;
		98	STRLEN max_size;
		99
95	SV *cb_object;	100	SV *cb_object;
96	HV *cb_sk_object;	101	HV *cb_sk_object;
97		102
98	// for the incremental parser	103	// for the incremental parser
99	SV *incr_text; // the source text so far	104	SV *incr_text; // the source text so far
100	STRLEN incr_pos; // the current offset into the text	105	STRLEN incr_pos; // the current offset into the text
101	int incr_nest; // {[]}-nesting level	106	int incr_nest; // {[]}-nesting level
102	int incr_mode;	107	unsigned char incr_mode;
103	} JSON;	108	} JSON;
		109
		110	INLINE void
		111	json_init (JSON *json)
		112	{
		113	Zero (json, 1, JSON);
		114	json->max_depth = 512;
		115	}
104		116
105	/////////////////////////////////////////////////////////////////////////////	117	/////////////////////////////////////////////////////////////////////////////
106	// utility functions	118	// utility functions
107		119
108	INLINE SV *	120	INLINE SV *
…		…
118		130
119	INLINE void	131	INLINE void
120	shrink (SV *sv)	132	shrink (SV *sv)
121	{	133	{
122	sv_utf8_downgrade (sv, 1);	134	sv_utf8_downgrade (sv, 1);
		135
123	if (SvLEN (sv) > SvCUR (sv) + 1)	136	if (SvLEN (sv) > SvCUR (sv) + 1)
124	{	137	{
125	#ifdef SvPV_shrink_to_cur	138	#ifdef SvPV_shrink_to_cur
126	SvPV_shrink_to_cur (sv);	139	SvPV_shrink_to_cur (sv);
127	#elif defined (SvPV_renew)	140	#elif defined (SvPV_renew)
…		…
171	*s++ = 0x80 \| ( ch & 0x3f);	184	*s++ = 0x80 \| ( ch & 0x3f);
172		185
173	return s;	186	return s;
174	}	187	}
175		188
		189	// convert offset pointer to character index, sv must be string
		190	static STRLEN
		191	ptr_to_index (SV sv, char offset)
		192	{
		193	return SvUTF8 (sv)
		194	? utf8_distance (offset, SvPVX (sv))
		195	: offset - SvPVX (sv);
		196	}
		197
		198	/////////////////////////////////////////////////////////////////////////////
		199	// fp hell
		200
		201	// scan a group of digits, and a trailing exponent
		202	static void
		203	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		204	{
		205	UV uaccum = 0;
		206	int eaccum = 0;
		207
		208	// if we recurse too deep, skip all remaining digits
		209	// to avoid a stack overflow attack
		210	if (expect_false (--maxdepth <= 0))
		211	while (((U8)*s - '0') < 10)
		212	++s;
		213
		214	for (;;)
		215	{
		216	U8 dig = (U8)*s - '0';
		217
		218	if (expect_false (dig >= 10))
		219	{
		220	if (dig == (U8)((U8)'.' - (U8)'0'))
		221	{
		222	++s;
		223	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		224	}
		225	else if ((dig \| ' ') == 'e' - '0')
		226	{
		227	int exp2 = 0;
		228	int neg = 0;
		229
		230	++s;
		231
		232	if (*s == '-')
		233	{
		234	++s;
		235	neg = 1;
		236	}
		237	else if (*s == '+')
		238	++s;
		239
		240	while ((dig = (U8)*s - '0') < 10)
		241	exp2 = exp2 * 10 + *s++ - '0';
		242
		243	*expo += neg ? -exp2 : exp2;
		244	}
		245
		246	break;
		247	}
		248
		249	++s;
		250
		251	uaccum = uaccum * 10 + dig;
		252	++eaccum;
		253
		254	// if we have too many digits, then recurse for more
		255	// we actually do this for rather few digits
		256	if (uaccum >= (UV_MAX - 9) / 10)
		257	{
		258	if (postdp) *expo -= eaccum;
		259	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		260	if (postdp) *expo += eaccum;
		261
		262	break;
		263	}
		264	}
		265
		266	// this relies greatly on the quality of the pow ()
		267	// implementation of the platform, but a good
		268	// implementation is hard to beat.
		269	// (IEEE 754 conformant ones are required to be exact)
		270	if (postdp) *expo -= eaccum;
		271	accum += uaccum Perl_pow (10., *expo);
		272	*expo += eaccum;
		273	}
		274
		275	static NV
		276	json_atof (const char *s)
		277	{
		278	NV accum = 0.;
		279	int expo = 0;
		280	int neg = 0;
		281
		282	if (*s == '-')
		283	{
		284	++s;
		285	neg = 1;
		286	}
		287
		288	// a recursion depth of ten gives us >>500 bits
		289	json_atof_scan1 (s, &accum, &expo, 0, 10);
		290
		291	return neg ? -accum : accum;
		292	}
176	/////////////////////////////////////////////////////////////////////////////	293	/////////////////////////////////////////////////////////////////////////////
177	// encoder	294	// encoder
178		295
179	// structure used for encoding JSON	296	// structure used for encoding JSON
180	typedef struct	297	typedef struct
…		…
182	char *cur; // SvPVX (sv) + current output position	299	char *cur; // SvPVX (sv) + current output position
183	char *end; // SvEND (sv)	300	char *end; // SvEND (sv)
184	SV *sv; // result scalar	301	SV *sv; // result scalar
185	JSON json;	302	JSON json;
186	U32 indent; // indentation level	303	U32 indent; // indentation level
187	U32 maxdepth; // max. indentation/recursion level
188	UV limit; // escape character values >= this value when encoding	304	UV limit; // escape character values >= this value when encoding
189	} enc_t;	305	} enc_t;
190		306
191	INLINE void	307	INLINE void
192	need (enc_t *enc, STRLEN len)	308	need (enc_t *enc, STRLEN len)
193	{	309	{
194	if (expect_false (enc->cur + len >= enc->end))	310	if (expect_false (enc->cur + len >= enc->end))
195	{	311	{
196	STRLEN cur = enc->cur - SvPVX (enc->sv);	312	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
197	SvGROW (enc->sv, cur + len + 1);	313	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
198	enc->cur = SvPVX (enc->sv) + cur;	314	enc->cur = SvPVX (enc->sv) + cur;
199	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	315	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
200	}	316	}
201	}	317	}
202		318
…		…
277	(int)((uch - 0x10000) % 0x400 + 0xDC00));	393	(int)((uch - 0x10000) % 0x400 + 0xDC00));
278	enc->cur += 12;	394	enc->cur += 12;
279	}	395	}
280	else	396	else
281	{	397	{
282	static char hexdigit [16] = "0123456789abcdef";
283	need (enc, len += 5);	398	need (enc, len += 5);
284	*enc->cur++ = '\\';	399	*enc->cur++ = '\\';
285	*enc->cur++ = 'u';	400	*enc->cur++ = 'u';
286	*enc->cur++ = hexdigit [ uch >> 12 ];	401	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
287	*enc->cur++ = hexdigit [(uch >> 8) & 15];	402	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
288	*enc->cur++ = hexdigit [(uch >> 4) & 15];	403	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
289	*enc->cur++ = hexdigit [(uch >> 0) & 15];	404	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
290	}	405	}
291		406
292	str += clen;	407	str += clen;
293	}	408	}
294	else if (enc->json.flags & F_LATIN1)	409	else if (enc->json.flags & F_LATIN1)
…		…
365	static void	480	static void
366	encode_av (enc_t enc, AV av)	481	encode_av (enc_t enc, AV av)
367	{	482	{
368	int i, len = av_len (av);	483	int i, len = av_len (av);
369		484
370	if (enc->indent >= enc->maxdepth)	485	if (enc->indent >= enc->json.max_depth)
371	croak ("data structure too deep (hit recursion limit)");	486	croak (ERR_NESTING_EXCEEDED);
372		487
373	encode_ch (enc, '[');	488	encode_ch (enc, '[');
374		489
375	if (len >= 0)	490	if (len >= 0)
376	{	491	{
377	encode_nl (enc); ++enc->indent;	492	encode_nl (enc); ++enc->indent;
378		493
379	for (i = 0; i <= len; ++i)	494	for (i = 0; i <= len; ++i)
…		…
391	encode_comma (enc);	506	encode_comma (enc);
392	}	507	}
393		508
394	encode_nl (enc); --enc->indent; encode_indent (enc);	509	encode_nl (enc); --enc->indent; encode_indent (enc);
395	}	510	}
396		511
397	encode_ch (enc, ']');	512	encode_ch (enc, ']');
398	}	513	}
399		514
400	static void	515	static void
401	encode_hk (enc_t enc, HE he)	516	encode_hk (enc_t enc, HE he)
…		…
405	if (HeKLEN (he) == HEf_SVKEY)	520	if (HeKLEN (he) == HEf_SVKEY)
406	{	521	{
407	SV *sv = HeSVKEY (he);	522	SV *sv = HeSVKEY (he);
408	STRLEN len;	523	STRLEN len;
409	char *str;	524	char *str;
410		525
411	SvGETMAGIC (sv);	526	SvGETMAGIC (sv);
412	str = SvPV (sv, len);	527	str = SvPV (sv, len);
413		528
414	encode_str (enc, str, len, SvUTF8 (sv));	529	encode_str (enc, str, len, SvUTF8 (sv));
415	}	530	}
…		…
451	static void	566	static void
452	encode_hv (enc_t enc, HV hv)	567	encode_hv (enc_t enc, HV hv)
453	{	568	{
454	HE *he;	569	HE *he;
455		570
456	if (enc->indent >= enc->maxdepth)	571	if (enc->indent >= enc->json.max_depth)
457	croak ("data structure too deep (hit recursion limit)");	572	croak (ERR_NESTING_EXCEEDED);
458		573
459	encode_ch (enc, '{');	574	encode_ch (enc, '{');
460		575
461	// for canonical output we have to sort by keys first	576	// for canonical output we have to sort by keys first
462	// actually, this is mostly due to the stupid so-called	577	// actually, this is mostly due to the stupid so-called
463	// security workaround added somewhere in 5.8.x.	578	// security workaround added somewhere in 5.8.x
464	// that randomises hash orderings	579	// that randomises hash orderings
465	if (enc->json.flags & F_CANONICAL)	580	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
466	{	581	{
467	int count = hv_iterinit (hv);	582	int count = hv_iterinit (hv);
468		583
469	if (SvMAGICAL (hv))	584	if (SvMAGICAL (hv))
470	{	585	{
…		…
481	}	596	}
482		597
483	if (count)	598	if (count)
484	{	599	{
485	int i, fast = 1;	600	int i, fast = 1;
486	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	601	HE *hes_stack [STACK_HES];
487	HE *hes = _alloca (count sizeof (HE));	602	HE **hes = hes_stack;
488	#else	603
489	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	604	// allocate larger arrays on the heap
490	#endif	605	if (count > STACK_HES)
		606	{
		607	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		608	hes = (HE **)SvPVX (sv);
		609	}
491		610
492	i = 0;	611	i = 0;
493	while ((he = hv_iternext (hv)))	612	while ((he = hv_iternext (hv)))
494	{	613	{
495	hes [i++] = he;	614	hes [i++] = he;
…		…
564	// encode objects, arrays and special \0=false and \1=true values.	683	// encode objects, arrays and special \0=false and \1=true values.
565	static void	684	static void
566	encode_rv (enc_t enc, SV sv)	685	encode_rv (enc_t enc, SV sv)
567	{	686	{
568	svtype svt;	687	svtype svt;
		688	GV *method;
569		689
570	SvGETMAGIC (sv);	690	SvGETMAGIC (sv);
571	svt = SvTYPE (sv);	691	svt = SvTYPE (sv);
572		692
573	if (expect_false (SvOBJECT (sv)))	693	if (expect_false (SvOBJECT (sv)))
574	{	694	{
575	HV *stash = !JSON_SLOW \|\| json_boolean_stash	695	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
576	? json_boolean_stash	696	? types_boolean_stash
577	: gv_stashpv ("JSON::XS::Boolean", 1);	697	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		698	HV *stash = SvSTASH (sv);
578		699
579	if (SvSTASH (sv) == stash)	700	if (stash == boolean_stash)
580	{	701	{
581	if (SvIV (sv))	702	if (SvIV (sv))
582	encode_str (enc, "true", 4, 0);	703	encode_str (enc, "true", 4, 0);
583	else	704	else
584	encode_str (enc, "false", 5, 0);	705	encode_str (enc, "false", 5, 0);
585	}	706	}
		707	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		708	{
		709	int count;
		710	dSP;
		711
		712	ENTER; SAVETMPS; PUSHMARK (SP);
		713	EXTEND (SP, 2);
		714	// we re-bless the reference to get overload and other niceties right
		715	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		716	PUSHs (sv_json);
		717
		718	PUTBACK;
		719	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		720	SPAGAIN;
		721
		722	// catch this surprisingly common error
		723	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		724	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		725
		726	encode_ch (enc, '(');
		727	encode_ch (enc, '"');
		728	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		729	encode_ch (enc, '"');
		730	encode_ch (enc, ')');
		731	encode_ch (enc, '[');
		732
		733	while (count)
		734	{
		735	encode_sv (enc, SP[1 - count--]);
		736
		737	if (count)
		738	encode_ch (enc, ',');
		739	}
		740
		741	encode_ch (enc, ']');
		742
		743	PUTBACK;
		744
		745	FREETMPS; LEAVE;
		746	}
		747	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		748	{
		749	dSP;
		750
		751	ENTER; SAVETMPS; PUSHMARK (SP);
		752	// we re-bless the reference to get overload and other niceties right
		753	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		754
		755	// calling with G_SCALAR ensures that we always get a 1 return value
		756	PUTBACK;
		757	call_sv ((SV *)GvCV (method), G_SCALAR);
		758	SPAGAIN;
		759
		760	// catch this surprisingly common error
		761	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		762	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		763
		764	sv = POPs;
		765	PUTBACK;
		766
		767	encode_sv (enc, sv);
		768
		769	FREETMPS; LEAVE;
		770	}
		771	else if (enc->json.flags & F_ALLOW_BLESSED)
		772	encode_str (enc, "null", 4, 0);
586	else	773	else
587	{
588	#if 0
589	if (0 && sv_derived_from (rv, "JSON::Literal"))
590	{
591	// not yet
592	}
593	#endif
594	if (enc->json.flags & F_CONV_BLESSED)
595	{
596	// we re-bless the reference to get overload and other niceties right
597	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
598
599	if (to_json)
600	{
601	dSP;
602
603	ENTER; SAVETMPS; PUSHMARK (SP);
604	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
605
606	// calling with G_SCALAR ensures that we always get a 1 return value
607	PUTBACK;
608	call_sv ((SV *)GvCV (to_json), G_SCALAR);
609	SPAGAIN;
610
611	// catch this surprisingly common error
612	if (SvROK (TOPs) && SvRV (TOPs) == sv)
613	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
614
615	sv = POPs;
616	PUTBACK;
617
618	encode_sv (enc, sv);
619
620	FREETMPS; LEAVE;
621	}
622	else if (enc->json.flags & F_ALLOW_BLESSED)
623	encode_str (enc, "null", 4, 0);
624	else
625	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
626	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
627	}
628	else if (enc->json.flags & F_ALLOW_BLESSED)
629	encode_str (enc, "null", 4, 0);
630	else
631	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	774	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
632	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	775	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
633	}
634	}	776	}
635	else if (svt == SVt_PVHV)	777	else if (svt == SVt_PVHV)
636	encode_hv (enc, (HV *)sv);	778	encode_hv (enc, (HV *)sv);
637	else if (svt == SVt_PVAV)	779	else if (svt == SVt_PVAV)
638	encode_av (enc, (AV *)sv);	780	encode_av (enc, (AV *)sv);
…		…
714	}	856	}
715	else	857	else
716	{	858	{
717	// large integer, use the (rather slow) snprintf way.	859	// large integer, use the (rather slow) snprintf way.
718	need (enc, IVUV_MAXCHARS);	860	need (enc, IVUV_MAXCHARS);
719	enc->cur +=	861	enc->cur +=
720	SvIsUV(sv)	862	SvIsUV(sv)
721	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	863	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
722	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	864	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
723	}	865	}
724	}	866	}
725	else if (SvROK (sv))	867	else if (SvROK (sv))
726	encode_rv (enc, SvRV (sv));	868	encode_rv (enc, SvRV (sv));
727	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	869	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
728	encode_str (enc, "null", 4, 0);	870	encode_str (enc, "null", 4, 0);
729	else	871	else
730	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	872	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
731	SvPV_nolen (sv), SvFLAGS (sv));	873	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
732	}	874	}
733		875
734	static SV *	876	static SV *
735	encode_json (SV scalar, JSON json)	877	encode_json (SV scalar, JSON json)
736	{	878	{
…		…
742	enc.json = *json;	884	enc.json = *json;
743	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	885	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
744	enc.cur = SvPVX (enc.sv);	886	enc.cur = SvPVX (enc.sv);
745	enc.end = SvEND (enc.sv);	887	enc.end = SvEND (enc.sv);
746	enc.indent = 0;	888	enc.indent = 0;
747	enc.maxdepth = DEC_DEPTH (enc.json.flags);
748	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	889	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
749	: enc.json.flags & F_LATIN1 ? 0x000100UL	890	: enc.json.flags & F_LATIN1 ? 0x000100UL
750	: 0x110000UL;	891	: 0x110000UL;
751		892
752	SvPOK_only (enc.sv);	893	SvPOK_only (enc.sv);
753	encode_sv (&enc, scalar);	894	encode_sv (&enc, scalar);
		895	encode_nl (&enc);
754		896
755	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	897	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
756	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	898	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
757		899
758	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	900	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
819	if (*dec->cur != ch) \	961	if (*dec->cur != ch) \
820	ERR (# ch " expected"); \	962	ERR (# ch " expected"); \
821	++dec->cur; \	963	++dec->cur; \
822	SE	964	SE
823		965
824	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	966	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
825	#define DEC_DEC_DEPTH --dec->depth	967	#define DEC_DEC_DEPTH --dec->depth
826		968
827	static SV decode_sv (dec_t dec);	969	static SV decode_sv (dec_t dec);
828		970
829	static signed char decode_hexdigit[256];	971	static signed char decode_hexdigit[256];
…		…
938	else if (expect_true (ch >= 0x20 && ch < 0x80))	1080	else if (expect_true (ch >= 0x20 && ch < 0x80))
939	*cur++ = ch;	1081	*cur++ = ch;
940	else if (ch >= 0x80)	1082	else if (ch >= 0x80)
941	{	1083	{
942	STRLEN clen;	1084	STRLEN clen;
943	UV uch;
944		1085
945	--dec_cur;	1086	--dec_cur;
946		1087
947	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1088	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
948	if (clen == (STRLEN)-1)	1089	if (clen == (STRLEN)-1)
949	ERR ("malformed UTF-8 character in JSON string");	1090	ERR ("malformed UTF-8 character in JSON string");
950		1091
951	do	1092	do
952	cur++ = dec_cur++;	1093	cur++ = dec_cur++;
…		…
969	{	1110	{
970	STRLEN len = cur - buf;	1111	STRLEN len = cur - buf;
971		1112
972	if (sv)	1113	if (sv)
973	{	1114	{
974	SvGROW (sv, SvCUR (sv) + len + 1);	1115	STRLEN cur = SvCUR (sv);
		1116
		1117	if (SvLEN (sv) <= cur + len)
		1118	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1119
975	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1120	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
976	SvCUR_set (sv, SvCUR (sv) + len);	1121	SvCUR_set (sv, SvCUR (sv) + len);
977	}	1122	}
978	else	1123	else
979	sv = newSVpvn (buf, len);	1124	sv = newSVpvn (buf, len);
…		…
1070		1215
1071	// special case the rather common 1..5-digit-int case	1216	// special case the rather common 1..5-digit-int case
1072	if (*start == '-')	1217	if (*start == '-')
1073	switch (len)	1218	switch (len)
1074	{	1219	{
1075	case 2: return newSViv (-( start [1] - '0' * 1));	1220	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1076	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1221	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1077	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1222	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1078	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1223	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1079	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1224	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1080	}	1225	}
1081	else	1226	else
1082	switch (len)	1227	switch (len)
1083	{	1228	{
1084	case 1: return newSViv ( start [0] - '0' * 1);	1229	case 1: return newSViv ( start [0] - '0' * 1);
1085	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1230	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1086	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1231	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1087	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1232	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1088	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1233	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1089	}	1234	}
1090		1235
1091	{	1236	{
1092	UV uv;	1237	UV uv;
1093	int numtype = grok_number (start, len, &uv);	1238	int numtype = grok_number (start, len, &uv);
…		…
1102	}	1247	}
1103		1248
1104	len -= *start == '-' ? 1 : 0;	1249	len -= *start == '-' ? 1 : 0;
1105		1250
1106	// does not fit into IV or UV, try NV	1251	// does not fit into IV or UV, try NV
1107	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1252	if (len <= NV_DIG)
1108	#if defined (LDBL_DIG)
1109	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1110	#endif
1111	)
1112	// fits into NV without loss of precision	1253	// fits into NV without loss of precision
1113	return newSVnv (Atof (start));	1254	return newSVnv (json_atof (start));
1114		1255
1115	// everything else fails, convert it to a string	1256	// everything else fails, convert it to a string
1116	return newSVpvn (start, dec->cur - start);	1257	return newSVpvn (start, dec->cur - start);
1117	}	1258	}
1118		1259
1119	// loss of precision here	1260	// loss of precision here
1120	return newSVnv (Atof (start));	1261	return newSVnv (json_atof (start));
1121		1262
1122	fail:	1263	fail:
1123	return 0;	1264	return 0;
1124	}	1265	}
1125		1266
…		…
1149	if (*dec->cur == ']')	1290	if (*dec->cur == ']')
1150	{	1291	{
1151	++dec->cur;	1292	++dec->cur;
1152	break;	1293	break;
1153	}	1294	}
1154		1295
1155	if (*dec->cur != ',')	1296	if (*dec->cur != ',')
1156	ERR (", or ] expected while parsing array");	1297	ERR (", or ] expected while parsing array");
1157		1298
1158	++dec->cur;	1299	++dec->cur;
1159		1300
…		…
1294	dSP;	1435	dSP;
1295	int count;	1436	int count;
1296		1437
1297	ENTER; SAVETMPS; PUSHMARK (SP);	1438	ENTER; SAVETMPS; PUSHMARK (SP);
1298	XPUSHs (HeVAL (he));	1439	XPUSHs (HeVAL (he));
		1440	sv_2mortal (sv);
1299		1441
1300	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1442	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1301		1443
1302	if (count == 1)	1444	if (count == 1)
1303	{	1445	{
1304	sv = newSVsv (POPs);	1446	sv = newSVsv (POPs);
1305	FREETMPS; LEAVE;	1447	FREETMPS; LEAVE;
1306	return sv;	1448	return sv;
1307	}	1449	}
1308		1450
		1451	SvREFCNT_inc (sv);
1309	FREETMPS; LEAVE;	1452	FREETMPS; LEAVE;
1310	}	1453	}
1311	}	1454	}
1312		1455
1313	if (dec->json.cb_object)	1456	if (dec->json.cb_object)
…		…
1339	DEC_DEC_DEPTH;	1482	DEC_DEC_DEPTH;
1340	return 0;	1483	return 0;
1341	}	1484	}
1342		1485
1343	static SV *	1486	static SV *
		1487	decode_tag (dec_t *dec)
		1488	{
		1489	SV *tag = 0;
		1490	SV *val = 0;
		1491
		1492	if (!(dec->json.flags & F_ALLOW_TAGS))
		1493	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1494
		1495	++dec->cur;
		1496
		1497	decode_ws (dec);
		1498
		1499	tag = decode_sv (dec);
		1500	if (!tag)
		1501	goto fail;
		1502
		1503	if (!SvPOK (tag))
		1504	ERR ("malformed JSON string, (tag) must be a string");
		1505
		1506	decode_ws (dec);
		1507
		1508	if (*dec->cur != ')')
		1509	ERR (") expected after tag");
		1510
		1511	++dec->cur;
		1512
		1513	decode_ws (dec);
		1514
		1515	val = decode_sv (dec);
		1516	if (!val)
		1517	goto fail;
		1518
		1519	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1520	ERR ("malformed JSON string, tag value must be an array");
		1521
		1522	{
		1523	AV av = (AV )SvRV (val);
		1524	int i, len = av_len (av) + 1;
		1525	HV *stash = gv_stashsv (tag, 0);
		1526	SV *sv;
		1527
		1528	if (!stash)
		1529	ERR ("cannot decode perl-object (package does not exist)");
		1530
		1531	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1532
		1533	if (!method)
		1534	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1535
		1536	dSP;
		1537
		1538	ENTER; SAVETMPS; PUSHMARK (SP);
		1539	EXTEND (SP, len + 2);
		1540	// we re-bless the reference to get overload and other niceties right
		1541	PUSHs (tag);
		1542	PUSHs (sv_json);
		1543
		1544	for (i = 0; i < len; ++i)
		1545	PUSHs (*av_fetch (av, i, 1));
		1546
		1547	PUTBACK;
		1548	call_sv ((SV *)GvCV (method), G_SCALAR);
		1549	SPAGAIN;
		1550
		1551	SvREFCNT_dec (tag);
		1552	SvREFCNT_dec (val);
		1553	sv = SvREFCNT_inc (POPs);
		1554
		1555	PUTBACK;
		1556
		1557	FREETMPS; LEAVE;
		1558
		1559	return sv;
		1560	}
		1561
		1562	fail:
		1563	SvREFCNT_dec (tag);
		1564	SvREFCNT_dec (val);
		1565	return 0;
		1566	}
		1567
		1568	static SV *
1344	decode_sv (dec_t *dec)	1569	decode_sv (dec_t *dec)
1345	{	1570	{
1346	// the beauty of JSON: you need exactly one character lookahead	1571	// the beauty of JSON: you need exactly one character lookahead
1347	// to parse everything.	1572	// to parse everything.
1348	switch (*dec->cur)	1573	switch (*dec->cur)
1349	{	1574	{
1350	case '"': ++dec->cur; return decode_str (dec);	1575	case '"': ++dec->cur; return decode_str (dec);
1351	case '[': ++dec->cur; return decode_av (dec);	1576	case '[': ++dec->cur; return decode_av (dec);
1352	case '{': ++dec->cur; return decode_hv (dec);	1577	case '{': ++dec->cur; return decode_hv (dec);
		1578	case '(': return decode_tag (dec);
1353		1579
1354	case '-':	1580	case '-':
1355	case '0': case '1': case '2': case '3': case '4':	1581	case '0': case '1': case '2': case '3': case '4':
1356	case '5': case '6': case '7': case '8': case '9':	1582	case '5': case '6': case '7': case '8': case '9':
1357	return decode_num (dec);	1583	return decode_num (dec);
…		…
1359	case 't':	1585	case 't':
1360	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1586	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1361	{	1587	{
1362	dec->cur += 4;	1588	dec->cur += 4;
1363	#if JSON_SLOW	1589	#if JSON_SLOW
1364	json_true = get_bool ("JSON::XS::true");	1590	types_true = get_bool ("Types::Serialiser::true");
1365	#endif	1591	#endif
1366	return newSVsv (json_true);	1592	return newSVsv (types_true);
1367	}	1593	}
1368	else	1594	else
1369	ERR ("'true' expected");	1595	ERR ("'true' expected");
1370		1596
1371	break;	1597	break;
…		…
1373	case 'f':	1599	case 'f':
1374	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1600	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1375	{	1601	{
1376	dec->cur += 5;	1602	dec->cur += 5;
1377	#if JSON_SLOW	1603	#if JSON_SLOW
1378	json_false = get_bool ("JSON::XS::false");	1604	types_false = get_bool ("Types::Serialiser::false");
1379	#endif	1605	#endif
1380	return newSVsv (json_false);	1606	return newSVsv (types_false);
1381	}	1607	}
1382	else	1608	else
1383	ERR ("'false' expected");	1609	ERR ("'false' expected");
1384		1610
1385	break;	1611	break;
…		…
1394	ERR ("'null' expected");	1620	ERR ("'null' expected");
1395		1621
1396	break;	1622	break;
1397		1623
1398	default:	1624	default:
1399	ERR ("malformed JSON string, neither array, object, number, string or atom");	1625	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1400	break;	1626	break;
1401	}	1627	}
1402		1628
1403	fail:	1629	fail:
1404	return 0;	1630	return 0;
1405	}	1631	}
1406		1632
1407	static SV *	1633	static SV *
1408	decode_json (SV string, JSON json, STRLEN *offset_return)	1634	decode_json (SV string, JSON json, char **offset_return)
1409	{	1635	{
1410	dec_t dec;	1636	dec_t dec;
1411	STRLEN offset;
1412	SV *sv;	1637	SV *sv;
1413		1638
		1639	/* work around bugs in 5.10 where manipulating magic values
		1640	* makes perl ignore the magic in subsequent accesses.
		1641	* also make a copy of non-PV values, to get them into a clean
		1642	* state (SvPV should do that, but it's buggy, see below).
		1643	*/
1414	SvGETMAGIC (string);	1644	/SvGETMAGIC (string);/
		1645	if (SvMAGICAL (string) \|\| !SvPOK (string))
		1646	string = sv_2mortal (newSVsv (string));
		1647
1415	SvUPGRADE (string, SVt_PV);	1648	SvUPGRADE (string, SVt_PV);
1416		1649
1417	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1650	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1651	* assertion with -DDEBUGGING, although SvCUR is documented to
		1652	* return the xpv_cur field which certainly exists after upgrading.
		1653	* according to nicholas clark, calling SvPOK fixes this.
		1654	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1655	* and hope for the best.
		1656	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1657	* assertion business is seriously broken, try yet another workaround
		1658	* for the broken -DDEBUGGING.
		1659	*/
		1660	{
		1661	#ifdef DEBUGGING
		1662	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1663	#else
		1664	STRLEN offset = SvCUR (string);
		1665	#endif
		1666
		1667	if (offset > json->max_size && json->max_size)
1418	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1668	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1419	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1669	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1670	}
1420		1671
1421	if (json->flags & F_UTF8)	1672	if (DECODE_WANTS_OCTETS (json))
1422	sv_utf8_downgrade (string, 0);	1673	sv_utf8_downgrade (string, 0);
1423	else	1674	else
1424	sv_utf8_upgrade (string);	1675	sv_utf8_upgrade (string);
1425		1676
1426	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1677	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1427		1678
1428	dec.json = *json;	1679	dec.json = *json;
1429	dec.cur = SvPVX (string);	1680	dec.cur = SvPVX (string);
1430	dec.end = SvEND (string);	1681	dec.end = SvEND (string);
1431	dec.err = 0;	1682	dec.err = 0;
1432	dec.depth = 0;	1683	dec.depth = 0;
1433	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1434		1684
1435	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1685	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1436	dec.json.flags \|= F_HOOK;	1686	dec.json.flags \|= F_HOOK;
1437		1687
1438	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1688	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1439		1689
1440	decode_ws (&dec);	1690	decode_ws (&dec);
1441	sv = decode_sv (&dec);	1691	sv = decode_sv (&dec);
		1692
		1693	if (offset_return)
		1694	*offset_return = dec.cur;
1442		1695
1443	if (!(offset_return \|\| !sv))	1696	if (!(offset_return \|\| !sv))
1444	{	1697	{
1445	// check for trailing garbage	1698	// check for trailing garbage
1446	decode_ws (&dec);	1699	decode_ws (&dec);
…		…
1449	{	1702	{
1450	dec.err = "garbage after JSON object";	1703	dec.err = "garbage after JSON object";
1451	SvREFCNT_dec (sv);	1704	SvREFCNT_dec (sv);
1452	sv = 0;	1705	sv = 0;
1453	}	1706	}
1454	}
1455
1456	if (offset_return \|\| !sv)
1457	{
1458	offset = dec.json.flags & F_UTF8
1459	? dec.cur - SvPVX (string)
1460	: utf8_distance (dec.cur, SvPVX (string));
1461
1462	if (offset_return)
1463	*offset_return = offset;
1464	}	1707	}
1465		1708
1466	if (!sv)	1709	if (!sv)
1467	{	1710	{
1468	SV *uni = sv_newmortal ();	1711	SV *uni = sv_newmortal ();
…		…
1474	SAVEVPTR (PL_curcop);	1717	SAVEVPTR (PL_curcop);
1475	PL_curcop = &cop;	1718	PL_curcop = &cop;
1476	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1719	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1477	LEAVE;	1720	LEAVE;
1478		1721
1479	croak ("%s, at character offset %d [\"%s\"]",	1722	croak ("%s, at character offset %d (before \"%s\")",
1480	dec.err,	1723	dec.err,
1481	(int)offset,	1724	(int)ptr_to_index (string, dec.cur),
1482	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1725	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1483	}	1726	}
1484		1727
1485	sv = sv_2mortal (sv);	1728	sv = sv_2mortal (sv);
1486		1729
…		…
1495		1738
1496	static void	1739	static void
1497	incr_parse (JSON *self)	1740	incr_parse (JSON *self)
1498	{	1741	{
1499	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1742	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1743
		1744	// the state machine here is a bit convoluted and could be simplified a lot
		1745	// but this would make it slower, so...
1500		1746
1501	for (;;)	1747	for (;;)
1502	{	1748	{
1503	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D	1749	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D
1504	switch (self->incr_mode)	1750	switch (self->incr_mode)
1505	{	1751	{
1506	// only used for intiial whitespace skipping	1752	// only used for initial whitespace skipping
1507	case INCR_M_WS:	1753	case INCR_M_WS:
1508	for (;;)	1754	for (;;)
1509	{	1755	{
1510	if (*p > 0x20)	1756	if (*p > 0x20)
1511	{	1757	{
		1758	if (*p == '#')
		1759	{
		1760	self->incr_mode = INCR_M_C0;
		1761	goto incr_m_c;
		1762	}
		1763	else
		1764	{
1512	self->incr_mode = INCR_M_JSON;	1765	self->incr_mode = INCR_M_JSON;
1513	goto incr_m_json;	1766	goto incr_m_json;
		1767	}
1514	}	1768	}
1515	else if (!*p)	1769	else if (!*p)
1516	goto interrupt;	1770	goto interrupt;
1517		1771
1518	++p;	1772	++p;
…		…
1524	goto interrupt;	1778	goto interrupt;
1525		1779
1526	++p;	1780	++p;
1527	self->incr_mode = INCR_M_STR;	1781	self->incr_mode = INCR_M_STR;
1528	goto incr_m_str;	1782	goto incr_m_str;
		1783
		1784	// inside #-style comments
		1785	case INCR_M_C0:
		1786	case INCR_M_C1:
		1787	incr_m_c:
		1788	for (;;)
		1789	{
		1790	if (*p == '\n')
		1791	{
		1792	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1793	break;
		1794	}
		1795	else if (!*p)
		1796	goto interrupt;
		1797
		1798	++p;
		1799	}
		1800
		1801	break;
1529		1802
1530	// inside a string	1803	// inside a string
1531	case INCR_M_STR:	1804	case INCR_M_STR:
1532	incr_m_str:	1805	incr_m_str:
1533	for (;;)	1806	for (;;)
…		…
1584	self->incr_mode = INCR_M_STR;	1857	self->incr_mode = INCR_M_STR;
1585	goto incr_m_str;	1858	goto incr_m_str;
1586		1859
1587	case '[':	1860	case '[':
1588	case '{':	1861	case '{':
		1862	case '(':
1589	++self->incr_nest;	1863	if (++self->incr_nest > self->max_depth)
		1864	croak (ERR_NESTING_EXCEEDED);
1590	break;	1865	break;
1591		1866
1592	case ']':	1867	case ']':
1593	case '}':	1868	case '}':
1594	if (!--self->incr_nest)	1869	if (--self->incr_nest <= 0)
1595	goto interrupt;	1870	goto interrupt;
		1871	break;
		1872
		1873	case ')':
		1874	--self->incr_nest;
		1875	break;
		1876
		1877	case '#':
		1878	self->incr_mode = INCR_M_C1;
		1879	goto incr_m_c;
1596	}	1880	}
1597	}	1881	}
1598	}	1882	}
1599		1883
1600	modechange:	1884	modechange:
1601	;	1885	;
1602	}	1886	}
1603		1887
1604	interrupt:	1888	interrupt:
1605	self->incr_pos = p - SvPVX (self->incr_text);	1889	self->incr_pos = p - SvPVX (self->incr_text);
		1890	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1606	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1891	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1607	}	1892	}
1608		1893
1609	/////////////////////////////////////////////////////////////////////////////	1894	/////////////////////////////////////////////////////////////////////////////
1610	// XS interface functions	1895	// XS interface functions
…		…
1620	i >= '0' && i <= '9' ? i - '0'	1905	i >= '0' && i <= '9' ? i - '0'
1621	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1906	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1622	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1907	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1623	: -1;	1908	: -1;
1624		1909
1625	json_stash = gv_stashpv ("JSON::XS" , 1);	1910	json_stash = gv_stashpv ("JSON::XS" , 1);
1626	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1911	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1627		1912
1628	json_true = get_bool ("JSON::XS::true");	1913	types_true = get_bool ("Types::Serialiser::true");
1629	json_false = get_bool ("JSON::XS::false");	1914	types_false = get_bool ("Types::Serialiser::false");
		1915
		1916	sv_json = newSVpv ("JSON", 0);
		1917	SvREADONLY_on (sv_json);
		1918
		1919	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1630	}	1920	}
1631		1921
1632	PROTOTYPES: DISABLE	1922	PROTOTYPES: DISABLE
1633		1923
1634	void CLONE (...)	1924	void CLONE (...)
1635	CODE:	1925	CODE:
1636	json_stash = 0;	1926	json_stash = 0;
1637	json_boolean_stash = 0;	1927	types_boolean_stash = 0;
1638		1928
1639	void new (char *klass)	1929	void new (char *klass)
1640	PPCODE:	1930	PPCODE:
1641	{	1931	{
1642	SV *pv = NEWSV (0, sizeof (JSON));	1932	SV *pv = NEWSV (0, sizeof (JSON));
1643	SvPOK_only (pv);	1933	SvPOK_only (pv);
1644	Zero (SvPVX (pv), 1, JSON);	1934	json_init ((JSON *)SvPVX (pv));
1645	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1646	XPUSHs (sv_2mortal (sv_bless (	1935	XPUSHs (sv_2mortal (sv_bless (
1647	newRV_noinc (pv),	1936	newRV_noinc (pv),
1648	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1937	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1649	)));	1938	)));
1650	}	1939	}
…		…
1663	shrink = F_SHRINK	1952	shrink = F_SHRINK
1664	allow_blessed = F_ALLOW_BLESSED	1953	allow_blessed = F_ALLOW_BLESSED
1665	convert_blessed = F_CONV_BLESSED	1954	convert_blessed = F_CONV_BLESSED
1666	relaxed = F_RELAXED	1955	relaxed = F_RELAXED
1667	allow_unknown = F_ALLOW_UNKNOWN	1956	allow_unknown = F_ALLOW_UNKNOWN
		1957	allow_tags = F_ALLOW_TAGS
1668	PPCODE:	1958	PPCODE:
1669	{	1959	{
1670	if (enable)	1960	if (enable)
1671	self->flags \|= ix;	1961	self->flags \|= ix;
1672	else	1962	else
…		…
1688	get_shrink = F_SHRINK	1978	get_shrink = F_SHRINK
1689	get_allow_blessed = F_ALLOW_BLESSED	1979	get_allow_blessed = F_ALLOW_BLESSED
1690	get_convert_blessed = F_CONV_BLESSED	1980	get_convert_blessed = F_CONV_BLESSED
1691	get_relaxed = F_RELAXED	1981	get_relaxed = F_RELAXED
1692	get_allow_unknown = F_ALLOW_UNKNOWN	1982	get_allow_unknown = F_ALLOW_UNKNOWN
		1983	get_allow_tags = F_ALLOW_TAGS
1693	PPCODE:	1984	PPCODE:
1694	XPUSHs (boolSV (self->flags & ix));	1985	XPUSHs (boolSV (self->flags & ix));
1695		1986
1696	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1987	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1697	PPCODE:	1988	PPCODE:
1698	{	1989	self->max_depth = max_depth;
1699	UV log2 = 0;
1700
1701	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1702
1703	while ((1UL << log2) < max_depth)
1704	++log2;
1705
1706	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1707
1708	XPUSHs (ST (0));	1990	XPUSHs (ST (0));
1709	}
1710		1991
1711	U32 get_max_depth (JSON *self)	1992	U32 get_max_depth (JSON *self)
1712	CODE:	1993	CODE:
1713	RETVAL = DEC_DEPTH (self->flags);	1994	RETVAL = self->max_depth;
1714	OUTPUT:	1995	OUTPUT:
1715	RETVAL	1996	RETVAL
1716		1997
1717	void max_size (JSON *self, UV max_size = 0)	1998	void max_size (JSON *self, U32 max_size = 0)
1718	PPCODE:	1999	PPCODE:
1719	{	2000	self->max_size = max_size;
1720	UV log2 = 0;
1721
1722	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1723	if (max_size == 1) max_size = 2;
1724
1725	while ((1UL << log2) < max_size)
1726	++log2;
1727
1728	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1729
1730	XPUSHs (ST (0));	2001	XPUSHs (ST (0));
1731	}
1732		2002
1733	int get_max_size (JSON *self)	2003	int get_max_size (JSON *self)
1734	CODE:	2004	CODE:
1735	RETVAL = DEC_SIZE (self->flags);	2005	RETVAL = self->max_size;
1736	OUTPUT:	2006	OUTPUT:
1737	RETVAL	2007	RETVAL
1738		2008
1739	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	2009	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1740	PPCODE:	2010	PPCODE:
…		…
1746	}	2016	}
1747		2017
1748	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2018	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1749	PPCODE:	2019	PPCODE:
1750	{	2020	{
1751	if (!self->cb_sk_object)	2021	if (!self->cb_sk_object)
1752	self->cb_sk_object = newHV ();	2022	self->cb_sk_object = newHV ();
1753		2023
1754	if (SvOK (cb))	2024	if (SvOK (cb))
1755	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2025	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1756	else	2026	else
…		…
1767	XPUSHs (ST (0));	2037	XPUSHs (ST (0));
1768	}	2038	}
1769		2039
1770	void encode (JSON self, SV scalar)	2040	void encode (JSON self, SV scalar)
1771	PPCODE:	2041	PPCODE:
1772	XPUSHs (encode_json (scalar, self));	2042	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2043	XPUSHs (scalar);
1773		2044
1774	void decode (JSON self, SV jsonstr)	2045	void decode (JSON self, SV jsonstr)
1775	PPCODE:	2046	PPCODE:
1776	XPUSHs (decode_json (jsonstr, self, 0));	2047	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2048	XPUSHs (jsonstr);
1777		2049
1778	void decode_prefix (JSON self, SV jsonstr)	2050	void decode_prefix (JSON self, SV jsonstr)
1779	PPCODE:	2051	PPCODE:
1780	{	2052	{
1781	STRLEN offset;	2053	SV *sv;
		2054	char *offset;
		2055	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1782	EXTEND (SP, 2);	2056	EXTEND (SP, 2);
1783	PUSHs (decode_json (jsonstr, self, &offset));	2057	PUSHs (sv);
1784	PUSHs (sv_2mortal (newSVuv (offset)));	2058	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1785	}	2059	}
1786		2060
1787	void incr_parse (JSON self, SV jsonstr = 0)	2061	void incr_parse (JSON self, SV jsonstr = 0)
1788	PPCODE:	2062	PPCODE:
1789	{	2063	{
1790	if (!self->incr_text)	2064	if (!self->incr_text)
1791	self->incr_text = newSVpvn ("", 0);	2065	self->incr_text = newSVpvn ("", 0);
		2066
		2067	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2068	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2069	if (DECODE_WANTS_OCTETS (self))
		2070	{
		2071	if (self->incr_pos)
		2072	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2073	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2074
		2075	sv_utf8_downgrade (self->incr_text, 0);
		2076	}
		2077	else
		2078	{
		2079	sv_utf8_upgrade (self->incr_text);
		2080
		2081	if (self->incr_pos)
		2082	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2083	- (U8 *)SvPVX (self->incr_text);
		2084	}
1792		2085
1793	// append data, if any	2086	// append data, if any
1794	if (jsonstr)	2087	if (jsonstr)
1795	{	2088	{
		2089	/* make sure both strings have same encoding */
1796	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	2090	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		2091	if (SvUTF8 (jsonstr))
		2092	sv_utf8_downgrade (jsonstr, 0);
1797	{	2093	else
1798	/* utf-8-ness differs, need to upgrade */
1799	sv_utf8_upgrade (self->incr_text);	2094	sv_utf8_upgrade (jsonstr);
1800		2095
1801	if (self->incr_pos)	2096	/* and then just blindly append */
1802	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1803	- (U8 *)SvPVX (self->incr_text);
1804	}
1805
1806	{	2097	{
1807	STRLEN len;	2098	STRLEN len;
1808	const char *str = SvPV (jsonstr, len);	2099	const char *str = SvPV (jsonstr, len);
1809	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	2100	STRLEN cur = SvCUR (self->incr_text);
		2101
		2102	if (SvLEN (self->incr_text) <= cur + len)
		2103	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		2104
1810	Move (str, SvEND (self->incr_text), len, char);	2105	Move (str, SvEND (self->incr_text), len, char);
1811	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	2106	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1812	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	2107	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1813	}	2108	}
1814	}	2109	}
1815		2110
1816	if (GIMME_V != G_VOID)	2111	if (GIMME_V != G_VOID)
1817	do	2112	do
1818	{	2113	{
		2114	SV *sv;
1819	STRLEN offset;	2115	char *offset;
1820		2116
1821	if (!INCR_DONE (self))	2117	if (!INCR_DONE (self))
1822	{	2118	{
1823	incr_parse (self);	2119	incr_parse (self);
		2120
		2121	if (self->incr_pos > self->max_size && self->max_size)
		2122	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		2123	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		2124
1824	if (!INCR_DONE (self))	2125	if (!INCR_DONE (self))
		2126	{
		2127	// as an optimisation, do not accumulate white space in the incr buffer
		2128	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2129	{
		2130	self->incr_pos = 0;
		2131	SvCUR_set (self->incr_text, 0);
		2132	}
		2133
1825	break;	2134	break;
		2135	}
1826	}	2136	}
1827		2137
1828	XPUSHs (decode_json (self->incr_text, self, &offset));	2138	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2139	XPUSHs (sv);
1829		2140
1830	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1831	self->incr_pos -= offset;	2141	self->incr_pos -= offset - SvPVX (self->incr_text);
1832	self->incr_nest = 0;	2142	self->incr_nest = 0;
1833	self->incr_mode = 0;	2143	self->incr_mode = 0;
		2144
		2145	sv_chop (self->incr_text, offset);
1834	}	2146	}
1835	while (GIMME_V == G_ARRAY);	2147	while (GIMME_V == G_ARRAY);
1836	}	2148	}
1837		2149
1838	SV incr_text (JSON self)	2150	SV incr_text (JSON self)
…		…
1857	self->incr_nest = 0;	2169	self->incr_nest = 0;
1858	self->incr_mode = 0;	2170	self->incr_mode = 0;
1859	}	2171	}
1860	}	2172	}
1861		2173
		2174	void incr_reset (JSON *self)
		2175	CODE:
		2176	{
		2177	SvREFCNT_dec (self->incr_text);
		2178	self->incr_text = 0;
		2179	self->incr_pos = 0;
		2180	self->incr_nest = 0;
		2181	self->incr_mode = 0;
		2182	}
		2183
1862	void DESTROY (JSON *self)	2184	void DESTROY (JSON *self)
1863	CODE:	2185	CODE:
1864	SvREFCNT_dec (self->cb_sk_object);	2186	SvREFCNT_dec (self->cb_sk_object);
1865	SvREFCNT_dec (self->cb_object);	2187	SvREFCNT_dec (self->cb_object);
1866	SvREFCNT_dec (self->incr_text);	2188	SvREFCNT_dec (self->incr_text);
1867		2189
1868	PROTOTYPES: ENABLE	2190	PROTOTYPES: ENABLE
1869		2191
1870	void encode_json (SV *scalar)	2192	void encode_json (SV *scalar)
1871	ALIAS:
1872	to_json_ = 0
1873	encode_json = F_UTF8
1874	PPCODE:	2193	PPCODE:
1875	{	2194	{
1876	JSON json = { F_DEFAULT \| ix };	2195	JSON json;
1877	XPUSHs (encode_json (scalar, &json));	2196	json_init (&json);
		2197	json.flags \|= F_UTF8;
		2198	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2199	XPUSHs (scalar);
1878	}	2200	}
1879		2201
1880	void decode_json (SV *jsonstr)	2202	void decode_json (SV *jsonstr)
1881	ALIAS:
1882	from_json_ = 0
1883	decode_json = F_UTF8
1884	PPCODE:	2203	PPCODE:
1885	{	2204	{
1886	JSON json = { F_DEFAULT \| ix };	2205	JSON json;
1887	XPUSHs (decode_json (jsonstr, &json, 0));	2206	json_init (&json);
		2207	json.flags \|= F_UTF8;
		2208	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2209	XPUSHs (jsonstr);
1888	}	2210	}
1889		2211
1890

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC vs. Revision 1.121 by root, Tue Oct 29 00:06:40 2013 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC vs.
Revision 1.121 by root, Tue Oct 29 00:06:40 2013 UTC