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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.132 by root, Tue Sep 5 13:07:09 2017 UTC vs.
Revision 1.136 by root, Thu Nov 15 22:35:35 2018 UTC

…		…
50	#define F_ALLOW_TAGS 0x00004000UL	50	#define F_ALLOW_TAGS 0x00004000UL
51	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	51	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
52		52
53	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	53	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
54		54
55	#define INIT_SIZE 32 // initial scalar size to be allocated	55	#define INIT_SIZE 64 // initial scalar size to be allocated
56	#define INDENT_STEP 3 // spaces per indentation level	56	#define INDENT_STEP 3 // spaces per indentation level
57		57
58	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	58	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
59		59
60	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)	60	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
…		…
78	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	78	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
79		79
80	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"	80	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
81		81
82	#ifdef USE_ITHREADS	82	#ifdef USE_ITHREADS
83	# define JSON_SLOW 1
84	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	83	# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
85	# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))	84	# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
		85	# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
86	#else	86	#else
87	# define JSON_SLOW 0
88	# define JSON_STASH json_stash	87	# define JSON_STASH json_stash
89	# define BOOL_STASH bool_stash	88	# define BOOL_STASH bool_stash
		89	# define GET_BOOL(value) bool_ ## value
90	#endif	90	#endif
91		91
92	// the amount of HEs to allocate on the stack, when sorting keys	92	// the amount of HEs to allocate on the stack, when sorting keys
93	#define STACK_HES 64	93	#define STACK_HES 64
94		94
95	static HV json_stash, bool_stash; // JSON::XS::, Types::Serialiser::Boolean::	95	static HV json_stash, bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
96	static SV bool_true, bool_false, *sv_json;	96	static SV bool_false, bool_true;
		97	static SV *sv_json;
97		98
98	enum {	99	enum {
99	INCR_M_WS = 0, // initial whitespace skipping, must be 0	100	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		101	INCR_M_TFN, // inside true/false/null
		102	INCR_M_NUM, // inside number
100	INCR_M_STR, // inside string	103	INCR_M_STR, // inside string
101	INCR_M_BS, // inside backslash	104	INCR_M_BS, // inside backslash
102	INCR_M_C0, // inside comment in initial whitespace sequence	105	INCR_M_C0, // inside comment in initial whitespace sequence
103	INCR_M_C1, // inside comment in other places	106	INCR_M_C1, // inside comment in other places
104	INCR_M_JSON // outside anything, count nesting	107	INCR_M_JSON // outside anything, count nesting
…		…
117	// for the incremental parser	120	// for the incremental parser
118	SV *incr_text; // the source text so far	121	SV *incr_text; // the source text so far
119	STRLEN incr_pos; // the current offset into the text	122	STRLEN incr_pos; // the current offset into the text
120	int incr_nest; // {[]}-nesting level	123	int incr_nest; // {[]}-nesting level
121	unsigned char incr_mode;	124	unsigned char incr_mode;
		125
		126	SV v_false, v_true;
122	} JSON;	127	} JSON;
123		128
124	INLINE void	129	INLINE void
125	json_init (JSON *json)	130	json_init (JSON *json)
126	{	131	{
127	Zero (json, 1, JSON);	132	static const JSON init = { F_ALLOW_NONREF, 512 };
128	json->max_depth = 512;	133
		134	*json = init;
129	}	135	}
130		136
131	/////////////////////////////////////////////////////////////////////////////	137	/////////////////////////////////////////////////////////////////////////////
132	// utility functions	138	// utility functions
133		139
…		…
776	{	782	{
777	HV *stash = SvSTASH (sv);	783	HV *stash = SvSTASH (sv);
778		784
779	if (stash == bool_stash)	785	if (stash == bool_stash)
780	{	786	{
781	if (SvIV (sv))
782	encode_str (enc, "true", 4, 0);	787	if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
783	else
784	encode_str (enc, "false", 5, 0);	788	else encode_str (enc, "false", 5, 0);
785	}	789	}
786	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))	790	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
787	{	791	{
788	int count;	792	int count;
789	dSP;	793	dSP;
790		794
791	ENTER; SAVETMPS;	795	ENTER; SAVETMPS;
792	SAVESTACK_POS ();
793	PUSHMARK (SP);	796	PUSHMARK (SP);
794	EXTEND (SP, 2);	797	EXTEND (SP, 2);
795	// we re-bless the reference to get overload and other niceties right	798	// we re-bless the reference to get overload and other niceties right
796	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));	799	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
797	PUSHs (sv_json);	800	PUSHs (sv_json);
…		…
809	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));	812	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
810	encode_ch (enc, '"');	813	encode_ch (enc, '"');
811	encode_ch (enc, ')');	814	encode_ch (enc, ')');
812	encode_ch (enc, '[');	815	encode_ch (enc, '[');
813		816
814	while (count)	817	if (count)
815	{	818	{
		819	int i;
		820
		821	for (i = 0; i < count - 1; ++i)
		822	{
816	encode_sv (enc, SP[1 - count--]);	823	encode_sv (enc, SP[i + 1 - count]);
817
818	if (count)
819	encode_ch (enc, ',');	824	encode_ch (enc, ',');
		825	}
		826
		827	encode_sv (enc, TOPs);
		828	SP -= count;
820	}	829	}
821		830
822	encode_ch (enc, ']');	831	encode_ch (enc, ']');
823		832
824	FREETMPS; LEAVE;	833	FREETMPS; LEAVE;
…		…
1515	{	1524	{
1516	dSP;	1525	dSP;
1517	int count;	1526	int count;
1518		1527
1519	ENTER; SAVETMPS;	1528	ENTER; SAVETMPS;
1520	SAVESTACK_POS ();
1521	PUSHMARK (SP);	1529	PUSHMARK (SP);
1522	XPUSHs (HeVAL (he));	1530	XPUSHs (HeVAL (he));
1523	sv_2mortal (sv);	1531	sv_2mortal (sv);
1524		1532
1525	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1533	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
…		…
1528	{	1536	{
1529	sv = newSVsv (POPs);	1537	sv = newSVsv (POPs);
1530	FREETMPS; LEAVE;	1538	FREETMPS; LEAVE;
1531	return sv;	1539	return sv;
1532	}	1540	}
		1541	else if (count)
		1542	croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1533		1543
1534	SvREFCNT_inc (sv);	1544	SvREFCNT_inc (sv);
1535	FREETMPS; LEAVE;	1545	FREETMPS; LEAVE;
1536	}	1546	}
1537	}	1547	}
…		…
1540	{	1550	{
1541	dSP;	1551	dSP;
1542	int count;	1552	int count;
1543		1553
1544	ENTER; SAVETMPS;	1554	ENTER; SAVETMPS;
1545	SAVESTACK_POS ();
1546	PUSHMARK (SP);	1555	PUSHMARK (SP);
1547	XPUSHs (sv_2mortal (sv));	1556	XPUSHs (sv_2mortal (sv));
1548		1557
1549	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1558	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1550		1559
…		…
1552	{	1561	{
1553	sv = newSVsv (POPs);	1562	sv = newSVsv (POPs);
1554	FREETMPS; LEAVE;	1563	FREETMPS; LEAVE;
1555	return sv;	1564	return sv;
1556	}	1565	}
		1566	else if (count)
		1567	croak ("filter_json_object callbacks must not return more than one scalar");
1557		1568
1558	SvREFCNT_inc (sv);	1569	SvREFCNT_inc (sv);
1559	FREETMPS; LEAVE;	1570	FREETMPS; LEAVE;
1560	}	1571	}
1561	}	1572	}
…		…
1666	case '-':	1677	case '-':
1667	case '0': case '1': case '2': case '3': case '4':	1678	case '0': case '1': case '2': case '3': case '4':
1668	case '5': case '6': case '7': case '8': case '9':	1679	case '5': case '6': case '7': case '8': case '9':
1669	return decode_num (dec);	1680	return decode_num (dec);
1670		1681
		1682	case 'f':
		1683	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
		1684	{
		1685	dec->cur += 5;
		1686
		1687	if (expect_false (!dec->json.v_false))
		1688	dec->json.v_false = GET_BOOL (false);
		1689
		1690	return newSVsv (dec->json.v_false);
		1691	}
		1692	else
		1693	ERR ("'false' expected");
		1694
		1695	break;
		1696
1671	case 't':	1697	case 't':
1672	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1698	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1673	{	1699	{
1674	dec->cur += 4;	1700	dec->cur += 4;
1675	#if JSON_SLOW	1701
1676	bool_true = get_bool ("Types::Serialiser::true");	1702	if (expect_false (!dec->json.v_true))
1677	#endif	1703	dec->json.v_true = GET_BOOL (true);
		1704
1678	return newSVsv (bool_true);	1705	return newSVsv (dec->json.v_true);
1679	}	1706	}
1680	else	1707	else
1681	ERR ("'true' expected");	1708	ERR ("'true' expected");
1682
1683	break;
1684
1685	case 'f':
1686	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1687	{
1688	dec->cur += 5;
1689	#if JSON_SLOW
1690	bool_false = get_bool ("Types::Serialiser::false");
1691	#endif
1692	return newSVsv (bool_false);
1693	}
1694	else
1695	ERR ("'false' expected");
1696		1709
1697	break;	1710	break;
1698		1711
1699	case 'n':	1712	case 'n':
1700	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))	1713	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
…		…
1784	else if (sv)	1797	else if (sv)
1785	{	1798	{
1786	// check for trailing garbage	1799	// check for trailing garbage
1787	decode_ws (&dec);	1800	decode_ws (&dec);
1788		1801
1789	if (*dec.cur)	1802	if (dec.cur != dec.end)
1790	{	1803	{
1791	dec.err = "garbage after JSON object";	1804	dec.err = "garbage after JSON object";
1792	SvREFCNT_dec (sv);	1805	SvREFCNT_dec (sv);
1793	sv = 0;	1806	sv = 0;
1794	}	1807	}
…		…
1832	// the state machine here is a bit convoluted and could be simplified a lot	1845	// the state machine here is a bit convoluted and could be simplified a lot
1833	// but this would make it slower, so...	1846	// but this would make it slower, so...
1834		1847
1835	for (;;)	1848	for (;;)
1836	{	1849	{
1837	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D
1838	switch (self->incr_mode)	1850	switch (self->incr_mode)
1839	{	1851	{
		1852	// reached end of a scalar, see if we are inside a nested structure or not
		1853	end_of_scalar:
		1854	self->incr_mode = INCR_M_JSON;
		1855
		1856	if (self->incr_nest) // end of a scalar inside array, object or tag
		1857	goto incr_m_json;
		1858	else // end of scalar outside structure, json text ends here
		1859	goto interrupt;
		1860
1840	// only used for initial whitespace skipping	1861	// only used for initial whitespace skipping
1841	case INCR_M_WS:	1862	case INCR_M_WS:
1842	for (;;)	1863	for (;;)
1843	{	1864	{
1844	if (*p > 0x20)	1865	if (*p > 0x20)
…		…
1886	++p;	1907	++p;
1887	}	1908	}
1888		1909
1889	break;	1910	break;
1890		1911
		1912	// inside true/false/null
		1913	case INCR_M_TFN:
		1914	incr_m_tfn:
		1915	for (;;)
		1916	switch (*p++)
		1917	{
		1918	case 'r': case 'u': case 'e': // tRUE, falsE, nUll
		1919	case 'a': case 'l': case 's': // fALSe, nuLL
		1920	// allowed
		1921	break;
		1922
		1923	default:
		1924	--p;
		1925	goto end_of_scalar;
		1926	}
		1927
		1928	// inside a number
		1929	case INCR_M_NUM:
		1930	incr_m_num:
		1931	for (;;)
		1932	switch (*p++)
		1933	{
		1934	case 'e': case 'E': case '.': case '+':
		1935	case '-':
		1936	case '0': case '1': case '2': case '3': case '4':
		1937	case '5': case '6': case '7': case '8': case '9':
		1938	// allowed
		1939	break;
		1940
		1941	default:
		1942	--p;
		1943	goto end_of_scalar;
		1944	}
		1945
1891	// inside a string	1946	// inside a string
1892	case INCR_M_STR:	1947	case INCR_M_STR:
1893	incr_m_str:	1948	incr_m_str:
1894	for (;;)	1949	for (;;)
1895	{	1950	{
1896	if (*p == '"')	1951	if (*p == '"')
1897	{	1952	{
1898	++p;	1953	++p;
1899	self->incr_mode = INCR_M_JSON;
1900
1901	if (!self->incr_nest)
1902	goto interrupt;
1903
1904	goto incr_m_json;	1954	goto end_of_scalar;
1905	}	1955	}
1906	else if (*p == '\\')	1956	else if (*p == '\\')
1907	{	1957	{
1908	++p; // "virtually" consumes character after \	1958	++p; // "virtually" consumes character after \
1909		1959
…		…
1939	--p; // do not eat the whitespace, let the next round do it	1989	--p; // do not eat the whitespace, let the next round do it
1940	goto interrupt;	1990	goto interrupt;
1941	}	1991	}
1942	break;	1992	break;
1943		1993
		1994	// the following three blocks handle scalars. this makes the parser
		1995	// more strict than required inside arrays or objects, and could
		1996	// be moved to a special case on the toplevel (except strings)
		1997	case 't':
		1998	case 'f':
		1999	case 'n':
		2000	self->incr_mode = INCR_M_TFN;
		2001	goto incr_m_tfn;
		2002
		2003	case '-':
		2004	case '0': case '1': case '2': case '3': case '4':
		2005	case '5': case '6': case '7': case '8': case '9':
		2006	self->incr_mode = INCR_M_NUM;
		2007	goto incr_m_num;
		2008
1944	case '"':	2009	case '"':
1945	self->incr_mode = INCR_M_STR;	2010	self->incr_mode = INCR_M_STR;
1946	goto incr_m_str;	2011	goto incr_m_str;
1947		2012
1948	case '[':	2013	case '[':
…		…
1995	: i >= 'A' && i <= 'F' ? i - 'A' + 10	2060	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1996	: -1;	2061	: -1;
1997		2062
1998	json_stash = gv_stashpv ("JSON::XS" , 1);	2063	json_stash = gv_stashpv ("JSON::XS" , 1);
1999	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);	2064	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
		2065	bool_false = get_bool ("Types::Serialiser::false");
2000	bool_true = get_bool ("Types::Serialiser::true");	2066	bool_true = get_bool ("Types::Serialiser::true");
2001	bool_false = get_bool ("Types::Serialiser::false");
2002		2067
2003	sv_json = newSVpv ("JSON", 0);	2068	sv_json = newSVpv ("JSON", 0);
2004	SvREADONLY_on (sv_json);	2069	SvREADONLY_on (sv_json);
2005		2070
2006	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */	2071	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
…		…
2008		2073
2009	PROTOTYPES: DISABLE	2074	PROTOTYPES: DISABLE
2010		2075
2011	void CLONE (...)	2076	void CLONE (...)
2012	CODE:	2077	CODE:
		2078	// as long as these writes are atomic, the race should not matter
		2079	// as existing threads either already use 0, or use the old value,
		2080	// which is sitll correct for the initial thread.
2013	json_stash = 0;	2081	json_stash = 0;
2014	bool_stash = 0;	2082	bool_stash = 0;
		2083	bool_false = 0;
		2084	bool_true = 0;
2015		2085
2016	void new (char *klass)	2086	void new (char *klass)
2017	PPCODE:	2087	PPCODE:
2018	{	2088	{
2019	SV *pv = NEWSV (0, sizeof (JSON));	2089	SV *pv = NEWSV (0, sizeof (JSON));
…		…
2022	XPUSHs (sv_2mortal (sv_bless (	2092	XPUSHs (sv_2mortal (sv_bless (
2023	newRV_noinc (pv),	2093	newRV_noinc (pv),
2024	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	2094	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
2025	)));	2095	)));
2026	}	2096	}
		2097
		2098	void boolean_values (JSON self, SV v_false = 0, SV *v_true = 0)
		2099	PPCODE:
		2100	self->v_false = newSVsv (v_false);
		2101	self->v_true = newSVsv (v_true);
		2102	XPUSHs (ST (0));
		2103
		2104	void get_boolean_values (JSON *self)
		2105	PPCODE:
		2106	if (self->v_false && self->v_true)
		2107	{
		2108	EXTEND (SP, 2);
		2109	PUSHs (self->v_false);
		2110	PUSHs (self->v_true);
		2111	}
2027		2112
2028	void ascii (JSON *self, int enable = 1)	2113	void ascii (JSON *self, int enable = 1)
2029	ALIAS:	2114	ALIAS:
2030	ascii = F_ASCII	2115	ascii = F_ASCII
2031	latin1 = F_LATIN1	2116	latin1 = F_LATIN1
…		…
2268	self->incr_mode = 0;	2353	self->incr_mode = 0;
2269	}	2354	}
2270		2355
2271	void DESTROY (JSON *self)	2356	void DESTROY (JSON *self)
2272	CODE:	2357	CODE:
		2358	SvREFCNT_dec (self->v_false);
		2359	SvREFCNT_dec (self->v_true);
2273	SvREFCNT_dec (self->cb_sk_object);	2360	SvREFCNT_dec (self->cb_sk_object);
2274	SvREFCNT_dec (self->cb_object);	2361	SvREFCNT_dec (self->cb_object);
2275	SvREFCNT_dec (self->incr_text);	2362	SvREFCNT_dec (self->incr_text);
2276		2363
2277	PROTOTYPES: ENABLE	2364	PROTOTYPES: ENABLE

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.132 by root, Tue Sep 5 13:07:09 2017 UTC vs. Revision 1.136 by root, Thu Nov 15 22:35:35 2018 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.132 by root, Tue Sep 5 13:07:09 2017 UTC vs.
Revision 1.136 by root, Thu Nov 15 22:35:35 2018 UTC