[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.120 by root, Mon Oct 28 23:23:10 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;
…		…
578	// encode objects, arrays and special \0=false and \1=true values.	683	// encode objects, arrays and special \0=false and \1=true values.
579	static void	684	static void
580	encode_rv (enc_t enc, SV sv)	685	encode_rv (enc_t enc, SV sv)
581	{	686	{
582	svtype svt;	687	svtype svt;
		688	GV *method;
583		689
584	SvGETMAGIC (sv);	690	SvGETMAGIC (sv);
585	svt = SvTYPE (sv);	691	svt = SvTYPE (sv);
586		692
587	if (expect_false (SvOBJECT (sv)))	693	if (expect_false (SvOBJECT (sv)))
588	{	694	{
589	HV *stash = !JSON_SLOW \|\| json_boolean_stash	695	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
590	? json_boolean_stash	696	? types_boolean_stash
591	: gv_stashpv ("JSON::XS::Boolean", 1);	697	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		698	HV *stash = SvSTASH (sv);
592		699
593	if (SvSTASH (sv) == stash)	700	if (stash == boolean_stash)
594	{	701	{
595	if (SvIV (sv))	702	if (SvIV (sv))
596	encode_str (enc, "true", 4, 0);	703	encode_str (enc, "true", 4, 0);
597	else	704	else
598	encode_str (enc, "false", 5, 0);	705	encode_str (enc, "false", 5, 0);
599	}	706	}
		707	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		708	{
		709	int count;
		710	dSP;
		711
		712	ENTER; SAVETMPS; PUSHMARK (SP);
		713	EXTEND (SP, 2);
		714	// we re-bless the reference to get overload and other niceties right
		715	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		716	PUSHs (sv_json);
		717
		718	PUTBACK;
		719	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		720	SPAGAIN;
		721
		722	// catch this surprisingly common error
		723	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		724	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		725
		726	encode_ch (enc, '(');
		727	encode_ch (enc, '"');
		728	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		729	encode_ch (enc, '"');
		730	encode_ch (enc, ')');
		731	encode_ch (enc, '[');
		732
		733	while (count)
		734	{
		735	encode_sv (enc, SP[1 - count--]);
		736
		737	if (count)
		738	encode_ch (enc, ',');
		739	}
		740
		741	encode_ch (enc, ']');
		742
		743	PUTBACK;
		744
		745	FREETMPS; LEAVE;
		746	}
		747	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		748	{
		749	dSP;
		750
		751	ENTER; SAVETMPS; PUSHMARK (SP);
		752	// we re-bless the reference to get overload and other niceties right
		753	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		754
		755	// calling with G_SCALAR ensures that we always get a 1 return value
		756	PUTBACK;
		757	call_sv ((SV *)GvCV (method), G_SCALAR);
		758	SPAGAIN;
		759
		760	// catch this surprisingly common error
		761	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		762	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		763
		764	sv = POPs;
		765	PUTBACK;
		766
		767	encode_sv (enc, sv);
		768
		769	FREETMPS; LEAVE;
		770	}
		771	else if (enc->json.flags & F_ALLOW_BLESSED)
		772	encode_str (enc, "null", 4, 0);
600	else	773	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",	774	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))));	775	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
647	}
648	}	776	}
649	else if (svt == SVt_PVHV)	777	else if (svt == SVt_PVHV)
650	encode_hv (enc, (HV *)sv);	778	encode_hv (enc, (HV *)sv);
651	else if (svt == SVt_PVAV)	779	else if (svt == SVt_PVAV)
652	encode_av (enc, (AV *)sv);	780	encode_av (enc, (AV *)sv);
…		…
728	}	856	}
729	else	857	else
730	{	858	{
731	// large integer, use the (rather slow) snprintf way.	859	// large integer, use the (rather slow) snprintf way.
732	need (enc, IVUV_MAXCHARS);	860	need (enc, IVUV_MAXCHARS);
733	enc->cur +=	861	enc->cur +=
734	SvIsUV(sv)	862	SvIsUV(sv)
735	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	863	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
736	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	864	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
737	}	865	}
738	}	866	}
739	else if (SvROK (sv))	867	else if (SvROK (sv))
740	encode_rv (enc, SvRV (sv));	868	encode_rv (enc, SvRV (sv));
741	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	869	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
742	encode_str (enc, "null", 4, 0);	870	encode_str (enc, "null", 4, 0);
743	else	871	else
744	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	872	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
745	SvPV_nolen (sv), SvFLAGS (sv));	873	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
746	}	874	}
747		875
748	static SV *	876	static SV *
749	encode_json (SV scalar, JSON json)	877	encode_json (SV scalar, JSON json)
750	{	878	{
…		…
1119	}	1247	}
1120		1248
1121	len -= *start == '-' ? 1 : 0;	1249	len -= *start == '-' ? 1 : 0;
1122		1250
1123	// does not fit into IV or UV, try NV	1251	// does not fit into IV or UV, try NV
1124	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1252	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	1253	// fits into NV without loss of precision
1130	return newSVnv (Atof (start));	1254	return newSVnv (json_atof (start));
1131		1255
1132	// everything else fails, convert it to a string	1256	// everything else fails, convert it to a string
1133	return newSVpvn (start, dec->cur - start);	1257	return newSVpvn (start, dec->cur - start);
1134	}	1258	}
1135		1259
1136	// loss of precision here	1260	// loss of precision here
1137	return newSVnv (Atof (start));	1261	return newSVnv (json_atof (start));
1138		1262
1139	fail:	1263	fail:
1140	return 0;	1264	return 0;
1141	}	1265	}
1142		1266
…		…
1166	if (*dec->cur == ']')	1290	if (*dec->cur == ']')
1167	{	1291	{
1168	++dec->cur;	1292	++dec->cur;
1169	break;	1293	break;
1170	}	1294	}
1171		1295
1172	if (*dec->cur != ',')	1296	if (*dec->cur != ',')
1173	ERR (", or ] expected while parsing array");	1297	ERR (", or ] expected while parsing array");
1174		1298
1175	++dec->cur;	1299	++dec->cur;
1176		1300
…		…
1311	dSP;	1435	dSP;
1312	int count;	1436	int count;
1313		1437
1314	ENTER; SAVETMPS; PUSHMARK (SP);	1438	ENTER; SAVETMPS; PUSHMARK (SP);
1315	XPUSHs (HeVAL (he));	1439	XPUSHs (HeVAL (he));
		1440	sv_2mortal (sv);
1316		1441
1317	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1442	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1318		1443
1319	if (count == 1)	1444	if (count == 1)
1320	{	1445	{
1321	sv = newSVsv (POPs);	1446	sv = newSVsv (POPs);
1322	FREETMPS; LEAVE;	1447	FREETMPS; LEAVE;
1323	return sv;	1448	return sv;
1324	}	1449	}
1325		1450
		1451	SvREFCNT_inc (sv);
1326	FREETMPS; LEAVE;	1452	FREETMPS; LEAVE;
1327	}	1453	}
1328	}	1454	}
1329		1455
1330	if (dec->json.cb_object)	1456	if (dec->json.cb_object)
…		…
1356	DEC_DEC_DEPTH;	1482	DEC_DEC_DEPTH;
1357	return 0;	1483	return 0;
1358	}	1484	}
1359		1485
1360	static SV *	1486	static SV *
		1487	decode_tag (dec_t *dec)
		1488	{
		1489	SV *tag = 0;
		1490	SV *val = 0;
		1491
		1492	if (!(dec->json.flags & F_ALLOW_TAGS))
		1493	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1494
		1495	++dec->cur;
		1496
		1497	tag = decode_sv (dec);
		1498	if (!tag)
		1499	goto fail;
		1500
		1501	if (!SvPOK (tag))
		1502	ERR ("malformed JSON string, (tag) must be a string");
		1503
		1504	if (*dec->cur != ')')
		1505	ERR (") expected after tag");
		1506
		1507	++dec->cur;
		1508
		1509	val = decode_sv (dec);
		1510	if (!val)
		1511	goto fail;
		1512
		1513	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1514	ERR ("malformed JSON string, tag value must be an array");
		1515
		1516	{
		1517	AV av = (AV )SvRV (val);
		1518	int i, len = av_len (av) + 1;
		1519	HV *stash = gv_stashsv (tag, 0);
		1520	SV *sv;
		1521
		1522	if (!stash)
		1523	ERR ("cannot decode perl-object (package does not exist)");
		1524
		1525	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1526
		1527	if (!method)
		1528	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1529
		1530	dSP;
		1531
		1532	ENTER; SAVETMPS; PUSHMARK (SP);
		1533	EXTEND (SP, len + 2);
		1534	// we re-bless the reference to get overload and other niceties right
		1535	PUSHs (tag);
		1536	PUSHs (sv_json);
		1537
		1538	for (i = 0; i < len; ++i)
		1539	PUSHs (*av_fetch (av, i, 1));
		1540
		1541	PUTBACK;
		1542	call_sv ((SV *)GvCV (method), G_SCALAR);
		1543	SPAGAIN;
		1544
		1545	SvREFCNT_dec (tag);
		1546	SvREFCNT_dec (val);
		1547	sv = SvREFCNT_inc (POPs);
		1548
		1549	PUTBACK;
		1550
		1551	FREETMPS; LEAVE;
		1552
		1553	return sv;
		1554	}
		1555
		1556	fail:
		1557	SvREFCNT_dec (tag);
		1558	SvREFCNT_dec (val);
		1559	return 0;
		1560	}
		1561
		1562	static SV *
1361	decode_sv (dec_t *dec)	1563	decode_sv (dec_t *dec)
1362	{	1564	{
1363	// the beauty of JSON: you need exactly one character lookahead	1565	// the beauty of JSON: you need exactly one character lookahead
1364	// to parse everything.	1566	// to parse everything.
1365	switch (*dec->cur)	1567	switch (*dec->cur)
1366	{	1568	{
1367	case '"': ++dec->cur; return decode_str (dec);	1569	case '"': ++dec->cur; return decode_str (dec);
1368	case '[': ++dec->cur; return decode_av (dec);	1570	case '[': ++dec->cur; return decode_av (dec);
1369	case '{': ++dec->cur; return decode_hv (dec);	1571	case '{': ++dec->cur; return decode_hv (dec);
		1572	case '(': return decode_tag (dec);
1370		1573
1371	case '-':	1574	case '-':
1372	case '0': case '1': case '2': case '3': case '4':	1575	case '0': case '1': case '2': case '3': case '4':
1373	case '5': case '6': case '7': case '8': case '9':	1576	case '5': case '6': case '7': case '8': case '9':
1374	return decode_num (dec);	1577	return decode_num (dec);
…		…
1376	case 't':	1579	case 't':
1377	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1580	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1378	{	1581	{
1379	dec->cur += 4;	1582	dec->cur += 4;
1380	#if JSON_SLOW	1583	#if JSON_SLOW
1381	json_true = get_bool ("JSON::XS::true");	1584	types_true = get_bool ("Types::Serialiser::true");
1382	#endif	1585	#endif
1383	return newSVsv (json_true);	1586	return newSVsv (types_true);
1384	}	1587	}
1385	else	1588	else
1386	ERR ("'true' expected");	1589	ERR ("'true' expected");
1387		1590
1388	break;	1591	break;
…		…
1390	case 'f':	1593	case 'f':
1391	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1594	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1392	{	1595	{
1393	dec->cur += 5;	1596	dec->cur += 5;
1394	#if JSON_SLOW	1597	#if JSON_SLOW
1395	json_false = get_bool ("JSON::XS::false");	1598	types_false = get_bool ("Types::Serialiser::false");
1396	#endif	1599	#endif
1397	return newSVsv (json_false);	1600	return newSVsv (types_false);
1398	}	1601	}
1399	else	1602	else
1400	ERR ("'false' expected");	1603	ERR ("'false' expected");
1401		1604
1402	break;	1605	break;
…		…
1411	ERR ("'null' expected");	1614	ERR ("'null' expected");
1412		1615
1413	break;	1616	break;
1414		1617
1415	default:	1618	default:
1416	ERR ("malformed JSON string, neither array, object, number, string or atom");	1619	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1417	break;	1620	break;
1418	}	1621	}
1419		1622
1420	fail:	1623	fail:
1421	return 0;	1624	return 0;
…		…
1426	{	1629	{
1427	dec_t dec;	1630	dec_t dec;
1428	SV *sv;	1631	SV *sv;
1429		1632
1430	/* work around bugs in 5.10 where manipulating magic values	1633	/* work around bugs in 5.10 where manipulating magic values
1431	* will perl ignore the magic in subsequent accesses	1634	* makes perl ignore the magic in subsequent accesses.
		1635	* also make a copy of non-PV values, to get them into a clean
		1636	* state (SvPV should do that, but it's buggy, see below).
1432	*/	1637	*/
1433	/SvGETMAGIC (string);/	1638	/SvGETMAGIC (string);/
1434	if (SvMAGICAL (string))	1639	if (SvMAGICAL (string) \|\| !SvPOK (string))
1435	string = sv_2mortal (newSVsv (string));	1640	string = sv_2mortal (newSVsv (string));
1436		1641
1437	SvUPGRADE (string, SVt_PV);	1642	SvUPGRADE (string, SVt_PV);
1438		1643
1439	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1644	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1456	if (offset > json->max_size && json->max_size)	1661	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",	1662	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);	1663	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1459	}	1664	}
1460		1665
1461	if (json->flags & F_UTF8)	1666	if (DECODE_WANTS_OCTETS (json))
1462	sv_utf8_downgrade (string, 0);	1667	sv_utf8_downgrade (string, 0);
1463	else	1668	else
1464	sv_utf8_upgrade (string);	1669	sv_utf8_upgrade (string);
1465		1670
1466	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1671	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);	1713	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1509	LEAVE;	1714	LEAVE;
1510		1715
1511	croak ("%s, at character offset %d (before \"%s\")",	1716	croak ("%s, at character offset %d (before \"%s\")",
1512	dec.err,	1717	dec.err,
1513	ptr_to_index (string, dec.cur),	1718	(int)ptr_to_index (string, dec.cur),
1514	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1719	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1515	}	1720	}
1516		1721
1517	sv = sv_2mortal (sv);	1722	sv = sv_2mortal (sv);
1518		1723
…		…
1646	self->incr_mode = INCR_M_STR;	1851	self->incr_mode = INCR_M_STR;
1647	goto incr_m_str;	1852	goto incr_m_str;
1648		1853
1649	case '[':	1854	case '[':
1650	case '{':	1855	case '{':
		1856	case '(':
1651	if (++self->incr_nest > self->max_depth)	1857	if (++self->incr_nest > self->max_depth)
1652	croak (ERR_NESTING_EXCEEDED);	1858	croak (ERR_NESTING_EXCEEDED);
1653	break;	1859	break;
1654		1860
1655	case ']':	1861	case ']':
1656	case '}':	1862	case '}':
1657	if (--self->incr_nest <= 0)	1863	if (--self->incr_nest <= 0)
1658	goto interrupt;	1864	goto interrupt;
		1865	break;
		1866
		1867	case ')':
		1868	--self->incr_nest;
1659	break;	1869	break;
1660		1870
1661	case '#':	1871	case '#':
1662	self->incr_mode = INCR_M_C1;	1872	self->incr_mode = INCR_M_C1;
1663	goto incr_m_c;	1873	goto incr_m_c;
…		…
1689	i >= '0' && i <= '9' ? i - '0'	1899	i >= '0' && i <= '9' ? i - '0'
1690	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1900	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1691	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1901	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1692	: -1;	1902	: -1;
1693		1903
1694	json_stash = gv_stashpv ("JSON::XS" , 1);	1904	json_stash = gv_stashpv ("JSON::XS" , 1);
1695	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1905	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1696		1906
1697	json_true = get_bool ("JSON::XS::true");	1907	types_true = get_bool ("Types::Serialiser::true");
1698	json_false = get_bool ("JSON::XS::false");	1908	types_false = get_bool ("Types::Serialiser::false");
		1909
		1910	sv_json = newSVpv ("JSON", 0);
		1911	SvREADONLY_on (sv_json);
1699		1912
1700	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1913	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1701	}	1914	}
1702		1915
1703	PROTOTYPES: DISABLE	1916	PROTOTYPES: DISABLE
1704		1917
1705	void CLONE (...)	1918	void CLONE (...)
1706	CODE:	1919	CODE:
1707	json_stash = 0;	1920	json_stash = 0;
1708	json_boolean_stash = 0;	1921	types_boolean_stash = 0;
1709		1922
1710	void new (char *klass)	1923	void new (char *klass)
1711	PPCODE:	1924	PPCODE:
1712	{	1925	{
1713	SV *pv = NEWSV (0, sizeof (JSON));	1926	SV *pv = NEWSV (0, sizeof (JSON));
1714	SvPOK_only (pv);	1927	SvPOK_only (pv);
1715	json_init ((JSON *)SvPVX (pv));	1928	json_init ((JSON *)SvPVX (pv));
1716	XPUSHs (sv_2mortal (sv_bless (	1929	XPUSHs (sv_2mortal (sv_bless (
1717	newRV_noinc (pv),	1930	newRV_noinc (pv),
1718	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1931	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1733	shrink = F_SHRINK	1946	shrink = F_SHRINK
1734	allow_blessed = F_ALLOW_BLESSED	1947	allow_blessed = F_ALLOW_BLESSED
1735	convert_blessed = F_CONV_BLESSED	1948	convert_blessed = F_CONV_BLESSED
1736	relaxed = F_RELAXED	1949	relaxed = F_RELAXED
1737	allow_unknown = F_ALLOW_UNKNOWN	1950	allow_unknown = F_ALLOW_UNKNOWN
		1951	allow_tags = F_ALLOW_TAGS
1738	PPCODE:	1952	PPCODE:
1739	{	1953	{
1740	if (enable)	1954	if (enable)
1741	self->flags \|= ix;	1955	self->flags \|= ix;
1742	else	1956	else
…		…
1758	get_shrink = F_SHRINK	1972	get_shrink = F_SHRINK
1759	get_allow_blessed = F_ALLOW_BLESSED	1973	get_allow_blessed = F_ALLOW_BLESSED
1760	get_convert_blessed = F_CONV_BLESSED	1974	get_convert_blessed = F_CONV_BLESSED
1761	get_relaxed = F_RELAXED	1975	get_relaxed = F_RELAXED
1762	get_allow_unknown = F_ALLOW_UNKNOWN	1976	get_allow_unknown = F_ALLOW_UNKNOWN
		1977	get_allow_tags = F_ALLOW_TAGS
1763	PPCODE:	1978	PPCODE:
1764	XPUSHs (boolSV (self->flags & ix));	1979	XPUSHs (boolSV (self->flags & ix));
1765		1980
1766	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	1981	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1767	PPCODE:	1982	PPCODE:
…		…
1795	}	2010	}
1796		2011
1797	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2012	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1798	PPCODE:	2013	PPCODE:
1799	{	2014	{
1800	if (!self->cb_sk_object)	2015	if (!self->cb_sk_object)
1801	self->cb_sk_object = newHV ();	2016	self->cb_sk_object = newHV ();
1802		2017
1803	if (SvOK (cb))	2018	if (SvOK (cb))
1804	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2019	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1805	else	2020	else
…		…
1816	XPUSHs (ST (0));	2031	XPUSHs (ST (0));
1817	}	2032	}
1818		2033
1819	void encode (JSON self, SV scalar)	2034	void encode (JSON self, SV scalar)
1820	PPCODE:	2035	PPCODE:
1821	XPUSHs (encode_json (scalar, self));	2036	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2037	XPUSHs (scalar);
1822		2038
1823	void decode (JSON self, SV jsonstr)	2039	void decode (JSON self, SV jsonstr)
1824	PPCODE:	2040	PPCODE:
1825	XPUSHs (decode_json (jsonstr, self, 0));	2041	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2042	XPUSHs (jsonstr);
1826		2043
1827	void decode_prefix (JSON self, SV jsonstr)	2044	void decode_prefix (JSON self, SV jsonstr)
1828	PPCODE:	2045	PPCODE:
1829	{	2046	{
		2047	SV *sv;
1830	char *offset;	2048	char *offset;
		2049	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1831	EXTEND (SP, 2);	2050	EXTEND (SP, 2);
1832	PUSHs (decode_json (jsonstr, self, &offset));	2051	PUSHs (sv);
1833	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2052	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1834	}	2053	}
1835		2054
1836	void incr_parse (JSON self, SV jsonstr = 0)	2055	void incr_parse (JSON self, SV jsonstr = 0)
1837	PPCODE:	2056	PPCODE:
1838	{	2057	{
1839	if (!self->incr_text)	2058	if (!self->incr_text)
1840	self->incr_text = newSVpvn ("", 0);	2059	self->incr_text = newSVpvn ("", 0);
		2060
		2061	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2062	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2063	if (DECODE_WANTS_OCTETS (self))
		2064	{
		2065	if (self->incr_pos)
		2066	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2067	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2068
		2069	sv_utf8_downgrade (self->incr_text, 0);
		2070	}
		2071	else
		2072	{
		2073	sv_utf8_upgrade (self->incr_text);
		2074
		2075	if (self->incr_pos)
		2076	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2077	- (U8 *)SvPVX (self->incr_text);
		2078	}
1841		2079
1842	// append data, if any	2080	// append data, if any
1843	if (jsonstr)	2081	if (jsonstr)
1844	{	2082	{
		2083	/* make sure both strings have same encoding */
		2084	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1845	if (SvUTF8 (jsonstr))	2085	if (SvUTF8 (jsonstr))
		2086	sv_utf8_downgrade (jsonstr, 0);
1846	{	2087	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);	2088	sv_utf8_upgrade (jsonstr);
1859		2089
		2090	/* and then just blindly append */
1860	{	2091	{
1861	STRLEN len;	2092	STRLEN len;
1862	const char *str = SvPV (jsonstr, len);	2093	const char *str = SvPV (jsonstr, len);
1863	STRLEN cur = SvCUR (self->incr_text);	2094	STRLEN cur = SvCUR (self->incr_text);
1864		2095
…		…
1872	}	2103	}
1873		2104
1874	if (GIMME_V != G_VOID)	2105	if (GIMME_V != G_VOID)
1875	do	2106	do
1876	{	2107	{
		2108	SV *sv;
1877	char *offset;	2109	char *offset;
1878		2110
1879	if (!INCR_DONE (self))	2111	if (!INCR_DONE (self))
1880	{	2112	{
1881	incr_parse (self);	2113	incr_parse (self);
…		…
1883	if (self->incr_pos > self->max_size && self->max_size)	2115	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",	2116	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);	2117	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1886		2118
1887	if (!INCR_DONE (self))	2119	if (!INCR_DONE (self))
		2120	{
		2121	// as an optimisation, do not accumulate white space in the incr buffer
		2122	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2123	{
		2124	self->incr_pos = 0;
		2125	SvCUR_set (self->incr_text, 0);
		2126	}
		2127
1888	break;	2128	break;
		2129	}
1889	}	2130	}
1890		2131
1891	XPUSHs (decode_json (self->incr_text, self, &offset));	2132	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2133	XPUSHs (sv);
1892		2134
1893	self->incr_pos -= offset - SvPVX (self->incr_text);	2135	self->incr_pos -= offset - SvPVX (self->incr_text);
1894	self->incr_nest = 0;	2136	self->incr_nest = 0;
1895	self->incr_mode = 0;	2137	self->incr_mode = 0;
1896		2138
…		…
1940	SvREFCNT_dec (self->incr_text);	2182	SvREFCNT_dec (self->incr_text);
1941		2183
1942	PROTOTYPES: ENABLE	2184	PROTOTYPES: ENABLE
1943		2185
1944	void encode_json (SV *scalar)	2186	void encode_json (SV *scalar)
1945	ALIAS:
1946	to_json_ = 0
1947	encode_json = F_UTF8
1948	PPCODE:	2187	PPCODE:
1949	{	2188	{
1950	JSON json;	2189	JSON json;
1951	json_init (&json);	2190	json_init (&json);
1952	json.flags \|= ix;	2191	json.flags \|= F_UTF8;
1953	XPUSHs (encode_json (scalar, &json));	2192	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2193	XPUSHs (scalar);
1954	}	2194	}
1955		2195
1956	void decode_json (SV *jsonstr)	2196	void decode_json (SV *jsonstr)
1957	ALIAS:
1958	from_json_ = 0
1959	decode_json = F_UTF8
1960	PPCODE:	2197	PPCODE:
1961	{	2198	{
1962	JSON json;	2199	JSON json;
1963	json_init (&json);	2200	json_init (&json);
1964	json.flags \|= ix;	2201	json.flags \|= F_UTF8;
1965	XPUSHs (decode_json (jsonstr, &json, 0));	2202	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2203	XPUSHs (jsonstr);
1966	}	2204	}
1967		2205
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.120 by root, Mon Oct 28 23:23:10 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.120 by root, Mon Oct 28 23:23:10 2013 UTC