[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.123 by root, Sun Dec 8 20:44:23 2013 UTC

…		…
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarantees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
		20	#endif
		21
		22	// compatibility with perl <5.18
		23	#ifndef HvNAMELEN_get
		24	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		25	#endif
		26	#ifndef HvNAMELEN
		27	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		28	#endif
		29	#ifndef HvNAMEUTF8
		30	# define HvNAMEUTF8(hv) 0
20	#endif	31	#endif
21		32
22	// three extra for rounding, sign, and end of string	33	// three extra for rounding, sign, and end of string
23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)	34	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24		35
…		…
33	#define F_SHRINK 0x00000200UL	44	#define F_SHRINK 0x00000200UL
34	#define F_ALLOW_BLESSED 0x00000400UL	45	#define F_ALLOW_BLESSED 0x00000400UL
35	#define F_CONV_BLESSED 0x00000800UL	46	#define F_CONV_BLESSED 0x00000800UL
36	#define F_RELAXED 0x00001000UL	47	#define F_RELAXED 0x00001000UL
37	#define F_ALLOW_UNKNOWN 0x00002000UL	48	#define F_ALLOW_UNKNOWN 0x00002000UL
		49	#define F_ALLOW_TAGS 0x00004000UL
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	50	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		51
40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	52	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
41		53
42	#define INIT_SIZE 32 // initial scalar size to be allocated	54	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
72	#else	84	#else
73	# define JSON_SLOW 0	85	# define JSON_SLOW 0
74	# define JSON_STASH json_stash	86	# define JSON_STASH json_stash
75	#endif	87	#endif
76		88
		89	// the amount of HEs to allocate on the stack, when sorting keys
		90	#define STACK_HES 64
		91
77	static HV json_stash, json_boolean_stash; // JSON::XS::	92	static HV json_stash, types_boolean_stash; // JSON::XS::
78	static SV json_true, json_false;	93	static SV types_true, types_false, *sv_json;
79		94
80	enum {	95	enum {
81	INCR_M_WS = 0, // initial whitespace skipping, must be 0	96	INCR_M_WS = 0, // initial whitespace skipping, must be 0
82	INCR_M_STR, // inside string	97	INCR_M_STR, // inside string
83	INCR_M_BS, // inside backslash	98	INCR_M_BS, // inside backslash
…		…
480		495
481	if (enc->indent >= enc->json.max_depth)	496	if (enc->indent >= enc->json.max_depth)
482	croak (ERR_NESTING_EXCEEDED);	497	croak (ERR_NESTING_EXCEEDED);
483		498
484	encode_ch (enc, '[');	499	encode_ch (enc, '[');
485		500
486	if (len >= 0)	501	if (len >= 0)
487	{	502	{
488	encode_nl (enc); ++enc->indent;	503	encode_nl (enc); ++enc->indent;
489		504
490	for (i = 0; i <= len; ++i)	505	for (i = 0; i <= len; ++i)
…		…
502	encode_comma (enc);	517	encode_comma (enc);
503	}	518	}
504		519
505	encode_nl (enc); --enc->indent; encode_indent (enc);	520	encode_nl (enc); --enc->indent; encode_indent (enc);
506	}	521	}
507		522
508	encode_ch (enc, ']');	523	encode_ch (enc, ']');
509	}	524	}
510		525
511	static void	526	static void
512	encode_hk (enc_t enc, HE he)	527	encode_hk (enc_t enc, HE he)
…		…
516	if (HeKLEN (he) == HEf_SVKEY)	531	if (HeKLEN (he) == HEf_SVKEY)
517	{	532	{
518	SV *sv = HeSVKEY (he);	533	SV *sv = HeSVKEY (he);
519	STRLEN len;	534	STRLEN len;
520	char *str;	535	char *str;
521		536
522	SvGETMAGIC (sv);	537	SvGETMAGIC (sv);
523	str = SvPV (sv, len);	538	str = SvPV (sv, len);
524		539
525	encode_str (enc, str, len, SvUTF8 (sv));	540	encode_str (enc, str, len, SvUTF8 (sv));
526	}	541	}
…		…
592	}	607	}
593		608
594	if (count)	609	if (count)
595	{	610	{
596	int i, fast = 1;	611	int i, fast = 1;
597	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	612	HE *hes_stack [STACK_HES];
598	HE *hes = _alloca (count sizeof (HE));	613	HE **hes = hes_stack;
599	#else	614
600	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	615	// allocate larger arrays on the heap
601	#endif	616	if (count > STACK_HES)
		617	{
		618	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		619	hes = (HE **)SvPVX (sv);
		620	}
602		621
603	i = 0;	622	i = 0;
604	while ((he = hv_iternext (hv)))	623	while ((he = hv_iternext (hv)))
605	{	624	{
606	hes [i++] = he;	625	hes [i++] = he;
…		…
675	// encode objects, arrays and special \0=false and \1=true values.	694	// encode objects, arrays and special \0=false and \1=true values.
676	static void	695	static void
677	encode_rv (enc_t enc, SV sv)	696	encode_rv (enc_t enc, SV sv)
678	{	697	{
679	svtype svt;	698	svtype svt;
		699	GV *method;
680		700
681	SvGETMAGIC (sv);	701	SvGETMAGIC (sv);
682	svt = SvTYPE (sv);	702	svt = SvTYPE (sv);
683		703
684	if (expect_false (SvOBJECT (sv)))	704	if (expect_false (SvOBJECT (sv)))
685	{	705	{
686	HV *stash = !JSON_SLOW \|\| json_boolean_stash	706	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
687	? json_boolean_stash	707	? types_boolean_stash
688	: gv_stashpv ("JSON::XS::Boolean", 1);	708	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		709	HV *stash = SvSTASH (sv);
689		710
690	if (SvSTASH (sv) == stash)	711	if (stash == boolean_stash)
691	{	712	{
692	if (SvIV (sv))	713	if (SvIV (sv))
693	encode_str (enc, "true", 4, 0);	714	encode_str (enc, "true", 4, 0);
694	else	715	else
695	encode_str (enc, "false", 5, 0);	716	encode_str (enc, "false", 5, 0);
696	}	717	}
		718	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		719	{
		720	int count;
		721	dSP;
		722
		723	ENTER; SAVETMPS; PUSHMARK (SP);
		724	EXTEND (SP, 2);
		725	// we re-bless the reference to get overload and other niceties right
		726	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		727	PUSHs (sv_json);
		728
		729	PUTBACK;
		730	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		731	SPAGAIN;
		732
		733	// catch this surprisingly common error
		734	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		735	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		736
		737	encode_ch (enc, '(');
		738	encode_ch (enc, '"');
		739	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		740	encode_ch (enc, '"');
		741	encode_ch (enc, ')');
		742	encode_ch (enc, '[');
		743
		744	while (count)
		745	{
		746	encode_sv (enc, SP[1 - count--]);
		747
		748	if (count)
		749	encode_ch (enc, ',');
		750	}
		751
		752	encode_ch (enc, ']');
		753
		754	PUTBACK;
		755
		756	FREETMPS; LEAVE;
		757	}
		758	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		759	{
		760	dSP;
		761
		762	ENTER; SAVETMPS; PUSHMARK (SP);
		763	// we re-bless the reference to get overload and other niceties right
		764	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		765
		766	// calling with G_SCALAR ensures that we always get a 1 return value
		767	PUTBACK;
		768	call_sv ((SV *)GvCV (method), G_SCALAR);
		769	SPAGAIN;
		770
		771	// catch this surprisingly common error
		772	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		773	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		774
		775	sv = POPs;
		776	PUTBACK;
		777
		778	encode_sv (enc, sv);
		779
		780	FREETMPS; LEAVE;
		781	}
		782	else if (enc->json.flags & F_ALLOW_BLESSED)
		783	encode_str (enc, "null", 4, 0);
697	else	784	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",	785	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))));	786	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744	}
745	}	787	}
746	else if (svt == SVt_PVHV)	788	else if (svt == SVt_PVHV)
747	encode_hv (enc, (HV *)sv);	789	encode_hv (enc, (HV *)sv);
748	else if (svt == SVt_PVAV)	790	else if (svt == SVt_PVAV)
749	encode_av (enc, (AV *)sv);	791	encode_av (enc, (AV *)sv);
…		…
825	}	867	}
826	else	868	else
827	{	869	{
828	// large integer, use the (rather slow) snprintf way.	870	// large integer, use the (rather slow) snprintf way.
829	need (enc, IVUV_MAXCHARS);	871	need (enc, IVUV_MAXCHARS);
830	enc->cur +=	872	enc->cur +=
831	SvIsUV(sv)	873	SvIsUV(sv)
832	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	874	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	875	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834	}	876	}
835	}	877	}
836	else if (SvROK (sv))	878	else if (SvROK (sv))
837	encode_rv (enc, SvRV (sv));	879	encode_rv (enc, SvRV (sv));
838	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	880	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
839	encode_str (enc, "null", 4, 0);	881	encode_str (enc, "null", 4, 0);
840	else	882	else
841	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	883	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842	SvPV_nolen (sv), SvFLAGS (sv));	884	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843	}	885	}
844		886
845	static SV *	887	static SV *
846	encode_json (SV scalar, JSON json)	888	encode_json (SV scalar, JSON json)
847	{	889	{
…		…
1259	if (*dec->cur == ']')	1301	if (*dec->cur == ']')
1260	{	1302	{
1261	++dec->cur;	1303	++dec->cur;
1262	break;	1304	break;
1263	}	1305	}
1264		1306
1265	if (*dec->cur != ',')	1307	if (*dec->cur != ',')
1266	ERR (", or ] expected while parsing array");	1308	ERR (", or ] expected while parsing array");
1267		1309
1268	++dec->cur;	1310	++dec->cur;
1269		1311
…		…
1451	DEC_DEC_DEPTH;	1493	DEC_DEC_DEPTH;
1452	return 0;	1494	return 0;
1453	}	1495	}
1454		1496
1455	static SV *	1497	static SV *
		1498	decode_tag (dec_t *dec)
		1499	{
		1500	SV *tag = 0;
		1501	SV *val = 0;
		1502
		1503	if (!(dec->json.flags & F_ALLOW_TAGS))
		1504	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1505
		1506	++dec->cur;
		1507
		1508	decode_ws (dec);
		1509
		1510	tag = decode_sv (dec);
		1511	if (!tag)
		1512	goto fail;
		1513
		1514	if (!SvPOK (tag))
		1515	ERR ("malformed JSON string, (tag) must be a string");
		1516
		1517	decode_ws (dec);
		1518
		1519	if (*dec->cur != ')')
		1520	ERR (") expected after tag");
		1521
		1522	++dec->cur;
		1523
		1524	decode_ws (dec);
		1525
		1526	val = decode_sv (dec);
		1527	if (!val)
		1528	goto fail;
		1529
		1530	if (!SvROK (val) \|\| SvTYPE (SvRV (val)) != SVt_PVAV)
		1531	ERR ("malformed JSON string, tag value must be an array");
		1532
		1533	{
		1534	AV av = (AV )SvRV (val);
		1535	int i, len = av_len (av) + 1;
		1536	HV *stash = gv_stashsv (tag, 0);
		1537	SV *sv;
		1538
		1539	if (!stash)
		1540	ERR ("cannot decode perl-object (package does not exist)");
		1541
		1542	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1543
		1544	if (!method)
		1545	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1546
		1547	dSP;
		1548
		1549	ENTER; SAVETMPS; PUSHMARK (SP);
		1550	EXTEND (SP, len + 2);
		1551	// we re-bless the reference to get overload and other niceties right
		1552	PUSHs (tag);
		1553	PUSHs (sv_json);
		1554
		1555	for (i = 0; i < len; ++i)
		1556	PUSHs (*av_fetch (av, i, 1));
		1557
		1558	PUTBACK;
		1559	call_sv ((SV *)GvCV (method), G_SCALAR);
		1560	SPAGAIN;
		1561
		1562	SvREFCNT_dec (tag);
		1563	SvREFCNT_dec (val);
		1564	sv = SvREFCNT_inc (POPs);
		1565
		1566	PUTBACK;
		1567
		1568	FREETMPS; LEAVE;
		1569
		1570	return sv;
		1571	}
		1572
		1573	fail:
		1574	SvREFCNT_dec (tag);
		1575	SvREFCNT_dec (val);
		1576	return 0;
		1577	}
		1578
		1579	static SV *
1456	decode_sv (dec_t *dec)	1580	decode_sv (dec_t *dec)
1457	{	1581	{
1458	// the beauty of JSON: you need exactly one character lookahead	1582	// the beauty of JSON: you need exactly one character lookahead
1459	// to parse everything.	1583	// to parse everything.
1460	switch (*dec->cur)	1584	switch (*dec->cur)
1461	{	1585	{
1462	case '"': ++dec->cur; return decode_str (dec);	1586	case '"': ++dec->cur; return decode_str (dec);
1463	case '[': ++dec->cur; return decode_av (dec);	1587	case '[': ++dec->cur; return decode_av (dec);
1464	case '{': ++dec->cur; return decode_hv (dec);	1588	case '{': ++dec->cur; return decode_hv (dec);
		1589	case '(': return decode_tag (dec);
1465		1590
1466	case '-':	1591	case '-':
1467	case '0': case '1': case '2': case '3': case '4':	1592	case '0': case '1': case '2': case '3': case '4':
1468	case '5': case '6': case '7': case '8': case '9':	1593	case '5': case '6': case '7': case '8': case '9':
1469	return decode_num (dec);	1594	return decode_num (dec);
…		…
1471	case 't':	1596	case 't':
1472	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1597	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473	{	1598	{
1474	dec->cur += 4;	1599	dec->cur += 4;
1475	#if JSON_SLOW	1600	#if JSON_SLOW
1476	json_true = get_bool ("JSON::XS::true");	1601	types_true = get_bool ("Types::Serialiser::true");
1477	#endif	1602	#endif
1478	return newSVsv (json_true);	1603	return newSVsv (types_true);
1479	}	1604	}
1480	else	1605	else
1481	ERR ("'true' expected");	1606	ERR ("'true' expected");
1482		1607
1483	break;	1608	break;
…		…
1485	case 'f':	1610	case 'f':
1486	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1611	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1487	{	1612	{
1488	dec->cur += 5;	1613	dec->cur += 5;
1489	#if JSON_SLOW	1614	#if JSON_SLOW
1490	json_false = get_bool ("JSON::XS::false");	1615	types_false = get_bool ("Types::Serialiser::false");
1491	#endif	1616	#endif
1492	return newSVsv (json_false);	1617	return newSVsv (types_false);
1493	}	1618	}
1494	else	1619	else
1495	ERR ("'false' expected");	1620	ERR ("'false' expected");
1496		1621
1497	break;	1622	break;
…		…
1506	ERR ("'null' expected");	1631	ERR ("'null' expected");
1507		1632
1508	break;	1633	break;
1509		1634
1510	default:	1635	default:
1511	ERR ("malformed JSON string, neither array, object, number, string or atom");	1636	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512	break;	1637	break;
1513	}	1638	}
1514		1639
1515	fail:	1640	fail:
1516	return 0;	1641	return 0;
…		…
1521	{	1646	{
1522	dec_t dec;	1647	dec_t dec;
1523	SV *sv;	1648	SV *sv;
1524		1649
1525	/* work around bugs in 5.10 where manipulating magic values	1650	/* work around bugs in 5.10 where manipulating magic values
1526	* will perl ignore the magic in subsequent accesses.	1651	* makes perl ignore the magic in subsequent accesses.
1527	* also make a copy of non-PV values, to get them into a clean	1652	* 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).	1653	* state (SvPV should do that, but it's buggy, see below).
1529	*/	1654	*/
1530	/SvGETMAGIC (string);/	1655	/SvGETMAGIC (string);/
1531	if (SvMAGICAL (string) \|\| !SvPOK (string))	1656	if (SvMAGICAL (string) \|\| !SvPOK (string))
…		…
1605	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1730	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1606	LEAVE;	1731	LEAVE;
1607		1732
1608	croak ("%s, at character offset %d (before \"%s\")",	1733	croak ("%s, at character offset %d (before \"%s\")",
1609	dec.err,	1734	dec.err,
1610	ptr_to_index (string, dec.cur),	1735	(int)ptr_to_index (string, dec.cur),
1611	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1736	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612	}	1737	}
1613		1738
1614	sv = sv_2mortal (sv);	1739	sv = sv_2mortal (sv);
1615		1740
…		…
1743	self->incr_mode = INCR_M_STR;	1868	self->incr_mode = INCR_M_STR;
1744	goto incr_m_str;	1869	goto incr_m_str;
1745		1870
1746	case '[':	1871	case '[':
1747	case '{':	1872	case '{':
		1873	case '(':
1748	if (++self->incr_nest > self->max_depth)	1874	if (++self->incr_nest > self->max_depth)
1749	croak (ERR_NESTING_EXCEEDED);	1875	croak (ERR_NESTING_EXCEEDED);
1750	break;	1876	break;
1751		1877
1752	case ']':	1878	case ']':
1753	case '}':	1879	case '}':
1754	if (--self->incr_nest <= 0)	1880	if (--self->incr_nest <= 0)
1755	goto interrupt;	1881	goto interrupt;
		1882	break;
		1883
		1884	case ')':
		1885	--self->incr_nest;
1756	break;	1886	break;
1757		1887
1758	case '#':	1888	case '#':
1759	self->incr_mode = INCR_M_C1;	1889	self->incr_mode = INCR_M_C1;
1760	goto incr_m_c;	1890	goto incr_m_c;
…		…
1786	i >= '0' && i <= '9' ? i - '0'	1916	i >= '0' && i <= '9' ? i - '0'
1787	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1917	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1788	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1918	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1789	: -1;	1919	: -1;
1790		1920
1791	json_stash = gv_stashpv ("JSON::XS" , 1);	1921	json_stash = gv_stashpv ("JSON::XS" , 1);
1792	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1922	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1793		1923
1794	json_true = get_bool ("JSON::XS::true");	1924	types_true = get_bool ("Types::Serialiser::true");
1795	json_false = get_bool ("JSON::XS::false");	1925	types_false = get_bool ("Types::Serialiser::false");
		1926
		1927	sv_json = newSVpv ("JSON", 0);
		1928	SvREADONLY_on (sv_json);
1796		1929
1797	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	1930	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798	}	1931	}
1799		1932
1800	PROTOTYPES: DISABLE	1933	PROTOTYPES: DISABLE
1801		1934
1802	void CLONE (...)	1935	void CLONE (...)
1803	CODE:	1936	CODE:
1804	json_stash = 0;	1937	json_stash = 0;
1805	json_boolean_stash = 0;	1938	types_boolean_stash = 0;
1806		1939
1807	void new (char *klass)	1940	void new (char *klass)
1808	PPCODE:	1941	PPCODE:
1809	{	1942	{
1810	SV *pv = NEWSV (0, sizeof (JSON));	1943	SV *pv = NEWSV (0, sizeof (JSON));
1811	SvPOK_only (pv);	1944	SvPOK_only (pv);
1812	json_init ((JSON *)SvPVX (pv));	1945	json_init ((JSON *)SvPVX (pv));
1813	XPUSHs (sv_2mortal (sv_bless (	1946	XPUSHs (sv_2mortal (sv_bless (
1814	newRV_noinc (pv),	1947	newRV_noinc (pv),
1815	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1948	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1830	shrink = F_SHRINK	1963	shrink = F_SHRINK
1831	allow_blessed = F_ALLOW_BLESSED	1964	allow_blessed = F_ALLOW_BLESSED
1832	convert_blessed = F_CONV_BLESSED	1965	convert_blessed = F_CONV_BLESSED
1833	relaxed = F_RELAXED	1966	relaxed = F_RELAXED
1834	allow_unknown = F_ALLOW_UNKNOWN	1967	allow_unknown = F_ALLOW_UNKNOWN
		1968	allow_tags = F_ALLOW_TAGS
1835	PPCODE:	1969	PPCODE:
1836	{	1970	{
1837	if (enable)	1971	if (enable)
1838	self->flags \|= ix;	1972	self->flags \|= ix;
1839	else	1973	else
…		…
1855	get_shrink = F_SHRINK	1989	get_shrink = F_SHRINK
1856	get_allow_blessed = F_ALLOW_BLESSED	1990	get_allow_blessed = F_ALLOW_BLESSED
1857	get_convert_blessed = F_CONV_BLESSED	1991	get_convert_blessed = F_CONV_BLESSED
1858	get_relaxed = F_RELAXED	1992	get_relaxed = F_RELAXED
1859	get_allow_unknown = F_ALLOW_UNKNOWN	1993	get_allow_unknown = F_ALLOW_UNKNOWN
		1994	get_allow_tags = F_ALLOW_TAGS
1860	PPCODE:	1995	PPCODE:
1861	XPUSHs (boolSV (self->flags & ix));	1996	XPUSHs (boolSV (self->flags & ix));
1862		1997
1863	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	1998	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864	PPCODE:	1999	PPCODE:
…		…
1892	}	2027	}
1893		2028
1894	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	2029	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1895	PPCODE:	2030	PPCODE:
1896	{	2031	{
1897	if (!self->cb_sk_object)	2032	if (!self->cb_sk_object)
1898	self->cb_sk_object = newHV ();	2033	self->cb_sk_object = newHV ();
1899		2034
1900	if (SvOK (cb))	2035	if (SvOK (cb))
1901	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2036	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902	else	2037	else
…		…
1913	XPUSHs (ST (0));	2048	XPUSHs (ST (0));
1914	}	2049	}
1915		2050
1916	void encode (JSON self, SV scalar)	2051	void encode (JSON self, SV scalar)
1917	PPCODE:	2052	PPCODE:
1918	XPUSHs (encode_json (scalar, self));	2053	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2054	XPUSHs (scalar);
1919		2055
1920	void decode (JSON self, SV jsonstr)	2056	void decode (JSON self, SV jsonstr)
1921	PPCODE:	2057	PPCODE:
1922	XPUSHs (decode_json (jsonstr, self, 0));	2058	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2059	XPUSHs (jsonstr);
1923		2060
1924	void decode_prefix (JSON self, SV jsonstr)	2061	void decode_prefix (JSON self, SV jsonstr)
1925	PPCODE:	2062	PPCODE:
1926	{	2063	{
		2064	SV *sv;
1927	char *offset;	2065	char *offset;
		2066	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928	EXTEND (SP, 2);	2067	EXTEND (SP, 2);
1929	PUSHs (decode_json (jsonstr, self, &offset));	2068	PUSHs (sv);
1930	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2069	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1931	}	2070	}
1932		2071
1933	void incr_parse (JSON self, SV jsonstr = 0)	2072	void incr_parse (JSON self, SV jsonstr = 0)
1934	PPCODE:	2073	PPCODE:
…		…
1981	}	2120	}
1982		2121
1983	if (GIMME_V != G_VOID)	2122	if (GIMME_V != G_VOID)
1984	do	2123	do
1985	{	2124	{
		2125	SV *sv;
1986	char *offset;	2126	char *offset;
1987		2127
1988	if (!INCR_DONE (self))	2128	if (!INCR_DONE (self))
1989	{	2129	{
1990	incr_parse (self);	2130	incr_parse (self);
…		…
1994	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2134	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1995		2135
1996	if (!INCR_DONE (self))	2136	if (!INCR_DONE (self))
1997	{	2137	{
1998	// as an optimisation, do not accumulate white space in the incr buffer	2138	// as an optimisation, do not accumulate white space in the incr buffer
1999	if (self->incr_mode == INCR_M_WS)	2139	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2140	{
		2141	self->incr_pos = 0;
2000	SvCUR_set (self->incr_text, 0);	2142	SvCUR_set (self->incr_text, 0);
		2143	}
2001		2144
2002	break;	2145	break;
2003	}	2146	}
2004	}	2147	}
2005		2148
2006	XPUSHs (decode_json (self->incr_text, self, &offset));	2149	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2150	XPUSHs (sv);
2007		2151
2008	self->incr_pos -= offset - SvPVX (self->incr_text);	2152	self->incr_pos -= offset - SvPVX (self->incr_text);
2009	self->incr_nest = 0;	2153	self->incr_nest = 0;
2010	self->incr_mode = 0;	2154	self->incr_mode = 0;
2011		2155
…		…
2055	SvREFCNT_dec (self->incr_text);	2199	SvREFCNT_dec (self->incr_text);
2056		2200
2057	PROTOTYPES: ENABLE	2201	PROTOTYPES: ENABLE
2058		2202
2059	void encode_json (SV *scalar)	2203	void encode_json (SV *scalar)
2060	ALIAS:
2061	to_json_ = 0
2062	encode_json = F_UTF8
2063	PPCODE:	2204	PPCODE:
2064	{	2205	{
2065	JSON json;	2206	JSON json;
2066	json_init (&json);	2207	json_init (&json);
2067	json.flags \|= ix;	2208	json.flags \|= F_UTF8;
2068	XPUSHs (encode_json (scalar, &json));	2209	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2210	XPUSHs (scalar);
2069	}	2211	}
2070		2212
2071	void decode_json (SV *jsonstr)	2213	void decode_json (SV *jsonstr)
2072	ALIAS:
2073	from_json_ = 0
2074	decode_json = F_UTF8
2075	PPCODE:	2214	PPCODE:
2076	{	2215	{
2077	JSON json;	2216	JSON json;
2078	json_init (&json);	2217	json_init (&json);
2079	json.flags \|= ix;	2218	json.flags \|= F_UTF8;
2080	XPUSHs (decode_json (jsonstr, &json, 0));	2219	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2220	XPUSHs (jsonstr);
2081	}	2221	}
2082		2222

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.123 by root, Sun Dec 8 20:44:23 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.123 by root, Sun Dec 8 20:44:23 2013 UTC