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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.103 by root, Wed Jan 6 08:01:39 2010 UTC vs.
Revision 1.122 by root, Tue Oct 29 15:55:49 2013 UTC

…		…
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarantees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
		20	#endif
		21
		22	// compatibility with perl <5.18
		23	#ifndef HvNAMELEN_get
		24	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		25	#endif
		26	#ifndef HvNAMELEN
		27	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		28	#endif
		29	#ifndef HvNAMEUTF8
		30	# define HvNAMEUTF8(hv) 0
20	#endif	31	#endif
21		32
22	// three extra for rounding, sign, and end of string	33	// three extra for rounding, sign, and end of string
23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)	34	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24		35
…		…
33	#define F_SHRINK 0x00000200UL	44	#define F_SHRINK 0x00000200UL
34	#define F_ALLOW_BLESSED 0x00000400UL	45	#define F_ALLOW_BLESSED 0x00000400UL
35	#define F_CONV_BLESSED 0x00000800UL	46	#define F_CONV_BLESSED 0x00000800UL
36	#define F_RELAXED 0x00001000UL	47	#define F_RELAXED 0x00001000UL
37	#define F_ALLOW_UNKNOWN 0x00002000UL	48	#define F_ALLOW_UNKNOWN 0x00002000UL
		49	#define F_ALLOW_TAGS 0x00004000UL
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	50	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		51
40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	52	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
41		53
42	#define INIT_SIZE 32 // initial scalar size to be allocated	54	#define INIT_SIZE 32 // initial scalar size to be allocated
43	#define INDENT_STEP 3 // spaces per indentation level	55	#define INDENT_STEP 3 // spaces per indentation level
44		56
45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	57	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		58
		59	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46		60
47	#define SB do {	61	#define SB do {
48	#define SE } while (0)	62	#define SE } while (0)
49		63
50	#if __GNUC__ >= 3	64	#if __GNUC__ >= 3
…		…
70	#else	84	#else
71	# define JSON_SLOW 0	85	# define JSON_SLOW 0
72	# define JSON_STASH json_stash	86	# define JSON_STASH json_stash
73	#endif	87	#endif
74		88
		89	// the amount of HEs to allocate on the stack, when sorting keys
		90	#define STACK_HES 64
		91
75	static HV json_stash, json_boolean_stash; // JSON::XS::	92	static HV json_stash, types_boolean_stash; // JSON::XS::
76	static SV json_true, json_false;	93	static SV types_true, types_false, *sv_json;
77		94
78	enum {	95	enum {
79	INCR_M_WS = 0, // initial whitespace skipping, must be 0	96	INCR_M_WS = 0, // initial whitespace skipping, must be 0
80	INCR_M_STR, // inside string	97	INCR_M_STR, // inside string
81	INCR_M_BS, // inside backslash	98	INCR_M_BS, // inside backslash
…		…
187	return SvUTF8 (sv)	204	return SvUTF8 (sv)
188	? utf8_distance (offset, SvPVX (sv))	205	? utf8_distance (offset, SvPVX (sv))
189	: offset - SvPVX (sv);	206	: offset - SvPVX (sv);
190	}	207	}
191		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	}
192	/////////////////////////////////////////////////////////////////////////////	304	/////////////////////////////////////////////////////////////////////////////
193	// encoder	305	// encoder
194		306
195	// structure used for encoding JSON	307	// structure used for encoding JSON
196	typedef struct	308	typedef struct
…		…
383		495
384	if (enc->indent >= enc->json.max_depth)	496	if (enc->indent >= enc->json.max_depth)
385	croak (ERR_NESTING_EXCEEDED);	497	croak (ERR_NESTING_EXCEEDED);
386		498
387	encode_ch (enc, '[');	499	encode_ch (enc, '[');
388		500
389	if (len >= 0)	501	if (len >= 0)
390	{	502	{
391	encode_nl (enc); ++enc->indent;	503	encode_nl (enc); ++enc->indent;
392		504
393	for (i = 0; i <= len; ++i)	505	for (i = 0; i <= len; ++i)
…		…
405	encode_comma (enc);	517	encode_comma (enc);
406	}	518	}
407		519
408	encode_nl (enc); --enc->indent; encode_indent (enc);	520	encode_nl (enc); --enc->indent; encode_indent (enc);
409	}	521	}
410		522
411	encode_ch (enc, ']');	523	encode_ch (enc, ']');
412	}	524	}
413		525
414	static void	526	static void
415	encode_hk (enc_t enc, HE he)	527	encode_hk (enc_t enc, HE he)
…		…
419	if (HeKLEN (he) == HEf_SVKEY)	531	if (HeKLEN (he) == HEf_SVKEY)
420	{	532	{
421	SV *sv = HeSVKEY (he);	533	SV *sv = HeSVKEY (he);
422	STRLEN len;	534	STRLEN len;
423	char *str;	535	char *str;
424		536
425	SvGETMAGIC (sv);	537	SvGETMAGIC (sv);
426	str = SvPV (sv, len);	538	str = SvPV (sv, len);
427		539
428	encode_str (enc, str, len, SvUTF8 (sv));	540	encode_str (enc, str, len, SvUTF8 (sv));
429	}	541	}
…		…
495	}	607	}
496		608
497	if (count)	609	if (count)
498	{	610	{
499	int i, fast = 1;	611	int i, fast = 1;
500	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	612	HE *hes_stack [STACK_HES];
501	HE *hes = _alloca (count sizeof (HE));	613	HE **hes = hes_stack;
502	#else	614
503	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	615	// allocate larger arrays on the heap
504	#endif	616	if (count > STACK_HES)
		617	{
		618	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		619	hes = (HE **)SvPVX (sv);
		620	}
505		621
506	i = 0;	622	i = 0;
507	while ((he = hv_iternext (hv)))	623	while ((he = hv_iternext (hv)))
508	{	624	{
509	hes [i++] = he;	625	hes [i++] = he;
…		…
578	// encode objects, arrays and special \0=false and \1=true values.	694	// encode objects, arrays and special \0=false and \1=true values.
579	static void	695	static void
580	encode_rv (enc_t enc, SV sv)	696	encode_rv (enc_t enc, SV sv)
581	{	697	{
582	svtype svt;	698	svtype svt;
		699	GV *method;
583		700
584	SvGETMAGIC (sv);	701	SvGETMAGIC (sv);
585	svt = SvTYPE (sv);	702	svt = SvTYPE (sv);
586		703
587	if (expect_false (SvOBJECT (sv)))	704	if (expect_false (SvOBJECT (sv)))
588	{	705	{
589	HV *stash = !JSON_SLOW \|\| json_boolean_stash	706	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
590	? json_boolean_stash	707	? types_boolean_stash
591	: gv_stashpv ("JSON::XS::Boolean", 1);	708	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		709	HV *stash = SvSTASH (sv);
592		710
593	if (SvSTASH (sv) == stash)	711	if (stash == boolean_stash)
594	{	712	{
595	if (SvIV (sv))	713	if (SvIV (sv))
596	encode_str (enc, "true", 4, 0);	714	encode_str (enc, "true", 4, 0);
597	else	715	else
598	encode_str (enc, "false", 5, 0);	716	encode_str (enc, "false", 5, 0);
599	}	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; PUSHMARK (SP);
		724	EXTEND (SP, 2);
		725	// we re-bless the reference to get overload and other niceties right
		726	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		727	PUSHs (sv_json);
		728
		729	PUTBACK;
		730	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		731	SPAGAIN;
		732
		733	// catch this surprisingly common error
		734	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		735	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		736
		737	encode_ch (enc, '(');
		738	encode_ch (enc, '"');
		739	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		740	encode_ch (enc, '"');
		741	encode_ch (enc, ')');
		742	encode_ch (enc, '[');
		743
		744	while (count)
		745	{
		746	encode_sv (enc, SP[1 - count--]);
		747
		748	if (count)
		749	encode_ch (enc, ',');
		750	}
		751
		752	encode_ch (enc, ']');
		753
		754	PUTBACK;
		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; PUSHMARK (SP);
		763	// we re-bless the reference to get overload and other niceties right
		764	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		765
		766	// calling with G_SCALAR ensures that we always get a 1 return value
		767	PUTBACK;
		768	call_sv ((SV *)GvCV (method), G_SCALAR);
		769	SPAGAIN;
		770
		771	// catch this surprisingly common error
		772	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		773	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		774
		775	sv = POPs;
		776	PUTBACK;
		777
		778	encode_sv (enc, sv);
		779
		780	FREETMPS; LEAVE;
		781	}
		782	else if (enc->json.flags & F_ALLOW_BLESSED)
		783	encode_str (enc, "null", 4, 0);
600	else	784	else
601	{
602	#if 0
603	if (0 && sv_derived_from (rv, "JSON::Literal"))
604	{
605	// not yet
606	}
607	#endif
608	if (enc->json.flags & F_CONV_BLESSED)
609	{
610	// we re-bless the reference to get overload and other niceties right
611	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
612
613	if (to_json)
614	{
615	dSP;
616
617	ENTER; SAVETMPS; PUSHMARK (SP);
618	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
619
620	// calling with G_SCALAR ensures that we always get a 1 return value
621	PUTBACK;
622	call_sv ((SV *)GvCV (to_json), G_SCALAR);
623	SPAGAIN;
624
625	// catch this surprisingly common error
626	if (SvROK (TOPs) && SvRV (TOPs) == sv)
627	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
628
629	sv = POPs;
630	PUTBACK;
631
632	encode_sv (enc, sv);
633
634	FREETMPS; LEAVE;
635	}
636	else if (enc->json.flags & F_ALLOW_BLESSED)
637	encode_str (enc, "null", 4, 0);
638	else
639	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
640	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
641	}
642	else if (enc->json.flags & F_ALLOW_BLESSED)
643	encode_str (enc, "null", 4, 0);
644	else
645	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	785	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
646	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	786	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
647	}
648	}	787	}
649	else if (svt == SVt_PVHV)	788	else if (svt == SVt_PVHV)
650	encode_hv (enc, (HV *)sv);	789	encode_hv (enc, (HV *)sv);
651	else if (svt == SVt_PVAV)	790	else if (svt == SVt_PVAV)
652	encode_av (enc, (AV *)sv);	791	encode_av (enc, (AV *)sv);
…		…
728	}	867	}
729	else	868	else
730	{	869	{
731	// large integer, use the (rather slow) snprintf way.	870	// large integer, use the (rather slow) snprintf way.
732	need (enc, IVUV_MAXCHARS);	871	need (enc, IVUV_MAXCHARS);
733	enc->cur +=	872	enc->cur +=
734	SvIsUV(sv)	873	SvIsUV(sv)
735	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	874	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
736	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	875	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
737	}	876	}
738	}	877	}
739	else if (SvROK (sv))	878	else if (SvROK (sv))
740	encode_rv (enc, SvRV (sv));	879	encode_rv (enc, SvRV (sv));
741	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	880	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
742	encode_str (enc, "null", 4, 0);	881	encode_str (enc, "null", 4, 0);
743	else	882	else
744	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	883	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
745	SvPV_nolen (sv), SvFLAGS (sv));	884	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
746	}	885	}
747		886
748	static SV *	887	static SV *
749	encode_json (SV scalar, JSON json)	888	encode_json (SV scalar, JSON json)
750	{	889	{
…		…
1119	}	1258	}
1120		1259
1121	len -= *start == '-' ? 1 : 0;	1260	len -= *start == '-' ? 1 : 0;
1122		1261
1123	// does not fit into IV or UV, try NV	1262	// does not fit into IV or UV, try NV
1124	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1263	if (len <= NV_DIG)
1125	#if defined (LDBL_DIG)
1126	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1127	#endif
1128	)
1129	// fits into NV without loss of precision	1264	// fits into NV without loss of precision
1130	return newSVnv (Atof (start));	1265	return newSVnv (json_atof (start));
1131		1266
1132	// everything else fails, convert it to a string	1267	// everything else fails, convert it to a string
1133	return newSVpvn (start, dec->cur - start);	1268	return newSVpvn (start, dec->cur - start);
1134	}	1269	}
1135		1270
1136	// loss of precision here	1271	// loss of precision here
1137	return newSVnv (Atof (start));	1272	return newSVnv (json_atof (start));
1138		1273
1139	fail:	1274	fail:
1140	return 0;	1275	return 0;
1141	}	1276	}
1142		1277
…		…
1166	if (*dec->cur == ']')	1301	if (*dec->cur == ']')
1167	{	1302	{
1168	++dec->cur;	1303	++dec->cur;
1169	break;	1304	break;
1170	}	1305	}
1171		1306
1172	if (*dec->cur != ',')	1307	if (*dec->cur != ',')
1173	ERR (", or ] expected while parsing array");	1308	ERR (", or ] expected while parsing array");
1174		1309
1175	++dec->cur;	1310	++dec->cur;
1176		1311
…		…
1311	dSP;	1446	dSP;
1312	int count;	1447	int count;
1313		1448
1314	ENTER; SAVETMPS; PUSHMARK (SP);	1449	ENTER; SAVETMPS; PUSHMARK (SP);
1315	XPUSHs (HeVAL (he));	1450	XPUSHs (HeVAL (he));
		1451	sv_2mortal (sv);
1316		1452
1317	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1453	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1318		1454
1319	if (count == 1)	1455	if (count == 1)
1320	{	1456	{
1321	sv = newSVsv (POPs);	1457	sv = newSVsv (POPs);
1322	FREETMPS; LEAVE;	1458	FREETMPS; LEAVE;
1323	return sv;	1459	return sv;
1324	}	1460	}
1325		1461
		1462	SvREFCNT_inc (sv);
1326	FREETMPS; LEAVE;	1463	FREETMPS; LEAVE;
1327	}	1464	}
1328	}	1465	}
1329		1466
1330	if (dec->json.cb_object)	1467	if (dec->json.cb_object)
…		…
1356	DEC_DEC_DEPTH;	1493	DEC_DEC_DEPTH;
1357	return 0;	1494	return 0;
1358	}	1495	}
1359		1496
1360	static SV *	1497	static SV *
		1498	decode_tag (dec_t *dec)
		1499	{
		1500	SV *tag = 0;
		1501	SV *val = 0;
		1502
		1503	if (!(dec->json.flags & F_ALLOW_TAGS))
		1504	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1505
		1506	++dec->cur;
		1507
		1508	decode_ws (dec);
		1509
		1510	tag = decode_sv (dec);
		1511	if (!tag)
		1512	goto fail;
		1513
		1514	if (!SvPOK (tag))
		1515	ERR ("malformed JSON string, (tag) must be a string");
		1516
		1517	decode_ws (dec);
		1518
		1519	if (*dec->cur != ')')
		1520	ERR (") expected after tag");
		1521
		1522	++dec->cur;
		1523
		1524	decode_ws (dec);
		1525
		1526	val = decode_sv (dec);
		1527	if (!val)
		1528	goto fail;
		1529
		1530	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1531	ERR ("malformed JSON string, tag value must be an array");
		1532
		1533	{
		1534	AV av = (AV )SvRV (val);
		1535	int i, len = av_len (av) + 1;
		1536	HV *stash = gv_stashsv (tag, 0);
		1537	SV *sv;
		1538
		1539	if (!stash)
		1540	ERR ("cannot decode perl-object (package does not exist)");
		1541
		1542	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1543
		1544	if (!method)
		1545	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1546
		1547	dSP;
		1548
		1549	ENTER; SAVETMPS; PUSHMARK (SP);
		1550	EXTEND (SP, len + 2);
		1551	// we re-bless the reference to get overload and other niceties right
		1552	PUSHs (tag);
		1553	PUSHs (sv_json);
		1554
		1555	for (i = 0; i < len; ++i)
		1556	PUSHs (*av_fetch (av, i, 1));
		1557
		1558	PUTBACK;
		1559	call_sv ((SV *)GvCV (method), G_SCALAR);
		1560	SPAGAIN;
		1561
		1562	SvREFCNT_dec (tag);
		1563	SvREFCNT_dec (val);
		1564	sv = SvREFCNT_inc (POPs);
		1565
		1566	PUTBACK;
		1567
		1568	FREETMPS; LEAVE;
		1569
		1570	return sv;
		1571	}
		1572
		1573	fail:
		1574	SvREFCNT_dec (tag);
		1575	SvREFCNT_dec (val);
		1576	return 0;
		1577	}
		1578
		1579	static SV *
1361	decode_sv (dec_t *dec)	1580	decode_sv (dec_t *dec)
1362	{	1581	{
1363	// the beauty of JSON: you need exactly one character lookahead	1582	// the beauty of JSON: you need exactly one character lookahead
1364	// to parse everything.	1583	// to parse everything.
1365	switch (*dec->cur)	1584	switch (*dec->cur)
1366	{	1585	{
1367	case '"': ++dec->cur; return decode_str (dec);	1586	case '"': ++dec->cur; return decode_str (dec);
1368	case '[': ++dec->cur; return decode_av (dec);	1587	case '[': ++dec->cur; return decode_av (dec);
1369	case '{': ++dec->cur; return decode_hv (dec);	1588	case '{': ++dec->cur; return decode_hv (dec);
		1589	case '(': return decode_tag (dec);
1370		1590
1371	case '-':	1591	case '-':
1372	case '0': case '1': case '2': case '3': case '4':	1592	case '0': case '1': case '2': case '3': case '4':
1373	case '5': case '6': case '7': case '8': case '9':	1593	case '5': case '6': case '7': case '8': case '9':
1374	return decode_num (dec);	1594	return decode_num (dec);
…		…
1376	case 't':	1596	case 't':
1377	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1597	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1378	{	1598	{
1379	dec->cur += 4;	1599	dec->cur += 4;
1380	#if JSON_SLOW	1600	#if JSON_SLOW
1381	json_true = get_bool ("JSON::XS::true");	1601	types_true = get_bool ("Types::Serialiser::true");
1382	#endif	1602	#endif
1383	return newSVsv (json_true);	1603	return newSVsv (types_true);
1384	}	1604	}
1385	else	1605	else
1386	ERR ("'true' expected");	1606	ERR ("'true' expected");
1387		1607
1388	break;	1608	break;
…		…
1390	case 'f':	1610	case 'f':
1391	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1611	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1392	{	1612	{
1393	dec->cur += 5;	1613	dec->cur += 5;
1394	#if JSON_SLOW	1614	#if JSON_SLOW
1395	json_false = get_bool ("JSON::XS::false");	1615	types_false = get_bool ("Types::Serialiser::false");
1396	#endif	1616	#endif
1397	return newSVsv (json_false);	1617	return newSVsv (types_false);
1398	}	1618	}
1399	else	1619	else
1400	ERR ("'false' expected");	1620	ERR ("'false' expected");
1401		1621
1402	break;	1622	break;
…		…
1411	ERR ("'null' expected");	1631	ERR ("'null' expected");
1412		1632
1413	break;	1633	break;
1414		1634
1415	default:	1635	default:
1416	ERR ("malformed JSON string, neither array, object, number, string or atom");	1636	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1417	break;	1637	break;
1418	}	1638	}
1419		1639
1420	fail:	1640	fail:
1421	return 0;	1641	return 0;
…		…
1426	{	1646	{
1427	dec_t dec;	1647	dec_t dec;
1428	SV *sv;	1648	SV *sv;
1429		1649
1430	/* work around bugs in 5.10 where manipulating magic values	1650	/* work around bugs in 5.10 where manipulating magic values
1431	* will perl ignore the magic in subsequent accesses	1651	* makes perl ignore the magic in subsequent accesses.
		1652	* also make a copy of non-PV values, to get them into a clean
		1653	* state (SvPV should do that, but it's buggy, see below).
1432	*/	1654	*/
1433	/SvGETMAGIC (string);/	1655	/SvGETMAGIC (string);/
1434	if (SvMAGICAL (string))	1656	if (SvMAGICAL (string) \|\| !SvPOK (string))
1435	string = sv_2mortal (newSVsv (string));	1657	string = sv_2mortal (newSVsv (string));
1436		1658
1437	SvUPGRADE (string, SVt_PV);	1659	SvUPGRADE (string, SVt_PV);
1438		1660
1439	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1661	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1456	if (offset > json->max_size && json->max_size)	1678	if (offset > json->max_size && json->max_size)
1457	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1679	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1458	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1680	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1459	}	1681	}
1460		1682
1461	if (json->flags & F_UTF8)	1683	if (DECODE_WANTS_OCTETS (json))
1462	sv_utf8_downgrade (string, 0);	1684	sv_utf8_downgrade (string, 0);
1463	else	1685	else
1464	sv_utf8_upgrade (string);	1686	sv_utf8_upgrade (string);
1465		1687
1466	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1688	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1508	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1730	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1509	LEAVE;	1731	LEAVE;
1510		1732
1511	croak ("%s, at character offset %d (before \"%s\")",	1733	croak ("%s, at character offset %d (before \"%s\")",
1512	dec.err,	1734	dec.err,
1513	ptr_to_index (string, dec.cur),	1735	(int)ptr_to_index (string, dec.cur),
1514	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1736	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1515	}	1737	}
1516		1738
1517	sv = sv_2mortal (sv);	1739	sv = sv_2mortal (sv);
1518		1740
…		…
1646	self->incr_mode = INCR_M_STR;	1868	self->incr_mode = INCR_M_STR;
1647	goto incr_m_str;	1869	goto incr_m_str;
1648		1870
1649	case '[':	1871	case '[':
1650	case '{':	1872	case '{':
		1873	case '(':
1651	if (++self->incr_nest > self->max_depth)	1874	if (++self->incr_nest > self->max_depth)
1652	croak (ERR_NESTING_EXCEEDED);	1875	croak (ERR_NESTING_EXCEEDED);
1653	break;	1876	break;
1654		1877
1655	case ']':	1878	case ']':
1656	case '}':	1879	case '}':
1657	if (--self->incr_nest <= 0)	1880	if (--self->incr_nest <= 0)
1658	goto interrupt;	1881	goto interrupt;
		1882	break;
		1883
		1884	case ')':
		1885	--self->incr_nest;
1659	break;	1886	break;
1660		1887
1661	case '#':	1888	case '#':
1662	self->incr_mode = INCR_M_C1;	1889	self->incr_mode = INCR_M_C1;
1663	goto incr_m_c;	1890	goto incr_m_c;
…		…
1689	i >= '0' && i <= '9' ? i - '0'	1916	i >= '0' && i <= '9' ? i - '0'
1690	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1917	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1691	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1918	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1692	: -1;	1919	: -1;
1693		1920
1694	json_stash = gv_stashpv ("JSON::XS" , 1);	1921	json_stash = gv_stashpv ("JSON::XS" , 1);
1695	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1922	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1696		1923
1697	json_true = get_bool ("JSON::XS::true");	1924	types_true = get_bool ("Types::Serialiser::true");
1698	json_false = get_bool ("JSON::XS::false");	1925	types_false = get_bool ("Types::Serialiser::false");
		1926
		1927	sv_json = newSVpv ("JSON", 0);
		1928	SvREADONLY_on (sv_json);
1699		1929
1700	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1930	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1701	}	1931	}
1702		1932
1703	PROTOTYPES: DISABLE	1933	PROTOTYPES: DISABLE
1704		1934
1705	void CLONE (...)	1935	void CLONE (...)
1706	CODE:	1936	CODE:
1707	json_stash = 0;	1937	json_stash = 0;
1708	json_boolean_stash = 0;	1938	types_boolean_stash = 0;
1709		1939
1710	void new (char *klass)	1940	void new (char *klass)
1711	PPCODE:	1941	PPCODE:
1712	{	1942	{
1713	SV *pv = NEWSV (0, sizeof (JSON));	1943	SV *pv = NEWSV (0, sizeof (JSON));
1714	SvPOK_only (pv);	1944	SvPOK_only (pv);
1715	json_init ((JSON *)SvPVX (pv));	1945	json_init ((JSON *)SvPVX (pv));
1716	XPUSHs (sv_2mortal (sv_bless (	1946	XPUSHs (sv_2mortal (sv_bless (
1717	newRV_noinc (pv),	1947	newRV_noinc (pv),
1718	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1948	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1733	shrink = F_SHRINK	1963	shrink = F_SHRINK
1734	allow_blessed = F_ALLOW_BLESSED	1964	allow_blessed = F_ALLOW_BLESSED
1735	convert_blessed = F_CONV_BLESSED	1965	convert_blessed = F_CONV_BLESSED
1736	relaxed = F_RELAXED	1966	relaxed = F_RELAXED
1737	allow_unknown = F_ALLOW_UNKNOWN	1967	allow_unknown = F_ALLOW_UNKNOWN
		1968	allow_tags = F_ALLOW_TAGS
1738	PPCODE:	1969	PPCODE:
1739	{	1970	{
1740	if (enable)	1971	if (enable)
1741	self->flags \|= ix;	1972	self->flags \|= ix;
1742	else	1973	else
…		…
1758	get_shrink = F_SHRINK	1989	get_shrink = F_SHRINK
1759	get_allow_blessed = F_ALLOW_BLESSED	1990	get_allow_blessed = F_ALLOW_BLESSED
1760	get_convert_blessed = F_CONV_BLESSED	1991	get_convert_blessed = F_CONV_BLESSED
1761	get_relaxed = F_RELAXED	1992	get_relaxed = F_RELAXED
1762	get_allow_unknown = F_ALLOW_UNKNOWN	1993	get_allow_unknown = F_ALLOW_UNKNOWN
		1994	get_allow_tags = F_ALLOW_TAGS
1763	PPCODE:	1995	PPCODE:
1764	XPUSHs (boolSV (self->flags & ix));	1996	XPUSHs (boolSV (self->flags & ix));
1765		1997
1766	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	1998	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1767	PPCODE:	1999	PPCODE:
…		…
1795	}	2027	}
1796		2028
1797	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2029	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1798	PPCODE:	2030	PPCODE:
1799	{	2031	{
1800	if (!self->cb_sk_object)	2032	if (!self->cb_sk_object)
1801	self->cb_sk_object = newHV ();	2033	self->cb_sk_object = newHV ();
1802		2034
1803	if (SvOK (cb))	2035	if (SvOK (cb))
1804	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2036	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1805	else	2037	else
…		…
1816	XPUSHs (ST (0));	2048	XPUSHs (ST (0));
1817	}	2049	}
1818		2050
1819	void encode (JSON self, SV scalar)	2051	void encode (JSON self, SV scalar)
1820	PPCODE:	2052	PPCODE:
1821	XPUSHs (encode_json (scalar, self));	2053	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2054	XPUSHs (scalar);
1822		2055
1823	void decode (JSON self, SV jsonstr)	2056	void decode (JSON self, SV jsonstr)
1824	PPCODE:	2057	PPCODE:
1825	XPUSHs (decode_json (jsonstr, self, 0));	2058	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2059	XPUSHs (jsonstr);
1826		2060
1827	void decode_prefix (JSON self, SV jsonstr)	2061	void decode_prefix (JSON self, SV jsonstr)
1828	PPCODE:	2062	PPCODE:
1829	{	2063	{
		2064	SV *sv;
1830	char *offset;	2065	char *offset;
		2066	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1831	EXTEND (SP, 2);	2067	EXTEND (SP, 2);
1832	PUSHs (decode_json (jsonstr, self, &offset));	2068	PUSHs (sv);
1833	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2069	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1834	}	2070	}
1835		2071
1836	void incr_parse (JSON self, SV jsonstr = 0)	2072	void incr_parse (JSON self, SV jsonstr = 0)
1837	PPCODE:	2073	PPCODE:
1838	{	2074	{
1839	if (!self->incr_text)	2075	if (!self->incr_text)
1840	self->incr_text = newSVpvn ("", 0);	2076	self->incr_text = newSVpvn ("", 0);
		2077
		2078	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2079	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2080	if (DECODE_WANTS_OCTETS (self))
		2081	{
		2082	if (self->incr_pos)
		2083	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2084	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2085
		2086	sv_utf8_downgrade (self->incr_text, 0);
		2087	}
		2088	else
		2089	{
		2090	sv_utf8_upgrade (self->incr_text);
		2091
		2092	if (self->incr_pos)
		2093	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2094	- (U8 *)SvPVX (self->incr_text);
		2095	}
1841		2096
1842	// append data, if any	2097	// append data, if any
1843	if (jsonstr)	2098	if (jsonstr)
1844	{	2099	{
		2100	/* make sure both strings have same encoding */
		2101	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1845	if (SvUTF8 (jsonstr))	2102	if (SvUTF8 (jsonstr))
		2103	sv_utf8_downgrade (jsonstr, 0);
1846	{	2104	else
1847	if (!SvUTF8 (self->incr_text))
1848	{
1849	/* utf-8-ness differs, need to upgrade */
1850	sv_utf8_upgrade (self->incr_text);
1851
1852	if (self->incr_pos)
1853	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1854	- (U8 *)SvPVX (self->incr_text);
1855	}
1856	}
1857	else if (SvUTF8 (self->incr_text))
1858	sv_utf8_upgrade (jsonstr);	2105	sv_utf8_upgrade (jsonstr);
1859		2106
		2107	/* and then just blindly append */
1860	{	2108	{
1861	STRLEN len;	2109	STRLEN len;
1862	const char *str = SvPV (jsonstr, len);	2110	const char *str = SvPV (jsonstr, len);
1863	STRLEN cur = SvCUR (self->incr_text);	2111	STRLEN cur = SvCUR (self->incr_text);
1864		2112
…		…
1872	}	2120	}
1873		2121
1874	if (GIMME_V != G_VOID)	2122	if (GIMME_V != G_VOID)
1875	do	2123	do
1876	{	2124	{
		2125	SV *sv;
1877	char *offset;	2126	char *offset;
1878		2127
1879	if (!INCR_DONE (self))	2128	if (!INCR_DONE (self))
1880	{	2129	{
1881	incr_parse (self);	2130	incr_parse (self);
…		…
1883	if (self->incr_pos > self->max_size && self->max_size)	2132	if (self->incr_pos > self->max_size && self->max_size)
1884	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	2133	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1885	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2134	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1886		2135
1887	if (!INCR_DONE (self))	2136	if (!INCR_DONE (self))
		2137	{
		2138	// as an optimisation, do not accumulate white space in the incr buffer
		2139	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2140	{
		2141	self->incr_pos = 0;
		2142	SvCUR_set (self->incr_text, 0);
		2143	}
		2144
1888	break;	2145	break;
		2146	}
1889	}	2147	}
1890		2148
1891	XPUSHs (decode_json (self->incr_text, self, &offset));	2149	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2150	XPUSHs (sv);
1892		2151
1893	self->incr_pos -= offset - SvPVX (self->incr_text);	2152	self->incr_pos -= offset - SvPVX (self->incr_text);
1894	self->incr_nest = 0;	2153	self->incr_nest = 0;
1895	self->incr_mode = 0;	2154	self->incr_mode = 0;
1896		2155
…		…
1940	SvREFCNT_dec (self->incr_text);	2199	SvREFCNT_dec (self->incr_text);
1941		2200
1942	PROTOTYPES: ENABLE	2201	PROTOTYPES: ENABLE
1943		2202
1944	void encode_json (SV *scalar)	2203	void encode_json (SV *scalar)
1945	ALIAS:
1946	to_json_ = 0
1947	encode_json = F_UTF8
1948	PPCODE:	2204	PPCODE:
1949	{	2205	{
1950	JSON json;	2206	JSON json;
1951	json_init (&json);	2207	json_init (&json);
1952	json.flags \|= ix;	2208	json.flags \|= F_UTF8;
1953	XPUSHs (encode_json (scalar, &json));	2209	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2210	XPUSHs (scalar);
1954	}	2211	}
1955		2212
1956	void decode_json (SV *jsonstr)	2213	void decode_json (SV *jsonstr)
1957	ALIAS:
1958	from_json_ = 0
1959	decode_json = F_UTF8
1960	PPCODE:	2214	PPCODE:
1961	{	2215	{
1962	JSON json;	2216	JSON json;
1963	json_init (&json);	2217	json_init (&json);
1964	json.flags \|= ix;	2218	json.flags \|= F_UTF8;
1965	XPUSHs (decode_json (jsonstr, &json, 0));	2219	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2220	XPUSHs (jsonstr);
1966	}	2221	}
1967		2222
1968

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.103 by root, Wed Jan 6 08:01:39 2010 UTC vs. Revision 1.122 by root, Tue Oct 29 15:55:49 2013 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.103 by root, Wed Jan 6 08:01:39 2010 UTC vs.
Revision 1.122 by root, Tue Oct 29 15:55:49 2013 UTC