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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.112 by root, Thu Aug 11 17:06:53 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
…		…
82		79
83	enum {	80	enum {
84	INCR_M_WS = 0, // initial whitespace skipping, must be 0	81	INCR_M_WS = 0, // initial whitespace skipping, must be 0
85	INCR_M_STR, // inside string	82	INCR_M_STR, // inside string
86	INCR_M_BS, // inside backslash	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
87	INCR_M_JSON // outside anything, count nesting	86	INCR_M_JSON // outside anything, count nesting
88	};	87	};
89		88
90	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	89	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91		90
92	typedef struct {	91	typedef struct {
93	U32 flags;	92	U32 flags;
		93	U32 max_depth;
		94	STRLEN max_size;
		95
94	SV *cb_object;	96	SV *cb_object;
95	HV *cb_sk_object;	97	HV *cb_sk_object;
96		98
97	// for the incremental parser	99	// for the incremental parser
98	SV *incr_text; // the source text so far	100	SV *incr_text; // the source text so far
99	STRLEN incr_pos; // the current offset into the text	101	STRLEN incr_pos; // the current offset into the text
100	int incr_nest; // {[]}-nesting level	102	int incr_nest; // {[]}-nesting level
101	int incr_mode;	103	unsigned char incr_mode;
102	} JSON;	104	} JSON;
		105
		106	INLINE void
		107	json_init (JSON *json)
		108	{
		109	Zero (json, 1, JSON);
		110	json->max_depth = 512;
		111	}
103		112
104	/////////////////////////////////////////////////////////////////////////////	113	/////////////////////////////////////////////////////////////////////////////
105	// utility functions	114	// utility functions
106		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
107	INLINE void	127	INLINE void
108	shrink (SV *sv)	128	shrink (SV *sv)
109	{	129	{
110	sv_utf8_downgrade (sv, 1);	130	sv_utf8_downgrade (sv, 1);
		131
111	if (SvLEN (sv) > SvCUR (sv) + 1)	132	if (SvLEN (sv) > SvCUR (sv) + 1)
112	{	133	{
113	#ifdef SvPV_shrink_to_cur	134	#ifdef SvPV_shrink_to_cur
114	SvPV_shrink_to_cur (sv);	135	SvPV_shrink_to_cur (sv);
115	#elif defined (SvPV_renew)	136	#elif defined (SvPV_renew)
…		…
159	*s++ = 0x80 \| ( ch & 0x3f);	180	*s++ = 0x80 \| ( ch & 0x3f);
160		181
161	return s;	182	return s;
162	}	183	}
163		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	// (IEEE 754 conformant ones are required to be exact)
		266	if (postdp) *expo -= eaccum;
		267	accum += uaccum Perl_pow (10., *expo);
		268	*expo += eaccum;
		269	}
		270
		271	static NV
		272	json_atof (const char *s)
		273	{
		274	NV accum = 0.;
		275	int expo = 0;
		276	int neg = 0;
		277
		278	if (*s == '-')
		279	{
		280	++s;
		281	neg = 1;
		282	}
		283
		284	// a recursion depth of ten gives us >>500 bits
		285	json_atof_scan1 (s, &accum, &expo, 0, 10);
		286
		287	return neg ? -accum : accum;
		288	}
164	/////////////////////////////////////////////////////////////////////////////	289	/////////////////////////////////////////////////////////////////////////////
165	// encoder	290	// encoder
166		291
167	// structure used for encoding JSON	292	// structure used for encoding JSON
168	typedef struct	293	typedef struct
…		…
170	char *cur; // SvPVX (sv) + current output position	295	char *cur; // SvPVX (sv) + current output position
171	char *end; // SvEND (sv)	296	char *end; // SvEND (sv)
172	SV *sv; // result scalar	297	SV *sv; // result scalar
173	JSON json;	298	JSON json;
174	U32 indent; // indentation level	299	U32 indent; // indentation level
175	U32 maxdepth; // max. indentation/recursion level
176	UV limit; // escape character values >= this value when encoding	300	UV limit; // escape character values >= this value when encoding
177	} enc_t;	301	} enc_t;
178		302
179	INLINE void	303	INLINE void
180	need (enc_t *enc, STRLEN len)	304	need (enc_t *enc, STRLEN len)
181	{	305	{
182	if (expect_false (enc->cur + len >= enc->end))	306	if (expect_false (enc->cur + len >= enc->end))
183	{	307	{
184	STRLEN cur = enc->cur - SvPVX (enc->sv);	308	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
185	SvGROW (enc->sv, cur + len + 1);	309	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
186	enc->cur = SvPVX (enc->sv) + cur;	310	enc->cur = SvPVX (enc->sv) + cur;
187	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	311	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
188	}	312	}
189	}	313	}
190		314
…		…
265	(int)((uch - 0x10000) % 0x400 + 0xDC00));	389	(int)((uch - 0x10000) % 0x400 + 0xDC00));
266	enc->cur += 12;	390	enc->cur += 12;
267	}	391	}
268	else	392	else
269	{	393	{
270	static char hexdigit [16] = "0123456789abcdef";
271	need (enc, len += 5);	394	need (enc, len += 5);
272	*enc->cur++ = '\\';	395	*enc->cur++ = '\\';
273	*enc->cur++ = 'u';	396	*enc->cur++ = 'u';
274	*enc->cur++ = hexdigit [ uch >> 12 ];	397	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
275	*enc->cur++ = hexdigit [(uch >> 8) & 15];	398	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
276	*enc->cur++ = hexdigit [(uch >> 4) & 15];	399	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
277	*enc->cur++ = hexdigit [(uch >> 0) & 15];	400	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
278	}	401	}
279		402
280	str += clen;	403	str += clen;
281	}	404	}
282	else if (enc->json.flags & F_LATIN1)	405	else if (enc->json.flags & F_LATIN1)
…		…
353	static void	476	static void
354	encode_av (enc_t enc, AV av)	477	encode_av (enc_t enc, AV av)
355	{	478	{
356	int i, len = av_len (av);	479	int i, len = av_len (av);
357		480
358	if (enc->indent >= enc->maxdepth)	481	if (enc->indent >= enc->json.max_depth)
359	croak ("data structure too deep (hit recursion limit)");	482	croak (ERR_NESTING_EXCEEDED);
360		483
361	encode_ch (enc, '[');	484	encode_ch (enc, '[');
362		485
363	if (len >= 0)	486	if (len >= 0)
364	{	487	{
…		…
438		561
439	static void	562	static void
440	encode_hv (enc_t enc, HV hv)	563	encode_hv (enc_t enc, HV hv)
441	{	564	{
442	HE *he;	565	HE *he;
443	int count;
444		566
445	if (enc->indent >= enc->maxdepth)	567	if (enc->indent >= enc->json.max_depth)
446	croak ("data structure too deep (hit recursion limit)");	568	croak (ERR_NESTING_EXCEEDED);
447		569
448	encode_ch (enc, '{');	570	encode_ch (enc, '{');
449		571
450	// for canonical output we have to sort by keys first	572	// for canonical output we have to sort by keys first
451	// actually, this is mostly due to the stupid so-called	573	// actually, this is mostly due to the stupid so-called
452	// security workaround added somewhere in 5.8.x.	574	// security workaround added somewhere in 5.8.x
453	// that randomises hash orderings	575	// that randomises hash orderings
454	if (enc->json.flags & F_CANONICAL)	576	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
455	{	577	{
456	int count = hv_iterinit (hv);	578	int count = hv_iterinit (hv);
457		579
458	if (SvMAGICAL (hv))	580	if (SvMAGICAL (hv))
459	{	581	{
…		…
632		754
633	if (len == 1 && *pv == '1')	755	if (len == 1 && *pv == '1')
634	encode_str (enc, "true", 4, 0);	756	encode_str (enc, "true", 4, 0);
635	else if (len == 1 && *pv == '0')	757	else if (len == 1 && *pv == '0')
636	encode_str (enc, "false", 5, 0);	758	encode_str (enc, "false", 5, 0);
		759	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		760	encode_str (enc, "null", 4, 0);
637	else	761	else
638	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	762	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
639	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	763	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
640	}	764	}
		765	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		766	encode_str (enc, "null", 4, 0);
641	else	767	else
642	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	768	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
643	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	769	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644	}	770	}
645		771
…		…
707	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	833	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
708	}	834	}
709	}	835	}
710	else if (SvROK (sv))	836	else if (SvROK (sv))
711	encode_rv (enc, SvRV (sv));	837	encode_rv (enc, SvRV (sv));
712	else if (!SvOK (sv))	838	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
713	encode_str (enc, "null", 4, 0);	839	encode_str (enc, "null", 4, 0);
714	else	840	else
715	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	841	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
716	SvPV_nolen (sv), SvFLAGS (sv));	842	SvPV_nolen (sv), SvFLAGS (sv));
717	}	843	}
…		…
727	enc.json = *json;	853	enc.json = *json;
728	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	854	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
729	enc.cur = SvPVX (enc.sv);	855	enc.cur = SvPVX (enc.sv);
730	enc.end = SvEND (enc.sv);	856	enc.end = SvEND (enc.sv);
731	enc.indent = 0;	857	enc.indent = 0;
732	enc.maxdepth = DEC_DEPTH (enc.json.flags);
733	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	858	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
734	: enc.json.flags & F_LATIN1 ? 0x000100UL	859	: enc.json.flags & F_LATIN1 ? 0x000100UL
735	: 0x110000UL;	860	: 0x110000UL;
736		861
737	SvPOK_only (enc.sv);	862	SvPOK_only (enc.sv);
738	encode_sv (&enc, scalar);	863	encode_sv (&enc, scalar);
		864	encode_nl (&enc);
739		865
740	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	866	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
741	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	867	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
742		868
743	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	869	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
804	if (*dec->cur != ch) \	930	if (*dec->cur != ch) \
805	ERR (# ch " expected"); \	931	ERR (# ch " expected"); \
806	++dec->cur; \	932	++dec->cur; \
807	SE	933	SE
808		934
809	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	935	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
810	#define DEC_DEC_DEPTH --dec->depth	936	#define DEC_DEC_DEPTH --dec->depth
811		937
812	static SV decode_sv (dec_t dec);	938	static SV decode_sv (dec_t dec);
813		939
814	static signed char decode_hexdigit[256];	940	static signed char decode_hexdigit[256];
…		…
923	else if (expect_true (ch >= 0x20 && ch < 0x80))	1049	else if (expect_true (ch >= 0x20 && ch < 0x80))
924	*cur++ = ch;	1050	*cur++ = ch;
925	else if (ch >= 0x80)	1051	else if (ch >= 0x80)
926	{	1052	{
927	STRLEN clen;	1053	STRLEN clen;
928	UV uch;
929		1054
930	--dec_cur;	1055	--dec_cur;
931		1056
932	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1057	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
933	if (clen == (STRLEN)-1)	1058	if (clen == (STRLEN)-1)
934	ERR ("malformed UTF-8 character in JSON string");	1059	ERR ("malformed UTF-8 character in JSON string");
935		1060
936	do	1061	do
937	cur++ = dec_cur++;	1062	cur++ = dec_cur++;
…		…
954	{	1079	{
955	STRLEN len = cur - buf;	1080	STRLEN len = cur - buf;
956		1081
957	if (sv)	1082	if (sv)
958	{	1083	{
959	SvGROW (sv, SvCUR (sv) + len + 1);	1084	STRLEN cur = SvCUR (sv);
		1085
		1086	if (SvLEN (sv) <= cur + len)
		1087	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1088
960	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1089	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
961	SvCUR_set (sv, SvCUR (sv) + len);	1090	SvCUR_set (sv, SvCUR (sv) + len);
962	}	1091	}
963	else	1092	else
964	sv = newSVpvn (buf, len);	1093	sv = newSVpvn (buf, len);
…		…
1055		1184
1056	// special case the rather common 1..5-digit-int case	1185	// special case the rather common 1..5-digit-int case
1057	if (*start == '-')	1186	if (*start == '-')
1058	switch (len)	1187	switch (len)
1059	{	1188	{
1060	case 2: return newSViv (-( start [1] - '0' * 1));	1189	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1061	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1190	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1062	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1191	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1063	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1192	case 5: return newSViv (-(IV)( 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));	1193	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1065	}	1194	}
1066	else	1195	else
1067	switch (len)	1196	switch (len)
1068	{	1197	{
1069	case 1: return newSViv ( start [0] - '0' * 1);	1198	case 1: return newSViv ( start [0] - '0' * 1);
1070	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1199	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1071	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1200	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1072	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1201	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);	1202	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1074	}	1203	}
1075		1204
1076	{	1205	{
1077	UV uv;	1206	UV uv;
1078	int numtype = grok_number (start, len, &uv);	1207	int numtype = grok_number (start, len, &uv);
…		…
1087	}	1216	}
1088		1217
1089	len -= *start == '-' ? 1 : 0;	1218	len -= *start == '-' ? 1 : 0;
1090		1219
1091	// does not fit into IV or UV, try NV	1220	// does not fit into IV or UV, try NV
1092	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1221	if (len <= NV_DIG)
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	1222	// fits into NV without loss of precision
1098	return newSVnv (Atof (start));	1223	return newSVnv (json_atof (start));
1099		1224
1100	// everything else fails, convert it to a string	1225	// everything else fails, convert it to a string
1101	return newSVpvn (start, dec->cur - start);	1226	return newSVpvn (start, dec->cur - start);
1102	}	1227	}
1103		1228
1104	// loss of precision here	1229	// loss of precision here
1105	return newSVnv (Atof (start));	1230	return newSVnv (json_atof (start));
1106		1231
1107	fail:	1232	fail:
1108	return 0;	1233	return 0;
1109	}	1234	}
1110		1235
…		…
1279	dSP;	1404	dSP;
1280	int count;	1405	int count;
1281		1406
1282	ENTER; SAVETMPS; PUSHMARK (SP);	1407	ENTER; SAVETMPS; PUSHMARK (SP);
1283	XPUSHs (HeVAL (he));	1408	XPUSHs (HeVAL (he));
		1409	sv_2mortal (sv);
1284		1410
1285	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1411	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1286		1412
1287	if (count == 1)	1413	if (count == 1)
1288	{	1414	{
1289	sv = newSVsv (POPs);	1415	sv = newSVsv (POPs);
1290	FREETMPS; LEAVE;	1416	FREETMPS; LEAVE;
1291	return sv;	1417	return sv;
1292	}	1418	}
1293		1419
		1420	SvREFCNT_inc (sv);
1294	FREETMPS; LEAVE;	1421	FREETMPS; LEAVE;
1295	}	1422	}
1296	}	1423	}
1297		1424
1298	if (dec->json.cb_object)	1425	if (dec->json.cb_object)
…		…
1344	case 't':	1471	case 't':
1345	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1472	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1346	{	1473	{
1347	dec->cur += 4;	1474	dec->cur += 4;
1348	#if JSON_SLOW	1475	#if JSON_SLOW
1349	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1476	json_true = get_bool ("JSON::XS::true");
1350	#endif	1477	#endif
1351	return SvREFCNT_inc (json_true);	1478	return newSVsv (json_true);
1352	}	1479	}
1353	else	1480	else
1354	ERR ("'true' expected");	1481	ERR ("'true' expected");
1355		1482
1356	break;	1483	break;
…		…
1358	case 'f':	1485	case 'f':
1359	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1486	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1360	{	1487	{
1361	dec->cur += 5;	1488	dec->cur += 5;
1362	#if JSON_SLOW	1489	#if JSON_SLOW
1363	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1490	json_false = get_bool ("JSON::XS::false");
1364	#endif	1491	#endif
1365	return SvREFCNT_inc (json_false);	1492	return newSVsv (json_false);
1366	}	1493	}
1367	else	1494	else
1368	ERR ("'false' expected");	1495	ERR ("'false' expected");
1369		1496
1370	break;	1497	break;
…		…
1388	fail:	1515	fail:
1389	return 0;	1516	return 0;
1390	}	1517	}
1391		1518
1392	static SV *	1519	static SV *
1393	decode_json (SV string, JSON json, STRLEN *offset_return)	1520	decode_json (SV string, JSON json, char **offset_return)
1394	{	1521	{
1395	dec_t dec;	1522	dec_t dec;
1396	STRLEN offset;
1397	SV *sv;	1523	SV *sv;
1398		1524
		1525	/* work around bugs in 5.10 where manipulating magic values
		1526	* will perl ignore the magic in subsequent accesses.
		1527	* also make a copy of non-PV values, to get them into a clean
		1528	* state (SvPV should do that, but it's buggy, see below).
		1529	*/
1399	SvGETMAGIC (string);	1530	/SvGETMAGIC (string);/
		1531	if (SvMAGICAL (string) \|\| !SvPOK (string))
		1532	string = sv_2mortal (newSVsv (string));
		1533
1400	SvUPGRADE (string, SVt_PV);	1534	SvUPGRADE (string, SVt_PV);
1401		1535
1402	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1536	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1537	* assertion with -DDEBUGGING, although SvCUR is documented to
		1538	* return the xpv_cur field which certainly exists after upgrading.
		1539	* according to nicholas clark, calling SvPOK fixes this.
		1540	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1541	* and hope for the best.
		1542	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1543	* assertion business is seriously broken, try yet another workaround
		1544	* for the broken -DDEBUGGING.
		1545	*/
		1546	{
		1547	#ifdef DEBUGGING
		1548	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1549	#else
		1550	STRLEN offset = SvCUR (string);
		1551	#endif
		1552
		1553	if (offset > json->max_size && json->max_size)
1403	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1554	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1404	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1555	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1556	}
1405		1557
1406	if (json->flags & F_UTF8)	1558	if (DECODE_WANTS_OCTETS (json))
1407	sv_utf8_downgrade (string, 0);	1559	sv_utf8_downgrade (string, 0);
1408	else	1560	else
1409	sv_utf8_upgrade (string);	1561	sv_utf8_upgrade (string);
1410		1562
1411	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1563	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1412		1564
1413	dec.json = *json;	1565	dec.json = *json;
1414	dec.cur = SvPVX (string);	1566	dec.cur = SvPVX (string);
1415	dec.end = SvEND (string);	1567	dec.end = SvEND (string);
1416	dec.err = 0;	1568	dec.err = 0;
1417	dec.depth = 0;	1569	dec.depth = 0;
1418	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1419		1570
1420	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1571	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1421	dec.json.flags \|= F_HOOK;	1572	dec.json.flags \|= F_HOOK;
1422		1573
1423	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1574	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1424		1575
1425	decode_ws (&dec);	1576	decode_ws (&dec);
1426	sv = decode_sv (&dec);	1577	sv = decode_sv (&dec);
		1578
		1579	if (offset_return)
		1580	*offset_return = dec.cur;
1427		1581
1428	if (!(offset_return \|\| !sv))	1582	if (!(offset_return \|\| !sv))
1429	{	1583	{
1430	// check for trailing garbage	1584	// check for trailing garbage
1431	decode_ws (&dec);	1585	decode_ws (&dec);
…		…
1434	{	1588	{
1435	dec.err = "garbage after JSON object";	1589	dec.err = "garbage after JSON object";
1436	SvREFCNT_dec (sv);	1590	SvREFCNT_dec (sv);
1437	sv = 0;	1591	sv = 0;
1438	}	1592	}
1439	}
1440
1441	if (offset_return \|\| !sv)
1442	{
1443	offset = dec.json.flags & F_UTF8
1444	? dec.cur - SvPVX (string)
1445	: utf8_distance (dec.cur, SvPVX (string));
1446
1447	if (offset_return)
1448	*offset_return = offset;
1449	}	1593	}
1450		1594
1451	if (!sv)	1595	if (!sv)
1452	{	1596	{
1453	SV *uni = sv_newmortal ();	1597	SV *uni = sv_newmortal ();
…		…
1459	SAVEVPTR (PL_curcop);	1603	SAVEVPTR (PL_curcop);
1460	PL_curcop = &cop;	1604	PL_curcop = &cop;
1461	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1605	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1462	LEAVE;	1606	LEAVE;
1463		1607
1464	croak ("%s, at character offset %d [\"%s\"]",	1608	croak ("%s, at character offset %d (before \"%s\")",
1465	dec.err,	1609	dec.err,
1466	(int)offset,	1610	ptr_to_index (string, dec.cur),
1467	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1611	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1468	}	1612	}
1469		1613
1470	sv = sv_2mortal (sv);	1614	sv = sv_2mortal (sv);
1471		1615
…		…
1480		1624
1481	static void	1625	static void
1482	incr_parse (JSON *self)	1626	incr_parse (JSON *self)
1483	{	1627	{
1484	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1628	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1629
		1630	// the state machine here is a bit convoluted and could be simplified a lot
		1631	// but this would make it slower, so...
1485		1632
1486	for (;;)	1633	for (;;)
1487	{	1634	{
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	1635	//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)	1636	switch (self->incr_mode)
1490	{	1637	{
1491	// only used for intiial whitespace skipping	1638	// only used for initial whitespace skipping
1492	case INCR_M_WS:	1639	case INCR_M_WS:
1493	for (;;)	1640	for (;;)
1494	{	1641	{
1495	if (*p > 0x20)	1642	if (*p > 0x20)
1496	{	1643	{
		1644	if (*p == '#')
		1645	{
		1646	self->incr_mode = INCR_M_C0;
		1647	goto incr_m_c;
		1648	}
		1649	else
		1650	{
1497	self->incr_mode = INCR_M_JSON;	1651	self->incr_mode = INCR_M_JSON;
1498	goto incr_m_json;	1652	goto incr_m_json;
		1653	}
1499	}	1654	}
1500	else if (!*p)	1655	else if (!*p)
1501	goto interrupt;	1656	goto interrupt;
1502		1657
1503	++p;	1658	++p;
…		…
1509	goto interrupt;	1664	goto interrupt;
1510		1665
1511	++p;	1666	++p;
1512	self->incr_mode = INCR_M_STR;	1667	self->incr_mode = INCR_M_STR;
1513	goto incr_m_str;	1668	goto incr_m_str;
		1669
		1670	// inside #-style comments
		1671	case INCR_M_C0:
		1672	case INCR_M_C1:
		1673	incr_m_c:
		1674	for (;;)
		1675	{
		1676	if (*p == '\n')
		1677	{
		1678	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1679	break;
		1680	}
		1681	else if (!*p)
		1682	goto interrupt;
		1683
		1684	++p;
		1685	}
		1686
		1687	break;
1514		1688
1515	// inside a string	1689	// inside a string
1516	case INCR_M_STR:	1690	case INCR_M_STR:
1517	incr_m_str:	1691	incr_m_str:
1518	for (;;)	1692	for (;;)
…		…
1569	self->incr_mode = INCR_M_STR;	1743	self->incr_mode = INCR_M_STR;
1570	goto incr_m_str;	1744	goto incr_m_str;
1571		1745
1572	case '[':	1746	case '[':
1573	case '{':	1747	case '{':
1574	++self->incr_nest;	1748	if (++self->incr_nest > self->max_depth)
		1749	croak (ERR_NESTING_EXCEEDED);
1575	break;	1750	break;
1576		1751
1577	case ']':	1752	case ']':
1578	case '}':	1753	case '}':
1579	if (!--self->incr_nest)	1754	if (--self->incr_nest <= 0)
1580	goto interrupt;	1755	goto interrupt;
		1756	break;
		1757
		1758	case '#':
		1759	self->incr_mode = INCR_M_C1;
		1760	goto incr_m_c;
1581	}	1761	}
1582	}	1762	}
1583	}	1763	}
1584		1764
1585	modechange:	1765	modechange:
1586	;	1766	;
1587	}	1767	}
1588		1768
1589	interrupt:	1769	interrupt:
1590	self->incr_pos = p - SvPVX (self->incr_text);	1770	self->incr_pos = p - SvPVX (self->incr_text);
		1771	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1591	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1772	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1592	}	1773	}
1593		1774
1594	/////////////////////////////////////////////////////////////////////////////	1775	/////////////////////////////////////////////////////////////////////////////
1595	// XS interface functions	1776	// XS interface functions
…		…
1608	: -1;	1789	: -1;
1609		1790
1610	json_stash = gv_stashpv ("JSON::XS" , 1);	1791	json_stash = gv_stashpv ("JSON::XS" , 1);
1611	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1792	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1612		1793
1613	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1794	json_true = get_bool ("JSON::XS::true");
1614	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1795	json_false = get_bool ("JSON::XS::false");
		1796
		1797	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1615	}	1798	}
1616		1799
1617	PROTOTYPES: DISABLE	1800	PROTOTYPES: DISABLE
1618		1801
1619	void CLONE (...)	1802	void CLONE (...)
…		…
1624	void new (char *klass)	1807	void new (char *klass)
1625	PPCODE:	1808	PPCODE:
1626	{	1809	{
1627	SV *pv = NEWSV (0, sizeof (JSON));	1810	SV *pv = NEWSV (0, sizeof (JSON));
1628	SvPOK_only (pv);	1811	SvPOK_only (pv);
1629	Zero (SvPVX (pv), 1, JSON);	1812	json_init ((JSON *)SvPVX (pv));
1630	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1631	XPUSHs (sv_2mortal (sv_bless (	1813	XPUSHs (sv_2mortal (sv_bless (
1632	newRV_noinc (pv),	1814	newRV_noinc (pv),
1633	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1815	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1634	)));	1816	)));
1635	}	1817	}
…		…
1647	allow_nonref = F_ALLOW_NONREF	1829	allow_nonref = F_ALLOW_NONREF
1648	shrink = F_SHRINK	1830	shrink = F_SHRINK
1649	allow_blessed = F_ALLOW_BLESSED	1831	allow_blessed = F_ALLOW_BLESSED
1650	convert_blessed = F_CONV_BLESSED	1832	convert_blessed = F_CONV_BLESSED
1651	relaxed = F_RELAXED	1833	relaxed = F_RELAXED
		1834	allow_unknown = F_ALLOW_UNKNOWN
1652	PPCODE:	1835	PPCODE:
1653	{	1836	{
1654	if (enable)	1837	if (enable)
1655	self->flags \|= ix;	1838	self->flags \|= ix;
1656	else	1839	else
…		…
1671	get_allow_nonref = F_ALLOW_NONREF	1854	get_allow_nonref = F_ALLOW_NONREF
1672	get_shrink = F_SHRINK	1855	get_shrink = F_SHRINK
1673	get_allow_blessed = F_ALLOW_BLESSED	1856	get_allow_blessed = F_ALLOW_BLESSED
1674	get_convert_blessed = F_CONV_BLESSED	1857	get_convert_blessed = F_CONV_BLESSED
1675	get_relaxed = F_RELAXED	1858	get_relaxed = F_RELAXED
		1859	get_allow_unknown = F_ALLOW_UNKNOWN
1676	PPCODE:	1860	PPCODE:
1677	XPUSHs (boolSV (self->flags & ix));	1861	XPUSHs (boolSV (self->flags & ix));
1678		1862
1679	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1863	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1680	PPCODE:	1864	PPCODE:
1681	{	1865	self->max_depth = max_depth;
1682	UV log2 = 0;
1683
1684	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1685
1686	while ((1UL << log2) < max_depth)
1687	++log2;
1688
1689	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1690
1691	XPUSHs (ST (0));	1866	XPUSHs (ST (0));
1692	}
1693		1867
1694	U32 get_max_depth (JSON *self)	1868	U32 get_max_depth (JSON *self)
1695	CODE:	1869	CODE:
1696	RETVAL = DEC_DEPTH (self->flags);	1870	RETVAL = self->max_depth;
1697	OUTPUT:	1871	OUTPUT:
1698	RETVAL	1872	RETVAL
1699		1873
1700	void max_size (JSON *self, UV max_size = 0)	1874	void max_size (JSON *self, U32 max_size = 0)
1701	PPCODE:	1875	PPCODE:
1702	{	1876	self->max_size = max_size;
1703	UV log2 = 0;
1704
1705	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1706	if (max_size == 1) max_size = 2;
1707
1708	while ((1UL << log2) < max_size)
1709	++log2;
1710
1711	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1712
1713	XPUSHs (ST (0));	1877	XPUSHs (ST (0));
1714	}
1715		1878
1716	int get_max_size (JSON *self)	1879	int get_max_size (JSON *self)
1717	CODE:	1880	CODE:
1718	RETVAL = DEC_SIZE (self->flags);	1881	RETVAL = self->max_size;
1719	OUTPUT:	1882	OUTPUT:
1720	RETVAL	1883	RETVAL
1721		1884
1722	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1885	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1723	PPCODE:	1886	PPCODE:
…		…
1759	XPUSHs (decode_json (jsonstr, self, 0));	1922	XPUSHs (decode_json (jsonstr, self, 0));
1760		1923
1761	void decode_prefix (JSON self, SV jsonstr)	1924	void decode_prefix (JSON self, SV jsonstr)
1762	PPCODE:	1925	PPCODE:
1763	{	1926	{
1764	STRLEN offset;	1927	char *offset;
1765	EXTEND (SP, 2);	1928	EXTEND (SP, 2);
1766	PUSHs (decode_json (jsonstr, self, &offset));	1929	PUSHs (decode_json (jsonstr, self, &offset));
1767	PUSHs (sv_2mortal (newSVuv (offset)));	1930	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1768	}	1931	}
1769		1932
1770	void incr_parse (JSON self, SV jsonstr = 0)	1933	void incr_parse (JSON self, SV jsonstr = 0)
1771	PPCODE:	1934	PPCODE:
1772	{	1935	{
1773	if (!self->incr_text)	1936	if (!self->incr_text)
1774	self->incr_text = newSVpvn ("", 0);	1937	self->incr_text = newSVpvn ("", 0);
		1938
		1939	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		1940	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		1941	if (DECODE_WANTS_OCTETS (self))
		1942	{
		1943	if (self->incr_pos)
		1944	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		1945	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		1946
		1947	sv_utf8_downgrade (self->incr_text, 0);
		1948	}
		1949	else
		1950	{
		1951	sv_utf8_upgrade (self->incr_text);
		1952
		1953	if (self->incr_pos)
		1954	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1955	- (U8 *)SvPVX (self->incr_text);
		1956	}
1775		1957
1776	// append data, if any	1958	// append data, if any
1777	if (jsonstr)	1959	if (jsonstr)
1778	{	1960	{
		1961	/* make sure both strings have same encoding */
1779	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1962	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		1963	if (SvUTF8 (jsonstr))
		1964	sv_utf8_downgrade (jsonstr, 0);
1780	{	1965	else
1781	/* utf-8-ness differs, need to upgrade */
1782	sv_utf8_upgrade (self->incr_text);	1966	sv_utf8_upgrade (jsonstr);
1783		1967
1784	if (self->incr_pos)	1968	/* and then just blindly append */
1785	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1786	- (U8 *)SvPVX (self->incr_text);
1787	}
1788
1789	{	1969	{
1790	STRLEN len;	1970	STRLEN len;
1791	const char *str = SvPV (jsonstr, len);	1971	const char *str = SvPV (jsonstr, len);
1792	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	1972	STRLEN cur = SvCUR (self->incr_text);
		1973
		1974	if (SvLEN (self->incr_text) <= cur + len)
		1975	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1976
1793	Move (str, SvEND (self->incr_text), len, char);	1977	Move (str, SvEND (self->incr_text), len, char);
1794	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1978	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	1979	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1796	}	1980	}
1797	}	1981	}
1798		1982
1799	if (GIMME_V != G_VOID)	1983	if (GIMME_V != G_VOID)
1800	do	1984	do
1801	{	1985	{
1802	STRLEN offset;	1986	char *offset;
1803
1804	incr_parse (self);
1805		1987
1806	if (!INCR_DONE (self))	1988	if (!INCR_DONE (self))
		1989	{
		1990	incr_parse (self);
		1991
		1992	if (self->incr_pos > self->max_size && self->max_size)
		1993	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1994	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1995
		1996	if (!INCR_DONE (self))
		1997	{
		1998	// as an optimisation, do not accumulate white space in the incr buffer
		1999	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2000	{
		2001	self->incr_pos = 0;
		2002	SvCUR_set (self->incr_text, 0);
		2003	}
		2004
1807	break;	2005	break;
		2006	}
		2007	}
1808		2008
1809	XPUSHs (decode_json (self->incr_text, self, &offset));	2009	XPUSHs (decode_json (self->incr_text, self, &offset));
1810		2010
1811	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1812	self->incr_pos -= offset;	2011	self->incr_pos -= offset - SvPVX (self->incr_text);
1813	self->incr_nest = 0;	2012	self->incr_nest = 0;
1814	self->incr_mode = 0;	2013	self->incr_mode = 0;
		2014
		2015	sv_chop (self->incr_text, offset);
1815	}	2016	}
1816	while (GIMME_V == G_ARRAY);	2017	while (GIMME_V == G_ARRAY);
1817	}	2018	}
1818		2019
1819	SV incr_text (JSON self)	2020	SV incr_text (JSON self)
1820	ATTRS: lvalue	2021	ATTRS: lvalue
1821	CODE:	2022	CODE:
1822	{	2023	{
1823	if (self->incr_pos)	2024	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	2025	croak ("incr_text can not be called when the incremental parser already started parsing");
1825		2026
1826	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;	2027	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1827	}	2028	}
1828	OUTPUT:	2029	OUTPUT:
1829	RETVAL	2030	RETVAL
		2031
		2032	void incr_skip (JSON *self)
		2033	CODE:
		2034	{
		2035	if (self->incr_pos)
		2036	{
		2037	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		2038	self->incr_pos = 0;
		2039	self->incr_nest = 0;
		2040	self->incr_mode = 0;
		2041	}
		2042	}
		2043
		2044	void incr_reset (JSON *self)
		2045	CODE:
		2046	{
		2047	SvREFCNT_dec (self->incr_text);
		2048	self->incr_text = 0;
		2049	self->incr_pos = 0;
		2050	self->incr_nest = 0;
		2051	self->incr_mode = 0;
		2052	}
1830		2053
1831	void DESTROY (JSON *self)	2054	void DESTROY (JSON *self)
1832	CODE:	2055	CODE:
1833	SvREFCNT_dec (self->cb_sk_object);	2056	SvREFCNT_dec (self->cb_sk_object);
1834	SvREFCNT_dec (self->cb_object);	2057	SvREFCNT_dec (self->cb_object);
…		…
1840	ALIAS:	2063	ALIAS:
1841	to_json_ = 0	2064	to_json_ = 0
1842	encode_json = F_UTF8	2065	encode_json = F_UTF8
1843	PPCODE:	2066	PPCODE:
1844	{	2067	{
1845	JSON json = { F_DEFAULT \| ix };	2068	JSON json;
		2069	json_init (&json);
		2070	json.flags \|= ix;
1846	XPUSHs (encode_json (scalar, &json));	2071	XPUSHs (encode_json (scalar, &json));
1847	}	2072	}
1848		2073
1849	void decode_json (SV *jsonstr)	2074	void decode_json (SV *jsonstr)
1850	ALIAS:	2075	ALIAS:
1851	from_json_ = 0	2076	from_json_ = 0
1852	decode_json = F_UTF8	2077	decode_json = F_UTF8
1853	PPCODE:	2078	PPCODE:
1854	{	2079	{
1855	JSON json = { F_DEFAULT \| ix };	2080	JSON json;
		2081	json_init (&json);
		2082	json.flags \|= ix;
1856	XPUSHs (decode_json (jsonstr, &json, 0));	2083	XPUSHs (decode_json (jsonstr, &json, 0));
1857	}	2084	}
1858		2085
1859

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs. Revision 1.112 by root, Thu Aug 11 17:06:53 2011 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.112 by root, Thu Aug 11 17:06:53 2011 UTC