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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.51 by root, Mon Jul 2 00:48:18 2007 UTC vs.
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC

…		…
1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
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>
		10	#include <float.h>
9		11
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	14	#endif
13		15
14	// 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
15	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarentees, though. if it breaks, you get to keep the pieces.
16	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
17	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
18	#endif	20	#endif
		21
		22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
19		23
20	#define F_ASCII 0x00000001UL	24	#define F_ASCII 0x00000001UL
21	#define F_LATIN1 0x00000002UL	25	#define F_LATIN1 0x00000002UL
22	#define F_UTF8 0x00000004UL	26	#define F_UTF8 0x00000004UL
23	#define F_INDENT 0x00000008UL	27	#define F_INDENT 0x00000008UL
26	#define F_SPACE_AFTER 0x00000040UL	30	#define F_SPACE_AFTER 0x00000040UL
27	#define F_ALLOW_NONREF 0x00000100UL	31	#define F_ALLOW_NONREF 0x00000100UL
28	#define F_SHRINK 0x00000200UL	32	#define F_SHRINK 0x00000200UL
29	#define F_ALLOW_BLESSED 0x00000400UL	33	#define F_ALLOW_BLESSED 0x00000400UL
30	#define F_CONV_BLESSED 0x00000800UL	34	#define F_CONV_BLESSED 0x00000800UL
		35	#define F_RELAXED 0x00001000UL
		36
31	#define F_MAXDEPTH 0xf8000000UL	37	#define F_MAXDEPTH 0xf8000000UL
32	#define S_MAXDEPTH 27	38	#define S_MAXDEPTH 27
33	#define F_MAXSIZE 0x01f00000UL	39	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	40	#define S_MAXSIZE 20
35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
…		…
47		53
48	#define SB do {	54	#define SB do {
49	#define SE } while (0)	55	#define SE } while (0)
50		56
51	#if __GNUC__ >= 3	57	#if __GNUC__ >= 3
52	# define expect(expr,value) __builtin_expect ((expr),(value))	58	# define expect(expr,value) __builtin_expect ((expr), (value))
53	# define inline inline	59	# define INLINE static inline
54	#else	60	#else
55	# define expect(expr,value) (expr)	61	# define expect(expr,value) (expr)
56	# define inline static	62	# define INLINE static
57	#endif	63	#endif
58		64
59	#define expect_false(expr) expect ((expr) != 0, 0)	65	#define expect_false(expr) expect ((expr) != 0, 0)
60	#define expect_true(expr) expect ((expr) != 0, 1)	66	#define expect_true(expr) expect ((expr) != 0, 1)
61		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)))
		71
		72	#ifdef USE_ITHREADS
		73	# define JSON_SLOW 1
		74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		75	#else
		76	# define JSON_SLOW 0
		77	# define JSON_STASH json_stash
		78	#endif
		79
62	static HV json_stash, json_boolean_stash; // JSON::XS::	80	static HV json_stash, json_boolean_stash; // JSON::XS::
63	static SV json_true, json_false;	81	static SV json_true, json_false;
64		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
65	typedef struct {	92	typedef struct {
66	U32 flags;	93	U32 flags;
67	SV cb_object, cb_sk_object;	94	SV *cb_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;
68	} JSON;	102	} JSON;
69		103
70	/////////////////////////////////////////////////////////////////////////////	104	/////////////////////////////////////////////////////////////////////////////
71	// utility functions	105	// utility functions
72		106
73	inline void	107	INLINE void
74	shrink (SV *sv)	108	shrink (SV *sv)
75	{	109	{
76	sv_utf8_downgrade (sv, 1);	110	sv_utf8_downgrade (sv, 1);
77	if (SvLEN (sv) > SvCUR (sv) + 1)	111	if (SvLEN (sv) > SvCUR (sv) + 1)
78	{	112	{
…		…
87	// decode an utf-8 character and return it, or (UV)-1 in	121	// decode an utf-8 character and return it, or (UV)-1 in
88	// case of an error.	122	// case of an error.
89	// we special-case "safe" characters from U+80 .. U+7FF,	123	// we special-case "safe" characters from U+80 .. U+7FF,
90	// but use the very good perl function to parse anything else.	124	// but use the very good perl function to parse anything else.
91	// note that we never call this function for a ascii codepoints	125	// note that we never call this function for a ascii codepoints
92	inline UV	126	INLINE UV
93	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	127	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
94	{	128	{
95	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))	129	if (expect_true (len >= 2
96	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	130	&& IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
97	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	131	&& IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
98	{	132	{
99	*clen = 2;	133	*clen = 2;
100	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	134	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
101	}	135	}
102	else	136	else
103	{	137	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
104	*clen = (STRLEN)-1;	138	}
105	return (UV)-1;	139
106	}	140	// likewise for encoding, also never called for ascii codepoints
		141	// this function takes advantage of this fact, although current gccs
		142	// seem to optimise the check for >= 0x80 away anyways
		143	INLINE unsigned char *
		144	encode_utf8 (unsigned char *s, UV ch)
		145	{
		146	if (expect_false (ch < 0x000080))
		147	*s++ = ch;
		148	else if (expect_true (ch < 0x000800))
		149	*s++ = 0xc0 \| ( ch >> 6),
		150	*s++ = 0x80 \| ( ch & 0x3f);
		151	else if ( ch < 0x010000)
		152	*s++ = 0xe0 \| ( ch >> 12),
		153	*s++ = 0x80 \| ((ch >> 6) & 0x3f),
		154	*s++ = 0x80 \| ( ch & 0x3f);
		155	else if ( ch < 0x110000)
		156	*s++ = 0xf0 \| ( ch >> 18),
		157	*s++ = 0x80 \| ((ch >> 12) & 0x3f),
		158	*s++ = 0x80 \| ((ch >> 6) & 0x3f),
		159	*s++ = 0x80 \| ( ch & 0x3f);
		160
		161	return s;
107	}	162	}
108		163
109	/////////////////////////////////////////////////////////////////////////////	164	/////////////////////////////////////////////////////////////////////////////
110	// encoder	165	// encoder
111		166
…		…
116	char *end; // SvEND (sv)	171	char *end; // SvEND (sv)
117	SV *sv; // result scalar	172	SV *sv; // result scalar
118	JSON json;	173	JSON json;
119	U32 indent; // indentation level	174	U32 indent; // indentation level
120	U32 maxdepth; // max. indentation/recursion level	175	U32 maxdepth; // max. indentation/recursion level
		176	UV limit; // escape character values >= this value when encoding
121	} enc_t;	177	} enc_t;
122		178
123	inline void	179	INLINE void
124	need (enc_t *enc, STRLEN len)	180	need (enc_t *enc, STRLEN len)
125	{	181	{
126	if (expect_false (enc->cur + len >= enc->end))	182	if (expect_false (enc->cur + len >= enc->end))
127	{	183	{
128	STRLEN cur = enc->cur - SvPVX (enc->sv);	184	STRLEN cur = enc->cur - SvPVX (enc->sv);
…		…
130	enc->cur = SvPVX (enc->sv) + cur;	186	enc->cur = SvPVX (enc->sv) + cur;
131	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	187	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
132	}	188	}
133	}	189	}
134		190
135	inline void	191	INLINE void
136	encode_ch (enc_t *enc, char ch)	192	encode_ch (enc_t *enc, char ch)
137	{	193	{
138	need (enc, 1);	194	need (enc, 1);
139	*enc->cur++ = ch;	195	*enc->cur++ = ch;
140	}	196	}
…		…
194	{	250	{
195	uch = ch;	251	uch = ch;
196	clen = 1;	252	clen = 1;
197	}	253	}
198		254
199	if (uch > 0x10FFFFUL)	255	if (uch < 0x80/0x20/ \|\| uch >= enc->limit)
200	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
201
202	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
203	{	256	{
204	if (uch > 0xFFFFUL)	257	if (uch >= 0x10000UL)
205	{	258	{
		259	if (uch >= 0x110000UL)
		260	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		261
206	need (enc, len += 11);	262	need (enc, len += 11);
207	sprintf (enc->cur, "\\u%04x\\u%04x",	263	sprintf (enc->cur, "\\u%04x\\u%04x",
208	(int)((uch - 0x10000) / 0x400 + 0xD800),	264	(int)((uch - 0x10000) / 0x400 + 0xD800),
209	(int)((uch - 0x10000) % 0x400 + 0xDC00));	265	(int)((uch - 0x10000) % 0x400 + 0xDC00));
210	enc->cur += 12;	266	enc->cur += 12;
…		…
238	while (--clen);	294	while (--clen);
239	}	295	}
240	else	296	else
241	{	297	{
242	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed	298	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
243	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);	299	enc->cur = encode_utf8 (enc->cur, uch);
244	++str;	300	++str;
245	}	301	}
246	}	302	}
247	}	303	}
248	}	304	}
249		305
250	--len;	306	--len;
251	}	307	}
252	}	308	}
253		309
254	inline void	310	INLINE void
255	encode_indent (enc_t *enc)	311	encode_indent (enc_t *enc)
256	{	312	{
257	if (enc->json.flags & F_INDENT)	313	if (enc->json.flags & F_INDENT)
258	{	314	{
259	int spaces = enc->indent * INDENT_STEP;	315	int spaces = enc->indent * INDENT_STEP;
…		…
262	memset (enc->cur, ' ', spaces);	318	memset (enc->cur, ' ', spaces);
263	enc->cur += spaces;	319	enc->cur += spaces;
264	}	320	}
265	}	321	}
266		322
267	inline void	323	INLINE void
268	encode_space (enc_t *enc)	324	encode_space (enc_t *enc)
269	{	325	{
270	need (enc, 1);	326	need (enc, 1);
271	encode_ch (enc, ' ');	327	encode_ch (enc, ' ');
272	}	328	}
273		329
274	inline void	330	INLINE void
275	encode_nl (enc_t *enc)	331	encode_nl (enc_t *enc)
276	{	332	{
277	if (enc->json.flags & F_INDENT)	333	if (enc->json.flags & F_INDENT)
278	{	334	{
279	need (enc, 1);	335	need (enc, 1);
280	encode_ch (enc, '\n');	336	encode_ch (enc, '\n');
281	}	337	}
282	}	338	}
283		339
284	inline void	340	INLINE void
285	encode_comma (enc_t *enc)	341	encode_comma (enc_t *enc)
286	{	342	{
287	encode_ch (enc, ',');	343	encode_ch (enc, ',');
288		344
289	if (enc->json.flags & F_INDENT)	345	if (enc->json.flags & F_INDENT)
…		…
300	int i, len = av_len (av);	356	int i, len = av_len (av);
301		357
302	if (enc->indent >= enc->maxdepth)	358	if (enc->indent >= enc->maxdepth)
303	croak ("data structure too deep (hit recursion limit)");	359	croak ("data structure too deep (hit recursion limit)");
304		360
305	encode_ch (enc, '['); encode_nl (enc);	361	encode_ch (enc, '[');
306	++enc->indent;	362
		363	if (len >= 0)
		364	{
		365	encode_nl (enc); ++enc->indent;
307		366
308	for (i = 0; i <= len; ++i)	367	for (i = 0; i <= len; ++i)
309	{	368	{
		369	SV **svp = av_fetch (av, i, 0);
		370
310	encode_indent (enc);	371	encode_indent (enc);
311	encode_sv (enc, *av_fetch (av, i, 0));
312		372
		373	if (svp)
		374	encode_sv (enc, *svp);
		375	else
		376	encode_str (enc, "null", 4, 0);
		377
313	if (i < len)	378	if (i < len)
314	encode_comma (enc);	379	encode_comma (enc);
315	}	380	}
316		381
		382	encode_nl (enc); --enc->indent; encode_indent (enc);
		383	}
		384
317	encode_nl (enc);	385	encode_ch (enc, ']');
318
319	--enc->indent;
320	encode_indent (enc); encode_ch (enc, ']');
321	}	386	}
322		387
323	static void	388	static void
324	encode_he (enc_t enc, HE he)	389	encode_hk (enc_t enc, HE he)
325	{	390	{
326	encode_ch (enc, '"');	391	encode_ch (enc, '"');
327		392
328	if (HeKLEN (he) == HEf_SVKEY)	393	if (HeKLEN (he) == HEf_SVKEY)
329	{	394	{
…		…
342	encode_ch (enc, '"');	407	encode_ch (enc, '"');
343		408
344	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	409	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345	encode_ch (enc, ':');	410	encode_ch (enc, ':');
346	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	411	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347	encode_sv (enc, HeVAL (he));
348	}	412	}
349		413
350	// compare hash entries, used when all keys are bytestrings	414	// compare hash entries, used when all keys are bytestrings
351	static int	415	static int
352	he_cmp_fast (const void a_, const void b_)	416	he_cmp_fast (const void a_, const void b_)
…		…
357	HE b = (HE **)b_;	421	HE b = (HE **)b_;
358		422
359	STRLEN la = HeKLEN (a);	423	STRLEN la = HeKLEN (a);
360	STRLEN lb = HeKLEN (b);	424	STRLEN lb = HeKLEN (b);
361		425
362	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	426	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
363	cmp = la - lb;	427	cmp = lb - la;
364		428
365	return cmp;	429	return cmp;
366	}	430	}
367		431
368	// compare hash entries, used when some keys are sv's or utf-x	432	// compare hash entries, used when some keys are sv's or utf-x
369	static int	433	static int
370	he_cmp_slow (const void a, const void b)	434	he_cmp_slow (const void a, const void b)
371	{	435	{
372	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	436	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
373	}	437	}
374		438
375	static void	439	static void
376	encode_hv (enc_t enc, HV hv)	440	encode_hv (enc_t enc, HV hv)
377	{	441	{
		442	HE *he;
378	int count, i;	443	int count;
379		444
380	if (enc->indent >= enc->maxdepth)	445	if (enc->indent >= enc->maxdepth)
381	croak ("data structure too deep (hit recursion limit)");	446	croak ("data structure too deep (hit recursion limit)");
382		447
383	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	448	encode_ch (enc, '{');
384		449
385	if ((count = hv_iterinit (hv)))
386	{
387	// for canonical output we have to sort by keys first	450	// for canonical output we have to sort by keys first
388	// actually, this is mostly due to the stupid so-called	451	// actually, this is mostly due to the stupid so-called
389	// security workaround added somewhere in 5.8.x.	452	// security workaround added somewhere in 5.8.x.
390	// that randomises hash orderings	453	// that randomises hash orderings
391	if (enc->json.flags & F_CANONICAL)	454	if (enc->json.flags & F_CANONICAL)
		455	{
		456	int count = hv_iterinit (hv);
		457
		458	if (SvMAGICAL (hv))
392	{	459	{
		460	// need to count by iterating. could improve by dynamically building the vector below
		461	// but I don't care for the speed of this special case.
		462	// note also that we will run into undefined behaviour when the two iterations
		463	// do not result in the same count, something I might care for in some later release.
		464
		465	count = 0;
		466	while (hv_iternext (hv))
		467	++count;
		468
		469	hv_iterinit (hv);
		470	}
		471
		472	if (count)
		473	{
393	int fast = 1;	474	int i, fast = 1;
394	HE *he;
395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	475	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
396	HE *hes = _alloca (count sizeof (HE));	476	HE *hes = _alloca (count sizeof (HE));
397	#else	477	#else
398	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	478	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
399	#endif	479	#endif
…		…
426		506
427	FREETMPS;	507	FREETMPS;
428	LEAVE;	508	LEAVE;
429	}	509	}
430		510
431	for (i = 0; i < count; ++i)	511	encode_nl (enc); ++enc->indent;
		512
		513	while (count--)
432	{	514	{
433	encode_indent (enc);	515	encode_indent (enc);
		516	he = hes [count];
434	encode_he (enc, hes [i]);	517	encode_hk (enc, he);
		518	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
435		519
436	if (i < count - 1)	520	if (count)
437	encode_comma (enc);	521	encode_comma (enc);
438	}	522	}
439		523
440	encode_nl (enc);	524	encode_nl (enc); --enc->indent; encode_indent (enc);
441	}	525	}
		526	}
442	else	527	else
		528	{
		529	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		530	if ((he = hv_iternext (hv)))
443	{	531	{
444	HE *he = hv_iternext (hv);	532	encode_nl (enc); ++enc->indent;
445		533
446	for (;;)	534	for (;;)
447	{	535	{
448	encode_indent (enc);	536	encode_indent (enc);
449	encode_he (enc, he);	537	encode_hk (enc, he);
		538	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
450		539
451	if (!(he = hv_iternext (hv)))	540	if (!(he = hv_iternext (hv)))
452	break;	541	break;
453		542
454	encode_comma (enc);	543	encode_comma (enc);
455	}	544	}
456		545
457	encode_nl (enc);	546	encode_nl (enc); --enc->indent; encode_indent (enc);
458	}	547	}
459	}	548	}
460		549
461	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	550	encode_ch (enc, '}');
462	}	551	}
463		552
464	// encode objects, arrays and special \0=false and \1=true values.	553	// encode objects, arrays and special \0=false and \1=true values.
465	static void	554	static void
466	encode_rv (enc_t enc, SV sv)	555	encode_rv (enc_t enc, SV sv)
…		…
470	SvGETMAGIC (sv);	559	SvGETMAGIC (sv);
471	svt = SvTYPE (sv);	560	svt = SvTYPE (sv);
472		561
473	if (expect_false (SvOBJECT (sv)))	562	if (expect_false (SvOBJECT (sv)))
474	{	563	{
		564	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		565	? json_boolean_stash
		566	: gv_stashpv ("JSON::XS::Boolean", 1);
		567
475	if (SvSTASH (sv) == json_boolean_stash)	568	if (SvSTASH (sv) == stash)
476	{	569	{
477	if (SvIV (sv))	570	if (SvIV (sv))
478	encode_str (enc, "true", 4, 0);	571	encode_str (enc, "true", 4, 0);
479	else	572	else
480	encode_str (enc, "false", 5, 0);	573	encode_str (enc, "false", 5, 0);
…		…
488	}	581	}
489	#endif	582	#endif
490	if (enc->json.flags & F_CONV_BLESSED)	583	if (enc->json.flags & F_CONV_BLESSED)
491	{	584	{
492	// we re-bless the reference to get overload and other niceties right	585	// we re-bless the reference to get overload and other niceties right
493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	586	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494		587
495	if (to_json)	588	if (to_json)
496	{	589	{
		590	dSP;
		591
497	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	592	ENTER; SAVETMPS; PUSHMARK (SP);
498	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	593	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499		594
500	// calling with G_SCALAR ensures that we always get a 1 reutrn value	595	// calling with G_SCALAR ensures that we always get a 1 return value
501	// check anyways.
502	PUTBACK;	596	PUTBACK;
503	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	597	call_sv ((SV *)GvCV (to_json), G_SCALAR);
504	SPAGAIN;	598	SPAGAIN;
505		599
		600	// catch this surprisingly common error
		601	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		602	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		603
		604	sv = POPs;
		605	PUTBACK;
		606
506	encode_sv (enc, POPs);	607	encode_sv (enc, sv);
507		608
508	FREETMPS; LEAVE;	609	FREETMPS; LEAVE;
509	}	610	}
510	else if (enc->json.flags & F_ALLOW_BLESSED)	611	else if (enc->json.flags & F_ALLOW_BLESSED)
511	encode_str (enc, "null", 4, 0);	612	encode_str (enc, "null", 4, 0);
…		…
562	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	663	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
563	enc->cur += strlen (enc->cur);	664	enc->cur += strlen (enc->cur);
564	}	665	}
565	else if (SvIOKp (sv))	666	else if (SvIOKp (sv))
566	{	667	{
567	// we assume we can always read an IV as a UV	668	// we assume we can always read an IV as a UV and vice versa
568	if (SvUV (sv) & ~(UV)0x7fff)	669	// we assume two's complement
569	{	670	// we assume no aliasing issues in the union
570	// large integer, use the (rather slow) snprintf way.	671	if (SvIsUV (sv) ? SvUVX (sv) <= 59000
571	need (enc, sizeof (UV) * 3);	672	: SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
572	enc->cur +=
573	SvIsUV(sv)
574	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
575	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
576	}
577	else
578	{	673	{
579	// optimise the "small number case"	674	// optimise the "small number case"
580	// code will likely be branchless and use only a single multiplication	675	// code will likely be branchless and use only a single multiplication
		676	// works for numbers up to 59074
581	I32 i = SvIV (sv);	677	I32 i = SvIVX (sv);
582	U32 u;	678	U32 u;
583	char digit, nz = 0;	679	char digit, nz = 0;
584		680
585	need (enc, 6);	681	need (enc, 6);
586		682
…		…
592		688
593	// now output digit by digit, each time masking out the integer part	689	// now output digit by digit, each time masking out the integer part
594	// and multiplying by 5 while moving the decimal point one to the right,	690	// and multiplying by 5 while moving the decimal point one to the right,
595	// resulting in a net multiplication by 10.	691	// resulting in a net multiplication by 10.
596	// we always write the digit to memory but conditionally increment	692	// we always write the digit to memory but conditionally increment
597	// the pointer, to ease the usage of conditional move instructions.	693	// the pointer, to enable the use of conditional move instructions.
598	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;	694	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffffUL) 5;
599	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;	695	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffffUL) 5;
600	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;	696	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffffUL) 5;
601	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;	697	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffffUL) 5;
602	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'	698	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
		699	}
		700	else
		701	{
		702	// large integer, use the (rather slow) snprintf way.
		703	need (enc, IVUV_MAXCHARS);
		704	enc->cur +=
		705	SvIsUV(sv)
		706	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
		707	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
603	}	708	}
604	}	709	}
605	else if (SvROK (sv))	710	else if (SvROK (sv))
606	encode_rv (enc, SvRV (sv));	711	encode_rv (enc, SvRV (sv));
607	else if (!SvOK (sv))	712	else if (!SvOK (sv))
…		…
623	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	728	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
624	enc.cur = SvPVX (enc.sv);	729	enc.cur = SvPVX (enc.sv);
625	enc.end = SvEND (enc.sv);	730	enc.end = SvEND (enc.sv);
626	enc.indent = 0;	731	enc.indent = 0;
627	enc.maxdepth = DEC_DEPTH (enc.json.flags);	732	enc.maxdepth = DEC_DEPTH (enc.json.flags);
		733	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
		734	: enc.json.flags & F_LATIN1 ? 0x000100UL
		735	: 0x110000UL;
628		736
629	SvPOK_only (enc.sv);	737	SvPOK_only (enc.sv);
630	encode_sv (&enc, scalar);	738	encode_sv (&enc, scalar);
631		739
632	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	740	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
…		…
653	JSON json;	761	JSON json;
654	U32 depth; // recursion depth	762	U32 depth; // recursion depth
655	U32 maxdepth; // recursion depth limit	763	U32 maxdepth; // recursion depth limit
656	} dec_t;	764	} dec_t;
657		765
658	inline void	766	INLINE void
		767	decode_comment (dec_t *dec)
		768	{
		769	// only '#'-style comments allowed a.t.m.
		770
		771	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		772	++dec->cur;
		773	}
		774
		775	INLINE void
659	decode_ws (dec_t *dec)	776	decode_ws (dec_t *dec)
660	{	777	{
661	for (;;)	778	for (;;)
662	{	779	{
663	char ch = *dec->cur;	780	char ch = *dec->cur;
664		781
665	if (ch > 0x20	782	if (ch > 0x20)
		783	{
		784	if (expect_false (ch == '#'))
		785	{
		786	if (dec->json.flags & F_RELAXED)
		787	decode_comment (dec);
		788	else
		789	break;
		790	}
		791	else
		792	break;
		793	}
666	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	794	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
667	break;	795	break; // parse error, but let higher level handle it, gives better error messages
668		796
669	++dec->cur;	797	++dec->cur;
670	}	798	}
671	}	799	}
672		800
…		…
778		906
779	if (hi >= 0x80)	907	if (hi >= 0x80)
780	{	908	{
781	utf8 = 1;	909	utf8 = 1;
782		910
783	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);	911	cur = encode_utf8 (cur, hi);
784	}	912	}
785	else	913	else
786	*cur++ = hi;	914	*cur++ = hi;
787	}	915	}
788	break;	916	break;
…		…
790	default:	918	default:
791	--dec_cur;	919	--dec_cur;
792	ERR ("illegal backslash escape sequence in string");	920	ERR ("illegal backslash escape sequence in string");
793	}	921	}
794	}	922	}
795	else if (expect_true (ch >= 0x20 && ch <= 0x7f))	923	else if (expect_true (ch >= 0x20 && ch < 0x80))
796	*cur++ = ch;	924	*cur++ = ch;
797	else if (ch >= 0x80)	925	else if (ch >= 0x80)
798	{	926	{
799	STRLEN clen;	927	STRLEN clen;
800	UV uch;	928	UV uch;
…		…
921	is_nv = 1;	1049	is_nv = 1;
922	}	1050	}
923		1051
924	if (!is_nv)	1052	if (!is_nv)
925	{	1053	{
		1054	int len = dec->cur - start;
		1055
926	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1056	// special case the rather common 1..5-digit-int case
927	if (*start == '-')	1057	if (*start == '-')
928	switch (dec->cur - start)	1058	switch (len)
929	{	1059	{
930	case 2: return newSViv (-( start [1] - '0' * 1));	1060	case 2: return newSViv (-( start [1] - '0' * 1));
931	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1061	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
932	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1062	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
933	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1063	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
		1064	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
934	}	1065	}
935	else	1066	else
936	switch (dec->cur - start)	1067	switch (len)
937	{	1068	{
938	case 1: return newSViv ( start [0] - '0' * 1);	1069	case 1: return newSViv ( start [0] - '0' * 1);
939	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1070	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
940	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1071	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
941	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1072	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		1073	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
942	}	1074	}
943		1075
944	{	1076	{
945	UV uv;	1077	UV uv;
946	int numtype = grok_number (start, dec->cur - start, &uv);	1078	int numtype = grok_number (start, len, &uv);
947	if (numtype & IS_NUMBER_IN_UV)	1079	if (numtype & IS_NUMBER_IN_UV)
948	if (numtype & IS_NUMBER_NEG)	1080	if (numtype & IS_NUMBER_NEG)
949	{	1081	{
950	if (uv < (UV)IV_MIN)	1082	if (uv < (UV)IV_MIN)
951	return newSViv (-(IV)uv);	1083	return newSViv (-(IV)uv);
952	}	1084	}
953	else	1085	else
954	return newSVuv (uv);	1086	return newSVuv (uv);
955
956	// here would likely be the place for bigint support
957	}	1087	}
958	}
959		1088
960	// if we ever support bigint or bigfloat, this is the place for bigfloat	1089	len -= *start == '-' ? 1 : 0;
		1090
		1091	// does not fit into IV or UV, try NV
		1092	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1093	#if defined (LDBL_DIG)
		1094	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1095	#endif
		1096	)
		1097	// fits into NV without loss of precision
		1098	return newSVnv (Atof (start));
		1099
		1100	// everything else fails, convert it to a string
		1101	return newSVpvn (start, dec->cur - start);
		1102	}
		1103
		1104	// loss of precision here
961	return newSVnv (Atof (start));	1105	return newSVnv (Atof (start));
962		1106
963	fail:	1107	fail:
964	return 0;	1108	return 0;
965	}	1109	}
…		…
995		1139
996	if (*dec->cur != ',')	1140	if (*dec->cur != ',')
997	ERR (", or ] expected while parsing array");	1141	ERR (", or ] expected while parsing array");
998		1142
999	++dec->cur;	1143	++dec->cur;
		1144
		1145	decode_ws (dec);
		1146
		1147	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1148	{
		1149	++dec->cur;
		1150	break;
		1151	}
1000	}	1152	}
1001		1153
1002	DEC_DEC_DEPTH;	1154	DEC_DEC_DEPTH;
1003	return newRV_noinc ((SV *)av);	1155	return newRV_noinc ((SV *)av);
1004		1156
…		…
1020	if (*dec->cur == '}')	1172	if (*dec->cur == '}')
1021	++dec->cur;	1173	++dec->cur;
1022	else	1174	else
1023	for (;;)	1175	for (;;)
1024	{	1176	{
1025	decode_ws (dec); EXPECT_CH ('"');	1177	EXPECT_CH ('"');
1026		1178
1027	// heuristic: assume that	1179	// heuristic: assume that
1028	// a) decode_str + hv_store_ent are abysmally slow.	1180	// a) decode_str + hv_store_ent are abysmally slow.
1029	// b) most hash keys are short, simple ascii text.	1181	// b) most hash keys are short, simple ascii text.
1030	// => try to "fast-match" such strings to avoid	1182	// => try to "fast-match" such strings to avoid
…		…
1034	char *p = dec->cur;	1186	char *p = dec->cur;
1035	char *e = p + 24; // only try up to 24 bytes	1187	char *e = p + 24; // only try up to 24 bytes
1036		1188
1037	for (;;)	1189	for (;;)
1038	{	1190	{
1039	// the >= 0x80 is true on most architectures	1191	// the >= 0x80 is false on most architectures
1040	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1192	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1041	{	1193	{
1042	// slow path, back up and use decode_str	1194	// slow path, back up and use decode_str
1043	SV *key = decode_str (dec);	1195	SV *key = decode_str (dec);
1044	if (!key)	1196	if (!key)
1045	goto fail;	1197	goto fail;
1046		1198
1047	decode_ws (dec); EXPECT_CH (':');	1199	decode_ws (dec); EXPECT_CH (':');
1048		1200
		1201	decode_ws (dec);
1049	value = decode_sv (dec);	1202	value = decode_sv (dec);
1050	if (!value)	1203	if (!value)
1051	{	1204	{
1052	SvREFCNT_dec (key);	1205	SvREFCNT_dec (key);
1053	goto fail;	1206	goto fail;
…		…
1065	int len = p - key;	1218	int len = p - key;
1066	dec->cur = p + 1;	1219	dec->cur = p + 1;
1067		1220
1068	decode_ws (dec); EXPECT_CH (':');	1221	decode_ws (dec); EXPECT_CH (':');
1069		1222
		1223	decode_ws (dec);
1070	value = decode_sv (dec);	1224	value = decode_sv (dec);
1071	if (!value)	1225	if (!value)
1072	goto fail;	1226	goto fail;
1073		1227
1074	hv_store (hv, key, len, value, 0);	1228	hv_store (hv, key, len, value, 0);
…		…
1090		1244
1091	if (*dec->cur != ',')	1245	if (*dec->cur != ',')
1092	ERR (", or } expected while parsing object/hash");	1246	ERR (", or } expected while parsing object/hash");
1093		1247
1094	++dec->cur;	1248	++dec->cur;
		1249
		1250	decode_ws (dec);
		1251
		1252	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1253	{
		1254	++dec->cur;
		1255	break;
		1256	}
1095	}	1257	}
1096		1258
1097	DEC_DEC_DEPTH;	1259	DEC_DEC_DEPTH;
1098	sv = newRV_noinc ((SV *)hv);	1260	sv = newRV_noinc ((SV *)hv);
1099		1261
1100	// check filter callbacks	1262	// check filter callbacks
1101	if (dec->json.flags & F_HOOK)	1263	if (dec->json.flags & F_HOOK)
1102	{	1264	{
1103	ENTER; SAVETMPS;
1104
1105	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)	1265	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1106	{	1266	{
		1267	HE cb, he;
		1268
		1269	hv_iterinit (hv);
		1270	he = hv_iternext (hv);
		1271	hv_iterinit (hv);
		1272
		1273	// the next line creates a mortal sv each time its called.
		1274	// might want to optimise this for common cases.
		1275	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1276
		1277	if (cb)
		1278	{
		1279	dSP;
		1280	int count;
		1281
		1282	ENTER; SAVETMPS; PUSHMARK (SP);
		1283	XPUSHs (HeVAL (he));
		1284
		1285	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1286
		1287	if (count == 1)
		1288	{
		1289	sv = newSVsv (POPs);
		1290	FREETMPS; LEAVE;
		1291	return sv;
		1292	}
		1293
		1294	FREETMPS; LEAVE;
		1295	}
		1296	}
		1297
		1298	if (dec->json.cb_object)
		1299	{
		1300	dSP;
1107	int count;	1301	int count;
1108		1302
1109	dSP; PUSHMARK (SP);	1303	ENTER; SAVETMPS; PUSHMARK (SP);
1110	XPUSHs (sv_2mortal (sv));	1304	XPUSHs (sv_2mortal (sv));
1111		1305
1112	PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;	1306	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1113		1307
1114	if (count == 1)	1308	if (count == 1)
1115	{	1309	{
1116	sv = newSVsv (POPs);	1310	sv = newSVsv (POPs);
1117	goto filter_ok;	1311	FREETMPS; LEAVE;
		1312	return sv;
1118	}	1313	}
1119		1314
1120	SvREFCNT_inc (sv);	1315	SvREFCNT_inc (sv);
		1316	FREETMPS; LEAVE;
1121	}	1317	}
1122
1123	if (dec->json.cb_object)
1124	{
1125	int count;
1126
1127	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
1128	XPUSHs (sv_2mortal (sv));
1129
1130	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1131
1132	if (count == 1)
1133	{
1134	sv = newSVsv (POPs);
1135	goto filter_ok;
1136	}
1137
1138	SvREFCNT_inc (sv);
1139	}
1140
1141	filter_ok:
1142	FREETMPS; LEAVE;
1143	}	1318	}
1144		1319
1145	return sv;	1320	return sv;
1146		1321
1147	fail:	1322	fail:
…		…
1151	}	1326	}
1152		1327
1153	static SV *	1328	static SV *
1154	decode_sv (dec_t *dec)	1329	decode_sv (dec_t *dec)
1155	{	1330	{
1156	decode_ws (dec);
1157
1158	// the beauty of JSON: you need exactly one character lookahead	1331	// the beauty of JSON: you need exactly one character lookahead
1159	// to parse anything.	1332	// to parse everything.
1160	switch (*dec->cur)	1333	switch (*dec->cur)
1161	{	1334	{
1162	case '"': ++dec->cur; return decode_str (dec);	1335	case '"': ++dec->cur; return decode_str (dec);
1163	case '[': ++dec->cur; return decode_av (dec);	1336	case '[': ++dec->cur; return decode_av (dec);
1164	case '{': ++dec->cur; return decode_hv (dec);	1337	case '{': ++dec->cur; return decode_hv (dec);
1165		1338
1166	case '-':	1339	case '-':
1167	case '0': case '1': case '2': case '3': case '4':	1340	case '0': case '1': case '2': case '3': case '4':
1168	case '5': case '6': case '7': case '8': case '9':	1341	case '5': case '6': case '7': case '8': case '9':
1169	return decode_num (dec);	1342	return decode_num (dec);
1170		1343
1171	case 't':	1344	case 't':
1172	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1345	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1173	{	1346	{
1174	dec->cur += 4;	1347	dec->cur += 4;
		1348	#if JSON_SLOW
		1349	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1350	#endif
1175	return SvREFCNT_inc (json_true);	1351	return SvREFCNT_inc (json_true);
1176	}	1352	}
1177	else	1353	else
1178	ERR ("'true' expected");	1354	ERR ("'true' expected");
1179		1355
…		…
1181		1357
1182	case 'f':	1358	case 'f':
1183	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1359	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1184	{	1360	{
1185	dec->cur += 5;	1361	dec->cur += 5;
		1362	#if JSON_SLOW
		1363	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1364	#endif
1186	return SvREFCNT_inc (json_false);	1365	return SvREFCNT_inc (json_false);
1187	}	1366	}
1188	else	1367	else
1189	ERR ("'false' expected");	1368	ERR ("'false' expected");
1190		1369
…		…
1209	fail:	1388	fail:
1210	return 0;	1389	return 0;
1211	}	1390	}
1212		1391
1213	static SV *	1392	static SV *
1214	decode_json (SV string, JSON json, UV *offset_return)	1393	decode_json (SV string, JSON json, STRLEN *offset_return)
1215	{	1394	{
1216	dec_t dec;	1395	dec_t dec;
1217	UV offset;	1396	STRLEN offset;
1218	SV *sv;	1397	SV *sv;
1219		1398
1220	SvGETMAGIC (string);	1399	SvGETMAGIC (string);
1221	SvUPGRADE (string, SVt_PV);	1400	SvUPGRADE (string, SVt_PV);
1222		1401
…		…
1240		1419
1241	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1420	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1242	dec.json.flags \|= F_HOOK;	1421	dec.json.flags \|= F_HOOK;
1243		1422
1244	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1423	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1424
		1425	decode_ws (&dec);
1245	sv = decode_sv (&dec);	1426	sv = decode_sv (&dec);
1246		1427
1247	if (!(offset_return \|\| !sv))	1428	if (!(offset_return \|\| !sv))
1248	{	1429	{
1249	// check for trailing garbage	1430	// check for trailing garbage
…		…
1293		1474
1294	return sv;	1475	return sv;
1295	}	1476	}
1296		1477
1297	/////////////////////////////////////////////////////////////////////////////	1478	/////////////////////////////////////////////////////////////////////////////
		1479	// incremental parser
		1480
		1481	static void
		1482	incr_parse (JSON *self)
		1483	{
		1484	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1485
		1486	for (;;)
		1487	{
		1488	//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
		1489	switch (self->incr_mode)
		1490	{
		1491	// only used for intiial whitespace skipping
		1492	case INCR_M_WS:
		1493	for (;;)
		1494	{
		1495	if (*p > 0x20)
		1496	{
		1497	self->incr_mode = INCR_M_JSON;
		1498	goto incr_m_json;
		1499	}
		1500	else if (!*p)
		1501	goto interrupt;
		1502
		1503	++p;
		1504	}
		1505
		1506	// skip a single char inside a string (for \\-processing)
		1507	case INCR_M_BS:
		1508	if (!*p)
		1509	goto interrupt;
		1510
		1511	++p;
		1512	self->incr_mode = INCR_M_STR;
		1513	goto incr_m_str;
		1514
		1515	// inside a string
		1516	case INCR_M_STR:
		1517	incr_m_str:
		1518	for (;;)
		1519	{
		1520	if (*p == '"')
		1521	{
		1522	++p;
		1523	self->incr_mode = INCR_M_JSON;
		1524
		1525	if (!self->incr_nest)
		1526	goto interrupt;
		1527
		1528	goto incr_m_json;
		1529	}
		1530	else if (*p == '\\')
		1531	{
		1532	++p; // "virtually" consumes character after \
		1533
		1534	if (!*p) // if at end of string we have to switch modes
		1535	{
		1536	self->incr_mode = INCR_M_BS;
		1537	goto interrupt;
		1538	}
		1539	}
		1540	else if (!*p)
		1541	goto interrupt;
		1542
		1543	++p;
		1544	}
		1545
		1546	// after initial ws, outside string
		1547	case INCR_M_JSON:
		1548	incr_m_json:
		1549	for (;;)
		1550	{
		1551	switch (*p++)
		1552	{
		1553	case 0:
		1554	--p;
		1555	goto interrupt;
		1556
		1557	case 0x09:
		1558	case 0x0a:
		1559	case 0x0d:
		1560	case 0x20:
		1561	if (!self->incr_nest)
		1562	{
		1563	--p; // do not eat the whitespace, let the next round do it
		1564	goto interrupt;
		1565	}
		1566	break;
		1567
		1568	case '"':
		1569	self->incr_mode = INCR_M_STR;
		1570	goto incr_m_str;
		1571
		1572	case '[':
		1573	case '{':
		1574	++self->incr_nest;
		1575	break;
		1576
		1577	case ']':
		1578	case '}':
		1579	if (!--self->incr_nest)
		1580	goto interrupt;
		1581	}
		1582	}
		1583	}
		1584
		1585	modechange:
		1586	;
		1587	}
		1588
		1589	interrupt:
		1590	self->incr_pos = p - SvPVX (self->incr_text);
		1591	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
		1592	}
		1593
		1594	/////////////////////////////////////////////////////////////////////////////
1298	// XS interface functions	1595	// XS interface functions
1299		1596
1300	MODULE = JSON::XS PACKAGE = JSON::XS	1597	MODULE = JSON::XS PACKAGE = JSON::XS
1301		1598
1302	BOOT:	1599	BOOT:
…		…
1317	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1614	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1318	}	1615	}
1319		1616
1320	PROTOTYPES: DISABLE	1617	PROTOTYPES: DISABLE
1321		1618
		1619	void CLONE (...)
		1620	CODE:
		1621	json_stash = 0;
		1622	json_boolean_stash = 0;
		1623
1322	void new (char *klass)	1624	void new (char *klass)
1323	PPCODE:	1625	PPCODE:
1324	{	1626	{
1325	SV *pv = NEWSV (0, sizeof (JSON));	1627	SV *pv = NEWSV (0, sizeof (JSON));
1326	SvPOK_only (pv);	1628	SvPOK_only (pv);
1327	Zero (SvPVX (pv), 1, JSON);	1629	Zero (SvPVX (pv), 1, JSON);
1328	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1630	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1329	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1631	XPUSHs (sv_2mortal (sv_bless (
		1632	newRV_noinc (pv),
		1633	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		1634	)));
1330	}	1635	}
1331		1636
1332	void ascii (JSON *self, int enable = 1)	1637	void ascii (JSON *self, int enable = 1)
1333	ALIAS:	1638	ALIAS:
1334	ascii = F_ASCII	1639	ascii = F_ASCII
…		…
1341	pretty = F_PRETTY	1646	pretty = F_PRETTY
1342	allow_nonref = F_ALLOW_NONREF	1647	allow_nonref = F_ALLOW_NONREF
1343	shrink = F_SHRINK	1648	shrink = F_SHRINK
1344	allow_blessed = F_ALLOW_BLESSED	1649	allow_blessed = F_ALLOW_BLESSED
1345	convert_blessed = F_CONV_BLESSED	1650	convert_blessed = F_CONV_BLESSED
		1651	relaxed = F_RELAXED
1346	PPCODE:	1652	PPCODE:
1347	{	1653	{
1348	if (enable)	1654	if (enable)
1349	self->flags \|= ix;	1655	self->flags \|= ix;
1350	else	1656	else
1351	self->flags &= ~ix;	1657	self->flags &= ~ix;
1352		1658
1353	XPUSHs (ST (0));	1659	XPUSHs (ST (0));
1354	}	1660	}
1355		1661
		1662	void get_ascii (JSON *self)
		1663	ALIAS:
		1664	get_ascii = F_ASCII
		1665	get_latin1 = F_LATIN1
		1666	get_utf8 = F_UTF8
		1667	get_indent = F_INDENT
		1668	get_canonical = F_CANONICAL
		1669	get_space_before = F_SPACE_BEFORE
		1670	get_space_after = F_SPACE_AFTER
		1671	get_allow_nonref = F_ALLOW_NONREF
		1672	get_shrink = F_SHRINK
		1673	get_allow_blessed = F_ALLOW_BLESSED
		1674	get_convert_blessed = F_CONV_BLESSED
		1675	get_relaxed = F_RELAXED
		1676	PPCODE:
		1677	XPUSHs (boolSV (self->flags & ix));
		1678
1356	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1679	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1357	PPCODE:	1680	PPCODE:
1358	{	1681	{
1359	UV log2 = 0;	1682	UV log2 = 0;
1360		1683
…		…
1366	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1689	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1367		1690
1368	XPUSHs (ST (0));	1691	XPUSHs (ST (0));
1369	}	1692	}
1370		1693
		1694	U32 get_max_depth (JSON *self)
		1695	CODE:
		1696	RETVAL = DEC_DEPTH (self->flags);
		1697	OUTPUT:
		1698	RETVAL
		1699
1371	void max_size (JSON *self, UV max_size = 0)	1700	void max_size (JSON *self, UV max_size = 0)
1372	PPCODE:	1701	PPCODE:
1373	{	1702	{
1374	UV log2 = 0;	1703	UV log2 = 0;
1375		1704
…		…
1382	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1711	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1383		1712
1384	XPUSHs (ST (0));	1713	XPUSHs (ST (0));
1385	}	1714	}
1386		1715
		1716	int get_max_size (JSON *self)
		1717	CODE:
		1718	RETVAL = DEC_SIZE (self->flags);
		1719	OUTPUT:
		1720	RETVAL
		1721
1387	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1722	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1388	ALIAS:
1389	filter_json_single_key_object = 1
1390	PPCODE:	1723	PPCODE:
1391	{	1724	{
1392	SV **svp;	1725	SvREFCNT_dec (self->cb_object);
		1726	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1393		1727
		1728	XPUSHs (ST (0));
		1729	}
		1730
		1731	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1732	PPCODE:
		1733	{
		1734	if (!self->cb_sk_object)
		1735	self->cb_sk_object = newHV ();
		1736
1394	if (!SvOK (cb))	1737	if (SvOK (cb))
1395	cb = 0;	1738	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1396	else	1739	else
1397	cb = newSVsv (cb);
1398
1399	switch (ix)
1400	{	1740	{
1401	case 0: svp = &self->cb_object ; break;	1741	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1402	case 1: svp = &self->cb_sk_object; break;	1742
		1743	if (!HvKEYS (self->cb_sk_object))
		1744	{
		1745	SvREFCNT_dec (self->cb_sk_object);
		1746	self->cb_sk_object = 0;
		1747	}
1403	}	1748	}
1404
1405	if (*svp)
1406	SvREFCNT_dec (*svp);
1407
1408	*svp = cb;
1409		1749
1410	XPUSHs (ST (0));	1750	XPUSHs (ST (0));
1411	}	1751	}
1412		1752
1413	void encode (JSON self, SV scalar)	1753	void encode (JSON self, SV scalar)
…		…
1419	XPUSHs (decode_json (jsonstr, self, 0));	1759	XPUSHs (decode_json (jsonstr, self, 0));
1420		1760
1421	void decode_prefix (JSON self, SV jsonstr)	1761	void decode_prefix (JSON self, SV jsonstr)
1422	PPCODE:	1762	PPCODE:
1423	{	1763	{
1424	UV offset;	1764	STRLEN offset;
1425	EXTEND (SP, 2);	1765	EXTEND (SP, 2);
1426	PUSHs (decode_json (jsonstr, self, &offset));	1766	PUSHs (decode_json (jsonstr, self, &offset));
1427	PUSHs (sv_2mortal (newSVuv (offset)));	1767	PUSHs (sv_2mortal (newSVuv (offset)));
1428	}	1768	}
1429		1769
		1770	void incr_parse (JSON self, SV jsonstr = 0)
		1771	PPCODE:
		1772	{
		1773	if (!self->incr_text)
		1774	self->incr_text = newSVpvn ("", 0);
		1775
		1776	// append data, if any
		1777	if (jsonstr)
		1778	{
		1779	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
		1780	{
		1781	/* utf-8-ness differs, need to upgrade */
		1782	sv_utf8_upgrade (self->incr_text);
		1783
		1784	if (self->incr_pos)
		1785	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1786	- (U8 *)SvPVX (self->incr_text);
		1787	}
		1788
		1789	{
		1790	STRLEN len;
		1791	const char *str = SvPV (jsonstr, len);
		1792	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
		1793	Move (str, SvEND (self->incr_text), len, char);
		1794	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1795	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1796	}
		1797	}
		1798
		1799	if (GIMME_V != G_VOID)
		1800	do
		1801	{
		1802	STRLEN offset;
		1803
		1804	incr_parse (self);
		1805
		1806	if (!INCR_DONE (self))
		1807	break;
		1808
		1809	XPUSHs (decode_json (self->incr_text, self, &offset));
		1810
		1811	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
		1812	self->incr_pos -= offset;
		1813	self->incr_nest = 0;
		1814	self->incr_mode = 0;
		1815	}
		1816	while (GIMME_V == G_ARRAY);
		1817	}
		1818
		1819	SV incr_text (JSON self)
		1820	ATTRS: lvalue
		1821	CODE:
		1822	{
		1823	if (self->incr_pos)
		1824	croak ("incr_text can only be called after a successful incr_parse call in scalar context %d", self->incr_pos);//D
		1825
		1826	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1827	}
		1828	OUTPUT:
		1829	RETVAL
		1830
		1831	void DESTROY (JSON *self)
		1832	CODE:
		1833	SvREFCNT_dec (self->cb_sk_object);
		1834	SvREFCNT_dec (self->cb_object);
		1835	SvREFCNT_dec (self->incr_text);
		1836
1430	PROTOTYPES: ENABLE	1837	PROTOTYPES: ENABLE
1431		1838
1432	void to_json (SV *scalar)	1839	void encode_json (SV *scalar)
		1840	ALIAS:
		1841	to_json_ = 0
		1842	encode_json = F_UTF8
1433	PPCODE:	1843	PPCODE:
1434	{	1844	{
1435	JSON json = { F_DEFAULT \| F_UTF8 };	1845	JSON json = { F_DEFAULT \| ix };
1436	XPUSHs (encode_json (scalar, &json));	1846	XPUSHs (encode_json (scalar, &json));
1437	}	1847	}
1438		1848
1439	void from_json (SV *jsonstr)	1849	void decode_json (SV *jsonstr)
		1850	ALIAS:
		1851	from_json_ = 0
		1852	decode_json = F_UTF8
1440	PPCODE:	1853	PPCODE:
1441	{	1854	{
1442	JSON json = { F_DEFAULT \| F_UTF8 };	1855	JSON json = { F_DEFAULT \| ix };
1443	XPUSHs (decode_json (jsonstr, &json, 0));	1856	XPUSHs (decode_json (jsonstr, &json, 0));
1444	}	1857	}
1445		1858
		1859

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.51 by root, Mon Jul 2 00:48:18 2007 UTC vs. Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.51 by root, Mon Jul 2 00:48:18 2007 UTC vs.
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC