[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.119 by root, Mon Oct 28 23:19:54 2013 UTC

…		…
33	#define F_SHRINK 0x00000200UL	33	#define F_SHRINK 0x00000200UL
34	#define F_ALLOW_BLESSED 0x00000400UL	34	#define F_ALLOW_BLESSED 0x00000400UL
35	#define F_CONV_BLESSED 0x00000800UL	35	#define F_CONV_BLESSED 0x00000800UL
36	#define F_RELAXED 0x00001000UL	36	#define F_RELAXED 0x00001000UL
37	#define F_ALLOW_UNKNOWN 0x00002000UL	37	#define F_ALLOW_UNKNOWN 0x00002000UL
		38	#define F_ALLOW_TAGS 0x00004000UL
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	39	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		40
40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
41		42
42	#define INIT_SIZE 32 // initial scalar size to be allocated	43	#define INIT_SIZE 32 // initial scalar size to be allocated
43	#define INDENT_STEP 3 // spaces per indentation level	44	#define INDENT_STEP 3 // spaces per indentation level
44		45
45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	46	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		47
		48	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46		49
47	#define SB do {	50	#define SB do {
48	#define SE } while (0)	51	#define SE } while (0)
49		52
50	#if __GNUC__ >= 3	53	#if __GNUC__ >= 3
…		…
70	#else	73	#else
71	# define JSON_SLOW 0	74	# define JSON_SLOW 0
72	# define JSON_STASH json_stash	75	# define JSON_STASH json_stash
73	#endif	76	#endif
74		77
		78	// the amount of HEs to allocate on the stack, when sorting keys
		79	#define STACK_HES 64
		80
75	static HV json_stash, json_boolean_stash; // JSON::XS::	81	static HV json_stash, types_boolean_stash; // JSON::XS::
76	static SV json_true, json_false;	82	static SV types_true, types_false, *sv_json;
77		83
78	enum {	84	enum {
79	INCR_M_WS = 0, // initial whitespace skipping, must be 0	85	INCR_M_WS = 0, // initial whitespace skipping, must be 0
80	INCR_M_STR, // inside string	86	INCR_M_STR, // inside string
81	INCR_M_BS, // inside backslash	87	INCR_M_BS, // inside backslash
…		…
187	return SvUTF8 (sv)	193	return SvUTF8 (sv)
188	? utf8_distance (offset, SvPVX (sv))	194	? utf8_distance (offset, SvPVX (sv))
189	: offset - SvPVX (sv);	195	: offset - SvPVX (sv);
190	}	196	}
191		197
		198	/////////////////////////////////////////////////////////////////////////////
		199	// fp hell
		200
		201	// scan a group of digits, and a trailing exponent
		202	static void
		203	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		204	{
		205	UV uaccum = 0;
		206	int eaccum = 0;
		207
		208	// if we recurse too deep, skip all remaining digits
		209	// to avoid a stack overflow attack
		210	if (expect_false (--maxdepth <= 0))
		211	while (((U8)*s - '0') < 10)
		212	++s;
		213
		214	for (;;)
		215	{
		216	U8 dig = (U8)*s - '0';
		217
		218	if (expect_false (dig >= 10))
		219	{
		220	if (dig == (U8)((U8)'.' - (U8)'0'))
		221	{
		222	++s;
		223	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		224	}
		225	else if ((dig \| ' ') == 'e' - '0')
		226	{
		227	int exp2 = 0;
		228	int neg = 0;
		229
		230	++s;
		231
		232	if (*s == '-')
		233	{
		234	++s;
		235	neg = 1;
		236	}
		237	else if (*s == '+')
		238	++s;
		239
		240	while ((dig = (U8)*s - '0') < 10)
		241	exp2 = exp2 * 10 + *s++ - '0';
		242
		243	*expo += neg ? -exp2 : exp2;
		244	}
		245
		246	break;
		247	}
		248
		249	++s;
		250
		251	uaccum = uaccum * 10 + dig;
		252	++eaccum;
		253
		254	// if we have too many digits, then recurse for more
		255	// we actually do this for rather few digits
		256	if (uaccum >= (UV_MAX - 9) / 10)
		257	{
		258	if (postdp) *expo -= eaccum;
		259	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		260	if (postdp) *expo += eaccum;
		261
		262	break;
		263	}
		264	}
		265
		266	// this relies greatly on the quality of the pow ()
		267	// implementation of the platform, but a good
		268	// implementation is hard to beat.
		269	// (IEEE 754 conformant ones are required to be exact)
		270	if (postdp) *expo -= eaccum;
		271	accum += uaccum Perl_pow (10., *expo);
		272	*expo += eaccum;
		273	}
		274
		275	static NV
		276	json_atof (const char *s)
		277	{
		278	NV accum = 0.;
		279	int expo = 0;
		280	int neg = 0;
		281
		282	if (*s == '-')
		283	{
		284	++s;
		285	neg = 1;
		286	}
		287
		288	// a recursion depth of ten gives us >>500 bits
		289	json_atof_scan1 (s, &accum, &expo, 0, 10);
		290
		291	return neg ? -accum : accum;
		292	}
192	/////////////////////////////////////////////////////////////////////////////	293	/////////////////////////////////////////////////////////////////////////////
193	// encoder	294	// encoder
194		295
195	// structure used for encoding JSON	296	// structure used for encoding JSON
196	typedef struct	297	typedef struct
…		…
383		484
384	if (enc->indent >= enc->json.max_depth)	485	if (enc->indent >= enc->json.max_depth)
385	croak (ERR_NESTING_EXCEEDED);	486	croak (ERR_NESTING_EXCEEDED);
386		487
387	encode_ch (enc, '[');	488	encode_ch (enc, '[');
388		489
389	if (len >= 0)	490	if (len >= 0)
390	{	491	{
391	encode_nl (enc); ++enc->indent;	492	encode_nl (enc); ++enc->indent;
392		493
393	for (i = 0; i <= len; ++i)	494	for (i = 0; i <= len; ++i)
…		…
405	encode_comma (enc);	506	encode_comma (enc);
406	}	507	}
407		508
408	encode_nl (enc); --enc->indent; encode_indent (enc);	509	encode_nl (enc); --enc->indent; encode_indent (enc);
409	}	510	}
410		511
411	encode_ch (enc, ']');	512	encode_ch (enc, ']');
412	}	513	}
413		514
414	static void	515	static void
415	encode_hk (enc_t enc, HE he)	516	encode_hk (enc_t enc, HE he)
…		…
419	if (HeKLEN (he) == HEf_SVKEY)	520	if (HeKLEN (he) == HEf_SVKEY)
420	{	521	{
421	SV *sv = HeSVKEY (he);	522	SV *sv = HeSVKEY (he);
422	STRLEN len;	523	STRLEN len;
423	char *str;	524	char *str;
424		525
425	SvGETMAGIC (sv);	526	SvGETMAGIC (sv);
426	str = SvPV (sv, len);	527	str = SvPV (sv, len);
427		528
428	encode_str (enc, str, len, SvUTF8 (sv));	529	encode_str (enc, str, len, SvUTF8 (sv));
429	}	530	}
…		…
495	}	596	}
496		597
497	if (count)	598	if (count)
498	{	599	{
499	int i, fast = 1;	600	int i, fast = 1;
500	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	601	HE *hes_stack [STACK_HES];
501	HE *hes = _alloca (count sizeof (HE));	602	HE **hes = hes_stack;
502	#else	603
503	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	604	// allocate larger arrays on the heap
504	#endif	605	if (count > STACK_HES)
		606	{
		607	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		608	hes = (HE **)SvPVX (sv);
		609	}
505		610
506	i = 0;	611	i = 0;
507	while ((he = hv_iternext (hv)))	612	while ((he = hv_iternext (hv)))
508	{	613	{
509	hes [i++] = he;	614	hes [i++] = he;
…		…
584	SvGETMAGIC (sv);	689	SvGETMAGIC (sv);
585	svt = SvTYPE (sv);	690	svt = SvTYPE (sv);
586		691
587	if (expect_false (SvOBJECT (sv)))	692	if (expect_false (SvOBJECT (sv)))
588	{	693	{
589	HV *stash = !JSON_SLOW \|\| json_boolean_stash	694	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
590	? json_boolean_stash	695	? types_boolean_stash
591	: gv_stashpv ("JSON::XS::Boolean", 1);	696	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		697	HV *stash = SvSTASH (sv);
592		698
593	if (SvSTASH (sv) == stash)	699	if (stash == boolean_stash)
594	{	700	{
595	if (SvIV (sv))	701	if (SvIV (sv))
596	encode_str (enc, "true", 4, 0);	702	encode_str (enc, "true", 4, 0);
597	else	703	else
598	encode_str (enc, "false", 5, 0);	704	encode_str (enc, "false", 5, 0);
599	}	705	}
600	else	706	else if (enc->json.flags & F_CONV_BLESSED)
601	{	707	{
602	#if 0	708	GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0);
603	if (0 && sv_derived_from (rv, "JSON::Literal"))	709
604	{	710	if (to_json)
605	// not yet
606	}	711	{
607	#endif
608	if (enc->json.flags & F_CONV_BLESSED)
609	{	712	dSP;
		713
		714	ENTER; SAVETMPS; PUSHMARK (SP);
610	// we re-bless the reference to get overload and other niceties right	715	// 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)));	716	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
619		717
620	// calling with G_SCALAR ensures that we always get a 1 return value	718	// calling with G_SCALAR ensures that we always get a 1 return value
621	PUTBACK;	719	PUTBACK;
622	call_sv ((SV *)GvCV (to_json), G_SCALAR);	720	call_sv ((SV *)GvCV (to_json), G_SCALAR);
623	SPAGAIN;	721	SPAGAIN;
624		722
625	// catch this surprisingly common error	723	// catch this surprisingly common error
626	if (SvROK (TOPs) && SvRV (TOPs) == sv)	724	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)));	725	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
628		726
629	sv = POPs;	727	sv = POPs;
630	PUTBACK;	728	PUTBACK;
631		729
632	encode_sv (enc, sv);	730	encode_sv (enc, sv);
633		731
634	FREETMPS; LEAVE;	732	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	}	733	}
642	else if (enc->json.flags & F_ALLOW_BLESSED)	734	else if (enc->json.flags & F_ALLOW_BLESSED)
643	encode_str (enc, "null", 4, 0);	735	encode_str (enc, "null", 4, 0);
644	else	736	else
645	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	737	croak ("encountered object '%s' when conv_object is enabled, but TO_JSON is missing and allow_blessed disabled",
646	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	738	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
647	}	739	}
		740	else if (enc->json.flags & F_ALLOW_TAGS)
		741	{
		742	GV *method = gv_fetchmethod_autoload (stash, "FREEZE", 0);
		743
		744	if (method)
		745	{
		746	int count;
		747	dSP;
		748
		749	ENTER; SAVETMPS; PUSHMARK (SP);
		750	EXTEND (SP, 2);
		751	// we re-bless the reference to get overload and other niceties right
		752	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		753	PUSHs (sv_json);
		754
		755	PUTBACK;
		756	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		757	SPAGAIN;
		758
		759	// catch this surprisingly common error
		760	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		761	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		762
		763	encode_ch (enc, '(');
		764	encode_ch (enc, '"');
		765	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		766	encode_ch (enc, '"');
		767	encode_ch (enc, ')');
		768	encode_ch (enc, '[');
		769
		770	while (count)
		771	{
		772	encode_sv (enc, SP[1 - count--]);
		773
		774	if (count)
		775	encode_ch (enc, ',');
		776	}
		777
		778	encode_ch (enc, ']');
		779
		780	PUTBACK;
		781
		782	FREETMPS; LEAVE;
		783	}
		784	else if (enc->json.flags & F_ALLOW_BLESSED)
		785	encode_str (enc, "null", 4, 0);
		786	else
		787	croak ("encountered object '%s' when allow_tags is enabled, but FREEZE is missing and allow_blessed disabled",
		788	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		789	}
		790	else if (enc->json.flags & F_ALLOW_BLESSED)
		791	encode_str (enc, "null", 4, 0);
		792	else
		793	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled",
		794	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
648	}	795	}
649	else if (svt == SVt_PVHV)	796	else if (svt == SVt_PVHV)
650	encode_hv (enc, (HV *)sv);	797	encode_hv (enc, (HV *)sv);
651	else if (svt == SVt_PVAV)	798	else if (svt == SVt_PVAV)
652	encode_av (enc, (AV *)sv);	799	encode_av (enc, (AV *)sv);
…		…
728	}	875	}
729	else	876	else
730	{	877	{
731	// large integer, use the (rather slow) snprintf way.	878	// large integer, use the (rather slow) snprintf way.
732	need (enc, IVUV_MAXCHARS);	879	need (enc, IVUV_MAXCHARS);
733	enc->cur +=	880	enc->cur +=
734	SvIsUV(sv)	881	SvIsUV(sv)
735	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	882	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
736	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	883	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
737	}	884	}
738	}	885	}
739	else if (SvROK (sv))	886	else if (SvROK (sv))
740	encode_rv (enc, SvRV (sv));	887	encode_rv (enc, SvRV (sv));
741	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	888	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
742	encode_str (enc, "null", 4, 0);	889	encode_str (enc, "null", 4, 0);
743	else	890	else
744	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	891	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
745	SvPV_nolen (sv), SvFLAGS (sv));	892	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
746	}	893	}
747		894
748	static SV *	895	static SV *
749	encode_json (SV scalar, JSON json)	896	encode_json (SV scalar, JSON json)
750	{	897	{
…		…
1119	}	1266	}
1120		1267
1121	len -= *start == '-' ? 1 : 0;	1268	len -= *start == '-' ? 1 : 0;
1122		1269
1123	// does not fit into IV or UV, try NV	1270	// does not fit into IV or UV, try NV
1124	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1271	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	1272	// fits into NV without loss of precision
1130	return newSVnv (Atof (start));	1273	return newSVnv (json_atof (start));
1131		1274
1132	// everything else fails, convert it to a string	1275	// everything else fails, convert it to a string
1133	return newSVpvn (start, dec->cur - start);	1276	return newSVpvn (start, dec->cur - start);
1134	}	1277	}
1135		1278
1136	// loss of precision here	1279	// loss of precision here
1137	return newSVnv (Atof (start));	1280	return newSVnv (json_atof (start));
1138		1281
1139	fail:	1282	fail:
1140	return 0;	1283	return 0;
1141	}	1284	}
1142		1285
…		…
1166	if (*dec->cur == ']')	1309	if (*dec->cur == ']')
1167	{	1310	{
1168	++dec->cur;	1311	++dec->cur;
1169	break;	1312	break;
1170	}	1313	}
1171		1314
1172	if (*dec->cur != ',')	1315	if (*dec->cur != ',')
1173	ERR (", or ] expected while parsing array");	1316	ERR (", or ] expected while parsing array");
1174		1317
1175	++dec->cur;	1318	++dec->cur;
1176		1319
…		…
1311	dSP;	1454	dSP;
1312	int count;	1455	int count;
1313		1456
1314	ENTER; SAVETMPS; PUSHMARK (SP);	1457	ENTER; SAVETMPS; PUSHMARK (SP);
1315	XPUSHs (HeVAL (he));	1458	XPUSHs (HeVAL (he));
		1459	sv_2mortal (sv);
1316		1460
1317	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1461	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1318		1462
1319	if (count == 1)	1463	if (count == 1)
1320	{	1464	{
1321	sv = newSVsv (POPs);	1465	sv = newSVsv (POPs);
1322	FREETMPS; LEAVE;	1466	FREETMPS; LEAVE;
1323	return sv;	1467	return sv;
1324	}	1468	}
1325		1469
		1470	SvREFCNT_inc (sv);
1326	FREETMPS; LEAVE;	1471	FREETMPS; LEAVE;
1327	}	1472	}
1328	}	1473	}
1329		1474
1330	if (dec->json.cb_object)	1475	if (dec->json.cb_object)
…		…
1356	DEC_DEC_DEPTH;	1501	DEC_DEC_DEPTH;
1357	return 0;	1502	return 0;
1358	}	1503	}
1359		1504
1360	static SV *	1505	static SV *
		1506	decode_tag (dec_t *dec)
		1507	{
		1508	SV *tag = 0;
		1509	SV *val = 0;
		1510
		1511	if (!(dec->json.flags & F_ALLOW_TAGS))
		1512	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1513
		1514	++dec->cur;
		1515
		1516	tag = decode_sv (dec);
		1517	if (!tag)
		1518	goto fail;
		1519
		1520	if (!SvPOK (tag))
		1521	ERR ("malformed JSON string, (tag) must be a string");
		1522
		1523	if (*dec->cur != ')')
		1524	ERR (") expected after tag");
		1525
		1526	++dec->cur;
		1527
		1528	val = decode_sv (dec);
		1529	if (!val)
		1530	goto fail;
		1531
		1532	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1533	ERR ("malformed JSON string, tag value must be an array");
		1534
		1535	{
		1536	AV av = (AV )SvRV (val);
		1537	int i, len = av_len (av) + 1;
		1538	HV *stash = gv_stashsv (tag, 0);
		1539	SV *sv;
		1540
		1541	if (!stash)
		1542	ERR ("cannot decode perl-object (package does not exist)");
		1543
		1544	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1545
		1546	if (!method)
		1547	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1548
		1549	dSP;
		1550
		1551	ENTER; SAVETMPS; PUSHMARK (SP);
		1552	EXTEND (SP, len + 2);
		1553	// we re-bless the reference to get overload and other niceties right
		1554	PUSHs (tag);
		1555	PUSHs (sv_json);
		1556
		1557	for (i = 0; i < len; ++i)
		1558	PUSHs (*av_fetch (av, i, 1));
		1559
		1560	PUTBACK;
		1561	call_sv ((SV *)GvCV (method), G_SCALAR);
		1562	SPAGAIN;
		1563
		1564	SvREFCNT_dec (tag);
		1565	SvREFCNT_dec (val);
		1566	sv = SvREFCNT_inc (POPs);
		1567
		1568	PUTBACK;
		1569
		1570	FREETMPS; LEAVE;
		1571
		1572	return sv;
		1573	}
		1574
		1575	fail:
		1576	SvREFCNT_dec (tag);
		1577	SvREFCNT_dec (val);
		1578	return 0;
		1579	}
		1580
		1581	static SV *
1361	decode_sv (dec_t *dec)	1582	decode_sv (dec_t *dec)
1362	{	1583	{
1363	// the beauty of JSON: you need exactly one character lookahead	1584	// the beauty of JSON: you need exactly one character lookahead
1364	// to parse everything.	1585	// to parse everything.
1365	switch (*dec->cur)	1586	switch (*dec->cur)
1366	{	1587	{
1367	case '"': ++dec->cur; return decode_str (dec);	1588	case '"': ++dec->cur; return decode_str (dec);
1368	case '[': ++dec->cur; return decode_av (dec);	1589	case '[': ++dec->cur; return decode_av (dec);
1369	case '{': ++dec->cur; return decode_hv (dec);	1590	case '{': ++dec->cur; return decode_hv (dec);
		1591	case '(': return decode_tag (dec);
1370		1592
1371	case '-':	1593	case '-':
1372	case '0': case '1': case '2': case '3': case '4':	1594	case '0': case '1': case '2': case '3': case '4':
1373	case '5': case '6': case '7': case '8': case '9':	1595	case '5': case '6': case '7': case '8': case '9':
1374	return decode_num (dec);	1596	return decode_num (dec);
…		…
1376	case 't':	1598	case 't':
1377	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1599	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1378	{	1600	{
1379	dec->cur += 4;	1601	dec->cur += 4;
1380	#if JSON_SLOW	1602	#if JSON_SLOW
1381	json_true = get_bool ("JSON::XS::true");	1603	types_true = get_bool ("Types::Serialiser::true");
1382	#endif	1604	#endif
1383	return newSVsv (json_true);	1605	return newSVsv (types_true);
1384	}	1606	}
1385	else	1607	else
1386	ERR ("'true' expected");	1608	ERR ("'true' expected");
1387		1609
1388	break;	1610	break;
…		…
1390	case 'f':	1612	case 'f':
1391	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1613	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1392	{	1614	{
1393	dec->cur += 5;	1615	dec->cur += 5;
1394	#if JSON_SLOW	1616	#if JSON_SLOW
1395	json_false = get_bool ("JSON::XS::false");	1617	types_false = get_bool ("Types::Serialiser::false");
1396	#endif	1618	#endif
1397	return newSVsv (json_false);	1619	return newSVsv (types_false);
1398	}	1620	}
1399	else	1621	else
1400	ERR ("'false' expected");	1622	ERR ("'false' expected");
1401		1623
1402	break;	1624	break;
…		…
1411	ERR ("'null' expected");	1633	ERR ("'null' expected");
1412		1634
1413	break;	1635	break;
1414		1636
1415	default:	1637	default:
1416	ERR ("malformed JSON string, neither array, object, number, string or atom");	1638	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1417	break;	1639	break;
1418	}	1640	}
1419		1641
1420	fail:	1642	fail:
1421	return 0;	1643	return 0;
…		…
1426	{	1648	{
1427	dec_t dec;	1649	dec_t dec;
1428	SV *sv;	1650	SV *sv;
1429		1651
1430	/* work around bugs in 5.10 where manipulating magic values	1652	/* work around bugs in 5.10 where manipulating magic values
1431	* will perl ignore the magic in subsequent accesses	1653	* makes perl ignore the magic in subsequent accesses.
		1654	* also make a copy of non-PV values, to get them into a clean
		1655	* state (SvPV should do that, but it's buggy, see below).
1432	*/	1656	*/
1433	/SvGETMAGIC (string);/	1657	/SvGETMAGIC (string);/
1434	if (SvMAGICAL (string))	1658	if (SvMAGICAL (string) \|\| !SvPOK (string))
1435	string = sv_2mortal (newSVsv (string));	1659	string = sv_2mortal (newSVsv (string));
1436		1660
1437	SvUPGRADE (string, SVt_PV);	1661	SvUPGRADE (string, SVt_PV);
1438		1662
1439	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1663	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1456	if (offset > json->max_size && json->max_size)	1680	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",	1681	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);	1682	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1459	}	1683	}
1460		1684
1461	if (json->flags & F_UTF8)	1685	if (DECODE_WANTS_OCTETS (json))
1462	sv_utf8_downgrade (string, 0);	1686	sv_utf8_downgrade (string, 0);
1463	else	1687	else
1464	sv_utf8_upgrade (string);	1688	sv_utf8_upgrade (string);
1465		1689
1466	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1690	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);	1732	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1509	LEAVE;	1733	LEAVE;
1510		1734
1511	croak ("%s, at character offset %d (before \"%s\")",	1735	croak ("%s, at character offset %d (before \"%s\")",
1512	dec.err,	1736	dec.err,
1513	ptr_to_index (string, dec.cur),	1737	(int)ptr_to_index (string, dec.cur),
1514	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1738	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1515	}	1739	}
1516		1740
1517	sv = sv_2mortal (sv);	1741	sv = sv_2mortal (sv);
1518		1742
…		…
1646	self->incr_mode = INCR_M_STR;	1870	self->incr_mode = INCR_M_STR;
1647	goto incr_m_str;	1871	goto incr_m_str;
1648		1872
1649	case '[':	1873	case '[':
1650	case '{':	1874	case '{':
		1875	case '(':
1651	if (++self->incr_nest > self->max_depth)	1876	if (++self->incr_nest > self->max_depth)
1652	croak (ERR_NESTING_EXCEEDED);	1877	croak (ERR_NESTING_EXCEEDED);
1653	break;	1878	break;
1654		1879
1655	case ']':	1880	case ']':
1656	case '}':	1881	case '}':
1657	if (--self->incr_nest <= 0)	1882	if (--self->incr_nest <= 0)
1658	goto interrupt;	1883	goto interrupt;
		1884	break;
		1885
		1886	case ')':
		1887	--self->incr_nest;
1659	break;	1888	break;
1660		1889
1661	case '#':	1890	case '#':
1662	self->incr_mode = INCR_M_C1;	1891	self->incr_mode = INCR_M_C1;
1663	goto incr_m_c;	1892	goto incr_m_c;
…		…
1689	i >= '0' && i <= '9' ? i - '0'	1918	i >= '0' && i <= '9' ? i - '0'
1690	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1919	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1691	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1920	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1692	: -1;	1921	: -1;
1693		1922
1694	json_stash = gv_stashpv ("JSON::XS" , 1);	1923	json_stash = gv_stashpv ("JSON::XS" , 1);
1695	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1924	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1696		1925
1697	json_true = get_bool ("JSON::XS::true");	1926	types_true = get_bool ("Types::Serialiser::true");
1698	json_false = get_bool ("JSON::XS::false");	1927	types_false = get_bool ("Types::Serialiser::false");
		1928
		1929	sv_json = newSVpv ("JSON", 0);
		1930	SvREADONLY_on (sv_json);
1699		1931
1700	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1932	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1701	}	1933	}
1702		1934
1703	PROTOTYPES: DISABLE	1935	PROTOTYPES: DISABLE
1704		1936
1705	void CLONE (...)	1937	void CLONE (...)
1706	CODE:	1938	CODE:
1707	json_stash = 0;	1939	json_stash = 0;
1708	json_boolean_stash = 0;	1940	types_boolean_stash = 0;
1709		1941
1710	void new (char *klass)	1942	void new (char *klass)
1711	PPCODE:	1943	PPCODE:
1712	{	1944	{
1713	SV *pv = NEWSV (0, sizeof (JSON));	1945	SV *pv = NEWSV (0, sizeof (JSON));
1714	SvPOK_only (pv);	1946	SvPOK_only (pv);
1715	json_init ((JSON *)SvPVX (pv));	1947	json_init ((JSON *)SvPVX (pv));
1716	XPUSHs (sv_2mortal (sv_bless (	1948	XPUSHs (sv_2mortal (sv_bless (
1717	newRV_noinc (pv),	1949	newRV_noinc (pv),
1718	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1950	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1733	shrink = F_SHRINK	1965	shrink = F_SHRINK
1734	allow_blessed = F_ALLOW_BLESSED	1966	allow_blessed = F_ALLOW_BLESSED
1735	convert_blessed = F_CONV_BLESSED	1967	convert_blessed = F_CONV_BLESSED
1736	relaxed = F_RELAXED	1968	relaxed = F_RELAXED
1737	allow_unknown = F_ALLOW_UNKNOWN	1969	allow_unknown = F_ALLOW_UNKNOWN
		1970	allow_tags = F_ALLOW_TAGS
1738	PPCODE:	1971	PPCODE:
1739	{	1972	{
1740	if (enable)	1973	if (enable)
1741	self->flags \|= ix;	1974	self->flags \|= ix;
1742	else	1975	else
…		…
1758	get_shrink = F_SHRINK	1991	get_shrink = F_SHRINK
1759	get_allow_blessed = F_ALLOW_BLESSED	1992	get_allow_blessed = F_ALLOW_BLESSED
1760	get_convert_blessed = F_CONV_BLESSED	1993	get_convert_blessed = F_CONV_BLESSED
1761	get_relaxed = F_RELAXED	1994	get_relaxed = F_RELAXED
1762	get_allow_unknown = F_ALLOW_UNKNOWN	1995	get_allow_unknown = F_ALLOW_UNKNOWN
		1996	get_allow_tags = F_ALLOW_TAGS
1763	PPCODE:	1997	PPCODE:
1764	XPUSHs (boolSV (self->flags & ix));	1998	XPUSHs (boolSV (self->flags & ix));
1765		1999
1766	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2000	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1767	PPCODE:	2001	PPCODE:
…		…
1795	}	2029	}
1796		2030
1797	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2031	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1798	PPCODE:	2032	PPCODE:
1799	{	2033	{
1800	if (!self->cb_sk_object)	2034	if (!self->cb_sk_object)
1801	self->cb_sk_object = newHV ();	2035	self->cb_sk_object = newHV ();
1802		2036
1803	if (SvOK (cb))	2037	if (SvOK (cb))
1804	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2038	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1805	else	2039	else
…		…
1816	XPUSHs (ST (0));	2050	XPUSHs (ST (0));
1817	}	2051	}
1818		2052
1819	void encode (JSON self, SV scalar)	2053	void encode (JSON self, SV scalar)
1820	PPCODE:	2054	PPCODE:
1821	XPUSHs (encode_json (scalar, self));	2055	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2056	XPUSHs (scalar);
1822		2057
1823	void decode (JSON self, SV jsonstr)	2058	void decode (JSON self, SV jsonstr)
1824	PPCODE:	2059	PPCODE:
1825	XPUSHs (decode_json (jsonstr, self, 0));	2060	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2061	XPUSHs (jsonstr);
1826		2062
1827	void decode_prefix (JSON self, SV jsonstr)	2063	void decode_prefix (JSON self, SV jsonstr)
1828	PPCODE:	2064	PPCODE:
1829	{	2065	{
		2066	SV *sv;
1830	char *offset;	2067	char *offset;
		2068	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1831	EXTEND (SP, 2);	2069	EXTEND (SP, 2);
1832	PUSHs (decode_json (jsonstr, self, &offset));	2070	PUSHs (sv);
1833	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2071	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1834	}	2072	}
1835		2073
1836	void incr_parse (JSON self, SV jsonstr = 0)	2074	void incr_parse (JSON self, SV jsonstr = 0)
1837	PPCODE:	2075	PPCODE:
1838	{	2076	{
1839	if (!self->incr_text)	2077	if (!self->incr_text)
1840	self->incr_text = newSVpvn ("", 0);	2078	self->incr_text = newSVpvn ("", 0);
		2079
		2080	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2081	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2082	if (DECODE_WANTS_OCTETS (self))
		2083	{
		2084	if (self->incr_pos)
		2085	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2086	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2087
		2088	sv_utf8_downgrade (self->incr_text, 0);
		2089	}
		2090	else
		2091	{
		2092	sv_utf8_upgrade (self->incr_text);
		2093
		2094	if (self->incr_pos)
		2095	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2096	- (U8 *)SvPVX (self->incr_text);
		2097	}
1841		2098
1842	// append data, if any	2099	// append data, if any
1843	if (jsonstr)	2100	if (jsonstr)
1844	{	2101	{
		2102	/* make sure both strings have same encoding */
		2103	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1845	if (SvUTF8 (jsonstr))	2104	if (SvUTF8 (jsonstr))
		2105	sv_utf8_downgrade (jsonstr, 0);
1846	{	2106	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);	2107	sv_utf8_upgrade (jsonstr);
1859		2108
		2109	/* and then just blindly append */
1860	{	2110	{
1861	STRLEN len;	2111	STRLEN len;
1862	const char *str = SvPV (jsonstr, len);	2112	const char *str = SvPV (jsonstr, len);
1863	STRLEN cur = SvCUR (self->incr_text);	2113	STRLEN cur = SvCUR (self->incr_text);
1864		2114
…		…
1872	}	2122	}
1873		2123
1874	if (GIMME_V != G_VOID)	2124	if (GIMME_V != G_VOID)
1875	do	2125	do
1876	{	2126	{
		2127	SV *sv;
1877	char *offset;	2128	char *offset;
1878		2129
1879	if (!INCR_DONE (self))	2130	if (!INCR_DONE (self))
1880	{	2131	{
1881	incr_parse (self);	2132	incr_parse (self);
…		…
1883	if (self->incr_pos > self->max_size && self->max_size)	2134	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",	2135	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);	2136	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1886		2137
1887	if (!INCR_DONE (self))	2138	if (!INCR_DONE (self))
		2139	{
		2140	// as an optimisation, do not accumulate white space in the incr buffer
		2141	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2142	{
		2143	self->incr_pos = 0;
		2144	SvCUR_set (self->incr_text, 0);
		2145	}
		2146
1888	break;	2147	break;
		2148	}
1889	}	2149	}
1890		2150
1891	XPUSHs (decode_json (self->incr_text, self, &offset));	2151	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2152	XPUSHs (sv);
1892		2153
1893	self->incr_pos -= offset - SvPVX (self->incr_text);	2154	self->incr_pos -= offset - SvPVX (self->incr_text);
1894	self->incr_nest = 0;	2155	self->incr_nest = 0;
1895	self->incr_mode = 0;	2156	self->incr_mode = 0;
1896		2157
…		…
1940	SvREFCNT_dec (self->incr_text);	2201	SvREFCNT_dec (self->incr_text);
1941		2202
1942	PROTOTYPES: ENABLE	2203	PROTOTYPES: ENABLE
1943		2204
1944	void encode_json (SV *scalar)	2205	void encode_json (SV *scalar)
1945	ALIAS:
1946	to_json_ = 0
1947	encode_json = F_UTF8
1948	PPCODE:	2206	PPCODE:
1949	{	2207	{
1950	JSON json;	2208	JSON json;
1951	json_init (&json);	2209	json_init (&json);
1952	json.flags \|= ix;	2210	json.flags \|= F_UTF8;
1953	XPUSHs (encode_json (scalar, &json));	2211	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2212	XPUSHs (scalar);
1954	}	2213	}
1955		2214
1956	void decode_json (SV *jsonstr)	2215	void decode_json (SV *jsonstr)
1957	ALIAS:
1958	from_json_ = 0
1959	decode_json = F_UTF8
1960	PPCODE:	2216	PPCODE:
1961	{	2217	{
1962	JSON json;	2218	JSON json;
1963	json_init (&json);	2219	json_init (&json);
1964	json.flags \|= ix;	2220	json.flags \|= F_UTF8;
1965	XPUSHs (decode_json (jsonstr, &json, 0));	2221	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2222	XPUSHs (jsonstr);
1966	}	2223	}
1967		2224
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.119 by root, Mon Oct 28 23:19:54 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.119 by root, Mon Oct 28 23:19:54 2013 UTC