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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.92 by root, Mon Sep 22 07:29:29 2008 UTC vs.
Revision 1.129 by root, Wed Nov 16 18:06:34 2016 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	// 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
		31	#endif
		32
		33	// three extra for rounding, sign, and end of string
22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	34	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23		35
24	#define F_ASCII 0x00000001UL	36	#define F_ASCII 0x00000001UL
25	#define F_LATIN1 0x00000002UL	37	#define F_LATIN1 0x00000002UL
26	#define F_UTF8 0x00000004UL	38	#define F_UTF8 0x00000004UL
27	#define F_INDENT 0x00000008UL	39	#define F_INDENT 0x00000008UL
…		…
32	#define F_SHRINK 0x00000200UL	44	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	45	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	46	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	47	#define F_RELAXED 0x00001000UL
36	#define F_ALLOW_UNKNOWN 0x00002000UL	48	#define F_ALLOW_UNKNOWN 0x00002000UL
		49	#define F_ALLOW_TAGS 0x00004000UL
37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	50	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
38		51
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	52	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
40		53
41	#define INIT_SIZE 32 // initial scalar size to be allocated	54	#define INIT_SIZE 32 // initial scalar size to be allocated
42	#define INDENT_STEP 3 // spaces per indentation level	55	#define INDENT_STEP 3 // spaces per indentation level
43		56
44	#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)
45		60
46	#define SB do {	61	#define SB do {
47	#define SE } while (0)	62	#define SE } while (0)
48		63
49	#if __GNUC__ >= 3	64	#if __GNUC__ >= 3
…		…
64	#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?)"
65		80
66	#ifdef USE_ITHREADS	81	#ifdef USE_ITHREADS
67	# define JSON_SLOW 1	82	# define JSON_SLOW 1
68	# 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))
69	#else	85	#else
70	# define JSON_SLOW 0	86	# define JSON_SLOW 0
71	# define JSON_STASH json_stash	87	# define JSON_STASH json_stash
		88	# define BOOL_STASH bool_stash
72	#endif	89	#endif
73		90
74	static HV json_stash, json_boolean_stash; // JSON::XS::	91	// the amount of HEs to allocate on the stack, when sorting keys
75	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;
76		96
77	enum {	97	enum {
78	INCR_M_WS = 0, // initial whitespace skipping, must be 0	98	INCR_M_WS = 0, // initial whitespace skipping, must be 0
79	INCR_M_STR, // inside string	99	INCR_M_STR, // inside string
80	INCR_M_BS, // inside backslash	100	INCR_M_BS, // inside backslash
		101	INCR_M_C0, // inside comment in initial whitespace sequence
		102	INCR_M_C1, // inside comment in other places
81	INCR_M_JSON // outside anything, count nesting	103	INCR_M_JSON // outside anything, count nesting
82	};	104	};
83		105
84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)	106	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85		107
…		…
175	*s++ = 0x80 \| ( ch & 0x3f);	197	*s++ = 0x80 \| ( ch & 0x3f);
176		198
177	return s;	199	return s;
178	}	200	}
179		201
		202	// convert offset pointer to character index, sv must be string
		203	static STRLEN
		204	ptr_to_index (SV sv, char offset)
		205	{
		206	return SvUTF8 (sv)
		207	? utf8_distance (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;
		347	}
		348
180	/////////////////////////////////////////////////////////////////////////////	349	/////////////////////////////////////////////////////////////////////////////
181	// encoder	350	// encoder
182		351
183	// structure used for encoding JSON	352	// structure used for encoding JSON
184	typedef struct	353	typedef struct
…		…
194	INLINE void	363	INLINE void
195	need (enc_t *enc, STRLEN len)	364	need (enc_t *enc, STRLEN len)
196	{	365	{
197	if (expect_false (enc->cur + len >= enc->end))	366	if (expect_false (enc->cur + len >= enc->end))
198	{	367	{
199	STRLEN cur = enc->cur - SvPVX (enc->sv);	368	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
200	SvGROW (enc->sv, cur + len + 1);	369	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
201	enc->cur = SvPVX (enc->sv) + cur;	370	enc->cur = SvPVX (enc->sv) + cur;
202	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	371	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
203	}	372	}
204	}	373	}
205		374
…		…
371		540
372	if (enc->indent >= enc->json.max_depth)	541	if (enc->indent >= enc->json.max_depth)
373	croak (ERR_NESTING_EXCEEDED);	542	croak (ERR_NESTING_EXCEEDED);
374		543
375	encode_ch (enc, '[');	544	encode_ch (enc, '[');
376		545
377	if (len >= 0)	546	if (len >= 0)
378	{	547	{
379	encode_nl (enc); ++enc->indent;	548	encode_nl (enc); ++enc->indent;
380		549
381	for (i = 0; i <= len; ++i)	550	for (i = 0; i <= len; ++i)
…		…
393	encode_comma (enc);	562	encode_comma (enc);
394	}	563	}
395		564
396	encode_nl (enc); --enc->indent; encode_indent (enc);	565	encode_nl (enc); --enc->indent; encode_indent (enc);
397	}	566	}
398		567
399	encode_ch (enc, ']');	568	encode_ch (enc, ']');
400	}	569	}
401		570
402	static void	571	static void
403	encode_hk (enc_t enc, HE he)	572	encode_hk (enc_t enc, HE he)
…		…
407	if (HeKLEN (he) == HEf_SVKEY)	576	if (HeKLEN (he) == HEf_SVKEY)
408	{	577	{
409	SV *sv = HeSVKEY (he);	578	SV *sv = HeSVKEY (he);
410	STRLEN len;	579	STRLEN len;
411	char *str;	580	char *str;
412		581
413	SvGETMAGIC (sv);	582	SvGETMAGIC (sv);
414	str = SvPV (sv, len);	583	str = SvPV (sv, len);
415		584
416	encode_str (enc, str, len, SvUTF8 (sv));	585	encode_str (enc, str, len, SvUTF8 (sv));
417	}	586	}
…		…
462		631
463	// for canonical output we have to sort by keys first	632	// for canonical output we have to sort by keys first
464	// actually, this is mostly due to the stupid so-called	633	// actually, this is mostly due to the stupid so-called
465	// security workaround added somewhere in 5.8.x	634	// security workaround added somewhere in 5.8.x
466	// that randomises hash orderings	635	// that randomises hash orderings
467	if (enc->json.flags & F_CANONICAL)	636	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
468	{	637	{
469	int count = hv_iterinit (hv);	638	int count = hv_iterinit (hv);
470		639
471	if (SvMAGICAL (hv))	640	if (SvMAGICAL (hv))
472	{	641	{
…		…
483	}	652	}
484		653
485	if (count)	654	if (count)
486	{	655	{
487	int i, fast = 1;	656	int i, fast = 1;
488	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	657	HE *hes_stack [STACK_HES];
489	HE *hes = _alloca (count sizeof (HE));	658	HE **hes = hes_stack;
490	#else	659
491	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	660	// allocate larger arrays on the heap
492	#endif	661	if (count > STACK_HES)
		662	{
		663	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		664	hes = (HE **)SvPVX (sv);
		665	}
493		666
494	i = 0;	667	i = 0;
495	while ((he = hv_iternext (hv)))	668	while ((he = hv_iternext (hv)))
496	{	669	{
497	hes [i++] = he;	670	hes [i++] = he;
…		…
566	// encode objects, arrays and special \0=false and \1=true values.	739	// encode objects, arrays and special \0=false and \1=true values.
567	static void	740	static void
568	encode_rv (enc_t enc, SV sv)	741	encode_rv (enc_t enc, SV sv)
569	{	742	{
570	svtype svt;	743	svtype svt;
		744	GV *method;
571		745
572	SvGETMAGIC (sv);	746	SvGETMAGIC (sv);
573	svt = SvTYPE (sv);	747	svt = SvTYPE (sv);
574		748
575	if (expect_false (SvOBJECT (sv)))	749	if (expect_false (SvOBJECT (sv)))
576	{	750	{
577	HV *stash = !JSON_SLOW \|\| json_boolean_stash	751	HV *stash = SvSTASH (sv);
578	? json_boolean_stash
579	: gv_stashpv ("JSON::XS::Boolean", 1);
580		752
581	if (SvSTASH (sv) == stash)	753	if (stash == bool_stash)
582	{	754	{
583	if (SvIV (sv))	755	if (SvIV (sv))
584	encode_str (enc, "true", 4, 0);	756	encode_str (enc, "true", 4, 0);
585	else	757	else
586	encode_str (enc, "false", 5, 0);	758	encode_str (enc, "false", 5, 0);
587	}	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);
588	else	827	else
589	{
590	#if 0
591	if (0 && sv_derived_from (rv, "JSON::Literal"))
592	{
593	// not yet
594	}
595	#endif
596	if (enc->json.flags & F_CONV_BLESSED)
597	{
598	// we re-bless the reference to get overload and other niceties right
599	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
600
601	if (to_json)
602	{
603	dSP;
604
605	ENTER; SAVETMPS; PUSHMARK (SP);
606	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
607
608	// calling with G_SCALAR ensures that we always get a 1 return value
609	PUTBACK;
610	call_sv ((SV *)GvCV (to_json), G_SCALAR);
611	SPAGAIN;
612
613	// catch this surprisingly common error
614	if (SvROK (TOPs) && SvRV (TOPs) == sv)
615	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
616
617	sv = POPs;
618	PUTBACK;
619
620	encode_sv (enc, sv);
621
622	FREETMPS; LEAVE;
623	}
624	else if (enc->json.flags & F_ALLOW_BLESSED)
625	encode_str (enc, "null", 4, 0);
626	else
627	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
628	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629	}
630	else if (enc->json.flags & F_ALLOW_BLESSED)
631	encode_str (enc, "null", 4, 0);
632	else
633	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)",
634	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	829	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
635	}
636	}	830	}
637	else if (svt == SVt_PVHV)	831	else if (svt == SVt_PVHV)
638	encode_hv (enc, (HV *)sv);	832	encode_hv (enc, (HV *)sv);
639	else if (svt == SVt_PVAV)	833	else if (svt == SVt_PVAV)
640	encode_av (enc, (AV *)sv);	834	encode_av (enc, (AV *)sv);
641	else if (svt < SVt_PVAV)	835	else if (svt < SVt_PVAV)
642	{	836	{
643	STRLEN len = 0;	837	int bool_type = ref_bool_type (sv);
644	char *pv = svt ? SvPV (sv, len) : 0;
645		838
646	if (len == 1 && *pv == '1')	839	if (bool_type == 1)
647	encode_str (enc, "true", 4, 0);	840	encode_str (enc, "true", 4, 0);
648	else if (len == 1 && *pv == '0')	841	else if (bool_type == 0)
649	encode_str (enc, "false", 5, 0);	842	encode_str (enc, "false", 5, 0);
650	else if (enc->json.flags & F_ALLOW_UNKNOWN)	843	else if (enc->json.flags & F_ALLOW_UNKNOWN)
651	encode_str (enc, "null", 4, 0);	844	encode_str (enc, "null", 4, 0);
652	else	845	else
653	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",
…		…
716	}	909	}
717	else	910	else
718	{	911	{
719	// large integer, use the (rather slow) snprintf way.	912	// large integer, use the (rather slow) snprintf way.
720	need (enc, IVUV_MAXCHARS);	913	need (enc, IVUV_MAXCHARS);
721	enc->cur +=	914	enc->cur +=
722	SvIsUV(sv)	915	SvIsUV(sv)
723	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	916	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
724	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	917	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
725	}	918	}
726	}	919	}
727	else if (SvROK (sv))	920	else if (SvROK (sv))
728	encode_rv (enc, SvRV (sv));	921	encode_rv (enc, SvRV (sv));
729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	922	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
730	encode_str (enc, "null", 4, 0);	923	encode_str (enc, "null", 4, 0);
731	else	924	else
732	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",
733	SvPV_nolen (sv), SvFLAGS (sv));	926	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
734	}	927	}
735		928
736	static SV *	929	static SV *
737	encode_json (SV scalar, JSON json)	930	encode_json (SV scalar, JSON json)
738	{	931	{
739	enc_t enc;	932	enc_t enc;
740		933
741	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	934	if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
742	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)");
743		936
744	enc.json = *json;	937	enc.json = *json;
745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	938	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
746	enc.cur = SvPVX (enc.sv);	939	enc.cur = SvPVX (enc.sv);
…		…
750	: enc.json.flags & F_LATIN1 ? 0x000100UL	943	: enc.json.flags & F_LATIN1 ? 0x000100UL
751	: 0x110000UL;	944	: 0x110000UL;
752		945
753	SvPOK_only (enc.sv);	946	SvPOK_only (enc.sv);
754	encode_sv (&enc, scalar);	947	encode_sv (&enc, scalar);
		948	encode_nl (&enc);
755		949
756	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	950	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
757	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	951	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
758		952
759	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	953	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
939	else if (expect_true (ch >= 0x20 && ch < 0x80))	1133	else if (expect_true (ch >= 0x20 && ch < 0x80))
940	*cur++ = ch;	1134	*cur++ = ch;
941	else if (ch >= 0x80)	1135	else if (ch >= 0x80)
942	{	1136	{
943	STRLEN clen;	1137	STRLEN clen;
944	UV uch;
945		1138
946	--dec_cur;	1139	--dec_cur;
947		1140
948	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1141	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
949	if (clen == (STRLEN)-1)	1142	if (clen == (STRLEN)-1)
950	ERR ("malformed UTF-8 character in JSON string");	1143	ERR ("malformed UTF-8 character in JSON string");
951		1144
952	do	1145	do
953	cur++ = dec_cur++;	1146	cur++ = dec_cur++;
954	while (--clen);	1147	while (--clen);
955		1148
956	utf8 = 1;	1149	utf8 = 1;
957	}	1150	}
		1151	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1152	*cur++ = ch;
958	else	1153	else
959	{	1154	{
960	--dec_cur;	1155	--dec_cur;
961		1156
962	if (!ch)	1157	if (!ch)
…		…
970	{	1165	{
971	STRLEN len = cur - buf;	1166	STRLEN len = cur - buf;
972		1167
973	if (sv)	1168	if (sv)
974	{	1169	{
975	SvGROW (sv, SvCUR (sv) + len + 1);	1170	STRLEN cur = SvCUR (sv);
		1171
		1172	if (SvLEN (sv) <= cur + len)
		1173	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1174
976	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1175	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
977	SvCUR_set (sv, SvCUR (sv) + len);	1176	SvCUR_set (sv, SvCUR (sv) + len);
978	}	1177	}
979	else	1178	else
980	sv = newSVpvn (buf, len);	1179	sv = newSVpvn (buf, len);
…		…
1071		1270
1072	// special case the rather common 1..5-digit-int case	1271	// special case the rather common 1..5-digit-int case
1073	if (*start == '-')	1272	if (*start == '-')
1074	switch (len)	1273	switch (len)
1075	{	1274	{
1076	case 2: return newSViv (-( start [1] - '0' * 1));	1275	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1077	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1276	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1078	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1277	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1079	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1278	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1080	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1279	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1081	}	1280	}
1082	else	1281	else
1083	switch (len)	1282	switch (len)
1084	{	1283	{
1085	case 1: return newSViv ( start [0] - '0' * 1);	1284	case 1: return newSViv ( start [0] - '0' * 1);
1086	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1285	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1087	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1286	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1088	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1287	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1089	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1288	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1090	}	1289	}
1091		1290
1092	{	1291	{
1093	UV uv;	1292	UV uv;
1094	int numtype = grok_number (start, len, &uv);	1293	int numtype = grok_number (start, len, &uv);
…		…
1103	}	1302	}
1104		1303
1105	len -= *start == '-' ? 1 : 0;	1304	len -= *start == '-' ? 1 : 0;
1106		1305
1107	// does not fit into IV or UV, try NV	1306	// does not fit into IV or UV, try NV
1108	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1307	if (len <= NV_DIG)
1109	#if defined (LDBL_DIG)
1110	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1111	#endif
1112	)
1113	// fits into NV without loss of precision	1308	// fits into NV without loss of precision
1114	return newSVnv (Atof (start));	1309	return newSVnv (json_atof (start));
1115		1310
1116	// everything else fails, convert it to a string	1311	// everything else fails, convert it to a string
1117	return newSVpvn (start, dec->cur - start);	1312	return newSVpvn (start, dec->cur - start);
1118	}	1313	}
1119		1314
1120	// loss of precision here	1315	// loss of precision here
1121	return newSVnv (Atof (start));	1316	return newSVnv (json_atof (start));
1122		1317
1123	fail:	1318	fail:
1124	return 0;	1319	return 0;
1125	}	1320	}
1126		1321
…		…
1150	if (*dec->cur == ']')	1345	if (*dec->cur == ']')
1151	{	1346	{
1152	++dec->cur;	1347	++dec->cur;
1153	break;	1348	break;
1154	}	1349	}
1155		1350
1156	if (*dec->cur != ',')	1351	if (*dec->cur != ',')
1157	ERR (", or ] expected while parsing array");	1352	ERR (", or ] expected while parsing array");
1158		1353
1159	++dec->cur;	1354	++dec->cur;
1160		1355
…		…
1284		1479
1285	hv_iterinit (hv);	1480	hv_iterinit (hv);
1286	he = hv_iternext (hv);	1481	he = hv_iternext (hv);
1287	hv_iterinit (hv);	1482	hv_iterinit (hv);
1288		1483
1289	// the next line creates a mortal sv each time its called.	1484	// the next line creates a mortal sv each time it's called.
1290	// might want to optimise this for common cases.	1485	// might want to optimise this for common cases.
1291	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);
1292		1487
1293	if (cb)	1488	if (cb)
1294	{	1489	{
1295	dSP;	1490	dSP;
1296	int count;	1491	int count;
1297		1492
1298	ENTER; SAVETMPS; PUSHMARK (SP);	1493	ENTER; SAVETMPS;
		1494	SAVESTACK_POS ();
		1495	PUSHMARK (SP);
1299	XPUSHs (HeVAL (he));	1496	XPUSHs (HeVAL (he));
		1497	sv_2mortal (sv);
1300		1498
1301	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1499	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1302		1500
1303	if (count == 1)	1501	if (count == 1)
1304	{	1502	{
1305	sv = newSVsv (POPs);	1503	sv = newSVsv (POPs);
1306	FREETMPS; LEAVE;	1504	FREETMPS; LEAVE;
1307	return sv;	1505	return sv;
1308	}	1506	}
1309		1507
		1508	SvREFCNT_inc (sv);
1310	FREETMPS; LEAVE;	1509	FREETMPS; LEAVE;
1311	}	1510	}
1312	}	1511	}
1313		1512
1314	if (dec->json.cb_object)	1513	if (dec->json.cb_object)
1315	{	1514	{
1316	dSP;	1515	dSP;
1317	int count;	1516	int count;
1318		1517
1319	ENTER; SAVETMPS; PUSHMARK (SP);	1518	ENTER; SAVETMPS;
		1519	SAVESTACK_POS ();
		1520	PUSHMARK (SP);
1320	XPUSHs (sv_2mortal (sv));	1521	XPUSHs (sv_2mortal (sv));
1321		1522
1322	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1523	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1323		1524
1324	if (count == 1)	1525	if (count == 1)
…		…
1340	DEC_DEC_DEPTH;	1541	DEC_DEC_DEPTH;
1341	return 0;	1542	return 0;
1342	}	1543	}
1343		1544
1344	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 *
1345	decode_sv (dec_t *dec)	1629	decode_sv (dec_t *dec)
1346	{	1630	{
1347	// the beauty of JSON: you need exactly one character lookahead	1631	// the beauty of JSON: you need exactly one character lookahead
1348	// to parse everything.	1632	// to parse everything.
1349	switch (*dec->cur)	1633	switch (*dec->cur)
1350	{	1634	{
1351	case '"': ++dec->cur; return decode_str (dec);	1635	case '"': ++dec->cur; return decode_str (dec);
1352	case '[': ++dec->cur; return decode_av (dec);	1636	case '[': ++dec->cur; return decode_av (dec);
1353	case '{': ++dec->cur; return decode_hv (dec);	1637	case '{': ++dec->cur; return decode_hv (dec);
		1638	case '(': return decode_tag (dec);
1354		1639
1355	case '-':	1640	case '-':
1356	case '0': case '1': case '2': case '3': case '4':	1641	case '0': case '1': case '2': case '3': case '4':
1357	case '5': case '6': case '7': case '8': case '9':	1642	case '5': case '6': case '7': case '8': case '9':
1358	return decode_num (dec);	1643	return decode_num (dec);
…		…
1360	case 't':	1645	case 't':
1361	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1646	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1362	{	1647	{
1363	dec->cur += 4;	1648	dec->cur += 4;
1364	#if JSON_SLOW	1649	#if JSON_SLOW
1365	json_true = get_bool ("JSON::XS::true");	1650	bool_true = get_bool ("Types::Serialiser::true");
1366	#endif	1651	#endif
1367	return newSVsv (json_true);	1652	return newSVsv (bool_true);
1368	}	1653	}
1369	else	1654	else
1370	ERR ("'true' expected");	1655	ERR ("'true' expected");
1371		1656
1372	break;	1657	break;
…		…
1374	case 'f':	1659	case 'f':
1375	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1660	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1376	{	1661	{
1377	dec->cur += 5;	1662	dec->cur += 5;
1378	#if JSON_SLOW	1663	#if JSON_SLOW
1379	json_false = get_bool ("JSON::XS::false");	1664	bool_false = get_bool ("Types::Serialiser::false");
1380	#endif	1665	#endif
1381	return newSVsv (json_false);	1666	return newSVsv (bool_false);
1382	}	1667	}
1383	else	1668	else
1384	ERR ("'false' expected");	1669	ERR ("'false' expected");
1385		1670
1386	break;	1671	break;
…		…
1395	ERR ("'null' expected");	1680	ERR ("'null' expected");
1396		1681
1397	break;	1682	break;
1398		1683
1399	default:	1684	default:
1400	ERR ("malformed JSON string, neither array, object, number, string or atom");	1685	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1401	break;	1686	break;
1402	}	1687	}
1403		1688
1404	fail:	1689	fail:
1405	return 0;	1690	return 0;
…		…
1407		1692
1408	static SV *	1693	static SV *
1409	decode_json (SV string, JSON json, STRLEN *offset_return)	1694	decode_json (SV string, JSON json, STRLEN *offset_return)
1410	{	1695	{
1411	dec_t dec;	1696	dec_t dec;
1412	STRLEN offset;
1413	SV *sv;	1697	SV *sv;
1414		1698
		1699	/* work around bugs in 5.10 where manipulating magic values
		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.
		1706	*/
1415	SvGETMAGIC (string);	1707	/SvGETMAGIC (string);/
		1708	if (SvMAGICAL (string) \|\| !SvPOK (string) \|\| SvIsCOW_shared_hash (string))
		1709	string = sv_2mortal (newSVsv (string));
		1710
1416	SvUPGRADE (string, SVt_PV);	1711	SvUPGRADE (string, SVt_PV);
1417		1712
1418	/* 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
1419	* assertion with -DDEBUGGING, although SvCUR is documented to	1714	* assertion with -DDEBUGGING, although SvCUR is documented to
1420	* return the xpv_cur field which certainly exists after upgrading.	1715	* return the xpv_cur field which certainly exists after upgrading.
…		…
1423	* and hope for the best.	1718	* and hope for the best.
1424	* Damnit, SvPV_nolen still trips over yet another assertion. This	1719	* Damnit, SvPV_nolen still trips over yet another assertion. This
1425	* assertion business is seriously broken, try yet another workaround	1720	* assertion business is seriously broken, try yet another workaround
1426	* for the broken -DDEBUGGING.	1721	* for the broken -DDEBUGGING.
1427	*/	1722	*/
		1723	{
1428	#ifdef DEBUGGING	1724	#ifdef DEBUGGING
1429	offset = SvOK (string) ? sv_len (string) : 0;	1725	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1430	#else	1726	#else
1431	offset = SvCUR (string);	1727	STRLEN offset = SvCUR (string);
1432	#endif	1728	#endif
1433		1729
1434	if (offset > json->max_size && json->max_size)	1730	if (offset > json->max_size && json->max_size)
1435	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",
1436	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1732	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1733	}
1437		1734
1438	if (json->flags & F_UTF8)	1735	if (DECODE_WANTS_OCTETS (json))
1439	sv_utf8_downgrade (string, 0);	1736	sv_utf8_downgrade (string, 0);
1440	else	1737	else
1441	sv_utf8_upgrade (string);	1738	sv_utf8_upgrade (string);
1442		1739
1443	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1740	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1454	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1751	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1455		1752
1456	decode_ws (&dec);	1753	decode_ws (&dec);
1457	sv = decode_sv (&dec);	1754	sv = decode_sv (&dec);
1458		1755
1459	if (!(offset_return \|\| !sv))	1756	if (offset_return)
		1757	*offset_return = dec.cur - SvPVX (string);
		1758	else if (sv)
1460	{	1759	{
1461	// check for trailing garbage	1760	// check for trailing garbage
1462	decode_ws (&dec);	1761	decode_ws (&dec);
1463		1762
1464	if (*dec.cur)	1763	if (*dec.cur)
1465	{	1764	{
1466	dec.err = "garbage after JSON object";	1765	dec.err = "garbage after JSON object";
1467	SvREFCNT_dec (sv);	1766	SvREFCNT_dec (sv);
1468	sv = 0;	1767	sv = 0;
1469	}	1768	}
1470	}
1471
1472	if (offset_return \|\| !sv)
1473	{
1474	offset = dec.json.flags & F_UTF8
1475	? dec.cur - SvPVX (string)
1476	: utf8_distance (dec.cur, SvPVX (string));
1477
1478	if (offset_return)
1479	*offset_return = offset;
1480	}	1769	}
1481		1770
1482	if (!sv)	1771	if (!sv)
1483	{	1772	{
1484	SV *uni = sv_newmortal ();	1773	SV *uni = sv_newmortal ();
…		…
1490	SAVEVPTR (PL_curcop);	1779	SAVEVPTR (PL_curcop);
1491	PL_curcop = &cop;	1780	PL_curcop = &cop;
1492	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);
1493	LEAVE;	1782	LEAVE;
1494		1783
1495	croak ("%s, at character offset %d [\"%s\"]",	1784	croak ("%s, at character offset %d (before \"%s\")",
1496	dec.err,	1785	dec.err,
1497	(int)offset,	1786	(int)ptr_to_index (string, dec.cur),
1498	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1787	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1499	}	1788	}
1500		1789
1501	sv = sv_2mortal (sv);	1790	sv = sv_2mortal (sv);
1502		1791
1503	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1792	if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1504	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)");
1505		1794
1506	return sv;	1795	return sv;
1507	}	1796	}
1508		1797
…		…
1511		1800
1512	static void	1801	static void
1513	incr_parse (JSON *self)	1802	incr_parse (JSON *self)
1514	{	1803	{
1515	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1804	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1805
		1806	// the state machine here is a bit convoluted and could be simplified a lot
		1807	// but this would make it slower, so...
1516		1808
1517	for (;;)	1809	for (;;)
1518	{	1810	{
1519	//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	1811	//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
1520	switch (self->incr_mode)	1812	switch (self->incr_mode)
1521	{	1813	{
1522	// only used for intiial whitespace skipping	1814	// only used for initial whitespace skipping
1523	case INCR_M_WS:	1815	case INCR_M_WS:
1524	for (;;)	1816	for (;;)
1525	{	1817	{
1526	if (*p > 0x20)	1818	if (*p > 0x20)
1527	{	1819	{
		1820	if (*p == '#')
		1821	{
		1822	self->incr_mode = INCR_M_C0;
		1823	goto incr_m_c;
		1824	}
		1825	else
		1826	{
1528	self->incr_mode = INCR_M_JSON;	1827	self->incr_mode = INCR_M_JSON;
1529	goto incr_m_json;	1828	goto incr_m_json;
		1829	}
1530	}	1830	}
1531	else if (!*p)	1831	else if (!*p)
1532	goto interrupt;	1832	goto interrupt;
1533		1833
1534	++p;	1834	++p;
…		…
1540	goto interrupt;	1840	goto interrupt;
1541		1841
1542	++p;	1842	++p;
1543	self->incr_mode = INCR_M_STR;	1843	self->incr_mode = INCR_M_STR;
1544	goto incr_m_str;	1844	goto incr_m_str;
		1845
		1846	// inside #-style comments
		1847	case INCR_M_C0:
		1848	case INCR_M_C1:
		1849	incr_m_c:
		1850	for (;;)
		1851	{
		1852	if (*p == '\n')
		1853	{
		1854	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1855	break;
		1856	}
		1857	else if (!*p)
		1858	goto interrupt;
		1859
		1860	++p;
		1861	}
		1862
		1863	break;
1545		1864
1546	// inside a string	1865	// inside a string
1547	case INCR_M_STR:	1866	case INCR_M_STR:
1548	incr_m_str:	1867	incr_m_str:
1549	for (;;)	1868	for (;;)
…		…
1600	self->incr_mode = INCR_M_STR;	1919	self->incr_mode = INCR_M_STR;
1601	goto incr_m_str;	1920	goto incr_m_str;
1602		1921
1603	case '[':	1922	case '[':
1604	case '{':	1923	case '{':
		1924	case '(':
1605	if (++self->incr_nest > self->max_depth)	1925	if (++self->incr_nest > self->max_depth)
1606	croak (ERR_NESTING_EXCEEDED);	1926	croak (ERR_NESTING_EXCEEDED);
1607	break;	1927	break;
1608		1928
1609	case ']':	1929	case ']':
1610	case '}':	1930	case '}':
1611	if (--self->incr_nest <= 0)	1931	if (--self->incr_nest <= 0)
1612	goto interrupt;	1932	goto interrupt;
		1933	break;
		1934
		1935	case ')':
		1936	--self->incr_nest;
		1937	break;
		1938
		1939	case '#':
		1940	self->incr_mode = INCR_M_C1;
		1941	goto incr_m_c;
1613	}	1942	}
1614	}	1943	}
1615	}	1944	}
1616		1945
1617	modechange:	1946	modechange:
1618	;	1947	;
1619	}	1948	}
1620		1949
1621	interrupt:	1950	interrupt:
1622	self->incr_pos = p - SvPVX (self->incr_text);	1951	self->incr_pos = p - SvPVX (self->incr_text);
		1952	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1623	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1953	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1624	}	1954	}
1625		1955
1626	/////////////////////////////////////////////////////////////////////////////	1956	/////////////////////////////////////////////////////////////////////////////
1627	// XS interface functions	1957	// XS interface functions
…		…
1637	i >= '0' && i <= '9' ? i - '0'	1967	i >= '0' && i <= '9' ? i - '0'
1638	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1968	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1639	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1969	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1640	: -1;	1970	: -1;
1641		1971
1642	json_stash = gv_stashpv ("JSON::XS" , 1);	1972	json_stash = gv_stashpv ("JSON::XS" , 1);
1643	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1973	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1644
1645	json_true = get_bool ("JSON::XS::true");	1974	bool_true = get_bool ("Types::Serialiser::true");
1646	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);
		1979
		1980	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1647	}	1981	}
1648		1982
1649	PROTOTYPES: DISABLE	1983	PROTOTYPES: DISABLE
1650		1984
1651	void CLONE (...)	1985	void CLONE (...)
1652	CODE:	1986	CODE:
1653	json_stash = 0;	1987	json_stash = 0;
1654	json_boolean_stash = 0;	1988	bool_stash = 0;
1655		1989
1656	void new (char *klass)	1990	void new (char *klass)
1657	PPCODE:	1991	PPCODE:
1658	{	1992	{
1659	SV *pv = NEWSV (0, sizeof (JSON));	1993	SV *pv = NEWSV (0, sizeof (JSON));
1660	SvPOK_only (pv);	1994	SvPOK_only (pv);
1661	json_init ((JSON *)SvPVX (pv));	1995	json_init ((JSON *)SvPVX (pv));
1662	XPUSHs (sv_2mortal (sv_bless (	1996	XPUSHs (sv_2mortal (sv_bless (
1663	newRV_noinc (pv),	1997	newRV_noinc (pv),
1664	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1998	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1679	shrink = F_SHRINK	2013	shrink = F_SHRINK
1680	allow_blessed = F_ALLOW_BLESSED	2014	allow_blessed = F_ALLOW_BLESSED
1681	convert_blessed = F_CONV_BLESSED	2015	convert_blessed = F_CONV_BLESSED
1682	relaxed = F_RELAXED	2016	relaxed = F_RELAXED
1683	allow_unknown = F_ALLOW_UNKNOWN	2017	allow_unknown = F_ALLOW_UNKNOWN
		2018	allow_tags = F_ALLOW_TAGS
1684	PPCODE:	2019	PPCODE:
1685	{	2020	{
1686	if (enable)	2021	if (enable)
1687	self->flags \|= ix;	2022	self->flags \|= ix;
1688	else	2023	else
…		…
1704	get_shrink = F_SHRINK	2039	get_shrink = F_SHRINK
1705	get_allow_blessed = F_ALLOW_BLESSED	2040	get_allow_blessed = F_ALLOW_BLESSED
1706	get_convert_blessed = F_CONV_BLESSED	2041	get_convert_blessed = F_CONV_BLESSED
1707	get_relaxed = F_RELAXED	2042	get_relaxed = F_RELAXED
1708	get_allow_unknown = F_ALLOW_UNKNOWN	2043	get_allow_unknown = F_ALLOW_UNKNOWN
		2044	get_allow_tags = F_ALLOW_TAGS
1709	PPCODE:	2045	PPCODE:
1710	XPUSHs (boolSV (self->flags & ix));	2046	XPUSHs (boolSV (self->flags & ix));
1711		2047
1712	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2048	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1713	PPCODE:	2049	PPCODE:
…		…
1741	}	2077	}
1742		2078
1743	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)
1744	PPCODE:	2080	PPCODE:
1745	{	2081	{
1746	if (!self->cb_sk_object)	2082	if (!self->cb_sk_object)
1747	self->cb_sk_object = newHV ();	2083	self->cb_sk_object = newHV ();
1748		2084
1749	if (SvOK (cb))	2085	if (SvOK (cb))
1750	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2086	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1751	else	2087	else
…		…
1762	XPUSHs (ST (0));	2098	XPUSHs (ST (0));
1763	}	2099	}
1764		2100
1765	void encode (JSON self, SV scalar)	2101	void encode (JSON self, SV scalar)
1766	PPCODE:	2102	PPCODE:
1767	XPUSHs (encode_json (scalar, self));	2103	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2104	XPUSHs (scalar);
1768		2105
1769	void decode (JSON self, SV jsonstr)	2106	void decode (JSON self, SV jsonstr)
1770	PPCODE:	2107	PPCODE:
1771	XPUSHs (decode_json (jsonstr, self, 0));	2108	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2109	XPUSHs (jsonstr);
1772		2110
1773	void decode_prefix (JSON self, SV jsonstr)	2111	void decode_prefix (JSON self, SV jsonstr)
1774	PPCODE:	2112	PPCODE:
1775	{	2113	{
		2114	SV *sv;
1776	STRLEN offset;	2115	STRLEN offset;
		2116	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1777	EXTEND (SP, 2);	2117	EXTEND (SP, 2);
1778	PUSHs (decode_json (jsonstr, self, &offset));	2118	PUSHs (sv);
1779	PUSHs (sv_2mortal (newSVuv (offset)));	2119	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1780	}	2120	}
1781		2121
1782	void incr_parse (JSON self, SV jsonstr = 0)	2122	void incr_parse (JSON self, SV jsonstr = 0)
1783	PPCODE:	2123	PPCODE:
1784	{	2124	{
1785	if (!self->incr_text)	2125	if (!self->incr_text)
1786	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	}
1787		2146
1788	// append data, if any	2147	// append data, if any
1789	if (jsonstr)	2148	if (jsonstr)
1790	{	2149	{
		2150	/* make sure both strings have same encoding */
1791	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	2151	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		2152	if (SvUTF8 (jsonstr))
		2153	sv_utf8_downgrade (jsonstr, 0);
1792	{	2154	else
1793	/* utf-8-ness differs, need to upgrade */
1794	sv_utf8_upgrade (self->incr_text);	2155	sv_utf8_upgrade (jsonstr);
1795		2156
1796	if (self->incr_pos)	2157	/* and then just blindly append */
1797	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1798	- (U8 *)SvPVX (self->incr_text);
1799	}
1800
1801	{	2158	{
1802	STRLEN len;	2159	STRLEN len;
1803	const char *str = SvPV (jsonstr, len);	2160	const char *str = SvPV (jsonstr, len);
1804	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	2161	STRLEN cur = SvCUR (self->incr_text);
		2162
		2163	if (SvLEN (self->incr_text) <= cur + len)
		2164	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		2165
1805	Move (str, SvEND (self->incr_text), len, char);	2166	Move (str, SvEND (self->incr_text), len, char);
1806	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	2167	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1807	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	2168	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1808	}	2169	}
1809	}	2170	}
1810		2171
1811	if (GIMME_V != G_VOID)	2172	if (GIMME_V != G_VOID)
1812	do	2173	do
1813	{	2174	{
		2175	SV *sv;
1814	STRLEN offset;	2176	STRLEN offset;
1815		2177
1816	if (!INCR_DONE (self))	2178	if (!INCR_DONE (self))
1817	{	2179	{
1818	incr_parse (self);	2180	incr_parse (self);
…		…
1820	if (self->incr_pos > self->max_size && self->max_size)	2182	if (self->incr_pos > self->max_size && self->max_size)
1821	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",
1822	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2184	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1823		2185
1824	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
1825	break;	2195	break;
		2196	}
1826	}	2197	}
1827		2198
1828	XPUSHs (decode_json (self->incr_text, self, &offset));	2199	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2200	XPUSHs (sv);
1829		2201
1830	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1831	self->incr_pos -= offset;	2202	self->incr_pos -= offset;
1832	self->incr_nest = 0;	2203	self->incr_nest = 0;
1833	self->incr_mode = 0;	2204	self->incr_mode = 0;
		2205
		2206	sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
1834	}	2207	}
1835	while (GIMME_V == G_ARRAY);	2208	while (GIMME_V == G_ARRAY);
1836	}	2209	}
1837		2210
1838	SV incr_text (JSON self)	2211	SV incr_text (JSON self)
…		…
1876	SvREFCNT_dec (self->incr_text);	2249	SvREFCNT_dec (self->incr_text);
1877		2250
1878	PROTOTYPES: ENABLE	2251	PROTOTYPES: ENABLE
1879		2252
1880	void encode_json (SV *scalar)	2253	void encode_json (SV *scalar)
1881	ALIAS:
1882	to_json_ = 0
1883	encode_json = F_UTF8
1884	PPCODE:	2254	PPCODE:
1885	{	2255	{
1886	JSON json;	2256	JSON json;
1887	json_init (&json);	2257	json_init (&json);
1888	json.flags \|= ix;	2258	json.flags \|= F_UTF8;
1889	XPUSHs (encode_json (scalar, &json));	2259	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2260	XPUSHs (scalar);
1890	}	2261	}
1891		2262
1892	void decode_json (SV *jsonstr)	2263	void decode_json (SV *jsonstr)
1893	ALIAS:
1894	from_json_ = 0
1895	decode_json = F_UTF8
1896	PPCODE:	2264	PPCODE:
1897	{	2265	{
1898	JSON json;	2266	JSON json;
1899	json_init (&json);	2267	json_init (&json);
1900	json.flags \|= ix;	2268	json.flags \|= F_UTF8;
1901	XPUSHs (decode_json (jsonstr, &json, 0));	2269	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2270	XPUSHs (jsonstr);
1902	}	2271	}
1903		2272
1904

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.92 by root, Mon Sep 22 07:29:29 2008 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.92 by root, Mon Sep 22 07:29:29 2008 UTC vs.
Revision 1.129 by root, Wed Nov 16 18:06:34 2016 UTC