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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.111 by root, Wed Jul 27 15:53:40 2011 UTC vs.
Revision 1.121 by root, Tue Oct 29 00:06:40 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
…		…
480		484
481	if (enc->indent >= enc->json.max_depth)	485	if (enc->indent >= enc->json.max_depth)
482	croak (ERR_NESTING_EXCEEDED);	486	croak (ERR_NESTING_EXCEEDED);
483		487
484	encode_ch (enc, '[');	488	encode_ch (enc, '[');
485		489
486	if (len >= 0)	490	if (len >= 0)
487	{	491	{
488	encode_nl (enc); ++enc->indent;	492	encode_nl (enc); ++enc->indent;
489		493
490	for (i = 0; i <= len; ++i)	494	for (i = 0; i <= len; ++i)
…		…
502	encode_comma (enc);	506	encode_comma (enc);
503	}	507	}
504		508
505	encode_nl (enc); --enc->indent; encode_indent (enc);	509	encode_nl (enc); --enc->indent; encode_indent (enc);
506	}	510	}
507		511
508	encode_ch (enc, ']');	512	encode_ch (enc, ']');
509	}	513	}
510		514
511	static void	515	static void
512	encode_hk (enc_t enc, HE he)	516	encode_hk (enc_t enc, HE he)
…		…
516	if (HeKLEN (he) == HEf_SVKEY)	520	if (HeKLEN (he) == HEf_SVKEY)
517	{	521	{
518	SV *sv = HeSVKEY (he);	522	SV *sv = HeSVKEY (he);
519	STRLEN len;	523	STRLEN len;
520	char *str;	524	char *str;
521		525
522	SvGETMAGIC (sv);	526	SvGETMAGIC (sv);
523	str = SvPV (sv, len);	527	str = SvPV (sv, len);
524		528
525	encode_str (enc, str, len, SvUTF8 (sv));	529	encode_str (enc, str, len, SvUTF8 (sv));
526	}	530	}
…		…
592	}	596	}
593		597
594	if (count)	598	if (count)
595	{	599	{
596	int i, fast = 1;	600	int i, fast = 1;
597	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	601	HE *hes_stack [STACK_HES];
598	HE *hes = _alloca (count sizeof (HE));	602	HE **hes = hes_stack;
599	#else	603
600	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	604	// allocate larger arrays on the heap
601	#endif	605	if (count > STACK_HES)
		606	{
		607	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		608	hes = (HE **)SvPVX (sv);
		609	}
602		610
603	i = 0;	611	i = 0;
604	while ((he = hv_iternext (hv)))	612	while ((he = hv_iternext (hv)))
605	{	613	{
606	hes [i++] = he;	614	hes [i++] = he;
…		…
675	// encode objects, arrays and special \0=false and \1=true values.	683	// encode objects, arrays and special \0=false and \1=true values.
676	static void	684	static void
677	encode_rv (enc_t enc, SV sv)	685	encode_rv (enc_t enc, SV sv)
678	{	686	{
679	svtype svt;	687	svtype svt;
		688	GV *method;
680		689
681	SvGETMAGIC (sv);	690	SvGETMAGIC (sv);
682	svt = SvTYPE (sv);	691	svt = SvTYPE (sv);
683		692
684	if (expect_false (SvOBJECT (sv)))	693	if (expect_false (SvOBJECT (sv)))
685	{	694	{
686	HV *stash = !JSON_SLOW \|\| json_boolean_stash	695	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
687	? json_boolean_stash	696	? types_boolean_stash
688	: gv_stashpv ("JSON::XS::Boolean", 1);	697	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		698	HV *stash = SvSTASH (sv);
689		699
690	if (SvSTASH (sv) == stash)	700	if (stash == boolean_stash)
691	{	701	{
692	if (SvIV (sv))	702	if (SvIV (sv))
693	encode_str (enc, "true", 4, 0);	703	encode_str (enc, "true", 4, 0);
694	else	704	else
695	encode_str (enc, "false", 5, 0);	705	encode_str (enc, "false", 5, 0);
696	}	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);
697	else	773	else
698	{
699	#if 0
700	if (0 && sv_derived_from (rv, "JSON::Literal"))
701	{
702	// not yet
703	}
704	#endif
705	if (enc->json.flags & F_CONV_BLESSED)
706	{
707	// we re-bless the reference to get overload and other niceties right
708	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
709
710	if (to_json)
711	{
712	dSP;
713
714	ENTER; SAVETMPS; PUSHMARK (SP);
715	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
716
717	// calling with G_SCALAR ensures that we always get a 1 return value
718	PUTBACK;
719	call_sv ((SV *)GvCV (to_json), G_SCALAR);
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	sv = POPs;
727	PUTBACK;
728
729	encode_sv (enc, sv);
730
731	FREETMPS; LEAVE;
732	}
733	else if (enc->json.flags & F_ALLOW_BLESSED)
734	encode_str (enc, "null", 4, 0);
735	else
736	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
737	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
738	}
739	else if (enc->json.flags & F_ALLOW_BLESSED)
740	encode_str (enc, "null", 4, 0);
741	else
742	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)",
743	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	775	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744	}
745	}	776	}
746	else if (svt == SVt_PVHV)	777	else if (svt == SVt_PVHV)
747	encode_hv (enc, (HV *)sv);	778	encode_hv (enc, (HV *)sv);
748	else if (svt == SVt_PVAV)	779	else if (svt == SVt_PVAV)
749	encode_av (enc, (AV *)sv);	780	encode_av (enc, (AV *)sv);
…		…
825	}	856	}
826	else	857	else
827	{	858	{
828	// large integer, use the (rather slow) snprintf way.	859	// large integer, use the (rather slow) snprintf way.
829	need (enc, IVUV_MAXCHARS);	860	need (enc, IVUV_MAXCHARS);
830	enc->cur +=	861	enc->cur +=
831	SvIsUV(sv)	862	SvIsUV(sv)
832	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	863	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	864	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834	}	865	}
835	}	866	}
836	else if (SvROK (sv))	867	else if (SvROK (sv))
837	encode_rv (enc, SvRV (sv));	868	encode_rv (enc, SvRV (sv));
838	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	869	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
839	encode_str (enc, "null", 4, 0);	870	encode_str (enc, "null", 4, 0);
840	else	871	else
841	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",
842	SvPV_nolen (sv), SvFLAGS (sv));	873	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843	}	874	}
844		875
845	static SV *	876	static SV *
846	encode_json (SV scalar, JSON json)	877	encode_json (SV scalar, JSON json)
847	{	878	{
…		…
1259	if (*dec->cur == ']')	1290	if (*dec->cur == ']')
1260	{	1291	{
1261	++dec->cur;	1292	++dec->cur;
1262	break;	1293	break;
1263	}	1294	}
1264		1295
1265	if (*dec->cur != ',')	1296	if (*dec->cur != ',')
1266	ERR (", or ] expected while parsing array");	1297	ERR (", or ] expected while parsing array");
1267		1298
1268	++dec->cur;	1299	++dec->cur;
1269		1300
…		…
1451	DEC_DEC_DEPTH;	1482	DEC_DEC_DEPTH;
1452	return 0;	1483	return 0;
1453	}	1484	}
1454		1485
1455	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	decode_ws (dec);
		1498
		1499	tag = decode_sv (dec);
		1500	if (!tag)
		1501	goto fail;
		1502
		1503	if (!SvPOK (tag))
		1504	ERR ("malformed JSON string, (tag) must be a string");
		1505
		1506	decode_ws (dec);
		1507
		1508	if (*dec->cur != ')')
		1509	ERR (") expected after tag");
		1510
		1511	++dec->cur;
		1512
		1513	decode_ws (dec);
		1514
		1515	val = decode_sv (dec);
		1516	if (!val)
		1517	goto fail;
		1518
		1519	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1520	ERR ("malformed JSON string, tag value must be an array");
		1521
		1522	{
		1523	AV av = (AV )SvRV (val);
		1524	int i, len = av_len (av) + 1;
		1525	HV *stash = gv_stashsv (tag, 0);
		1526	SV *sv;
		1527
		1528	if (!stash)
		1529	ERR ("cannot decode perl-object (package does not exist)");
		1530
		1531	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1532
		1533	if (!method)
		1534	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1535
		1536	dSP;
		1537
		1538	ENTER; SAVETMPS; PUSHMARK (SP);
		1539	EXTEND (SP, len + 2);
		1540	// we re-bless the reference to get overload and other niceties right
		1541	PUSHs (tag);
		1542	PUSHs (sv_json);
		1543
		1544	for (i = 0; i < len; ++i)
		1545	PUSHs (*av_fetch (av, i, 1));
		1546
		1547	PUTBACK;
		1548	call_sv ((SV *)GvCV (method), G_SCALAR);
		1549	SPAGAIN;
		1550
		1551	SvREFCNT_dec (tag);
		1552	SvREFCNT_dec (val);
		1553	sv = SvREFCNT_inc (POPs);
		1554
		1555	PUTBACK;
		1556
		1557	FREETMPS; LEAVE;
		1558
		1559	return sv;
		1560	}
		1561
		1562	fail:
		1563	SvREFCNT_dec (tag);
		1564	SvREFCNT_dec (val);
		1565	return 0;
		1566	}
		1567
		1568	static SV *
1456	decode_sv (dec_t *dec)	1569	decode_sv (dec_t *dec)
1457	{	1570	{
1458	// the beauty of JSON: you need exactly one character lookahead	1571	// the beauty of JSON: you need exactly one character lookahead
1459	// to parse everything.	1572	// to parse everything.
1460	switch (*dec->cur)	1573	switch (*dec->cur)
1461	{	1574	{
1462	case '"': ++dec->cur; return decode_str (dec);	1575	case '"': ++dec->cur; return decode_str (dec);
1463	case '[': ++dec->cur; return decode_av (dec);	1576	case '[': ++dec->cur; return decode_av (dec);
1464	case '{': ++dec->cur; return decode_hv (dec);	1577	case '{': ++dec->cur; return decode_hv (dec);
		1578	case '(': return decode_tag (dec);
1465		1579
1466	case '-':	1580	case '-':
1467	case '0': case '1': case '2': case '3': case '4':	1581	case '0': case '1': case '2': case '3': case '4':
1468	case '5': case '6': case '7': case '8': case '9':	1582	case '5': case '6': case '7': case '8': case '9':
1469	return decode_num (dec);	1583	return decode_num (dec);
…		…
1471	case 't':	1585	case 't':
1472	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1586	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473	{	1587	{
1474	dec->cur += 4;	1588	dec->cur += 4;
1475	#if JSON_SLOW	1589	#if JSON_SLOW
1476	json_true = get_bool ("JSON::XS::true");	1590	types_true = get_bool ("Types::Serialiser::true");
1477	#endif	1591	#endif
1478	return newSVsv (json_true);	1592	return newSVsv (types_true);
1479	}	1593	}
1480	else	1594	else
1481	ERR ("'true' expected");	1595	ERR ("'true' expected");
1482		1596
1483	break;	1597	break;
…		…
1485	case 'f':	1599	case 'f':
1486	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1600	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1487	{	1601	{
1488	dec->cur += 5;	1602	dec->cur += 5;
1489	#if JSON_SLOW	1603	#if JSON_SLOW
1490	json_false = get_bool ("JSON::XS::false");	1604	types_false = get_bool ("Types::Serialiser::false");
1491	#endif	1605	#endif
1492	return newSVsv (json_false);	1606	return newSVsv (types_false);
1493	}	1607	}
1494	else	1608	else
1495	ERR ("'false' expected");	1609	ERR ("'false' expected");
1496		1610
1497	break;	1611	break;
…		…
1506	ERR ("'null' expected");	1620	ERR ("'null' expected");
1507		1621
1508	break;	1622	break;
1509		1623
1510	default:	1624	default:
1511	ERR ("malformed JSON string, neither array, object, number, string or atom");	1625	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512	break;	1626	break;
1513	}	1627	}
1514		1628
1515	fail:	1629	fail:
1516	return 0;	1630	return 0;
…		…
1521	{	1635	{
1522	dec_t dec;	1636	dec_t dec;
1523	SV *sv;	1637	SV *sv;
1524		1638
1525	/* work around bugs in 5.10 where manipulating magic values	1639	/* work around bugs in 5.10 where manipulating magic values
1526	* will perl ignore the magic in subsequent accesses.	1640	* makes perl ignore the magic in subsequent accesses.
1527	* also make a copy of non-PV values, to get them into a clean	1641	* also make a copy of non-PV values, to get them into a clean
1528	* state (SvPV should do that, but it's buggy, see below).	1642	* state (SvPV should do that, but it's buggy, see below).
1529	*/	1643	*/
1530	/SvGETMAGIC (string);/	1644	/SvGETMAGIC (string);/
1531	if (SvMAGICAL (string) \|\| !SvPOK (string))	1645	if (SvMAGICAL (string) \|\| !SvPOK (string))
…		…
1605	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1719	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1606	LEAVE;	1720	LEAVE;
1607		1721
1608	croak ("%s, at character offset %d (before \"%s\")",	1722	croak ("%s, at character offset %d (before \"%s\")",
1609	dec.err,	1723	dec.err,
1610	ptr_to_index (string, dec.cur),	1724	(int)ptr_to_index (string, dec.cur),
1611	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1725	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612	}	1726	}
1613		1727
1614	sv = sv_2mortal (sv);	1728	sv = sv_2mortal (sv);
1615		1729
…		…
1743	self->incr_mode = INCR_M_STR;	1857	self->incr_mode = INCR_M_STR;
1744	goto incr_m_str;	1858	goto incr_m_str;
1745		1859
1746	case '[':	1860	case '[':
1747	case '{':	1861	case '{':
		1862	case '(':
1748	if (++self->incr_nest > self->max_depth)	1863	if (++self->incr_nest > self->max_depth)
1749	croak (ERR_NESTING_EXCEEDED);	1864	croak (ERR_NESTING_EXCEEDED);
1750	break;	1865	break;
1751		1866
1752	case ']':	1867	case ']':
1753	case '}':	1868	case '}':
1754	if (--self->incr_nest <= 0)	1869	if (--self->incr_nest <= 0)
1755	goto interrupt;	1870	goto interrupt;
		1871	break;
		1872
		1873	case ')':
		1874	--self->incr_nest;
1756	break;	1875	break;
1757		1876
1758	case '#':	1877	case '#':
1759	self->incr_mode = INCR_M_C1;	1878	self->incr_mode = INCR_M_C1;
1760	goto incr_m_c;	1879	goto incr_m_c;
…		…
1786	i >= '0' && i <= '9' ? i - '0'	1905	i >= '0' && i <= '9' ? i - '0'
1787	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1906	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1788	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1907	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1789	: -1;	1908	: -1;
1790		1909
1791	json_stash = gv_stashpv ("JSON::XS" , 1);	1910	json_stash = gv_stashpv ("JSON::XS" , 1);
1792	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1911	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1793		1912
1794	json_true = get_bool ("JSON::XS::true");	1913	types_true = get_bool ("Types::Serialiser::true");
1795	json_false = get_bool ("JSON::XS::false");	1914	types_false = get_bool ("Types::Serialiser::false");
		1915
		1916	sv_json = newSVpv ("JSON", 0);
		1917	SvREADONLY_on (sv_json);
1796		1918
1797	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1919	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798	}	1920	}
1799		1921
1800	PROTOTYPES: DISABLE	1922	PROTOTYPES: DISABLE
1801		1923
1802	void CLONE (...)	1924	void CLONE (...)
1803	CODE:	1925	CODE:
1804	json_stash = 0;	1926	json_stash = 0;
1805	json_boolean_stash = 0;	1927	types_boolean_stash = 0;
1806		1928
1807	void new (char *klass)	1929	void new (char *klass)
1808	PPCODE:	1930	PPCODE:
1809	{	1931	{
1810	SV *pv = NEWSV (0, sizeof (JSON));	1932	SV *pv = NEWSV (0, sizeof (JSON));
1811	SvPOK_only (pv);	1933	SvPOK_only (pv);
1812	json_init ((JSON *)SvPVX (pv));	1934	json_init ((JSON *)SvPVX (pv));
1813	XPUSHs (sv_2mortal (sv_bless (	1935	XPUSHs (sv_2mortal (sv_bless (
1814	newRV_noinc (pv),	1936	newRV_noinc (pv),
1815	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1937	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1830	shrink = F_SHRINK	1952	shrink = F_SHRINK
1831	allow_blessed = F_ALLOW_BLESSED	1953	allow_blessed = F_ALLOW_BLESSED
1832	convert_blessed = F_CONV_BLESSED	1954	convert_blessed = F_CONV_BLESSED
1833	relaxed = F_RELAXED	1955	relaxed = F_RELAXED
1834	allow_unknown = F_ALLOW_UNKNOWN	1956	allow_unknown = F_ALLOW_UNKNOWN
		1957	allow_tags = F_ALLOW_TAGS
1835	PPCODE:	1958	PPCODE:
1836	{	1959	{
1837	if (enable)	1960	if (enable)
1838	self->flags \|= ix;	1961	self->flags \|= ix;
1839	else	1962	else
…		…
1855	get_shrink = F_SHRINK	1978	get_shrink = F_SHRINK
1856	get_allow_blessed = F_ALLOW_BLESSED	1979	get_allow_blessed = F_ALLOW_BLESSED
1857	get_convert_blessed = F_CONV_BLESSED	1980	get_convert_blessed = F_CONV_BLESSED
1858	get_relaxed = F_RELAXED	1981	get_relaxed = F_RELAXED
1859	get_allow_unknown = F_ALLOW_UNKNOWN	1982	get_allow_unknown = F_ALLOW_UNKNOWN
		1983	get_allow_tags = F_ALLOW_TAGS
1860	PPCODE:	1984	PPCODE:
1861	XPUSHs (boolSV (self->flags & ix));	1985	XPUSHs (boolSV (self->flags & ix));
1862		1986
1863	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	1987	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864	PPCODE:	1988	PPCODE:
…		…
1892	}	2016	}
1893		2017
1894	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2018	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1895	PPCODE:	2019	PPCODE:
1896	{	2020	{
1897	if (!self->cb_sk_object)	2021	if (!self->cb_sk_object)
1898	self->cb_sk_object = newHV ();	2022	self->cb_sk_object = newHV ();
1899		2023
1900	if (SvOK (cb))	2024	if (SvOK (cb))
1901	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2025	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902	else	2026	else
…		…
1913	XPUSHs (ST (0));	2037	XPUSHs (ST (0));
1914	}	2038	}
1915		2039
1916	void encode (JSON self, SV scalar)	2040	void encode (JSON self, SV scalar)
1917	PPCODE:	2041	PPCODE:
1918	XPUSHs (encode_json (scalar, self));	2042	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2043	XPUSHs (scalar);
1919		2044
1920	void decode (JSON self, SV jsonstr)	2045	void decode (JSON self, SV jsonstr)
1921	PPCODE:	2046	PPCODE:
1922	XPUSHs (decode_json (jsonstr, self, 0));	2047	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2048	XPUSHs (jsonstr);
1923		2049
1924	void decode_prefix (JSON self, SV jsonstr)	2050	void decode_prefix (JSON self, SV jsonstr)
1925	PPCODE:	2051	PPCODE:
1926	{	2052	{
		2053	SV *sv;
1927	char *offset;	2054	char *offset;
		2055	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928	EXTEND (SP, 2);	2056	EXTEND (SP, 2);
1929	PUSHs (decode_json (jsonstr, self, &offset));	2057	PUSHs (sv);
1930	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2058	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1931	}	2059	}
1932		2060
1933	void incr_parse (JSON self, SV jsonstr = 0)	2061	void incr_parse (JSON self, SV jsonstr = 0)
1934	PPCODE:	2062	PPCODE:
…		…
1981	}	2109	}
1982		2110
1983	if (GIMME_V != G_VOID)	2111	if (GIMME_V != G_VOID)
1984	do	2112	do
1985	{	2113	{
		2114	SV *sv;
1986	char *offset;	2115	char *offset;
1987		2116
1988	if (!INCR_DONE (self))	2117	if (!INCR_DONE (self))
1989	{	2118	{
1990	incr_parse (self);	2119	incr_parse (self);
…		…
1994	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2123	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1995		2124
1996	if (!INCR_DONE (self))	2125	if (!INCR_DONE (self))
1997	{	2126	{
1998	// as an optimisation, do not accumulate white space in the incr buffer	2127	// as an optimisation, do not accumulate white space in the incr buffer
1999	if (self->incr_mode == INCR_M_WS)	2128	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2129	{
		2130	self->incr_pos = 0;
2000	SvCUR_set (self->incr_text, 0);	2131	SvCUR_set (self->incr_text, 0);
		2132	}
2001		2133
2002	break;	2134	break;
2003	}	2135	}
2004	}	2136	}
2005		2137
2006	XPUSHs (decode_json (self->incr_text, self, &offset));	2138	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2139	XPUSHs (sv);
2007		2140
2008	self->incr_pos -= offset - SvPVX (self->incr_text);	2141	self->incr_pos -= offset - SvPVX (self->incr_text);
2009	self->incr_nest = 0;	2142	self->incr_nest = 0;
2010	self->incr_mode = 0;	2143	self->incr_mode = 0;
2011		2144
…		…
2055	SvREFCNT_dec (self->incr_text);	2188	SvREFCNT_dec (self->incr_text);
2056		2189
2057	PROTOTYPES: ENABLE	2190	PROTOTYPES: ENABLE
2058		2191
2059	void encode_json (SV *scalar)	2192	void encode_json (SV *scalar)
2060	ALIAS:
2061	to_json_ = 0
2062	encode_json = F_UTF8
2063	PPCODE:	2193	PPCODE:
2064	{	2194	{
2065	JSON json;	2195	JSON json;
2066	json_init (&json);	2196	json_init (&json);
2067	json.flags \|= ix;	2197	json.flags \|= F_UTF8;
2068	XPUSHs (encode_json (scalar, &json));	2198	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2199	XPUSHs (scalar);
2069	}	2200	}
2070		2201
2071	void decode_json (SV *jsonstr)	2202	void decode_json (SV *jsonstr)
2072	ALIAS:
2073	from_json_ = 0
2074	decode_json = F_UTF8
2075	PPCODE:	2203	PPCODE:
2076	{	2204	{
2077	JSON json;	2205	JSON json;
2078	json_init (&json);	2206	json_init (&json);
2079	json.flags \|= ix;	2207	json.flags \|= F_UTF8;
2080	XPUSHs (decode_json (jsonstr, &json, 0));	2208	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2209	XPUSHs (jsonstr);
2081	}	2210	}
2082		2211

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.111 by root, Wed Jul 27 15:53:40 2011 UTC vs. Revision 1.121 by root, Tue Oct 29 00:06:40 2013 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.111 by root, Wed Jul 27 15:53:40 2011 UTC vs.
Revision 1.121 by root, Tue Oct 29 00:06:40 2013 UTC