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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC vs.
Revision 1.115 by root, Fri Dec 21 05:16:19 2012 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
…		…
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	#define F_ALLOW_UNKNOWN 0x00002000UL	37	#define F_ALLOW_UNKNOWN 0x00002000UL
37
38	#define F_MAXDEPTH 0xf8000000UL
39	#define S_MAXDEPTH 27
40	#define F_MAXSIZE 0x01f00000UL
41	#define S_MAXSIZE 20
42	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
43		39
44	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
45	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
46
47	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
48	#define F_DEFAULT (9UL << S_MAXDEPTH)
49		41
50	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
51	#define INDENT_STEP 3 // spaces per indentation level	43	#define INDENT_STEP 3 // spaces per indentation level
52		44
53	#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)
54		48
55	#define SB do {	49	#define SB do {
56	#define SE } while (0)	50	#define SE } while (0)
57		51
58	#if __GNUC__ >= 3	52	#if __GNUC__ >= 3
…		…
68		62
69	#define IN_RANGE_INC(type,val,beg,end) \	63	#define IN_RANGE_INC(type,val,beg,end) \
70	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	64	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
71	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	65	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
72		66
		67	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		68
73	#ifdef USE_ITHREADS	69	#ifdef USE_ITHREADS
74	# define JSON_SLOW 1	70	# define JSON_SLOW 1
75	# 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))
76	#else	72	#else
77	# define JSON_SLOW 0	73	# define JSON_SLOW 0
78	# define JSON_STASH json_stash	74	# define JSON_STASH json_stash
79	#endif	75	#endif
80		76
		77	// the amount of HEs to allocate on the stack, when sorting keys
		78	#define STACK_HES 64
		79
81	static HV json_stash, json_boolean_stash; // JSON::XS::	80	static HV json_stash, json_boolean_stash; // JSON::XS::
82	static SV json_true, json_false;	81	static SV json_true, json_false;
83		82
84	enum {	83	enum {
85	INCR_M_WS = 0, // initial whitespace skipping, must be 0	84	INCR_M_WS = 0, // initial whitespace skipping, must be 0
86	INCR_M_STR, // inside string	85	INCR_M_STR, // inside string
87	INCR_M_BS, // inside backslash	86	INCR_M_BS, // inside backslash
		87	INCR_M_C0, // inside comment in initial whitespace sequence
		88	INCR_M_C1, // inside comment in other places
88	INCR_M_JSON // outside anything, count nesting	89	INCR_M_JSON // outside anything, count nesting
89	};	90	};
90		91
91	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	92	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
92		93
93	typedef struct {	94	typedef struct {
94	U32 flags;	95	U32 flags;
		96	U32 max_depth;
		97	STRLEN max_size;
		98
95	SV *cb_object;	99	SV *cb_object;
96	HV *cb_sk_object;	100	HV *cb_sk_object;
97		101
98	// for the incremental parser	102	// for the incremental parser
99	SV *incr_text; // the source text so far	103	SV *incr_text; // the source text so far
100	STRLEN incr_pos; // the current offset into the text	104	STRLEN incr_pos; // the current offset into the text
101	int incr_nest; // {[]}-nesting level	105	int incr_nest; // {[]}-nesting level
102	int incr_mode;	106	unsigned char incr_mode;
103	} JSON;	107	} JSON;
		108
		109	INLINE void
		110	json_init (JSON *json)
		111	{
		112	Zero (json, 1, JSON);
		113	json->max_depth = 512;
		114	}
104		115
105	/////////////////////////////////////////////////////////////////////////////	116	/////////////////////////////////////////////////////////////////////////////
106	// utility functions	117	// utility functions
107		118
108	INLINE SV *	119	INLINE SV *
…		…
118		129
119	INLINE void	130	INLINE void
120	shrink (SV *sv)	131	shrink (SV *sv)
121	{	132	{
122	sv_utf8_downgrade (sv, 1);	133	sv_utf8_downgrade (sv, 1);
		134
123	if (SvLEN (sv) > SvCUR (sv) + 1)	135	if (SvLEN (sv) > SvCUR (sv) + 1)
124	{	136	{
125	#ifdef SvPV_shrink_to_cur	137	#ifdef SvPV_shrink_to_cur
126	SvPV_shrink_to_cur (sv);	138	SvPV_shrink_to_cur (sv);
127	#elif defined (SvPV_renew)	139	#elif defined (SvPV_renew)
…		…
171	*s++ = 0x80 \| ( ch & 0x3f);	183	*s++ = 0x80 \| ( ch & 0x3f);
172		184
173	return s;	185	return s;
174	}	186	}
175		187
		188	// convert offset pointer to character index, sv must be string
		189	static STRLEN
		190	ptr_to_index (SV sv, char offset)
		191	{
		192	return SvUTF8 (sv)
		193	? utf8_distance (offset, SvPVX (sv))
		194	: offset - SvPVX (sv);
		195	}
		196
		197	/////////////////////////////////////////////////////////////////////////////
		198	// fp hell
		199
		200	// scan a group of digits, and a trailing exponent
		201	static void
		202	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		203	{
		204	UV uaccum = 0;
		205	int eaccum = 0;
		206
		207	// if we recurse too deep, skip all remaining digits
		208	// to avoid a stack overflow attack
		209	if (expect_false (--maxdepth <= 0))
		210	while (((U8)*s - '0') < 10)
		211	++s;
		212
		213	for (;;)
		214	{
		215	U8 dig = (U8)*s - '0';
		216
		217	if (expect_false (dig >= 10))
		218	{
		219	if (dig == (U8)((U8)'.' - (U8)'0'))
		220	{
		221	++s;
		222	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		223	}
		224	else if ((dig \| ' ') == 'e' - '0')
		225	{
		226	int exp2 = 0;
		227	int neg = 0;
		228
		229	++s;
		230
		231	if (*s == '-')
		232	{
		233	++s;
		234	neg = 1;
		235	}
		236	else if (*s == '+')
		237	++s;
		238
		239	while ((dig = (U8)*s - '0') < 10)
		240	exp2 = exp2 * 10 + *s++ - '0';
		241
		242	*expo += neg ? -exp2 : exp2;
		243	}
		244
		245	break;
		246	}
		247
		248	++s;
		249
		250	uaccum = uaccum * 10 + dig;
		251	++eaccum;
		252
		253	// if we have too many digits, then recurse for more
		254	// we actually do this for rather few digits
		255	if (uaccum >= (UV_MAX - 9) / 10)
		256	{
		257	if (postdp) *expo -= eaccum;
		258	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		259	if (postdp) *expo += eaccum;
		260
		261	break;
		262	}
		263	}
		264
		265	// this relies greatly on the quality of the pow ()
		266	// implementation of the platform, but a good
		267	// implementation is hard to beat.
		268	// (IEEE 754 conformant ones are required to be exact)
		269	if (postdp) *expo -= eaccum;
		270	accum += uaccum Perl_pow (10., *expo);
		271	*expo += eaccum;
		272	}
		273
		274	static NV
		275	json_atof (const char *s)
		276	{
		277	NV accum = 0.;
		278	int expo = 0;
		279	int neg = 0;
		280
		281	if (*s == '-')
		282	{
		283	++s;
		284	neg = 1;
		285	}
		286
		287	// a recursion depth of ten gives us >>500 bits
		288	json_atof_scan1 (s, &accum, &expo, 0, 10);
		289
		290	return neg ? -accum : accum;
		291	}
176	/////////////////////////////////////////////////////////////////////////////	292	/////////////////////////////////////////////////////////////////////////////
177	// encoder	293	// encoder
178		294
179	// structure used for encoding JSON	295	// structure used for encoding JSON
180	typedef struct	296	typedef struct
…		…
182	char *cur; // SvPVX (sv) + current output position	298	char *cur; // SvPVX (sv) + current output position
183	char *end; // SvEND (sv)	299	char *end; // SvEND (sv)
184	SV *sv; // result scalar	300	SV *sv; // result scalar
185	JSON json;	301	JSON json;
186	U32 indent; // indentation level	302	U32 indent; // indentation level
187	U32 maxdepth; // max. indentation/recursion level
188	UV limit; // escape character values >= this value when encoding	303	UV limit; // escape character values >= this value when encoding
189	} enc_t;	304	} enc_t;
190		305
191	INLINE void	306	INLINE void
192	need (enc_t *enc, STRLEN len)	307	need (enc_t *enc, STRLEN len)
193	{	308	{
194	if (expect_false (enc->cur + len >= enc->end))	309	if (expect_false (enc->cur + len >= enc->end))
195	{	310	{
196	STRLEN cur = enc->cur - SvPVX (enc->sv);	311	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
197	SvGROW (enc->sv, cur + len + 1);	312	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
198	enc->cur = SvPVX (enc->sv) + cur;	313	enc->cur = SvPVX (enc->sv) + cur;
199	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	314	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
200	}	315	}
201	}	316	}
202		317
…		…
277	(int)((uch - 0x10000) % 0x400 + 0xDC00));	392	(int)((uch - 0x10000) % 0x400 + 0xDC00));
278	enc->cur += 12;	393	enc->cur += 12;
279	}	394	}
280	else	395	else
281	{	396	{
282	static char hexdigit [16] = "0123456789abcdef";
283	need (enc, len += 5);	397	need (enc, len += 5);
284	*enc->cur++ = '\\';	398	*enc->cur++ = '\\';
285	*enc->cur++ = 'u';	399	*enc->cur++ = 'u';
286	*enc->cur++ = hexdigit [ uch >> 12 ];	400	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
287	*enc->cur++ = hexdigit [(uch >> 8) & 15];	401	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
288	*enc->cur++ = hexdigit [(uch >> 4) & 15];	402	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
289	*enc->cur++ = hexdigit [(uch >> 0) & 15];	403	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
290	}	404	}
291		405
292	str += clen;	406	str += clen;
293	}	407	}
294	else if (enc->json.flags & F_LATIN1)	408	else if (enc->json.flags & F_LATIN1)
…		…
365	static void	479	static void
366	encode_av (enc_t enc, AV av)	480	encode_av (enc_t enc, AV av)
367	{	481	{
368	int i, len = av_len (av);	482	int i, len = av_len (av);
369		483
370	if (enc->indent >= enc->maxdepth)	484	if (enc->indent >= enc->json.max_depth)
371	croak ("data structure too deep (hit recursion limit)");	485	croak (ERR_NESTING_EXCEEDED);
372		486
373	encode_ch (enc, '[');	487	encode_ch (enc, '[');
374		488
375	if (len >= 0)	489	if (len >= 0)
376	{	490	{
…		…
451	static void	565	static void
452	encode_hv (enc_t enc, HV hv)	566	encode_hv (enc_t enc, HV hv)
453	{	567	{
454	HE *he;	568	HE *he;
455		569
456	if (enc->indent >= enc->maxdepth)	570	if (enc->indent >= enc->json.max_depth)
457	croak ("data structure too deep (hit recursion limit)");	571	croak (ERR_NESTING_EXCEEDED);
458		572
459	encode_ch (enc, '{');	573	encode_ch (enc, '{');
460		574
461	// for canonical output we have to sort by keys first	575	// for canonical output we have to sort by keys first
462	// actually, this is mostly due to the stupid so-called	576	// actually, this is mostly due to the stupid so-called
463	// security workaround added somewhere in 5.8.x.	577	// security workaround added somewhere in 5.8.x
464	// that randomises hash orderings	578	// that randomises hash orderings
465	if (enc->json.flags & F_CANONICAL)	579	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
466	{	580	{
467	int count = hv_iterinit (hv);	581	int count = hv_iterinit (hv);
468		582
469	if (SvMAGICAL (hv))	583	if (SvMAGICAL (hv))
470	{	584	{
…		…
481	}	595	}
482		596
483	if (count)	597	if (count)
484	{	598	{
485	int i, fast = 1;	599	int i, fast = 1;
486	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	600	HE *hes_stack [STACK_HES];
487	HE *hes = _alloca (count sizeof (HE));	601	HE **hes = hes_stack;
488	#else	602
489	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	603	// allocate larger arrays on the heap
490	#endif	604	if (count > STACK_HES)
		605	{
		606	SV sv = sv_2mortal (NEWSV (0, count sizeof (*hes)));
		607	hes = (HE **)SvPVX (sv);
		608	}
491		609
492	i = 0;	610	i = 0;
493	while ((he = hv_iternext (hv)))	611	while ((he = hv_iternext (hv)))
494	{	612	{
495	hes [i++] = he;	613	hes [i++] = he;
…		…
714	}	832	}
715	else	833	else
716	{	834	{
717	// large integer, use the (rather slow) snprintf way.	835	// large integer, use the (rather slow) snprintf way.
718	need (enc, IVUV_MAXCHARS);	836	need (enc, IVUV_MAXCHARS);
719	enc->cur +=	837	enc->cur +=
720	SvIsUV(sv)	838	SvIsUV(sv)
721	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))	839	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
722	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	840	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
723	}	841	}
724	}	842	}
…		…
726	encode_rv (enc, SvRV (sv));	844	encode_rv (enc, SvRV (sv));
727	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)	845	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
728	encode_str (enc, "null", 4, 0);	846	encode_str (enc, "null", 4, 0);
729	else	847	else
730	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	848	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
731	SvPV_nolen (sv), SvFLAGS (sv));	849	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
732	}	850	}
733		851
734	static SV *	852	static SV *
735	encode_json (SV scalar, JSON json)	853	encode_json (SV scalar, JSON json)
736	{	854	{
…		…
742	enc.json = *json;	860	enc.json = *json;
743	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	861	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
744	enc.cur = SvPVX (enc.sv);	862	enc.cur = SvPVX (enc.sv);
745	enc.end = SvEND (enc.sv);	863	enc.end = SvEND (enc.sv);
746	enc.indent = 0;	864	enc.indent = 0;
747	enc.maxdepth = DEC_DEPTH (enc.json.flags);
748	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	865	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
749	: enc.json.flags & F_LATIN1 ? 0x000100UL	866	: enc.json.flags & F_LATIN1 ? 0x000100UL
750	: 0x110000UL;	867	: 0x110000UL;
751		868
752	SvPOK_only (enc.sv);	869	SvPOK_only (enc.sv);
753	encode_sv (&enc, scalar);	870	encode_sv (&enc, scalar);
		871	encode_nl (&enc);
754		872
755	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	873	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
756	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	874	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
757		875
758	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	876	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
819	if (*dec->cur != ch) \	937	if (*dec->cur != ch) \
820	ERR (# ch " expected"); \	938	ERR (# ch " expected"); \
821	++dec->cur; \	939	++dec->cur; \
822	SE	940	SE
823		941
824	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	942	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
825	#define DEC_DEC_DEPTH --dec->depth	943	#define DEC_DEC_DEPTH --dec->depth
826		944
827	static SV decode_sv (dec_t dec);	945	static SV decode_sv (dec_t dec);
828		946
829	static signed char decode_hexdigit[256];	947	static signed char decode_hexdigit[256];
…		…
938	else if (expect_true (ch >= 0x20 && ch < 0x80))	1056	else if (expect_true (ch >= 0x20 && ch < 0x80))
939	*cur++ = ch;	1057	*cur++ = ch;
940	else if (ch >= 0x80)	1058	else if (ch >= 0x80)
941	{	1059	{
942	STRLEN clen;	1060	STRLEN clen;
943	UV uch;
944		1061
945	--dec_cur;	1062	--dec_cur;
946		1063
947	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1064	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
948	if (clen == (STRLEN)-1)	1065	if (clen == (STRLEN)-1)
949	ERR ("malformed UTF-8 character in JSON string");	1066	ERR ("malformed UTF-8 character in JSON string");
950		1067
951	do	1068	do
952	cur++ = dec_cur++;	1069	cur++ = dec_cur++;
…		…
969	{	1086	{
970	STRLEN len = cur - buf;	1087	STRLEN len = cur - buf;
971		1088
972	if (sv)	1089	if (sv)
973	{	1090	{
974	SvGROW (sv, SvCUR (sv) + len + 1);	1091	STRLEN cur = SvCUR (sv);
		1092
		1093	if (SvLEN (sv) <= cur + len)
		1094	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1095
975	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1096	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
976	SvCUR_set (sv, SvCUR (sv) + len);	1097	SvCUR_set (sv, SvCUR (sv) + len);
977	}	1098	}
978	else	1099	else
979	sv = newSVpvn (buf, len);	1100	sv = newSVpvn (buf, len);
…		…
1070		1191
1071	// special case the rather common 1..5-digit-int case	1192	// special case the rather common 1..5-digit-int case
1072	if (*start == '-')	1193	if (*start == '-')
1073	switch (len)	1194	switch (len)
1074	{	1195	{
1075	case 2: return newSViv (-( start [1] - '0' * 1));	1196	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1076	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1197	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1077	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1198	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1078	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1199	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1079	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1200	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1080	}	1201	}
1081	else	1202	else
1082	switch (len)	1203	switch (len)
1083	{	1204	{
1084	case 1: return newSViv ( start [0] - '0' * 1);	1205	case 1: return newSViv ( start [0] - '0' * 1);
1085	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1206	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1086	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1207	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1087	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1208	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1088	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1209	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1089	}	1210	}
1090		1211
1091	{	1212	{
1092	UV uv;	1213	UV uv;
1093	int numtype = grok_number (start, len, &uv);	1214	int numtype = grok_number (start, len, &uv);
…		…
1102	}	1223	}
1103		1224
1104	len -= *start == '-' ? 1 : 0;	1225	len -= *start == '-' ? 1 : 0;
1105		1226
1106	// does not fit into IV or UV, try NV	1227	// does not fit into IV or UV, try NV
1107	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1228	if (len <= NV_DIG)
1108	#if defined (LDBL_DIG)
1109	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1110	#endif
1111	)
1112	// fits into NV without loss of precision	1229	// fits into NV without loss of precision
1113	return newSVnv (Atof (start));	1230	return newSVnv (json_atof (start));
1114		1231
1115	// everything else fails, convert it to a string	1232	// everything else fails, convert it to a string
1116	return newSVpvn (start, dec->cur - start);	1233	return newSVpvn (start, dec->cur - start);
1117	}	1234	}
1118		1235
1119	// loss of precision here	1236	// loss of precision here
1120	return newSVnv (Atof (start));	1237	return newSVnv (json_atof (start));
1121		1238
1122	fail:	1239	fail:
1123	return 0;	1240	return 0;
1124	}	1241	}
1125		1242
…		…
1294	dSP;	1411	dSP;
1295	int count;	1412	int count;
1296		1413
1297	ENTER; SAVETMPS; PUSHMARK (SP);	1414	ENTER; SAVETMPS; PUSHMARK (SP);
1298	XPUSHs (HeVAL (he));	1415	XPUSHs (HeVAL (he));
		1416	sv_2mortal (sv);
1299		1417
1300	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1418	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1301		1419
1302	if (count == 1)	1420	if (count == 1)
1303	{	1421	{
1304	sv = newSVsv (POPs);	1422	sv = newSVsv (POPs);
1305	FREETMPS; LEAVE;	1423	FREETMPS; LEAVE;
1306	return sv;	1424	return sv;
1307	}	1425	}
1308		1426
		1427	SvREFCNT_inc (sv);
1309	FREETMPS; LEAVE;	1428	FREETMPS; LEAVE;
1310	}	1429	}
1311	}	1430	}
1312		1431
1313	if (dec->json.cb_object)	1432	if (dec->json.cb_object)
…		…
1403	fail:	1522	fail:
1404	return 0;	1523	return 0;
1405	}	1524	}
1406		1525
1407	static SV *	1526	static SV *
1408	decode_json (SV string, JSON json, STRLEN *offset_return)	1527	decode_json (SV string, JSON json, char **offset_return)
1409	{	1528	{
1410	dec_t dec;	1529	dec_t dec;
1411	STRLEN offset;
1412	SV *sv;	1530	SV *sv;
1413		1531
		1532	/* work around bugs in 5.10 where manipulating magic values
		1533	* will perl ignore the magic in subsequent accesses.
		1534	* also make a copy of non-PV values, to get them into a clean
		1535	* state (SvPV should do that, but it's buggy, see below).
		1536	*/
1414	SvGETMAGIC (string);	1537	/SvGETMAGIC (string);/
		1538	if (SvMAGICAL (string) \|\| !SvPOK (string))
		1539	string = sv_2mortal (newSVsv (string));
		1540
1415	SvUPGRADE (string, SVt_PV);	1541	SvUPGRADE (string, SVt_PV);
1416		1542
1417	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1543	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1544	* assertion with -DDEBUGGING, although SvCUR is documented to
		1545	* return the xpv_cur field which certainly exists after upgrading.
		1546	* according to nicholas clark, calling SvPOK fixes this.
		1547	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1548	* and hope for the best.
		1549	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1550	* assertion business is seriously broken, try yet another workaround
		1551	* for the broken -DDEBUGGING.
		1552	*/
		1553	{
		1554	#ifdef DEBUGGING
		1555	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1556	#else
		1557	STRLEN offset = SvCUR (string);
		1558	#endif
		1559
		1560	if (offset > json->max_size && json->max_size)
1418	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1561	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1419	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1562	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1563	}
1420		1564
1421	if (json->flags & F_UTF8)	1565	if (DECODE_WANTS_OCTETS (json))
1422	sv_utf8_downgrade (string, 0);	1566	sv_utf8_downgrade (string, 0);
1423	else	1567	else
1424	sv_utf8_upgrade (string);	1568	sv_utf8_upgrade (string);
1425		1569
1426	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1570	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1427		1571
1428	dec.json = *json;	1572	dec.json = *json;
1429	dec.cur = SvPVX (string);	1573	dec.cur = SvPVX (string);
1430	dec.end = SvEND (string);	1574	dec.end = SvEND (string);
1431	dec.err = 0;	1575	dec.err = 0;
1432	dec.depth = 0;	1576	dec.depth = 0;
1433	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1434		1577
1435	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1578	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1436	dec.json.flags \|= F_HOOK;	1579	dec.json.flags \|= F_HOOK;
1437		1580
1438	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1581	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1439		1582
1440	decode_ws (&dec);	1583	decode_ws (&dec);
1441	sv = decode_sv (&dec);	1584	sv = decode_sv (&dec);
		1585
		1586	if (offset_return)
		1587	*offset_return = dec.cur;
1442		1588
1443	if (!(offset_return \|\| !sv))	1589	if (!(offset_return \|\| !sv))
1444	{	1590	{
1445	// check for trailing garbage	1591	// check for trailing garbage
1446	decode_ws (&dec);	1592	decode_ws (&dec);
…		…
1449	{	1595	{
1450	dec.err = "garbage after JSON object";	1596	dec.err = "garbage after JSON object";
1451	SvREFCNT_dec (sv);	1597	SvREFCNT_dec (sv);
1452	sv = 0;	1598	sv = 0;
1453	}	1599	}
1454	}
1455
1456	if (offset_return \|\| !sv)
1457	{
1458	offset = dec.json.flags & F_UTF8
1459	? dec.cur - SvPVX (string)
1460	: utf8_distance (dec.cur, SvPVX (string));
1461
1462	if (offset_return)
1463	*offset_return = offset;
1464	}	1600	}
1465		1601
1466	if (!sv)	1602	if (!sv)
1467	{	1603	{
1468	SV *uni = sv_newmortal ();	1604	SV *uni = sv_newmortal ();
…		…
1474	SAVEVPTR (PL_curcop);	1610	SAVEVPTR (PL_curcop);
1475	PL_curcop = &cop;	1611	PL_curcop = &cop;
1476	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1612	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1477	LEAVE;	1613	LEAVE;
1478		1614
1479	croak ("%s, at character offset %d [\"%s\"]",	1615	croak ("%s, at character offset %d (before \"%s\")",
1480	dec.err,	1616	dec.err,
1481	(int)offset,	1617	(int)ptr_to_index (string, dec.cur),
1482	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1618	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1483	}	1619	}
1484		1620
1485	sv = sv_2mortal (sv);	1621	sv = sv_2mortal (sv);
1486		1622
…		…
1495		1631
1496	static void	1632	static void
1497	incr_parse (JSON *self)	1633	incr_parse (JSON *self)
1498	{	1634	{
1499	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1635	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1636
		1637	// the state machine here is a bit convoluted and could be simplified a lot
		1638	// but this would make it slower, so...
1500		1639
1501	for (;;)	1640	for (;;)
1502	{	1641	{
1503	//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	1642	//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
1504	switch (self->incr_mode)	1643	switch (self->incr_mode)
1505	{	1644	{
1506	// only used for intiial whitespace skipping	1645	// only used for initial whitespace skipping
1507	case INCR_M_WS:	1646	case INCR_M_WS:
1508	for (;;)	1647	for (;;)
1509	{	1648	{
1510	if (*p > 0x20)	1649	if (*p > 0x20)
1511	{	1650	{
		1651	if (*p == '#')
		1652	{
		1653	self->incr_mode = INCR_M_C0;
		1654	goto incr_m_c;
		1655	}
		1656	else
		1657	{
1512	self->incr_mode = INCR_M_JSON;	1658	self->incr_mode = INCR_M_JSON;
1513	goto incr_m_json;	1659	goto incr_m_json;
		1660	}
1514	}	1661	}
1515	else if (!*p)	1662	else if (!*p)
1516	goto interrupt;	1663	goto interrupt;
1517		1664
1518	++p;	1665	++p;
…		…
1524	goto interrupt;	1671	goto interrupt;
1525		1672
1526	++p;	1673	++p;
1527	self->incr_mode = INCR_M_STR;	1674	self->incr_mode = INCR_M_STR;
1528	goto incr_m_str;	1675	goto incr_m_str;
		1676
		1677	// inside #-style comments
		1678	case INCR_M_C0:
		1679	case INCR_M_C1:
		1680	incr_m_c:
		1681	for (;;)
		1682	{
		1683	if (*p == '\n')
		1684	{
		1685	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1686	break;
		1687	}
		1688	else if (!*p)
		1689	goto interrupt;
		1690
		1691	++p;
		1692	}
		1693
		1694	break;
1529		1695
1530	// inside a string	1696	// inside a string
1531	case INCR_M_STR:	1697	case INCR_M_STR:
1532	incr_m_str:	1698	incr_m_str:
1533	for (;;)	1699	for (;;)
…		…
1584	self->incr_mode = INCR_M_STR;	1750	self->incr_mode = INCR_M_STR;
1585	goto incr_m_str;	1751	goto incr_m_str;
1586		1752
1587	case '[':	1753	case '[':
1588	case '{':	1754	case '{':
1589	++self->incr_nest;	1755	if (++self->incr_nest > self->max_depth)
		1756	croak (ERR_NESTING_EXCEEDED);
1590	break;	1757	break;
1591		1758
1592	case ']':	1759	case ']':
1593	case '}':	1760	case '}':
1594	if (!--self->incr_nest)	1761	if (--self->incr_nest <= 0)
1595	goto interrupt;	1762	goto interrupt;
		1763	break;
		1764
		1765	case '#':
		1766	self->incr_mode = INCR_M_C1;
		1767	goto incr_m_c;
1596	}	1768	}
1597	}	1769	}
1598	}	1770	}
1599		1771
1600	modechange:	1772	modechange:
1601	;	1773	;
1602	}	1774	}
1603		1775
1604	interrupt:	1776	interrupt:
1605	self->incr_pos = p - SvPVX (self->incr_text);	1777	self->incr_pos = p - SvPVX (self->incr_text);
		1778	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1606	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1779	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1607	}	1780	}
1608		1781
1609	/////////////////////////////////////////////////////////////////////////////	1782	/////////////////////////////////////////////////////////////////////////////
1610	// XS interface functions	1783	// XS interface functions
…		…
1625	json_stash = gv_stashpv ("JSON::XS" , 1);	1798	json_stash = gv_stashpv ("JSON::XS" , 1);
1626	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1799	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1627		1800
1628	json_true = get_bool ("JSON::XS::true");	1801	json_true = get_bool ("JSON::XS::true");
1629	json_false = get_bool ("JSON::XS::false");	1802	json_false = get_bool ("JSON::XS::false");
		1803
		1804	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1630	}	1805	}
1631		1806
1632	PROTOTYPES: DISABLE	1807	PROTOTYPES: DISABLE
1633		1808
1634	void CLONE (...)	1809	void CLONE (...)
…		…
1637	json_boolean_stash = 0;	1812	json_boolean_stash = 0;
1638		1813
1639	void new (char *klass)	1814	void new (char *klass)
1640	PPCODE:	1815	PPCODE:
1641	{	1816	{
1642	SV *pv = NEWSV (0, sizeof (JSON));	1817	SV *pv = NEWSV (0, sizeof (JSON));
1643	SvPOK_only (pv);	1818	SvPOK_only (pv);
1644	Zero (SvPVX (pv), 1, JSON);	1819	json_init ((JSON *)SvPVX (pv));
1645	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1646	XPUSHs (sv_2mortal (sv_bless (	1820	XPUSHs (sv_2mortal (sv_bless (
1647	newRV_noinc (pv),	1821	newRV_noinc (pv),
1648	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1822	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1649	)));	1823	)));
1650	}	1824	}
…		…
1691	get_relaxed = F_RELAXED	1865	get_relaxed = F_RELAXED
1692	get_allow_unknown = F_ALLOW_UNKNOWN	1866	get_allow_unknown = F_ALLOW_UNKNOWN
1693	PPCODE:	1867	PPCODE:
1694	XPUSHs (boolSV (self->flags & ix));	1868	XPUSHs (boolSV (self->flags & ix));
1695		1869
1696	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1870	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1697	PPCODE:	1871	PPCODE:
1698	{	1872	self->max_depth = max_depth;
1699	UV log2 = 0;
1700
1701	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1702
1703	while ((1UL << log2) < max_depth)
1704	++log2;
1705
1706	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1707
1708	XPUSHs (ST (0));	1873	XPUSHs (ST (0));
1709	}
1710		1874
1711	U32 get_max_depth (JSON *self)	1875	U32 get_max_depth (JSON *self)
1712	CODE:	1876	CODE:
1713	RETVAL = DEC_DEPTH (self->flags);	1877	RETVAL = self->max_depth;
1714	OUTPUT:	1878	OUTPUT:
1715	RETVAL	1879	RETVAL
1716		1880
1717	void max_size (JSON *self, UV max_size = 0)	1881	void max_size (JSON *self, U32 max_size = 0)
1718	PPCODE:	1882	PPCODE:
1719	{	1883	self->max_size = max_size;
1720	UV log2 = 0;
1721
1722	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1723	if (max_size == 1) max_size = 2;
1724
1725	while ((1UL << log2) < max_size)
1726	++log2;
1727
1728	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1729
1730	XPUSHs (ST (0));	1884	XPUSHs (ST (0));
1731	}
1732		1885
1733	int get_max_size (JSON *self)	1886	int get_max_size (JSON *self)
1734	CODE:	1887	CODE:
1735	RETVAL = DEC_SIZE (self->flags);	1888	RETVAL = self->max_size;
1736	OUTPUT:	1889	OUTPUT:
1737	RETVAL	1890	RETVAL
1738		1891
1739	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1892	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1740	PPCODE:	1893	PPCODE:
…		…
1746	}	1899	}
1747		1900
1748	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)	1901	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1749	PPCODE:	1902	PPCODE:
1750	{	1903	{
1751	if (!self->cb_sk_object)	1904	if (!self->cb_sk_object)
1752	self->cb_sk_object = newHV ();	1905	self->cb_sk_object = newHV ();
1753		1906
1754	if (SvOK (cb))	1907	if (SvOK (cb))
1755	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);	1908	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1756	else	1909	else
…		…
1767	XPUSHs (ST (0));	1920	XPUSHs (ST (0));
1768	}	1921	}
1769		1922
1770	void encode (JSON self, SV scalar)	1923	void encode (JSON self, SV scalar)
1771	PPCODE:	1924	PPCODE:
1772	XPUSHs (encode_json (scalar, self));	1925	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		1926	XPUSHs (scalar);
1773		1927
1774	void decode (JSON self, SV jsonstr)	1928	void decode (JSON self, SV jsonstr)
1775	PPCODE:	1929	PPCODE:
1776	XPUSHs (decode_json (jsonstr, self, 0));	1930	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		1931	XPUSHs (jsonstr);
1777		1932
1778	void decode_prefix (JSON self, SV jsonstr)	1933	void decode_prefix (JSON self, SV jsonstr)
1779	PPCODE:	1934	PPCODE:
1780	{	1935	{
1781	STRLEN offset;	1936	SV *sv;
		1937	char *offset;
		1938	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1782	EXTEND (SP, 2);	1939	EXTEND (SP, 2);
1783	PUSHs (decode_json (jsonstr, self, &offset));	1940	PUSHs (sv);
1784	PUSHs (sv_2mortal (newSVuv (offset)));	1941	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1785	}	1942	}
1786		1943
1787	void incr_parse (JSON self, SV jsonstr = 0)	1944	void incr_parse (JSON self, SV jsonstr = 0)
1788	PPCODE:	1945	PPCODE:
1789	{	1946	{
1790	if (!self->incr_text)	1947	if (!self->incr_text)
1791	self->incr_text = newSVpvn ("", 0);	1948	self->incr_text = newSVpvn ("", 0);
		1949
		1950	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		1951	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		1952	if (DECODE_WANTS_OCTETS (self))
		1953	{
		1954	if (self->incr_pos)
		1955	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		1956	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		1957
		1958	sv_utf8_downgrade (self->incr_text, 0);
		1959	}
		1960	else
		1961	{
		1962	sv_utf8_upgrade (self->incr_text);
		1963
		1964	if (self->incr_pos)
		1965	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1966	- (U8 *)SvPVX (self->incr_text);
		1967	}
1792		1968
1793	// append data, if any	1969	// append data, if any
1794	if (jsonstr)	1970	if (jsonstr)
1795	{	1971	{
		1972	/* make sure both strings have same encoding */
1796	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1973	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		1974	if (SvUTF8 (jsonstr))
		1975	sv_utf8_downgrade (jsonstr, 0);
1797	{	1976	else
1798	/* utf-8-ness differs, need to upgrade */
1799	sv_utf8_upgrade (self->incr_text);	1977	sv_utf8_upgrade (jsonstr);
1800		1978
1801	if (self->incr_pos)	1979	/* and then just blindly append */
1802	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1803	- (U8 *)SvPVX (self->incr_text);
1804	}
1805
1806	{	1980	{
1807	STRLEN len;	1981	STRLEN len;
1808	const char *str = SvPV (jsonstr, len);	1982	const char *str = SvPV (jsonstr, len);
1809	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	1983	STRLEN cur = SvCUR (self->incr_text);
		1984
		1985	if (SvLEN (self->incr_text) <= cur + len)
		1986	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1987
1810	Move (str, SvEND (self->incr_text), len, char);	1988	Move (str, SvEND (self->incr_text), len, char);
1811	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1989	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1812	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	1990	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1813	}	1991	}
1814	}	1992	}
1815		1993
1816	if (GIMME_V != G_VOID)	1994	if (GIMME_V != G_VOID)
1817	do	1995	do
1818	{	1996	{
		1997	SV *sv;
1819	STRLEN offset;	1998	char *offset;
1820		1999
1821	if (!INCR_DONE (self))	2000	if (!INCR_DONE (self))
1822	{	2001	{
1823	incr_parse (self);	2002	incr_parse (self);
		2003
		2004	if (self->incr_pos > self->max_size && self->max_size)
		2005	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		2006	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		2007
1824	if (!INCR_DONE (self))	2008	if (!INCR_DONE (self))
		2009	{
		2010	// as an optimisation, do not accumulate white space in the incr buffer
		2011	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2012	{
		2013	self->incr_pos = 0;
		2014	SvCUR_set (self->incr_text, 0);
		2015	}
		2016
1825	break;	2017	break;
		2018	}
1826	}	2019	}
1827		2020
1828	XPUSHs (decode_json (self->incr_text, self, &offset));	2021	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2022	XPUSHs (sv);
1829		2023
1830	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1831	self->incr_pos -= offset;	2024	self->incr_pos -= offset - SvPVX (self->incr_text);
1832	self->incr_nest = 0;	2025	self->incr_nest = 0;
1833	self->incr_mode = 0;	2026	self->incr_mode = 0;
		2027
		2028	sv_chop (self->incr_text, offset);
1834	}	2029	}
1835	while (GIMME_V == G_ARRAY);	2030	while (GIMME_V == G_ARRAY);
1836	}	2031	}
1837		2032
1838	SV incr_text (JSON self)	2033	SV incr_text (JSON self)
…		…
1857	self->incr_nest = 0;	2052	self->incr_nest = 0;
1858	self->incr_mode = 0;	2053	self->incr_mode = 0;
1859	}	2054	}
1860	}	2055	}
1861		2056
		2057	void incr_reset (JSON *self)
		2058	CODE:
		2059	{
		2060	SvREFCNT_dec (self->incr_text);
		2061	self->incr_text = 0;
		2062	self->incr_pos = 0;
		2063	self->incr_nest = 0;
		2064	self->incr_mode = 0;
		2065	}
		2066
1862	void DESTROY (JSON *self)	2067	void DESTROY (JSON *self)
1863	CODE:	2068	CODE:
1864	SvREFCNT_dec (self->cb_sk_object);	2069	SvREFCNT_dec (self->cb_sk_object);
1865	SvREFCNT_dec (self->cb_object);	2070	SvREFCNT_dec (self->cb_object);
1866	SvREFCNT_dec (self->incr_text);	2071	SvREFCNT_dec (self->incr_text);
…		…
1871	ALIAS:	2076	ALIAS:
1872	to_json_ = 0	2077	to_json_ = 0
1873	encode_json = F_UTF8	2078	encode_json = F_UTF8
1874	PPCODE:	2079	PPCODE:
1875	{	2080	{
1876	JSON json = { F_DEFAULT \| ix };	2081	JSON json;
1877	XPUSHs (encode_json (scalar, &json));	2082	json_init (&json);
		2083	json.flags \|= ix;
		2084	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2085	XPUSHs (scalar);
1878	}	2086	}
1879		2087
1880	void decode_json (SV *jsonstr)	2088	void decode_json (SV *jsonstr)
1881	ALIAS:	2089	ALIAS:
1882	from_json_ = 0	2090	from_json_ = 0
1883	decode_json = F_UTF8	2091	decode_json = F_UTF8
1884	PPCODE:	2092	PPCODE:
1885	{	2093	{
1886	JSON json = { F_DEFAULT \| ix };	2094	JSON json;
1887	XPUSHs (decode_json (jsonstr, &json, 0));	2095	json_init (&json);
		2096	json.flags \|= ix;
		2097	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2098	XPUSHs (jsonstr);
1888	}	2099	}
1889		2100
1890

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC vs. Revision 1.115 by root, Fri Dec 21 05:16:19 2012 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC vs.
Revision 1.115 by root, Fri Dec 21 05:16:19 2012 UTC