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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.109 by root, Tue Mar 8 10:18:50 2011 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
…		…
72	#else	73	#else
73	# define JSON_SLOW 0	74	# define JSON_SLOW 0
74	# define JSON_STASH json_stash	75	# define JSON_STASH json_stash
75	#endif	76	#endif
76		77
		78	// the amount of HEs to allocate on the stack, when sorting keys
		79	#define STACK_HES 64
		80
77	static HV json_stash, json_boolean_stash; // JSON::XS::	81	static HV json_stash, types_boolean_stash; // JSON::XS::
78	static SV json_true, json_false;	82	static SV types_true, types_false, *sv_json;
79		83
80	enum {	84	enum {
81	INCR_M_WS = 0, // initial whitespace skipping, must be 0	85	INCR_M_WS = 0, // initial whitespace skipping, must be 0
82	INCR_M_STR, // inside string	86	INCR_M_STR, // inside string
83	INCR_M_BS, // inside backslash	87	INCR_M_BS, // inside backslash
…		…
260	}	264	}
261		265
262	// this relies greatly on the quality of the pow ()	266	// this relies greatly on the quality of the pow ()
263	// implementation of the platform, but a good	267	// implementation of the platform, but a good
264	// implementation is hard to beat.	268	// implementation is hard to beat.
		269	// (IEEE 754 conformant ones are required to be exact)
265	if (postdp) *expo -= eaccum;	270	if (postdp) *expo -= eaccum;
266	accum += uaccum Perl_pow (10., *expo);	271	accum += uaccum Perl_pow (10., *expo);
267	*expo += eaccum;	272	*expo += eaccum;
268	}	273	}
269		274
…		…
479		484
480	if (enc->indent >= enc->json.max_depth)	485	if (enc->indent >= enc->json.max_depth)
481	croak (ERR_NESTING_EXCEEDED);	486	croak (ERR_NESTING_EXCEEDED);
482		487
483	encode_ch (enc, '[');	488	encode_ch (enc, '[');
484		489
485	if (len >= 0)	490	if (len >= 0)
486	{	491	{
487	encode_nl (enc); ++enc->indent;	492	encode_nl (enc); ++enc->indent;
488		493
489	for (i = 0; i <= len; ++i)	494	for (i = 0; i <= len; ++i)
…		…
501	encode_comma (enc);	506	encode_comma (enc);
502	}	507	}
503		508
504	encode_nl (enc); --enc->indent; encode_indent (enc);	509	encode_nl (enc); --enc->indent; encode_indent (enc);
505	}	510	}
506		511
507	encode_ch (enc, ']');	512	encode_ch (enc, ']');
508	}	513	}
509		514
510	static void	515	static void
511	encode_hk (enc_t enc, HE he)	516	encode_hk (enc_t enc, HE he)
…		…
515	if (HeKLEN (he) == HEf_SVKEY)	520	if (HeKLEN (he) == HEf_SVKEY)
516	{	521	{
517	SV *sv = HeSVKEY (he);	522	SV *sv = HeSVKEY (he);
518	STRLEN len;	523	STRLEN len;
519	char *str;	524	char *str;
520		525
521	SvGETMAGIC (sv);	526	SvGETMAGIC (sv);
522	str = SvPV (sv, len);	527	str = SvPV (sv, len);
523		528
524	encode_str (enc, str, len, SvUTF8 (sv));	529	encode_str (enc, str, len, SvUTF8 (sv));
525	}	530	}
…		…
591	}	596	}
592		597
593	if (count)	598	if (count)
594	{	599	{
595	int i, fast = 1;	600	int i, fast = 1;
596	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	601	HE *hes_stack [STACK_HES];
597	HE *hes = _alloca (count sizeof (HE));	602	HE **hes = hes_stack;
598	#else	603
599	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	604	// allocate larger arrays on the heap
600	#endif	605	if (count > STACK_HES)
		606	{
		607	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		608	hes = (HE **)SvPVX (sv);
		609	}
601		610
602	i = 0;	611	i = 0;
603	while ((he = hv_iternext (hv)))	612	while ((he = hv_iternext (hv)))
604	{	613	{
605	hes [i++] = he;	614	hes [i++] = he;
…		…
680	SvGETMAGIC (sv);	689	SvGETMAGIC (sv);
681	svt = SvTYPE (sv);	690	svt = SvTYPE (sv);
682		691
683	if (expect_false (SvOBJECT (sv)))	692	if (expect_false (SvOBJECT (sv)))
684	{	693	{
685	HV *stash = !JSON_SLOW \|\| json_boolean_stash	694	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
686	? json_boolean_stash	695	? types_boolean_stash
687	: gv_stashpv ("JSON::XS::Boolean", 1);	696	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		697	HV *stash = SvSTASH (sv);
688		698
689	if (SvSTASH (sv) == stash)	699	if (stash == boolean_stash)
690	{	700	{
691	if (SvIV (sv))	701	if (SvIV (sv))
692	encode_str (enc, "true", 4, 0);	702	encode_str (enc, "true", 4, 0);
693	else	703	else
694	encode_str (enc, "false", 5, 0);	704	encode_str (enc, "false", 5, 0);
695	}	705	}
696	else	706	else if (enc->json.flags & F_CONV_BLESSED)
697	{	707	{
698	#if 0	708	GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0);
699	if (0 && sv_derived_from (rv, "JSON::Literal"))	709
700	{	710	if (to_json)
701	// not yet
702	}	711	{
703	#endif
704	if (enc->json.flags & F_CONV_BLESSED)
705	{	712	dSP;
		713
		714	ENTER; SAVETMPS; PUSHMARK (SP);
706	// 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
707	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
708
709	if (to_json)
710	{
711	dSP;
712
713	ENTER; SAVETMPS; PUSHMARK (SP);
714	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	716	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
715		717
716	// 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
717	PUTBACK;	719	PUTBACK;
718	call_sv ((SV *)GvCV (to_json), G_SCALAR);	720	call_sv ((SV *)GvCV (to_json), G_SCALAR);
719	SPAGAIN;	721	SPAGAIN;
720		722
721	// catch this surprisingly common error	723	// catch this surprisingly common error
722	if (SvROK (TOPs) && SvRV (TOPs) == sv)	724	if (SvROK (TOPs) && SvRV (TOPs) == sv)
723	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)));
724		726
725	sv = POPs;	727	sv = POPs;
726	PUTBACK;	728	PUTBACK;
727		729
728	encode_sv (enc, sv);	730	encode_sv (enc, sv);
729		731
730	FREETMPS; LEAVE;	732	FREETMPS; LEAVE;
731	}
732	else if (enc->json.flags & F_ALLOW_BLESSED)
733	encode_str (enc, "null", 4, 0);
734	else
735	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
736	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
737	}	733	}
738	else if (enc->json.flags & F_ALLOW_BLESSED)	734	else if (enc->json.flags & F_ALLOW_BLESSED)
739	encode_str (enc, "null", 4, 0);	735	encode_str (enc, "null", 4, 0);
740	else	736	else
741	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",
742	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	738	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
743	}	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))));
744	}	795	}
745	else if (svt == SVt_PVHV)	796	else if (svt == SVt_PVHV)
746	encode_hv (enc, (HV *)sv);	797	encode_hv (enc, (HV *)sv);
747	else if (svt == SVt_PVAV)	798	else if (svt == SVt_PVAV)
748	encode_av (enc, (AV *)sv);	799	encode_av (enc, (AV *)sv);
…		…
824	}	875	}
825	else	876	else
826	{	877	{
827	// large integer, use the (rather slow) snprintf way.	878	// large integer, use the (rather slow) snprintf way.
828	need (enc, IVUV_MAXCHARS);	879	need (enc, IVUV_MAXCHARS);
829	enc->cur +=	880	enc->cur +=
830	SvIsUV(sv)	881	SvIsUV(sv)
831	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	882	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	883	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833	}	884	}
834	}	885	}
835	else if (SvROK (sv))	886	else if (SvROK (sv))
836	encode_rv (enc, SvRV (sv));	887	encode_rv (enc, SvRV (sv));
837	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	888	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
838	encode_str (enc, "null", 4, 0);	889	encode_str (enc, "null", 4, 0);
839	else	890	else
840	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",
841	SvPV_nolen (sv), SvFLAGS (sv));	892	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
842	}	893	}
843		894
844	static SV *	895	static SV *
845	encode_json (SV scalar, JSON json)	896	encode_json (SV scalar, JSON json)
846	{	897	{
…		…
1258	if (*dec->cur == ']')	1309	if (*dec->cur == ']')
1259	{	1310	{
1260	++dec->cur;	1311	++dec->cur;
1261	break;	1312	break;
1262	}	1313	}
1263		1314
1264	if (*dec->cur != ',')	1315	if (*dec->cur != ',')
1265	ERR (", or ] expected while parsing array");	1316	ERR (", or ] expected while parsing array");
1266		1317
1267	++dec->cur;	1318	++dec->cur;
1268		1319
…		…
1450	DEC_DEC_DEPTH;	1501	DEC_DEC_DEPTH;
1451	return 0;	1502	return 0;
1452	}	1503	}
1453		1504
1454	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 *
1455	decode_sv (dec_t *dec)	1582	decode_sv (dec_t *dec)
1456	{	1583	{
1457	// the beauty of JSON: you need exactly one character lookahead	1584	// the beauty of JSON: you need exactly one character lookahead
1458	// to parse everything.	1585	// to parse everything.
1459	switch (*dec->cur)	1586	switch (*dec->cur)
1460	{	1587	{
1461	case '"': ++dec->cur; return decode_str (dec);	1588	case '"': ++dec->cur; return decode_str (dec);
1462	case '[': ++dec->cur; return decode_av (dec);	1589	case '[': ++dec->cur; return decode_av (dec);
1463	case '{': ++dec->cur; return decode_hv (dec);	1590	case '{': ++dec->cur; return decode_hv (dec);
		1591	case '(': return decode_tag (dec);
1464		1592
1465	case '-':	1593	case '-':
1466	case '0': case '1': case '2': case '3': case '4':	1594	case '0': case '1': case '2': case '3': case '4':
1467	case '5': case '6': case '7': case '8': case '9':	1595	case '5': case '6': case '7': case '8': case '9':
1468	return decode_num (dec);	1596	return decode_num (dec);
…		…
1470	case 't':	1598	case 't':
1471	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1599	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1472	{	1600	{
1473	dec->cur += 4;	1601	dec->cur += 4;
1474	#if JSON_SLOW	1602	#if JSON_SLOW
1475	json_true = get_bool ("JSON::XS::true");	1603	types_true = get_bool ("Types::Serialiser::true");
1476	#endif	1604	#endif
1477	return newSVsv (json_true);	1605	return newSVsv (types_true);
1478	}	1606	}
1479	else	1607	else
1480	ERR ("'true' expected");	1608	ERR ("'true' expected");
1481		1609
1482	break;	1610	break;
…		…
1484	case 'f':	1612	case 'f':
1485	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1613	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1486	{	1614	{
1487	dec->cur += 5;	1615	dec->cur += 5;
1488	#if JSON_SLOW	1616	#if JSON_SLOW
1489	json_false = get_bool ("JSON::XS::false");	1617	types_false = get_bool ("Types::Serialiser::false");
1490	#endif	1618	#endif
1491	return newSVsv (json_false);	1619	return newSVsv (types_false);
1492	}	1620	}
1493	else	1621	else
1494	ERR ("'false' expected");	1622	ERR ("'false' expected");
1495		1623
1496	break;	1624	break;
…		…
1505	ERR ("'null' expected");	1633	ERR ("'null' expected");
1506		1634
1507	break;	1635	break;
1508		1636
1509	default:	1637	default:
1510	ERR ("malformed JSON string, neither array, object, number, string or atom");	1638	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1511	break;	1639	break;
1512	}	1640	}
1513		1641
1514	fail:	1642	fail:
1515	return 0;	1643	return 0;
…		…
1520	{	1648	{
1521	dec_t dec;	1649	dec_t dec;
1522	SV *sv;	1650	SV *sv;
1523		1651
1524	/* work around bugs in 5.10 where manipulating magic values	1652	/* work around bugs in 5.10 where manipulating magic values
1525	* will perl ignore the magic in subsequent accesses.	1653	* makes perl ignore the magic in subsequent accesses.
1526	* also make a copy of non-PV values, to get them into a clean	1654	* also make a copy of non-PV values, to get them into a clean
1527	* state (SvPV should do that, but it's buggy, see below).	1655	* state (SvPV should do that, but it's buggy, see below).
1528	*/	1656	*/
1529	/SvGETMAGIC (string);/	1657	/SvGETMAGIC (string);/
1530	if (SvMAGICAL (string) \|\| !SvPOK (string))	1658	if (SvMAGICAL (string) \|\| !SvPOK (string))
…		…
1604	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);
1605	LEAVE;	1733	LEAVE;
1606		1734
1607	croak ("%s, at character offset %d (before \"%s\")",	1735	croak ("%s, at character offset %d (before \"%s\")",
1608	dec.err,	1736	dec.err,
1609	ptr_to_index (string, dec.cur),	1737	(int)ptr_to_index (string, dec.cur),
1610	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1738	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1611	}	1739	}
1612		1740
1613	sv = sv_2mortal (sv);	1741	sv = sv_2mortal (sv);
1614		1742
…		…
1742	self->incr_mode = INCR_M_STR;	1870	self->incr_mode = INCR_M_STR;
1743	goto incr_m_str;	1871	goto incr_m_str;
1744		1872
1745	case '[':	1873	case '[':
1746	case '{':	1874	case '{':
		1875	case '(':
1747	if (++self->incr_nest > self->max_depth)	1876	if (++self->incr_nest > self->max_depth)
1748	croak (ERR_NESTING_EXCEEDED);	1877	croak (ERR_NESTING_EXCEEDED);
1749	break;	1878	break;
1750		1879
1751	case ']':	1880	case ']':
1752	case '}':	1881	case '}':
1753	if (--self->incr_nest <= 0)	1882	if (--self->incr_nest <= 0)
1754	goto interrupt;	1883	goto interrupt;
		1884	break;
		1885
		1886	case ')':
		1887	--self->incr_nest;
1755	break;	1888	break;
1756		1889
1757	case '#':	1890	case '#':
1758	self->incr_mode = INCR_M_C1;	1891	self->incr_mode = INCR_M_C1;
1759	goto incr_m_c;	1892	goto incr_m_c;
…		…
1785	i >= '0' && i <= '9' ? i - '0'	1918	i >= '0' && i <= '9' ? i - '0'
1786	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1919	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1787	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1920	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1788	: -1;	1921	: -1;
1789		1922
1790	json_stash = gv_stashpv ("JSON::XS" , 1);	1923	json_stash = gv_stashpv ("JSON::XS" , 1);
1791	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1924	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1792		1925
1793	json_true = get_bool ("JSON::XS::true");	1926	types_true = get_bool ("Types::Serialiser::true");
1794	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);
1795		1931
1796	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 */
1797	}	1933	}
1798		1934
1799	PROTOTYPES: DISABLE	1935	PROTOTYPES: DISABLE
1800		1936
1801	void CLONE (...)	1937	void CLONE (...)
1802	CODE:	1938	CODE:
1803	json_stash = 0;	1939	json_stash = 0;
1804	json_boolean_stash = 0;	1940	types_boolean_stash = 0;
1805		1941
1806	void new (char *klass)	1942	void new (char *klass)
1807	PPCODE:	1943	PPCODE:
1808	{	1944	{
1809	SV *pv = NEWSV (0, sizeof (JSON));	1945	SV *pv = NEWSV (0, sizeof (JSON));
1810	SvPOK_only (pv);	1946	SvPOK_only (pv);
1811	json_init ((JSON *)SvPVX (pv));	1947	json_init ((JSON *)SvPVX (pv));
1812	XPUSHs (sv_2mortal (sv_bless (	1948	XPUSHs (sv_2mortal (sv_bless (
1813	newRV_noinc (pv),	1949	newRV_noinc (pv),
1814	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1950	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1829	shrink = F_SHRINK	1965	shrink = F_SHRINK
1830	allow_blessed = F_ALLOW_BLESSED	1966	allow_blessed = F_ALLOW_BLESSED
1831	convert_blessed = F_CONV_BLESSED	1967	convert_blessed = F_CONV_BLESSED
1832	relaxed = F_RELAXED	1968	relaxed = F_RELAXED
1833	allow_unknown = F_ALLOW_UNKNOWN	1969	allow_unknown = F_ALLOW_UNKNOWN
		1970	allow_tags = F_ALLOW_TAGS
1834	PPCODE:	1971	PPCODE:
1835	{	1972	{
1836	if (enable)	1973	if (enable)
1837	self->flags \|= ix;	1974	self->flags \|= ix;
1838	else	1975	else
…		…
1854	get_shrink = F_SHRINK	1991	get_shrink = F_SHRINK
1855	get_allow_blessed = F_ALLOW_BLESSED	1992	get_allow_blessed = F_ALLOW_BLESSED
1856	get_convert_blessed = F_CONV_BLESSED	1993	get_convert_blessed = F_CONV_BLESSED
1857	get_relaxed = F_RELAXED	1994	get_relaxed = F_RELAXED
1858	get_allow_unknown = F_ALLOW_UNKNOWN	1995	get_allow_unknown = F_ALLOW_UNKNOWN
		1996	get_allow_tags = F_ALLOW_TAGS
1859	PPCODE:	1997	PPCODE:
1860	XPUSHs (boolSV (self->flags & ix));	1998	XPUSHs (boolSV (self->flags & ix));
1861		1999
1862	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	2000	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1863	PPCODE:	2001	PPCODE:
…		…
1891	}	2029	}
1892		2030
1893	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)
1894	PPCODE:	2032	PPCODE:
1895	{	2033	{
1896	if (!self->cb_sk_object)	2034	if (!self->cb_sk_object)
1897	self->cb_sk_object = newHV ();	2035	self->cb_sk_object = newHV ();
1898		2036
1899	if (SvOK (cb))	2037	if (SvOK (cb))
1900	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2038	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1901	else	2039	else
…		…
1912	XPUSHs (ST (0));	2050	XPUSHs (ST (0));
1913	}	2051	}
1914		2052
1915	void encode (JSON self, SV scalar)	2053	void encode (JSON self, SV scalar)
1916	PPCODE:	2054	PPCODE:
1917	XPUSHs (encode_json (scalar, self));	2055	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2056	XPUSHs (scalar);
1918		2057
1919	void decode (JSON self, SV jsonstr)	2058	void decode (JSON self, SV jsonstr)
1920	PPCODE:	2059	PPCODE:
1921	XPUSHs (decode_json (jsonstr, self, 0));	2060	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2061	XPUSHs (jsonstr);
1922		2062
1923	void decode_prefix (JSON self, SV jsonstr)	2063	void decode_prefix (JSON self, SV jsonstr)
1924	PPCODE:	2064	PPCODE:
1925	{	2065	{
		2066	SV *sv;
1926	char *offset;	2067	char *offset;
		2068	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1927	EXTEND (SP, 2);	2069	EXTEND (SP, 2);
1928	PUSHs (decode_json (jsonstr, self, &offset));	2070	PUSHs (sv);
1929	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2071	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1930	}	2072	}
1931		2073
1932	void incr_parse (JSON self, SV jsonstr = 0)	2074	void incr_parse (JSON self, SV jsonstr = 0)
1933	PPCODE:	2075	PPCODE:
…		…
1980	}	2122	}
1981		2123
1982	if (GIMME_V != G_VOID)	2124	if (GIMME_V != G_VOID)
1983	do	2125	do
1984	{	2126	{
		2127	SV *sv;
1985	char *offset;	2128	char *offset;
1986		2129
1987	if (!INCR_DONE (self))	2130	if (!INCR_DONE (self))
1988	{	2131	{
1989	incr_parse (self);	2132	incr_parse (self);
…		…
1991	if (self->incr_pos > self->max_size && self->max_size)	2134	if (self->incr_pos > self->max_size && self->max_size)
1992	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",
1993	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2136	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1994		2137
1995	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
1996	break;	2147	break;
		2148	}
1997	}	2149	}
1998		2150
1999	XPUSHs (decode_json (self->incr_text, self, &offset));	2151	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2152	XPUSHs (sv);
2000		2153
2001	self->incr_pos -= offset - SvPVX (self->incr_text);	2154	self->incr_pos -= offset - SvPVX (self->incr_text);
2002	self->incr_nest = 0;	2155	self->incr_nest = 0;
2003	self->incr_mode = 0;	2156	self->incr_mode = 0;
2004		2157
…		…
2048	SvREFCNT_dec (self->incr_text);	2201	SvREFCNT_dec (self->incr_text);
2049		2202
2050	PROTOTYPES: ENABLE	2203	PROTOTYPES: ENABLE
2051		2204
2052	void encode_json (SV *scalar)	2205	void encode_json (SV *scalar)
2053	ALIAS:
2054	to_json_ = 0
2055	encode_json = F_UTF8
2056	PPCODE:	2206	PPCODE:
2057	{	2207	{
2058	JSON json;	2208	JSON json;
2059	json_init (&json);	2209	json_init (&json);
2060	json.flags \|= ix;	2210	json.flags \|= F_UTF8;
2061	XPUSHs (encode_json (scalar, &json));	2211	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2212	XPUSHs (scalar);
2062	}	2213	}
2063		2214
2064	void decode_json (SV *jsonstr)	2215	void decode_json (SV *jsonstr)
2065	ALIAS:
2066	from_json_ = 0
2067	decode_json = F_UTF8
2068	PPCODE:	2216	PPCODE:
2069	{	2217	{
2070	JSON json;	2218	JSON json;
2071	json_init (&json);	2219	json_init (&json);
2072	json.flags \|= ix;	2220	json.flags \|= F_UTF8;
2073	XPUSHs (decode_json (jsonstr, &json, 0));	2221	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2222	XPUSHs (jsonstr);
2074	}	2223	}
2075		2224

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.109 by root, Tue Mar 8 10:18:50 2011 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.109 by root, Tue Mar 8 10:18:50 2011 UTC vs.
Revision 1.119 by root, Mon Oct 28 23:19:54 2013 UTC