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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC vs.
Revision 1.125 by root, Sun Feb 21 15:37:53 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
…		…
69	#else	84	#else
70	# define JSON_SLOW 0	85	# define JSON_SLOW 0
71	# define JSON_STASH json_stash	86	# define JSON_STASH json_stash
72	#endif	87	#endif
73		88
		89	// the amount of HEs to allocate on the stack, when sorting keys
		90	#define STACK_HES 64
		91
74	static HV json_stash, json_boolean_stash; // JSON::XS::	92	static HV json_stash, types_boolean_stash; // JSON::XS::
75	static SV json_true, json_false;	93	static SV types_true, types_false, *sv_json;
76		94
77	enum {	95	enum {
78	INCR_M_WS = 0, // initial whitespace skipping, must be 0	96	INCR_M_WS = 0, // initial whitespace skipping, must be 0
79	INCR_M_STR, // inside string	97	INCR_M_STR, // inside string
80	INCR_M_BS, // inside backslash	98	INCR_M_BS, // inside backslash
		99	INCR_M_C0, // inside comment in initial whitespace sequence
		100	INCR_M_C1, // inside comment in other places
81	INCR_M_JSON // outside anything, count nesting	101	INCR_M_JSON // outside anything, count nesting
82	};	102	};
83		103
84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)	104	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85		105
…		…
175	*s++ = 0x80 \| ( ch & 0x3f);	195	*s++ = 0x80 \| ( ch & 0x3f);
176		196
177	return s;	197	return s;
178	}	198	}
179		199
		200	// convert offset pointer to character index, sv must be string
		201	static STRLEN
		202	ptr_to_index (SV sv, char offset)
		203	{
		204	return SvUTF8 (sv)
		205	? utf8_distance (offset, SvPVX (sv))
		206	: offset - SvPVX (sv);
		207	}
		208
		209	/////////////////////////////////////////////////////////////////////////////
		210	// fp hell
		211
		212	// scan a group of digits, and a trailing exponent
		213	static void
		214	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		215	{
		216	UV uaccum = 0;
		217	int eaccum = 0;
		218
		219	// if we recurse too deep, skip all remaining digits
		220	// to avoid a stack overflow attack
		221	if (expect_false (--maxdepth <= 0))
		222	while (((U8)*s - '0') < 10)
		223	++s;
		224
		225	for (;;)
		226	{
		227	U8 dig = (U8)*s - '0';
		228
		229	if (expect_false (dig >= 10))
		230	{
		231	if (dig == (U8)((U8)'.' - (U8)'0'))
		232	{
		233	++s;
		234	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		235	}
		236	else if ((dig \| ' ') == 'e' - '0')
		237	{
		238	int exp2 = 0;
		239	int neg = 0;
		240
		241	++s;
		242
		243	if (*s == '-')
		244	{
		245	++s;
		246	neg = 1;
		247	}
		248	else if (*s == '+')
		249	++s;
		250
		251	while ((dig = (U8)*s - '0') < 10)
		252	exp2 = exp2 * 10 + *s++ - '0';
		253
		254	*expo += neg ? -exp2 : exp2;
		255	}
		256
		257	break;
		258	}
		259
		260	++s;
		261
		262	uaccum = uaccum * 10 + dig;
		263	++eaccum;
		264
		265	// if we have too many digits, then recurse for more
		266	// we actually do this for rather few digits
		267	if (uaccum >= (UV_MAX - 9) / 10)
		268	{
		269	if (postdp) *expo -= eaccum;
		270	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		271	if (postdp) *expo += eaccum;
		272
		273	break;
		274	}
		275	}
		276
		277	// this relies greatly on the quality of the pow ()
		278	// implementation of the platform, but a good
		279	// implementation is hard to beat.
		280	// (IEEE 754 conformant ones are required to be exact)
		281	if (postdp) *expo -= eaccum;
		282	accum += uaccum Perl_pow (10., *expo);
		283	*expo += eaccum;
		284	}
		285
		286	static NV
		287	json_atof (const char *s)
		288	{
		289	NV accum = 0.;
		290	int expo = 0;
		291	int neg = 0;
		292
		293	if (*s == '-')
		294	{
		295	++s;
		296	neg = 1;
		297	}
		298
		299	// a recursion depth of ten gives us >>500 bits
		300	json_atof_scan1 (s, &accum, &expo, 0, 10);
		301
		302	return neg ? -accum : accum;
		303	}
180	/////////////////////////////////////////////////////////////////////////////	304	/////////////////////////////////////////////////////////////////////////////
181	// encoder	305	// encoder
182		306
183	// structure used for encoding JSON	307	// structure used for encoding JSON
184	typedef struct	308	typedef struct
…		…
371		495
372	if (enc->indent >= enc->json.max_depth)	496	if (enc->indent >= enc->json.max_depth)
373	croak (ERR_NESTING_EXCEEDED);	497	croak (ERR_NESTING_EXCEEDED);
374		498
375	encode_ch (enc, '[');	499	encode_ch (enc, '[');
376		500
377	if (len >= 0)	501	if (len >= 0)
378	{	502	{
379	encode_nl (enc); ++enc->indent;	503	encode_nl (enc); ++enc->indent;
380		504
381	for (i = 0; i <= len; ++i)	505	for (i = 0; i <= len; ++i)
…		…
393	encode_comma (enc);	517	encode_comma (enc);
394	}	518	}
395		519
396	encode_nl (enc); --enc->indent; encode_indent (enc);	520	encode_nl (enc); --enc->indent; encode_indent (enc);
397	}	521	}
398		522
399	encode_ch (enc, ']');	523	encode_ch (enc, ']');
400	}	524	}
401		525
402	static void	526	static void
403	encode_hk (enc_t enc, HE he)	527	encode_hk (enc_t enc, HE he)
…		…
407	if (HeKLEN (he) == HEf_SVKEY)	531	if (HeKLEN (he) == HEf_SVKEY)
408	{	532	{
409	SV *sv = HeSVKEY (he);	533	SV *sv = HeSVKEY (he);
410	STRLEN len;	534	STRLEN len;
411	char *str;	535	char *str;
412		536
413	SvGETMAGIC (sv);	537	SvGETMAGIC (sv);
414	str = SvPV (sv, len);	538	str = SvPV (sv, len);
415		539
416	encode_str (enc, str, len, SvUTF8 (sv));	540	encode_str (enc, str, len, SvUTF8 (sv));
417	}	541	}
…		…
462		586
463	// for canonical output we have to sort by keys first	587	// for canonical output we have to sort by keys first
464	// actually, this is mostly due to the stupid so-called	588	// actually, this is mostly due to the stupid so-called
465	// security workaround added somewhere in 5.8.x	589	// security workaround added somewhere in 5.8.x
466	// that randomises hash orderings	590	// that randomises hash orderings
467	if (enc->json.flags & F_CANONICAL)	591	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
468	{	592	{
469	int count = hv_iterinit (hv);	593	int count = hv_iterinit (hv);
470		594
471	if (SvMAGICAL (hv))	595	if (SvMAGICAL (hv))
472	{	596	{
…		…
483	}	607	}
484		608
485	if (count)	609	if (count)
486	{	610	{
487	int i, fast = 1;	611	int i, fast = 1;
488	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	612	HE *hes_stack [STACK_HES];
489	HE *hes = _alloca (count sizeof (HE));	613	HE **hes = hes_stack;
490	#else	614
491	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	615	// allocate larger arrays on the heap
492	#endif	616	if (count > STACK_HES)
		617	{
		618	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		619	hes = (HE **)SvPVX (sv);
		620	}
493		621
494	i = 0;	622	i = 0;
495	while ((he = hv_iternext (hv)))	623	while ((he = hv_iternext (hv)))
496	{	624	{
497	hes [i++] = he;	625	hes [i++] = he;
…		…
566	// encode objects, arrays and special \0=false and \1=true values.	694	// encode objects, arrays and special \0=false and \1=true values.
567	static void	695	static void
568	encode_rv (enc_t enc, SV sv)	696	encode_rv (enc_t enc, SV sv)
569	{	697	{
570	svtype svt;	698	svtype svt;
		699	GV *method;
571		700
572	SvGETMAGIC (sv);	701	SvGETMAGIC (sv);
573	svt = SvTYPE (sv);	702	svt = SvTYPE (sv);
574		703
575	if (expect_false (SvOBJECT (sv)))	704	if (expect_false (SvOBJECT (sv)))
576	{	705	{
577	HV *stash = !JSON_SLOW \|\| json_boolean_stash	706	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
578	? json_boolean_stash	707	? types_boolean_stash
579	: gv_stashpv ("JSON::XS::Boolean", 1);	708	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		709	HV *stash = SvSTASH (sv);
580		710
581	if (SvSTASH (sv) == stash)	711	if (stash == boolean_stash)
582	{	712	{
583	if (SvIV (sv))	713	if (SvIV (sv))
584	encode_str (enc, "true", 4, 0);	714	encode_str (enc, "true", 4, 0);
585	else	715	else
586	encode_str (enc, "false", 5, 0);	716	encode_str (enc, "false", 5, 0);
587	}	717	}
		718	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		719	{
		720	int count;
		721	dSP;
		722
		723	ENTER; SAVETMPS;
		724	SAVESTACK_POS ();
		725	PUSHMARK (SP);
		726	EXTEND (SP, 2);
		727	// we re-bless the reference to get overload and other niceties right
		728	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		729	PUSHs (sv_json);
		730
		731	PUTBACK;
		732	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		733	SPAGAIN;
		734
		735	// catch this surprisingly common error
		736	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		737	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		738
		739	encode_ch (enc, '(');
		740	encode_ch (enc, '"');
		741	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		742	encode_ch (enc, '"');
		743	encode_ch (enc, ')');
		744	encode_ch (enc, '[');
		745
		746	while (count)
		747	{
		748	encode_sv (enc, SP[1 - count--]);
		749
		750	if (count)
		751	encode_ch (enc, ',');
		752	}
		753
		754	encode_ch (enc, ']');
		755
		756	FREETMPS; LEAVE;
		757	}
		758	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		759	{
		760	dSP;
		761
		762	ENTER; SAVETMPS;
		763	PUSHMARK (SP);
		764	// we re-bless the reference to get overload and other niceties right
		765	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		766
		767	// calling with G_SCALAR ensures that we always get a 1 return value
		768	PUTBACK;
		769	call_sv ((SV *)GvCV (method), G_SCALAR);
		770	SPAGAIN;
		771
		772	// catch this surprisingly common error
		773	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		774	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		775
		776	sv = POPs;
		777	PUTBACK;
		778
		779	encode_sv (enc, sv);
		780
		781	FREETMPS; LEAVE;
		782	}
		783	else if (enc->json.flags & F_ALLOW_BLESSED)
		784	encode_str (enc, "null", 4, 0);
588	else	785	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",	786	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))));	787	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
635	}
636	}	788	}
637	else if (svt == SVt_PVHV)	789	else if (svt == SVt_PVHV)
638	encode_hv (enc, (HV *)sv);	790	encode_hv (enc, (HV *)sv);
639	else if (svt == SVt_PVAV)	791	else if (svt == SVt_PVAV)
640	encode_av (enc, (AV *)sv);	792	encode_av (enc, (AV *)sv);
…		…
716	}	868	}
717	else	869	else
718	{	870	{
719	// large integer, use the (rather slow) snprintf way.	871	// large integer, use the (rather slow) snprintf way.
720	need (enc, IVUV_MAXCHARS);	872	need (enc, IVUV_MAXCHARS);
721	enc->cur +=	873	enc->cur +=
722	SvIsUV(sv)	874	SvIsUV(sv)
723	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	875	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
724	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	876	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
725	}	877	}
726	}	878	}
727	else if (SvROK (sv))	879	else if (SvROK (sv))
728	encode_rv (enc, SvRV (sv));	880	encode_rv (enc, SvRV (sv));
729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	881	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
730	encode_str (enc, "null", 4, 0);	882	encode_str (enc, "null", 4, 0);
731	else	883	else
732	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	884	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
733	SvPV_nolen (sv), SvFLAGS (sv));	885	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
		886	}
		887
		888	static int
		889	json_scalar (SV *scalar)
		890	{
		891	return 0;//D
		892	if (!SvROK (scalar))
		893	return 1;
734	}	894	}
735		895
736	static SV *	896	static SV *
737	encode_json (SV scalar, JSON json)	897	encode_json (SV scalar, JSON json)
738	{	898	{
739	enc_t enc;	899	enc_t enc;
740		900
741	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	901	if (!(json->flags & F_ALLOW_NONREF) && json_scalar (scalar))
742	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	902	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
743		903
744	enc.json = *json;	904	enc.json = *json;
745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	905	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
746	enc.cur = SvPVX (enc.sv);	906	enc.cur = SvPVX (enc.sv);
…		…
750	: enc.json.flags & F_LATIN1 ? 0x000100UL	910	: enc.json.flags & F_LATIN1 ? 0x000100UL
751	: 0x110000UL;	911	: 0x110000UL;
752		912
753	SvPOK_only (enc.sv);	913	SvPOK_only (enc.sv);
754	encode_sv (&enc, scalar);	914	encode_sv (&enc, scalar);
		915	encode_nl (&enc);
755		916
756	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	917	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
757	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	918	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
758		919
759	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	920	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
939	else if (expect_true (ch >= 0x20 && ch < 0x80))	1100	else if (expect_true (ch >= 0x20 && ch < 0x80))
940	*cur++ = ch;	1101	*cur++ = ch;
941	else if (ch >= 0x80)	1102	else if (ch >= 0x80)
942	{	1103	{
943	STRLEN clen;	1104	STRLEN clen;
944	UV uch;
945		1105
946	--dec_cur;	1106	--dec_cur;
947		1107
948	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1108	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
949	if (clen == (STRLEN)-1)	1109	if (clen == (STRLEN)-1)
950	ERR ("malformed UTF-8 character in JSON string");	1110	ERR ("malformed UTF-8 character in JSON string");
951		1111
952	do	1112	do
953	cur++ = dec_cur++;	1113	cur++ = dec_cur++;
954	while (--clen);	1114	while (--clen);
955		1115
956	utf8 = 1;	1116	utf8 = 1;
957	}	1117	}
		1118	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1119	*cur++ = ch;
958	else	1120	else
959	{	1121	{
960	--dec_cur;	1122	--dec_cur;
961		1123
962	if (!ch)	1124	if (!ch)
…		…
1075		1237
1076	// special case the rather common 1..5-digit-int case	1238	// special case the rather common 1..5-digit-int case
1077	if (*start == '-')	1239	if (*start == '-')
1078	switch (len)	1240	switch (len)
1079	{	1241	{
1080	case 2: return newSViv (-( start [1] - '0' * 1));	1242	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1081	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1243	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1082	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1244	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1083	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1245	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1084	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1246	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1085	}	1247	}
1086	else	1248	else
1087	switch (len)	1249	switch (len)
1088	{	1250	{
1089	case 1: return newSViv ( start [0] - '0' * 1);	1251	case 1: return newSViv ( start [0] - '0' * 1);
1090	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1252	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1091	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1253	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1092	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1254	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1093	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1255	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1094	}	1256	}
1095		1257
1096	{	1258	{
1097	UV uv;	1259	UV uv;
1098	int numtype = grok_number (start, len, &uv);	1260	int numtype = grok_number (start, len, &uv);
…		…
1107	}	1269	}
1108		1270
1109	len -= *start == '-' ? 1 : 0;	1271	len -= *start == '-' ? 1 : 0;
1110		1272
1111	// does not fit into IV or UV, try NV	1273	// does not fit into IV or UV, try NV
1112	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1274	if (len <= NV_DIG)
1113	#if defined (LDBL_DIG)
1114	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1115	#endif
1116	)
1117	// fits into NV without loss of precision	1275	// fits into NV without loss of precision
1118	return newSVnv (Atof (start));	1276	return newSVnv (json_atof (start));
1119		1277
1120	// everything else fails, convert it to a string	1278	// everything else fails, convert it to a string
1121	return newSVpvn (start, dec->cur - start);	1279	return newSVpvn (start, dec->cur - start);
1122	}	1280	}
1123		1281
1124	// loss of precision here	1282	// loss of precision here
1125	return newSVnv (Atof (start));	1283	return newSVnv (json_atof (start));
1126		1284
1127	fail:	1285	fail:
1128	return 0;	1286	return 0;
1129	}	1287	}
1130		1288
…		…
1154	if (*dec->cur == ']')	1312	if (*dec->cur == ']')
1155	{	1313	{
1156	++dec->cur;	1314	++dec->cur;
1157	break;	1315	break;
1158	}	1316	}
1159		1317
1160	if (*dec->cur != ',')	1318	if (*dec->cur != ',')
1161	ERR (", or ] expected while parsing array");	1319	ERR (", or ] expected while parsing array");
1162		1320
1163	++dec->cur;	1321	++dec->cur;
1164		1322
…		…
1288		1446
1289	hv_iterinit (hv);	1447	hv_iterinit (hv);
1290	he = hv_iternext (hv);	1448	he = hv_iternext (hv);
1291	hv_iterinit (hv);	1449	hv_iterinit (hv);
1292		1450
1293	// the next line creates a mortal sv each time its called.	1451	// the next line creates a mortal sv each time it's called.
1294	// might want to optimise this for common cases.	1452	// might want to optimise this for common cases.
1295	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);	1453	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1296		1454
1297	if (cb)	1455	if (cb)
1298	{	1456	{
1299	dSP;	1457	dSP;
1300	int count;	1458	int count;
1301		1459
1302	ENTER; SAVETMPS; PUSHMARK (SP);	1460	ENTER; SAVETMPS;
		1461	SAVESTACK_POS ();
		1462	PUSHMARK (SP);
1303	XPUSHs (HeVAL (he));	1463	XPUSHs (HeVAL (he));
		1464	sv_2mortal (sv);
1304		1465
1305	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1466	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1306		1467
1307	if (count == 1)	1468	if (count == 1)
1308	{	1469	{
1309	sv = newSVsv (POPs);	1470	sv = newSVsv (POPs);
1310	FREETMPS; LEAVE;	1471	FREETMPS; LEAVE;
1311	return sv;	1472	return sv;
1312	}	1473	}
1313		1474
		1475	SvREFCNT_inc (sv);
1314	FREETMPS; LEAVE;	1476	FREETMPS; LEAVE;
1315	}	1477	}
1316	}	1478	}
1317		1479
1318	if (dec->json.cb_object)	1480	if (dec->json.cb_object)
1319	{	1481	{
1320	dSP;	1482	dSP;
1321	int count;	1483	int count;
1322		1484
1323	ENTER; SAVETMPS; PUSHMARK (SP);	1485	ENTER; SAVETMPS;
		1486	SAVESTACK_POS ();
		1487	PUSHMARK (SP);
1324	XPUSHs (sv_2mortal (sv));	1488	XPUSHs (sv_2mortal (sv));
1325		1489
1326	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1490	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1327		1491
1328	if (count == 1)	1492	if (count == 1)
…		…
1344	DEC_DEC_DEPTH;	1508	DEC_DEC_DEPTH;
1345	return 0;	1509	return 0;
1346	}	1510	}
1347		1511
1348	static SV *	1512	static SV *
		1513	decode_tag (dec_t *dec)
		1514	{
		1515	SV *tag = 0;
		1516	SV *val = 0;
		1517
		1518	if (!(dec->json.flags & F_ALLOW_TAGS))
		1519	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1520
		1521	++dec->cur;
		1522
		1523	decode_ws (dec);
		1524
		1525	tag = decode_sv (dec);
		1526	if (!tag)
		1527	goto fail;
		1528
		1529	if (!SvPOK (tag))
		1530	ERR ("malformed JSON string, (tag) must be a string");
		1531
		1532	decode_ws (dec);
		1533
		1534	if (*dec->cur != ')')
		1535	ERR (") expected after tag");
		1536
		1537	++dec->cur;
		1538
		1539	decode_ws (dec);
		1540
		1541	val = decode_sv (dec);
		1542	if (!val)
		1543	goto fail;
		1544
		1545	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1546	ERR ("malformed JSON string, tag value must be an array");
		1547
		1548	{
		1549	AV av = (AV )SvRV (val);
		1550	int i, len = av_len (av) + 1;
		1551	HV *stash = gv_stashsv (tag, 0);
		1552	SV *sv;
		1553
		1554	if (!stash)
		1555	ERR ("cannot decode perl-object (package does not exist)");
		1556
		1557	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1558
		1559	if (!method)
		1560	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1561
		1562	dSP;
		1563
		1564	ENTER; SAVETMPS;
		1565	PUSHMARK (SP);
		1566	EXTEND (SP, len + 2);
		1567	// we re-bless the reference to get overload and other niceties right
		1568	PUSHs (tag);
		1569	PUSHs (sv_json);
		1570
		1571	for (i = 0; i < len; ++i)
		1572	PUSHs (*av_fetch (av, i, 1));
		1573
		1574	PUTBACK;
		1575	call_sv ((SV *)GvCV (method), G_SCALAR);
		1576	SPAGAIN;
		1577
		1578	SvREFCNT_dec (tag);
		1579	SvREFCNT_dec (val);
		1580	sv = SvREFCNT_inc (POPs);
		1581
		1582	PUTBACK;
		1583
		1584	FREETMPS; LEAVE;
		1585
		1586	return sv;
		1587	}
		1588
		1589	fail:
		1590	SvREFCNT_dec (tag);
		1591	SvREFCNT_dec (val);
		1592	return 0;
		1593	}
		1594
		1595	static SV *
1349	decode_sv (dec_t *dec)	1596	decode_sv (dec_t *dec)
1350	{	1597	{
1351	// the beauty of JSON: you need exactly one character lookahead	1598	// the beauty of JSON: you need exactly one character lookahead
1352	// to parse everything.	1599	// to parse everything.
1353	switch (*dec->cur)	1600	switch (*dec->cur)
1354	{	1601	{
1355	case '"': ++dec->cur; return decode_str (dec);	1602	case '"': ++dec->cur; return decode_str (dec);
1356	case '[': ++dec->cur; return decode_av (dec);	1603	case '[': ++dec->cur; return decode_av (dec);
1357	case '{': ++dec->cur; return decode_hv (dec);	1604	case '{': ++dec->cur; return decode_hv (dec);
		1605	case '(': return decode_tag (dec);
1358		1606
1359	case '-':	1607	case '-':
1360	case '0': case '1': case '2': case '3': case '4':	1608	case '0': case '1': case '2': case '3': case '4':
1361	case '5': case '6': case '7': case '8': case '9':	1609	case '5': case '6': case '7': case '8': case '9':
1362	return decode_num (dec);	1610	return decode_num (dec);
…		…
1364	case 't':	1612	case 't':
1365	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1613	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1366	{	1614	{
1367	dec->cur += 4;	1615	dec->cur += 4;
1368	#if JSON_SLOW	1616	#if JSON_SLOW
1369	json_true = get_bool ("JSON::XS::true");	1617	types_true = get_bool ("Types::Serialiser::true");
1370	#endif	1618	#endif
1371	return newSVsv (json_true);	1619	return newSVsv (types_true);
1372	}	1620	}
1373	else	1621	else
1374	ERR ("'true' expected");	1622	ERR ("'true' expected");
1375		1623
1376	break;	1624	break;
…		…
1378	case 'f':	1626	case 'f':
1379	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1627	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1380	{	1628	{
1381	dec->cur += 5;	1629	dec->cur += 5;
1382	#if JSON_SLOW	1630	#if JSON_SLOW
1383	json_false = get_bool ("JSON::XS::false");	1631	types_false = get_bool ("Types::Serialiser::false");
1384	#endif	1632	#endif
1385	return newSVsv (json_false);	1633	return newSVsv (types_false);
1386	}	1634	}
1387	else	1635	else
1388	ERR ("'false' expected");	1636	ERR ("'false' expected");
1389		1637
1390	break;	1638	break;
…		…
1399	ERR ("'null' expected");	1647	ERR ("'null' expected");
1400		1648
1401	break;	1649	break;
1402		1650
1403	default:	1651	default:
1404	ERR ("malformed JSON string, neither array, object, number, string or atom");	1652	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1405	break;	1653	break;
1406	}	1654	}
1407		1655
1408	fail:	1656	fail:
1409	return 0;	1657	return 0;
1410	}	1658	}
1411		1659
1412	static SV *	1660	static SV *
1413	decode_json (SV string, JSON json, STRLEN *offset_return)	1661	decode_json (SV string, JSON json, char **offset_return)
1414	{	1662	{
1415	dec_t dec;	1663	dec_t dec;
1416	STRLEN offset;
1417	SV *sv;	1664	SV *sv;
1418		1665
1419	/* work around bugs in 5.10 where manipulating magic values	1666	/* work around bugs in 5.10 where manipulating magic values
1420	* will perl ignore the magic in subsequent accesses	1667	* makes perl ignore the magic in subsequent accesses.
		1668	* also make a copy of non-PV values, to get them into a clean
		1669	* state (SvPV should do that, but it's buggy, see below).
1421	*/	1670	*/
1422	/SvGETMAGIC (string);/	1671	/SvGETMAGIC (string);/
1423	if (SvMAGICAL (string))	1672	if (SvMAGICAL (string) \|\| !SvPOK (string))
1424	string = sv_2mortal (newSVsv (string));	1673	string = sv_2mortal (newSVsv (string));
1425		1674
1426	SvUPGRADE (string, SVt_PV);	1675	SvUPGRADE (string, SVt_PV);
1427		1676
1428	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1677	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1433	* and hope for the best.	1682	* and hope for the best.
1434	* Damnit, SvPV_nolen still trips over yet another assertion. This	1683	* Damnit, SvPV_nolen still trips over yet another assertion. This
1435	* assertion business is seriously broken, try yet another workaround	1684	* assertion business is seriously broken, try yet another workaround
1436	* for the broken -DDEBUGGING.	1685	* for the broken -DDEBUGGING.
1437	*/	1686	*/
		1687	{
1438	#ifdef DEBUGGING	1688	#ifdef DEBUGGING
1439	offset = SvOK (string) ? sv_len (string) : 0;	1689	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1440	#else	1690	#else
1441	offset = SvCUR (string);	1691	STRLEN offset = SvCUR (string);
1442	#endif	1692	#endif
1443		1693
1444	if (offset > json->max_size && json->max_size)	1694	if (offset > json->max_size && json->max_size)
1445	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1695	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1446	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1696	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1697	}
1447		1698
1448	if (json->flags & F_UTF8)	1699	if (DECODE_WANTS_OCTETS (json))
1449	sv_utf8_downgrade (string, 0);	1700	sv_utf8_downgrade (string, 0);
1450	else	1701	else
1451	sv_utf8_upgrade (string);	1702	sv_utf8_upgrade (string);
1452		1703
1453	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1704	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1463		1714
1464	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1715	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1465		1716
1466	decode_ws (&dec);	1717	decode_ws (&dec);
1467	sv = decode_sv (&dec);	1718	sv = decode_sv (&dec);
		1719
		1720	if (offset_return)
		1721	*offset_return = dec.cur;
1468		1722
1469	if (!(offset_return \|\| !sv))	1723	if (!(offset_return \|\| !sv))
1470	{	1724	{
1471	// check for trailing garbage	1725	// check for trailing garbage
1472	decode_ws (&dec);	1726	decode_ws (&dec);
…		…
1475	{	1729	{
1476	dec.err = "garbage after JSON object";	1730	dec.err = "garbage after JSON object";
1477	SvREFCNT_dec (sv);	1731	SvREFCNT_dec (sv);
1478	sv = 0;	1732	sv = 0;
1479	}	1733	}
1480	}
1481
1482	if (offset_return \|\| !sv)
1483	{
1484	offset = dec.json.flags & F_UTF8
1485	? dec.cur - SvPVX (string)
1486	: utf8_distance (dec.cur, SvPVX (string));
1487
1488	if (offset_return)
1489	*offset_return = offset;
1490	}	1734	}
1491		1735
1492	if (!sv)	1736	if (!sv)
1493	{	1737	{
1494	SV *uni = sv_newmortal ();	1738	SV *uni = sv_newmortal ();
…		…
1500	SAVEVPTR (PL_curcop);	1744	SAVEVPTR (PL_curcop);
1501	PL_curcop = &cop;	1745	PL_curcop = &cop;
1502	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1746	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1503	LEAVE;	1747	LEAVE;
1504		1748
1505	croak ("%s, at character offset %d [\"%s\"]",	1749	croak ("%s, at character offset %d (before \"%s\")",
1506	dec.err,	1750	dec.err,
1507	(int)offset,	1751	(int)ptr_to_index (string, dec.cur),
1508	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1752	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1509	}	1753	}
1510		1754
1511	sv = sv_2mortal (sv);	1755	sv = sv_2mortal (sv);
1512		1756
…		…
1521		1765
1522	static void	1766	static void
1523	incr_parse (JSON *self)	1767	incr_parse (JSON *self)
1524	{	1768	{
1525	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1769	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1770
		1771	// the state machine here is a bit convoluted and could be simplified a lot
		1772	// but this would make it slower, so...
1526		1773
1527	for (;;)	1774	for (;;)
1528	{	1775	{
1529	//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	1776	//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
1530	switch (self->incr_mode)	1777	switch (self->incr_mode)
1531	{	1778	{
1532	// only used for intiial whitespace skipping	1779	// only used for initial whitespace skipping
1533	case INCR_M_WS:	1780	case INCR_M_WS:
1534	for (;;)	1781	for (;;)
1535	{	1782	{
1536	if (*p > 0x20)	1783	if (*p > 0x20)
1537	{	1784	{
		1785	if (*p == '#')
		1786	{
		1787	self->incr_mode = INCR_M_C0;
		1788	goto incr_m_c;
		1789	}
		1790	else
		1791	{
1538	self->incr_mode = INCR_M_JSON;	1792	self->incr_mode = INCR_M_JSON;
1539	goto incr_m_json;	1793	goto incr_m_json;
		1794	}
1540	}	1795	}
1541	else if (!*p)	1796	else if (!*p)
1542	goto interrupt;	1797	goto interrupt;
1543		1798
1544	++p;	1799	++p;
…		…
1550	goto interrupt;	1805	goto interrupt;
1551		1806
1552	++p;	1807	++p;
1553	self->incr_mode = INCR_M_STR;	1808	self->incr_mode = INCR_M_STR;
1554	goto incr_m_str;	1809	goto incr_m_str;
		1810
		1811	// inside #-style comments
		1812	case INCR_M_C0:
		1813	case INCR_M_C1:
		1814	incr_m_c:
		1815	for (;;)
		1816	{
		1817	if (*p == '\n')
		1818	{
		1819	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1820	break;
		1821	}
		1822	else if (!*p)
		1823	goto interrupt;
		1824
		1825	++p;
		1826	}
		1827
		1828	break;
1555		1829
1556	// inside a string	1830	// inside a string
1557	case INCR_M_STR:	1831	case INCR_M_STR:
1558	incr_m_str:	1832	incr_m_str:
1559	for (;;)	1833	for (;;)
…		…
1610	self->incr_mode = INCR_M_STR;	1884	self->incr_mode = INCR_M_STR;
1611	goto incr_m_str;	1885	goto incr_m_str;
1612		1886
1613	case '[':	1887	case '[':
1614	case '{':	1888	case '{':
		1889	case '(':
1615	if (++self->incr_nest > self->max_depth)	1890	if (++self->incr_nest > self->max_depth)
1616	croak (ERR_NESTING_EXCEEDED);	1891	croak (ERR_NESTING_EXCEEDED);
1617	break;	1892	break;
1618		1893
1619	case ']':	1894	case ']':
1620	case '}':	1895	case '}':
1621	if (--self->incr_nest <= 0)	1896	if (--self->incr_nest <= 0)
1622	goto interrupt;	1897	goto interrupt;
		1898	break;
		1899
		1900	case ')':
		1901	--self->incr_nest;
		1902	break;
		1903
		1904	case '#':
		1905	self->incr_mode = INCR_M_C1;
		1906	goto incr_m_c;
1623	}	1907	}
1624	}	1908	}
1625	}	1909	}
1626		1910
1627	modechange:	1911	modechange:
1628	;	1912	;
1629	}	1913	}
1630		1914
1631	interrupt:	1915	interrupt:
1632	self->incr_pos = p - SvPVX (self->incr_text);	1916	self->incr_pos = p - SvPVX (self->incr_text);
		1917	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1633	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1918	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1634	}	1919	}
1635		1920
1636	/////////////////////////////////////////////////////////////////////////////	1921	/////////////////////////////////////////////////////////////////////////////
1637	// XS interface functions	1922	// XS interface functions
…		…
1647	i >= '0' && i <= '9' ? i - '0'	1932	i >= '0' && i <= '9' ? i - '0'
1648	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1933	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1649	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1934	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1650	: -1;	1935	: -1;
1651		1936
1652	json_stash = gv_stashpv ("JSON::XS" , 1);	1937	json_stash = gv_stashpv ("JSON::XS" , 1);
1653	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1938	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1654		1939
1655	json_true = get_bool ("JSON::XS::true");	1940	types_true = get_bool ("Types::Serialiser::true");
1656	json_false = get_bool ("JSON::XS::false");	1941	types_false = get_bool ("Types::Serialiser::false");
		1942
		1943	sv_json = newSVpv ("JSON", 0);
		1944	SvREADONLY_on (sv_json);
		1945
		1946	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1657	}	1947	}
1658		1948
1659	PROTOTYPES: DISABLE	1949	PROTOTYPES: DISABLE
1660		1950
1661	void CLONE (...)	1951	void CLONE (...)
1662	CODE:	1952	CODE:
1663	json_stash = 0;	1953	json_stash = 0;
1664	json_boolean_stash = 0;	1954	types_boolean_stash = 0;
1665		1955
1666	void new (char *klass)	1956	void new (char *klass)
1667	PPCODE:	1957	PPCODE:
1668	{	1958	{
1669	SV *pv = NEWSV (0, sizeof (JSON));	1959	SV *pv = NEWSV (0, sizeof (JSON));
1670	SvPOK_only (pv);	1960	SvPOK_only (pv);
1671	json_init ((JSON *)SvPVX (pv));	1961	json_init ((JSON *)SvPVX (pv));
1672	XPUSHs (sv_2mortal (sv_bless (	1962	XPUSHs (sv_2mortal (sv_bless (
1673	newRV_noinc (pv),	1963	newRV_noinc (pv),
1674	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1964	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1689	shrink = F_SHRINK	1979	shrink = F_SHRINK
1690	allow_blessed = F_ALLOW_BLESSED	1980	allow_blessed = F_ALLOW_BLESSED
1691	convert_blessed = F_CONV_BLESSED	1981	convert_blessed = F_CONV_BLESSED
1692	relaxed = F_RELAXED	1982	relaxed = F_RELAXED
1693	allow_unknown = F_ALLOW_UNKNOWN	1983	allow_unknown = F_ALLOW_UNKNOWN
		1984	allow_tags = F_ALLOW_TAGS
1694	PPCODE:	1985	PPCODE:
1695	{	1986	{
1696	if (enable)	1987	if (enable)
1697	self->flags \|= ix;	1988	self->flags \|= ix;
1698	else	1989	else
…		…
1714	get_shrink = F_SHRINK	2005	get_shrink = F_SHRINK
1715	get_allow_blessed = F_ALLOW_BLESSED	2006	get_allow_blessed = F_ALLOW_BLESSED
1716	get_convert_blessed = F_CONV_BLESSED	2007	get_convert_blessed = F_CONV_BLESSED
1717	get_relaxed = F_RELAXED	2008	get_relaxed = F_RELAXED
1718	get_allow_unknown = F_ALLOW_UNKNOWN	2009	get_allow_unknown = F_ALLOW_UNKNOWN
		2010	get_allow_tags = F_ALLOW_TAGS
1719	PPCODE:	2011	PPCODE:
1720	XPUSHs (boolSV (self->flags & ix));	2012	XPUSHs (boolSV (self->flags & ix));
1721		2013
1722	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2014	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1723	PPCODE:	2015	PPCODE:
…		…
1751	}	2043	}
1752		2044
1753	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2045	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1754	PPCODE:	2046	PPCODE:
1755	{	2047	{
1756	if (!self->cb_sk_object)	2048	if (!self->cb_sk_object)
1757	self->cb_sk_object = newHV ();	2049	self->cb_sk_object = newHV ();
1758		2050
1759	if (SvOK (cb))	2051	if (SvOK (cb))
1760	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2052	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1761	else	2053	else
…		…
1772	XPUSHs (ST (0));	2064	XPUSHs (ST (0));
1773	}	2065	}
1774		2066
1775	void encode (JSON self, SV scalar)	2067	void encode (JSON self, SV scalar)
1776	PPCODE:	2068	PPCODE:
1777	XPUSHs (encode_json (scalar, self));	2069	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2070	XPUSHs (scalar);
1778		2071
1779	void decode (JSON self, SV jsonstr)	2072	void decode (JSON self, SV jsonstr)
1780	PPCODE:	2073	PPCODE:
1781	XPUSHs (decode_json (jsonstr, self, 0));	2074	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2075	XPUSHs (jsonstr);
1782		2076
1783	void decode_prefix (JSON self, SV jsonstr)	2077	void decode_prefix (JSON self, SV jsonstr)
1784	PPCODE:	2078	PPCODE:
1785	{	2079	{
1786	STRLEN offset;	2080	SV *sv;
		2081	char *offset;
		2082	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1787	EXTEND (SP, 2);	2083	EXTEND (SP, 2);
1788	PUSHs (decode_json (jsonstr, self, &offset));	2084	PUSHs (sv);
1789	PUSHs (sv_2mortal (newSVuv (offset)));	2085	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1790	}	2086	}
1791		2087
1792	void incr_parse (JSON self, SV jsonstr = 0)	2088	void incr_parse (JSON self, SV jsonstr = 0)
1793	PPCODE:	2089	PPCODE:
1794	{	2090	{
1795	if (!self->incr_text)	2091	if (!self->incr_text)
1796	self->incr_text = newSVpvn ("", 0);	2092	self->incr_text = newSVpvn ("", 0);
		2093
		2094	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2095	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2096	if (DECODE_WANTS_OCTETS (self))
		2097	{
		2098	if (self->incr_pos)
		2099	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2100	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2101
		2102	sv_utf8_downgrade (self->incr_text, 0);
		2103	}
		2104	else
		2105	{
		2106	sv_utf8_upgrade (self->incr_text);
		2107
		2108	if (self->incr_pos)
		2109	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2110	- (U8 *)SvPVX (self->incr_text);
		2111	}
1797		2112
1798	// append data, if any	2113	// append data, if any
1799	if (jsonstr)	2114	if (jsonstr)
1800	{	2115	{
		2116	/* make sure both strings have same encoding */
1801	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	2117	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		2118	if (SvUTF8 (jsonstr))
		2119	sv_utf8_downgrade (jsonstr, 0);
1802	{	2120	else
1803	/* utf-8-ness differs, need to upgrade */
1804	sv_utf8_upgrade (self->incr_text);	2121	sv_utf8_upgrade (jsonstr);
1805		2122
1806	if (self->incr_pos)	2123	/* and then just blindly append */
1807	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1808	- (U8 *)SvPVX (self->incr_text);
1809	}
1810
1811	{	2124	{
1812	STRLEN len;	2125	STRLEN len;
1813	const char *str = SvPV (jsonstr, len);	2126	const char *str = SvPV (jsonstr, len);
1814	STRLEN cur = SvCUR (self->incr_text);	2127	STRLEN cur = SvCUR (self->incr_text);
1815		2128
…		…
1823	}	2136	}
1824		2137
1825	if (GIMME_V != G_VOID)	2138	if (GIMME_V != G_VOID)
1826	do	2139	do
1827	{	2140	{
		2141	SV *sv;
1828	STRLEN offset;	2142	char *offset;
1829		2143
1830	if (!INCR_DONE (self))	2144	if (!INCR_DONE (self))
1831	{	2145	{
1832	incr_parse (self);	2146	incr_parse (self);
1833		2147
1834	if (self->incr_pos > self->max_size && self->max_size)	2148	if (self->incr_pos > self->max_size && self->max_size)
1835	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	2149	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1836	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2150	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1837		2151
1838	if (!INCR_DONE (self))	2152	if (!INCR_DONE (self))
		2153	{
		2154	// as an optimisation, do not accumulate white space in the incr buffer
		2155	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2156	{
		2157	self->incr_pos = 0;
		2158	SvCUR_set (self->incr_text, 0);
		2159	}
		2160
1839	break;	2161	break;
		2162	}
1840	}	2163	}
1841		2164
1842	XPUSHs (decode_json (self->incr_text, self, &offset));	2165	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2166	XPUSHs (sv);
1843		2167
1844	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1845	self->incr_pos -= offset;	2168	self->incr_pos -= offset - SvPVX (self->incr_text);
1846	self->incr_nest = 0;	2169	self->incr_nest = 0;
1847	self->incr_mode = 0;	2170	self->incr_mode = 0;
		2171
		2172	sv_chop (self->incr_text, offset);
1848	}	2173	}
1849	while (GIMME_V == G_ARRAY);	2174	while (GIMME_V == G_ARRAY);
1850	}	2175	}
1851		2176
1852	SV incr_text (JSON self)	2177	SV incr_text (JSON self)
…		…
1890	SvREFCNT_dec (self->incr_text);	2215	SvREFCNT_dec (self->incr_text);
1891		2216
1892	PROTOTYPES: ENABLE	2217	PROTOTYPES: ENABLE
1893		2218
1894	void encode_json (SV *scalar)	2219	void encode_json (SV *scalar)
1895	ALIAS:
1896	to_json_ = 0
1897	encode_json = F_UTF8
1898	PPCODE:	2220	PPCODE:
1899	{	2221	{
1900	JSON json;	2222	JSON json;
1901	json_init (&json);	2223	json_init (&json);
1902	json.flags \|= ix;	2224	json.flags \|= F_UTF8;
1903	XPUSHs (encode_json (scalar, &json));	2225	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2226	XPUSHs (scalar);
1904	}	2227	}
1905		2228
1906	void decode_json (SV *jsonstr)	2229	void decode_json (SV *jsonstr)
1907	ALIAS:
1908	from_json_ = 0
1909	decode_json = F_UTF8
1910	PPCODE:	2230	PPCODE:
1911	{	2231	{
1912	JSON json;	2232	JSON json;
1913	json_init (&json);	2233	json_init (&json);
1914	json.flags \|= ix;	2234	json.flags \|= F_UTF8;
1915	XPUSHs (decode_json (jsonstr, &json, 0));	2235	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2236	XPUSHs (jsonstr);
1916	}	2237	}
1917		2238
1918

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC vs. Revision 1.125 by root, Sun Feb 21 15:37:53 2016 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC vs.
Revision 1.125 by root, Sun Feb 21 15:37:53 2016 UTC