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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.59 by root, Mon Aug 13 16:14:20 2007 UTC vs.
Revision 1.83 by root, Wed Mar 26 22:54:38 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
…		…
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
		35	#define F_RELAXED 0x00001000UL
		36
32	#define F_MAXDEPTH 0xf8000000UL	37	#define F_MAXDEPTH 0xf8000000UL
33	#define S_MAXDEPTH 27	38	#define S_MAXDEPTH 27
34	#define F_MAXSIZE 0x01f00000UL	39	#define F_MAXSIZE 0x01f00000UL
35	#define S_MAXSIZE 20	40	#define S_MAXSIZE 20
36	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
…		…
48		53
49	#define SB do {	54	#define SB do {
50	#define SE } while (0)	55	#define SE } while (0)
51		56
52	#if __GNUC__ >= 3	57	#if __GNUC__ >= 3
53	# define expect(expr,value) __builtin_expect ((expr),(value))	58	# define expect(expr,value) __builtin_expect ((expr), (value))
54	# define inline inline	59	# define INLINE static inline
55	#else	60	#else
56	# define expect(expr,value) (expr)	61	# define expect(expr,value) (expr)
57	# define inline static	62	# define INLINE static
58	#endif	63	#endif
59		64
60	#define expect_false(expr) expect ((expr) != 0, 0)	65	#define expect_false(expr) expect ((expr) != 0, 0)
61	#define expect_true(expr) expect ((expr) != 0, 1)	66	#define expect_true(expr) expect ((expr) != 0, 1)
		67
		68	#define IN_RANGE_INC(type,val,beg,end) \
		69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
		70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
62		71
63	#ifdef USE_ITHREADS	72	#ifdef USE_ITHREADS
64	# define JSON_SLOW 1	73	# define JSON_SLOW 1
65	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
66	#else	75	#else
…		…
69	#endif	78	#endif
70		79
71	static HV json_stash, json_boolean_stash; // JSON::XS::	80	static HV json_stash, json_boolean_stash; // JSON::XS::
72	static SV json_true, json_false;	81	static SV json_true, json_false;
73		82
		83	enum {
		84	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		85	INCR_M_STR, // inside string
		86	INCR_M_BS, // inside backslash
		87	INCR_M_JSON // outside anything, count nesting
		88	};
		89
		90	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)
		91
74	typedef struct {	92	typedef struct {
75	U32 flags;	93	U32 flags;
76	SV *cb_object;	94	SV *cb_object;
77	HV *cb_sk_object;	95	HV *cb_sk_object;
		96
		97	// for the incremental parser
		98	SV *incr_text; // the source text so far
		99	STRLEN incr_pos; // the current offset into the text
		100	int incr_nest; // {[]}-nesting level
		101	int incr_mode;
78	} JSON;	102	} JSON;
79		103
80	/////////////////////////////////////////////////////////////////////////////	104	/////////////////////////////////////////////////////////////////////////////
81	// utility functions	105	// utility functions
82		106
83	inline void	107	INLINE SV *
		108	get_bool (const char *name)
		109	{
		110	SV *sv = get_sv (name, 1);
		111
		112	SvREADONLY_on (sv);
		113	SvREADONLY_on (SvRV (sv));
		114
		115	return sv;
		116	}
		117
		118	INLINE void
84	shrink (SV *sv)	119	shrink (SV *sv)
85	{	120	{
86	sv_utf8_downgrade (sv, 1);	121	sv_utf8_downgrade (sv, 1);
87	if (SvLEN (sv) > SvCUR (sv) + 1)	122	if (SvLEN (sv) > SvCUR (sv) + 1)
88	{	123	{
…		…
97	// decode an utf-8 character and return it, or (UV)-1 in	132	// decode an utf-8 character and return it, or (UV)-1 in
98	// case of an error.	133	// case of an error.
99	// we special-case "safe" characters from U+80 .. U+7FF,	134	// we special-case "safe" characters from U+80 .. U+7FF,
100	// but use the very good perl function to parse anything else.	135	// but use the very good perl function to parse anything else.
101	// note that we never call this function for a ascii codepoints	136	// note that we never call this function for a ascii codepoints
102	inline UV	137	INLINE UV
103	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	138	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
104	{	139	{
105	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))	140	if (expect_true (len >= 2
106	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	141	&& IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
107	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	142	&& IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
108	{	143	{
109	*clen = 2;	144	*clen = 2;
110	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	145	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
111	}	146	}
112	else	147	else
113	{	148	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
114	*clen = (STRLEN)-1;	149	}
115	return (UV)-1;	150
116	}	151	// likewise for encoding, also never called for ascii codepoints
		152	// this function takes advantage of this fact, although current gccs
		153	// seem to optimise the check for >= 0x80 away anyways
		154	INLINE unsigned char *
		155	encode_utf8 (unsigned char *s, UV ch)
		156	{
		157	if (expect_false (ch < 0x000080))
		158	*s++ = ch;
		159	else if (expect_true (ch < 0x000800))
		160	*s++ = 0xc0 \| ( ch >> 6),
		161	*s++ = 0x80 \| ( ch & 0x3f);
		162	else if ( ch < 0x010000)
		163	*s++ = 0xe0 \| ( ch >> 12),
		164	*s++ = 0x80 \| ((ch >> 6) & 0x3f),
		165	*s++ = 0x80 \| ( ch & 0x3f);
		166	else if ( ch < 0x110000)
		167	*s++ = 0xf0 \| ( ch >> 18),
		168	*s++ = 0x80 \| ((ch >> 12) & 0x3f),
		169	*s++ = 0x80 \| ((ch >> 6) & 0x3f),
		170	*s++ = 0x80 \| ( ch & 0x3f);
		171
		172	return s;
117	}	173	}
118		174
119	/////////////////////////////////////////////////////////////////////////////	175	/////////////////////////////////////////////////////////////////////////////
120	// encoder	176	// encoder
121		177
…		…
126	char *end; // SvEND (sv)	182	char *end; // SvEND (sv)
127	SV *sv; // result scalar	183	SV *sv; // result scalar
128	JSON json;	184	JSON json;
129	U32 indent; // indentation level	185	U32 indent; // indentation level
130	U32 maxdepth; // max. indentation/recursion level	186	U32 maxdepth; // max. indentation/recursion level
		187	UV limit; // escape character values >= this value when encoding
131	} enc_t;	188	} enc_t;
132		189
133	inline void	190	INLINE void
134	need (enc_t *enc, STRLEN len)	191	need (enc_t *enc, STRLEN len)
135	{	192	{
136	if (expect_false (enc->cur + len >= enc->end))	193	if (expect_false (enc->cur + len >= enc->end))
137	{	194	{
138	STRLEN cur = enc->cur - SvPVX (enc->sv);	195	STRLEN cur = enc->cur - SvPVX (enc->sv);
…		…
140	enc->cur = SvPVX (enc->sv) + cur;	197	enc->cur = SvPVX (enc->sv) + cur;
141	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	198	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
142	}	199	}
143	}	200	}
144		201
145	inline void	202	INLINE void
146	encode_ch (enc_t *enc, char ch)	203	encode_ch (enc_t *enc, char ch)
147	{	204	{
148	need (enc, 1);	205	need (enc, 1);
149	*enc->cur++ = ch;	206	*enc->cur++ = ch;
150	}	207	}
…		…
204	{	261	{
205	uch = ch;	262	uch = ch;
206	clen = 1;	263	clen = 1;
207	}	264	}
208		265
209	if (uch > 0x10FFFFUL)	266	if (uch < 0x80/0x20/ \|\| uch >= enc->limit)
210	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
211
212	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
213	{	267	{
214	if (uch > 0xFFFFUL)	268	if (uch >= 0x10000UL)
215	{	269	{
		270	if (uch >= 0x110000UL)
		271	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		272
216	need (enc, len += 11);	273	need (enc, len += 11);
217	sprintf (enc->cur, "\\u%04x\\u%04x",	274	sprintf (enc->cur, "\\u%04x\\u%04x",
218	(int)((uch - 0x10000) / 0x400 + 0xD800),	275	(int)((uch - 0x10000) / 0x400 + 0xD800),
219	(int)((uch - 0x10000) % 0x400 + 0xDC00));	276	(int)((uch - 0x10000) % 0x400 + 0xDC00));
220	enc->cur += 12;	277	enc->cur += 12;
…		…
248	while (--clen);	305	while (--clen);
249	}	306	}
250	else	307	else
251	{	308	{
252	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed	309	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
253	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);	310	enc->cur = encode_utf8 (enc->cur, uch);
254	++str;	311	++str;
255	}	312	}
256	}	313	}
257	}	314	}
258	}	315	}
259		316
260	--len;	317	--len;
261	}	318	}
262	}	319	}
263		320
264	inline void	321	INLINE void
265	encode_indent (enc_t *enc)	322	encode_indent (enc_t *enc)
266	{	323	{
267	if (enc->json.flags & F_INDENT)	324	if (enc->json.flags & F_INDENT)
268	{	325	{
269	int spaces = enc->indent * INDENT_STEP;	326	int spaces = enc->indent * INDENT_STEP;
…		…
272	memset (enc->cur, ' ', spaces);	329	memset (enc->cur, ' ', spaces);
273	enc->cur += spaces;	330	enc->cur += spaces;
274	}	331	}
275	}	332	}
276		333
277	inline void	334	INLINE void
278	encode_space (enc_t *enc)	335	encode_space (enc_t *enc)
279	{	336	{
280	need (enc, 1);	337	need (enc, 1);
281	encode_ch (enc, ' ');	338	encode_ch (enc, ' ');
282	}	339	}
283		340
284	inline void	341	INLINE void
285	encode_nl (enc_t *enc)	342	encode_nl (enc_t *enc)
286	{	343	{
287	if (enc->json.flags & F_INDENT)	344	if (enc->json.flags & F_INDENT)
288	{	345	{
289	need (enc, 1);	346	need (enc, 1);
290	encode_ch (enc, '\n');	347	encode_ch (enc, '\n');
291	}	348	}
292	}	349	}
293		350
294	inline void	351	INLINE void
295	encode_comma (enc_t *enc)	352	encode_comma (enc_t *enc)
296	{	353	{
297	encode_ch (enc, ',');	354	encode_ch (enc, ',');
298		355
299	if (enc->json.flags & F_INDENT)	356	if (enc->json.flags & F_INDENT)
…		…
310	int i, len = av_len (av);	367	int i, len = av_len (av);
311		368
312	if (enc->indent >= enc->maxdepth)	369	if (enc->indent >= enc->maxdepth)
313	croak ("data structure too deep (hit recursion limit)");	370	croak ("data structure too deep (hit recursion limit)");
314		371
315	encode_ch (enc, '['); encode_nl (enc);	372	encode_ch (enc, '[');
316	++enc->indent;	373
		374	if (len >= 0)
		375	{
		376	encode_nl (enc); ++enc->indent;
317		377
318	for (i = 0; i <= len; ++i)	378	for (i = 0; i <= len; ++i)
319	{	379	{
320	SV **svp = av_fetch (av, i, 0);	380	SV **svp = av_fetch (av, i, 0);
321		381
322	encode_indent (enc);	382	encode_indent (enc);
323		383
324	if (svp)	384	if (svp)
325	encode_sv (enc, *svp);	385	encode_sv (enc, *svp);
326	else	386	else
327	encode_str (enc, "null", 4, 0);	387	encode_str (enc, "null", 4, 0);
328		388
329	if (i < len)	389	if (i < len)
330	encode_comma (enc);	390	encode_comma (enc);
331	}	391	}
332		392
		393	encode_nl (enc); --enc->indent; encode_indent (enc);
		394	}
		395
333	encode_nl (enc);	396	encode_ch (enc, ']');
334
335	--enc->indent;
336	encode_indent (enc); encode_ch (enc, ']');
337	}	397	}
338		398
339	static void	399	static void
340	encode_he (enc_t enc, HE he)	400	encode_hk (enc_t enc, HE he)
341	{	401	{
342	encode_ch (enc, '"');	402	encode_ch (enc, '"');
343		403
344	if (HeKLEN (he) == HEf_SVKEY)	404	if (HeKLEN (he) == HEf_SVKEY)
345	{	405	{
…		…
358	encode_ch (enc, '"');	418	encode_ch (enc, '"');
359		419
360	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	420	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
361	encode_ch (enc, ':');	421	encode_ch (enc, ':');
362	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	422	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
363	encode_sv (enc, HeVAL (he));
364	}	423	}
365		424
366	// compare hash entries, used when all keys are bytestrings	425	// compare hash entries, used when all keys are bytestrings
367	static int	426	static int
368	he_cmp_fast (const void a_, const void b_)	427	he_cmp_fast (const void a_, const void b_)
…		…
373	HE b = (HE **)b_;	432	HE b = (HE **)b_;
374		433
375	STRLEN la = HeKLEN (a);	434	STRLEN la = HeKLEN (a);
376	STRLEN lb = HeKLEN (b);	435	STRLEN lb = HeKLEN (b);
377		436
378	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	437	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
379	cmp = la - lb;	438	cmp = lb - la;
380		439
381	return cmp;	440	return cmp;
382	}	441	}
383		442
384	// compare hash entries, used when some keys are sv's or utf-x	443	// compare hash entries, used when some keys are sv's or utf-x
385	static int	444	static int
386	he_cmp_slow (const void a, const void b)	445	he_cmp_slow (const void a, const void b)
387	{	446	{
388	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	447	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
389	}	448	}
390		449
391	static void	450	static void
392	encode_hv (enc_t enc, HV hv)	451	encode_hv (enc_t enc, HV hv)
393	{	452	{
394	int count, i;	453	HE *he;
395		454
396	if (enc->indent >= enc->maxdepth)	455	if (enc->indent >= enc->maxdepth)
397	croak ("data structure too deep (hit recursion limit)");	456	croak ("data structure too deep (hit recursion limit)");
398		457
399	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	458	encode_ch (enc, '{');
400		459
401	if ((count = hv_iterinit (hv)))
402	{
403	// for canonical output we have to sort by keys first	460	// for canonical output we have to sort by keys first
404	// actually, this is mostly due to the stupid so-called	461	// actually, this is mostly due to the stupid so-called
405	// security workaround added somewhere in 5.8.x.	462	// security workaround added somewhere in 5.8.x.
406	// that randomises hash orderings	463	// that randomises hash orderings
407	if (enc->json.flags & F_CANONICAL)	464	if (enc->json.flags & F_CANONICAL)
		465	{
		466	int count = hv_iterinit (hv);
		467
		468	if (SvMAGICAL (hv))
408	{	469	{
		470	// need to count by iterating. could improve by dynamically building the vector below
		471	// but I don't care for the speed of this special case.
		472	// note also that we will run into undefined behaviour when the two iterations
		473	// do not result in the same count, something I might care for in some later release.
		474
		475	count = 0;
		476	while (hv_iternext (hv))
		477	++count;
		478
		479	hv_iterinit (hv);
		480	}
		481
		482	if (count)
		483	{
409	int fast = 1;	484	int i, fast = 1;
410	HE *he;
411	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	485	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
412	HE *hes = _alloca (count sizeof (HE));	486	HE *hes = _alloca (count sizeof (HE));
413	#else	487	#else
414	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	488	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
415	#endif	489	#endif
…		…
442		516
443	FREETMPS;	517	FREETMPS;
444	LEAVE;	518	LEAVE;
445	}	519	}
446		520
447	for (i = 0; i < count; ++i)	521	encode_nl (enc); ++enc->indent;
		522
		523	while (count--)
448	{	524	{
449	encode_indent (enc);	525	encode_indent (enc);
		526	he = hes [count];
450	encode_he (enc, hes [i]);	527	encode_hk (enc, he);
		528	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
451		529
452	if (i < count - 1)	530	if (count)
453	encode_comma (enc);	531	encode_comma (enc);
454	}	532	}
455		533
456	encode_nl (enc);	534	encode_nl (enc); --enc->indent; encode_indent (enc);
457	}	535	}
		536	}
458	else	537	else
		538	{
		539	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		540	if ((he = hv_iternext (hv)))
459	{	541	{
460	HE *he = hv_iternext (hv);	542	encode_nl (enc); ++enc->indent;
461		543
462	for (;;)	544	for (;;)
463	{	545	{
464	encode_indent (enc);	546	encode_indent (enc);
465	encode_he (enc, he);	547	encode_hk (enc, he);
		548	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
466		549
467	if (!(he = hv_iternext (hv)))	550	if (!(he = hv_iternext (hv)))
468	break;	551	break;
469		552
470	encode_comma (enc);	553	encode_comma (enc);
471	}	554	}
472		555
473	encode_nl (enc);	556	encode_nl (enc); --enc->indent; encode_indent (enc);
474	}	557	}
475	}	558	}
476		559
477	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	560	encode_ch (enc, '}');
478	}	561	}
479		562
480	// encode objects, arrays and special \0=false and \1=true values.	563	// encode objects, arrays and special \0=false and \1=true values.
481	static void	564	static void
482	encode_rv (enc_t enc, SV sv)	565	encode_rv (enc_t enc, SV sv)
…		…
590	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	673	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
591	enc->cur += strlen (enc->cur);	674	enc->cur += strlen (enc->cur);
592	}	675	}
593	else if (SvIOKp (sv))	676	else if (SvIOKp (sv))
594	{	677	{
595	// we assume we can always read an IV as a UV	678	// we assume we can always read an IV as a UV and vice versa
596	if (SvUV (sv) & ~(UV)0x7fff)	679	// we assume two's complement
597	{	680	// we assume no aliasing issues in the union
598	// large integer, use the (rather slow) snprintf way.	681	if (SvIsUV (sv) ? SvUVX (sv) <= 59000
599	need (enc, sizeof (UV) * 3);	682	: SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
600	enc->cur +=
601	SvIsUV(sv)
602	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
603	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
604	}
605	else
606	{	683	{
607	// optimise the "small number case"	684	// optimise the "small number case"
608	// code will likely be branchless and use only a single multiplication	685	// code will likely be branchless and use only a single multiplication
		686	// works for numbers up to 59074
609	I32 i = SvIV (sv);	687	I32 i = SvIVX (sv);
610	U32 u;	688	U32 u;
611	char digit, nz = 0;	689	char digit, nz = 0;
612		690
613	need (enc, 6);	691	need (enc, 6);
614		692
…		…
620		698
621	// now output digit by digit, each time masking out the integer part	699	// now output digit by digit, each time masking out the integer part
622	// and multiplying by 5 while moving the decimal point one to the right,	700	// and multiplying by 5 while moving the decimal point one to the right,
623	// resulting in a net multiplication by 10.	701	// resulting in a net multiplication by 10.
624	// we always write the digit to memory but conditionally increment	702	// we always write the digit to memory but conditionally increment
625	// the pointer, to ease the usage of conditional move instructions.	703	// the pointer, to enable the use of conditional move instructions.
626	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;	704	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffffUL) 5;
627	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;	705	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffffUL) 5;
628	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;	706	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffffUL) 5;
629	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;	707	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffffUL) 5;
630	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'	708	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
		709	}
		710	else
		711	{
		712	// large integer, use the (rather slow) snprintf way.
		713	need (enc, IVUV_MAXCHARS);
		714	enc->cur +=
		715	SvIsUV(sv)
		716	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
		717	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
631	}	718	}
632	}	719	}
633	else if (SvROK (sv))	720	else if (SvROK (sv))
634	encode_rv (enc, SvRV (sv));	721	encode_rv (enc, SvRV (sv));
635	else if (!SvOK (sv))	722	else if (!SvOK (sv))
…		…
651	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	738	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
652	enc.cur = SvPVX (enc.sv);	739	enc.cur = SvPVX (enc.sv);
653	enc.end = SvEND (enc.sv);	740	enc.end = SvEND (enc.sv);
654	enc.indent = 0;	741	enc.indent = 0;
655	enc.maxdepth = DEC_DEPTH (enc.json.flags);	742	enc.maxdepth = DEC_DEPTH (enc.json.flags);
		743	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
		744	: enc.json.flags & F_LATIN1 ? 0x000100UL
		745	: 0x110000UL;
656		746
657	SvPOK_only (enc.sv);	747	SvPOK_only (enc.sv);
658	encode_sv (&enc, scalar);	748	encode_sv (&enc, scalar);
659		749
660	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	750	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
681	JSON json;	771	JSON json;
682	U32 depth; // recursion depth	772	U32 depth; // recursion depth
683	U32 maxdepth; // recursion depth limit	773	U32 maxdepth; // recursion depth limit
684	} dec_t;	774	} dec_t;
685		775
686	inline void	776	INLINE void
		777	decode_comment (dec_t *dec)
		778	{
		779	// only '#'-style comments allowed a.t.m.
		780
		781	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		782	++dec->cur;
		783	}
		784
		785	INLINE void
687	decode_ws (dec_t *dec)	786	decode_ws (dec_t *dec)
688	{	787	{
689	for (;;)	788	for (;;)
690	{	789	{
691	char ch = *dec->cur;	790	char ch = *dec->cur;
692		791
693	if (ch > 0x20	792	if (ch > 0x20)
		793	{
		794	if (expect_false (ch == '#'))
		795	{
		796	if (dec->json.flags & F_RELAXED)
		797	decode_comment (dec);
		798	else
		799	break;
		800	}
		801	else
		802	break;
		803	}
694	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	804	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
695	break;	805	break; // parse error, but let higher level handle it, gives better error messages
696		806
697	++dec->cur;	807	++dec->cur;
698	}	808	}
699	}	809	}
700		810
…		…
806		916
807	if (hi >= 0x80)	917	if (hi >= 0x80)
808	{	918	{
809	utf8 = 1;	919	utf8 = 1;
810		920
811	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);	921	cur = encode_utf8 (cur, hi);
812	}	922	}
813	else	923	else
814	*cur++ = hi;	924	*cur++ = hi;
815	}	925	}
816	break;	926	break;
…		…
818	default:	928	default:
819	--dec_cur;	929	--dec_cur;
820	ERR ("illegal backslash escape sequence in string");	930	ERR ("illegal backslash escape sequence in string");
821	}	931	}
822	}	932	}
823	else if (expect_true (ch >= 0x20 && ch <= 0x7f))	933	else if (expect_true (ch >= 0x20 && ch < 0x80))
824	*cur++ = ch;	934	*cur++ = ch;
825	else if (ch >= 0x80)	935	else if (ch >= 0x80)
826	{	936	{
827	STRLEN clen;	937	STRLEN clen;
828	UV uch;	938	UV uch;
…		…
951		1061
952	if (!is_nv)	1062	if (!is_nv)
953	{	1063	{
954	int len = dec->cur - start;	1064	int len = dec->cur - start;
955		1065
956	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1066	// special case the rather common 1..5-digit-int case
957	if (*start == '-')	1067	if (*start == '-')
958	switch (len)	1068	switch (len)
959	{	1069	{
960	case 2: return newSViv (-( start [1] - '0' * 1));	1070	case 2: return newSViv (-( start [1] - '0' * 1));
961	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1071	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
962	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1072	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
963	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1073	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
		1074	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
964	}	1075	}
965	else	1076	else
966	switch (len)	1077	switch (len)
967	{	1078	{
968	case 1: return newSViv ( start [0] - '0' * 1);	1079	case 1: return newSViv ( start [0] - '0' * 1);
969	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1080	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
970	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1081	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
971	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1082	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		1083	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
972	}	1084	}
973		1085
974	{	1086	{
975	UV uv;	1087	UV uv;
976	int numtype = grok_number (start, len, &uv);	1088	int numtype = grok_number (start, len, &uv);
…		…
1037		1149
1038	if (*dec->cur != ',')	1150	if (*dec->cur != ',')
1039	ERR (", or ] expected while parsing array");	1151	ERR (", or ] expected while parsing array");
1040		1152
1041	++dec->cur;	1153	++dec->cur;
		1154
		1155	decode_ws (dec);
		1156
		1157	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1158	{
		1159	++dec->cur;
		1160	break;
		1161	}
1042	}	1162	}
1043		1163
1044	DEC_DEC_DEPTH;	1164	DEC_DEC_DEPTH;
1045	return newRV_noinc ((SV *)av);	1165	return newRV_noinc ((SV *)av);
1046		1166
…		…
1062	if (*dec->cur == '}')	1182	if (*dec->cur == '}')
1063	++dec->cur;	1183	++dec->cur;
1064	else	1184	else
1065	for (;;)	1185	for (;;)
1066	{	1186	{
1067	decode_ws (dec); EXPECT_CH ('"');	1187	EXPECT_CH ('"');
1068		1188
1069	// heuristic: assume that	1189	// heuristic: assume that
1070	// a) decode_str + hv_store_ent are abysmally slow.	1190	// a) decode_str + hv_store_ent are abysmally slow.
1071	// b) most hash keys are short, simple ascii text.	1191	// b) most hash keys are short, simple ascii text.
1072	// => try to "fast-match" such strings to avoid	1192	// => try to "fast-match" such strings to avoid
…		…
1076	char *p = dec->cur;	1196	char *p = dec->cur;
1077	char *e = p + 24; // only try up to 24 bytes	1197	char *e = p + 24; // only try up to 24 bytes
1078		1198
1079	for (;;)	1199	for (;;)
1080	{	1200	{
1081	// the >= 0x80 is true on most architectures	1201	// the >= 0x80 is false on most architectures
1082	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1202	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1083	{	1203	{
1084	// slow path, back up and use decode_str	1204	// slow path, back up and use decode_str
1085	SV *key = decode_str (dec);	1205	SV *key = decode_str (dec);
1086	if (!key)	1206	if (!key)
1087	goto fail;	1207	goto fail;
1088		1208
1089	decode_ws (dec); EXPECT_CH (':');	1209	decode_ws (dec); EXPECT_CH (':');
1090		1210
		1211	decode_ws (dec);
1091	value = decode_sv (dec);	1212	value = decode_sv (dec);
1092	if (!value)	1213	if (!value)
1093	{	1214	{
1094	SvREFCNT_dec (key);	1215	SvREFCNT_dec (key);
1095	goto fail;	1216	goto fail;
…		…
1107	int len = p - key;	1228	int len = p - key;
1108	dec->cur = p + 1;	1229	dec->cur = p + 1;
1109		1230
1110	decode_ws (dec); EXPECT_CH (':');	1231	decode_ws (dec); EXPECT_CH (':');
1111		1232
		1233	decode_ws (dec);
1112	value = decode_sv (dec);	1234	value = decode_sv (dec);
1113	if (!value)	1235	if (!value)
1114	goto fail;	1236	goto fail;
1115		1237
1116	hv_store (hv, key, len, value, 0);	1238	hv_store (hv, key, len, value, 0);
…		…
1132		1254
1133	if (*dec->cur != ',')	1255	if (*dec->cur != ',')
1134	ERR (", or } expected while parsing object/hash");	1256	ERR (", or } expected while parsing object/hash");
1135		1257
1136	++dec->cur;	1258	++dec->cur;
		1259
		1260	decode_ws (dec);
		1261
		1262	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1263	{
		1264	++dec->cur;
		1265	break;
		1266	}
1137	}	1267	}
1138		1268
1139	DEC_DEC_DEPTH;	1269	DEC_DEC_DEPTH;
1140	sv = newRV_noinc ((SV *)hv);	1270	sv = newRV_noinc ((SV *)hv);
1141		1271
…		…
1206	}	1336	}
1207		1337
1208	static SV *	1338	static SV *
1209	decode_sv (dec_t *dec)	1339	decode_sv (dec_t *dec)
1210	{	1340	{
1211	decode_ws (dec);
1212
1213	// the beauty of JSON: you need exactly one character lookahead	1341	// the beauty of JSON: you need exactly one character lookahead
1214	// to parse anything.	1342	// to parse everything.
1215	switch (*dec->cur)	1343	switch (*dec->cur)
1216	{	1344	{
1217	case '"': ++dec->cur; return decode_str (dec);	1345	case '"': ++dec->cur; return decode_str (dec);
1218	case '[': ++dec->cur; return decode_av (dec);	1346	case '[': ++dec->cur; return decode_av (dec);
1219	case '{': ++dec->cur; return decode_hv (dec);	1347	case '{': ++dec->cur; return decode_hv (dec);
1220		1348
1221	case '-':	1349	case '-':
1222	case '0': case '1': case '2': case '3': case '4':	1350	case '0': case '1': case '2': case '3': case '4':
1223	case '5': case '6': case '7': case '8': case '9':	1351	case '5': case '6': case '7': case '8': case '9':
1224	return decode_num (dec);	1352	return decode_num (dec);
1225		1353
1226	case 't':	1354	case 't':
1227	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1355	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1228	{	1356	{
1229	dec->cur += 4;	1357	dec->cur += 4;
		1358	#if JSON_SLOW
		1359	json_true = get_bool ("JSON::XS::true");
		1360	#endif
1230	return SvREFCNT_inc (json_true);	1361	return newSVsv (json_true);
1231	}	1362	}
1232	else	1363	else
1233	ERR ("'true' expected");	1364	ERR ("'true' expected");
1234		1365
1235	break;	1366	break;
1236		1367
1237	case 'f':	1368	case 'f':
1238	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1369	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1239	{	1370	{
1240	dec->cur += 5;	1371	dec->cur += 5;
		1372	#if JSON_SLOW
		1373	json_false = get_bool ("JSON::XS::false");
		1374	#endif
1241	return SvREFCNT_inc (json_false);	1375	return newSVsv (json_false);
1242	}	1376	}
1243	else	1377	else
1244	ERR ("'false' expected");	1378	ERR ("'false' expected");
1245		1379
1246	break;	1380	break;
…		…
1264	fail:	1398	fail:
1265	return 0;	1399	return 0;
1266	}	1400	}
1267		1401
1268	static SV *	1402	static SV *
1269	decode_json (SV string, JSON json, UV *offset_return)	1403	decode_json (SV string, JSON json, STRLEN *offset_return)
1270	{	1404	{
1271	dec_t dec;	1405	dec_t dec;
1272	UV offset;	1406	STRLEN offset;
1273	SV *sv;	1407	SV *sv;
1274		1408
1275	SvGETMAGIC (string);	1409	SvGETMAGIC (string);
1276	SvUPGRADE (string, SVt_PV);	1410	SvUPGRADE (string, SVt_PV);
1277		1411
…		…
1295		1429
1296	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1430	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1297	dec.json.flags \|= F_HOOK;	1431	dec.json.flags \|= F_HOOK;
1298		1432
1299	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1433	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1434
		1435	decode_ws (&dec);
1300	sv = decode_sv (&dec);	1436	sv = decode_sv (&dec);
1301		1437
1302	if (!(offset_return \|\| !sv))	1438	if (!(offset_return \|\| !sv))
1303	{	1439	{
1304	// check for trailing garbage	1440	// check for trailing garbage
…		…
1348		1484
1349	return sv;	1485	return sv;
1350	}	1486	}
1351		1487
1352	/////////////////////////////////////////////////////////////////////////////	1488	/////////////////////////////////////////////////////////////////////////////
		1489	// incremental parser
		1490
		1491	static void
		1492	incr_parse (JSON *self)
		1493	{
		1494	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1495
		1496	for (;;)
		1497	{
		1498	//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
		1499	switch (self->incr_mode)
		1500	{
		1501	// only used for intiial whitespace skipping
		1502	case INCR_M_WS:
		1503	for (;;)
		1504	{
		1505	if (*p > 0x20)
		1506	{
		1507	self->incr_mode = INCR_M_JSON;
		1508	goto incr_m_json;
		1509	}
		1510	else if (!*p)
		1511	goto interrupt;
		1512
		1513	++p;
		1514	}
		1515
		1516	// skip a single char inside a string (for \\-processing)
		1517	case INCR_M_BS:
		1518	if (!*p)
		1519	goto interrupt;
		1520
		1521	++p;
		1522	self->incr_mode = INCR_M_STR;
		1523	goto incr_m_str;
		1524
		1525	// inside a string
		1526	case INCR_M_STR:
		1527	incr_m_str:
		1528	for (;;)
		1529	{
		1530	if (*p == '"')
		1531	{
		1532	++p;
		1533	self->incr_mode = INCR_M_JSON;
		1534
		1535	if (!self->incr_nest)
		1536	goto interrupt;
		1537
		1538	goto incr_m_json;
		1539	}
		1540	else if (*p == '\\')
		1541	{
		1542	++p; // "virtually" consumes character after \
		1543
		1544	if (!*p) // if at end of string we have to switch modes
		1545	{
		1546	self->incr_mode = INCR_M_BS;
		1547	goto interrupt;
		1548	}
		1549	}
		1550	else if (!*p)
		1551	goto interrupt;
		1552
		1553	++p;
		1554	}
		1555
		1556	// after initial ws, outside string
		1557	case INCR_M_JSON:
		1558	incr_m_json:
		1559	for (;;)
		1560	{
		1561	switch (*p++)
		1562	{
		1563	case 0:
		1564	--p;
		1565	goto interrupt;
		1566
		1567	case 0x09:
		1568	case 0x0a:
		1569	case 0x0d:
		1570	case 0x20:
		1571	if (!self->incr_nest)
		1572	{
		1573	--p; // do not eat the whitespace, let the next round do it
		1574	goto interrupt;
		1575	}
		1576	break;
		1577
		1578	case '"':
		1579	self->incr_mode = INCR_M_STR;
		1580	goto incr_m_str;
		1581
		1582	case '[':
		1583	case '{':
		1584	++self->incr_nest;
		1585	break;
		1586
		1587	case ']':
		1588	case '}':
		1589	if (!--self->incr_nest)
		1590	goto interrupt;
		1591	}
		1592	}
		1593	}
		1594
		1595	modechange:
		1596	;
		1597	}
		1598
		1599	interrupt:
		1600	self->incr_pos = p - SvPVX (self->incr_text);
		1601	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
		1602	}
		1603
		1604	/////////////////////////////////////////////////////////////////////////////
1353	// XS interface functions	1605	// XS interface functions
1354		1606
1355	MODULE = JSON::XS PACKAGE = JSON::XS	1607	MODULE = JSON::XS PACKAGE = JSON::XS
1356		1608
1357	BOOT:	1609	BOOT:
…		…
1366	: -1;	1618	: -1;
1367		1619
1368	json_stash = gv_stashpv ("JSON::XS" , 1);	1620	json_stash = gv_stashpv ("JSON::XS" , 1);
1369	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1621	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1370		1622
1371	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1623	json_true = get_bool ("JSON::XS::true");
1372	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1624	json_false = get_bool ("JSON::XS::false");
1373	}	1625	}
1374		1626
1375	PROTOTYPES: DISABLE	1627	PROTOTYPES: DISABLE
1376		1628
1377	void CLONE (...)	1629	void CLONE (...)
…		…
1384	{	1636	{
1385	SV *pv = NEWSV (0, sizeof (JSON));	1637	SV *pv = NEWSV (0, sizeof (JSON));
1386	SvPOK_only (pv);	1638	SvPOK_only (pv);
1387	Zero (SvPVX (pv), 1, JSON);	1639	Zero (SvPVX (pv), 1, JSON);
1388	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1640	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1389	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));	1641	XPUSHs (sv_2mortal (sv_bless (
		1642	newRV_noinc (pv),
		1643	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		1644	)));
1390	}	1645	}
1391		1646
1392	void ascii (JSON *self, int enable = 1)	1647	void ascii (JSON *self, int enable = 1)
1393	ALIAS:	1648	ALIAS:
1394	ascii = F_ASCII	1649	ascii = F_ASCII
…		…
1401	pretty = F_PRETTY	1656	pretty = F_PRETTY
1402	allow_nonref = F_ALLOW_NONREF	1657	allow_nonref = F_ALLOW_NONREF
1403	shrink = F_SHRINK	1658	shrink = F_SHRINK
1404	allow_blessed = F_ALLOW_BLESSED	1659	allow_blessed = F_ALLOW_BLESSED
1405	convert_blessed = F_CONV_BLESSED	1660	convert_blessed = F_CONV_BLESSED
		1661	relaxed = F_RELAXED
1406	PPCODE:	1662	PPCODE:
1407	{	1663	{
1408	if (enable)	1664	if (enable)
1409	self->flags \|= ix;	1665	self->flags \|= ix;
1410	else	1666	else
1411	self->flags &= ~ix;	1667	self->flags &= ~ix;
1412		1668
1413	XPUSHs (ST (0));	1669	XPUSHs (ST (0));
1414	}	1670	}
1415		1671
		1672	void get_ascii (JSON *self)
		1673	ALIAS:
		1674	get_ascii = F_ASCII
		1675	get_latin1 = F_LATIN1
		1676	get_utf8 = F_UTF8
		1677	get_indent = F_INDENT
		1678	get_canonical = F_CANONICAL
		1679	get_space_before = F_SPACE_BEFORE
		1680	get_space_after = F_SPACE_AFTER
		1681	get_allow_nonref = F_ALLOW_NONREF
		1682	get_shrink = F_SHRINK
		1683	get_allow_blessed = F_ALLOW_BLESSED
		1684	get_convert_blessed = F_CONV_BLESSED
		1685	get_relaxed = F_RELAXED
		1686	PPCODE:
		1687	XPUSHs (boolSV (self->flags & ix));
		1688
1416	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1689	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1417	PPCODE:	1690	PPCODE:
1418	{	1691	{
1419	UV log2 = 0;	1692	UV log2 = 0;
1420		1693
…		…
1426	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1699	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1427		1700
1428	XPUSHs (ST (0));	1701	XPUSHs (ST (0));
1429	}	1702	}
1430		1703
		1704	U32 get_max_depth (JSON *self)
		1705	CODE:
		1706	RETVAL = DEC_DEPTH (self->flags);
		1707	OUTPUT:
		1708	RETVAL
		1709
1431	void max_size (JSON *self, UV max_size = 0)	1710	void max_size (JSON *self, UV max_size = 0)
1432	PPCODE:	1711	PPCODE:
1433	{	1712	{
1434	UV log2 = 0;	1713	UV log2 = 0;
1435		1714
…		…
1441		1720
1442	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1721	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1443		1722
1444	XPUSHs (ST (0));	1723	XPUSHs (ST (0));
1445	}	1724	}
		1725
		1726	int get_max_size (JSON *self)
		1727	CODE:
		1728	RETVAL = DEC_SIZE (self->flags);
		1729	OUTPUT:
		1730	RETVAL
1446		1731
1447	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1732	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1448	PPCODE:	1733	PPCODE:
1449	{	1734	{
1450	SvREFCNT_dec (self->cb_object);	1735	SvREFCNT_dec (self->cb_object);
…		…
1484	XPUSHs (decode_json (jsonstr, self, 0));	1769	XPUSHs (decode_json (jsonstr, self, 0));
1485		1770
1486	void decode_prefix (JSON self, SV jsonstr)	1771	void decode_prefix (JSON self, SV jsonstr)
1487	PPCODE:	1772	PPCODE:
1488	{	1773	{
1489	UV offset;	1774	STRLEN offset;
1490	EXTEND (SP, 2);	1775	EXTEND (SP, 2);
1491	PUSHs (decode_json (jsonstr, self, &offset));	1776	PUSHs (decode_json (jsonstr, self, &offset));
1492	PUSHs (sv_2mortal (newSVuv (offset)));	1777	PUSHs (sv_2mortal (newSVuv (offset)));
		1778	}
		1779
		1780	void incr_parse (JSON self, SV jsonstr = 0)
		1781	PPCODE:
		1782	{
		1783	if (!self->incr_text)
		1784	self->incr_text = newSVpvn ("", 0);
		1785
		1786	// append data, if any
		1787	if (jsonstr)
		1788	{
		1789	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
		1790	{
		1791	/* utf-8-ness differs, need to upgrade */
		1792	sv_utf8_upgrade (self->incr_text);
		1793
		1794	if (self->incr_pos)
		1795	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1796	- (U8 *)SvPVX (self->incr_text);
		1797	}
		1798
		1799	{
		1800	STRLEN len;
		1801	const char *str = SvPV (jsonstr, len);
		1802	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
		1803	Move (str, SvEND (self->incr_text), len, char);
		1804	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1805	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1806	}
		1807	}
		1808
		1809	if (GIMME_V != G_VOID)
		1810	do
		1811	{
		1812	STRLEN offset;
		1813
		1814	if (!INCR_DONE (self))
		1815	{
		1816	incr_parse (self);
		1817	if (!INCR_DONE (self))
		1818	break;
		1819	}
		1820
		1821	XPUSHs (decode_json (self->incr_text, self, &offset));
		1822
		1823	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
		1824	self->incr_pos -= offset;
		1825	self->incr_nest = 0;
		1826	self->incr_mode = 0;
		1827	}
		1828	while (GIMME_V == G_ARRAY);
		1829	}
		1830
		1831	SV incr_text (JSON self)
		1832	ATTRS: lvalue
		1833	CODE:
		1834	{
		1835	if (self->incr_pos)
		1836	croak ("incr_text can not be called when the incremental parser already started parsing");
		1837
		1838	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1839	}
		1840	OUTPUT:
		1841	RETVAL
		1842
		1843	void incr_skip (JSON *self)
		1844	CODE:
		1845	{
		1846	if (self->incr_pos)
		1847	{
		1848	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1849	self->incr_pos = 0;
		1850	self->incr_nest = 0;
		1851	self->incr_mode = 0;
		1852	}
1493	}	1853	}
1494		1854
1495	void DESTROY (JSON *self)	1855	void DESTROY (JSON *self)
1496	CODE:	1856	CODE:
1497	SvREFCNT_dec (self->cb_sk_object);	1857	SvREFCNT_dec (self->cb_sk_object);
1498	SvREFCNT_dec (self->cb_object);	1858	SvREFCNT_dec (self->cb_object);
		1859	SvREFCNT_dec (self->incr_text);
1499		1860
1500	PROTOTYPES: ENABLE	1861	PROTOTYPES: ENABLE
1501		1862
1502	void to_json (SV *scalar)	1863	void encode_json (SV *scalar)
		1864	ALIAS:
		1865	to_json_ = 0
		1866	encode_json = F_UTF8
1503	PPCODE:	1867	PPCODE:
1504	{	1868	{
1505	JSON json = { F_DEFAULT \| F_UTF8 };	1869	JSON json = { F_DEFAULT \| ix };
1506	XPUSHs (encode_json (scalar, &json));	1870	XPUSHs (encode_json (scalar, &json));
1507	}	1871	}
1508		1872
1509	void from_json (SV *jsonstr)	1873	void decode_json (SV *jsonstr)
		1874	ALIAS:
		1875	from_json_ = 0
		1876	decode_json = F_UTF8
1510	PPCODE:	1877	PPCODE:
1511	{	1878	{
1512	JSON json = { F_DEFAULT \| F_UTF8 };	1879	JSON json = { F_DEFAULT \| ix };
1513	XPUSHs (decode_json (jsonstr, &json, 0));	1880	XPUSHs (decode_json (jsonstr, &json, 0));
1514	}	1881	}
1515		1882
		1883

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.59 by root, Mon Aug 13 16:14:20 2007 UTC vs. Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.59 by root, Mon Aug 13 16:14:20 2007 UTC vs.
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC