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