[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.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
…		…
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	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	}
164	/////////////////////////////////////////////////////////////////////////////	288	/////////////////////////////////////////////////////////////////////////////
165	// encoder	289	// encoder
166		290
167	// structure used for encoding JSON	291	// structure used for encoding JSON
168	typedef struct	292	typedef struct
…		…
170	char *cur; // SvPVX (sv) + current output position	294	char *cur; // SvPVX (sv) + current output position
171	char *end; // SvEND (sv)	295	char *end; // SvEND (sv)
172	SV *sv; // result scalar	296	SV *sv; // result scalar
173	JSON json;	297	JSON json;
174	U32 indent; // indentation level	298	U32 indent; // indentation level
175	U32 maxdepth; // max. indentation/recursion level
176	UV limit; // escape character values >= this value when encoding	299	UV limit; // escape character values >= this value when encoding
177	} enc_t;	300	} enc_t;
178		301
179	INLINE void	302	INLINE void
180	need (enc_t *enc, STRLEN len)	303	need (enc_t *enc, STRLEN len)
181	{	304	{
182	if (expect_false (enc->cur + len >= enc->end))	305	if (expect_false (enc->cur + len >= enc->end))
183	{	306	{
184	STRLEN cur = enc->cur - SvPVX (enc->sv);	307	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
185	SvGROW (enc->sv, cur + len + 1);	308	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
186	enc->cur = SvPVX (enc->sv) + cur;	309	enc->cur = SvPVX (enc->sv) + cur;
187	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	310	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
188	}	311	}
189	}	312	}
190		313
…		…
265	(int)((uch - 0x10000) % 0x400 + 0xDC00));	388	(int)((uch - 0x10000) % 0x400 + 0xDC00));
266	enc->cur += 12;	389	enc->cur += 12;
267	}	390	}
268	else	391	else
269	{	392	{
270	static char hexdigit [16] = "0123456789abcdef";
271	need (enc, len += 5);	393	need (enc, len += 5);
272	*enc->cur++ = '\\';	394	*enc->cur++ = '\\';
273	*enc->cur++ = 'u';	395	*enc->cur++ = 'u';
274	*enc->cur++ = hexdigit [ uch >> 12 ];	396	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
275	*enc->cur++ = hexdigit [(uch >> 8) & 15];	397	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
276	*enc->cur++ = hexdigit [(uch >> 4) & 15];	398	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
277	*enc->cur++ = hexdigit [(uch >> 0) & 15];	399	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
278	}	400	}
279		401
280	str += clen;	402	str += clen;
281	}	403	}
282	else if (enc->json.flags & F_LATIN1)	404	else if (enc->json.flags & F_LATIN1)
…		…
353	static void	475	static void
354	encode_av (enc_t enc, AV av)	476	encode_av (enc_t enc, AV av)
355	{	477	{
356	int i, len = av_len (av);	478	int i, len = av_len (av);
357		479
358	if (enc->indent >= enc->maxdepth)	480	if (enc->indent >= enc->json.max_depth)
359	croak ("data structure too deep (hit recursion limit)");	481	croak (ERR_NESTING_EXCEEDED);
360		482
361	encode_ch (enc, '[');	483	encode_ch (enc, '[');
362		484
363	if (len >= 0)	485	if (len >= 0)
364	{	486	{
…		…
438		560
439	static void	561	static void
440	encode_hv (enc_t enc, HV hv)	562	encode_hv (enc_t enc, HV hv)
441	{	563	{
442	HE *he;	564	HE *he;
443	int count;
444		565
445	if (enc->indent >= enc->maxdepth)	566	if (enc->indent >= enc->json.max_depth)
446	croak ("data structure too deep (hit recursion limit)");	567	croak (ERR_NESTING_EXCEEDED);
447		568
448	encode_ch (enc, '{');	569	encode_ch (enc, '{');
449		570
450	// for canonical output we have to sort by keys first	571	// for canonical output we have to sort by keys first
451	// actually, this is mostly due to the stupid so-called	572	// actually, this is mostly due to the stupid so-called
452	// security workaround added somewhere in 5.8.x.	573	// security workaround added somewhere in 5.8.x
453	// that randomises hash orderings	574	// that randomises hash orderings
454	if (enc->json.flags & F_CANONICAL)	575	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
455	{	576	{
456	int count = hv_iterinit (hv);	577	int count = hv_iterinit (hv);
457		578
458	if (SvMAGICAL (hv))	579	if (SvMAGICAL (hv))
459	{	580	{
…		…
632		753
633	if (len == 1 && *pv == '1')	754	if (len == 1 && *pv == '1')
634	encode_str (enc, "true", 4, 0);	755	encode_str (enc, "true", 4, 0);
635	else if (len == 1 && *pv == '0')	756	else if (len == 1 && *pv == '0')
636	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);
637	else	760	else
638	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",
639	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	762	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
640	}	763	}
		764	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		765	encode_str (enc, "null", 4, 0);
641	else	766	else
642	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",
643	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	768	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644	}	769	}
645		770
…		…
707	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	832	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
708	}	833	}
709	}	834	}
710	else if (SvROK (sv))	835	else if (SvROK (sv))
711	encode_rv (enc, SvRV (sv));	836	encode_rv (enc, SvRV (sv));
712	else if (!SvOK (sv))	837	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
713	encode_str (enc, "null", 4, 0);	838	encode_str (enc, "null", 4, 0);
714	else	839	else
715	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",
716	SvPV_nolen (sv), SvFLAGS (sv));	841	SvPV_nolen (sv), SvFLAGS (sv));
717	}	842	}
…		…
727	enc.json = *json;	852	enc.json = *json;
728	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	853	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
729	enc.cur = SvPVX (enc.sv);	854	enc.cur = SvPVX (enc.sv);
730	enc.end = SvEND (enc.sv);	855	enc.end = SvEND (enc.sv);
731	enc.indent = 0;	856	enc.indent = 0;
732	enc.maxdepth = DEC_DEPTH (enc.json.flags);
733	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	857	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
734	: enc.json.flags & F_LATIN1 ? 0x000100UL	858	: enc.json.flags & F_LATIN1 ? 0x000100UL
735	: 0x110000UL;	859	: 0x110000UL;
736		860
737	SvPOK_only (enc.sv);	861	SvPOK_only (enc.sv);
738	encode_sv (&enc, scalar);	862	encode_sv (&enc, scalar);
		863	encode_nl (&enc);
739		864
740	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	865	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
741	*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
742		867
743	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	868	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
804	if (*dec->cur != ch) \	929	if (*dec->cur != ch) \
805	ERR (# ch " expected"); \	930	ERR (# ch " expected"); \
806	++dec->cur; \	931	++dec->cur; \
807	SE	932	SE
808		933
809	#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)
810	#define DEC_DEC_DEPTH --dec->depth	935	#define DEC_DEC_DEPTH --dec->depth
811		936
812	static SV decode_sv (dec_t dec);	937	static SV decode_sv (dec_t dec);
813		938
814	static signed char decode_hexdigit[256];	939	static signed char decode_hexdigit[256];
…		…
923	else if (expect_true (ch >= 0x20 && ch < 0x80))	1048	else if (expect_true (ch >= 0x20 && ch < 0x80))
924	*cur++ = ch;	1049	*cur++ = ch;
925	else if (ch >= 0x80)	1050	else if (ch >= 0x80)
926	{	1051	{
927	STRLEN clen;	1052	STRLEN clen;
928	UV uch;
929		1053
930	--dec_cur;	1054	--dec_cur;
931		1055
932	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1056	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
933	if (clen == (STRLEN)-1)	1057	if (clen == (STRLEN)-1)
934	ERR ("malformed UTF-8 character in JSON string");	1058	ERR ("malformed UTF-8 character in JSON string");
935		1059
936	do	1060	do
937	cur++ = dec_cur++;	1061	cur++ = dec_cur++;
…		…
954	{	1078	{
955	STRLEN len = cur - buf;	1079	STRLEN len = cur - buf;
956		1080
957	if (sv)	1081	if (sv)
958	{	1082	{
959	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
960	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1088	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
961	SvCUR_set (sv, SvCUR (sv) + len);	1089	SvCUR_set (sv, SvCUR (sv) + len);
962	}	1090	}
963	else	1091	else
964	sv = newSVpvn (buf, len);	1092	sv = newSVpvn (buf, len);
…		…
1055		1183
1056	// special case the rather common 1..5-digit-int case	1184	// special case the rather common 1..5-digit-int case
1057	if (*start == '-')	1185	if (*start == '-')
1058	switch (len)	1186	switch (len)
1059	{	1187	{
1060	case 2: return newSViv (-( start [1] - '0' * 1));	1188	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1061	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1189	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));	1190	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));	1191	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));	1192	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1065	}	1193	}
1066	else	1194	else
1067	switch (len)	1195	switch (len)
1068	{	1196	{
1069	case 1: return newSViv ( start [0] - '0' * 1);	1197	case 1: return newSViv ( start [0] - '0' * 1);
1070	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1198	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);	1199	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);	1200	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);	1201	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1074	}	1202	}
1075		1203
1076	{	1204	{
1077	UV uv;	1205	UV uv;
1078	int numtype = grok_number (start, len, &uv);	1206	int numtype = grok_number (start, len, &uv);
…		…
1087	}	1215	}
1088		1216
1089	len -= *start == '-' ? 1 : 0;	1217	len -= *start == '-' ? 1 : 0;
1090		1218
1091	// does not fit into IV or UV, try NV	1219	// does not fit into IV or UV, try NV
1092	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1220	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	1221	// fits into NV without loss of precision
1098	return newSVnv (Atof (start));	1222	return newSVnv (json_atof (start));
1099		1223
1100	// everything else fails, convert it to a string	1224	// everything else fails, convert it to a string
1101	return newSVpvn (start, dec->cur - start);	1225	return newSVpvn (start, dec->cur - start);
1102	}	1226	}
1103		1227
1104	// loss of precision here	1228	// loss of precision here
1105	return newSVnv (Atof (start));	1229	return newSVnv (json_atof (start));
1106		1230
1107	fail:	1231	fail:
1108	return 0;	1232	return 0;
1109	}	1233	}
1110		1234
…		…
1279	dSP;	1403	dSP;
1280	int count;	1404	int count;
1281		1405
1282	ENTER; SAVETMPS; PUSHMARK (SP);	1406	ENTER; SAVETMPS; PUSHMARK (SP);
1283	XPUSHs (HeVAL (he));	1407	XPUSHs (HeVAL (he));
		1408	sv_2mortal (sv);
1284		1409
1285	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1410	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1286		1411
1287	if (count == 1)	1412	if (count == 1)
1288	{	1413	{
1289	sv = newSVsv (POPs);	1414	sv = newSVsv (POPs);
1290	FREETMPS; LEAVE;	1415	FREETMPS; LEAVE;
1291	return sv;	1416	return sv;
1292	}	1417	}
1293		1418
		1419	SvREFCNT_inc (sv);
1294	FREETMPS; LEAVE;	1420	FREETMPS; LEAVE;
1295	}	1421	}
1296	}	1422	}
1297		1423
1298	if (dec->json.cb_object)	1424	if (dec->json.cb_object)
…		…
1344	case 't':	1470	case 't':
1345	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1471	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1346	{	1472	{
1347	dec->cur += 4;	1473	dec->cur += 4;
1348	#if JSON_SLOW	1474	#if JSON_SLOW
1349	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1475	json_true = get_bool ("JSON::XS::true");
1350	#endif	1476	#endif
1351	return SvREFCNT_inc (json_true);	1477	return newSVsv (json_true);
1352	}	1478	}
1353	else	1479	else
1354	ERR ("'true' expected");	1480	ERR ("'true' expected");
1355		1481
1356	break;	1482	break;
…		…
1358	case 'f':	1484	case 'f':
1359	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1485	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1360	{	1486	{
1361	dec->cur += 5;	1487	dec->cur += 5;
1362	#if JSON_SLOW	1488	#if JSON_SLOW
1363	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1489	json_false = get_bool ("JSON::XS::false");
1364	#endif	1490	#endif
1365	return SvREFCNT_inc (json_false);	1491	return newSVsv (json_false);
1366	}	1492	}
1367	else	1493	else
1368	ERR ("'false' expected");	1494	ERR ("'false' expected");
1369		1495
1370	break;	1496	break;
…		…
1388	fail:	1514	fail:
1389	return 0;	1515	return 0;
1390	}	1516	}
1391		1517
1392	static SV *	1518	static SV *
1393	decode_json (SV string, JSON json, STRLEN *offset_return)	1519	decode_json (SV string, JSON json, char **offset_return)
1394	{	1520	{
1395	dec_t dec;	1521	dec_t dec;
1396	STRLEN offset;
1397	SV *sv;	1522	SV *sv;
1398		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	*/
1399	SvGETMAGIC (string);	1529	/SvGETMAGIC (string);/
		1530	if (SvMAGICAL (string) \|\| !SvPOK (string))
		1531	string = sv_2mortal (newSVsv (string));
		1532
1400	SvUPGRADE (string, SVt_PV);	1533	SvUPGRADE (string, SVt_PV);
1401		1534
1402	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)
1403	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",
1404	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1554	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1555	}
1405		1556
1406	if (json->flags & F_UTF8)	1557	if (DECODE_WANTS_OCTETS (json))
1407	sv_utf8_downgrade (string, 0);	1558	sv_utf8_downgrade (string, 0);
1408	else	1559	else
1409	sv_utf8_upgrade (string);	1560	sv_utf8_upgrade (string);
1410		1561
1411	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1562	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1412		1563
1413	dec.json = *json;	1564	dec.json = *json;
1414	dec.cur = SvPVX (string);	1565	dec.cur = SvPVX (string);
1415	dec.end = SvEND (string);	1566	dec.end = SvEND (string);
1416	dec.err = 0;	1567	dec.err = 0;
1417	dec.depth = 0;	1568	dec.depth = 0;
1418	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1419		1569
1420	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1570	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1421	dec.json.flags \|= F_HOOK;	1571	dec.json.flags \|= F_HOOK;
1422		1572
1423	*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
1424		1574
1425	decode_ws (&dec);	1575	decode_ws (&dec);
1426	sv = decode_sv (&dec);	1576	sv = decode_sv (&dec);
		1577
		1578	if (offset_return)
		1579	*offset_return = dec.cur;
1427		1580
1428	if (!(offset_return \|\| !sv))	1581	if (!(offset_return \|\| !sv))
1429	{	1582	{
1430	// check for trailing garbage	1583	// check for trailing garbage
1431	decode_ws (&dec);	1584	decode_ws (&dec);
…		…
1434	{	1587	{
1435	dec.err = "garbage after JSON object";	1588	dec.err = "garbage after JSON object";
1436	SvREFCNT_dec (sv);	1589	SvREFCNT_dec (sv);
1437	sv = 0;	1590	sv = 0;
1438	}	1591	}
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	}	1592	}
1450		1593
1451	if (!sv)	1594	if (!sv)
1452	{	1595	{
1453	SV *uni = sv_newmortal ();	1596	SV *uni = sv_newmortal ();
…		…
1459	SAVEVPTR (PL_curcop);	1602	SAVEVPTR (PL_curcop);
1460	PL_curcop = &cop;	1603	PL_curcop = &cop;
1461	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);
1462	LEAVE;	1605	LEAVE;
1463		1606
1464	croak ("%s, at character offset %d [\"%s\"]",	1607	croak ("%s, at character offset %d (before \"%s\")",
1465	dec.err,	1608	dec.err,
1466	(int)offset,	1609	ptr_to_index (string, dec.cur),
1467	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1610	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1468	}	1611	}
1469		1612
1470	sv = sv_2mortal (sv);	1613	sv = sv_2mortal (sv);
1471		1614
…		…
1480		1623
1481	static void	1624	static void
1482	incr_parse (JSON *self)	1625	incr_parse (JSON *self)
1483	{	1626	{
1484	const char *p = SvPVX (self->incr_text) + self->incr_pos;	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...
1485		1631
1486	for (;;)	1632	for (;;)
1487	{	1633	{
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	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
1489	switch (self->incr_mode)	1635	switch (self->incr_mode)
1490	{	1636	{
1491	// only used for intiial whitespace skipping	1637	// only used for initial whitespace skipping
1492	case INCR_M_WS:	1638	case INCR_M_WS:
1493	for (;;)	1639	for (;;)
1494	{	1640	{
1495	if (*p > 0x20)	1641	if (*p > 0x20)
1496	{	1642	{
		1643	if (*p == '#')
		1644	{
		1645	self->incr_mode = INCR_M_C0;
		1646	goto incr_m_c;
		1647	}
		1648	else
		1649	{
1497	self->incr_mode = INCR_M_JSON;	1650	self->incr_mode = INCR_M_JSON;
1498	goto incr_m_json;	1651	goto incr_m_json;
		1652	}
1499	}	1653	}
1500	else if (!*p)	1654	else if (!*p)
1501	goto interrupt;	1655	goto interrupt;
1502		1656
1503	++p;	1657	++p;
…		…
1509	goto interrupt;	1663	goto interrupt;
1510		1664
1511	++p;	1665	++p;
1512	self->incr_mode = INCR_M_STR;	1666	self->incr_mode = INCR_M_STR;
1513	goto 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;
1514		1687
1515	// inside a string	1688	// inside a string
1516	case INCR_M_STR:	1689	case INCR_M_STR:
1517	incr_m_str:	1690	incr_m_str:
1518	for (;;)	1691	for (;;)
…		…
1569	self->incr_mode = INCR_M_STR;	1742	self->incr_mode = INCR_M_STR;
1570	goto incr_m_str;	1743	goto incr_m_str;
1571		1744
1572	case '[':	1745	case '[':
1573	case '{':	1746	case '{':
1574	++self->incr_nest;	1747	if (++self->incr_nest > self->max_depth)
		1748	croak (ERR_NESTING_EXCEEDED);
1575	break;	1749	break;
1576		1750
1577	case ']':	1751	case ']':
1578	case '}':	1752	case '}':
1579	if (!--self->incr_nest)	1753	if (--self->incr_nest <= 0)
1580	goto interrupt;	1754	goto interrupt;
		1755	break;
		1756
		1757	case '#':
		1758	self->incr_mode = INCR_M_C1;
		1759	goto incr_m_c;
1581	}	1760	}
1582	}	1761	}
1583	}	1762	}
1584		1763
1585	modechange:	1764	modechange:
1586	;	1765	;
1587	}	1766	}
1588		1767
1589	interrupt:	1768	interrupt:
1590	self->incr_pos = p - SvPVX (self->incr_text);	1769	self->incr_pos = p - SvPVX (self->incr_text);
		1770	//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	1771	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1592	}	1772	}
1593		1773
1594	/////////////////////////////////////////////////////////////////////////////	1774	/////////////////////////////////////////////////////////////////////////////
1595	// XS interface functions	1775	// XS interface functions
…		…
1608	: -1;	1788	: -1;
1609		1789
1610	json_stash = gv_stashpv ("JSON::XS" , 1);	1790	json_stash = gv_stashpv ("JSON::XS" , 1);
1611	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1791	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1612		1792
1613	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1793	json_true = get_bool ("JSON::XS::true");
1614	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 */
1615	}	1797	}
1616		1798
1617	PROTOTYPES: DISABLE	1799	PROTOTYPES: DISABLE
1618		1800
1619	void CLONE (...)	1801	void CLONE (...)
…		…
1624	void new (char *klass)	1806	void new (char *klass)
1625	PPCODE:	1807	PPCODE:
1626	{	1808	{
1627	SV *pv = NEWSV (0, sizeof (JSON));	1809	SV *pv = NEWSV (0, sizeof (JSON));
1628	SvPOK_only (pv);	1810	SvPOK_only (pv);
1629	Zero (SvPVX (pv), 1, JSON);	1811	json_init ((JSON *)SvPVX (pv));
1630	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1631	XPUSHs (sv_2mortal (sv_bless (	1812	XPUSHs (sv_2mortal (sv_bless (
1632	newRV_noinc (pv),	1813	newRV_noinc (pv),
1633	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1814	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1634	)));	1815	)));
1635	}	1816	}
…		…
1647	allow_nonref = F_ALLOW_NONREF	1828	allow_nonref = F_ALLOW_NONREF
1648	shrink = F_SHRINK	1829	shrink = F_SHRINK
1649	allow_blessed = F_ALLOW_BLESSED	1830	allow_blessed = F_ALLOW_BLESSED
1650	convert_blessed = F_CONV_BLESSED	1831	convert_blessed = F_CONV_BLESSED
1651	relaxed = F_RELAXED	1832	relaxed = F_RELAXED
		1833	allow_unknown = F_ALLOW_UNKNOWN
1652	PPCODE:	1834	PPCODE:
1653	{	1835	{
1654	if (enable)	1836	if (enable)
1655	self->flags \|= ix;	1837	self->flags \|= ix;
1656	else	1838	else
…		…
1671	get_allow_nonref = F_ALLOW_NONREF	1853	get_allow_nonref = F_ALLOW_NONREF
1672	get_shrink = F_SHRINK	1854	get_shrink = F_SHRINK
1673	get_allow_blessed = F_ALLOW_BLESSED	1855	get_allow_blessed = F_ALLOW_BLESSED
1674	get_convert_blessed = F_CONV_BLESSED	1856	get_convert_blessed = F_CONV_BLESSED
1675	get_relaxed = F_RELAXED	1857	get_relaxed = F_RELAXED
		1858	get_allow_unknown = F_ALLOW_UNKNOWN
1676	PPCODE:	1859	PPCODE:
1677	XPUSHs (boolSV (self->flags & ix));	1860	XPUSHs (boolSV (self->flags & ix));
1678		1861
1679	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1862	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1680	PPCODE:	1863	PPCODE:
1681	{	1864	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));	1865	XPUSHs (ST (0));
1692	}
1693		1866
1694	U32 get_max_depth (JSON *self)	1867	U32 get_max_depth (JSON *self)
1695	CODE:	1868	CODE:
1696	RETVAL = DEC_DEPTH (self->flags);	1869	RETVAL = self->max_depth;
1697	OUTPUT:	1870	OUTPUT:
1698	RETVAL	1871	RETVAL
1699		1872
1700	void max_size (JSON *self, UV max_size = 0)	1873	void max_size (JSON *self, U32 max_size = 0)
1701	PPCODE:	1874	PPCODE:
1702	{	1875	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));	1876	XPUSHs (ST (0));
1714	}
1715		1877
1716	int get_max_size (JSON *self)	1878	int get_max_size (JSON *self)
1717	CODE:	1879	CODE:
1718	RETVAL = DEC_SIZE (self->flags);	1880	RETVAL = self->max_size;
1719	OUTPUT:	1881	OUTPUT:
1720	RETVAL	1882	RETVAL
1721		1883
1722	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1884	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1723	PPCODE:	1885	PPCODE:
…		…
1759	XPUSHs (decode_json (jsonstr, self, 0));	1921	XPUSHs (decode_json (jsonstr, self, 0));
1760		1922
1761	void decode_prefix (JSON self, SV jsonstr)	1923	void decode_prefix (JSON self, SV jsonstr)
1762	PPCODE:	1924	PPCODE:
1763	{	1925	{
1764	STRLEN offset;	1926	char *offset;
1765	EXTEND (SP, 2);	1927	EXTEND (SP, 2);
1766	PUSHs (decode_json (jsonstr, self, &offset));	1928	PUSHs (decode_json (jsonstr, self, &offset));
1767	PUSHs (sv_2mortal (newSVuv (offset)));	1929	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1768	}	1930	}
1769		1931
1770	void incr_parse (JSON self, SV jsonstr = 0)	1932	void incr_parse (JSON self, SV jsonstr = 0)
1771	PPCODE:	1933	PPCODE:
1772	{	1934	{
1773	if (!self->incr_text)	1935	if (!self->incr_text)
1774	self->incr_text = newSVpvn ("", 0);	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	}
1775		1956
1776	// append data, if any	1957	// append data, if any
1777	if (jsonstr)	1958	if (jsonstr)
1778	{	1959	{
		1960	/* make sure both strings have same encoding */
1779	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1961	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		1962	if (SvUTF8 (jsonstr))
		1963	sv_utf8_downgrade (jsonstr, 0);
1780	{	1964	else
1781	/* utf-8-ness differs, need to upgrade */
1782	sv_utf8_upgrade (self->incr_text);	1965	sv_utf8_upgrade (jsonstr);
1783		1966
1784	if (self->incr_pos)	1967	/* 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	{	1968	{
1790	STRLEN len;	1969	STRLEN len;
1791	const char *str = SvPV (jsonstr, len);	1970	const char *str = SvPV (jsonstr, len);
1792	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	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
1793	Move (str, SvEND (self->incr_text), len, char);	1976	Move (str, SvEND (self->incr_text), len, char);
1794	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1977	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	1978	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1796	}	1979	}
1797	}	1980	}
1798		1981
1799	if (GIMME_V != G_VOID)	1982	if (GIMME_V != G_VOID)
1800	do	1983	do
1801	{	1984	{
1802	STRLEN offset;	1985	char *offset;
1803
1804	incr_parse (self);
1805		1986
1806	if (!INCR_DONE (self))	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))
1807	break;	1996	break;
		1997	}
1808		1998
1809	XPUSHs (decode_json (self->incr_text, self, &offset));	1999	XPUSHs (decode_json (self->incr_text, self, &offset));
1810		2000
1811	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1812	self->incr_pos -= offset;	2001	self->incr_pos -= offset - SvPVX (self->incr_text);
1813	self->incr_nest = 0;	2002	self->incr_nest = 0;
1814	self->incr_mode = 0;	2003	self->incr_mode = 0;
		2004
		2005	sv_chop (self->incr_text, offset);
1815	}	2006	}
1816	while (GIMME_V == G_ARRAY);	2007	while (GIMME_V == G_ARRAY);
1817	}	2008	}
1818		2009
1819	SV incr_text (JSON self)	2010	SV incr_text (JSON self)
1820	ATTRS: lvalue	2011	ATTRS: lvalue
1821	CODE:	2012	CODE:
1822	{	2013	{
1823	if (self->incr_pos)	2014	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	2015	croak ("incr_text can not be called when the incremental parser already started parsing");
1825		2016
1826	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;	2017	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1827	}	2018	}
1828	OUTPUT:	2019	OUTPUT:
1829	RETVAL	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;
		2042	}
1830		2043
1831	void DESTROY (JSON *self)	2044	void DESTROY (JSON *self)
1832	CODE:	2045	CODE:
1833	SvREFCNT_dec (self->cb_sk_object);	2046	SvREFCNT_dec (self->cb_sk_object);
1834	SvREFCNT_dec (self->cb_object);	2047	SvREFCNT_dec (self->cb_object);
…		…
1840	ALIAS:	2053	ALIAS:
1841	to_json_ = 0	2054	to_json_ = 0
1842	encode_json = F_UTF8	2055	encode_json = F_UTF8
1843	PPCODE:	2056	PPCODE:
1844	{	2057	{
1845	JSON json = { F_DEFAULT \| ix };	2058	JSON json;
		2059	json_init (&json);
		2060	json.flags \|= ix;
1846	XPUSHs (encode_json (scalar, &json));	2061	XPUSHs (encode_json (scalar, &json));
1847	}	2062	}
1848		2063
1849	void decode_json (SV *jsonstr)	2064	void decode_json (SV *jsonstr)
1850	ALIAS:	2065	ALIAS:
1851	from_json_ = 0	2066	from_json_ = 0
1852	decode_json = F_UTF8	2067	decode_json = F_UTF8
1853	PPCODE:	2068	PPCODE:
1854	{	2069	{
1855	JSON json = { F_DEFAULT \| ix };	2070	JSON json;
		2071	json_init (&json);
		2072	json.flags \|= ix;
1856	XPUSHs (decode_json (jsonstr, &json, 0));	2073	XPUSHs (decode_json (jsonstr, &json, 0));
1857	}	2074	}
1858		2075
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.109 by root, Tue Mar 8 10:18:50 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.109 by root, Tue Mar 8 10:18:50 2011 UTC