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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.96 by root, Sat May 30 06:26:05 2009 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
…		…
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
		38	#define F_ALLOW_TAGS 0x00004000UL
37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	39	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
38		40
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
40		42
41	#define INIT_SIZE 32 // initial scalar size to be allocated	43	#define INIT_SIZE 32 // initial scalar size to be allocated
42	#define INDENT_STEP 3 // spaces per indentation level	44	#define INDENT_STEP 3 // spaces per indentation level
43		45
44	#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)
45		49
46	#define SB do {	50	#define SB do {
47	#define SE } while (0)	51	#define SE } while (0)
48		52
49	#if __GNUC__ >= 3	53	#if __GNUC__ >= 3
…		…
69	#else	73	#else
70	# define JSON_SLOW 0	74	# define JSON_SLOW 0
71	# define JSON_STASH json_stash	75	# define JSON_STASH json_stash
72	#endif	76	#endif
73		77
		78	// the amount of HEs to allocate on the stack, when sorting keys
		79	#define STACK_HES 64
		80
74	static HV json_stash, json_boolean_stash; // JSON::XS::	81	static HV json_stash, types_boolean_stash; // JSON::XS::
75	static SV json_true, json_false;	82	static SV types_true, types_false, *sv_json;
76		83
77	enum {	84	enum {
78	INCR_M_WS = 0, // initial whitespace skipping, must be 0	85	INCR_M_WS = 0, // initial whitespace skipping, must be 0
79	INCR_M_STR, // inside string	86	INCR_M_STR, // inside string
80	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
81	INCR_M_JSON // outside anything, count nesting	90	INCR_M_JSON // outside anything, count nesting
82	};	91	};
83		92
84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)	93	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85		94
…		…
184	return SvUTF8 (sv)	193	return SvUTF8 (sv)
185	? utf8_distance (offset, SvPVX (sv))	194	? utf8_distance (offset, SvPVX (sv))
186	: offset - SvPVX (sv);	195	: offset - SvPVX (sv);
187	}	196	}
188		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	}
189	/////////////////////////////////////////////////////////////////////////////	293	/////////////////////////////////////////////////////////////////////////////
190	// encoder	294	// encoder
191		295
192	// structure used for encoding JSON	296	// structure used for encoding JSON
193	typedef struct	297	typedef struct
…		…
380		484
381	if (enc->indent >= enc->json.max_depth)	485	if (enc->indent >= enc->json.max_depth)
382	croak (ERR_NESTING_EXCEEDED);	486	croak (ERR_NESTING_EXCEEDED);
383		487
384	encode_ch (enc, '[');	488	encode_ch (enc, '[');
385		489
386	if (len >= 0)	490	if (len >= 0)
387	{	491	{
388	encode_nl (enc); ++enc->indent;	492	encode_nl (enc); ++enc->indent;
389		493
390	for (i = 0; i <= len; ++i)	494	for (i = 0; i <= len; ++i)
…		…
402	encode_comma (enc);	506	encode_comma (enc);
403	}	507	}
404		508
405	encode_nl (enc); --enc->indent; encode_indent (enc);	509	encode_nl (enc); --enc->indent; encode_indent (enc);
406	}	510	}
407		511
408	encode_ch (enc, ']');	512	encode_ch (enc, ']');
409	}	513	}
410		514
411	static void	515	static void
412	encode_hk (enc_t enc, HE he)	516	encode_hk (enc_t enc, HE he)
…		…
416	if (HeKLEN (he) == HEf_SVKEY)	520	if (HeKLEN (he) == HEf_SVKEY)
417	{	521	{
418	SV *sv = HeSVKEY (he);	522	SV *sv = HeSVKEY (he);
419	STRLEN len;	523	STRLEN len;
420	char *str;	524	char *str;
421		525
422	SvGETMAGIC (sv);	526	SvGETMAGIC (sv);
423	str = SvPV (sv, len);	527	str = SvPV (sv, len);
424		528
425	encode_str (enc, str, len, SvUTF8 (sv));	529	encode_str (enc, str, len, SvUTF8 (sv));
426	}	530	}
…		…
471		575
472	// for canonical output we have to sort by keys first	576	// for canonical output we have to sort by keys first
473	// actually, this is mostly due to the stupid so-called	577	// actually, this is mostly due to the stupid so-called
474	// security workaround added somewhere in 5.8.x	578	// security workaround added somewhere in 5.8.x
475	// that randomises hash orderings	579	// that randomises hash orderings
476	if (enc->json.flags & F_CANONICAL)	580	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
477	{	581	{
478	int count = hv_iterinit (hv);	582	int count = hv_iterinit (hv);
479		583
480	if (SvMAGICAL (hv))	584	if (SvMAGICAL (hv))
481	{	585	{
…		…
492	}	596	}
493		597
494	if (count)	598	if (count)
495	{	599	{
496	int i, fast = 1;	600	int i, fast = 1;
497	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	601	HE *hes_stack [STACK_HES];
498	HE *hes = _alloca (count sizeof (HE));	602	HE **hes = hes_stack;
499	#else	603
500	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	604	// allocate larger arrays on the heap
501	#endif	605	if (count > STACK_HES)
		606	{
		607	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		608	hes = (HE **)SvPVX (sv);
		609	}
502		610
503	i = 0;	611	i = 0;
504	while ((he = hv_iternext (hv)))	612	while ((he = hv_iternext (hv)))
505	{	613	{
506	hes [i++] = he;	614	hes [i++] = he;
…		…
575	// encode objects, arrays and special \0=false and \1=true values.	683	// encode objects, arrays and special \0=false and \1=true values.
576	static void	684	static void
577	encode_rv (enc_t enc, SV sv)	685	encode_rv (enc_t enc, SV sv)
578	{	686	{
579	svtype svt;	687	svtype svt;
		688	GV *method;
580		689
581	SvGETMAGIC (sv);	690	SvGETMAGIC (sv);
582	svt = SvTYPE (sv);	691	svt = SvTYPE (sv);
583		692
584	if (expect_false (SvOBJECT (sv)))	693	if (expect_false (SvOBJECT (sv)))
585	{	694	{
586	HV *stash = !JSON_SLOW \|\| json_boolean_stash	695	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
587	? json_boolean_stash	696	? types_boolean_stash
588	: gv_stashpv ("JSON::XS::Boolean", 1);	697	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		698	HV *stash = SvSTASH (sv);
589		699
590	if (SvSTASH (sv) == stash)	700	if (stash == boolean_stash)
591	{	701	{
592	if (SvIV (sv))	702	if (SvIV (sv))
593	encode_str (enc, "true", 4, 0);	703	encode_str (enc, "true", 4, 0);
594	else	704	else
595	encode_str (enc, "false", 5, 0);	705	encode_str (enc, "false", 5, 0);
596	}	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);
597	else	773	else
598	{
599	#if 0
600	if (0 && sv_derived_from (rv, "JSON::Literal"))
601	{
602	// not yet
603	}
604	#endif
605	if (enc->json.flags & F_CONV_BLESSED)
606	{
607	// we re-bless the reference to get overload and other niceties right
608	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
609
610	if (to_json)
611	{
612	dSP;
613
614	ENTER; SAVETMPS; PUSHMARK (SP);
615	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
616
617	// calling with G_SCALAR ensures that we always get a 1 return value
618	PUTBACK;
619	call_sv ((SV *)GvCV (to_json), G_SCALAR);
620	SPAGAIN;
621
622	// catch this surprisingly common error
623	if (SvROK (TOPs) && SvRV (TOPs) == sv)
624	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
625
626	sv = POPs;
627	PUTBACK;
628
629	encode_sv (enc, sv);
630
631	FREETMPS; LEAVE;
632	}
633	else if (enc->json.flags & F_ALLOW_BLESSED)
634	encode_str (enc, "null", 4, 0);
635	else
636	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
637	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
638	}
639	else if (enc->json.flags & F_ALLOW_BLESSED)
640	encode_str (enc, "null", 4, 0);
641	else
642	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)",
643	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	775	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644	}
645	}	776	}
646	else if (svt == SVt_PVHV)	777	else if (svt == SVt_PVHV)
647	encode_hv (enc, (HV *)sv);	778	encode_hv (enc, (HV *)sv);
648	else if (svt == SVt_PVAV)	779	else if (svt == SVt_PVAV)
649	encode_av (enc, (AV *)sv);	780	encode_av (enc, (AV *)sv);
…		…
725	}	856	}
726	else	857	else
727	{	858	{
728	// large integer, use the (rather slow) snprintf way.	859	// large integer, use the (rather slow) snprintf way.
729	need (enc, IVUV_MAXCHARS);	860	need (enc, IVUV_MAXCHARS);
730	enc->cur +=	861	enc->cur +=
731	SvIsUV(sv)	862	SvIsUV(sv)
732	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	863	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
733	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	864	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
734	}	865	}
735	}	866	}
736	else if (SvROK (sv))	867	else if (SvROK (sv))
737	encode_rv (enc, SvRV (sv));	868	encode_rv (enc, SvRV (sv));
738	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	869	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
739	encode_str (enc, "null", 4, 0);	870	encode_str (enc, "null", 4, 0);
740	else	871	else
741	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",
742	SvPV_nolen (sv), SvFLAGS (sv));	873	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
743	}	874	}
744		875
745	static SV *	876	static SV *
746	encode_json (SV scalar, JSON json)	877	encode_json (SV scalar, JSON json)
747	{	878	{
…		…
759	: enc.json.flags & F_LATIN1 ? 0x000100UL	890	: enc.json.flags & F_LATIN1 ? 0x000100UL
760	: 0x110000UL;	891	: 0x110000UL;
761		892
762	SvPOK_only (enc.sv);	893	SvPOK_only (enc.sv);
763	encode_sv (&enc, scalar);	894	encode_sv (&enc, scalar);
		895	encode_nl (&enc);
764		896
765	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	897	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
766	*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
767		899
768	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	900	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
948	else if (expect_true (ch >= 0x20 && ch < 0x80))	1080	else if (expect_true (ch >= 0x20 && ch < 0x80))
949	*cur++ = ch;	1081	*cur++ = ch;
950	else if (ch >= 0x80)	1082	else if (ch >= 0x80)
951	{	1083	{
952	STRLEN clen;	1084	STRLEN clen;
953	UV uch;
954		1085
955	--dec_cur;	1086	--dec_cur;
956		1087
957	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1088	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
958	if (clen == (STRLEN)-1)	1089	if (clen == (STRLEN)-1)
959	ERR ("malformed UTF-8 character in JSON string");	1090	ERR ("malformed UTF-8 character in JSON string");
960		1091
961	do	1092	do
962	cur++ = dec_cur++;	1093	cur++ = dec_cur++;
…		…
1084		1215
1085	// special case the rather common 1..5-digit-int case	1216	// special case the rather common 1..5-digit-int case
1086	if (*start == '-')	1217	if (*start == '-')
1087	switch (len)	1218	switch (len)
1088	{	1219	{
1089	case 2: return newSViv (-( start [1] - '0' * 1));	1220	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1090	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1221	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1091	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));
1092	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));
1093	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));
1094	}	1225	}
1095	else	1226	else
1096	switch (len)	1227	switch (len)
1097	{	1228	{
1098	case 1: return newSViv ( start [0] - '0' * 1);	1229	case 1: return newSViv ( start [0] - '0' * 1);
1099	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1230	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1100	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);
1101	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);
1102	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);
1103	}	1234	}
1104		1235
1105	{	1236	{
1106	UV uv;	1237	UV uv;
1107	int numtype = grok_number (start, len, &uv);	1238	int numtype = grok_number (start, len, &uv);
…		…
1116	}	1247	}
1117		1248
1118	len -= *start == '-' ? 1 : 0;	1249	len -= *start == '-' ? 1 : 0;
1119		1250
1120	// does not fit into IV or UV, try NV	1251	// does not fit into IV or UV, try NV
1121	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1252	if (len <= NV_DIG)
1122	#if defined (LDBL_DIG)
1123	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1124	#endif
1125	)
1126	// fits into NV without loss of precision	1253	// fits into NV without loss of precision
1127	return newSVnv (Atof (start));	1254	return newSVnv (json_atof (start));
1128		1255
1129	// everything else fails, convert it to a string	1256	// everything else fails, convert it to a string
1130	return newSVpvn (start, dec->cur - start);	1257	return newSVpvn (start, dec->cur - start);
1131	}	1258	}
1132		1259
1133	// loss of precision here	1260	// loss of precision here
1134	return newSVnv (Atof (start));	1261	return newSVnv (json_atof (start));
1135		1262
1136	fail:	1263	fail:
1137	return 0;	1264	return 0;
1138	}	1265	}
1139		1266
…		…
1163	if (*dec->cur == ']')	1290	if (*dec->cur == ']')
1164	{	1291	{
1165	++dec->cur;	1292	++dec->cur;
1166	break;	1293	break;
1167	}	1294	}
1168		1295
1169	if (*dec->cur != ',')	1296	if (*dec->cur != ',')
1170	ERR (", or ] expected while parsing array");	1297	ERR (", or ] expected while parsing array");
1171		1298
1172	++dec->cur;	1299	++dec->cur;
1173		1300
…		…
1308	dSP;	1435	dSP;
1309	int count;	1436	int count;
1310		1437
1311	ENTER; SAVETMPS; PUSHMARK (SP);	1438	ENTER; SAVETMPS; PUSHMARK (SP);
1312	XPUSHs (HeVAL (he));	1439	XPUSHs (HeVAL (he));
		1440	sv_2mortal (sv);
1313		1441
1314	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1442	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1315		1443
1316	if (count == 1)	1444	if (count == 1)
1317	{	1445	{
1318	sv = newSVsv (POPs);	1446	sv = newSVsv (POPs);
1319	FREETMPS; LEAVE;	1447	FREETMPS; LEAVE;
1320	return sv;	1448	return sv;
1321	}	1449	}
1322		1450
		1451	SvREFCNT_inc (sv);
1323	FREETMPS; LEAVE;	1452	FREETMPS; LEAVE;
1324	}	1453	}
1325	}	1454	}
1326		1455
1327	if (dec->json.cb_object)	1456	if (dec->json.cb_object)
…		…
1353	DEC_DEC_DEPTH;	1482	DEC_DEC_DEPTH;
1354	return 0;	1483	return 0;
1355	}	1484	}
1356		1485
1357	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 *
1358	decode_sv (dec_t *dec)	1563	decode_sv (dec_t *dec)
1359	{	1564	{
1360	// the beauty of JSON: you need exactly one character lookahead	1565	// the beauty of JSON: you need exactly one character lookahead
1361	// to parse everything.	1566	// to parse everything.
1362	switch (*dec->cur)	1567	switch (*dec->cur)
1363	{	1568	{
1364	case '"': ++dec->cur; return decode_str (dec);	1569	case '"': ++dec->cur; return decode_str (dec);
1365	case '[': ++dec->cur; return decode_av (dec);	1570	case '[': ++dec->cur; return decode_av (dec);
1366	case '{': ++dec->cur; return decode_hv (dec);	1571	case '{': ++dec->cur; return decode_hv (dec);
		1572	case '(': return decode_tag (dec);
1367		1573
1368	case '-':	1574	case '-':
1369	case '0': case '1': case '2': case '3': case '4':	1575	case '0': case '1': case '2': case '3': case '4':
1370	case '5': case '6': case '7': case '8': case '9':	1576	case '5': case '6': case '7': case '8': case '9':
1371	return decode_num (dec);	1577	return decode_num (dec);
…		…
1373	case 't':	1579	case 't':
1374	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1580	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1375	{	1581	{
1376	dec->cur += 4;	1582	dec->cur += 4;
1377	#if JSON_SLOW	1583	#if JSON_SLOW
1378	json_true = get_bool ("JSON::XS::true");	1584	types_true = get_bool ("Types::Serialiser::true");
1379	#endif	1585	#endif
1380	return newSVsv (json_true);	1586	return newSVsv (types_true);
1381	}	1587	}
1382	else	1588	else
1383	ERR ("'true' expected");	1589	ERR ("'true' expected");
1384		1590
1385	break;	1591	break;
…		…
1387	case 'f':	1593	case 'f':
1388	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1594	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1389	{	1595	{
1390	dec->cur += 5;	1596	dec->cur += 5;
1391	#if JSON_SLOW	1597	#if JSON_SLOW
1392	json_false = get_bool ("JSON::XS::false");	1598	types_false = get_bool ("Types::Serialiser::false");
1393	#endif	1599	#endif
1394	return newSVsv (json_false);	1600	return newSVsv (types_false);
1395	}	1601	}
1396	else	1602	else
1397	ERR ("'false' expected");	1603	ERR ("'false' expected");
1398		1604
1399	break;	1605	break;
…		…
1408	ERR ("'null' expected");	1614	ERR ("'null' expected");
1409		1615
1410	break;	1616	break;
1411		1617
1412	default:	1618	default:
1413	ERR ("malformed JSON string, neither array, object, number, string or atom");	1619	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1414	break;	1620	break;
1415	}	1621	}
1416		1622
1417	fail:	1623	fail:
1418	return 0;	1624	return 0;
…		…
1423	{	1629	{
1424	dec_t dec;	1630	dec_t dec;
1425	SV *sv;	1631	SV *sv;
1426		1632
1427	/* work around bugs in 5.10 where manipulating magic values	1633	/* work around bugs in 5.10 where manipulating magic values
1428	* will perl ignore the magic in subsequent accesses	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).
1429	*/	1637	*/
1430	/SvGETMAGIC (string);/	1638	/SvGETMAGIC (string);/
1431	if (SvMAGICAL (string))	1639	if (SvMAGICAL (string) \|\| !SvPOK (string))
1432	string = sv_2mortal (newSVsv (string));	1640	string = sv_2mortal (newSVsv (string));
1433		1641
1434	SvUPGRADE (string, SVt_PV);	1642	SvUPGRADE (string, SVt_PV);
1435		1643
1436	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1644	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1453	if (offset > json->max_size && json->max_size)	1661	if (offset > json->max_size && json->max_size)
1454	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",
1455	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1663	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1456	}	1664	}
1457		1665
1458	if (json->flags & F_UTF8)	1666	if (DECODE_WANTS_OCTETS (json))
1459	sv_utf8_downgrade (string, 0);	1667	sv_utf8_downgrade (string, 0);
1460	else	1668	else
1461	sv_utf8_upgrade (string);	1669	sv_utf8_upgrade (string);
1462		1670
1463	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1671	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1505	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);
1506	LEAVE;	1714	LEAVE;
1507		1715
1508	croak ("%s, at character offset %d (before \"%s\")",	1716	croak ("%s, at character offset %d (before \"%s\")",
1509	dec.err,	1717	dec.err,
1510	ptr_to_index (string, dec.cur),	1718	(int)ptr_to_index (string, dec.cur),
1511	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1719	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1512	}	1720	}
1513		1721
1514	sv = sv_2mortal (sv);	1722	sv = sv_2mortal (sv);
1515		1723
…		…
1524		1732
1525	static void	1733	static void
1526	incr_parse (JSON *self)	1734	incr_parse (JSON *self)
1527	{	1735	{
1528	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...
1529		1740
1530	for (;;)	1741	for (;;)
1531	{	1742	{
1532	//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
1533	switch (self->incr_mode)	1744	switch (self->incr_mode)
1534	{	1745	{
1535	// only used for intiial whitespace skipping	1746	// only used for initial whitespace skipping
1536	case INCR_M_WS:	1747	case INCR_M_WS:
1537	for (;;)	1748	for (;;)
1538	{	1749	{
1539	if (*p > 0x20)	1750	if (*p > 0x20)
1540	{	1751	{
		1752	if (*p == '#')
		1753	{
		1754	self->incr_mode = INCR_M_C0;
		1755	goto incr_m_c;
		1756	}
		1757	else
		1758	{
1541	self->incr_mode = INCR_M_JSON;	1759	self->incr_mode = INCR_M_JSON;
1542	goto incr_m_json;	1760	goto incr_m_json;
		1761	}
1543	}	1762	}
1544	else if (!*p)	1763	else if (!*p)
1545	goto interrupt;	1764	goto interrupt;
1546		1765
1547	++p;	1766	++p;
…		…
1553	goto interrupt;	1772	goto interrupt;
1554		1773
1555	++p;	1774	++p;
1556	self->incr_mode = INCR_M_STR;	1775	self->incr_mode = INCR_M_STR;
1557	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;
1558		1796
1559	// inside a string	1797	// inside a string
1560	case INCR_M_STR:	1798	case INCR_M_STR:
1561	incr_m_str:	1799	incr_m_str:
1562	for (;;)	1800	for (;;)
…		…
1613	self->incr_mode = INCR_M_STR;	1851	self->incr_mode = INCR_M_STR;
1614	goto incr_m_str;	1852	goto incr_m_str;
1615		1853
1616	case '[':	1854	case '[':
1617	case '{':	1855	case '{':
		1856	case '(':
1618	if (++self->incr_nest > self->max_depth)	1857	if (++self->incr_nest > self->max_depth)
1619	croak (ERR_NESTING_EXCEEDED);	1858	croak (ERR_NESTING_EXCEEDED);
1620	break;	1859	break;
1621		1860
1622	case ']':	1861	case ']':
1623	case '}':	1862	case '}':
1624	if (--self->incr_nest <= 0)	1863	if (--self->incr_nest <= 0)
1625	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;
1626	}	1874	}
1627	}	1875	}
1628	}	1876	}
1629		1877
1630	modechange:	1878	modechange:
1631	;	1879	;
1632	}	1880	}
1633		1881
1634	interrupt:	1882	interrupt:
1635	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
1636	//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
1637	}	1886	}
1638		1887
1639	/////////////////////////////////////////////////////////////////////////////	1888	/////////////////////////////////////////////////////////////////////////////
1640	// XS interface functions	1889	// XS interface functions
…		…
1650	i >= '0' && i <= '9' ? i - '0'	1899	i >= '0' && i <= '9' ? i - '0'
1651	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1900	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1652	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1901	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1653	: -1;	1902	: -1;
1654		1903
1655	json_stash = gv_stashpv ("JSON::XS" , 1);	1904	json_stash = gv_stashpv ("JSON::XS" , 1);
1656	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1905	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1657		1906
1658	json_true = get_bool ("JSON::XS::true");	1907	types_true = get_bool ("Types::Serialiser::true");
1659	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 */
1660	}	1914	}
1661		1915
1662	PROTOTYPES: DISABLE	1916	PROTOTYPES: DISABLE
1663		1917
1664	void CLONE (...)	1918	void CLONE (...)
1665	CODE:	1919	CODE:
1666	json_stash = 0;	1920	json_stash = 0;
1667	json_boolean_stash = 0;	1921	types_boolean_stash = 0;
1668		1922
1669	void new (char *klass)	1923	void new (char *klass)
1670	PPCODE:	1924	PPCODE:
1671	{	1925	{
1672	SV *pv = NEWSV (0, sizeof (JSON));	1926	SV *pv = NEWSV (0, sizeof (JSON));
1673	SvPOK_only (pv);	1927	SvPOK_only (pv);
1674	json_init ((JSON *)SvPVX (pv));	1928	json_init ((JSON *)SvPVX (pv));
1675	XPUSHs (sv_2mortal (sv_bless (	1929	XPUSHs (sv_2mortal (sv_bless (
1676	newRV_noinc (pv),	1930	newRV_noinc (pv),
1677	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1931	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1692	shrink = F_SHRINK	1946	shrink = F_SHRINK
1693	allow_blessed = F_ALLOW_BLESSED	1947	allow_blessed = F_ALLOW_BLESSED
1694	convert_blessed = F_CONV_BLESSED	1948	convert_blessed = F_CONV_BLESSED
1695	relaxed = F_RELAXED	1949	relaxed = F_RELAXED
1696	allow_unknown = F_ALLOW_UNKNOWN	1950	allow_unknown = F_ALLOW_UNKNOWN
		1951	allow_tags = F_ALLOW_TAGS
1697	PPCODE:	1952	PPCODE:
1698	{	1953	{
1699	if (enable)	1954	if (enable)
1700	self->flags \|= ix;	1955	self->flags \|= ix;
1701	else	1956	else
…		…
1717	get_shrink = F_SHRINK	1972	get_shrink = F_SHRINK
1718	get_allow_blessed = F_ALLOW_BLESSED	1973	get_allow_blessed = F_ALLOW_BLESSED
1719	get_convert_blessed = F_CONV_BLESSED	1974	get_convert_blessed = F_CONV_BLESSED
1720	get_relaxed = F_RELAXED	1975	get_relaxed = F_RELAXED
1721	get_allow_unknown = F_ALLOW_UNKNOWN	1976	get_allow_unknown = F_ALLOW_UNKNOWN
		1977	get_allow_tags = F_ALLOW_TAGS
1722	PPCODE:	1978	PPCODE:
1723	XPUSHs (boolSV (self->flags & ix));	1979	XPUSHs (boolSV (self->flags & ix));
1724		1980
1725	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	1981	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1726	PPCODE:	1982	PPCODE:
…		…
1754	}	2010	}
1755		2011
1756	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)
1757	PPCODE:	2013	PPCODE:
1758	{	2014	{
1759	if (!self->cb_sk_object)	2015	if (!self->cb_sk_object)
1760	self->cb_sk_object = newHV ();	2016	self->cb_sk_object = newHV ();
1761		2017
1762	if (SvOK (cb))	2018	if (SvOK (cb))
1763	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2019	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1764	else	2020	else
…		…
1775	XPUSHs (ST (0));	2031	XPUSHs (ST (0));
1776	}	2032	}
1777		2033
1778	void encode (JSON self, SV scalar)	2034	void encode (JSON self, SV scalar)
1779	PPCODE:	2035	PPCODE:
1780	XPUSHs (encode_json (scalar, self));	2036	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2037	XPUSHs (scalar);
1781		2038
1782	void decode (JSON self, SV jsonstr)	2039	void decode (JSON self, SV jsonstr)
1783	PPCODE:	2040	PPCODE:
1784	XPUSHs (decode_json (jsonstr, self, 0));	2041	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2042	XPUSHs (jsonstr);
1785		2043
1786	void decode_prefix (JSON self, SV jsonstr)	2044	void decode_prefix (JSON self, SV jsonstr)
1787	PPCODE:	2045	PPCODE:
1788	{	2046	{
		2047	SV *sv;
1789	char *offset;	2048	char *offset;
		2049	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1790	EXTEND (SP, 2);	2050	EXTEND (SP, 2);
1791	PUSHs (decode_json (jsonstr, self, &offset));	2051	PUSHs (sv);
1792	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2052	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1793	}	2053	}
1794		2054
1795	void incr_parse (JSON self, SV jsonstr = 0)	2055	void incr_parse (JSON self, SV jsonstr = 0)
1796	PPCODE:	2056	PPCODE:
1797	{	2057	{
1798	if (!self->incr_text)	2058	if (!self->incr_text)
1799	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	}
1800		2079
1801	// append data, if any	2080	// append data, if any
1802	if (jsonstr)	2081	if (jsonstr)
1803	{	2082	{
		2083	/* make sure both strings have same encoding */
		2084	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1804	if (SvUTF8 (jsonstr))	2085	if (SvUTF8 (jsonstr))
		2086	sv_utf8_downgrade (jsonstr, 0);
1805	{	2087	else
1806	if (!SvUTF8 (self->incr_text))
1807	{
1808	/* utf-8-ness differs, need to upgrade */
1809	sv_utf8_upgrade (self->incr_text);
1810
1811	if (self->incr_pos)
1812	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1813	- (U8 *)SvPVX (self->incr_text);
1814	}
1815	}
1816	else if (SvUTF8 (self->incr_text))
1817	sv_utf8_upgrade (jsonstr);	2088	sv_utf8_upgrade (jsonstr);
1818		2089
		2090	/* and then just blindly append */
1819	{	2091	{
1820	STRLEN len;	2092	STRLEN len;
1821	const char *str = SvPV (jsonstr, len);	2093	const char *str = SvPV (jsonstr, len);
1822	STRLEN cur = SvCUR (self->incr_text);	2094	STRLEN cur = SvCUR (self->incr_text);
1823		2095
…		…
1831	}	2103	}
1832		2104
1833	if (GIMME_V != G_VOID)	2105	if (GIMME_V != G_VOID)
1834	do	2106	do
1835	{	2107	{
		2108	SV *sv;
1836	char *offset;	2109	char *offset;
1837		2110
1838	if (!INCR_DONE (self))	2111	if (!INCR_DONE (self))
1839	{	2112	{
1840	incr_parse (self);	2113	incr_parse (self);
…		…
1842	if (self->incr_pos > self->max_size && self->max_size)	2115	if (self->incr_pos > self->max_size && self->max_size)
1843	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	2116	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1844	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2117	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1845		2118
1846	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
1847	break;	2128	break;
		2129	}
1848	}	2130	}
1849		2131
1850	XPUSHs (decode_json (self->incr_text, self, &offset));	2132	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2133	XPUSHs (sv);
1851		2134
1852	self->incr_pos -= offset - SvPVX (self->incr_text);	2135	self->incr_pos -= offset - SvPVX (self->incr_text);
1853	self->incr_nest = 0;	2136	self->incr_nest = 0;
1854	self->incr_mode = 0;	2137	self->incr_mode = 0;
1855		2138
…		…
1899	SvREFCNT_dec (self->incr_text);	2182	SvREFCNT_dec (self->incr_text);
1900		2183
1901	PROTOTYPES: ENABLE	2184	PROTOTYPES: ENABLE
1902		2185
1903	void encode_json (SV *scalar)	2186	void encode_json (SV *scalar)
1904	ALIAS:
1905	to_json_ = 0
1906	encode_json = F_UTF8
1907	PPCODE:	2187	PPCODE:
1908	{	2188	{
1909	JSON json;	2189	JSON json;
1910	json_init (&json);	2190	json_init (&json);
1911	json.flags \|= ix;	2191	json.flags \|= F_UTF8;
1912	XPUSHs (encode_json (scalar, &json));	2192	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2193	XPUSHs (scalar);
1913	}	2194	}
1914		2195
1915	void decode_json (SV *jsonstr)	2196	void decode_json (SV *jsonstr)
1916	ALIAS:
1917	from_json_ = 0
1918	decode_json = F_UTF8
1919	PPCODE:	2197	PPCODE:
1920	{	2198	{
1921	JSON json;	2199	JSON json;
1922	json_init (&json);	2200	json_init (&json);
1923	json.flags \|= ix;	2201	json.flags \|= F_UTF8;
1924	XPUSHs (decode_json (jsonstr, &json, 0));	2202	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2203	XPUSHs (jsonstr);
1925	}	2204	}
1926		2205
1927

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.96 by root, Sat May 30 06:26:05 2009 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.96 by root, Sat May 30 06:26:05 2009 UTC vs.
Revision 1.120 by root, Mon Oct 28 23:23:10 2013 UTC