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

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

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs. Revision 1.120 by root, Mon Oct 28 23:23:10 2013 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs.
Revision 1.120 by root, Mon Oct 28 23:23:10 2013 UTC