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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.103 by root, Wed Jan 6 08:01:39 2010 UTC vs.
Revision 1.129 by root, Wed Nov 16 18:06:34 2016 UTC

…		…
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	// guarantees, 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
		21
		22	// compatibility with perl <5.18
		23	#ifndef HvNAMELEN_get
		24	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		25	#endif
		26	#ifndef HvNAMELEN
		27	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		28	#endif
		29	#ifndef HvNAMEUTF8
		30	# define HvNAMEUTF8(hv) 0
20	#endif	31	#endif
21		32
22	// three extra for rounding, sign, and end of string	33	// three extra for rounding, sign, and end of string
23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)	34	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24		35
…		…
33	#define F_SHRINK 0x00000200UL	44	#define F_SHRINK 0x00000200UL
34	#define F_ALLOW_BLESSED 0x00000400UL	45	#define F_ALLOW_BLESSED 0x00000400UL
35	#define F_CONV_BLESSED 0x00000800UL	46	#define F_CONV_BLESSED 0x00000800UL
36	#define F_RELAXED 0x00001000UL	47	#define F_RELAXED 0x00001000UL
37	#define F_ALLOW_UNKNOWN 0x00002000UL	48	#define F_ALLOW_UNKNOWN 0x00002000UL
		49	#define F_ALLOW_TAGS 0x00004000UL
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	50	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		51
40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	52	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
41		53
42	#define INIT_SIZE 32 // initial scalar size to be allocated	54	#define INIT_SIZE 32 // initial scalar size to be allocated
43	#define INDENT_STEP 3 // spaces per indentation level	55	#define INDENT_STEP 3 // spaces per indentation level
44		56
45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	57	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		58
		59	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46		60
47	#define SB do {	61	#define SB do {
48	#define SE } while (0)	62	#define SE } while (0)
49		63
50	#if __GNUC__ >= 3	64	#if __GNUC__ >= 3
…		…
65	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"	79	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
66		80
67	#ifdef USE_ITHREADS	81	#ifdef USE_ITHREADS
68	# define JSON_SLOW 1	82	# define JSON_SLOW 1
69	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	83	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		84	# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
70	#else	85	#else
71	# define JSON_SLOW 0	86	# define JSON_SLOW 0
72	# define JSON_STASH json_stash	87	# define JSON_STASH json_stash
		88	# define BOOL_STASH bool_stash
73	#endif	89	#endif
74		90
75	static HV json_stash, json_boolean_stash; // JSON::XS::	91	// the amount of HEs to allocate on the stack, when sorting keys
76	static SV json_true, json_false;	92	#define STACK_HES 64
		93
		94	static HV json_stash, bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
		95	static SV bool_true, bool_false, *sv_json;
77		96
78	enum {	97	enum {
79	INCR_M_WS = 0, // initial whitespace skipping, must be 0	98	INCR_M_WS = 0, // initial whitespace skipping, must be 0
80	INCR_M_STR, // inside string	99	INCR_M_STR, // inside string
81	INCR_M_BS, // inside backslash	100	INCR_M_BS, // inside backslash
…		…
185	ptr_to_index (SV sv, char offset)	204	ptr_to_index (SV sv, char offset)
186	{	205	{
187	return SvUTF8 (sv)	206	return SvUTF8 (sv)
188	? utf8_distance (offset, SvPVX (sv))	207	? utf8_distance (offset, SvPVX (sv))
189	: offset - SvPVX (sv);	208	: offset - SvPVX (sv);
		209	}
		210
		211	/////////////////////////////////////////////////////////////////////////////
		212	// fp hell
		213
		214	// scan a group of digits, and a trailing exponent
		215	static void
		216	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		217	{
		218	UV uaccum = 0;
		219	int eaccum = 0;
		220
		221	// if we recurse too deep, skip all remaining digits
		222	// to avoid a stack overflow attack
		223	if (expect_false (--maxdepth <= 0))
		224	while (((U8)*s - '0') < 10)
		225	++s;
		226
		227	for (;;)
		228	{
		229	U8 dig = (U8)*s - '0';
		230
		231	if (expect_false (dig >= 10))
		232	{
		233	if (dig == (U8)((U8)'.' - (U8)'0'))
		234	{
		235	++s;
		236	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		237	}
		238	else if ((dig \| ' ') == 'e' - '0')
		239	{
		240	int exp2 = 0;
		241	int neg = 0;
		242
		243	++s;
		244
		245	if (*s == '-')
		246	{
		247	++s;
		248	neg = 1;
		249	}
		250	else if (*s == '+')
		251	++s;
		252
		253	while ((dig = (U8)*s - '0') < 10)
		254	exp2 = exp2 * 10 + *s++ - '0';
		255
		256	*expo += neg ? -exp2 : exp2;
		257	}
		258
		259	break;
		260	}
		261
		262	++s;
		263
		264	uaccum = uaccum * 10 + dig;
		265	++eaccum;
		266
		267	// if we have too many digits, then recurse for more
		268	// we actually do this for rather few digits
		269	if (uaccum >= (UV_MAX - 9) / 10)
		270	{
		271	if (postdp) *expo -= eaccum;
		272	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		273	if (postdp) *expo += eaccum;
		274
		275	break;
		276	}
		277	}
		278
		279	// this relies greatly on the quality of the pow ()
		280	// implementation of the platform, but a good
		281	// implementation is hard to beat.
		282	// (IEEE 754 conformant ones are required to be exact)
		283	if (postdp) *expo -= eaccum;
		284	accum += uaccum Perl_pow (10., *expo);
		285	*expo += eaccum;
		286	}
		287
		288	static NV
		289	json_atof (const char *s)
		290	{
		291	NV accum = 0.;
		292	int expo = 0;
		293	int neg = 0;
		294
		295	if (*s == '-')
		296	{
		297	++s;
		298	neg = 1;
		299	}
		300
		301	// a recursion depth of ten gives us >>500 bits
		302	json_atof_scan1 (s, &accum, &expo, 0, 10);
		303
		304	return neg ? -accum : accum;
		305	}
		306
		307	// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
		308	static int
		309	ref_bool_type (SV *sv)
		310	{
		311	svtype svt = SvTYPE (sv);
		312
		313	if (svt < SVt_PVAV)
		314	{
		315	STRLEN len = 0;
		316	char *pv = svt ? SvPV (sv, len) : 0;
		317
		318	if (len == 1)
		319	if (*pv == '1')
		320	return 1;
		321	else if (*pv == '0')
		322	return 0;
		323	}
		324
		325	return -1;
		326	}
		327
		328	// returns whether scalar is not a reference in the sense of allow_nonref
		329	static int
		330	json_nonref (SV *scalar)
		331	{
		332	if (!SvROK (scalar))
		333	return 1;
		334
		335	scalar = SvRV (scalar);
		336
		337	if (SvTYPE (scalar) >= SVt_PVMG)
		338	{
		339	if (SvSTASH (scalar) == bool_stash)
		340	return 1;
		341
		342	if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
		343	return 1;
		344	}
		345
		346	return 0;
190	}	347	}
191		348
192	/////////////////////////////////////////////////////////////////////////////	349	/////////////////////////////////////////////////////////////////////////////
193	// encoder	350	// encoder
194		351
…		…
383		540
384	if (enc->indent >= enc->json.max_depth)	541	if (enc->indent >= enc->json.max_depth)
385	croak (ERR_NESTING_EXCEEDED);	542	croak (ERR_NESTING_EXCEEDED);
386		543
387	encode_ch (enc, '[');	544	encode_ch (enc, '[');
388		545
389	if (len >= 0)	546	if (len >= 0)
390	{	547	{
391	encode_nl (enc); ++enc->indent;	548	encode_nl (enc); ++enc->indent;
392		549
393	for (i = 0; i <= len; ++i)	550	for (i = 0; i <= len; ++i)
…		…
405	encode_comma (enc);	562	encode_comma (enc);
406	}	563	}
407		564
408	encode_nl (enc); --enc->indent; encode_indent (enc);	565	encode_nl (enc); --enc->indent; encode_indent (enc);
409	}	566	}
410		567
411	encode_ch (enc, ']');	568	encode_ch (enc, ']');
412	}	569	}
413		570
414	static void	571	static void
415	encode_hk (enc_t enc, HE he)	572	encode_hk (enc_t enc, HE he)
…		…
419	if (HeKLEN (he) == HEf_SVKEY)	576	if (HeKLEN (he) == HEf_SVKEY)
420	{	577	{
421	SV *sv = HeSVKEY (he);	578	SV *sv = HeSVKEY (he);
422	STRLEN len;	579	STRLEN len;
423	char *str;	580	char *str;
424		581
425	SvGETMAGIC (sv);	582	SvGETMAGIC (sv);
426	str = SvPV (sv, len);	583	str = SvPV (sv, len);
427		584
428	encode_str (enc, str, len, SvUTF8 (sv));	585	encode_str (enc, str, len, SvUTF8 (sv));
429	}	586	}
…		…
495	}	652	}
496		653
497	if (count)	654	if (count)
498	{	655	{
499	int i, fast = 1;	656	int i, fast = 1;
500	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	657	HE *hes_stack [STACK_HES];
501	HE *hes = _alloca (count sizeof (HE));	658	HE **hes = hes_stack;
502	#else	659
503	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	660	// allocate larger arrays on the heap
504	#endif	661	if (count > STACK_HES)
		662	{
		663	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		664	hes = (HE **)SvPVX (sv);
		665	}
505		666
506	i = 0;	667	i = 0;
507	while ((he = hv_iternext (hv)))	668	while ((he = hv_iternext (hv)))
508	{	669	{
509	hes [i++] = he;	670	hes [i++] = he;
…		…
578	// encode objects, arrays and special \0=false and \1=true values.	739	// encode objects, arrays and special \0=false and \1=true values.
579	static void	740	static void
580	encode_rv (enc_t enc, SV sv)	741	encode_rv (enc_t enc, SV sv)
581	{	742	{
582	svtype svt;	743	svtype svt;
		744	GV *method;
583		745
584	SvGETMAGIC (sv);	746	SvGETMAGIC (sv);
585	svt = SvTYPE (sv);	747	svt = SvTYPE (sv);
586		748
587	if (expect_false (SvOBJECT (sv)))	749	if (expect_false (SvOBJECT (sv)))
588	{	750	{
589	HV *stash = !JSON_SLOW \|\| json_boolean_stash	751	HV *stash = SvSTASH (sv);
590	? json_boolean_stash
591	: gv_stashpv ("JSON::XS::Boolean", 1);
592		752
593	if (SvSTASH (sv) == stash)	753	if (stash == bool_stash)
594	{	754	{
595	if (SvIV (sv))	755	if (SvIV (sv))
596	encode_str (enc, "true", 4, 0);	756	encode_str (enc, "true", 4, 0);
597	else	757	else
598	encode_str (enc, "false", 5, 0);	758	encode_str (enc, "false", 5, 0);
599	}	759	}
		760	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		761	{
		762	int count;
		763	dSP;
		764
		765	ENTER; SAVETMPS;
		766	SAVESTACK_POS ();
		767	PUSHMARK (SP);
		768	EXTEND (SP, 2);
		769	// we re-bless the reference to get overload and other niceties right
		770	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		771	PUSHs (sv_json);
		772
		773	PUTBACK;
		774	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		775	SPAGAIN;
		776
		777	// catch this surprisingly common error
		778	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		779	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		780
		781	encode_ch (enc, '(');
		782	encode_ch (enc, '"');
		783	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		784	encode_ch (enc, '"');
		785	encode_ch (enc, ')');
		786	encode_ch (enc, '[');
		787
		788	while (count)
		789	{
		790	encode_sv (enc, SP[1 - count--]);
		791
		792	if (count)
		793	encode_ch (enc, ',');
		794	}
		795
		796	encode_ch (enc, ']');
		797
		798	FREETMPS; LEAVE;
		799	}
		800	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		801	{
		802	dSP;
		803
		804	ENTER; SAVETMPS;
		805	PUSHMARK (SP);
		806	// we re-bless the reference to get overload and other niceties right
		807	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		808
		809	// calling with G_SCALAR ensures that we always get a 1 return value
		810	PUTBACK;
		811	call_sv ((SV *)GvCV (method), G_SCALAR);
		812	SPAGAIN;
		813
		814	// catch this surprisingly common error
		815	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		816	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		817
		818	sv = POPs;
		819	PUTBACK;
		820
		821	encode_sv (enc, sv);
		822
		823	FREETMPS; LEAVE;
		824	}
		825	else if (enc->json.flags & F_ALLOW_BLESSED)
		826	encode_str (enc, "null", 4, 0);
600	else	827	else
601	{
602	#if 0
603	if (0 && sv_derived_from (rv, "JSON::Literal"))
604	{
605	// not yet
606	}
607	#endif
608	if (enc->json.flags & F_CONV_BLESSED)
609	{
610	// we re-bless the reference to get overload and other niceties right
611	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
612
613	if (to_json)
614	{
615	dSP;
616
617	ENTER; SAVETMPS; PUSHMARK (SP);
618	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
619
620	// calling with G_SCALAR ensures that we always get a 1 return value
621	PUTBACK;
622	call_sv ((SV *)GvCV (to_json), G_SCALAR);
623	SPAGAIN;
624
625	// catch this surprisingly common error
626	if (SvROK (TOPs) && SvRV (TOPs) == sv)
627	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
628
629	sv = POPs;
630	PUTBACK;
631
632	encode_sv (enc, sv);
633
634	FREETMPS; LEAVE;
635	}
636	else if (enc->json.flags & F_ALLOW_BLESSED)
637	encode_str (enc, "null", 4, 0);
638	else
639	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
640	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
641	}
642	else if (enc->json.flags & F_ALLOW_BLESSED)
643	encode_str (enc, "null", 4, 0);
644	else
645	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	828	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
646	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	829	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
647	}
648	}	830	}
649	else if (svt == SVt_PVHV)	831	else if (svt == SVt_PVHV)
650	encode_hv (enc, (HV *)sv);	832	encode_hv (enc, (HV *)sv);
651	else if (svt == SVt_PVAV)	833	else if (svt == SVt_PVAV)
652	encode_av (enc, (AV *)sv);	834	encode_av (enc, (AV *)sv);
653	else if (svt < SVt_PVAV)	835	else if (svt < SVt_PVAV)
654	{	836	{
655	STRLEN len = 0;	837	int bool_type = ref_bool_type (sv);
656	char *pv = svt ? SvPV (sv, len) : 0;
657		838
658	if (len == 1 && *pv == '1')	839	if (bool_type == 1)
659	encode_str (enc, "true", 4, 0);	840	encode_str (enc, "true", 4, 0);
660	else if (len == 1 && *pv == '0')	841	else if (bool_type == 0)
661	encode_str (enc, "false", 5, 0);	842	encode_str (enc, "false", 5, 0);
662	else if (enc->json.flags & F_ALLOW_UNKNOWN)	843	else if (enc->json.flags & F_ALLOW_UNKNOWN)
663	encode_str (enc, "null", 4, 0);	844	encode_str (enc, "null", 4, 0);
664	else	845	else
665	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	846	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
…		…
728	}	909	}
729	else	910	else
730	{	911	{
731	// large integer, use the (rather slow) snprintf way.	912	// large integer, use the (rather slow) snprintf way.
732	need (enc, IVUV_MAXCHARS);	913	need (enc, IVUV_MAXCHARS);
733	enc->cur +=	914	enc->cur +=
734	SvIsUV(sv)	915	SvIsUV(sv)
735	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	916	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
736	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	917	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
737	}	918	}
738	}	919	}
739	else if (SvROK (sv))	920	else if (SvROK (sv))
740	encode_rv (enc, SvRV (sv));	921	encode_rv (enc, SvRV (sv));
741	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	922	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
742	encode_str (enc, "null", 4, 0);	923	encode_str (enc, "null", 4, 0);
743	else	924	else
744	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	925	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
745	SvPV_nolen (sv), SvFLAGS (sv));	926	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
746	}	927	}
747		928
748	static SV *	929	static SV *
749	encode_json (SV scalar, JSON json)	930	encode_json (SV scalar, JSON json)
750	{	931	{
751	enc_t enc;	932	enc_t enc;
752		933
753	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	934	if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
754	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	935	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
755		936
756	enc.json = *json;	937	enc.json = *json;
757	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	938	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
758	enc.cur = SvPVX (enc.sv);	939	enc.cur = SvPVX (enc.sv);
…		…
965	cur++ = dec_cur++;	1146	cur++ = dec_cur++;
966	while (--clen);	1147	while (--clen);
967		1148
968	utf8 = 1;	1149	utf8 = 1;
969	}	1150	}
		1151	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1152	*cur++ = ch;
970	else	1153	else
971	{	1154	{
972	--dec_cur;	1155	--dec_cur;
973		1156
974	if (!ch)	1157	if (!ch)
…		…
1119	}	1302	}
1120		1303
1121	len -= *start == '-' ? 1 : 0;	1304	len -= *start == '-' ? 1 : 0;
1122		1305
1123	// does not fit into IV or UV, try NV	1306	// does not fit into IV or UV, try NV
1124	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1307	if (len <= NV_DIG)
1125	#if defined (LDBL_DIG)
1126	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1127	#endif
1128	)
1129	// fits into NV without loss of precision	1308	// fits into NV without loss of precision
1130	return newSVnv (Atof (start));	1309	return newSVnv (json_atof (start));
1131		1310
1132	// everything else fails, convert it to a string	1311	// everything else fails, convert it to a string
1133	return newSVpvn (start, dec->cur - start);	1312	return newSVpvn (start, dec->cur - start);
1134	}	1313	}
1135		1314
1136	// loss of precision here	1315	// loss of precision here
1137	return newSVnv (Atof (start));	1316	return newSVnv (json_atof (start));
1138		1317
1139	fail:	1318	fail:
1140	return 0;	1319	return 0;
1141	}	1320	}
1142		1321
…		…
1166	if (*dec->cur == ']')	1345	if (*dec->cur == ']')
1167	{	1346	{
1168	++dec->cur;	1347	++dec->cur;
1169	break;	1348	break;
1170	}	1349	}
1171		1350
1172	if (*dec->cur != ',')	1351	if (*dec->cur != ',')
1173	ERR (", or ] expected while parsing array");	1352	ERR (", or ] expected while parsing array");
1174		1353
1175	++dec->cur;	1354	++dec->cur;
1176		1355
…		…
1300		1479
1301	hv_iterinit (hv);	1480	hv_iterinit (hv);
1302	he = hv_iternext (hv);	1481	he = hv_iternext (hv);
1303	hv_iterinit (hv);	1482	hv_iterinit (hv);
1304		1483
1305	// the next line creates a mortal sv each time its called.	1484	// the next line creates a mortal sv each time it's called.
1306	// might want to optimise this for common cases.	1485	// might want to optimise this for common cases.
1307	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);	1486	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1308		1487
1309	if (cb)	1488	if (cb)
1310	{	1489	{
1311	dSP;	1490	dSP;
1312	int count;	1491	int count;
1313		1492
1314	ENTER; SAVETMPS; PUSHMARK (SP);	1493	ENTER; SAVETMPS;
		1494	SAVESTACK_POS ();
		1495	PUSHMARK (SP);
1315	XPUSHs (HeVAL (he));	1496	XPUSHs (HeVAL (he));
		1497	sv_2mortal (sv);
1316		1498
1317	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1499	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1318		1500
1319	if (count == 1)	1501	if (count == 1)
1320	{	1502	{
1321	sv = newSVsv (POPs);	1503	sv = newSVsv (POPs);
1322	FREETMPS; LEAVE;	1504	FREETMPS; LEAVE;
1323	return sv;	1505	return sv;
1324	}	1506	}
1325		1507
		1508	SvREFCNT_inc (sv);
1326	FREETMPS; LEAVE;	1509	FREETMPS; LEAVE;
1327	}	1510	}
1328	}	1511	}
1329		1512
1330	if (dec->json.cb_object)	1513	if (dec->json.cb_object)
1331	{	1514	{
1332	dSP;	1515	dSP;
1333	int count;	1516	int count;
1334		1517
1335	ENTER; SAVETMPS; PUSHMARK (SP);	1518	ENTER; SAVETMPS;
		1519	SAVESTACK_POS ();
		1520	PUSHMARK (SP);
1336	XPUSHs (sv_2mortal (sv));	1521	XPUSHs (sv_2mortal (sv));
1337		1522
1338	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1523	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1339		1524
1340	if (count == 1)	1525	if (count == 1)
…		…
1356	DEC_DEC_DEPTH;	1541	DEC_DEC_DEPTH;
1357	return 0;	1542	return 0;
1358	}	1543	}
1359		1544
1360	static SV *	1545	static SV *
		1546	decode_tag (dec_t *dec)
		1547	{
		1548	SV *tag = 0;
		1549	SV *val = 0;
		1550
		1551	if (!(dec->json.flags & F_ALLOW_TAGS))
		1552	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1553
		1554	++dec->cur;
		1555
		1556	decode_ws (dec);
		1557
		1558	tag = decode_sv (dec);
		1559	if (!tag)
		1560	goto fail;
		1561
		1562	if (!SvPOK (tag))
		1563	ERR ("malformed JSON string, (tag) must be a string");
		1564
		1565	decode_ws (dec);
		1566
		1567	if (*dec->cur != ')')
		1568	ERR (") expected after tag");
		1569
		1570	++dec->cur;
		1571
		1572	decode_ws (dec);
		1573
		1574	val = decode_sv (dec);
		1575	if (!val)
		1576	goto fail;
		1577
		1578	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1579	ERR ("malformed JSON string, tag value must be an array");
		1580
		1581	{
		1582	AV av = (AV )SvRV (val);
		1583	int i, len = av_len (av) + 1;
		1584	HV *stash = gv_stashsv (tag, 0);
		1585	SV *sv;
		1586
		1587	if (!stash)
		1588	ERR ("cannot decode perl-object (package does not exist)");
		1589
		1590	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1591
		1592	if (!method)
		1593	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1594
		1595	dSP;
		1596
		1597	ENTER; SAVETMPS;
		1598	PUSHMARK (SP);
		1599	EXTEND (SP, len + 2);
		1600	// we re-bless the reference to get overload and other niceties right
		1601	PUSHs (tag);
		1602	PUSHs (sv_json);
		1603
		1604	for (i = 0; i < len; ++i)
		1605	PUSHs (*av_fetch (av, i, 1));
		1606
		1607	PUTBACK;
		1608	call_sv ((SV *)GvCV (method), G_SCALAR);
		1609	SPAGAIN;
		1610
		1611	SvREFCNT_dec (tag);
		1612	SvREFCNT_dec (val);
		1613	sv = SvREFCNT_inc (POPs);
		1614
		1615	PUTBACK;
		1616
		1617	FREETMPS; LEAVE;
		1618
		1619	return sv;
		1620	}
		1621
		1622	fail:
		1623	SvREFCNT_dec (tag);
		1624	SvREFCNT_dec (val);
		1625	return 0;
		1626	}
		1627
		1628	static SV *
1361	decode_sv (dec_t *dec)	1629	decode_sv (dec_t *dec)
1362	{	1630	{
1363	// the beauty of JSON: you need exactly one character lookahead	1631	// the beauty of JSON: you need exactly one character lookahead
1364	// to parse everything.	1632	// to parse everything.
1365	switch (*dec->cur)	1633	switch (*dec->cur)
1366	{	1634	{
1367	case '"': ++dec->cur; return decode_str (dec);	1635	case '"': ++dec->cur; return decode_str (dec);
1368	case '[': ++dec->cur; return decode_av (dec);	1636	case '[': ++dec->cur; return decode_av (dec);
1369	case '{': ++dec->cur; return decode_hv (dec);	1637	case '{': ++dec->cur; return decode_hv (dec);
		1638	case '(': return decode_tag (dec);
1370		1639
1371	case '-':	1640	case '-':
1372	case '0': case '1': case '2': case '3': case '4':	1641	case '0': case '1': case '2': case '3': case '4':
1373	case '5': case '6': case '7': case '8': case '9':	1642	case '5': case '6': case '7': case '8': case '9':
1374	return decode_num (dec);	1643	return decode_num (dec);
…		…
1376	case 't':	1645	case 't':
1377	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1646	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1378	{	1647	{
1379	dec->cur += 4;	1648	dec->cur += 4;
1380	#if JSON_SLOW	1649	#if JSON_SLOW
1381	json_true = get_bool ("JSON::XS::true");	1650	bool_true = get_bool ("Types::Serialiser::true");
1382	#endif	1651	#endif
1383	return newSVsv (json_true);	1652	return newSVsv (bool_true);
1384	}	1653	}
1385	else	1654	else
1386	ERR ("'true' expected");	1655	ERR ("'true' expected");
1387		1656
1388	break;	1657	break;
…		…
1390	case 'f':	1659	case 'f':
1391	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1660	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1392	{	1661	{
1393	dec->cur += 5;	1662	dec->cur += 5;
1394	#if JSON_SLOW	1663	#if JSON_SLOW
1395	json_false = get_bool ("JSON::XS::false");	1664	bool_false = get_bool ("Types::Serialiser::false");
1396	#endif	1665	#endif
1397	return newSVsv (json_false);	1666	return newSVsv (bool_false);
1398	}	1667	}
1399	else	1668	else
1400	ERR ("'false' expected");	1669	ERR ("'false' expected");
1401		1670
1402	break;	1671	break;
…		…
1411	ERR ("'null' expected");	1680	ERR ("'null' expected");
1412		1681
1413	break;	1682	break;
1414		1683
1415	default:	1684	default:
1416	ERR ("malformed JSON string, neither array, object, number, string or atom");	1685	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1417	break;	1686	break;
1418	}	1687	}
1419		1688
1420	fail:	1689	fail:
1421	return 0;	1690	return 0;
1422	}	1691	}
1423		1692
1424	static SV *	1693	static SV *
1425	decode_json (SV string, JSON json, char **offset_return)	1694	decode_json (SV string, JSON json, STRLEN *offset_return)
1426	{	1695	{
1427	dec_t dec;	1696	dec_t dec;
1428	SV *sv;	1697	SV *sv;
1429		1698
1430	/* work around bugs in 5.10 where manipulating magic values	1699	/* work around bugs in 5.10 where manipulating magic values
1431	* will perl ignore the magic in subsequent accesses	1700	* makes perl ignore the magic in subsequent accesses.
		1701	* also make a copy of non-PV values, to get them into a clean
		1702	* state (SvPV should do that, but it's buggy, see below).
		1703	*
		1704	* SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
		1705	* as reported by Reini Urban.
1432	*/	1706	*/
1433	/SvGETMAGIC (string);/	1707	/SvGETMAGIC (string);/
1434	if (SvMAGICAL (string))	1708	if (SvMAGICAL (string) \|\| !SvPOK (string) \|\| SvIsCOW_shared_hash (string))
1435	string = sv_2mortal (newSVsv (string));	1709	string = sv_2mortal (newSVsv (string));
1436		1710
1437	SvUPGRADE (string, SVt_PV);	1711	SvUPGRADE (string, SVt_PV);
1438		1712
1439	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1713	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1456	if (offset > json->max_size && json->max_size)	1730	if (offset > json->max_size && json->max_size)
1457	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1731	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1458	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1732	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1459	}	1733	}
1460		1734
1461	if (json->flags & F_UTF8)	1735	if (DECODE_WANTS_OCTETS (json))
1462	sv_utf8_downgrade (string, 0);	1736	sv_utf8_downgrade (string, 0);
1463	else	1737	else
1464	sv_utf8_upgrade (string);	1738	sv_utf8_upgrade (string);
1465		1739
1466	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1740	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1478		1752
1479	decode_ws (&dec);	1753	decode_ws (&dec);
1480	sv = decode_sv (&dec);	1754	sv = decode_sv (&dec);
1481		1755
1482	if (offset_return)	1756	if (offset_return)
1483	*offset_return = dec.cur;	1757	*offset_return = dec.cur - SvPVX (string);
1484		1758	else if (sv)
1485	if (!(offset_return \|\| !sv))
1486	{	1759	{
1487	// check for trailing garbage	1760	// check for trailing garbage
1488	decode_ws (&dec);	1761	decode_ws (&dec);
1489		1762
1490	if (*dec.cur)	1763	if (*dec.cur)
…		…
1508	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1781	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1509	LEAVE;	1782	LEAVE;
1510		1783
1511	croak ("%s, at character offset %d (before \"%s\")",	1784	croak ("%s, at character offset %d (before \"%s\")",
1512	dec.err,	1785	dec.err,
1513	ptr_to_index (string, dec.cur),	1786	(int)ptr_to_index (string, dec.cur),
1514	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1787	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1515	}	1788	}
1516		1789
1517	sv = sv_2mortal (sv);	1790	sv = sv_2mortal (sv);
1518		1791
1519	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1792	if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1520	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1793	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1521		1794
1522	return sv;	1795	return sv;
1523	}	1796	}
1524		1797
…		…
1646	self->incr_mode = INCR_M_STR;	1919	self->incr_mode = INCR_M_STR;
1647	goto incr_m_str;	1920	goto incr_m_str;
1648		1921
1649	case '[':	1922	case '[':
1650	case '{':	1923	case '{':
		1924	case '(':
1651	if (++self->incr_nest > self->max_depth)	1925	if (++self->incr_nest > self->max_depth)
1652	croak (ERR_NESTING_EXCEEDED);	1926	croak (ERR_NESTING_EXCEEDED);
1653	break;	1927	break;
1654		1928
1655	case ']':	1929	case ']':
1656	case '}':	1930	case '}':
1657	if (--self->incr_nest <= 0)	1931	if (--self->incr_nest <= 0)
1658	goto interrupt;	1932	goto interrupt;
		1933	break;
		1934
		1935	case ')':
		1936	--self->incr_nest;
1659	break;	1937	break;
1660		1938
1661	case '#':	1939	case '#':
1662	self->incr_mode = INCR_M_C1;	1940	self->incr_mode = INCR_M_C1;
1663	goto incr_m_c;	1941	goto incr_m_c;
…		…
1689	i >= '0' && i <= '9' ? i - '0'	1967	i >= '0' && i <= '9' ? i - '0'
1690	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1968	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1691	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1969	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1692	: -1;	1970	: -1;
1693		1971
1694	json_stash = gv_stashpv ("JSON::XS" , 1);	1972	json_stash = gv_stashpv ("JSON::XS" , 1);
1695	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1973	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1696
1697	json_true = get_bool ("JSON::XS::true");	1974	bool_true = get_bool ("Types::Serialiser::true");
1698	json_false = get_bool ("JSON::XS::false");	1975	bool_false = get_bool ("Types::Serialiser::false");
		1976
		1977	sv_json = newSVpv ("JSON", 0);
		1978	SvREADONLY_on (sv_json);
1699		1979
1700	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1980	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1701	}	1981	}
1702		1982
1703	PROTOTYPES: DISABLE	1983	PROTOTYPES: DISABLE
1704		1984
1705	void CLONE (...)	1985	void CLONE (...)
1706	CODE:	1986	CODE:
1707	json_stash = 0;	1987	json_stash = 0;
1708	json_boolean_stash = 0;	1988	bool_stash = 0;
1709		1989
1710	void new (char *klass)	1990	void new (char *klass)
1711	PPCODE:	1991	PPCODE:
1712	{	1992	{
1713	SV *pv = NEWSV (0, sizeof (JSON));	1993	SV *pv = NEWSV (0, sizeof (JSON));
1714	SvPOK_only (pv);	1994	SvPOK_only (pv);
1715	json_init ((JSON *)SvPVX (pv));	1995	json_init ((JSON *)SvPVX (pv));
1716	XPUSHs (sv_2mortal (sv_bless (	1996	XPUSHs (sv_2mortal (sv_bless (
1717	newRV_noinc (pv),	1997	newRV_noinc (pv),
1718	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1998	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1733	shrink = F_SHRINK	2013	shrink = F_SHRINK
1734	allow_blessed = F_ALLOW_BLESSED	2014	allow_blessed = F_ALLOW_BLESSED
1735	convert_blessed = F_CONV_BLESSED	2015	convert_blessed = F_CONV_BLESSED
1736	relaxed = F_RELAXED	2016	relaxed = F_RELAXED
1737	allow_unknown = F_ALLOW_UNKNOWN	2017	allow_unknown = F_ALLOW_UNKNOWN
		2018	allow_tags = F_ALLOW_TAGS
1738	PPCODE:	2019	PPCODE:
1739	{	2020	{
1740	if (enable)	2021	if (enable)
1741	self->flags \|= ix;	2022	self->flags \|= ix;
1742	else	2023	else
…		…
1758	get_shrink = F_SHRINK	2039	get_shrink = F_SHRINK
1759	get_allow_blessed = F_ALLOW_BLESSED	2040	get_allow_blessed = F_ALLOW_BLESSED
1760	get_convert_blessed = F_CONV_BLESSED	2041	get_convert_blessed = F_CONV_BLESSED
1761	get_relaxed = F_RELAXED	2042	get_relaxed = F_RELAXED
1762	get_allow_unknown = F_ALLOW_UNKNOWN	2043	get_allow_unknown = F_ALLOW_UNKNOWN
		2044	get_allow_tags = F_ALLOW_TAGS
1763	PPCODE:	2045	PPCODE:
1764	XPUSHs (boolSV (self->flags & ix));	2046	XPUSHs (boolSV (self->flags & ix));
1765		2047
1766	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2048	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1767	PPCODE:	2049	PPCODE:
…		…
1795	}	2077	}
1796		2078
1797	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2079	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1798	PPCODE:	2080	PPCODE:
1799	{	2081	{
1800	if (!self->cb_sk_object)	2082	if (!self->cb_sk_object)
1801	self->cb_sk_object = newHV ();	2083	self->cb_sk_object = newHV ();
1802		2084
1803	if (SvOK (cb))	2085	if (SvOK (cb))
1804	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2086	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1805	else	2087	else
…		…
1816	XPUSHs (ST (0));	2098	XPUSHs (ST (0));
1817	}	2099	}
1818		2100
1819	void encode (JSON self, SV scalar)	2101	void encode (JSON self, SV scalar)
1820	PPCODE:	2102	PPCODE:
1821	XPUSHs (encode_json (scalar, self));	2103	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2104	XPUSHs (scalar);
1822		2105
1823	void decode (JSON self, SV jsonstr)	2106	void decode (JSON self, SV jsonstr)
1824	PPCODE:	2107	PPCODE:
1825	XPUSHs (decode_json (jsonstr, self, 0));	2108	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2109	XPUSHs (jsonstr);
1826		2110
1827	void decode_prefix (JSON self, SV jsonstr)	2111	void decode_prefix (JSON self, SV jsonstr)
1828	PPCODE:	2112	PPCODE:
1829	{	2113	{
1830	char *offset;	2114	SV *sv;
		2115	STRLEN offset;
		2116	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1831	EXTEND (SP, 2);	2117	EXTEND (SP, 2);
1832	PUSHs (decode_json (jsonstr, self, &offset));	2118	PUSHs (sv);
1833	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2119	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1834	}	2120	}
1835		2121
1836	void incr_parse (JSON self, SV jsonstr = 0)	2122	void incr_parse (JSON self, SV jsonstr = 0)
1837	PPCODE:	2123	PPCODE:
1838	{	2124	{
1839	if (!self->incr_text)	2125	if (!self->incr_text)
1840	self->incr_text = newSVpvn ("", 0);	2126	self->incr_text = newSVpvn ("", 0);
		2127
		2128	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2129	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2130	if (DECODE_WANTS_OCTETS (self))
		2131	{
		2132	if (self->incr_pos)
		2133	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2134	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2135
		2136	sv_utf8_downgrade (self->incr_text, 0);
		2137	}
		2138	else
		2139	{
		2140	sv_utf8_upgrade (self->incr_text);
		2141
		2142	if (self->incr_pos)
		2143	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2144	- (U8 *)SvPVX (self->incr_text);
		2145	}
1841		2146
1842	// append data, if any	2147	// append data, if any
1843	if (jsonstr)	2148	if (jsonstr)
1844	{	2149	{
		2150	/* make sure both strings have same encoding */
		2151	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1845	if (SvUTF8 (jsonstr))	2152	if (SvUTF8 (jsonstr))
		2153	sv_utf8_downgrade (jsonstr, 0);
1846	{	2154	else
1847	if (!SvUTF8 (self->incr_text))
1848	{
1849	/* utf-8-ness differs, need to upgrade */
1850	sv_utf8_upgrade (self->incr_text);
1851
1852	if (self->incr_pos)
1853	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1854	- (U8 *)SvPVX (self->incr_text);
1855	}
1856	}
1857	else if (SvUTF8 (self->incr_text))
1858	sv_utf8_upgrade (jsonstr);	2155	sv_utf8_upgrade (jsonstr);
1859		2156
		2157	/* and then just blindly append */
1860	{	2158	{
1861	STRLEN len;	2159	STRLEN len;
1862	const char *str = SvPV (jsonstr, len);	2160	const char *str = SvPV (jsonstr, len);
1863	STRLEN cur = SvCUR (self->incr_text);	2161	STRLEN cur = SvCUR (self->incr_text);
1864		2162
…		…
1872	}	2170	}
1873		2171
1874	if (GIMME_V != G_VOID)	2172	if (GIMME_V != G_VOID)
1875	do	2173	do
1876	{	2174	{
		2175	SV *sv;
1877	char *offset;	2176	STRLEN offset;
1878		2177
1879	if (!INCR_DONE (self))	2178	if (!INCR_DONE (self))
1880	{	2179	{
1881	incr_parse (self);	2180	incr_parse (self);
1882		2181
1883	if (self->incr_pos > self->max_size && self->max_size)	2182	if (self->incr_pos > self->max_size && self->max_size)
1884	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	2183	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1885	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2184	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1886		2185
1887	if (!INCR_DONE (self))	2186	if (!INCR_DONE (self))
		2187	{
		2188	// as an optimisation, do not accumulate white space in the incr buffer
		2189	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2190	{
		2191	self->incr_pos = 0;
		2192	SvCUR_set (self->incr_text, 0);
		2193	}
		2194
1888	break;	2195	break;
		2196	}
1889	}	2197	}
1890		2198
1891	XPUSHs (decode_json (self->incr_text, self, &offset));	2199	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2200	XPUSHs (sv);
1892		2201
1893	self->incr_pos -= offset - SvPVX (self->incr_text);	2202	self->incr_pos -= offset;
1894	self->incr_nest = 0;	2203	self->incr_nest = 0;
1895	self->incr_mode = 0;	2204	self->incr_mode = 0;
1896		2205
1897	sv_chop (self->incr_text, offset);	2206	sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
1898	}	2207	}
1899	while (GIMME_V == G_ARRAY);	2208	while (GIMME_V == G_ARRAY);
1900	}	2209	}
1901		2210
1902	SV incr_text (JSON self)	2211	SV incr_text (JSON self)
…		…
1940	SvREFCNT_dec (self->incr_text);	2249	SvREFCNT_dec (self->incr_text);
1941		2250
1942	PROTOTYPES: ENABLE	2251	PROTOTYPES: ENABLE
1943		2252
1944	void encode_json (SV *scalar)	2253	void encode_json (SV *scalar)
1945	ALIAS:
1946	to_json_ = 0
1947	encode_json = F_UTF8
1948	PPCODE:	2254	PPCODE:
1949	{	2255	{
1950	JSON json;	2256	JSON json;
1951	json_init (&json);	2257	json_init (&json);
1952	json.flags \|= ix;	2258	json.flags \|= F_UTF8;
1953	XPUSHs (encode_json (scalar, &json));	2259	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2260	XPUSHs (scalar);
1954	}	2261	}
1955		2262
1956	void decode_json (SV *jsonstr)	2263	void decode_json (SV *jsonstr)
1957	ALIAS:
1958	from_json_ = 0
1959	decode_json = F_UTF8
1960	PPCODE:	2264	PPCODE:
1961	{	2265	{
1962	JSON json;	2266	JSON json;
1963	json_init (&json);	2267	json_init (&json);
1964	json.flags \|= ix;	2268	json.flags \|= F_UTF8;
1965	XPUSHs (decode_json (jsonstr, &json, 0));	2269	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2270	XPUSHs (jsonstr);
1966	}	2271	}
1967		2272
1968

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.103 by root, Wed Jan 6 08:01:39 2010 UTC vs. Revision 1.129 by root, Wed Nov 16 18:06:34 2016 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.103 by root, Wed Jan 6 08:01:39 2010 UTC vs.
Revision 1.129 by root, Wed Nov 16 18:06:34 2016 UTC