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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC vs.
Revision 1.95 by root, Sun Feb 22 06:55:28 2009 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
…		…
27	#define F_SPACE_AFTER 0x00000040UL	30	#define F_SPACE_AFTER 0x00000040UL
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_MAXDEPTH 0xf8000000UL
33	#define S_MAXDEPTH 27
34	#define F_MAXSIZE 0x01f00000UL	35	#define F_RELAXED 0x00001000UL
35	#define S_MAXSIZE 20	36	#define F_ALLOW_UNKNOWN 0x00002000UL
36	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
37		38
38	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
39	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
40
41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
42	#define F_DEFAULT (9UL << S_MAXDEPTH)
43		40
44	#define INIT_SIZE 32 // initial scalar size to be allocated	41	#define INIT_SIZE 32 // initial scalar size to be allocated
45	#define INDENT_STEP 3 // spaces per indentation level	42	#define INDENT_STEP 3 // spaces per indentation level
46		43
47	#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
48		45
49	#define SB do {	46	#define SB do {
50	#define SE } while (0)	47	#define SE } while (0)
51		48
52	#if __GNUC__ >= 3	49	#if __GNUC__ >= 3
53	# define expect(expr,value) __builtin_expect ((expr),(value))	50	# define expect(expr,value) __builtin_expect ((expr), (value))
54	# define inline inline	51	# define INLINE static inline
55	#else	52	#else
56	# define expect(expr,value) (expr)	53	# define expect(expr,value) (expr)
57	# define inline static	54	# define INLINE static
58	#endif	55	#endif
59		56
60	#define expect_false(expr) expect ((expr) != 0, 0)	57	#define expect_false(expr) expect ((expr) != 0, 0)
61	#define expect_true(expr) expect ((expr) != 0, 1)	58	#define expect_true(expr) expect ((expr) != 0, 1)
62		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?)"
		65
		66	#ifdef USE_ITHREADS
		67	# define JSON_SLOW 1
		68	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		69	#else
		70	# define JSON_SLOW 0
		71	# define JSON_STASH json_stash
		72	#endif
		73
63	static HV json_stash, json_boolean_stash; // JSON::XS::	74	static HV json_stash, json_boolean_stash; // JSON::XS::
64	static SV json_true, json_false;	75	static SV json_true, json_false;
65		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
66	typedef struct {	86	typedef struct {
67	U32 flags;	87	U32 flags;
		88	U32 max_depth;
		89	STRLEN max_size;
		90
68	SV *cb_object;	91	SV *cb_object;
69	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;
70	} JSON;	99	} JSON;
		100
		101	INLINE void
		102	json_init (JSON *json)
		103	{
		104	Zero (json, 1, JSON);
		105	json->max_depth = 512;
		106	}
71		107
72	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
73	// utility functions	109	// utility functions
74		110
75	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
76	shrink (SV *sv)	123	shrink (SV *sv)
77	{	124	{
78	sv_utf8_downgrade (sv, 1);	125	sv_utf8_downgrade (sv, 1);
		126
79	if (SvLEN (sv) > SvCUR (sv) + 1)	127	if (SvLEN (sv) > SvCUR (sv) + 1)
80	{	128	{
81	#ifdef SvPV_shrink_to_cur	129	#ifdef SvPV_shrink_to_cur
82	SvPV_shrink_to_cur (sv);	130	SvPV_shrink_to_cur (sv);
83	#elif defined (SvPV_renew)	131	#elif defined (SvPV_renew)
…		…
89	// 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
90	// case of an error.	138	// case of an error.
91	// we special-case "safe" characters from U+80 .. U+7FF,	139	// we special-case "safe" characters from U+80 .. U+7FF,
92	// but use the very good perl function to parse anything else.	140	// but use the very good perl function to parse anything else.
93	// note that we never call this function for a ascii codepoints	141	// note that we never call this function for a ascii codepoints
94	inline UV	142	INLINE UV
95	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	143	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
96	{	144	{
97	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))	145	if (expect_true (len >= 2
98	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	146	&& IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
99	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	147	&& IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
100	{	148	{
101	*clen = 2;	149	*clen = 2;
102	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	150	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
103	}	151	}
104	else	152	else
105	{	153	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
106	*clen = (STRLEN)-1;	154	}
107	return (UV)-1;	155
108	}	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;
109	}	178	}
110		179
111	/////////////////////////////////////////////////////////////////////////////	180	/////////////////////////////////////////////////////////////////////////////
112	// encoder	181	// encoder
113		182
…		…
117	char *cur; // SvPVX (sv) + current output position	186	char *cur; // SvPVX (sv) + current output position
118	char *end; // SvEND (sv)	187	char *end; // SvEND (sv)
119	SV *sv; // result scalar	188	SV *sv; // result scalar
120	JSON json;	189	JSON json;
121	U32 indent; // indentation level	190	U32 indent; // indentation level
122	U32 maxdepth; // max. indentation/recursion level	191	UV limit; // escape character values >= this value when encoding
123	} enc_t;	192	} enc_t;
124		193
125	inline void	194	INLINE void
126	need (enc_t *enc, STRLEN len)	195	need (enc_t *enc, STRLEN len)
127	{	196	{
128	if (expect_false (enc->cur + len >= enc->end))	197	if (expect_false (enc->cur + len >= enc->end))
129	{	198	{
130	STRLEN cur = enc->cur - SvPVX (enc->sv);	199	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
131	SvGROW (enc->sv, cur + len + 1);	200	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
132	enc->cur = SvPVX (enc->sv) + cur;	201	enc->cur = SvPVX (enc->sv) + cur;
133	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	202	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
134	}	203	}
135	}	204	}
136		205
137	inline void	206	INLINE void
138	encode_ch (enc_t *enc, char ch)	207	encode_ch (enc_t *enc, char ch)
139	{	208	{
140	need (enc, 1);	209	need (enc, 1);
141	*enc->cur++ = ch;	210	*enc->cur++ = ch;
142	}	211	}
…		…
196	{	265	{
197	uch = ch;	266	uch = ch;
198	clen = 1;	267	clen = 1;
199	}	268	}
200		269
201	if (uch > 0x10FFFFUL)	270	if (uch < 0x80/0x20/ \|\| uch >= enc->limit)
202	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
203
204	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
205	{	271	{
206	if (uch > 0xFFFFUL)	272	if (uch >= 0x10000UL)
207	{	273	{
		274	if (uch >= 0x110000UL)
		275	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		276
208	need (enc, len += 11);	277	need (enc, len += 11);
209	sprintf (enc->cur, "\\u%04x\\u%04x",	278	sprintf (enc->cur, "\\u%04x\\u%04x",
210	(int)((uch - 0x10000) / 0x400 + 0xD800),	279	(int)((uch - 0x10000) / 0x400 + 0xD800),
211	(int)((uch - 0x10000) % 0x400 + 0xDC00));	280	(int)((uch - 0x10000) % 0x400 + 0xDC00));
212	enc->cur += 12;	281	enc->cur += 12;
213	}	282	}
214	else	283	else
215	{	284	{
216	static char hexdigit [16] = "0123456789abcdef";
217	need (enc, len += 5);	285	need (enc, len += 5);
218	*enc->cur++ = '\\';	286	*enc->cur++ = '\\';
219	*enc->cur++ = 'u';	287	*enc->cur++ = 'u';
220	*enc->cur++ = hexdigit [ uch >> 12 ];	288	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
221	*enc->cur++ = hexdigit [(uch >> 8) & 15];	289	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
222	*enc->cur++ = hexdigit [(uch >> 4) & 15];	290	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
223	*enc->cur++ = hexdigit [(uch >> 0) & 15];	291	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
224	}	292	}
225		293
226	str += clen;	294	str += clen;
227	}	295	}
228	else if (enc->json.flags & F_LATIN1)	296	else if (enc->json.flags & F_LATIN1)
…		…
240	while (--clen);	308	while (--clen);
241	}	309	}
242	else	310	else
243	{	311	{
244	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
245	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);	313	enc->cur = encode_utf8 (enc->cur, uch);
246	++str;	314	++str;
247	}	315	}
248	}	316	}
249	}	317	}
250	}	318	}
251		319
252	--len;	320	--len;
253	}	321	}
254	}	322	}
255		323
256	inline void	324	INLINE void
257	encode_indent (enc_t *enc)	325	encode_indent (enc_t *enc)
258	{	326	{
259	if (enc->json.flags & F_INDENT)	327	if (enc->json.flags & F_INDENT)
260	{	328	{
261	int spaces = enc->indent * INDENT_STEP;	329	int spaces = enc->indent * INDENT_STEP;
…		…
264	memset (enc->cur, ' ', spaces);	332	memset (enc->cur, ' ', spaces);
265	enc->cur += spaces;	333	enc->cur += spaces;
266	}	334	}
267	}	335	}
268		336
269	inline void	337	INLINE void
270	encode_space (enc_t *enc)	338	encode_space (enc_t *enc)
271	{	339	{
272	need (enc, 1);	340	need (enc, 1);
273	encode_ch (enc, ' ');	341	encode_ch (enc, ' ');
274	}	342	}
275		343
276	inline void	344	INLINE void
277	encode_nl (enc_t *enc)	345	encode_nl (enc_t *enc)
278	{	346	{
279	if (enc->json.flags & F_INDENT)	347	if (enc->json.flags & F_INDENT)
280	{	348	{
281	need (enc, 1);	349	need (enc, 1);
282	encode_ch (enc, '\n');	350	encode_ch (enc, '\n');
283	}	351	}
284	}	352	}
285		353
286	inline void	354	INLINE void
287	encode_comma (enc_t *enc)	355	encode_comma (enc_t *enc)
288	{	356	{
289	encode_ch (enc, ',');	357	encode_ch (enc, ',');
290		358
291	if (enc->json.flags & F_INDENT)	359	if (enc->json.flags & F_INDENT)
…		…
299	static void	367	static void
300	encode_av (enc_t enc, AV av)	368	encode_av (enc_t enc, AV av)
301	{	369	{
302	int i, len = av_len (av);	370	int i, len = av_len (av);
303		371
304	if (enc->indent >= enc->maxdepth)	372	if (enc->indent >= enc->json.max_depth)
305	croak ("data structure too deep (hit recursion limit)");	373	croak (ERR_NESTING_EXCEEDED);
306		374
307	encode_ch (enc, '['); encode_nl (enc);	375	encode_ch (enc, '[');
308	++enc->indent;	376
		377	if (len >= 0)
		378	{
		379	encode_nl (enc); ++enc->indent;
309		380
310	for (i = 0; i <= len; ++i)	381	for (i = 0; i <= len; ++i)
311	{	382	{
312	SV **svp = av_fetch (av, i, 0);	383	SV **svp = av_fetch (av, i, 0);
313		384
314	encode_indent (enc);	385	encode_indent (enc);
315		386
316	if (svp)	387	if (svp)
317	encode_sv (enc, *svp);	388	encode_sv (enc, *svp);
318	else	389	else
319	encode_str (enc, "null", 4, 0);	390	encode_str (enc, "null", 4, 0);
320		391
321	if (i < len)	392	if (i < len)
322	encode_comma (enc);	393	encode_comma (enc);
323	}	394	}
324		395
		396	encode_nl (enc); --enc->indent; encode_indent (enc);
		397	}
		398
325	encode_nl (enc);	399	encode_ch (enc, ']');
326
327	--enc->indent;
328	encode_indent (enc); encode_ch (enc, ']');
329	}	400	}
330		401
331	static void	402	static void
332	encode_he (enc_t enc, HE he)	403	encode_hk (enc_t enc, HE he)
333	{	404	{
334	encode_ch (enc, '"');	405	encode_ch (enc, '"');
335		406
336	if (HeKLEN (he) == HEf_SVKEY)	407	if (HeKLEN (he) == HEf_SVKEY)
337	{	408	{
…		…
350	encode_ch (enc, '"');	421	encode_ch (enc, '"');
351		422
352	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	423	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
353	encode_ch (enc, ':');	424	encode_ch (enc, ':');
354	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	425	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
355	encode_sv (enc, HeVAL (he));
356	}	426	}
357		427
358	// compare hash entries, used when all keys are bytestrings	428	// compare hash entries, used when all keys are bytestrings
359	static int	429	static int
360	he_cmp_fast (const void a_, const void b_)	430	he_cmp_fast (const void a_, const void b_)
…		…
365	HE b = (HE **)b_;	435	HE b = (HE **)b_;
366		436
367	STRLEN la = HeKLEN (a);	437	STRLEN la = HeKLEN (a);
368	STRLEN lb = HeKLEN (b);	438	STRLEN lb = HeKLEN (b);
369		439
370	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	440	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
371	cmp = la - lb;	441	cmp = lb - la;
372		442
373	return cmp;	443	return cmp;
374	}	444	}
375		445
376	// compare hash entries, used when some keys are sv's or utf-x	446	// compare hash entries, used when some keys are sv's or utf-x
377	static int	447	static int
378	he_cmp_slow (const void a, const void b)	448	he_cmp_slow (const void a, const void b)
379	{	449	{
380	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	450	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
381	}	451	}
382		452
383	static void	453	static void
384	encode_hv (enc_t enc, HV hv)	454	encode_hv (enc_t enc, HV hv)
385	{	455	{
386	int count, i;	456	HE *he;
387		457
388	if (enc->indent >= enc->maxdepth)	458	if (enc->indent >= enc->json.max_depth)
389	croak ("data structure too deep (hit recursion limit)");	459	croak (ERR_NESTING_EXCEEDED);
390		460
391	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	461	encode_ch (enc, '{');
392		462
393	if ((count = hv_iterinit (hv)))
394	{
395	// for canonical output we have to sort by keys first	463	// for canonical output we have to sort by keys first
396	// actually, this is mostly due to the stupid so-called	464	// actually, this is mostly due to the stupid so-called
397	// security workaround added somewhere in 5.8.x.	465	// security workaround added somewhere in 5.8.x
398	// that randomises hash orderings	466	// that randomises hash orderings
399	if (enc->json.flags & F_CANONICAL)	467	if (enc->json.flags & F_CANONICAL)
		468	{
		469	int count = hv_iterinit (hv);
		470
		471	if (SvMAGICAL (hv))
400	{	472	{
		473	// need to count by iterating. could improve by dynamically building the vector below
		474	// but I don't care for the speed of this special case.
		475	// note also that we will run into undefined behaviour when the two iterations
		476	// do not result in the same count, something I might care for in some later release.
		477
		478	count = 0;
		479	while (hv_iternext (hv))
		480	++count;
		481
		482	hv_iterinit (hv);
		483	}
		484
		485	if (count)
		486	{
401	int fast = 1;	487	int i, fast = 1;
402	HE *he;
403	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	488	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
404	HE *hes = _alloca (count sizeof (HE));	489	HE *hes = _alloca (count sizeof (HE));
405	#else	490	#else
406	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	491	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
407	#endif	492	#endif
…		…
434		519
435	FREETMPS;	520	FREETMPS;
436	LEAVE;	521	LEAVE;
437	}	522	}
438		523
439	for (i = 0; i < count; ++i)	524	encode_nl (enc); ++enc->indent;
		525
		526	while (count--)
440	{	527	{
441	encode_indent (enc);	528	encode_indent (enc);
		529	he = hes [count];
442	encode_he (enc, hes [i]);	530	encode_hk (enc, he);
		531	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
443		532
444	if (i < count - 1)	533	if (count)
445	encode_comma (enc);	534	encode_comma (enc);
446	}	535	}
447		536
448	encode_nl (enc);	537	encode_nl (enc); --enc->indent; encode_indent (enc);
449	}	538	}
		539	}
450	else	540	else
		541	{
		542	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		543	if ((he = hv_iternext (hv)))
451	{	544	{
452	HE *he = hv_iternext (hv);	545	encode_nl (enc); ++enc->indent;
453		546
454	for (;;)	547	for (;;)
455	{	548	{
456	encode_indent (enc);	549	encode_indent (enc);
457	encode_he (enc, he);	550	encode_hk (enc, he);
		551	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
458		552
459	if (!(he = hv_iternext (hv)))	553	if (!(he = hv_iternext (hv)))
460	break;	554	break;
461		555
462	encode_comma (enc);	556	encode_comma (enc);
463	}	557	}
464		558
465	encode_nl (enc);	559	encode_nl (enc); --enc->indent; encode_indent (enc);
466	}	560	}
467	}	561	}
468		562
469	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	563	encode_ch (enc, '}');
470	}	564	}
471		565
472	// encode objects, arrays and special \0=false and \1=true values.	566	// encode objects, arrays and special \0=false and \1=true values.
473	static void	567	static void
474	encode_rv (enc_t enc, SV sv)	568	encode_rv (enc_t enc, SV sv)
…		…
478	SvGETMAGIC (sv);	572	SvGETMAGIC (sv);
479	svt = SvTYPE (sv);	573	svt = SvTYPE (sv);
480		574
481	if (expect_false (SvOBJECT (sv)))	575	if (expect_false (SvOBJECT (sv)))
482	{	576	{
		577	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		578	? json_boolean_stash
		579	: gv_stashpv ("JSON::XS::Boolean", 1);
		580
483	if (SvSTASH (sv) == json_boolean_stash)	581	if (SvSTASH (sv) == stash)
484	{	582	{
485	if (SvIV (sv))	583	if (SvIV (sv))
486	encode_str (enc, "true", 4, 0);	584	encode_str (enc, "true", 4, 0);
487	else	585	else
488	encode_str (enc, "false", 5, 0);	586	encode_str (enc, "false", 5, 0);
…		…
500	// we re-bless the reference to get overload and other niceties right	598	// we re-bless the reference to get overload and other niceties right
501	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);	599	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
502		600
503	if (to_json)	601	if (to_json)
504	{	602	{
505	int count;
506	dSP;	603	dSP;
507		604
508	ENTER; SAVETMPS; PUSHMARK (SP);	605	ENTER; SAVETMPS; PUSHMARK (SP);
509	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	606	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
510		607
…		…
548		645
549	if (len == 1 && *pv == '1')	646	if (len == 1 && *pv == '1')
550	encode_str (enc, "true", 4, 0);	647	encode_str (enc, "true", 4, 0);
551	else if (len == 1 && *pv == '0')	648	else if (len == 1 && *pv == '0')
552	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);
553	else	652	else
554	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",
555	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	654	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
556	}	655	}
		656	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		657	encode_str (enc, "null", 4, 0);
557	else	658	else
558	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",
559	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	660	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
560	}	661	}
561		662
…		…
579	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	680	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
580	enc->cur += strlen (enc->cur);	681	enc->cur += strlen (enc->cur);
581	}	682	}
582	else if (SvIOKp (sv))	683	else if (SvIOKp (sv))
583	{	684	{
584	// 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
585	if (SvUV (sv) & ~(UV)0x7fff)	686	// we assume two's complement
586	{	687	// we assume no aliasing issues in the union
587	// large integer, use the (rather slow) snprintf way.	688	if (SvIsUV (sv) ? SvUVX (sv) <= 59000
588	need (enc, sizeof (UV) * 3);	689	: SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
589	enc->cur +=
590	SvIsUV(sv)
591	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
592	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
593	}
594	else
595	{	690	{
596	// optimise the "small number case"	691	// optimise the "small number case"
597	// 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
598	I32 i = SvIV (sv);	694	I32 i = SvIVX (sv);
599	U32 u;	695	U32 u;
600	char digit, nz = 0;	696	char digit, nz = 0;
601		697
602	need (enc, 6);	698	need (enc, 6);
603		699
…		…
609		705
610	// 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
611	// 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,
612	// resulting in a net multiplication by 10.	708	// resulting in a net multiplication by 10.
613	// we always write the digit to memory but conditionally increment	709	// we always write the digit to memory but conditionally increment
614	// the pointer, to ease the usage of conditional move instructions.	710	// the pointer, to enable the use of conditional move instructions.
615	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;
616	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;
617	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;
618	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;
619	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'
620	}	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	}
621	}	726	}
622	else if (SvROK (sv))	727	else if (SvROK (sv))
623	encode_rv (enc, SvRV (sv));	728	encode_rv (enc, SvRV (sv));
624	else if (!SvOK (sv))	729	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
625	encode_str (enc, "null", 4, 0);	730	encode_str (enc, "null", 4, 0);
626	else	731	else
627	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",
628	SvPV_nolen (sv), SvFLAGS (sv));	733	SvPV_nolen (sv), SvFLAGS (sv));
629	}	734	}
…		…
639	enc.json = *json;	744	enc.json = *json;
640	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	745	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
641	enc.cur = SvPVX (enc.sv);	746	enc.cur = SvPVX (enc.sv);
642	enc.end = SvEND (enc.sv);	747	enc.end = SvEND (enc.sv);
643	enc.indent = 0;	748	enc.indent = 0;
644	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;
645		752
646	SvPOK_only (enc.sv);	753	SvPOK_only (enc.sv);
647	encode_sv (&enc, scalar);	754	encode_sv (&enc, scalar);
648		755
649	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	756	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
670	JSON json;	777	JSON json;
671	U32 depth; // recursion depth	778	U32 depth; // recursion depth
672	U32 maxdepth; // recursion depth limit	779	U32 maxdepth; // recursion depth limit
673	} dec_t;	780	} dec_t;
674		781
675	inline void	782	INLINE void
		783	decode_comment (dec_t *dec)
		784	{
		785	// only '#'-style comments allowed a.t.m.
		786
		787	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		788	++dec->cur;
		789	}
		790
		791	INLINE void
676	decode_ws (dec_t *dec)	792	decode_ws (dec_t *dec)
677	{	793	{
678	for (;;)	794	for (;;)
679	{	795	{
680	char ch = *dec->cur;	796	char ch = *dec->cur;
681		797
682	if (ch > 0x20	798	if (ch > 0x20)
		799	{
		800	if (expect_false (ch == '#'))
		801	{
		802	if (dec->json.flags & F_RELAXED)
		803	decode_comment (dec);
		804	else
		805	break;
		806	}
		807	else
		808	break;
		809	}
683	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	810	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
684	break;	811	break; // parse error, but let higher level handle it, gives better error messages
685		812
686	++dec->cur;	813	++dec->cur;
687	}	814	}
688	}	815	}
689		816
…		…
693	if (*dec->cur != ch) \	820	if (*dec->cur != ch) \
694	ERR (# ch " expected"); \	821	ERR (# ch " expected"); \
695	++dec->cur; \	822	++dec->cur; \
696	SE	823	SE
697		824
698	#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)
699	#define DEC_DEC_DEPTH --dec->depth	826	#define DEC_DEC_DEPTH --dec->depth
700		827
701	static SV decode_sv (dec_t dec);	828	static SV decode_sv (dec_t dec);
702		829
703	static signed char decode_hexdigit[256];	830	static signed char decode_hexdigit[256];
…		…
795		922
796	if (hi >= 0x80)	923	if (hi >= 0x80)
797	{	924	{
798	utf8 = 1;	925	utf8 = 1;
799		926
800	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);	927	cur = encode_utf8 (cur, hi);
801	}	928	}
802	else	929	else
803	*cur++ = hi;	930	*cur++ = hi;
804	}	931	}
805	break;	932	break;
…		…
807	default:	934	default:
808	--dec_cur;	935	--dec_cur;
809	ERR ("illegal backslash escape sequence in string");	936	ERR ("illegal backslash escape sequence in string");
810	}	937	}
811	}	938	}
812	else if (expect_true (ch >= 0x20 && ch <= 0x7f))	939	else if (expect_true (ch >= 0x20 && ch < 0x80))
813	*cur++ = ch;	940	*cur++ = ch;
814	else if (ch >= 0x80)	941	else if (ch >= 0x80)
815	{	942	{
816	STRLEN clen;	943	STRLEN clen;
817	UV uch;	944	UV uch;
…		…
843	{	970	{
844	STRLEN len = cur - buf;	971	STRLEN len = cur - buf;
845		972
846	if (sv)	973	if (sv)
847	{	974	{
848	SvGROW (sv, SvCUR (sv) + len + 1);	975	STRLEN cur = SvCUR (sv);
		976
		977	if (SvLEN (sv) <= cur + len)
		978	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		979
849	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	980	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
850	SvCUR_set (sv, SvCUR (sv) + len);	981	SvCUR_set (sv, SvCUR (sv) + len);
851	}	982	}
852	else	983	else
853	sv = newSVpvn (buf, len);	984	sv = newSVpvn (buf, len);
…		…
940		1071
941	if (!is_nv)	1072	if (!is_nv)
942	{	1073	{
943	int len = dec->cur - start;	1074	int len = dec->cur - start;
944		1075
945	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1076	// special case the rather common 1..5-digit-int case
946	if (*start == '-')	1077	if (*start == '-')
947	switch (len)	1078	switch (len)
948	{	1079	{
949	case 2: return newSViv (-( start [1] - '0' * 1));	1080	case 2: return newSViv (-( start [1] - '0' * 1));
950	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1081	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
951	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1082	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
952	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1083	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
		1084	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
953	}	1085	}
954	else	1086	else
955	switch (len)	1087	switch (len)
956	{	1088	{
957	case 1: return newSViv ( start [0] - '0' * 1);	1089	case 1: return newSViv ( start [0] - '0' * 1);
958	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1090	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
959	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1091	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
960	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1092	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		1093	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
961	}	1094	}
962		1095
963	{	1096	{
964	UV uv;	1097	UV uv;
965	int numtype = grok_number (start, len, &uv);	1098	int numtype = grok_number (start, len, &uv);
…		…
1026		1159
1027	if (*dec->cur != ',')	1160	if (*dec->cur != ',')
1028	ERR (", or ] expected while parsing array");	1161	ERR (", or ] expected while parsing array");
1029		1162
1030	++dec->cur;	1163	++dec->cur;
		1164
		1165	decode_ws (dec);
		1166
		1167	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1168	{
		1169	++dec->cur;
		1170	break;
		1171	}
1031	}	1172	}
1032		1173
1033	DEC_DEC_DEPTH;	1174	DEC_DEC_DEPTH;
1034	return newRV_noinc ((SV *)av);	1175	return newRV_noinc ((SV *)av);
1035		1176
…		…
1051	if (*dec->cur == '}')	1192	if (*dec->cur == '}')
1052	++dec->cur;	1193	++dec->cur;
1053	else	1194	else
1054	for (;;)	1195	for (;;)
1055	{	1196	{
1056	decode_ws (dec); EXPECT_CH ('"');	1197	EXPECT_CH ('"');
1057		1198
1058	// heuristic: assume that	1199	// heuristic: assume that
1059	// a) decode_str + hv_store_ent are abysmally slow.	1200	// a) decode_str + hv_store_ent are abysmally slow.
1060	// b) most hash keys are short, simple ascii text.	1201	// b) most hash keys are short, simple ascii text.
1061	// => try to "fast-match" such strings to avoid	1202	// => try to "fast-match" such strings to avoid
…		…
1065	char *p = dec->cur;	1206	char *p = dec->cur;
1066	char *e = p + 24; // only try up to 24 bytes	1207	char *e = p + 24; // only try up to 24 bytes
1067		1208
1068	for (;;)	1209	for (;;)
1069	{	1210	{
1070	// the >= 0x80 is true on most architectures	1211	// the >= 0x80 is false on most architectures
1071	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1212	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1072	{	1213	{
1073	// slow path, back up and use decode_str	1214	// slow path, back up and use decode_str
1074	SV *key = decode_str (dec);	1215	SV *key = decode_str (dec);
1075	if (!key)	1216	if (!key)
1076	goto fail;	1217	goto fail;
1077		1218
1078	decode_ws (dec); EXPECT_CH (':');	1219	decode_ws (dec); EXPECT_CH (':');
1079		1220
		1221	decode_ws (dec);
1080	value = decode_sv (dec);	1222	value = decode_sv (dec);
1081	if (!value)	1223	if (!value)
1082	{	1224	{
1083	SvREFCNT_dec (key);	1225	SvREFCNT_dec (key);
1084	goto fail;	1226	goto fail;
…		…
1096	int len = p - key;	1238	int len = p - key;
1097	dec->cur = p + 1;	1239	dec->cur = p + 1;
1098		1240
1099	decode_ws (dec); EXPECT_CH (':');	1241	decode_ws (dec); EXPECT_CH (':');
1100		1242
		1243	decode_ws (dec);
1101	value = decode_sv (dec);	1244	value = decode_sv (dec);
1102	if (!value)	1245	if (!value)
1103	goto fail;	1246	goto fail;
1104		1247
1105	hv_store (hv, key, len, value, 0);	1248	hv_store (hv, key, len, value, 0);
…		…
1121		1264
1122	if (*dec->cur != ',')	1265	if (*dec->cur != ',')
1123	ERR (", or } expected while parsing object/hash");	1266	ERR (", or } expected while parsing object/hash");
1124		1267
1125	++dec->cur;	1268	++dec->cur;
		1269
		1270	decode_ws (dec);
		1271
		1272	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1273	{
		1274	++dec->cur;
		1275	break;
		1276	}
1126	}	1277	}
1127		1278
1128	DEC_DEC_DEPTH;	1279	DEC_DEC_DEPTH;
1129	sv = newRV_noinc ((SV *)hv);	1280	sv = newRV_noinc ((SV *)hv);
1130		1281
…		…
1195	}	1346	}
1196		1347
1197	static SV *	1348	static SV *
1198	decode_sv (dec_t *dec)	1349	decode_sv (dec_t *dec)
1199	{	1350	{
1200	decode_ws (dec);
1201
1202	// the beauty of JSON: you need exactly one character lookahead	1351	// the beauty of JSON: you need exactly one character lookahead
1203	// to parse anything.	1352	// to parse everything.
1204	switch (*dec->cur)	1353	switch (*dec->cur)
1205	{	1354	{
1206	case '"': ++dec->cur; return decode_str (dec);	1355	case '"': ++dec->cur; return decode_str (dec);
1207	case '[': ++dec->cur; return decode_av (dec);	1356	case '[': ++dec->cur; return decode_av (dec);
1208	case '{': ++dec->cur; return decode_hv (dec);	1357	case '{': ++dec->cur; return decode_hv (dec);
1209		1358
1210	case '-':	1359	case '-':
1211	case '0': case '1': case '2': case '3': case '4':	1360	case '0': case '1': case '2': case '3': case '4':
1212	case '5': case '6': case '7': case '8': case '9':	1361	case '5': case '6': case '7': case '8': case '9':
1213	return decode_num (dec);	1362	return decode_num (dec);
1214		1363
1215	case 't':	1364	case 't':
1216	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1365	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1217	{	1366	{
1218	dec->cur += 4;	1367	dec->cur += 4;
		1368	#if JSON_SLOW
		1369	json_true = get_bool ("JSON::XS::true");
		1370	#endif
1219	return SvREFCNT_inc (json_true);	1371	return newSVsv (json_true);
1220	}	1372	}
1221	else	1373	else
1222	ERR ("'true' expected");	1374	ERR ("'true' expected");
1223		1375
1224	break;	1376	break;
1225		1377
1226	case 'f':	1378	case 'f':
1227	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1379	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1228	{	1380	{
1229	dec->cur += 5;	1381	dec->cur += 5;
		1382	#if JSON_SLOW
		1383	json_false = get_bool ("JSON::XS::false");
		1384	#endif
1230	return SvREFCNT_inc (json_false);	1385	return newSVsv (json_false);
1231	}	1386	}
1232	else	1387	else
1233	ERR ("'false' expected");	1388	ERR ("'false' expected");
1234		1389
1235	break;	1390	break;
…		…
1253	fail:	1408	fail:
1254	return 0;	1409	return 0;
1255	}	1410	}
1256		1411
1257	static SV *	1412	static SV *
1258	decode_json (SV string, JSON json, UV *offset_return)	1413	decode_json (SV string, JSON json, STRLEN *offset_return)
1259	{	1414	{
1260	dec_t dec;	1415	dec_t dec;
1261	UV offset;	1416	STRLEN offset;
1262	SV *sv;	1417	SV *sv;
1263		1418
		1419	/* work around bugs in 5.10 where manipulating magic values
		1420	* will perl ignore the magic in subsequent accesses
		1421	*/
1264	SvGETMAGIC (string);	1422	/SvGETMAGIC (string);/
		1423	if (SvMAGICAL (string))
		1424	string = sv_2mortal (newSVsv (string));
		1425
1265	SvUPGRADE (string, SVt_PV);	1426	SvUPGRADE (string, SVt_PV);
1266		1427
1267	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1428	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1429	* assertion with -DDEBUGGING, although SvCUR is documented to
		1430	* return the xpv_cur field which certainly exists after upgrading.
		1431	* according to nicholas clark, calling SvPOK fixes this.
		1432	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1433	* and hope for the best.
		1434	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1435	* assertion business is seriously broken, try yet another workaround
		1436	* for the broken -DDEBUGGING.
		1437	*/
		1438	#ifdef DEBUGGING
		1439	offset = SvOK (string) ? sv_len (string) : 0;
		1440	#else
		1441	offset = SvCUR (string);
		1442	#endif
		1443
		1444	if (offset > json->max_size && json->max_size)
1268	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1445	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1269	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1446	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
1270		1447
1271	if (json->flags & F_UTF8)	1448	if (json->flags & F_UTF8)
1272	sv_utf8_downgrade (string, 0);	1449	sv_utf8_downgrade (string, 0);
1273	else	1450	else
1274	sv_utf8_upgrade (string);	1451	sv_utf8_upgrade (string);
1275		1452
1276	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1453	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1277		1454
1278	dec.json = *json;	1455	dec.json = *json;
1279	dec.cur = SvPVX (string);	1456	dec.cur = SvPVX (string);
1280	dec.end = SvEND (string);	1457	dec.end = SvEND (string);
1281	dec.err = 0;	1458	dec.err = 0;
1282	dec.depth = 0;	1459	dec.depth = 0;
1283	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1284		1460
1285	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1461	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1286	dec.json.flags \|= F_HOOK;	1462	dec.json.flags \|= F_HOOK;
1287		1463
1288	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1464	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1465
		1466	decode_ws (&dec);
1289	sv = decode_sv (&dec);	1467	sv = decode_sv (&dec);
1290		1468
1291	if (!(offset_return \|\| !sv))	1469	if (!(offset_return \|\| !sv))
1292	{	1470	{
1293	// check for trailing garbage	1471	// check for trailing garbage
…		…
1337		1515
1338	return sv;	1516	return sv;
1339	}	1517	}
1340		1518
1341	/////////////////////////////////////////////////////////////////////////////	1519	/////////////////////////////////////////////////////////////////////////////
		1520	// incremental parser
		1521
		1522	static void
		1523	incr_parse (JSON *self)
		1524	{
		1525	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1526
		1527	for (;;)
		1528	{
		1529	//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
		1530	switch (self->incr_mode)
		1531	{
		1532	// only used for intiial whitespace skipping
		1533	case INCR_M_WS:
		1534	for (;;)
		1535	{
		1536	if (*p > 0x20)
		1537	{
		1538	self->incr_mode = INCR_M_JSON;
		1539	goto incr_m_json;
		1540	}
		1541	else if (!*p)
		1542	goto interrupt;
		1543
		1544	++p;
		1545	}
		1546
		1547	// skip a single char inside a string (for \\-processing)
		1548	case INCR_M_BS:
		1549	if (!*p)
		1550	goto interrupt;
		1551
		1552	++p;
		1553	self->incr_mode = INCR_M_STR;
		1554	goto incr_m_str;
		1555
		1556	// inside a string
		1557	case INCR_M_STR:
		1558	incr_m_str:
		1559	for (;;)
		1560	{
		1561	if (*p == '"')
		1562	{
		1563	++p;
		1564	self->incr_mode = INCR_M_JSON;
		1565
		1566	if (!self->incr_nest)
		1567	goto interrupt;
		1568
		1569	goto incr_m_json;
		1570	}
		1571	else if (*p == '\\')
		1572	{
		1573	++p; // "virtually" consumes character after \
		1574
		1575	if (!*p) // if at end of string we have to switch modes
		1576	{
		1577	self->incr_mode = INCR_M_BS;
		1578	goto interrupt;
		1579	}
		1580	}
		1581	else if (!*p)
		1582	goto interrupt;
		1583
		1584	++p;
		1585	}
		1586
		1587	// after initial ws, outside string
		1588	case INCR_M_JSON:
		1589	incr_m_json:
		1590	for (;;)
		1591	{
		1592	switch (*p++)
		1593	{
		1594	case 0:
		1595	--p;
		1596	goto interrupt;
		1597
		1598	case 0x09:
		1599	case 0x0a:
		1600	case 0x0d:
		1601	case 0x20:
		1602	if (!self->incr_nest)
		1603	{
		1604	--p; // do not eat the whitespace, let the next round do it
		1605	goto interrupt;
		1606	}
		1607	break;
		1608
		1609	case '"':
		1610	self->incr_mode = INCR_M_STR;
		1611	goto incr_m_str;
		1612
		1613	case '[':
		1614	case '{':
		1615	if (++self->incr_nest > self->max_depth)
		1616	croak (ERR_NESTING_EXCEEDED);
		1617	break;
		1618
		1619	case ']':
		1620	case '}':
		1621	if (--self->incr_nest <= 0)
		1622	goto interrupt;
		1623	}
		1624	}
		1625	}
		1626
		1627	modechange:
		1628	;
		1629	}
		1630
		1631	interrupt:
		1632	self->incr_pos = p - SvPVX (self->incr_text);
		1633	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
		1634	}
		1635
		1636	/////////////////////////////////////////////////////////////////////////////
1342	// XS interface functions	1637	// XS interface functions
1343		1638
1344	MODULE = JSON::XS PACKAGE = JSON::XS	1639	MODULE = JSON::XS PACKAGE = JSON::XS
1345		1640
1346	BOOT:	1641	BOOT:
…		…
1355	: -1;	1650	: -1;
1356		1651
1357	json_stash = gv_stashpv ("JSON::XS" , 1);	1652	json_stash = gv_stashpv ("JSON::XS" , 1);
1358	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1653	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1359		1654
1360	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1655	json_true = get_bool ("JSON::XS::true");
1361	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1656	json_false = get_bool ("JSON::XS::false");
1362	}	1657	}
1363		1658
1364	PROTOTYPES: DISABLE	1659	PROTOTYPES: DISABLE
		1660
		1661	void CLONE (...)
		1662	CODE:
		1663	json_stash = 0;
		1664	json_boolean_stash = 0;
1365		1665
1366	void new (char *klass)	1666	void new (char *klass)
1367	PPCODE:	1667	PPCODE:
1368	{	1668	{
1369	SV *pv = NEWSV (0, sizeof (JSON));	1669	SV *pv = NEWSV (0, sizeof (JSON));
1370	SvPOK_only (pv);	1670	SvPOK_only (pv);
1371	Zero (SvPVX (pv), 1, JSON);	1671	json_init ((JSON *)SvPVX (pv));
1372	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1672	XPUSHs (sv_2mortal (sv_bless (
1373	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1673	newRV_noinc (pv),
		1674	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		1675	)));
1374	}	1676	}
1375		1677
1376	void ascii (JSON *self, int enable = 1)	1678	void ascii (JSON *self, int enable = 1)
1377	ALIAS:	1679	ALIAS:
1378	ascii = F_ASCII	1680	ascii = F_ASCII
…		…
1385	pretty = F_PRETTY	1687	pretty = F_PRETTY
1386	allow_nonref = F_ALLOW_NONREF	1688	allow_nonref = F_ALLOW_NONREF
1387	shrink = F_SHRINK	1689	shrink = F_SHRINK
1388	allow_blessed = F_ALLOW_BLESSED	1690	allow_blessed = F_ALLOW_BLESSED
1389	convert_blessed = F_CONV_BLESSED	1691	convert_blessed = F_CONV_BLESSED
		1692	relaxed = F_RELAXED
		1693	allow_unknown = F_ALLOW_UNKNOWN
1390	PPCODE:	1694	PPCODE:
1391	{	1695	{
1392	if (enable)	1696	if (enable)
1393	self->flags \|= ix;	1697	self->flags \|= ix;
1394	else	1698	else
1395	self->flags &= ~ix;	1699	self->flags &= ~ix;
1396		1700
1397	XPUSHs (ST (0));	1701	XPUSHs (ST (0));
1398	}	1702	}
1399		1703
1400	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1704	void get_ascii (JSON *self)
		1705	ALIAS:
		1706	get_ascii = F_ASCII
		1707	get_latin1 = F_LATIN1
		1708	get_utf8 = F_UTF8
		1709	get_indent = F_INDENT
		1710	get_canonical = F_CANONICAL
		1711	get_space_before = F_SPACE_BEFORE
		1712	get_space_after = F_SPACE_AFTER
		1713	get_allow_nonref = F_ALLOW_NONREF
		1714	get_shrink = F_SHRINK
		1715	get_allow_blessed = F_ALLOW_BLESSED
		1716	get_convert_blessed = F_CONV_BLESSED
		1717	get_relaxed = F_RELAXED
		1718	get_allow_unknown = F_ALLOW_UNKNOWN
1401	PPCODE:	1719	PPCODE:
1402	{	1720	XPUSHs (boolSV (self->flags & ix));
1403	UV log2 = 0;
1404		1721
1405	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1722	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1406		1723	PPCODE:
1407	while ((1UL << log2) < max_depth)	1724	self->max_depth = max_depth;
1408	++log2;
1409
1410	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1411
1412	XPUSHs (ST (0));	1725	XPUSHs (ST (0));
1413	}
1414		1726
		1727	U32 get_max_depth (JSON *self)
		1728	CODE:
		1729	RETVAL = self->max_depth;
		1730	OUTPUT:
		1731	RETVAL
		1732
1415	void max_size (JSON *self, UV max_size = 0)	1733	void max_size (JSON *self, U32 max_size = 0)
1416	PPCODE:	1734	PPCODE:
1417	{	1735	self->max_size = max_size;
1418	UV log2 = 0;
1419
1420	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1421	if (max_size == 1) max_size = 2;
1422
1423	while ((1UL << log2) < max_size)
1424	++log2;
1425
1426	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1427
1428	XPUSHs (ST (0));	1736	XPUSHs (ST (0));
1429	}	1737
		1738	int get_max_size (JSON *self)
		1739	CODE:
		1740	RETVAL = self->max_size;
		1741	OUTPUT:
		1742	RETVAL
1430		1743
1431	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1744	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1432	PPCODE:	1745	PPCODE:
1433	{	1746	{
1434	SvREFCNT_dec (self->cb_object);	1747	SvREFCNT_dec (self->cb_object);
…		…
1468	XPUSHs (decode_json (jsonstr, self, 0));	1781	XPUSHs (decode_json (jsonstr, self, 0));
1469		1782
1470	void decode_prefix (JSON self, SV jsonstr)	1783	void decode_prefix (JSON self, SV jsonstr)
1471	PPCODE:	1784	PPCODE:
1472	{	1785	{
1473	UV offset;	1786	STRLEN offset;
1474	EXTEND (SP, 2);	1787	EXTEND (SP, 2);
1475	PUSHs (decode_json (jsonstr, self, &offset));	1788	PUSHs (decode_json (jsonstr, self, &offset));
1476	PUSHs (sv_2mortal (newSVuv (offset)));	1789	PUSHs (sv_2mortal (newSVuv (offset)));
		1790	}
		1791
		1792	void incr_parse (JSON self, SV jsonstr = 0)
		1793	PPCODE:
		1794	{
		1795	if (!self->incr_text)
		1796	self->incr_text = newSVpvn ("", 0);
		1797
		1798	// append data, if any
		1799	if (jsonstr)
		1800	{
		1801	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
		1802	{
		1803	/* utf-8-ness differs, need to upgrade */
		1804	sv_utf8_upgrade (self->incr_text);
		1805
		1806	if (self->incr_pos)
		1807	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1808	- (U8 *)SvPVX (self->incr_text);
		1809	}
		1810
		1811	{
		1812	STRLEN len;
		1813	const char *str = SvPV (jsonstr, len);
		1814	STRLEN cur = SvCUR (self->incr_text);
		1815
		1816	if (SvLEN (self->incr_text) <= cur + len)
		1817	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1818
		1819	Move (str, SvEND (self->incr_text), len, char);
		1820	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1821	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1822	}
		1823	}
		1824
		1825	if (GIMME_V != G_VOID)
		1826	do
		1827	{
		1828	STRLEN offset;
		1829
		1830	if (!INCR_DONE (self))
		1831	{
		1832	incr_parse (self);
		1833
		1834	if (self->incr_pos > self->max_size && self->max_size)
		1835	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1836	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1837
		1838	if (!INCR_DONE (self))
		1839	break;
		1840	}
		1841
		1842	XPUSHs (decode_json (self->incr_text, self, &offset));
		1843
		1844	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
		1845	self->incr_pos -= offset;
		1846	self->incr_nest = 0;
		1847	self->incr_mode = 0;
		1848	}
		1849	while (GIMME_V == G_ARRAY);
		1850	}
		1851
		1852	SV incr_text (JSON self)
		1853	ATTRS: lvalue
		1854	CODE:
		1855	{
		1856	if (self->incr_pos)
		1857	croak ("incr_text can not be called when the incremental parser already started parsing");
		1858
		1859	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1860	}
		1861	OUTPUT:
		1862	RETVAL
		1863
		1864	void incr_skip (JSON *self)
		1865	CODE:
		1866	{
		1867	if (self->incr_pos)
		1868	{
		1869	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1870	self->incr_pos = 0;
		1871	self->incr_nest = 0;
		1872	self->incr_mode = 0;
		1873	}
		1874	}
		1875
		1876	void incr_reset (JSON *self)
		1877	CODE:
		1878	{
		1879	SvREFCNT_dec (self->incr_text);
		1880	self->incr_text = 0;
		1881	self->incr_pos = 0;
		1882	self->incr_nest = 0;
		1883	self->incr_mode = 0;
1477	}	1884	}
1478		1885
1479	void DESTROY (JSON *self)	1886	void DESTROY (JSON *self)
1480	CODE:	1887	CODE:
1481	SvREFCNT_dec (self->cb_sk_object);	1888	SvREFCNT_dec (self->cb_sk_object);
1482	SvREFCNT_dec (self->cb_object);	1889	SvREFCNT_dec (self->cb_object);
		1890	SvREFCNT_dec (self->incr_text);
1483		1891
1484	PROTOTYPES: ENABLE	1892	PROTOTYPES: ENABLE
1485		1893
1486	void to_json (SV *scalar)	1894	void encode_json (SV *scalar)
		1895	ALIAS:
		1896	to_json_ = 0
		1897	encode_json = F_UTF8
1487	PPCODE:	1898	PPCODE:
1488	{	1899	{
1489	JSON json = { F_DEFAULT \| F_UTF8 };	1900	JSON json;
		1901	json_init (&json);
		1902	json.flags \|= ix;
1490	XPUSHs (encode_json (scalar, &json));	1903	XPUSHs (encode_json (scalar, &json));
1491	}	1904	}
1492		1905
1493	void from_json (SV *jsonstr)	1906	void decode_json (SV *jsonstr)
		1907	ALIAS:
		1908	from_json_ = 0
		1909	decode_json = F_UTF8
1494	PPCODE:	1910	PPCODE:
1495	{	1911	{
1496	JSON json = { F_DEFAULT \| F_UTF8 };	1912	JSON json;
		1913	json_init (&json);
		1914	json.flags \|= ix;
1497	XPUSHs (decode_json (jsonstr, &json, 0));	1915	XPUSHs (decode_json (jsonstr, &json, 0));
1498	}	1916	}
1499		1917
		1918

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC vs. Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC vs.
Revision 1.95 by root, Sun Feb 22 06:55:28 2009 UTC