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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.106 by root, Tue Jan 19 01:36:34 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
…		…
258	}	264	}
259		265
260	// this relies greatly on the quality of the pow ()	266	// this relies greatly on the quality of the pow ()
261	// implementation of the platform, but a good	267	// implementation of the platform, but a good
262	// implementation is hard to beat.	268	// implementation is hard to beat.
		269	// (IEEE 754 conformant ones are required to be exact)
263	if (postdp) *expo -= eaccum;	270	if (postdp) *expo -= eaccum;
264	accum += uaccum Perl_pow (10., *expo);	271	accum += uaccum Perl_pow (10., *expo);
265	*expo += eaccum;	272	*expo += eaccum;
266	}	273	}
267		274
…		…
477		484
478	if (enc->indent >= enc->json.max_depth)	485	if (enc->indent >= enc->json.max_depth)
479	croak (ERR_NESTING_EXCEEDED);	486	croak (ERR_NESTING_EXCEEDED);
480		487
481	encode_ch (enc, '[');	488	encode_ch (enc, '[');
482		489
483	if (len >= 0)	490	if (len >= 0)
484	{	491	{
485	encode_nl (enc); ++enc->indent;	492	encode_nl (enc); ++enc->indent;
486		493
487	for (i = 0; i <= len; ++i)	494	for (i = 0; i <= len; ++i)
…		…
499	encode_comma (enc);	506	encode_comma (enc);
500	}	507	}
501		508
502	encode_nl (enc); --enc->indent; encode_indent (enc);	509	encode_nl (enc); --enc->indent; encode_indent (enc);
503	}	510	}
504		511
505	encode_ch (enc, ']');	512	encode_ch (enc, ']');
506	}	513	}
507		514
508	static void	515	static void
509	encode_hk (enc_t enc, HE he)	516	encode_hk (enc_t enc, HE he)
…		…
513	if (HeKLEN (he) == HEf_SVKEY)	520	if (HeKLEN (he) == HEf_SVKEY)
514	{	521	{
515	SV *sv = HeSVKEY (he);	522	SV *sv = HeSVKEY (he);
516	STRLEN len;	523	STRLEN len;
517	char *str;	524	char *str;
518		525
519	SvGETMAGIC (sv);	526	SvGETMAGIC (sv);
520	str = SvPV (sv, len);	527	str = SvPV (sv, len);
521		528
522	encode_str (enc, str, len, SvUTF8 (sv));	529	encode_str (enc, str, len, SvUTF8 (sv));
523	}	530	}
…		…
589	}	596	}
590		597
591	if (count)	598	if (count)
592	{	599	{
593	int i, fast = 1;	600	int i, fast = 1;
594	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	601	HE *hes_stack [STACK_HES];
595	HE *hes = _alloca (count sizeof (HE));	602	HE **hes = hes_stack;
596	#else	603
597	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	604	// allocate larger arrays on the heap
598	#endif	605	if (count > STACK_HES)
		606	{
		607	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		608	hes = (HE **)SvPVX (sv);
		609	}
599		610
600	i = 0;	611	i = 0;
601	while ((he = hv_iternext (hv)))	612	while ((he = hv_iternext (hv)))
602	{	613	{
603	hes [i++] = he;	614	hes [i++] = he;
…		…
678	SvGETMAGIC (sv);	689	SvGETMAGIC (sv);
679	svt = SvTYPE (sv);	690	svt = SvTYPE (sv);
680		691
681	if (expect_false (SvOBJECT (sv)))	692	if (expect_false (SvOBJECT (sv)))
682	{	693	{
683	HV *stash = !JSON_SLOW \|\| json_boolean_stash	694	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
684	? json_boolean_stash	695	? types_boolean_stash
685	: gv_stashpv ("JSON::XS::Boolean", 1);	696	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		697	HV *stash = SvSTASH (sv);
686		698
687	if (SvSTASH (sv) == stash)	699	if (stash == boolean_stash)
688	{	700	{
689	if (SvIV (sv))	701	if (SvIV (sv))
690	encode_str (enc, "true", 4, 0);	702	encode_str (enc, "true", 4, 0);
691	else	703	else
692	encode_str (enc, "false", 5, 0);	704	encode_str (enc, "false", 5, 0);
693	}	705	}
694	else	706	else if (enc->json.flags & F_CONV_BLESSED)
695	{	707	{
696	#if 0	708	GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0);
697	if (0 && sv_derived_from (rv, "JSON::Literal"))	709
698	{	710	if (to_json)
699	// not yet
700	}	711	{
701	#endif
702	if (enc->json.flags & F_CONV_BLESSED)
703	{	712	dSP;
		713
		714	ENTER; SAVETMPS; PUSHMARK (SP);
704	// 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
705	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
706
707	if (to_json)
708	{
709	dSP;
710
711	ENTER; SAVETMPS; PUSHMARK (SP);
712	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	716	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
713		717
714	// 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
715	PUTBACK;	719	PUTBACK;
716	call_sv ((SV *)GvCV (to_json), G_SCALAR);	720	call_sv ((SV *)GvCV (to_json), G_SCALAR);
717	SPAGAIN;	721	SPAGAIN;
718		722
719	// catch this surprisingly common error	723	// catch this surprisingly common error
720	if (SvROK (TOPs) && SvRV (TOPs) == sv)	724	if (SvROK (TOPs) && SvRV (TOPs) == sv)
721	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)));
722		726
723	sv = POPs;	727	sv = POPs;
724	PUTBACK;	728	PUTBACK;
725		729
726	encode_sv (enc, sv);	730	encode_sv (enc, sv);
727		731
728	FREETMPS; LEAVE;	732	FREETMPS; LEAVE;
729	}
730	else if (enc->json.flags & F_ALLOW_BLESSED)
731	encode_str (enc, "null", 4, 0);
732	else
733	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
734	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
735	}	733	}
736	else if (enc->json.flags & F_ALLOW_BLESSED)	734	else if (enc->json.flags & F_ALLOW_BLESSED)
737	encode_str (enc, "null", 4, 0);	735	encode_str (enc, "null", 4, 0);
738	else	736	else
739	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",
740	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	738	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
741	}	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))));
742	}	795	}
743	else if (svt == SVt_PVHV)	796	else if (svt == SVt_PVHV)
744	encode_hv (enc, (HV *)sv);	797	encode_hv (enc, (HV *)sv);
745	else if (svt == SVt_PVAV)	798	else if (svt == SVt_PVAV)
746	encode_av (enc, (AV *)sv);	799	encode_av (enc, (AV *)sv);
…		…
822	}	875	}
823	else	876	else
824	{	877	{
825	// large integer, use the (rather slow) snprintf way.	878	// large integer, use the (rather slow) snprintf way.
826	need (enc, IVUV_MAXCHARS);	879	need (enc, IVUV_MAXCHARS);
827	enc->cur +=	880	enc->cur +=
828	SvIsUV(sv)	881	SvIsUV(sv)
829	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	882	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	883	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831	}	884	}
832	}	885	}
833	else if (SvROK (sv))	886	else if (SvROK (sv))
834	encode_rv (enc, SvRV (sv));	887	encode_rv (enc, SvRV (sv));
835	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	888	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
836	encode_str (enc, "null", 4, 0);	889	encode_str (enc, "null", 4, 0);
837	else	890	else
838	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",
839	SvPV_nolen (sv), SvFLAGS (sv));	892	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
840	}	893	}
841		894
842	static SV *	895	static SV *
843	encode_json (SV scalar, JSON json)	896	encode_json (SV scalar, JSON json)
844	{	897	{
…		…
1256	if (*dec->cur == ']')	1309	if (*dec->cur == ']')
1257	{	1310	{
1258	++dec->cur;	1311	++dec->cur;
1259	break;	1312	break;
1260	}	1313	}
1261		1314
1262	if (*dec->cur != ',')	1315	if (*dec->cur != ',')
1263	ERR (", or ] expected while parsing array");	1316	ERR (", or ] expected while parsing array");
1264		1317
1265	++dec->cur;	1318	++dec->cur;
1266		1319
…		…
1401	dSP;	1454	dSP;
1402	int count;	1455	int count;
1403		1456
1404	ENTER; SAVETMPS; PUSHMARK (SP);	1457	ENTER; SAVETMPS; PUSHMARK (SP);
1405	XPUSHs (HeVAL (he));	1458	XPUSHs (HeVAL (he));
		1459	sv_2mortal (sv);
1406		1460
1407	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1461	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1408		1462
1409	if (count == 1)	1463	if (count == 1)
1410	{	1464	{
1411	sv = newSVsv (POPs);	1465	sv = newSVsv (POPs);
1412	FREETMPS; LEAVE;	1466	FREETMPS; LEAVE;
1413	return sv;	1467	return sv;
1414	}	1468	}
1415		1469
		1470	SvREFCNT_inc (sv);
1416	FREETMPS; LEAVE;	1471	FREETMPS; LEAVE;
1417	}	1472	}
1418	}	1473	}
1419		1474
1420	if (dec->json.cb_object)	1475	if (dec->json.cb_object)
…		…
1446	DEC_DEC_DEPTH;	1501	DEC_DEC_DEPTH;
1447	return 0;	1502	return 0;
1448	}	1503	}
1449		1504
1450	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 *
1451	decode_sv (dec_t *dec)	1582	decode_sv (dec_t *dec)
1452	{	1583	{
1453	// the beauty of JSON: you need exactly one character lookahead	1584	// the beauty of JSON: you need exactly one character lookahead
1454	// to parse everything.	1585	// to parse everything.
1455	switch (*dec->cur)	1586	switch (*dec->cur)
1456	{	1587	{
1457	case '"': ++dec->cur; return decode_str (dec);	1588	case '"': ++dec->cur; return decode_str (dec);
1458	case '[': ++dec->cur; return decode_av (dec);	1589	case '[': ++dec->cur; return decode_av (dec);
1459	case '{': ++dec->cur; return decode_hv (dec);	1590	case '{': ++dec->cur; return decode_hv (dec);
		1591	case '(': return decode_tag (dec);
1460		1592
1461	case '-':	1593	case '-':
1462	case '0': case '1': case '2': case '3': case '4':	1594	case '0': case '1': case '2': case '3': case '4':
1463	case '5': case '6': case '7': case '8': case '9':	1595	case '5': case '6': case '7': case '8': case '9':
1464	return decode_num (dec);	1596	return decode_num (dec);
…		…
1466	case 't':	1598	case 't':
1467	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1599	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1468	{	1600	{
1469	dec->cur += 4;	1601	dec->cur += 4;
1470	#if JSON_SLOW	1602	#if JSON_SLOW
1471	json_true = get_bool ("JSON::XS::true");	1603	types_true = get_bool ("Types::Serialiser::true");
1472	#endif	1604	#endif
1473	return newSVsv (json_true);	1605	return newSVsv (types_true);
1474	}	1606	}
1475	else	1607	else
1476	ERR ("'true' expected");	1608	ERR ("'true' expected");
1477		1609
1478	break;	1610	break;
…		…
1480	case 'f':	1612	case 'f':
1481	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1613	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1482	{	1614	{
1483	dec->cur += 5;	1615	dec->cur += 5;
1484	#if JSON_SLOW	1616	#if JSON_SLOW
1485	json_false = get_bool ("JSON::XS::false");	1617	types_false = get_bool ("Types::Serialiser::false");
1486	#endif	1618	#endif
1487	return newSVsv (json_false);	1619	return newSVsv (types_false);
1488	}	1620	}
1489	else	1621	else
1490	ERR ("'false' expected");	1622	ERR ("'false' expected");
1491		1623
1492	break;	1624	break;
…		…
1501	ERR ("'null' expected");	1633	ERR ("'null' expected");
1502		1634
1503	break;	1635	break;
1504		1636
1505	default:	1637	default:
1506	ERR ("malformed JSON string, neither array, object, number, string or atom");	1638	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1507	break;	1639	break;
1508	}	1640	}
1509		1641
1510	fail:	1642	fail:
1511	return 0;	1643	return 0;
…		…
1516	{	1648	{
1517	dec_t dec;	1649	dec_t dec;
1518	SV *sv;	1650	SV *sv;
1519		1651
1520	/* work around bugs in 5.10 where manipulating magic values	1652	/* work around bugs in 5.10 where manipulating magic values
1521	* 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).
1522	*/	1656	*/
1523	/SvGETMAGIC (string);/	1657	/SvGETMAGIC (string);/
1524	if (SvMAGICAL (string))	1658	if (SvMAGICAL (string) \|\| !SvPOK (string))
1525	string = sv_2mortal (newSVsv (string));	1659	string = sv_2mortal (newSVsv (string));
1526		1660
1527	SvUPGRADE (string, SVt_PV);	1661	SvUPGRADE (string, SVt_PV);
1528		1662
1529	/* 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
…		…
1546	if (offset > json->max_size && json->max_size)	1680	if (offset > json->max_size && json->max_size)
1547	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",
1548	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1682	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1549	}	1683	}
1550		1684
1551	if (json->flags & F_UTF8)	1685	if (DECODE_WANTS_OCTETS (json))
1552	sv_utf8_downgrade (string, 0);	1686	sv_utf8_downgrade (string, 0);
1553	else	1687	else
1554	sv_utf8_upgrade (string);	1688	sv_utf8_upgrade (string);
1555		1689
1556	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1690	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1598	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);
1599	LEAVE;	1733	LEAVE;
1600		1734
1601	croak ("%s, at character offset %d (before \"%s\")",	1735	croak ("%s, at character offset %d (before \"%s\")",
1602	dec.err,	1736	dec.err,
1603	ptr_to_index (string, dec.cur),	1737	(int)ptr_to_index (string, dec.cur),
1604	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1738	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1605	}	1739	}
1606		1740
1607	sv = sv_2mortal (sv);	1741	sv = sv_2mortal (sv);
1608		1742
…		…
1736	self->incr_mode = INCR_M_STR;	1870	self->incr_mode = INCR_M_STR;
1737	goto incr_m_str;	1871	goto incr_m_str;
1738		1872
1739	case '[':	1873	case '[':
1740	case '{':	1874	case '{':
		1875	case '(':
1741	if (++self->incr_nest > self->max_depth)	1876	if (++self->incr_nest > self->max_depth)
1742	croak (ERR_NESTING_EXCEEDED);	1877	croak (ERR_NESTING_EXCEEDED);
1743	break;	1878	break;
1744		1879
1745	case ']':	1880	case ']':
1746	case '}':	1881	case '}':
1747	if (--self->incr_nest <= 0)	1882	if (--self->incr_nest <= 0)
1748	goto interrupt;	1883	goto interrupt;
		1884	break;
		1885
		1886	case ')':
		1887	--self->incr_nest;
1749	break;	1888	break;
1750		1889
1751	case '#':	1890	case '#':
1752	self->incr_mode = INCR_M_C1;	1891	self->incr_mode = INCR_M_C1;
1753	goto incr_m_c;	1892	goto incr_m_c;
…		…
1779	i >= '0' && i <= '9' ? i - '0'	1918	i >= '0' && i <= '9' ? i - '0'
1780	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1919	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1781	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1920	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1782	: -1;	1921	: -1;
1783		1922
1784	json_stash = gv_stashpv ("JSON::XS" , 1);	1923	json_stash = gv_stashpv ("JSON::XS" , 1);
1785	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1924	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1786		1925
1787	json_true = get_bool ("JSON::XS::true");	1926	types_true = get_bool ("Types::Serialiser::true");
1788	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);
1789		1931
1790	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 */
1791	}	1933	}
1792		1934
1793	PROTOTYPES: DISABLE	1935	PROTOTYPES: DISABLE
1794		1936
1795	void CLONE (...)	1937	void CLONE (...)
1796	CODE:	1938	CODE:
1797	json_stash = 0;	1939	json_stash = 0;
1798	json_boolean_stash = 0;	1940	types_boolean_stash = 0;
1799		1941
1800	void new (char *klass)	1942	void new (char *klass)
1801	PPCODE:	1943	PPCODE:
1802	{	1944	{
1803	SV *pv = NEWSV (0, sizeof (JSON));	1945	SV *pv = NEWSV (0, sizeof (JSON));
1804	SvPOK_only (pv);	1946	SvPOK_only (pv);
1805	json_init ((JSON *)SvPVX (pv));	1947	json_init ((JSON *)SvPVX (pv));
1806	XPUSHs (sv_2mortal (sv_bless (	1948	XPUSHs (sv_2mortal (sv_bless (
1807	newRV_noinc (pv),	1949	newRV_noinc (pv),
1808	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1950	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1823	shrink = F_SHRINK	1965	shrink = F_SHRINK
1824	allow_blessed = F_ALLOW_BLESSED	1966	allow_blessed = F_ALLOW_BLESSED
1825	convert_blessed = F_CONV_BLESSED	1967	convert_blessed = F_CONV_BLESSED
1826	relaxed = F_RELAXED	1968	relaxed = F_RELAXED
1827	allow_unknown = F_ALLOW_UNKNOWN	1969	allow_unknown = F_ALLOW_UNKNOWN
		1970	allow_tags = F_ALLOW_TAGS
1828	PPCODE:	1971	PPCODE:
1829	{	1972	{
1830	if (enable)	1973	if (enable)
1831	self->flags \|= ix;	1974	self->flags \|= ix;
1832	else	1975	else
…		…
1848	get_shrink = F_SHRINK	1991	get_shrink = F_SHRINK
1849	get_allow_blessed = F_ALLOW_BLESSED	1992	get_allow_blessed = F_ALLOW_BLESSED
1850	get_convert_blessed = F_CONV_BLESSED	1993	get_convert_blessed = F_CONV_BLESSED
1851	get_relaxed = F_RELAXED	1994	get_relaxed = F_RELAXED
1852	get_allow_unknown = F_ALLOW_UNKNOWN	1995	get_allow_unknown = F_ALLOW_UNKNOWN
		1996	get_allow_tags = F_ALLOW_TAGS
1853	PPCODE:	1997	PPCODE:
1854	XPUSHs (boolSV (self->flags & ix));	1998	XPUSHs (boolSV (self->flags & ix));
1855		1999
1856	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2000	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1857	PPCODE:	2001	PPCODE:
…		…
1885	}	2029	}
1886		2030
1887	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)
1888	PPCODE:	2032	PPCODE:
1889	{	2033	{
1890	if (!self->cb_sk_object)	2034	if (!self->cb_sk_object)
1891	self->cb_sk_object = newHV ();	2035	self->cb_sk_object = newHV ();
1892		2036
1893	if (SvOK (cb))	2037	if (SvOK (cb))
1894	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2038	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1895	else	2039	else
…		…
1906	XPUSHs (ST (0));	2050	XPUSHs (ST (0));
1907	}	2051	}
1908		2052
1909	void encode (JSON self, SV scalar)	2053	void encode (JSON self, SV scalar)
1910	PPCODE:	2054	PPCODE:
1911	XPUSHs (encode_json (scalar, self));	2055	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2056	XPUSHs (scalar);
1912		2057
1913	void decode (JSON self, SV jsonstr)	2058	void decode (JSON self, SV jsonstr)
1914	PPCODE:	2059	PPCODE:
1915	XPUSHs (decode_json (jsonstr, self, 0));	2060	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2061	XPUSHs (jsonstr);
1916		2062
1917	void decode_prefix (JSON self, SV jsonstr)	2063	void decode_prefix (JSON self, SV jsonstr)
1918	PPCODE:	2064	PPCODE:
1919	{	2065	{
		2066	SV *sv;
1920	char *offset;	2067	char *offset;
		2068	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1921	EXTEND (SP, 2);	2069	EXTEND (SP, 2);
1922	PUSHs (decode_json (jsonstr, self, &offset));	2070	PUSHs (sv);
1923	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2071	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1924	}	2072	}
1925		2073
1926	void incr_parse (JSON self, SV jsonstr = 0)	2074	void incr_parse (JSON self, SV jsonstr = 0)
1927	PPCODE:	2075	PPCODE:
1928	{	2076	{
1929	if (!self->incr_text)	2077	if (!self->incr_text)
1930	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	}
1931		2098
1932	// append data, if any	2099	// append data, if any
1933	if (jsonstr)	2100	if (jsonstr)
1934	{	2101	{
		2102	/* make sure both strings have same encoding */
		2103	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1935	if (SvUTF8 (jsonstr))	2104	if (SvUTF8 (jsonstr))
		2105	sv_utf8_downgrade (jsonstr, 0);
1936	{	2106	else
1937	if (!SvUTF8 (self->incr_text))
1938	{
1939	/* utf-8-ness differs, need to upgrade */
1940	sv_utf8_upgrade (self->incr_text);
1941
1942	if (self->incr_pos)
1943	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1944	- (U8 *)SvPVX (self->incr_text);
1945	}
1946	}
1947	else if (SvUTF8 (self->incr_text))
1948	sv_utf8_upgrade (jsonstr);	2107	sv_utf8_upgrade (jsonstr);
1949		2108
		2109	/* and then just blindly append */
1950	{	2110	{
1951	STRLEN len;	2111	STRLEN len;
1952	const char *str = SvPV (jsonstr, len);	2112	const char *str = SvPV (jsonstr, len);
1953	STRLEN cur = SvCUR (self->incr_text);	2113	STRLEN cur = SvCUR (self->incr_text);
1954		2114
…		…
1962	}	2122	}
1963		2123
1964	if (GIMME_V != G_VOID)	2124	if (GIMME_V != G_VOID)
1965	do	2125	do
1966	{	2126	{
		2127	SV *sv;
1967	char *offset;	2128	char *offset;
1968		2129
1969	if (!INCR_DONE (self))	2130	if (!INCR_DONE (self))
1970	{	2131	{
1971	incr_parse (self);	2132	incr_parse (self);
…		…
1973	if (self->incr_pos > self->max_size && self->max_size)	2134	if (self->incr_pos > self->max_size && self->max_size)
1974	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",
1975	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2136	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1976		2137
1977	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
1978	break;	2147	break;
		2148	}
1979	}	2149	}
1980		2150
1981	XPUSHs (decode_json (self->incr_text, self, &offset));	2151	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2152	XPUSHs (sv);
1982		2153
1983	self->incr_pos -= offset - SvPVX (self->incr_text);	2154	self->incr_pos -= offset - SvPVX (self->incr_text);
1984	self->incr_nest = 0;	2155	self->incr_nest = 0;
1985	self->incr_mode = 0;	2156	self->incr_mode = 0;
1986		2157
…		…
2030	SvREFCNT_dec (self->incr_text);	2201	SvREFCNT_dec (self->incr_text);
2031		2202
2032	PROTOTYPES: ENABLE	2203	PROTOTYPES: ENABLE
2033		2204
2034	void encode_json (SV *scalar)	2205	void encode_json (SV *scalar)
2035	ALIAS:
2036	to_json_ = 0
2037	encode_json = F_UTF8
2038	PPCODE:	2206	PPCODE:
2039	{	2207	{
2040	JSON json;	2208	JSON json;
2041	json_init (&json);	2209	json_init (&json);
2042	json.flags \|= ix;	2210	json.flags \|= F_UTF8;
2043	XPUSHs (encode_json (scalar, &json));	2211	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2212	XPUSHs (scalar);
2044	}	2213	}
2045		2214
2046	void decode_json (SV *jsonstr)	2215	void decode_json (SV *jsonstr)
2047	ALIAS:
2048	from_json_ = 0
2049	decode_json = F_UTF8
2050	PPCODE:	2216	PPCODE:
2051	{	2217	{
2052	JSON json;	2218	JSON json;
2053	json_init (&json);	2219	json_init (&json);
2054	json.flags \|= ix;	2220	json.flags \|= F_UTF8;
2055	XPUSHs (decode_json (jsonstr, &json, 0));	2221	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2222	XPUSHs (jsonstr);
2056	}	2223	}
2057		2224

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.106 by root, Tue Jan 19 01:36:34 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.106 by root, Tue Jan 19 01:36:34 2010 UTC vs.
Revision 1.119 by root, Mon Oct 28 23:19:54 2013 UTC