[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.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
…		…
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;
…		…
674	// encode objects, arrays and special \0=false and \1=true values.	683	// encode objects, arrays and special \0=false and \1=true values.
675	static void	684	static void
676	encode_rv (enc_t enc, SV sv)	685	encode_rv (enc_t enc, SV sv)
677	{	686	{
678	svtype svt;	687	svtype svt;
		688	GV *method;
679		689
680	SvGETMAGIC (sv);	690	SvGETMAGIC (sv);
681	svt = SvTYPE (sv);	691	svt = SvTYPE (sv);
682		692
683	if (expect_false (SvOBJECT (sv)))	693	if (expect_false (SvOBJECT (sv)))
684	{	694	{
685	HV *stash = !JSON_SLOW \|\| json_boolean_stash	695	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
686	? json_boolean_stash	696	? types_boolean_stash
687	: gv_stashpv ("JSON::XS::Boolean", 1);	697	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		698	HV *stash = SvSTASH (sv);
688		699
689	if (SvSTASH (sv) == stash)	700	if (stash == boolean_stash)
690	{	701	{
691	if (SvIV (sv))	702	if (SvIV (sv))
692	encode_str (enc, "true", 4, 0);	703	encode_str (enc, "true", 4, 0);
693	else	704	else
694	encode_str (enc, "false", 5, 0);	705	encode_str (enc, "false", 5, 0);
695	}	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);
696	else	773	else
697	{
698	#if 0
699	if (0 && sv_derived_from (rv, "JSON::Literal"))
700	{
701	// not yet
702	}
703	#endif
704	if (enc->json.flags & F_CONV_BLESSED)
705	{
706	// 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)));
715
716	// calling with G_SCALAR ensures that we always get a 1 return value
717	PUTBACK;
718	call_sv ((SV *)GvCV (to_json), G_SCALAR);
719	SPAGAIN;
720
721	// catch this surprisingly common error
722	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)));
724
725	sv = POPs;
726	PUTBACK;
727
728	encode_sv (enc, sv);
729
730	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	}
738	else if (enc->json.flags & F_ALLOW_BLESSED)
739	encode_str (enc, "null", 4, 0);
740	else
741	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)",
742	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	775	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
743	}
744	}	776	}
745	else if (svt == SVt_PVHV)	777	else if (svt == SVt_PVHV)
746	encode_hv (enc, (HV *)sv);	778	encode_hv (enc, (HV *)sv);
747	else if (svt == SVt_PVAV)	779	else if (svt == SVt_PVAV)
748	encode_av (enc, (AV *)sv);	780	encode_av (enc, (AV *)sv);
…		…
824	}	856	}
825	else	857	else
826	{	858	{
827	// large integer, use the (rather slow) snprintf way.	859	// large integer, use the (rather slow) snprintf way.
828	need (enc, IVUV_MAXCHARS);	860	need (enc, IVUV_MAXCHARS);
829	enc->cur +=	861	enc->cur +=
830	SvIsUV(sv)	862	SvIsUV(sv)
831	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	863	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	864	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833	}	865	}
834	}	866	}
835	else if (SvROK (sv))	867	else if (SvROK (sv))
836	encode_rv (enc, SvRV (sv));	868	encode_rv (enc, SvRV (sv));
837	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	869	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
838	encode_str (enc, "null", 4, 0);	870	encode_str (enc, "null", 4, 0);
839	else	871	else
840	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",
841	SvPV_nolen (sv), SvFLAGS (sv));	873	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
842	}	874	}
843		875
844	static SV *	876	static SV *
845	encode_json (SV scalar, JSON json)	877	encode_json (SV scalar, JSON json)
846	{	878	{
…		…
1258	if (*dec->cur == ']')	1290	if (*dec->cur == ']')
1259	{	1291	{
1260	++dec->cur;	1292	++dec->cur;
1261	break;	1293	break;
1262	}	1294	}
1263		1295
1264	if (*dec->cur != ',')	1296	if (*dec->cur != ',')
1265	ERR (", or ] expected while parsing array");	1297	ERR (", or ] expected while parsing array");
1266		1298
1267	++dec->cur;	1299	++dec->cur;
1268		1300
…		…
1450	DEC_DEC_DEPTH;	1482	DEC_DEC_DEPTH;
1451	return 0;	1483	return 0;
1452	}	1484	}
1453		1485
1454	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 *
1455	decode_sv (dec_t *dec)	1563	decode_sv (dec_t *dec)
1456	{	1564	{
1457	// the beauty of JSON: you need exactly one character lookahead	1565	// the beauty of JSON: you need exactly one character lookahead
1458	// to parse everything.	1566	// to parse everything.
1459	switch (*dec->cur)	1567	switch (*dec->cur)
1460	{	1568	{
1461	case '"': ++dec->cur; return decode_str (dec);	1569	case '"': ++dec->cur; return decode_str (dec);
1462	case '[': ++dec->cur; return decode_av (dec);	1570	case '[': ++dec->cur; return decode_av (dec);
1463	case '{': ++dec->cur; return decode_hv (dec);	1571	case '{': ++dec->cur; return decode_hv (dec);
		1572	case '(': return decode_tag (dec);
1464		1573
1465	case '-':	1574	case '-':
1466	case '0': case '1': case '2': case '3': case '4':	1575	case '0': case '1': case '2': case '3': case '4':
1467	case '5': case '6': case '7': case '8': case '9':	1576	case '5': case '6': case '7': case '8': case '9':
1468	return decode_num (dec);	1577	return decode_num (dec);
…		…
1470	case 't':	1579	case 't':
1471	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1580	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1472	{	1581	{
1473	dec->cur += 4;	1582	dec->cur += 4;
1474	#if JSON_SLOW	1583	#if JSON_SLOW
1475	json_true = get_bool ("JSON::XS::true");	1584	types_true = get_bool ("Types::Serialiser::true");
1476	#endif	1585	#endif
1477	return newSVsv (json_true);	1586	return newSVsv (types_true);
1478	}	1587	}
1479	else	1588	else
1480	ERR ("'true' expected");	1589	ERR ("'true' expected");
1481		1590
1482	break;	1591	break;
…		…
1484	case 'f':	1593	case 'f':
1485	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1594	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1486	{	1595	{
1487	dec->cur += 5;	1596	dec->cur += 5;
1488	#if JSON_SLOW	1597	#if JSON_SLOW
1489	json_false = get_bool ("JSON::XS::false");	1598	types_false = get_bool ("Types::Serialiser::false");
1490	#endif	1599	#endif
1491	return newSVsv (json_false);	1600	return newSVsv (types_false);
1492	}	1601	}
1493	else	1602	else
1494	ERR ("'false' expected");	1603	ERR ("'false' expected");
1495		1604
1496	break;	1605	break;
…		…
1505	ERR ("'null' expected");	1614	ERR ("'null' expected");
1506		1615
1507	break;	1616	break;
1508		1617
1509	default:	1618	default:
1510	ERR ("malformed JSON string, neither array, object, number, string or atom");	1619	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1511	break;	1620	break;
1512	}	1621	}
1513		1622
1514	fail:	1623	fail:
1515	return 0;	1624	return 0;
…		…
1520	{	1629	{
1521	dec_t dec;	1630	dec_t dec;
1522	SV *sv;	1631	SV *sv;
1523		1632
1524	/* work around bugs in 5.10 where manipulating magic values	1633	/* work around bugs in 5.10 where manipulating magic values
1525	* will perl ignore the magic in subsequent accesses.	1634	* makes perl ignore the magic in subsequent accesses.
1526	* also make a copy of non-PV values, to get them into a clean	1635	* 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).	1636	* state (SvPV should do that, but it's buggy, see below).
1528	*/	1637	*/
1529	/SvGETMAGIC (string);/	1638	/SvGETMAGIC (string);/
1530	if (SvMAGICAL (string) \|\| !SvPOK (string))	1639	if (SvMAGICAL (string) \|\| !SvPOK (string))
…		…
1604	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);
1605	LEAVE;	1714	LEAVE;
1606		1715
1607	croak ("%s, at character offset %d (before \"%s\")",	1716	croak ("%s, at character offset %d (before \"%s\")",
1608	dec.err,	1717	dec.err,
1609	ptr_to_index (string, dec.cur),	1718	(int)ptr_to_index (string, dec.cur),
1610	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1719	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1611	}	1720	}
1612		1721
1613	sv = sv_2mortal (sv);	1722	sv = sv_2mortal (sv);
1614		1723
…		…
1742	self->incr_mode = INCR_M_STR;	1851	self->incr_mode = INCR_M_STR;
1743	goto incr_m_str;	1852	goto incr_m_str;
1744		1853
1745	case '[':	1854	case '[':
1746	case '{':	1855	case '{':
		1856	case '(':
1747	if (++self->incr_nest > self->max_depth)	1857	if (++self->incr_nest > self->max_depth)
1748	croak (ERR_NESTING_EXCEEDED);	1858	croak (ERR_NESTING_EXCEEDED);
1749	break;	1859	break;
1750		1860
1751	case ']':	1861	case ']':
1752	case '}':	1862	case '}':
1753	if (--self->incr_nest <= 0)	1863	if (--self->incr_nest <= 0)
1754	goto interrupt;	1864	goto interrupt;
		1865	break;
		1866
		1867	case ')':
		1868	--self->incr_nest;
1755	break;	1869	break;
1756		1870
1757	case '#':	1871	case '#':
1758	self->incr_mode = INCR_M_C1;	1872	self->incr_mode = INCR_M_C1;
1759	goto incr_m_c;	1873	goto incr_m_c;
…		…
1785	i >= '0' && i <= '9' ? i - '0'	1899	i >= '0' && i <= '9' ? i - '0'
1786	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1900	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1787	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1901	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1788	: -1;	1902	: -1;
1789		1903
1790	json_stash = gv_stashpv ("JSON::XS" , 1);	1904	json_stash = gv_stashpv ("JSON::XS" , 1);
1791	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1905	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1792		1906
1793	json_true = get_bool ("JSON::XS::true");	1907	types_true = get_bool ("Types::Serialiser::true");
1794	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);
1795		1912
1796	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 */
1797	}	1914	}
1798		1915
1799	PROTOTYPES: DISABLE	1916	PROTOTYPES: DISABLE
1800		1917
1801	void CLONE (...)	1918	void CLONE (...)
1802	CODE:	1919	CODE:
1803	json_stash = 0;	1920	json_stash = 0;
1804	json_boolean_stash = 0;	1921	types_boolean_stash = 0;
1805		1922
1806	void new (char *klass)	1923	void new (char *klass)
1807	PPCODE:	1924	PPCODE:
1808	{	1925	{
1809	SV *pv = NEWSV (0, sizeof (JSON));	1926	SV *pv = NEWSV (0, sizeof (JSON));
1810	SvPOK_only (pv);	1927	SvPOK_only (pv);
1811	json_init ((JSON *)SvPVX (pv));	1928	json_init ((JSON *)SvPVX (pv));
1812	XPUSHs (sv_2mortal (sv_bless (	1929	XPUSHs (sv_2mortal (sv_bless (
1813	newRV_noinc (pv),	1930	newRV_noinc (pv),
1814	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1931	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1829	shrink = F_SHRINK	1946	shrink = F_SHRINK
1830	allow_blessed = F_ALLOW_BLESSED	1947	allow_blessed = F_ALLOW_BLESSED
1831	convert_blessed = F_CONV_BLESSED	1948	convert_blessed = F_CONV_BLESSED
1832	relaxed = F_RELAXED	1949	relaxed = F_RELAXED
1833	allow_unknown = F_ALLOW_UNKNOWN	1950	allow_unknown = F_ALLOW_UNKNOWN
		1951	allow_tags = F_ALLOW_TAGS
1834	PPCODE:	1952	PPCODE:
1835	{	1953	{
1836	if (enable)	1954	if (enable)
1837	self->flags \|= ix;	1955	self->flags \|= ix;
1838	else	1956	else
…		…
1854	get_shrink = F_SHRINK	1972	get_shrink = F_SHRINK
1855	get_allow_blessed = F_ALLOW_BLESSED	1973	get_allow_blessed = F_ALLOW_BLESSED
1856	get_convert_blessed = F_CONV_BLESSED	1974	get_convert_blessed = F_CONV_BLESSED
1857	get_relaxed = F_RELAXED	1975	get_relaxed = F_RELAXED
1858	get_allow_unknown = F_ALLOW_UNKNOWN	1976	get_allow_unknown = F_ALLOW_UNKNOWN
		1977	get_allow_tags = F_ALLOW_TAGS
1859	PPCODE:	1978	PPCODE:
1860	XPUSHs (boolSV (self->flags & ix));	1979	XPUSHs (boolSV (self->flags & ix));
1861		1980
1862	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	1981	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1863	PPCODE:	1982	PPCODE:
…		…
1891	}	2010	}
1892		2011
1893	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)
1894	PPCODE:	2013	PPCODE:
1895	{	2014	{
1896	if (!self->cb_sk_object)	2015	if (!self->cb_sk_object)
1897	self->cb_sk_object = newHV ();	2016	self->cb_sk_object = newHV ();
1898		2017
1899	if (SvOK (cb))	2018	if (SvOK (cb))
1900	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2019	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1901	else	2020	else
…		…
1912	XPUSHs (ST (0));	2031	XPUSHs (ST (0));
1913	}	2032	}
1914		2033
1915	void encode (JSON self, SV scalar)	2034	void encode (JSON self, SV scalar)
1916	PPCODE:	2035	PPCODE:
1917	XPUSHs (encode_json (scalar, self));	2036	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2037	XPUSHs (scalar);
1918		2038
1919	void decode (JSON self, SV jsonstr)	2039	void decode (JSON self, SV jsonstr)
1920	PPCODE:	2040	PPCODE:
1921	XPUSHs (decode_json (jsonstr, self, 0));	2041	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2042	XPUSHs (jsonstr);
1922		2043
1923	void decode_prefix (JSON self, SV jsonstr)	2044	void decode_prefix (JSON self, SV jsonstr)
1924	PPCODE:	2045	PPCODE:
1925	{	2046	{
		2047	SV *sv;
1926	char *offset;	2048	char *offset;
		2049	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1927	EXTEND (SP, 2);	2050	EXTEND (SP, 2);
1928	PUSHs (decode_json (jsonstr, self, &offset));	2051	PUSHs (sv);
1929	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2052	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1930	}	2053	}
1931		2054
1932	void incr_parse (JSON self, SV jsonstr = 0)	2055	void incr_parse (JSON self, SV jsonstr = 0)
1933	PPCODE:	2056	PPCODE:
…		…
1980	}	2103	}
1981		2104
1982	if (GIMME_V != G_VOID)	2105	if (GIMME_V != G_VOID)
1983	do	2106	do
1984	{	2107	{
		2108	SV *sv;
1985	char *offset;	2109	char *offset;
1986		2110
1987	if (!INCR_DONE (self))	2111	if (!INCR_DONE (self))
1988	{	2112	{
1989	incr_parse (self);	2113	incr_parse (self);
…		…
1991	if (self->incr_pos > self->max_size && self->max_size)	2115	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",	2116	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);	2117	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1994		2118
1995	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
1996	break;	2128	break;
		2129	}
1997	}	2130	}
1998		2131
1999	XPUSHs (decode_json (self->incr_text, self, &offset));	2132	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2133	XPUSHs (sv);
2000		2134
2001	self->incr_pos -= offset - SvPVX (self->incr_text);	2135	self->incr_pos -= offset - SvPVX (self->incr_text);
2002	self->incr_nest = 0;	2136	self->incr_nest = 0;
2003	self->incr_mode = 0;	2137	self->incr_mode = 0;
2004		2138
…		…
2048	SvREFCNT_dec (self->incr_text);	2182	SvREFCNT_dec (self->incr_text);
2049		2183
2050	PROTOTYPES: ENABLE	2184	PROTOTYPES: ENABLE
2051		2185
2052	void encode_json (SV *scalar)	2186	void encode_json (SV *scalar)
2053	ALIAS:
2054	to_json_ = 0
2055	encode_json = F_UTF8
2056	PPCODE:	2187	PPCODE:
2057	{	2188	{
2058	JSON json;	2189	JSON json;
2059	json_init (&json);	2190	json_init (&json);
2060	json.flags \|= ix;	2191	json.flags \|= F_UTF8;
2061	XPUSHs (encode_json (scalar, &json));	2192	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2193	XPUSHs (scalar);
2062	}	2194	}
2063		2195
2064	void decode_json (SV *jsonstr)	2196	void decode_json (SV *jsonstr)
2065	ALIAS:
2066	from_json_ = 0
2067	decode_json = F_UTF8
2068	PPCODE:	2197	PPCODE:
2069	{	2198	{
2070	JSON json;	2199	JSON json;
2071	json_init (&json);	2200	json_init (&json);
2072	json.flags \|= ix;	2201	json.flags \|= F_UTF8;
2073	XPUSHs (decode_json (jsonstr, &json, 0));	2202	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2203	XPUSHs (jsonstr);
2074	}	2204	}
2075		2205

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.120 by root, Mon Oct 28 23:23:10 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.120 by root, Mon Oct 28 23:23:10 2013 UTC