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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.109 by root, Tue Mar 8 10:18:50 2011 UTC

…		…
12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
13	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
14	#endif	14	#endif
15		15
16	// 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
17	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
20	#endif	20	#endif
21		21
		22	// three extra for rounding, sign, and end of string
22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23		24
24	#define F_ASCII 0x00000001UL	25	#define F_ASCII 0x00000001UL
25	#define F_LATIN1 0x00000002UL	26	#define F_LATIN1 0x00000002UL
26	#define F_UTF8 0x00000004UL	27	#define F_UTF8 0x00000004UL
27	#define F_INDENT 0x00000008UL	28	#define F_INDENT 0x00000008UL
…		…
31	#define F_ALLOW_NONREF 0x00000100UL	32	#define F_ALLOW_NONREF 0x00000100UL
32	#define F_SHRINK 0x00000200UL	33	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	34	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	35	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	36	#define F_RELAXED 0x00001000UL
36		37	#define F_ALLOW_UNKNOWN 0x00002000UL
37	#define F_MAXDEPTH 0xf8000000UL
38	#define S_MAXDEPTH 27
39	#define F_MAXSIZE 0x01f00000UL
40	#define S_MAXSIZE 20
41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42		39
43	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
47	#define F_DEFAULT (9UL << S_MAXDEPTH)
48		41
49	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
50	#define INDENT_STEP 3 // spaces per indentation level	43	#define INDENT_STEP 3 // spaces per indentation level
51		44
52	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		46
		47	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
53		48
54	#define SB do {	49	#define SB do {
55	#define SE } while (0)	50	#define SE } while (0)
56		51
57	#if __GNUC__ >= 3	52	#if __GNUC__ >= 3
…		…
67		62
68	#define IN_RANGE_INC(type,val,beg,end) \	63	#define IN_RANGE_INC(type,val,beg,end) \
69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	64	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	65	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71		66
		67	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		68
72	#ifdef USE_ITHREADS	69	#ifdef USE_ITHREADS
73	# define JSON_SLOW 1	70	# define JSON_SLOW 1
74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	71	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75	#else	72	#else
76	# define JSON_SLOW 0	73	# define JSON_SLOW 0
…		…
78	#endif	75	#endif
79		76
80	static HV json_stash, json_boolean_stash; // JSON::XS::	77	static HV json_stash, json_boolean_stash; // JSON::XS::
81	static SV json_true, json_false;	78	static SV json_true, json_false;
82		79
		80	enum {
		81	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		82	INCR_M_STR, // inside string
		83	INCR_M_BS, // inside backslash
		84	INCR_M_C0, // inside comment in initial whitespace sequence
		85	INCR_M_C1, // inside comment in other places
		86	INCR_M_JSON // outside anything, count nesting
		87	};
		88
		89	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
		90
83	typedef struct {	91	typedef struct {
84	U32 flags;	92	U32 flags;
		93	U32 max_depth;
		94	STRLEN max_size;
		95
85	SV *cb_object;	96	SV *cb_object;
86	HV *cb_sk_object;	97	HV *cb_sk_object;
		98
		99	// for the incremental parser
		100	SV *incr_text; // the source text so far
		101	STRLEN incr_pos; // the current offset into the text
		102	int incr_nest; // {[]}-nesting level
		103	unsigned char incr_mode;
87	} JSON;	104	} JSON;
		105
		106	INLINE void
		107	json_init (JSON *json)
		108	{
		109	Zero (json, 1, JSON);
		110	json->max_depth = 512;
		111	}
88		112
89	/////////////////////////////////////////////////////////////////////////////	113	/////////////////////////////////////////////////////////////////////////////
90	// utility functions	114	// utility functions
91		115
		116	INLINE SV *
		117	get_bool (const char *name)
		118	{
		119	SV *sv = get_sv (name, 1);
		120
		121	SvREADONLY_on (sv);
		122	SvREADONLY_on (SvRV (sv));
		123
		124	return sv;
		125	}
		126
92	INLINE void	127	INLINE void
93	shrink (SV *sv)	128	shrink (SV *sv)
94	{	129	{
95	sv_utf8_downgrade (sv, 1);	130	sv_utf8_downgrade (sv, 1);
		131
96	if (SvLEN (sv) > SvCUR (sv) + 1)	132	if (SvLEN (sv) > SvCUR (sv) + 1)
97	{	133	{
98	#ifdef SvPV_shrink_to_cur	134	#ifdef SvPV_shrink_to_cur
99	SvPV_shrink_to_cur (sv);	135	SvPV_shrink_to_cur (sv);
100	#elif defined (SvPV_renew)	136	#elif defined (SvPV_renew)
…		…
144	*s++ = 0x80 \| ( ch & 0x3f);	180	*s++ = 0x80 \| ( ch & 0x3f);
145		181
146	return s;	182	return s;
147	}	183	}
148		184
		185	// convert offset pointer to character index, sv must be string
		186	static STRLEN
		187	ptr_to_index (SV sv, char offset)
		188	{
		189	return SvUTF8 (sv)
		190	? utf8_distance (offset, SvPVX (sv))
		191	: offset - SvPVX (sv);
		192	}
		193
		194	/////////////////////////////////////////////////////////////////////////////
		195	// fp hell
		196
		197	// scan a group of digits, and a trailing exponent
		198	static void
		199	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		200	{
		201	UV uaccum = 0;
		202	int eaccum = 0;
		203
		204	// if we recurse too deep, skip all remaining digits
		205	// to avoid a stack overflow attack
		206	if (expect_false (--maxdepth <= 0))
		207	while (((U8)*s - '0') < 10)
		208	++s;
		209
		210	for (;;)
		211	{
		212	U8 dig = (U8)*s - '0';
		213
		214	if (expect_false (dig >= 10))
		215	{
		216	if (dig == (U8)((U8)'.' - (U8)'0'))
		217	{
		218	++s;
		219	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		220	}
		221	else if ((dig \| ' ') == 'e' - '0')
		222	{
		223	int exp2 = 0;
		224	int neg = 0;
		225
		226	++s;
		227
		228	if (*s == '-')
		229	{
		230	++s;
		231	neg = 1;
		232	}
		233	else if (*s == '+')
		234	++s;
		235
		236	while ((dig = (U8)*s - '0') < 10)
		237	exp2 = exp2 * 10 + *s++ - '0';
		238
		239	*expo += neg ? -exp2 : exp2;
		240	}
		241
		242	break;
		243	}
		244
		245	++s;
		246
		247	uaccum = uaccum * 10 + dig;
		248	++eaccum;
		249
		250	// if we have too many digits, then recurse for more
		251	// we actually do this for rather few digits
		252	if (uaccum >= (UV_MAX - 9) / 10)
		253	{
		254	if (postdp) *expo -= eaccum;
		255	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		256	if (postdp) *expo += eaccum;
		257
		258	break;
		259	}
		260	}
		261
		262	// this relies greatly on the quality of the pow ()
		263	// implementation of the platform, but a good
		264	// implementation is hard to beat.
		265	if (postdp) *expo -= eaccum;
		266	accum += uaccum Perl_pow (10., *expo);
		267	*expo += eaccum;
		268	}
		269
		270	static NV
		271	json_atof (const char *s)
		272	{
		273	NV accum = 0.;
		274	int expo = 0;
		275	int neg = 0;
		276
		277	if (*s == '-')
		278	{
		279	++s;
		280	neg = 1;
		281	}
		282
		283	// a recursion depth of ten gives us >>500 bits
		284	json_atof_scan1 (s, &accum, &expo, 0, 10);
		285
		286	return neg ? -accum : accum;
		287	}
149	/////////////////////////////////////////////////////////////////////////////	288	/////////////////////////////////////////////////////////////////////////////
150	// encoder	289	// encoder
151		290
152	// structure used for encoding JSON	291	// structure used for encoding JSON
153	typedef struct	292	typedef struct
…		…
155	char *cur; // SvPVX (sv) + current output position	294	char *cur; // SvPVX (sv) + current output position
156	char *end; // SvEND (sv)	295	char *end; // SvEND (sv)
157	SV *sv; // result scalar	296	SV *sv; // result scalar
158	JSON json;	297	JSON json;
159	U32 indent; // indentation level	298	U32 indent; // indentation level
160	U32 maxdepth; // max. indentation/recursion level
161	UV limit; // escape character values >= this value when encoding	299	UV limit; // escape character values >= this value when encoding
162	} enc_t;	300	} enc_t;
163		301
164	INLINE void	302	INLINE void
165	need (enc_t *enc, STRLEN len)	303	need (enc_t *enc, STRLEN len)
166	{	304	{
167	if (expect_false (enc->cur + len >= enc->end))	305	if (expect_false (enc->cur + len >= enc->end))
168	{	306	{
169	STRLEN cur = enc->cur - SvPVX (enc->sv);	307	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
170	SvGROW (enc->sv, cur + len + 1);	308	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
171	enc->cur = SvPVX (enc->sv) + cur;	309	enc->cur = SvPVX (enc->sv) + cur;
172	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	310	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
173	}	311	}
174	}	312	}
175		313
…		…
250	(int)((uch - 0x10000) % 0x400 + 0xDC00));	388	(int)((uch - 0x10000) % 0x400 + 0xDC00));
251	enc->cur += 12;	389	enc->cur += 12;
252	}	390	}
253	else	391	else
254	{	392	{
255	static char hexdigit [16] = "0123456789abcdef";
256	need (enc, len += 5);	393	need (enc, len += 5);
257	*enc->cur++ = '\\';	394	*enc->cur++ = '\\';
258	*enc->cur++ = 'u';	395	*enc->cur++ = 'u';
259	*enc->cur++ = hexdigit [ uch >> 12 ];	396	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
260	*enc->cur++ = hexdigit [(uch >> 8) & 15];	397	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
261	*enc->cur++ = hexdigit [(uch >> 4) & 15];	398	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
262	*enc->cur++ = hexdigit [(uch >> 0) & 15];	399	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
263	}	400	}
264		401
265	str += clen;	402	str += clen;
266	}	403	}
267	else if (enc->json.flags & F_LATIN1)	404	else if (enc->json.flags & F_LATIN1)
…		…
338	static void	475	static void
339	encode_av (enc_t enc, AV av)	476	encode_av (enc_t enc, AV av)
340	{	477	{
341	int i, len = av_len (av);	478	int i, len = av_len (av);
342		479
343	if (enc->indent >= enc->maxdepth)	480	if (enc->indent >= enc->json.max_depth)
344	croak ("data structure too deep (hit recursion limit)");	481	croak (ERR_NESTING_EXCEEDED);
345		482
346	encode_ch (enc, '[');	483	encode_ch (enc, '[');
347		484
348	if (len >= 0)	485	if (len >= 0)
349	{	486	{
…		…
423		560
424	static void	561	static void
425	encode_hv (enc_t enc, HV hv)	562	encode_hv (enc_t enc, HV hv)
426	{	563	{
427	HE *he;	564	HE *he;
428	int count;
429		565
430	if (enc->indent >= enc->maxdepth)	566	if (enc->indent >= enc->json.max_depth)
431	croak ("data structure too deep (hit recursion limit)");	567	croak (ERR_NESTING_EXCEEDED);
432		568
433	encode_ch (enc, '{');	569	encode_ch (enc, '{');
434		570
435	// for canonical output we have to sort by keys first	571	// for canonical output we have to sort by keys first
436	// actually, this is mostly due to the stupid so-called	572	// actually, this is mostly due to the stupid so-called
437	// security workaround added somewhere in 5.8.x.	573	// security workaround added somewhere in 5.8.x
438	// that randomises hash orderings	574	// that randomises hash orderings
439	if (enc->json.flags & F_CANONICAL)	575	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
440	{	576	{
441	int count = hv_iterinit (hv);	577	int count = hv_iterinit (hv);
442		578
443	if (SvMAGICAL (hv))	579	if (SvMAGICAL (hv))
444	{	580	{
…		…
617		753
618	if (len == 1 && *pv == '1')	754	if (len == 1 && *pv == '1')
619	encode_str (enc, "true", 4, 0);	755	encode_str (enc, "true", 4, 0);
620	else if (len == 1 && *pv == '0')	756	else if (len == 1 && *pv == '0')
621	encode_str (enc, "false", 5, 0);	757	encode_str (enc, "false", 5, 0);
		758	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		759	encode_str (enc, "null", 4, 0);
622	else	760	else
623	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	761	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
624	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	762	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625	}	763	}
		764	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		765	encode_str (enc, "null", 4, 0);
626	else	766	else
627	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	767	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
628	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	768	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629	}	769	}
630		770
…		…
692	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	832	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693	}	833	}
694	}	834	}
695	else if (SvROK (sv))	835	else if (SvROK (sv))
696	encode_rv (enc, SvRV (sv));	836	encode_rv (enc, SvRV (sv));
697	else if (!SvOK (sv))	837	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
698	encode_str (enc, "null", 4, 0);	838	encode_str (enc, "null", 4, 0);
699	else	839	else
700	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	840	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
701	SvPV_nolen (sv), SvFLAGS (sv));	841	SvPV_nolen (sv), SvFLAGS (sv));
702	}	842	}
…		…
712	enc.json = *json;	852	enc.json = *json;
713	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	853	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
714	enc.cur = SvPVX (enc.sv);	854	enc.cur = SvPVX (enc.sv);
715	enc.end = SvEND (enc.sv);	855	enc.end = SvEND (enc.sv);
716	enc.indent = 0;	856	enc.indent = 0;
717	enc.maxdepth = DEC_DEPTH (enc.json.flags);
718	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	857	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719	: enc.json.flags & F_LATIN1 ? 0x000100UL	858	: enc.json.flags & F_LATIN1 ? 0x000100UL
720	: 0x110000UL;	859	: 0x110000UL;
721		860
722	SvPOK_only (enc.sv);	861	SvPOK_only (enc.sv);
723	encode_sv (&enc, scalar);	862	encode_sv (&enc, scalar);
		863	encode_nl (&enc);
724		864
725	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	865	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
726	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	866	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
727		867
728	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	868	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
789	if (*dec->cur != ch) \	929	if (*dec->cur != ch) \
790	ERR (# ch " expected"); \	930	ERR (# ch " expected"); \
791	++dec->cur; \	931	++dec->cur; \
792	SE	932	SE
793		933
794	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	934	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
795	#define DEC_DEC_DEPTH --dec->depth	935	#define DEC_DEC_DEPTH --dec->depth
796		936
797	static SV decode_sv (dec_t dec);	937	static SV decode_sv (dec_t dec);
798		938
799	static signed char decode_hexdigit[256];	939	static signed char decode_hexdigit[256];
…		…
908	else if (expect_true (ch >= 0x20 && ch < 0x80))	1048	else if (expect_true (ch >= 0x20 && ch < 0x80))
909	*cur++ = ch;	1049	*cur++ = ch;
910	else if (ch >= 0x80)	1050	else if (ch >= 0x80)
911	{	1051	{
912	STRLEN clen;	1052	STRLEN clen;
913	UV uch;
914		1053
915	--dec_cur;	1054	--dec_cur;
916		1055
917	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1056	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
918	if (clen == (STRLEN)-1)	1057	if (clen == (STRLEN)-1)
919	ERR ("malformed UTF-8 character in JSON string");	1058	ERR ("malformed UTF-8 character in JSON string");
920		1059
921	do	1060	do
922	cur++ = dec_cur++;	1061	cur++ = dec_cur++;
…		…
939	{	1078	{
940	STRLEN len = cur - buf;	1079	STRLEN len = cur - buf;
941		1080
942	if (sv)	1081	if (sv)
943	{	1082	{
944	SvGROW (sv, SvCUR (sv) + len + 1);	1083	STRLEN cur = SvCUR (sv);
		1084
		1085	if (SvLEN (sv) <= cur + len)
		1086	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1087
945	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1088	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
946	SvCUR_set (sv, SvCUR (sv) + len);	1089	SvCUR_set (sv, SvCUR (sv) + len);
947	}	1090	}
948	else	1091	else
949	sv = newSVpvn (buf, len);	1092	sv = newSVpvn (buf, len);
…		…
1040		1183
1041	// special case the rather common 1..5-digit-int case	1184	// special case the rather common 1..5-digit-int case
1042	if (*start == '-')	1185	if (*start == '-')
1043	switch (len)	1186	switch (len)
1044	{	1187	{
1045	case 2: return newSViv (-( start [1] - '0' * 1));	1188	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1046	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1189	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1047	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1190	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1048	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1191	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1049	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1192	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1050	}	1193	}
1051	else	1194	else
1052	switch (len)	1195	switch (len)
1053	{	1196	{
1054	case 1: return newSViv ( start [0] - '0' * 1);	1197	case 1: return newSViv ( start [0] - '0' * 1);
1055	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1198	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1056	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1199	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1057	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1200	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1058	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1201	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1059	}	1202	}
1060		1203
1061	{	1204	{
1062	UV uv;	1205	UV uv;
1063	int numtype = grok_number (start, len, &uv);	1206	int numtype = grok_number (start, len, &uv);
…		…
1072	}	1215	}
1073		1216
1074	len -= *start == '-' ? 1 : 0;	1217	len -= *start == '-' ? 1 : 0;
1075		1218
1076	// does not fit into IV or UV, try NV	1219	// does not fit into IV or UV, try NV
1077	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1220	if (len <= NV_DIG)
1078	#if defined (LDBL_DIG)
1079	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1080	#endif
1081	)
1082	// fits into NV without loss of precision	1221	// fits into NV without loss of precision
1083	return newSVnv (Atof (start));	1222	return newSVnv (json_atof (start));
1084		1223
1085	// everything else fails, convert it to a string	1224	// everything else fails, convert it to a string
1086	return newSVpvn (start, dec->cur - start);	1225	return newSVpvn (start, dec->cur - start);
1087	}	1226	}
1088		1227
1089	// loss of precision here	1228	// loss of precision here
1090	return newSVnv (Atof (start));	1229	return newSVnv (json_atof (start));
1091		1230
1092	fail:	1231	fail:
1093	return 0;	1232	return 0;
1094	}	1233	}
1095		1234
…		…
1171	char *p = dec->cur;	1310	char *p = dec->cur;
1172	char *e = p + 24; // only try up to 24 bytes	1311	char *e = p + 24; // only try up to 24 bytes
1173		1312
1174	for (;;)	1313	for (;;)
1175	{	1314	{
1176	// the >= 0x80 is true on most architectures	1315	// the >= 0x80 is false on most architectures
1177	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1316	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1178	{	1317	{
1179	// slow path, back up and use decode_str	1318	// slow path, back up and use decode_str
1180	SV *key = decode_str (dec);	1319	SV *key = decode_str (dec);
1181	if (!key)	1320	if (!key)
…		…
1264	dSP;	1403	dSP;
1265	int count;	1404	int count;
1266		1405
1267	ENTER; SAVETMPS; PUSHMARK (SP);	1406	ENTER; SAVETMPS; PUSHMARK (SP);
1268	XPUSHs (HeVAL (he));	1407	XPUSHs (HeVAL (he));
		1408	sv_2mortal (sv);
1269		1409
1270	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1410	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1271		1411
1272	if (count == 1)	1412	if (count == 1)
1273	{	1413	{
1274	sv = newSVsv (POPs);	1414	sv = newSVsv (POPs);
1275	FREETMPS; LEAVE;	1415	FREETMPS; LEAVE;
1276	return sv;	1416	return sv;
1277	}	1417	}
1278		1418
		1419	SvREFCNT_inc (sv);
1279	FREETMPS; LEAVE;	1420	FREETMPS; LEAVE;
1280	}	1421	}
1281	}	1422	}
1282		1423
1283	if (dec->json.cb_object)	1424	if (dec->json.cb_object)
…		…
1329	case 't':	1470	case 't':
1330	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1471	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331	{	1472	{
1332	dec->cur += 4;	1473	dec->cur += 4;
1333	#if JSON_SLOW	1474	#if JSON_SLOW
1334	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1475	json_true = get_bool ("JSON::XS::true");
1335	#endif	1476	#endif
1336	return SvREFCNT_inc (json_true);	1477	return newSVsv (json_true);
1337	}	1478	}
1338	else	1479	else
1339	ERR ("'true' expected");	1480	ERR ("'true' expected");
1340		1481
1341	break;	1482	break;
…		…
1343	case 'f':	1484	case 'f':
1344	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1485	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345	{	1486	{
1346	dec->cur += 5;	1487	dec->cur += 5;
1347	#if JSON_SLOW	1488	#if JSON_SLOW
1348	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1489	json_false = get_bool ("JSON::XS::false");
1349	#endif	1490	#endif
1350	return SvREFCNT_inc (json_false);	1491	return newSVsv (json_false);
1351	}	1492	}
1352	else	1493	else
1353	ERR ("'false' expected");	1494	ERR ("'false' expected");
1354		1495
1355	break;	1496	break;
…		…
1373	fail:	1514	fail:
1374	return 0;	1515	return 0;
1375	}	1516	}
1376		1517
1377	static SV *	1518	static SV *
1378	decode_json (SV string, JSON json, UV *offset_return)	1519	decode_json (SV string, JSON json, char **offset_return)
1379	{	1520	{
1380	dec_t dec;	1521	dec_t dec;
1381	UV offset;
1382	SV *sv;	1522	SV *sv;
1383		1523
		1524	/* work around bugs in 5.10 where manipulating magic values
		1525	* will perl ignore the magic in subsequent accesses.
		1526	* also make a copy of non-PV values, to get them into a clean
		1527	* state (SvPV should do that, but it's buggy, see below).
		1528	*/
1384	SvGETMAGIC (string);	1529	/SvGETMAGIC (string);/
		1530	if (SvMAGICAL (string) \|\| !SvPOK (string))
		1531	string = sv_2mortal (newSVsv (string));
		1532
1385	SvUPGRADE (string, SVt_PV);	1533	SvUPGRADE (string, SVt_PV);
1386		1534
1387	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1535	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1536	* assertion with -DDEBUGGING, although SvCUR is documented to
		1537	* return the xpv_cur field which certainly exists after upgrading.
		1538	* according to nicholas clark, calling SvPOK fixes this.
		1539	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1540	* and hope for the best.
		1541	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1542	* assertion business is seriously broken, try yet another workaround
		1543	* for the broken -DDEBUGGING.
		1544	*/
		1545	{
		1546	#ifdef DEBUGGING
		1547	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1548	#else
		1549	STRLEN offset = SvCUR (string);
		1550	#endif
		1551
		1552	if (offset > json->max_size && json->max_size)
1388	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1553	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1389	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1554	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1555	}
1390		1556
1391	if (json->flags & F_UTF8)	1557	if (DECODE_WANTS_OCTETS (json))
1392	sv_utf8_downgrade (string, 0);	1558	sv_utf8_downgrade (string, 0);
1393	else	1559	else
1394	sv_utf8_upgrade (string);	1560	sv_utf8_upgrade (string);
1395		1561
1396	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1562	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1397		1563
1398	dec.json = *json;	1564	dec.json = *json;
1399	dec.cur = SvPVX (string);	1565	dec.cur = SvPVX (string);
1400	dec.end = SvEND (string);	1566	dec.end = SvEND (string);
1401	dec.err = 0;	1567	dec.err = 0;
1402	dec.depth = 0;	1568	dec.depth = 0;
1403	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1404		1569
1405	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1570	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1406	dec.json.flags \|= F_HOOK;	1571	dec.json.flags \|= F_HOOK;
1407		1572
1408	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1573	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1409		1574
1410	decode_ws (&dec);	1575	decode_ws (&dec);
1411	sv = decode_sv (&dec);	1576	sv = decode_sv (&dec);
		1577
		1578	if (offset_return)
		1579	*offset_return = dec.cur;
1412		1580
1413	if (!(offset_return \|\| !sv))	1581	if (!(offset_return \|\| !sv))
1414	{	1582	{
1415	// check for trailing garbage	1583	// check for trailing garbage
1416	decode_ws (&dec);	1584	decode_ws (&dec);
…		…
1419	{	1587	{
1420	dec.err = "garbage after JSON object";	1588	dec.err = "garbage after JSON object";
1421	SvREFCNT_dec (sv);	1589	SvREFCNT_dec (sv);
1422	sv = 0;	1590	sv = 0;
1423	}	1591	}
1424	}
1425
1426	if (offset_return \|\| !sv)
1427	{
1428	offset = dec.json.flags & F_UTF8
1429	? dec.cur - SvPVX (string)
1430	: utf8_distance (dec.cur, SvPVX (string));
1431
1432	if (offset_return)
1433	*offset_return = offset;
1434	}	1592	}
1435		1593
1436	if (!sv)	1594	if (!sv)
1437	{	1595	{
1438	SV *uni = sv_newmortal ();	1596	SV *uni = sv_newmortal ();
…		…
1444	SAVEVPTR (PL_curcop);	1602	SAVEVPTR (PL_curcop);
1445	PL_curcop = &cop;	1603	PL_curcop = &cop;
1446	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1604	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1447	LEAVE;	1605	LEAVE;
1448		1606
1449	croak ("%s, at character offset %d [\"%s\"]",	1607	croak ("%s, at character offset %d (before \"%s\")",
1450	dec.err,	1608	dec.err,
1451	(int)offset,	1609	ptr_to_index (string, dec.cur),
1452	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1610	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1453	}	1611	}
1454		1612
1455	sv = sv_2mortal (sv);	1613	sv = sv_2mortal (sv);
1456		1614
1457	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1615	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1458	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1616	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1459		1617
1460	return sv;	1618	return sv;
		1619	}
		1620
		1621	/////////////////////////////////////////////////////////////////////////////
		1622	// incremental parser
		1623
		1624	static void
		1625	incr_parse (JSON *self)
		1626	{
		1627	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1628
		1629	// the state machine here is a bit convoluted and could be simplified a lot
		1630	// but this would make it slower, so...
		1631
		1632	for (;;)
		1633	{
		1634	//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
		1635	switch (self->incr_mode)
		1636	{
		1637	// only used for initial whitespace skipping
		1638	case INCR_M_WS:
		1639	for (;;)
		1640	{
		1641	if (*p > 0x20)
		1642	{
		1643	if (*p == '#')
		1644	{
		1645	self->incr_mode = INCR_M_C0;
		1646	goto incr_m_c;
		1647	}
		1648	else
		1649	{
		1650	self->incr_mode = INCR_M_JSON;
		1651	goto incr_m_json;
		1652	}
		1653	}
		1654	else if (!*p)
		1655	goto interrupt;
		1656
		1657	++p;
		1658	}
		1659
		1660	// skip a single char inside a string (for \\-processing)
		1661	case INCR_M_BS:
		1662	if (!*p)
		1663	goto interrupt;
		1664
		1665	++p;
		1666	self->incr_mode = INCR_M_STR;
		1667	goto incr_m_str;
		1668
		1669	// inside #-style comments
		1670	case INCR_M_C0:
		1671	case INCR_M_C1:
		1672	incr_m_c:
		1673	for (;;)
		1674	{
		1675	if (*p == '\n')
		1676	{
		1677	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1678	break;
		1679	}
		1680	else if (!*p)
		1681	goto interrupt;
		1682
		1683	++p;
		1684	}
		1685
		1686	break;
		1687
		1688	// inside a string
		1689	case INCR_M_STR:
		1690	incr_m_str:
		1691	for (;;)
		1692	{
		1693	if (*p == '"')
		1694	{
		1695	++p;
		1696	self->incr_mode = INCR_M_JSON;
		1697
		1698	if (!self->incr_nest)
		1699	goto interrupt;
		1700
		1701	goto incr_m_json;
		1702	}
		1703	else if (*p == '\\')
		1704	{
		1705	++p; // "virtually" consumes character after \
		1706
		1707	if (!*p) // if at end of string we have to switch modes
		1708	{
		1709	self->incr_mode = INCR_M_BS;
		1710	goto interrupt;
		1711	}
		1712	}
		1713	else if (!*p)
		1714	goto interrupt;
		1715
		1716	++p;
		1717	}
		1718
		1719	// after initial ws, outside string
		1720	case INCR_M_JSON:
		1721	incr_m_json:
		1722	for (;;)
		1723	{
		1724	switch (*p++)
		1725	{
		1726	case 0:
		1727	--p;
		1728	goto interrupt;
		1729
		1730	case 0x09:
		1731	case 0x0a:
		1732	case 0x0d:
		1733	case 0x20:
		1734	if (!self->incr_nest)
		1735	{
		1736	--p; // do not eat the whitespace, let the next round do it
		1737	goto interrupt;
		1738	}
		1739	break;
		1740
		1741	case '"':
		1742	self->incr_mode = INCR_M_STR;
		1743	goto incr_m_str;
		1744
		1745	case '[':
		1746	case '{':
		1747	if (++self->incr_nest > self->max_depth)
		1748	croak (ERR_NESTING_EXCEEDED);
		1749	break;
		1750
		1751	case ']':
		1752	case '}':
		1753	if (--self->incr_nest <= 0)
		1754	goto interrupt;
		1755	break;
		1756
		1757	case '#':
		1758	self->incr_mode = INCR_M_C1;
		1759	goto incr_m_c;
		1760	}
		1761	}
		1762	}
		1763
		1764	modechange:
		1765	;
		1766	}
		1767
		1768	interrupt:
		1769	self->incr_pos = p - SvPVX (self->incr_text);
		1770	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
		1771	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1461	}	1772	}
1462		1773
1463	/////////////////////////////////////////////////////////////////////////////	1774	/////////////////////////////////////////////////////////////////////////////
1464	// XS interface functions	1775	// XS interface functions
1465		1776
…		…
1477	: -1;	1788	: -1;
1478		1789
1479	json_stash = gv_stashpv ("JSON::XS" , 1);	1790	json_stash = gv_stashpv ("JSON::XS" , 1);
1480	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1791	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481		1792
1482	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1793	json_true = get_bool ("JSON::XS::true");
1483	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1794	json_false = get_bool ("JSON::XS::false");
		1795
		1796	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1484	}	1797	}
1485		1798
1486	PROTOTYPES: DISABLE	1799	PROTOTYPES: DISABLE
1487		1800
1488	void CLONE (...)	1801	void CLONE (...)
…		…
1493	void new (char *klass)	1806	void new (char *klass)
1494	PPCODE:	1807	PPCODE:
1495	{	1808	{
1496	SV *pv = NEWSV (0, sizeof (JSON));	1809	SV *pv = NEWSV (0, sizeof (JSON));
1497	SvPOK_only (pv);	1810	SvPOK_only (pv);
1498	Zero (SvPVX (pv), 1, JSON);	1811	json_init ((JSON *)SvPVX (pv));
1499	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500	XPUSHs (sv_2mortal (sv_bless (	1812	XPUSHs (sv_2mortal (sv_bless (
1501	newRV_noinc (pv),	1813	newRV_noinc (pv),
1502	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1814	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503	)));	1815	)));
1504	}	1816	}
…		…
1516	allow_nonref = F_ALLOW_NONREF	1828	allow_nonref = F_ALLOW_NONREF
1517	shrink = F_SHRINK	1829	shrink = F_SHRINK
1518	allow_blessed = F_ALLOW_BLESSED	1830	allow_blessed = F_ALLOW_BLESSED
1519	convert_blessed = F_CONV_BLESSED	1831	convert_blessed = F_CONV_BLESSED
1520	relaxed = F_RELAXED	1832	relaxed = F_RELAXED
		1833	allow_unknown = F_ALLOW_UNKNOWN
1521	PPCODE:	1834	PPCODE:
1522	{	1835	{
1523	if (enable)	1836	if (enable)
1524	self->flags \|= ix;	1837	self->flags \|= ix;
1525	else	1838	else
…		…
1540	get_allow_nonref = F_ALLOW_NONREF	1853	get_allow_nonref = F_ALLOW_NONREF
1541	get_shrink = F_SHRINK	1854	get_shrink = F_SHRINK
1542	get_allow_blessed = F_ALLOW_BLESSED	1855	get_allow_blessed = F_ALLOW_BLESSED
1543	get_convert_blessed = F_CONV_BLESSED	1856	get_convert_blessed = F_CONV_BLESSED
1544	get_relaxed = F_RELAXED	1857	get_relaxed = F_RELAXED
		1858	get_allow_unknown = F_ALLOW_UNKNOWN
1545	PPCODE:	1859	PPCODE:
1546	XPUSHs (boolSV (self->flags & ix));	1860	XPUSHs (boolSV (self->flags & ix));
1547		1861
1548	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1862	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1549	PPCODE:	1863	PPCODE:
1550	{	1864	self->max_depth = max_depth;
1551	UV log2 = 0;
1552
1553	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1554
1555	while ((1UL << log2) < max_depth)
1556	++log2;
1557
1558	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1559
1560	XPUSHs (ST (0));	1865	XPUSHs (ST (0));
1561	}
1562		1866
1563	U32 get_max_depth (JSON *self)	1867	U32 get_max_depth (JSON *self)
1564	CODE:	1868	CODE:
1565	RETVAL = DEC_DEPTH (self->flags);	1869	RETVAL = self->max_depth;
1566	OUTPUT:	1870	OUTPUT:
1567	RETVAL	1871	RETVAL
1568		1872
1569	void max_size (JSON *self, UV max_size = 0)	1873	void max_size (JSON *self, U32 max_size = 0)
1570	PPCODE:	1874	PPCODE:
1571	{	1875	self->max_size = max_size;
1572	UV log2 = 0;
1573
1574	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1575	if (max_size == 1) max_size = 2;
1576
1577	while ((1UL << log2) < max_size)
1578	++log2;
1579
1580	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1581
1582	XPUSHs (ST (0));	1876	XPUSHs (ST (0));
1583	}
1584		1877
1585	int get_max_size (JSON *self)	1878	int get_max_size (JSON *self)
1586	CODE:	1879	CODE:
1587	RETVAL = DEC_SIZE (self->flags);	1880	RETVAL = self->max_size;
1588	OUTPUT:	1881	OUTPUT:
1589	RETVAL	1882	RETVAL
1590		1883
1591	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1884	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1592	PPCODE:	1885	PPCODE:
…		…
1628	XPUSHs (decode_json (jsonstr, self, 0));	1921	XPUSHs (decode_json (jsonstr, self, 0));
1629		1922
1630	void decode_prefix (JSON self, SV jsonstr)	1923	void decode_prefix (JSON self, SV jsonstr)
1631	PPCODE:	1924	PPCODE:
1632	{	1925	{
1633	UV offset;	1926	char *offset;
1634	EXTEND (SP, 2);	1927	EXTEND (SP, 2);
1635	PUSHs (decode_json (jsonstr, self, &offset));	1928	PUSHs (decode_json (jsonstr, self, &offset));
1636	PUSHs (sv_2mortal (newSVuv (offset)));	1929	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
		1930	}
		1931
		1932	void incr_parse (JSON self, SV jsonstr = 0)
		1933	PPCODE:
		1934	{
		1935	if (!self->incr_text)
		1936	self->incr_text = newSVpvn ("", 0);
		1937
		1938	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		1939	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		1940	if (DECODE_WANTS_OCTETS (self))
		1941	{
		1942	if (self->incr_pos)
		1943	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		1944	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		1945
		1946	sv_utf8_downgrade (self->incr_text, 0);
		1947	}
		1948	else
		1949	{
		1950	sv_utf8_upgrade (self->incr_text);
		1951
		1952	if (self->incr_pos)
		1953	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1954	- (U8 *)SvPVX (self->incr_text);
		1955	}
		1956
		1957	// append data, if any
		1958	if (jsonstr)
		1959	{
		1960	/* make sure both strings have same encoding */
		1961	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		1962	if (SvUTF8 (jsonstr))
		1963	sv_utf8_downgrade (jsonstr, 0);
		1964	else
		1965	sv_utf8_upgrade (jsonstr);
		1966
		1967	/* and then just blindly append */
		1968	{
		1969	STRLEN len;
		1970	const char *str = SvPV (jsonstr, len);
		1971	STRLEN cur = SvCUR (self->incr_text);
		1972
		1973	if (SvLEN (self->incr_text) <= cur + len)
		1974	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1975
		1976	Move (str, SvEND (self->incr_text), len, char);
		1977	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1978	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1979	}
		1980	}
		1981
		1982	if (GIMME_V != G_VOID)
		1983	do
		1984	{
		1985	char *offset;
		1986
		1987	if (!INCR_DONE (self))
		1988	{
		1989	incr_parse (self);
		1990
		1991	if (self->incr_pos > self->max_size && self->max_size)
		1992	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1993	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1994
		1995	if (!INCR_DONE (self))
		1996	break;
		1997	}
		1998
		1999	XPUSHs (decode_json (self->incr_text, self, &offset));
		2000
		2001	self->incr_pos -= offset - SvPVX (self->incr_text);
		2002	self->incr_nest = 0;
		2003	self->incr_mode = 0;
		2004
		2005	sv_chop (self->incr_text, offset);
		2006	}
		2007	while (GIMME_V == G_ARRAY);
		2008	}
		2009
		2010	SV incr_text (JSON self)
		2011	ATTRS: lvalue
		2012	CODE:
		2013	{
		2014	if (self->incr_pos)
		2015	croak ("incr_text can not be called when the incremental parser already started parsing");
		2016
		2017	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		2018	}
		2019	OUTPUT:
		2020	RETVAL
		2021
		2022	void incr_skip (JSON *self)
		2023	CODE:
		2024	{
		2025	if (self->incr_pos)
		2026	{
		2027	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		2028	self->incr_pos = 0;
		2029	self->incr_nest = 0;
		2030	self->incr_mode = 0;
		2031	}
		2032	}
		2033
		2034	void incr_reset (JSON *self)
		2035	CODE:
		2036	{
		2037	SvREFCNT_dec (self->incr_text);
		2038	self->incr_text = 0;
		2039	self->incr_pos = 0;
		2040	self->incr_nest = 0;
		2041	self->incr_mode = 0;
1637	}	2042	}
1638		2043
1639	void DESTROY (JSON *self)	2044	void DESTROY (JSON *self)
1640	CODE:	2045	CODE:
1641	SvREFCNT_dec (self->cb_sk_object);	2046	SvREFCNT_dec (self->cb_sk_object);
1642	SvREFCNT_dec (self->cb_object);	2047	SvREFCNT_dec (self->cb_object);
		2048	SvREFCNT_dec (self->incr_text);
1643		2049
1644	PROTOTYPES: ENABLE	2050	PROTOTYPES: ENABLE
1645		2051
1646	void encode_json (SV *scalar)	2052	void encode_json (SV *scalar)
1647	ALIAS:	2053	ALIAS:
1648	to_json_ = 0	2054	to_json_ = 0
1649	encode_json = F_UTF8	2055	encode_json = F_UTF8
1650	PPCODE:	2056	PPCODE:
1651	{	2057	{
1652	JSON json = { F_DEFAULT \| ix };	2058	JSON json;
		2059	json_init (&json);
		2060	json.flags \|= ix;
1653	XPUSHs (encode_json (scalar, &json));	2061	XPUSHs (encode_json (scalar, &json));
1654	}	2062	}
1655		2063
1656	void decode_json (SV *jsonstr)	2064	void decode_json (SV *jsonstr)
1657	ALIAS:	2065	ALIAS:
1658	from_json_ = 0	2066	from_json_ = 0
1659	decode_json = F_UTF8	2067	decode_json = F_UTF8
1660	PPCODE:	2068	PPCODE:
1661	{	2069	{
1662	JSON json = { F_DEFAULT \| ix };	2070	JSON json;
		2071	json_init (&json);
		2072	json.flags \|= ix;
1663	XPUSHs (decode_json (jsonstr, &json, 0));	2073	XPUSHs (decode_json (jsonstr, &json, 0));
1664	}	2074	}
1665		2075

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs. Revision 1.109 by root, Tue Mar 8 10:18:50 2011 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.109 by root, Tue Mar 8 10:18:50 2011 UTC