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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.65 by root, Sat Oct 13 01:55:31 2007 UTC vs.
Revision 1.91 by root, Mon Sep 22 07:26:26 2008 UTC

…		…
4		4
5	#include <assert.h>	5	#include <assert.h>
6	#include <string.h>	6	#include <string.h>
7	#include <stdlib.h>	7	#include <stdlib.h>
8	#include <stdio.h>	8	#include <stdio.h>
		9	#include <limits.h>
9	#include <float.h>	10	#include <float.h>
10		11
11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
12	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
13	#endif	14	#endif
…		…
15	// 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
16	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarentees, though. if it breaks, you get to keep the pieces.
17	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
18	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
19	#endif	20	#endif
		21
		22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
20		23
21	#define F_ASCII 0x00000001UL	24	#define F_ASCII 0x00000001UL
22	#define F_LATIN1 0x00000002UL	25	#define F_LATIN1 0x00000002UL
23	#define F_UTF8 0x00000004UL	26	#define F_UTF8 0x00000004UL
24	#define F_INDENT 0x00000008UL	27	#define F_INDENT 0x00000008UL
…		…
28	#define F_ALLOW_NONREF 0x00000100UL	31	#define F_ALLOW_NONREF 0x00000100UL
29	#define F_SHRINK 0x00000200UL	32	#define F_SHRINK 0x00000200UL
30	#define F_ALLOW_BLESSED 0x00000400UL	33	#define F_ALLOW_BLESSED 0x00000400UL
31	#define F_CONV_BLESSED 0x00000800UL	34	#define F_CONV_BLESSED 0x00000800UL
32	#define F_RELAXED 0x00001000UL	35	#define F_RELAXED 0x00001000UL
33		36	#define F_ALLOW_UNKNOWN 0x00002000UL
34	#define F_MAXDEPTH 0xf8000000UL
35	#define S_MAXDEPTH 27
36	#define F_MAXSIZE 0x01f00000UL
37	#define S_MAXSIZE 20
38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39		38
40	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
41	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
42
43	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
44	#define F_DEFAULT (9UL << S_MAXDEPTH)
45		40
46	#define INIT_SIZE 32 // initial scalar size to be allocated	41	#define INIT_SIZE 32 // initial scalar size to be allocated
47	#define INDENT_STEP 3 // spaces per indentation level	42	#define INDENT_STEP 3 // spaces per indentation level
48		43
49	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	44	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
50		45
51	#define SB do {	46	#define SB do {
52	#define SE } while (0)	47	#define SE } while (0)
53		48
54	#if __GNUC__ >= 3	49	#if __GNUC__ >= 3
55	# define expect(expr,value) __builtin_expect ((expr),(value))	50	# define expect(expr,value) __builtin_expect ((expr), (value))
56	# define inline inline	51	# define INLINE static inline
57	#else	52	#else
58	# define expect(expr,value) (expr)	53	# define expect(expr,value) (expr)
59	# define inline static	54	# define INLINE static
60	#endif	55	#endif
61		56
62	#define expect_false(expr) expect ((expr) != 0, 0)	57	#define expect_false(expr) expect ((expr) != 0, 0)
63	#define expect_true(expr) expect ((expr) != 0, 1)	58	#define expect_true(expr) expect ((expr) != 0, 1)
		59
		60	#define IN_RANGE_INC(type,val,beg,end) \
		61	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
		62	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
		63
		64	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
64		65
65	#ifdef USE_ITHREADS	66	#ifdef USE_ITHREADS
66	# define JSON_SLOW 1	67	# define JSON_SLOW 1
67	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	68	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
68	#else	69	#else
…		…
71	#endif	72	#endif
72		73
73	static HV json_stash, json_boolean_stash; // JSON::XS::	74	static HV json_stash, json_boolean_stash; // JSON::XS::
74	static SV json_true, json_false;	75	static SV json_true, json_false;
75		76
		77	enum {
		78	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		79	INCR_M_STR, // inside string
		80	INCR_M_BS, // inside backslash
		81	INCR_M_JSON // outside anything, count nesting
		82	};
		83
		84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
		85
76	typedef struct {	86	typedef struct {
77	U32 flags;	87	U32 flags;
		88	U32 max_depth;
		89	STRLEN max_size;
		90
78	SV *cb_object;	91	SV *cb_object;
79	HV *cb_sk_object;	92	HV *cb_sk_object;
		93
		94	// for the incremental parser
		95	SV *incr_text; // the source text so far
		96	STRLEN incr_pos; // the current offset into the text
		97	int incr_nest; // {[]}-nesting level
		98	unsigned char incr_mode;
80	} JSON;	99	} JSON;
		100
		101	INLINE void
		102	json_init (JSON *json)
		103	{
		104	Zero (json, 1, JSON);
		105	json->max_depth = 512;
		106	}
81		107
82	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
83	// utility functions	109	// utility functions
84		110
85	inline void	111	INLINE SV *
		112	get_bool (const char *name)
		113	{
		114	SV *sv = get_sv (name, 1);
		115
		116	SvREADONLY_on (sv);
		117	SvREADONLY_on (SvRV (sv));
		118
		119	return sv;
		120	}
		121
		122	INLINE void
86	shrink (SV *sv)	123	shrink (SV *sv)
87	{	124	{
88	sv_utf8_downgrade (sv, 1);	125	sv_utf8_downgrade (sv, 1);
		126
89	if (SvLEN (sv) > SvCUR (sv) + 1)	127	if (SvLEN (sv) > SvCUR (sv) + 1)
90	{	128	{
91	#ifdef SvPV_shrink_to_cur	129	#ifdef SvPV_shrink_to_cur
92	SvPV_shrink_to_cur (sv);	130	SvPV_shrink_to_cur (sv);
93	#elif defined (SvPV_renew)	131	#elif defined (SvPV_renew)
…		…
99	// decode an utf-8 character and return it, or (UV)-1 in	137	// decode an utf-8 character and return it, or (UV)-1 in
100	// case of an error.	138	// case of an error.
101	// we special-case "safe" characters from U+80 .. U+7FF,	139	// we special-case "safe" characters from U+80 .. U+7FF,
102	// but use the very good perl function to parse anything else.	140	// but use the very good perl function to parse anything else.
103	// note that we never call this function for a ascii codepoints	141	// note that we never call this function for a ascii codepoints
104	inline UV	142	INLINE UV
105	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	143	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
106	{	144	{
107	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))	145	if (expect_true (len >= 2
108	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	146	&& IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
109	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	147	&& IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
110	{	148	{
111	*clen = 2;	149	*clen = 2;
112	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	150	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
113	}	151	}
114	else	152	else
115	{	153	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
116	*clen = (STRLEN)-1;	154	}
117	return (UV)-1;	155
118	}	156	// likewise for encoding, also never called for ascii codepoints
		157	// this function takes advantage of this fact, although current gccs
		158	// seem to optimise the check for >= 0x80 away anyways
		159	INLINE unsigned char *
		160	encode_utf8 (unsigned char *s, UV ch)
		161	{
		162	if (expect_false (ch < 0x000080))
		163	*s++ = ch;
		164	else if (expect_true (ch < 0x000800))
		165	*s++ = 0xc0 \| ( ch >> 6),
		166	*s++ = 0x80 \| ( ch & 0x3f);
		167	else if ( ch < 0x010000)
		168	*s++ = 0xe0 \| ( ch >> 12),
		169	*s++ = 0x80 \| ((ch >> 6) & 0x3f),
		170	*s++ = 0x80 \| ( ch & 0x3f);
		171	else if ( ch < 0x110000)
		172	*s++ = 0xf0 \| ( ch >> 18),
		173	*s++ = 0x80 \| ((ch >> 12) & 0x3f),
		174	*s++ = 0x80 \| ((ch >> 6) & 0x3f),
		175	*s++ = 0x80 \| ( ch & 0x3f);
		176
		177	return s;
119	}	178	}
120		179
121	/////////////////////////////////////////////////////////////////////////////	180	/////////////////////////////////////////////////////////////////////////////
122	// encoder	181	// encoder
123		182
…		…
127	char *cur; // SvPVX (sv) + current output position	186	char *cur; // SvPVX (sv) + current output position
128	char *end; // SvEND (sv)	187	char *end; // SvEND (sv)
129	SV *sv; // result scalar	188	SV *sv; // result scalar
130	JSON json;	189	JSON json;
131	U32 indent; // indentation level	190	U32 indent; // indentation level
132	U32 maxdepth; // max. indentation/recursion level	191	UV limit; // escape character values >= this value when encoding
133	} enc_t;	192	} enc_t;
134		193
135	inline void	194	INLINE void
136	need (enc_t *enc, STRLEN len)	195	need (enc_t *enc, STRLEN len)
137	{	196	{
138	if (expect_false (enc->cur + len >= enc->end))	197	if (expect_false (enc->cur + len >= enc->end))
139	{	198	{
140	STRLEN cur = enc->cur - SvPVX (enc->sv);	199	STRLEN cur = enc->cur - SvPVX (enc->sv);
…		…
142	enc->cur = SvPVX (enc->sv) + cur;	201	enc->cur = SvPVX (enc->sv) + cur;
143	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	202	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
144	}	203	}
145	}	204	}
146		205
147	inline void	206	INLINE void
148	encode_ch (enc_t *enc, char ch)	207	encode_ch (enc_t *enc, char ch)
149	{	208	{
150	need (enc, 1);	209	need (enc, 1);
151	*enc->cur++ = ch;	210	*enc->cur++ = ch;
152	}	211	}
…		…
206	{	265	{
207	uch = ch;	266	uch = ch;
208	clen = 1;	267	clen = 1;
209	}	268	}
210		269
211	if (uch > 0x10FFFFUL)	270	if (uch < 0x80/0x20/ \|\| uch >= enc->limit)
212	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
213
214	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
215	{	271	{
216	if (uch > 0xFFFFUL)	272	if (uch >= 0x10000UL)
217	{	273	{
		274	if (uch >= 0x110000UL)
		275	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		276
218	need (enc, len += 11);	277	need (enc, len += 11);
219	sprintf (enc->cur, "\\u%04x\\u%04x",	278	sprintf (enc->cur, "\\u%04x\\u%04x",
220	(int)((uch - 0x10000) / 0x400 + 0xD800),	279	(int)((uch - 0x10000) / 0x400 + 0xD800),
221	(int)((uch - 0x10000) % 0x400 + 0xDC00));	280	(int)((uch - 0x10000) % 0x400 + 0xDC00));
222	enc->cur += 12;	281	enc->cur += 12;
223	}	282	}
224	else	283	else
225	{	284	{
226	static char hexdigit [16] = "0123456789abcdef";
227	need (enc, len += 5);	285	need (enc, len += 5);
228	*enc->cur++ = '\\';	286	*enc->cur++ = '\\';
229	*enc->cur++ = 'u';	287	*enc->cur++ = 'u';
230	*enc->cur++ = hexdigit [ uch >> 12 ];	288	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
231	*enc->cur++ = hexdigit [(uch >> 8) & 15];	289	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
232	*enc->cur++ = hexdigit [(uch >> 4) & 15];	290	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
233	*enc->cur++ = hexdigit [(uch >> 0) & 15];	291	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
234	}	292	}
235		293
236	str += clen;	294	str += clen;
237	}	295	}
238	else if (enc->json.flags & F_LATIN1)	296	else if (enc->json.flags & F_LATIN1)
…		…
250	while (--clen);	308	while (--clen);
251	}	309	}
252	else	310	else
253	{	311	{
254	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed	312	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
255	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);	313	enc->cur = encode_utf8 (enc->cur, uch);
256	++str;	314	++str;
257	}	315	}
258	}	316	}
259	}	317	}
260	}	318	}
261		319
262	--len;	320	--len;
263	}	321	}
264	}	322	}
265		323
266	inline void	324	INLINE void
267	encode_indent (enc_t *enc)	325	encode_indent (enc_t *enc)
268	{	326	{
269	if (enc->json.flags & F_INDENT)	327	if (enc->json.flags & F_INDENT)
270	{	328	{
271	int spaces = enc->indent * INDENT_STEP;	329	int spaces = enc->indent * INDENT_STEP;
…		…
274	memset (enc->cur, ' ', spaces);	332	memset (enc->cur, ' ', spaces);
275	enc->cur += spaces;	333	enc->cur += spaces;
276	}	334	}
277	}	335	}
278		336
279	inline void	337	INLINE void
280	encode_space (enc_t *enc)	338	encode_space (enc_t *enc)
281	{	339	{
282	need (enc, 1);	340	need (enc, 1);
283	encode_ch (enc, ' ');	341	encode_ch (enc, ' ');
284	}	342	}
285		343
286	inline void	344	INLINE void
287	encode_nl (enc_t *enc)	345	encode_nl (enc_t *enc)
288	{	346	{
289	if (enc->json.flags & F_INDENT)	347	if (enc->json.flags & F_INDENT)
290	{	348	{
291	need (enc, 1);	349	need (enc, 1);
292	encode_ch (enc, '\n');	350	encode_ch (enc, '\n');
293	}	351	}
294	}	352	}
295		353
296	inline void	354	INLINE void
297	encode_comma (enc_t *enc)	355	encode_comma (enc_t *enc)
298	{	356	{
299	encode_ch (enc, ',');	357	encode_ch (enc, ',');
300		358
301	if (enc->json.flags & F_INDENT)	359	if (enc->json.flags & F_INDENT)
…		…
309	static void	367	static void
310	encode_av (enc_t enc, AV av)	368	encode_av (enc_t enc, AV av)
311	{	369	{
312	int i, len = av_len (av);	370	int i, len = av_len (av);
313		371
314	if (enc->indent >= enc->maxdepth)	372	if (enc->indent >= enc->json.max_depth)
315	croak ("data structure too deep (hit recursion limit)");	373	croak (ERR_NESTING_EXCEEDED);
316		374
317	encode_ch (enc, '[');	375	encode_ch (enc, '[');
318		376
319	if (len >= 0)	377	if (len >= 0)
320	{	378	{
…		…
394		452
395	static void	453	static void
396	encode_hv (enc_t enc, HV hv)	454	encode_hv (enc_t enc, HV hv)
397	{	455	{
398	HE *he;	456	HE *he;
399	int count;
400		457
401	if (enc->indent >= enc->maxdepth)	458	if (enc->indent >= enc->json.max_depth)
402	croak ("data structure too deep (hit recursion limit)");	459	croak (ERR_NESTING_EXCEEDED);
403		460
404	encode_ch (enc, '{');	461	encode_ch (enc, '{');
405		462
406	// for canonical output we have to sort by keys first	463	// for canonical output we have to sort by keys first
407	// actually, this is mostly due to the stupid so-called	464	// actually, this is mostly due to the stupid so-called
…		…
588		645
589	if (len == 1 && *pv == '1')	646	if (len == 1 && *pv == '1')
590	encode_str (enc, "true", 4, 0);	647	encode_str (enc, "true", 4, 0);
591	else if (len == 1 && *pv == '0')	648	else if (len == 1 && *pv == '0')
592	encode_str (enc, "false", 5, 0);	649	encode_str (enc, "false", 5, 0);
		650	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		651	encode_str (enc, "null", 4, 0);
593	else	652	else
594	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	653	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
595	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	654	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
596	}	655	}
		656	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		657	encode_str (enc, "null", 4, 0);
597	else	658	else
598	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	659	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
599	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	660	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
600	}	661	}
601		662
…		…
619	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	680	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
620	enc->cur += strlen (enc->cur);	681	enc->cur += strlen (enc->cur);
621	}	682	}
622	else if (SvIOKp (sv))	683	else if (SvIOKp (sv))
623	{	684	{
624	// we assume we can always read an IV as a UV	685	// we assume we can always read an IV as a UV and vice versa
625	if (SvUV (sv) & ~(UV)0x7fff)	686	// we assume two's complement
626	{	687	// we assume no aliasing issues in the union
627	// large integer, use the (rather slow) snprintf way.	688	if (SvIsUV (sv) ? SvUVX (sv) <= 59000
628	need (enc, sizeof (UV) * 3);	689	: SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
629	enc->cur +=
630	SvIsUV(sv)
631	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
632	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
633	}
634	else
635	{	690	{
636	// optimise the "small number case"	691	// optimise the "small number case"
637	// code will likely be branchless and use only a single multiplication	692	// code will likely be branchless and use only a single multiplication
		693	// works for numbers up to 59074
638	I32 i = SvIV (sv);	694	I32 i = SvIVX (sv);
639	U32 u;	695	U32 u;
640	char digit, nz = 0;	696	char digit, nz = 0;
641		697
642	need (enc, 6);	698	need (enc, 6);
643		699
…		…
649		705
650	// now output digit by digit, each time masking out the integer part	706	// now output digit by digit, each time masking out the integer part
651	// and multiplying by 5 while moving the decimal point one to the right,	707	// and multiplying by 5 while moving the decimal point one to the right,
652	// resulting in a net multiplication by 10.	708	// resulting in a net multiplication by 10.
653	// we always write the digit to memory but conditionally increment	709	// we always write the digit to memory but conditionally increment
654	// the pointer, to ease the usage of conditional move instructions.	710	// the pointer, to enable the use of conditional move instructions.
655	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;	711	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffffUL) 5;
656	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;	712	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffffUL) 5;
657	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;	713	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffffUL) 5;
658	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;	714	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffffUL) 5;
659	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'	715	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
660	}	716	}
		717	else
		718	{
		719	// large integer, use the (rather slow) snprintf way.
		720	need (enc, IVUV_MAXCHARS);
		721	enc->cur +=
		722	SvIsUV(sv)
		723	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
		724	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
		725	}
661	}	726	}
662	else if (SvROK (sv))	727	else if (SvROK (sv))
663	encode_rv (enc, SvRV (sv));	728	encode_rv (enc, SvRV (sv));
664	else if (!SvOK (sv))	729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
665	encode_str (enc, "null", 4, 0);	730	encode_str (enc, "null", 4, 0);
666	else	731	else
667	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	732	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
668	SvPV_nolen (sv), SvFLAGS (sv));	733	SvPV_nolen (sv), SvFLAGS (sv));
669	}	734	}
…		…
679	enc.json = *json;	744	enc.json = *json;
680	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
681	enc.cur = SvPVX (enc.sv);	746	enc.cur = SvPVX (enc.sv);
682	enc.end = SvEND (enc.sv);	747	enc.end = SvEND (enc.sv);
683	enc.indent = 0;	748	enc.indent = 0;
684	enc.maxdepth = DEC_DEPTH (enc.json.flags);	749	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
		750	: enc.json.flags & F_LATIN1 ? 0x000100UL
		751	: 0x110000UL;
685		752
686	SvPOK_only (enc.sv);	753	SvPOK_only (enc.sv);
687	encode_sv (&enc, scalar);	754	encode_sv (&enc, scalar);
688		755
689	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	756	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
710	JSON json;	777	JSON json;
711	U32 depth; // recursion depth	778	U32 depth; // recursion depth
712	U32 maxdepth; // recursion depth limit	779	U32 maxdepth; // recursion depth limit
713	} dec_t;	780	} dec_t;
714		781
715	inline void	782	INLINE void
716	decode_comment (dec_t *dec)	783	decode_comment (dec_t *dec)
717	{	784	{
718	// only '#'-style comments allowed a.t.m.	785	// only '#'-style comments allowed a.t.m.
719		786
720	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)	787	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
721	++dec->cur;	788	++dec->cur;
722	}	789	}
723		790
724	inline void	791	INLINE void
725	decode_ws (dec_t *dec)	792	decode_ws (dec_t *dec)
726	{	793	{
727	for (;;)	794	for (;;)
728	{	795	{
729	char ch = *dec->cur;	796	char ch = *dec->cur;
…		…
753	if (*dec->cur != ch) \	820	if (*dec->cur != ch) \
754	ERR (# ch " expected"); \	821	ERR (# ch " expected"); \
755	++dec->cur; \	822	++dec->cur; \
756	SE	823	SE
757		824
758	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	825	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
759	#define DEC_DEC_DEPTH --dec->depth	826	#define DEC_DEC_DEPTH --dec->depth
760		827
761	static SV decode_sv (dec_t dec);	828	static SV decode_sv (dec_t dec);
762		829
763	static signed char decode_hexdigit[256];	830	static signed char decode_hexdigit[256];
…		…
855		922
856	if (hi >= 0x80)	923	if (hi >= 0x80)
857	{	924	{
858	utf8 = 1;	925	utf8 = 1;
859		926
860	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);	927	cur = encode_utf8 (cur, hi);
861	}	928	}
862	else	929	else
863	*cur++ = hi;	930	*cur++ = hi;
864	}	931	}
865	break;	932	break;
…		…
867	default:	934	default:
868	--dec_cur;	935	--dec_cur;
869	ERR ("illegal backslash escape sequence in string");	936	ERR ("illegal backslash escape sequence in string");
870	}	937	}
871	}	938	}
872	else if (expect_true (ch >= 0x20 && ch <= 0x7f))	939	else if (expect_true (ch >= 0x20 && ch < 0x80))
873	*cur++ = ch;	940	*cur++ = ch;
874	else if (ch >= 0x80)	941	else if (ch >= 0x80)
875	{	942	{
876	STRLEN clen;	943	STRLEN clen;
877	UV uch;	944	UV uch;
…		…
1000		1067
1001	if (!is_nv)	1068	if (!is_nv)
1002	{	1069	{
1003	int len = dec->cur - start;	1070	int len = dec->cur - start;
1004		1071
1005	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1072	// special case the rather common 1..5-digit-int case
1006	if (*start == '-')	1073	if (*start == '-')
1007	switch (len)	1074	switch (len)
1008	{	1075	{
1009	case 2: return newSViv (-( start [1] - '0' * 1));	1076	case 2: return newSViv (-( start [1] - '0' * 1));
1010	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1077	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
1011	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1078	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1012	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1079	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
		1080	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1013	}	1081	}
1014	else	1082	else
1015	switch (len)	1083	switch (len)
1016	{	1084	{
1017	case 1: return newSViv ( start [0] - '0' * 1);	1085	case 1: return newSViv ( start [0] - '0' * 1);
1018	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1086	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1019	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1087	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1020	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1088	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		1089	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1021	}	1090	}
1022		1091
1023	{	1092	{
1024	UV uv;	1093	UV uv;
1025	int numtype = grok_number (start, len, &uv);	1094	int numtype = grok_number (start, len, &uv);
…		…
1133	char *p = dec->cur;	1202	char *p = dec->cur;
1134	char *e = p + 24; // only try up to 24 bytes	1203	char *e = p + 24; // only try up to 24 bytes
1135		1204
1136	for (;;)	1205	for (;;)
1137	{	1206	{
1138	// the >= 0x80 is true on most architectures	1207	// the >= 0x80 is false on most architectures
1139	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1208	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1140	{	1209	{
1141	// slow path, back up and use decode_str	1210	// slow path, back up and use decode_str
1142	SV *key = decode_str (dec);	1211	SV *key = decode_str (dec);
1143	if (!key)	1212	if (!key)
…		…
1274		1343
1275	static SV *	1344	static SV *
1276	decode_sv (dec_t *dec)	1345	decode_sv (dec_t *dec)
1277	{	1346	{
1278	// the beauty of JSON: you need exactly one character lookahead	1347	// the beauty of JSON: you need exactly one character lookahead
1279	// to parse anything.	1348	// to parse everything.
1280	switch (*dec->cur)	1349	switch (*dec->cur)
1281	{	1350	{
1282	case '"': ++dec->cur; return decode_str (dec);	1351	case '"': ++dec->cur; return decode_str (dec);
1283	case '[': ++dec->cur; return decode_av (dec);	1352	case '[': ++dec->cur; return decode_av (dec);
1284	case '{': ++dec->cur; return decode_hv (dec);	1353	case '{': ++dec->cur; return decode_hv (dec);
1285		1354
1286	case '-':	1355	case '-':
1287	case '0': case '1': case '2': case '3': case '4':	1356	case '0': case '1': case '2': case '3': case '4':
1288	case '5': case '6': case '7': case '8': case '9':	1357	case '5': case '6': case '7': case '8': case '9':
1289	return decode_num (dec);	1358	return decode_num (dec);
…		…
1291	case 't':	1360	case 't':
1292	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1361	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1293	{	1362	{
1294	dec->cur += 4;	1363	dec->cur += 4;
1295	#if JSON_SLOW	1364	#if JSON_SLOW
1296	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1365	json_true = get_bool ("JSON::XS::true");
1297	#endif	1366	#endif
1298	return SvREFCNT_inc (json_true);	1367	return newSVsv (json_true);
1299	}	1368	}
1300	else	1369	else
1301	ERR ("'true' expected");	1370	ERR ("'true' expected");
1302		1371
1303	break;	1372	break;
…		…
1305	case 'f':	1374	case 'f':
1306	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1375	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1307	{	1376	{
1308	dec->cur += 5;	1377	dec->cur += 5;
1309	#if JSON_SLOW	1378	#if JSON_SLOW
1310	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1379	json_false = get_bool ("JSON::XS::false");
1311	#endif	1380	#endif
1312	return SvREFCNT_inc (json_false);	1381	return newSVsv (json_false);
1313	}	1382	}
1314	else	1383	else
1315	ERR ("'false' expected");	1384	ERR ("'false' expected");
1316		1385
1317	break;	1386	break;
…		…
1335	fail:	1404	fail:
1336	return 0;	1405	return 0;
1337	}	1406	}
1338		1407
1339	static SV *	1408	static SV *
1340	decode_json (SV string, JSON json, UV *offset_return)	1409	decode_json (SV string, JSON json, STRLEN *offset_return)
1341	{	1410	{
1342	dec_t dec;	1411	dec_t dec;
1343	UV offset;	1412	STRLEN offset;
1344	SV *sv;	1413	SV *sv;
1345		1414
1346	SvGETMAGIC (string);	1415	SvGETMAGIC (string);
1347	SvUPGRADE (string, SVt_PV);	1416	SvUPGRADE (string, SVt_PV);
1348		1417
1349	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1418	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1419	* assertion with -DDEBUGGING, although SvCUR is documented to
		1420	* return the xpv_cur field which certainly exists after upgrading.
		1421	* according to nicholas clark, calling SvPOK fixes this.
		1422	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1423	* and hope for the best.
		1424	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1425	* assertion business is seriously broken, try yet another workaround
		1426	* for the broken -DDEBUGGING.
		1427	*/
		1428	#ifdef DEBUGGING
		1429	offset = SvOK (string) ? sv_len (string) : 0;
		1430	#else
		1431	offset = SvCUR (string);
		1432	#endif
		1433
		1434	if (offset > json->max_size && json->max_size)
1350	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1435	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1351	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1436	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1352		1437
1353	if (json->flags & F_UTF8)	1438	if (json->flags & F_UTF8)
1354	sv_utf8_downgrade (string, 0);	1439	sv_utf8_downgrade (string, 0);
1355	else	1440	else
1356	sv_utf8_upgrade (string);	1441	sv_utf8_upgrade (string);
1357		1442
1358	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1443	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1359		1444
1360	dec.json = *json;	1445	dec.json = *json;
1361	dec.cur = SvPVX (string);	1446	dec.cur = SvPVX (string);
1362	dec.end = SvEND (string);	1447	dec.end = SvEND (string);
1363	dec.err = 0;	1448	dec.err = 0;
1364	dec.depth = 0;	1449	dec.depth = 0;
1365	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1366		1450
1367	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1451	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1368	dec.json.flags \|= F_HOOK;	1452	dec.json.flags \|= F_HOOK;
1369		1453
1370	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1454	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
…		…
1421		1505
1422	return sv;	1506	return sv;
1423	}	1507	}
1424		1508
1425	/////////////////////////////////////////////////////////////////////////////	1509	/////////////////////////////////////////////////////////////////////////////
		1510	// incremental parser
		1511
		1512	static void
		1513	incr_parse (JSON *self)
		1514	{
		1515	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1516
		1517	for (;;)
		1518	{
		1519	//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
		1520	switch (self->incr_mode)
		1521	{
		1522	// only used for intiial whitespace skipping
		1523	case INCR_M_WS:
		1524	for (;;)
		1525	{
		1526	if (*p > 0x20)
		1527	{
		1528	self->incr_mode = INCR_M_JSON;
		1529	goto incr_m_json;
		1530	}
		1531	else if (!*p)
		1532	goto interrupt;
		1533
		1534	++p;
		1535	}
		1536
		1537	// skip a single char inside a string (for \\-processing)
		1538	case INCR_M_BS:
		1539	if (!*p)
		1540	goto interrupt;
		1541
		1542	++p;
		1543	self->incr_mode = INCR_M_STR;
		1544	goto incr_m_str;
		1545
		1546	// inside a string
		1547	case INCR_M_STR:
		1548	incr_m_str:
		1549	for (;;)
		1550	{
		1551	if (*p == '"')
		1552	{
		1553	++p;
		1554	self->incr_mode = INCR_M_JSON;
		1555
		1556	if (!self->incr_nest)
		1557	goto interrupt;
		1558
		1559	goto incr_m_json;
		1560	}
		1561	else if (*p == '\\')
		1562	{
		1563	++p; // "virtually" consumes character after \
		1564
		1565	if (!*p) // if at end of string we have to switch modes
		1566	{
		1567	self->incr_mode = INCR_M_BS;
		1568	goto interrupt;
		1569	}
		1570	}
		1571	else if (!*p)
		1572	goto interrupt;
		1573
		1574	++p;
		1575	}
		1576
		1577	// after initial ws, outside string
		1578	case INCR_M_JSON:
		1579	incr_m_json:
		1580	for (;;)
		1581	{
		1582	switch (*p++)
		1583	{
		1584	case 0:
		1585	--p;
		1586	goto interrupt;
		1587
		1588	case 0x09:
		1589	case 0x0a:
		1590	case 0x0d:
		1591	case 0x20:
		1592	if (!self->incr_nest)
		1593	{
		1594	--p; // do not eat the whitespace, let the next round do it
		1595	goto interrupt;
		1596	}
		1597	break;
		1598
		1599	case '"':
		1600	self->incr_mode = INCR_M_STR;
		1601	goto incr_m_str;
		1602
		1603	case '[':
		1604	case '{':
		1605	if (++self->incr_nest > self->max_depth)
		1606	croak (ERR_NESTING_EXCEEDED);
		1607	break;
		1608
		1609	case ']':
		1610	case '}':
		1611	if (--self->incr_nest <= 0)
		1612	goto interrupt;
		1613	}
		1614	}
		1615	}
		1616
		1617	modechange:
		1618	;
		1619	}
		1620
		1621	interrupt:
		1622	self->incr_pos = p - SvPVX (self->incr_text);
		1623	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
		1624	}
		1625
		1626	/////////////////////////////////////////////////////////////////////////////
1426	// XS interface functions	1627	// XS interface functions
1427		1628
1428	MODULE = JSON::XS PACKAGE = JSON::XS	1629	MODULE = JSON::XS PACKAGE = JSON::XS
1429		1630
1430	BOOT:	1631	BOOT:
…		…
1439	: -1;	1640	: -1;
1440		1641
1441	json_stash = gv_stashpv ("JSON::XS" , 1);	1642	json_stash = gv_stashpv ("JSON::XS" , 1);
1442	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1643	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1443		1644
1444	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1645	json_true = get_bool ("JSON::XS::true");
1445	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1646	json_false = get_bool ("JSON::XS::false");
1446	}	1647	}
1447		1648
1448	PROTOTYPES: DISABLE	1649	PROTOTYPES: DISABLE
1449		1650
1450	void CLONE (...)	1651	void CLONE (...)
…		…
1455	void new (char *klass)	1656	void new (char *klass)
1456	PPCODE:	1657	PPCODE:
1457	{	1658	{
1458	SV *pv = NEWSV (0, sizeof (JSON));	1659	SV *pv = NEWSV (0, sizeof (JSON));
1459	SvPOK_only (pv);	1660	SvPOK_only (pv);
1460	Zero (SvPVX (pv), 1, JSON);	1661	json_init ((JSON *)SvPVX (pv));
1461	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1662	XPUSHs (sv_2mortal (sv_bless (
1462	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));	1663	newRV_noinc (pv),
		1664	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		1665	)));
1463	}	1666	}
1464		1667
1465	void ascii (JSON *self, int enable = 1)	1668	void ascii (JSON *self, int enable = 1)
1466	ALIAS:	1669	ALIAS:
1467	ascii = F_ASCII	1670	ascii = F_ASCII
…		…
1475	allow_nonref = F_ALLOW_NONREF	1678	allow_nonref = F_ALLOW_NONREF
1476	shrink = F_SHRINK	1679	shrink = F_SHRINK
1477	allow_blessed = F_ALLOW_BLESSED	1680	allow_blessed = F_ALLOW_BLESSED
1478	convert_blessed = F_CONV_BLESSED	1681	convert_blessed = F_CONV_BLESSED
1479	relaxed = F_RELAXED	1682	relaxed = F_RELAXED
		1683	allow_unknown = F_ALLOW_UNKNOWN
1480	PPCODE:	1684	PPCODE:
1481	{	1685	{
1482	if (enable)	1686	if (enable)
1483	self->flags \|= ix;	1687	self->flags \|= ix;
1484	else	1688	else
1485	self->flags &= ~ix;	1689	self->flags &= ~ix;
1486		1690
1487	XPUSHs (ST (0));	1691	XPUSHs (ST (0));
1488	}	1692	}
1489		1693
1490	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1694	void get_ascii (JSON *self)
		1695	ALIAS:
		1696	get_ascii = F_ASCII
		1697	get_latin1 = F_LATIN1
		1698	get_utf8 = F_UTF8
		1699	get_indent = F_INDENT
		1700	get_canonical = F_CANONICAL
		1701	get_space_before = F_SPACE_BEFORE
		1702	get_space_after = F_SPACE_AFTER
		1703	get_allow_nonref = F_ALLOW_NONREF
		1704	get_shrink = F_SHRINK
		1705	get_allow_blessed = F_ALLOW_BLESSED
		1706	get_convert_blessed = F_CONV_BLESSED
		1707	get_relaxed = F_RELAXED
		1708	get_allow_unknown = F_ALLOW_UNKNOWN
1491	PPCODE:	1709	PPCODE:
1492	{	1710	XPUSHs (boolSV (self->flags & ix));
1493	UV log2 = 0;
1494		1711
1495	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1712	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1496		1713	PPCODE:
1497	while ((1UL << log2) < max_depth)	1714	self->max_depth = max_depth;
1498	++log2;
1499
1500	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1501
1502	XPUSHs (ST (0));	1715	XPUSHs (ST (0));
1503	}
1504		1716
		1717	U32 get_max_depth (JSON *self)
		1718	CODE:
		1719	RETVAL = self->max_depth;
		1720	OUTPUT:
		1721	RETVAL
		1722
1505	void max_size (JSON *self, UV max_size = 0)	1723	void max_size (JSON *self, U32 max_size = 0)
1506	PPCODE:	1724	PPCODE:
1507	{	1725	self->max_size = max_size;
1508	UV log2 = 0;
1509
1510	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1511	if (max_size == 1) max_size = 2;
1512
1513	while ((1UL << log2) < max_size)
1514	++log2;
1515
1516	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1517
1518	XPUSHs (ST (0));	1726	XPUSHs (ST (0));
1519	}	1727
		1728	int get_max_size (JSON *self)
		1729	CODE:
		1730	RETVAL = self->max_size;
		1731	OUTPUT:
		1732	RETVAL
1520		1733
1521	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1734	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1522	PPCODE:	1735	PPCODE:
1523	{	1736	{
1524	SvREFCNT_dec (self->cb_object);	1737	SvREFCNT_dec (self->cb_object);
…		…
1558	XPUSHs (decode_json (jsonstr, self, 0));	1771	XPUSHs (decode_json (jsonstr, self, 0));
1559		1772
1560	void decode_prefix (JSON self, SV jsonstr)	1773	void decode_prefix (JSON self, SV jsonstr)
1561	PPCODE:	1774	PPCODE:
1562	{	1775	{
1563	UV offset;	1776	STRLEN offset;
1564	EXTEND (SP, 2);	1777	EXTEND (SP, 2);
1565	PUSHs (decode_json (jsonstr, self, &offset));	1778	PUSHs (decode_json (jsonstr, self, &offset));
1566	PUSHs (sv_2mortal (newSVuv (offset)));	1779	PUSHs (sv_2mortal (newSVuv (offset)));
		1780	}
		1781
		1782	void incr_parse (JSON self, SV jsonstr = 0)
		1783	PPCODE:
		1784	{
		1785	if (!self->incr_text)
		1786	self->incr_text = newSVpvn ("", 0);
		1787
		1788	// append data, if any
		1789	if (jsonstr)
		1790	{
		1791	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
		1792	{
		1793	/* utf-8-ness differs, need to upgrade */
		1794	sv_utf8_upgrade (self->incr_text);
		1795
		1796	if (self->incr_pos)
		1797	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1798	- (U8 *)SvPVX (self->incr_text);
		1799	}
		1800
		1801	{
		1802	STRLEN len;
		1803	const char *str = SvPV (jsonstr, len);
		1804	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
		1805	Move (str, SvEND (self->incr_text), len, char);
		1806	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1807	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1808	}
		1809	}
		1810
		1811	if (GIMME_V != G_VOID)
		1812	do
		1813	{
		1814	STRLEN offset;
		1815
		1816	if (!INCR_DONE (self))
		1817	{
		1818	incr_parse (self);
		1819
		1820	if (self->incr_pos > self->max_size && self->max_size)
		1821	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1822	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1823
		1824	if (!INCR_DONE (self))
		1825	break;
		1826	}
		1827
		1828	XPUSHs (decode_json (self->incr_text, self, &offset));
		1829
		1830	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
		1831	self->incr_pos -= offset;
		1832	self->incr_nest = 0;
		1833	self->incr_mode = 0;
		1834	}
		1835	while (GIMME_V == G_ARRAY);
		1836	}
		1837
		1838	SV incr_text (JSON self)
		1839	ATTRS: lvalue
		1840	CODE:
		1841	{
		1842	if (self->incr_pos)
		1843	croak ("incr_text can not be called when the incremental parser already started parsing");
		1844
		1845	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1846	}
		1847	OUTPUT:
		1848	RETVAL
		1849
		1850	void incr_skip (JSON *self)
		1851	CODE:
		1852	{
		1853	if (self->incr_pos)
		1854	{
		1855	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1856	self->incr_pos = 0;
		1857	self->incr_nest = 0;
		1858	self->incr_mode = 0;
		1859	}
		1860	}
		1861
		1862	void incr_reset (JSON *self)
		1863	CODE:
		1864	{
		1865	SvREFCNT_dec (self->incr_text);
		1866	self->incr_text = 0;
		1867	self->incr_pos = 0;
		1868	self->incr_nest = 0;
		1869	self->incr_mode = 0;
1567	}	1870	}
1568		1871
1569	void DESTROY (JSON *self)	1872	void DESTROY (JSON *self)
1570	CODE:	1873	CODE:
1571	SvREFCNT_dec (self->cb_sk_object);	1874	SvREFCNT_dec (self->cb_sk_object);
1572	SvREFCNT_dec (self->cb_object);	1875	SvREFCNT_dec (self->cb_object);
		1876	SvREFCNT_dec (self->incr_text);
1573		1877
1574	PROTOTYPES: ENABLE	1878	PROTOTYPES: ENABLE
1575		1879
1576	void to_json (SV *scalar)	1880	void encode_json (SV *scalar)
		1881	ALIAS:
		1882	to_json_ = 0
		1883	encode_json = F_UTF8
1577	PPCODE:	1884	PPCODE:
1578	{	1885	{
1579	JSON json = { F_DEFAULT \| F_UTF8 };	1886	JSON json;
		1887	json_init (&json);
		1888	json.flags \|= ix;
1580	XPUSHs (encode_json (scalar, &json));	1889	XPUSHs (encode_json (scalar, &json));
1581	}	1890	}
1582		1891
1583	void from_json (SV *jsonstr)	1892	void decode_json (SV *jsonstr)
		1893	ALIAS:
		1894	from_json_ = 0
		1895	decode_json = F_UTF8
1584	PPCODE:	1896	PPCODE:
1585	{	1897	{
1586	JSON json = { F_DEFAULT \| F_UTF8 };	1898	JSON json;
		1899	json_init (&json);
		1900	json.flags \|= ix;
1587	XPUSHs (decode_json (jsonstr, &json, 0));	1901	XPUSHs (decode_json (jsonstr, &json, 0));
1588	}	1902	}
1589		1903
		1904

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.65 by root, Sat Oct 13 01:55:31 2007 UTC vs. Revision 1.91 by root, Mon Sep 22 07:26:26 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.65 by root, Sat Oct 13 01:55:31 2007 UTC vs.
Revision 1.91 by root, Mon Sep 22 07:26:26 2008 UTC