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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.107 by root, Wed Mar 17 01:45:43 2010 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
43	#define INDENT_STEP 3 // spaces per indentation level	44	#define INDENT_STEP 3 // spaces per indentation level
44		45
45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	46	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		47
		48	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46		49
47	#define SB do {	50	#define SB do {
48	#define SE } while (0)	51	#define SE } while (0)
49		52
50	#if __GNUC__ >= 3	53	#if __GNUC__ >= 3
…		…
70	#else	73	#else
71	# define JSON_SLOW 0	74	# define JSON_SLOW 0
72	# define JSON_STASH json_stash	75	# define JSON_STASH json_stash
73	#endif	76	#endif
74		77
		78	// the amount of HEs to allocate on the stack, when sorting keys
		79	#define STACK_HES 64
		80
75	static HV json_stash, json_boolean_stash; // JSON::XS::	81	static HV json_stash, types_boolean_stash; // JSON::XS::
76	static SV json_true, json_false;	82	static SV types_true, types_false, *sv_json;
77		83
78	enum {	84	enum {
79	INCR_M_WS = 0, // initial whitespace skipping, must be 0	85	INCR_M_WS = 0, // initial whitespace skipping, must be 0
80	INCR_M_STR, // inside string	86	INCR_M_STR, // inside string
81	INCR_M_BS, // inside backslash	87	INCR_M_BS, // inside backslash
…		…
258	}	264	}
259		265
260	// this relies greatly on the quality of the pow ()	266	// this relies greatly on the quality of the pow ()
261	// implementation of the platform, but a good	267	// implementation of the platform, but a good
262	// implementation is hard to beat.	268	// implementation is hard to beat.
		269	// (IEEE 754 conformant ones are required to be exact)
263	if (postdp) *expo -= eaccum;	270	if (postdp) *expo -= eaccum;
264	accum += uaccum Perl_pow (10., *expo);	271	accum += uaccum Perl_pow (10., *expo);
265	*expo += eaccum;	272	*expo += eaccum;
266	}	273	}
267		274
…		…
477		484
478	if (enc->indent >= enc->json.max_depth)	485	if (enc->indent >= enc->json.max_depth)
479	croak (ERR_NESTING_EXCEEDED);	486	croak (ERR_NESTING_EXCEEDED);
480		487
481	encode_ch (enc, '[');	488	encode_ch (enc, '[');
482		489
483	if (len >= 0)	490	if (len >= 0)
484	{	491	{
485	encode_nl (enc); ++enc->indent;	492	encode_nl (enc); ++enc->indent;
486		493
487	for (i = 0; i <= len; ++i)	494	for (i = 0; i <= len; ++i)
…		…
499	encode_comma (enc);	506	encode_comma (enc);
500	}	507	}
501		508
502	encode_nl (enc); --enc->indent; encode_indent (enc);	509	encode_nl (enc); --enc->indent; encode_indent (enc);
503	}	510	}
504		511
505	encode_ch (enc, ']');	512	encode_ch (enc, ']');
506	}	513	}
507		514
508	static void	515	static void
509	encode_hk (enc_t enc, HE he)	516	encode_hk (enc_t enc, HE he)
…		…
513	if (HeKLEN (he) == HEf_SVKEY)	520	if (HeKLEN (he) == HEf_SVKEY)
514	{	521	{
515	SV *sv = HeSVKEY (he);	522	SV *sv = HeSVKEY (he);
516	STRLEN len;	523	STRLEN len;
517	char *str;	524	char *str;
518		525
519	SvGETMAGIC (sv);	526	SvGETMAGIC (sv);
520	str = SvPV (sv, len);	527	str = SvPV (sv, len);
521		528
522	encode_str (enc, str, len, SvUTF8 (sv));	529	encode_str (enc, str, len, SvUTF8 (sv));
523	}	530	}
…		…
589	}	596	}
590		597
591	if (count)	598	if (count)
592	{	599	{
593	int i, fast = 1;	600	int i, fast = 1;
594	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	601	HE *hes_stack [STACK_HES];
595	HE *hes = _alloca (count sizeof (HE));	602	HE **hes = hes_stack;
596	#else	603
597	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	604	// allocate larger arrays on the heap
598	#endif	605	if (count > STACK_HES)
		606	{
		607	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		608	hes = (HE **)SvPVX (sv);
		609	}
599		610
600	i = 0;	611	i = 0;
601	while ((he = hv_iternext (hv)))	612	while ((he = hv_iternext (hv)))
602	{	613	{
603	hes [i++] = he;	614	hes [i++] = he;
…		…
672	// encode objects, arrays and special \0=false and \1=true values.	683	// encode objects, arrays and special \0=false and \1=true values.
673	static void	684	static void
674	encode_rv (enc_t enc, SV sv)	685	encode_rv (enc_t enc, SV sv)
675	{	686	{
676	svtype svt;	687	svtype svt;
		688	GV *method;
677		689
678	SvGETMAGIC (sv);	690	SvGETMAGIC (sv);
679	svt = SvTYPE (sv);	691	svt = SvTYPE (sv);
680		692
681	if (expect_false (SvOBJECT (sv)))	693	if (expect_false (SvOBJECT (sv)))
682	{	694	{
683	HV *stash = !JSON_SLOW \|\| json_boolean_stash	695	HV *boolean_stash = !JSON_SLOW \|\| types_boolean_stash
684	? json_boolean_stash	696	? types_boolean_stash
685	: gv_stashpv ("JSON::XS::Boolean", 1);	697	: gv_stashpv ("Types::Serialiser::Boolean", 1);
		698	HV *stash = SvSTASH (sv);
686		699
687	if (SvSTASH (sv) == stash)	700	if (stash == boolean_stash)
688	{	701	{
689	if (SvIV (sv))	702	if (SvIV (sv))
690	encode_str (enc, "true", 4, 0);	703	encode_str (enc, "true", 4, 0);
691	else	704	else
692	encode_str (enc, "false", 5, 0);	705	encode_str (enc, "false", 5, 0);
693	}	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);
694	else	773	else
695	{
696	#if 0
697	if (0 && sv_derived_from (rv, "JSON::Literal"))
698	{
699	// not yet
700	}
701	#endif
702	if (enc->json.flags & F_CONV_BLESSED)
703	{
704	// we re-bless the reference to get overload and other niceties right
705	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
706
707	if (to_json)
708	{
709	dSP;
710
711	ENTER; SAVETMPS; PUSHMARK (SP);
712	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
713
714	// calling with G_SCALAR ensures that we always get a 1 return value
715	PUTBACK;
716	call_sv ((SV *)GvCV (to_json), G_SCALAR);
717	SPAGAIN;
718
719	// catch this surprisingly common error
720	if (SvROK (TOPs) && SvRV (TOPs) == sv)
721	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
722
723	sv = POPs;
724	PUTBACK;
725
726	encode_sv (enc, sv);
727
728	FREETMPS; LEAVE;
729	}
730	else if (enc->json.flags & F_ALLOW_BLESSED)
731	encode_str (enc, "null", 4, 0);
732	else
733	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
734	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
735	}
736	else if (enc->json.flags & F_ALLOW_BLESSED)
737	encode_str (enc, "null", 4, 0);
738	else
739	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)",
740	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	775	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
741	}
742	}	776	}
743	else if (svt == SVt_PVHV)	777	else if (svt == SVt_PVHV)
744	encode_hv (enc, (HV *)sv);	778	encode_hv (enc, (HV *)sv);
745	else if (svt == SVt_PVAV)	779	else if (svt == SVt_PVAV)
746	encode_av (enc, (AV *)sv);	780	encode_av (enc, (AV *)sv);
…		…
822	}	856	}
823	else	857	else
824	{	858	{
825	// large integer, use the (rather slow) snprintf way.	859	// large integer, use the (rather slow) snprintf way.
826	need (enc, IVUV_MAXCHARS);	860	need (enc, IVUV_MAXCHARS);
827	enc->cur +=	861	enc->cur +=
828	SvIsUV(sv)	862	SvIsUV(sv)
829	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	863	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	864	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831	}	865	}
832	}	866	}
833	else if (SvROK (sv))	867	else if (SvROK (sv))
834	encode_rv (enc, SvRV (sv));	868	encode_rv (enc, SvRV (sv));
835	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	869	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
836	encode_str (enc, "null", 4, 0);	870	encode_str (enc, "null", 4, 0);
837	else	871	else
838	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",
839	SvPV_nolen (sv), SvFLAGS (sv));	873	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
840	}	874	}
841		875
842	static SV *	876	static SV *
843	encode_json (SV scalar, JSON json)	877	encode_json (SV scalar, JSON json)
844	{	878	{
…		…
1256	if (*dec->cur == ']')	1290	if (*dec->cur == ']')
1257	{	1291	{
1258	++dec->cur;	1292	++dec->cur;
1259	break;	1293	break;
1260	}	1294	}
1261		1295
1262	if (*dec->cur != ',')	1296	if (*dec->cur != ',')
1263	ERR (", or ] expected while parsing array");	1297	ERR (", or ] expected while parsing array");
1264		1298
1265	++dec->cur;	1299	++dec->cur;
1266		1300
…		…
1448	DEC_DEC_DEPTH;	1482	DEC_DEC_DEPTH;
1449	return 0;	1483	return 0;
1450	}	1484	}
1451		1485
1452	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 *
1453	decode_sv (dec_t *dec)	1569	decode_sv (dec_t *dec)
1454	{	1570	{
1455	// the beauty of JSON: you need exactly one character lookahead	1571	// the beauty of JSON: you need exactly one character lookahead
1456	// to parse everything.	1572	// to parse everything.
1457	switch (*dec->cur)	1573	switch (*dec->cur)
1458	{	1574	{
1459	case '"': ++dec->cur; return decode_str (dec);	1575	case '"': ++dec->cur; return decode_str (dec);
1460	case '[': ++dec->cur; return decode_av (dec);	1576	case '[': ++dec->cur; return decode_av (dec);
1461	case '{': ++dec->cur; return decode_hv (dec);	1577	case '{': ++dec->cur; return decode_hv (dec);
		1578	case '(': return decode_tag (dec);
1462		1579
1463	case '-':	1580	case '-':
1464	case '0': case '1': case '2': case '3': case '4':	1581	case '0': case '1': case '2': case '3': case '4':
1465	case '5': case '6': case '7': case '8': case '9':	1582	case '5': case '6': case '7': case '8': case '9':
1466	return decode_num (dec);	1583	return decode_num (dec);
…		…
1468	case 't':	1585	case 't':
1469	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1586	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1470	{	1587	{
1471	dec->cur += 4;	1588	dec->cur += 4;
1472	#if JSON_SLOW	1589	#if JSON_SLOW
1473	json_true = get_bool ("JSON::XS::true");	1590	types_true = get_bool ("Types::Serialiser::true");
1474	#endif	1591	#endif
1475	return newSVsv (json_true);	1592	return newSVsv (types_true);
1476	}	1593	}
1477	else	1594	else
1478	ERR ("'true' expected");	1595	ERR ("'true' expected");
1479		1596
1480	break;	1597	break;
…		…
1482	case 'f':	1599	case 'f':
1483	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1600	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1484	{	1601	{
1485	dec->cur += 5;	1602	dec->cur += 5;
1486	#if JSON_SLOW	1603	#if JSON_SLOW
1487	json_false = get_bool ("JSON::XS::false");	1604	types_false = get_bool ("Types::Serialiser::false");
1488	#endif	1605	#endif
1489	return newSVsv (json_false);	1606	return newSVsv (types_false);
1490	}	1607	}
1491	else	1608	else
1492	ERR ("'false' expected");	1609	ERR ("'false' expected");
1493		1610
1494	break;	1611	break;
…		…
1503	ERR ("'null' expected");	1620	ERR ("'null' expected");
1504		1621
1505	break;	1622	break;
1506		1623
1507	default:	1624	default:
1508	ERR ("malformed JSON string, neither array, object, number, string or atom");	1625	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1509	break;	1626	break;
1510	}	1627	}
1511		1628
1512	fail:	1629	fail:
1513	return 0;	1630	return 0;
…		…
1518	{	1635	{
1519	dec_t dec;	1636	dec_t dec;
1520	SV *sv;	1637	SV *sv;
1521		1638
1522	/* work around bugs in 5.10 where manipulating magic values	1639	/* work around bugs in 5.10 where manipulating magic values
1523	* will perl ignore the magic in subsequent accesses	1640	* makes perl ignore the magic in subsequent accesses.
		1641	* also make a copy of non-PV values, to get them into a clean
		1642	* state (SvPV should do that, but it's buggy, see below).
1524	*/	1643	*/
1525	/SvGETMAGIC (string);/	1644	/SvGETMAGIC (string);/
1526	if (SvMAGICAL (string))	1645	if (SvMAGICAL (string) \|\| !SvPOK (string))
1527	string = sv_2mortal (newSVsv (string));	1646	string = sv_2mortal (newSVsv (string));
1528		1647
1529	SvUPGRADE (string, SVt_PV);	1648	SvUPGRADE (string, SVt_PV);
1530		1649
1531	/* work around a bug in perl 5.10, which causes SvCUR to fail an	1650	/* work around a bug in perl 5.10, which causes SvCUR to fail an
…		…
1548	if (offset > json->max_size && json->max_size)	1667	if (offset > json->max_size && json->max_size)
1549	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1668	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1550	(unsigned long)SvCUR (string), (unsigned long)json->max_size);	1669	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1551	}	1670	}
1552		1671
1553	if (json->flags & F_UTF8)	1672	if (DECODE_WANTS_OCTETS (json))
1554	sv_utf8_downgrade (string, 0);	1673	sv_utf8_downgrade (string, 0);
1555	else	1674	else
1556	sv_utf8_upgrade (string);	1675	sv_utf8_upgrade (string);
1557		1676
1558	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1677	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
…		…
1600	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);
1601	LEAVE;	1720	LEAVE;
1602		1721
1603	croak ("%s, at character offset %d (before \"%s\")",	1722	croak ("%s, at character offset %d (before \"%s\")",
1604	dec.err,	1723	dec.err,
1605	ptr_to_index (string, dec.cur),	1724	(int)ptr_to_index (string, dec.cur),
1606	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1725	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1607	}	1726	}
1608		1727
1609	sv = sv_2mortal (sv);	1728	sv = sv_2mortal (sv);
1610		1729
…		…
1738	self->incr_mode = INCR_M_STR;	1857	self->incr_mode = INCR_M_STR;
1739	goto incr_m_str;	1858	goto incr_m_str;
1740		1859
1741	case '[':	1860	case '[':
1742	case '{':	1861	case '{':
		1862	case '(':
1743	if (++self->incr_nest > self->max_depth)	1863	if (++self->incr_nest > self->max_depth)
1744	croak (ERR_NESTING_EXCEEDED);	1864	croak (ERR_NESTING_EXCEEDED);
1745	break;	1865	break;
1746		1866
1747	case ']':	1867	case ']':
1748	case '}':	1868	case '}':
1749	if (--self->incr_nest <= 0)	1869	if (--self->incr_nest <= 0)
1750	goto interrupt;	1870	goto interrupt;
		1871	break;
		1872
		1873	case ')':
		1874	--self->incr_nest;
1751	break;	1875	break;
1752		1876
1753	case '#':	1877	case '#':
1754	self->incr_mode = INCR_M_C1;	1878	self->incr_mode = INCR_M_C1;
1755	goto incr_m_c;	1879	goto incr_m_c;
…		…
1781	i >= '0' && i <= '9' ? i - '0'	1905	i >= '0' && i <= '9' ? i - '0'
1782	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1906	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1783	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1907	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1784	: -1;	1908	: -1;
1785		1909
1786	json_stash = gv_stashpv ("JSON::XS" , 1);	1910	json_stash = gv_stashpv ("JSON::XS" , 1);
1787	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1911	types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1788		1912
1789	json_true = get_bool ("JSON::XS::true");	1913	types_true = get_bool ("Types::Serialiser::true");
1790	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);
1791		1918
1792	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 */
1793	}	1920	}
1794		1921
1795	PROTOTYPES: DISABLE	1922	PROTOTYPES: DISABLE
1796		1923
1797	void CLONE (...)	1924	void CLONE (...)
1798	CODE:	1925	CODE:
1799	json_stash = 0;	1926	json_stash = 0;
1800	json_boolean_stash = 0;	1927	types_boolean_stash = 0;
1801		1928
1802	void new (char *klass)	1929	void new (char *klass)
1803	PPCODE:	1930	PPCODE:
1804	{	1931	{
1805	SV *pv = NEWSV (0, sizeof (JSON));	1932	SV *pv = NEWSV (0, sizeof (JSON));
1806	SvPOK_only (pv);	1933	SvPOK_only (pv);
1807	json_init ((JSON *)SvPVX (pv));	1934	json_init ((JSON *)SvPVX (pv));
1808	XPUSHs (sv_2mortal (sv_bless (	1935	XPUSHs (sv_2mortal (sv_bless (
1809	newRV_noinc (pv),	1936	newRV_noinc (pv),
1810	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1937	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
…		…
1825	shrink = F_SHRINK	1952	shrink = F_SHRINK
1826	allow_blessed = F_ALLOW_BLESSED	1953	allow_blessed = F_ALLOW_BLESSED
1827	convert_blessed = F_CONV_BLESSED	1954	convert_blessed = F_CONV_BLESSED
1828	relaxed = F_RELAXED	1955	relaxed = F_RELAXED
1829	allow_unknown = F_ALLOW_UNKNOWN	1956	allow_unknown = F_ALLOW_UNKNOWN
		1957	allow_tags = F_ALLOW_TAGS
1830	PPCODE:	1958	PPCODE:
1831	{	1959	{
1832	if (enable)	1960	if (enable)
1833	self->flags \|= ix;	1961	self->flags \|= ix;
1834	else	1962	else
…		…
1850	get_shrink = F_SHRINK	1978	get_shrink = F_SHRINK
1851	get_allow_blessed = F_ALLOW_BLESSED	1979	get_allow_blessed = F_ALLOW_BLESSED
1852	get_convert_blessed = F_CONV_BLESSED	1980	get_convert_blessed = F_CONV_BLESSED
1853	get_relaxed = F_RELAXED	1981	get_relaxed = F_RELAXED
1854	get_allow_unknown = F_ALLOW_UNKNOWN	1982	get_allow_unknown = F_ALLOW_UNKNOWN
		1983	get_allow_tags = F_ALLOW_TAGS
1855	PPCODE:	1984	PPCODE:
1856	XPUSHs (boolSV (self->flags & ix));	1985	XPUSHs (boolSV (self->flags & ix));
1857		1986
1858	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)	1987	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1859	PPCODE:	1988	PPCODE:
…		…
1887	}	2016	}
1888		2017
1889	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)
1890	PPCODE:	2019	PPCODE:
1891	{	2020	{
1892	if (!self->cb_sk_object)	2021	if (!self->cb_sk_object)
1893	self->cb_sk_object = newHV ();	2022	self->cb_sk_object = newHV ();
1894		2023
1895	if (SvOK (cb))	2024	if (SvOK (cb))
1896	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	2025	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1897	else	2026	else
…		…
1908	XPUSHs (ST (0));	2037	XPUSHs (ST (0));
1909	}	2038	}
1910		2039
1911	void encode (JSON self, SV scalar)	2040	void encode (JSON self, SV scalar)
1912	PPCODE:	2041	PPCODE:
1913	XPUSHs (encode_json (scalar, self));	2042	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2043	XPUSHs (scalar);
1914		2044
1915	void decode (JSON self, SV jsonstr)	2045	void decode (JSON self, SV jsonstr)
1916	PPCODE:	2046	PPCODE:
1917	XPUSHs (decode_json (jsonstr, self, 0));	2047	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2048	XPUSHs (jsonstr);
1918		2049
1919	void decode_prefix (JSON self, SV jsonstr)	2050	void decode_prefix (JSON self, SV jsonstr)
1920	PPCODE:	2051	PPCODE:
1921	{	2052	{
		2053	SV *sv;
1922	char *offset;	2054	char *offset;
		2055	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1923	EXTEND (SP, 2);	2056	EXTEND (SP, 2);
1924	PUSHs (decode_json (jsonstr, self, &offset));	2057	PUSHs (sv);
1925	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));	2058	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1926	}	2059	}
1927		2060
1928	void incr_parse (JSON self, SV jsonstr = 0)	2061	void incr_parse (JSON self, SV jsonstr = 0)
1929	PPCODE:	2062	PPCODE:
1930	{	2063	{
1931	if (!self->incr_text)	2064	if (!self->incr_text)
1932	self->incr_text = newSVpvn ("", 0);	2065	self->incr_text = newSVpvn ("", 0);
		2066
		2067	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2068	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2069	if (DECODE_WANTS_OCTETS (self))
		2070	{
		2071	if (self->incr_pos)
		2072	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2073	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2074
		2075	sv_utf8_downgrade (self->incr_text, 0);
		2076	}
		2077	else
		2078	{
		2079	sv_utf8_upgrade (self->incr_text);
		2080
		2081	if (self->incr_pos)
		2082	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2083	- (U8 *)SvPVX (self->incr_text);
		2084	}
1933		2085
1934	// append data, if any	2086	// append data, if any
1935	if (jsonstr)	2087	if (jsonstr)
1936	{	2088	{
		2089	/* make sure both strings have same encoding */
		2090	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1937	if (SvUTF8 (jsonstr))	2091	if (SvUTF8 (jsonstr))
		2092	sv_utf8_downgrade (jsonstr, 0);
1938	{	2093	else
1939	if (!SvUTF8 (self->incr_text))
1940	{
1941	/* utf-8-ness differs, need to upgrade */
1942	sv_utf8_upgrade (self->incr_text);
1943
1944	if (self->incr_pos)
1945	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1946	- (U8 *)SvPVX (self->incr_text);
1947	}
1948	}
1949	else if (SvUTF8 (self->incr_text))
1950	sv_utf8_upgrade (jsonstr);	2094	sv_utf8_upgrade (jsonstr);
1951		2095
		2096	/* and then just blindly append */
1952	{	2097	{
1953	STRLEN len;	2098	STRLEN len;
1954	const char *str = SvPV (jsonstr, len);	2099	const char *str = SvPV (jsonstr, len);
1955	STRLEN cur = SvCUR (self->incr_text);	2100	STRLEN cur = SvCUR (self->incr_text);
1956		2101
…		…
1964	}	2109	}
1965		2110
1966	if (GIMME_V != G_VOID)	2111	if (GIMME_V != G_VOID)
1967	do	2112	do
1968	{	2113	{
		2114	SV *sv;
1969	char *offset;	2115	char *offset;
1970		2116
1971	if (!INCR_DONE (self))	2117	if (!INCR_DONE (self))
1972	{	2118	{
1973	incr_parse (self);	2119	incr_parse (self);
…		…
1975	if (self->incr_pos > self->max_size && self->max_size)	2121	if (self->incr_pos > self->max_size && self->max_size)
1976	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	2122	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1977	(unsigned long)self->incr_pos, (unsigned long)self->max_size);	2123	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
1978		2124
1979	if (!INCR_DONE (self))	2125	if (!INCR_DONE (self))
		2126	{
		2127	// as an optimisation, do not accumulate white space in the incr buffer
		2128	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2129	{
		2130	self->incr_pos = 0;
		2131	SvCUR_set (self->incr_text, 0);
		2132	}
		2133
1980	break;	2134	break;
		2135	}
1981	}	2136	}
1982		2137
1983	XPUSHs (decode_json (self->incr_text, self, &offset));	2138	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2139	XPUSHs (sv);
1984		2140
1985	self->incr_pos -= offset - SvPVX (self->incr_text);	2141	self->incr_pos -= offset - SvPVX (self->incr_text);
1986	self->incr_nest = 0;	2142	self->incr_nest = 0;
1987	self->incr_mode = 0;	2143	self->incr_mode = 0;
1988		2144
…		…
2032	SvREFCNT_dec (self->incr_text);	2188	SvREFCNT_dec (self->incr_text);
2033		2189
2034	PROTOTYPES: ENABLE	2190	PROTOTYPES: ENABLE
2035		2191
2036	void encode_json (SV *scalar)	2192	void encode_json (SV *scalar)
2037	ALIAS:
2038	to_json_ = 0
2039	encode_json = F_UTF8
2040	PPCODE:	2193	PPCODE:
2041	{	2194	{
2042	JSON json;	2195	JSON json;
2043	json_init (&json);	2196	json_init (&json);
2044	json.flags \|= ix;	2197	json.flags \|= F_UTF8;
2045	XPUSHs (encode_json (scalar, &json));	2198	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2199	XPUSHs (scalar);
2046	}	2200	}
2047		2201
2048	void decode_json (SV *jsonstr)	2202	void decode_json (SV *jsonstr)
2049	ALIAS:
2050	from_json_ = 0
2051	decode_json = F_UTF8
2052	PPCODE:	2203	PPCODE:
2053	{	2204	{
2054	JSON json;	2205	JSON json;
2055	json_init (&json);	2206	json_init (&json);
2056	json.flags \|= ix;	2207	json.flags \|= F_UTF8;
2057	XPUSHs (decode_json (jsonstr, &json, 0));	2208	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2209	XPUSHs (jsonstr);
2058	}	2210	}
2059		2211

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.107 by root, Wed Mar 17 01:45:43 2010 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.107 by root, Wed Mar 17 01:45:43 2010 UTC vs.
Revision 1.121 by root, Tue Oct 29 00:06:40 2013 UTC