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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs.
Revision 1.112 by root, Thu Aug 11 17:06:53 2011 UTC

…		…
12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
13	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
14	#endif	14	#endif
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
20	#endif	20	#endif
21		21
		22	// three extra for rounding, sign, and end of string
22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23		24
24	#define F_ASCII 0x00000001UL	25	#define F_ASCII 0x00000001UL
25	#define F_LATIN1 0x00000002UL	26	#define F_LATIN1 0x00000002UL
26	#define F_UTF8 0x00000004UL	27	#define F_UTF8 0x00000004UL
27	#define F_INDENT 0x00000008UL	28	#define F_INDENT 0x00000008UL
…		…
31	#define F_ALLOW_NONREF 0x00000100UL	32	#define F_ALLOW_NONREF 0x00000100UL
32	#define F_SHRINK 0x00000200UL	33	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	34	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	35	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	36	#define F_RELAXED 0x00001000UL
36		37	#define F_ALLOW_UNKNOWN 0x00002000UL
37	#define F_MAXDEPTH 0xf8000000UL
38	#define S_MAXDEPTH 27
39	#define F_MAXSIZE 0x01f00000UL
40	#define S_MAXSIZE 20
41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42		39
43	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
47	#define F_DEFAULT (9UL << S_MAXDEPTH)
48		41
49	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
50	#define INDENT_STEP 3 // spaces per indentation level	43	#define INDENT_STEP 3 // spaces per indentation level
51		44
52	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		46
		47	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
53		48
54	#define SB do {	49	#define SB do {
55	#define SE } while (0)	50	#define SE } while (0)
56		51
57	#if __GNUC__ >= 3	52	#if __GNUC__ >= 3
…		…
67		62
68	#define IN_RANGE_INC(type,val,beg,end) \	63	#define IN_RANGE_INC(type,val,beg,end) \
69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	64	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	65	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71		66
		67	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		68
72	#ifdef USE_ITHREADS	69	#ifdef USE_ITHREADS
73	# define JSON_SLOW 1	70	# define JSON_SLOW 1
74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	71	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75	#else	72	#else
76	# define JSON_SLOW 0	73	# define JSON_SLOW 0
…		…
82		79
83	enum {	80	enum {
84	INCR_M_WS = 0, // initial whitespace skipping, must be 0	81	INCR_M_WS = 0, // initial whitespace skipping, must be 0
85	INCR_M_STR, // inside string	82	INCR_M_STR, // inside string
86	INCR_M_BS, // inside backslash	83	INCR_M_BS, // inside backslash
		84	INCR_M_C0, // inside comment in initial whitespace sequence
		85	INCR_M_C1, // inside comment in other places
87	INCR_M_JSON // outside anything, count nesting	86	INCR_M_JSON // outside anything, count nesting
88	};	87	};
89		88
90	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	89	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91		90
92	typedef struct {	91	typedef struct {
93	U32 flags;	92	U32 flags;
		93	U32 max_depth;
		94	STRLEN max_size;
		95
94	SV *cb_object;	96	SV *cb_object;
95	HV *cb_sk_object;	97	HV *cb_sk_object;
96		98
97	// for the incremental parser	99	// for the incremental parser
98	SV *incr_text; // the source text so far	100	SV *incr_text; // the source text so far
99	STRLEN incr_pos; // the current offset into the text	101	STRLEN incr_pos; // the current offset into the text
100	int incr_nest; // {[]}-nesting level	102	int incr_nest; // {[]}-nesting level
101	int incr_mode;	103	unsigned char incr_mode;
102	} JSON;	104	} JSON;
		105
		106	INLINE void
		107	json_init (JSON *json)
		108	{
		109	Zero (json, 1, JSON);
		110	json->max_depth = 512;
		111	}
103		112
104	/////////////////////////////////////////////////////////////////////////////	113	/////////////////////////////////////////////////////////////////////////////
105	// utility functions	114	// utility functions
106		115
107	INLINE SV *	116	INLINE SV *
…		…
117		126
118	INLINE void	127	INLINE void
119	shrink (SV *sv)	128	shrink (SV *sv)
120	{	129	{
121	sv_utf8_downgrade (sv, 1);	130	sv_utf8_downgrade (sv, 1);
		131
122	if (SvLEN (sv) > SvCUR (sv) + 1)	132	if (SvLEN (sv) > SvCUR (sv) + 1)
123	{	133	{
124	#ifdef SvPV_shrink_to_cur	134	#ifdef SvPV_shrink_to_cur
125	SvPV_shrink_to_cur (sv);	135	SvPV_shrink_to_cur (sv);
126	#elif defined (SvPV_renew)	136	#elif defined (SvPV_renew)
…		…
170	*s++ = 0x80 \| ( ch & 0x3f);	180	*s++ = 0x80 \| ( ch & 0x3f);
171		181
172	return s;	182	return s;
173	}	183	}
174		184
		185	// convert offset pointer to character index, sv must be string
		186	static STRLEN
		187	ptr_to_index (SV sv, char offset)
		188	{
		189	return SvUTF8 (sv)
		190	? utf8_distance (offset, SvPVX (sv))
		191	: offset - SvPVX (sv);
		192	}
		193
		194	/////////////////////////////////////////////////////////////////////////////
		195	// fp hell
		196
		197	// scan a group of digits, and a trailing exponent
		198	static void
		199	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		200	{
		201	UV uaccum = 0;
		202	int eaccum = 0;
		203
		204	// if we recurse too deep, skip all remaining digits
		205	// to avoid a stack overflow attack
		206	if (expect_false (--maxdepth <= 0))
		207	while (((U8)*s - '0') < 10)
		208	++s;
		209
		210	for (;;)
		211	{
		212	U8 dig = (U8)*s - '0';
		213
		214	if (expect_false (dig >= 10))
		215	{
		216	if (dig == (U8)((U8)'.' - (U8)'0'))
		217	{
		218	++s;
		219	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		220	}
		221	else if ((dig \| ' ') == 'e' - '0')
		222	{
		223	int exp2 = 0;
		224	int neg = 0;
		225
		226	++s;
		227
		228	if (*s == '-')
		229	{
		230	++s;
		231	neg = 1;
		232	}
		233	else if (*s == '+')
		234	++s;
		235
		236	while ((dig = (U8)*s - '0') < 10)
		237	exp2 = exp2 * 10 + *s++ - '0';
		238
		239	*expo += neg ? -exp2 : exp2;
		240	}
		241
		242	break;
		243	}
		244
		245	++s;
		246
		247	uaccum = uaccum * 10 + dig;
		248	++eaccum;
		249
		250	// if we have too many digits, then recurse for more
		251	// we actually do this for rather few digits
		252	if (uaccum >= (UV_MAX - 9) / 10)
		253	{
		254	if (postdp) *expo -= eaccum;
		255	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		256	if (postdp) *expo += eaccum;
		257
		258	break;
		259	}
		260	}
		261
		262	// this relies greatly on the quality of the pow ()
		263	// implementation of the platform, but a good
		264	// implementation is hard to beat.
		265	// (IEEE 754 conformant ones are required to be exact)
		266	if (postdp) *expo -= eaccum;
		267	accum += uaccum Perl_pow (10., *expo);
		268	*expo += eaccum;
		269	}
		270
		271	static NV
		272	json_atof (const char *s)
		273	{
		274	NV accum = 0.;
		275	int expo = 0;
		276	int neg = 0;
		277
		278	if (*s == '-')
		279	{
		280	++s;
		281	neg = 1;
		282	}
		283
		284	// a recursion depth of ten gives us >>500 bits
		285	json_atof_scan1 (s, &accum, &expo, 0, 10);
		286
		287	return neg ? -accum : accum;
		288	}
175	/////////////////////////////////////////////////////////////////////////////	289	/////////////////////////////////////////////////////////////////////////////
176	// encoder	290	// encoder
177		291
178	// structure used for encoding JSON	292	// structure used for encoding JSON
179	typedef struct	293	typedef struct
…		…
181	char *cur; // SvPVX (sv) + current output position	295	char *cur; // SvPVX (sv) + current output position
182	char *end; // SvEND (sv)	296	char *end; // SvEND (sv)
183	SV *sv; // result scalar	297	SV *sv; // result scalar
184	JSON json;	298	JSON json;
185	U32 indent; // indentation level	299	U32 indent; // indentation level
186	U32 maxdepth; // max. indentation/recursion level
187	UV limit; // escape character values >= this value when encoding	300	UV limit; // escape character values >= this value when encoding
188	} enc_t;	301	} enc_t;
189		302
190	INLINE void	303	INLINE void
191	need (enc_t *enc, STRLEN len)	304	need (enc_t *enc, STRLEN len)
192	{	305	{
193	if (expect_false (enc->cur + len >= enc->end))	306	if (expect_false (enc->cur + len >= enc->end))
194	{	307	{
195	STRLEN cur = enc->cur - SvPVX (enc->sv);	308	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
196	SvGROW (enc->sv, cur + len + 1);	309	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
197	enc->cur = SvPVX (enc->sv) + cur;	310	enc->cur = SvPVX (enc->sv) + cur;
198	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	311	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
199	}	312	}
200	}	313	}
201		314
…		…
276	(int)((uch - 0x10000) % 0x400 + 0xDC00));	389	(int)((uch - 0x10000) % 0x400 + 0xDC00));
277	enc->cur += 12;	390	enc->cur += 12;
278	}	391	}
279	else	392	else
280	{	393	{
281	static char hexdigit [16] = "0123456789abcdef";
282	need (enc, len += 5);	394	need (enc, len += 5);
283	*enc->cur++ = '\\';	395	*enc->cur++ = '\\';
284	*enc->cur++ = 'u';	396	*enc->cur++ = 'u';
285	*enc->cur++ = hexdigit [ uch >> 12 ];	397	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
286	*enc->cur++ = hexdigit [(uch >> 8) & 15];	398	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
287	*enc->cur++ = hexdigit [(uch >> 4) & 15];	399	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
288	*enc->cur++ = hexdigit [(uch >> 0) & 15];	400	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
289	}	401	}
290		402
291	str += clen;	403	str += clen;
292	}	404	}
293	else if (enc->json.flags & F_LATIN1)	405	else if (enc->json.flags & F_LATIN1)
…		…
364	static void	476	static void
365	encode_av (enc_t enc, AV av)	477	encode_av (enc_t enc, AV av)
366	{	478	{
367	int i, len = av_len (av);	479	int i, len = av_len (av);
368		480
369	if (enc->indent >= enc->maxdepth)	481	if (enc->indent >= enc->json.max_depth)
370	croak ("data structure too deep (hit recursion limit)");	482	croak (ERR_NESTING_EXCEEDED);
371		483
372	encode_ch (enc, '[');	484	encode_ch (enc, '[');
373		485
374	if (len >= 0)	486	if (len >= 0)
375	{	487	{
…		…
450	static void	562	static void
451	encode_hv (enc_t enc, HV hv)	563	encode_hv (enc_t enc, HV hv)
452	{	564	{
453	HE *he;	565	HE *he;
454		566
455	if (enc->indent >= enc->maxdepth)	567	if (enc->indent >= enc->json.max_depth)
456	croak ("data structure too deep (hit recursion limit)");	568	croak (ERR_NESTING_EXCEEDED);
457		569
458	encode_ch (enc, '{');	570	encode_ch (enc, '{');
459		571
460	// for canonical output we have to sort by keys first	572	// for canonical output we have to sort by keys first
461	// actually, this is mostly due to the stupid so-called	573	// actually, this is mostly due to the stupid so-called
462	// security workaround added somewhere in 5.8.x.	574	// security workaround added somewhere in 5.8.x
463	// that randomises hash orderings	575	// that randomises hash orderings
464	if (enc->json.flags & F_CANONICAL)	576	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
465	{	577	{
466	int count = hv_iterinit (hv);	578	int count = hv_iterinit (hv);
467		579
468	if (SvMAGICAL (hv))	580	if (SvMAGICAL (hv))
469	{	581	{
…		…
642		754
643	if (len == 1 && *pv == '1')	755	if (len == 1 && *pv == '1')
644	encode_str (enc, "true", 4, 0);	756	encode_str (enc, "true", 4, 0);
645	else if (len == 1 && *pv == '0')	757	else if (len == 1 && *pv == '0')
646	encode_str (enc, "false", 5, 0);	758	encode_str (enc, "false", 5, 0);
		759	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		760	encode_str (enc, "null", 4, 0);
647	else	761	else
648	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	762	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
649	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	763	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
650	}	764	}
		765	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		766	encode_str (enc, "null", 4, 0);
651	else	767	else
652	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	768	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
653	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	769	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
654	}	770	}
655		771
…		…
717	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	833	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
718	}	834	}
719	}	835	}
720	else if (SvROK (sv))	836	else if (SvROK (sv))
721	encode_rv (enc, SvRV (sv));	837	encode_rv (enc, SvRV (sv));
722	else if (!SvOK (sv))	838	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
723	encode_str (enc, "null", 4, 0);	839	encode_str (enc, "null", 4, 0);
724	else	840	else
725	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	841	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
726	SvPV_nolen (sv), SvFLAGS (sv));	842	SvPV_nolen (sv), SvFLAGS (sv));
727	}	843	}
…		…
737	enc.json = *json;	853	enc.json = *json;
738	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	854	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
739	enc.cur = SvPVX (enc.sv);	855	enc.cur = SvPVX (enc.sv);
740	enc.end = SvEND (enc.sv);	856	enc.end = SvEND (enc.sv);
741	enc.indent = 0;	857	enc.indent = 0;
742	enc.maxdepth = DEC_DEPTH (enc.json.flags);
743	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	858	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
744	: enc.json.flags & F_LATIN1 ? 0x000100UL	859	: enc.json.flags & F_LATIN1 ? 0x000100UL
745	: 0x110000UL;	860	: 0x110000UL;
746		861
747	SvPOK_only (enc.sv);	862	SvPOK_only (enc.sv);
748	encode_sv (&enc, scalar);	863	encode_sv (&enc, scalar);
		864	encode_nl (&enc);
749		865
750	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	866	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
751	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	867	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
752		868
753	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	869	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
814	if (*dec->cur != ch) \	930	if (*dec->cur != ch) \
815	ERR (# ch " expected"); \	931	ERR (# ch " expected"); \
816	++dec->cur; \	932	++dec->cur; \
817	SE	933	SE
818		934
819	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	935	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
820	#define DEC_DEC_DEPTH --dec->depth	936	#define DEC_DEC_DEPTH --dec->depth
821		937
822	static SV decode_sv (dec_t dec);	938	static SV decode_sv (dec_t dec);
823		939
824	static signed char decode_hexdigit[256];	940	static signed char decode_hexdigit[256];
…		…
933	else if (expect_true (ch >= 0x20 && ch < 0x80))	1049	else if (expect_true (ch >= 0x20 && ch < 0x80))
934	*cur++ = ch;	1050	*cur++ = ch;
935	else if (ch >= 0x80)	1051	else if (ch >= 0x80)
936	{	1052	{
937	STRLEN clen;	1053	STRLEN clen;
938	UV uch;
939		1054
940	--dec_cur;	1055	--dec_cur;
941		1056
942	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1057	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
943	if (clen == (STRLEN)-1)	1058	if (clen == (STRLEN)-1)
944	ERR ("malformed UTF-8 character in JSON string");	1059	ERR ("malformed UTF-8 character in JSON string");
945		1060
946	do	1061	do
947	cur++ = dec_cur++;	1062	cur++ = dec_cur++;
…		…
964	{	1079	{
965	STRLEN len = cur - buf;	1080	STRLEN len = cur - buf;
966		1081
967	if (sv)	1082	if (sv)
968	{	1083	{
969	SvGROW (sv, SvCUR (sv) + len + 1);	1084	STRLEN cur = SvCUR (sv);
		1085
		1086	if (SvLEN (sv) <= cur + len)
		1087	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1088
970	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1089	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
971	SvCUR_set (sv, SvCUR (sv) + len);	1090	SvCUR_set (sv, SvCUR (sv) + len);
972	}	1091	}
973	else	1092	else
974	sv = newSVpvn (buf, len);	1093	sv = newSVpvn (buf, len);
…		…
1065		1184
1066	// special case the rather common 1..5-digit-int case	1185	// special case the rather common 1..5-digit-int case
1067	if (*start == '-')	1186	if (*start == '-')
1068	switch (len)	1187	switch (len)
1069	{	1188	{
1070	case 2: return newSViv (-( start [1] - '0' * 1));	1189	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1071	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1190	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1072	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1191	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1073	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1192	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1074	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1193	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1075	}	1194	}
1076	else	1195	else
1077	switch (len)	1196	switch (len)
1078	{	1197	{
1079	case 1: return newSViv ( start [0] - '0' * 1);	1198	case 1: return newSViv ( start [0] - '0' * 1);
1080	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1199	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1081	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1200	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1082	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1201	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1083	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1202	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1084	}	1203	}
1085		1204
1086	{	1205	{
1087	UV uv;	1206	UV uv;
1088	int numtype = grok_number (start, len, &uv);	1207	int numtype = grok_number (start, len, &uv);
…		…
1097	}	1216	}
1098		1217
1099	len -= *start == '-' ? 1 : 0;	1218	len -= *start == '-' ? 1 : 0;
1100		1219
1101	// does not fit into IV or UV, try NV	1220	// does not fit into IV or UV, try NV
1102	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1221	if (len <= NV_DIG)
1103	#if defined (LDBL_DIG)
1104	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1105	#endif
1106	)
1107	// fits into NV without loss of precision	1222	// fits into NV without loss of precision
1108	return newSVnv (Atof (start));	1223	return newSVnv (json_atof (start));
1109		1224
1110	// everything else fails, convert it to a string	1225	// everything else fails, convert it to a string
1111	return newSVpvn (start, dec->cur - start);	1226	return newSVpvn (start, dec->cur - start);
1112	}	1227	}
1113		1228
1114	// loss of precision here	1229	// loss of precision here
1115	return newSVnv (Atof (start));	1230	return newSVnv (json_atof (start));
1116		1231
1117	fail:	1232	fail:
1118	return 0;	1233	return 0;
1119	}	1234	}
1120		1235
…		…
1289	dSP;	1404	dSP;
1290	int count;	1405	int count;
1291		1406
1292	ENTER; SAVETMPS; PUSHMARK (SP);	1407	ENTER; SAVETMPS; PUSHMARK (SP);
1293	XPUSHs (HeVAL (he));	1408	XPUSHs (HeVAL (he));
		1409	sv_2mortal (sv);
1294		1410
1295	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1411	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1296		1412
1297	if (count == 1)	1413	if (count == 1)
1298	{	1414	{
1299	sv = newSVsv (POPs);	1415	sv = newSVsv (POPs);
1300	FREETMPS; LEAVE;	1416	FREETMPS; LEAVE;
1301	return sv;	1417	return sv;
1302	}	1418	}
1303		1419
		1420	SvREFCNT_inc (sv);
1304	FREETMPS; LEAVE;	1421	FREETMPS; LEAVE;
1305	}	1422	}
1306	}	1423	}
1307		1424
1308	if (dec->json.cb_object)	1425	if (dec->json.cb_object)
…		…
1398	fail:	1515	fail:
1399	return 0;	1516	return 0;
1400	}	1517	}
1401		1518
1402	static SV *	1519	static SV *
1403	decode_json (SV string, JSON json, STRLEN *offset_return)	1520	decode_json (SV string, JSON json, char **offset_return)
1404	{	1521	{
1405	dec_t dec;	1522	dec_t dec;
1406	STRLEN offset;
1407	SV *sv;	1523	SV *sv;
1408		1524
		1525	/* work around bugs in 5.10 where manipulating magic values
		1526	* will perl ignore the magic in subsequent accesses.
		1527	* also make a copy of non-PV values, to get them into a clean
		1528	* state (SvPV should do that, but it's buggy, see below).
		1529	*/
1409	SvGETMAGIC (string);	1530	/SvGETMAGIC (string);/
		1531	if (SvMAGICAL (string) \|\| !SvPOK (string))
		1532	string = sv_2mortal (newSVsv (string));
		1533
1410	SvUPGRADE (string, SVt_PV);	1534	SvUPGRADE (string, SVt_PV);
1411		1535
1412	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1536	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1537	* assertion with -DDEBUGGING, although SvCUR is documented to
		1538	* return the xpv_cur field which certainly exists after upgrading.
		1539	* according to nicholas clark, calling SvPOK fixes this.
		1540	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1541	* and hope for the best.
		1542	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1543	* assertion business is seriously broken, try yet another workaround
		1544	* for the broken -DDEBUGGING.
		1545	*/
		1546	{
		1547	#ifdef DEBUGGING
		1548	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1549	#else
		1550	STRLEN offset = SvCUR (string);
		1551	#endif
		1552
		1553	if (offset > json->max_size && json->max_size)
1413	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1554	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1414	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1555	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1556	}
1415		1557
1416	if (json->flags & F_UTF8)	1558	if (DECODE_WANTS_OCTETS (json))
1417	sv_utf8_downgrade (string, 0);	1559	sv_utf8_downgrade (string, 0);
1418	else	1560	else
1419	sv_utf8_upgrade (string);	1561	sv_utf8_upgrade (string);
1420		1562
1421	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1563	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1422		1564
1423	dec.json = *json;	1565	dec.json = *json;
1424	dec.cur = SvPVX (string);	1566	dec.cur = SvPVX (string);
1425	dec.end = SvEND (string);	1567	dec.end = SvEND (string);
1426	dec.err = 0;	1568	dec.err = 0;
1427	dec.depth = 0;	1569	dec.depth = 0;
1428	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1429		1570
1430	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1571	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1431	dec.json.flags \|= F_HOOK;	1572	dec.json.flags \|= F_HOOK;
1432		1573
1433	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1574	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1434		1575
1435	decode_ws (&dec);	1576	decode_ws (&dec);
1436	sv = decode_sv (&dec);	1577	sv = decode_sv (&dec);
		1578
		1579	if (offset_return)
		1580	*offset_return = dec.cur;
1437		1581
1438	if (!(offset_return \|\| !sv))	1582	if (!(offset_return \|\| !sv))
1439	{	1583	{
1440	// check for trailing garbage	1584	// check for trailing garbage
1441	decode_ws (&dec);	1585	decode_ws (&dec);
…		…
1444	{	1588	{
1445	dec.err = "garbage after JSON object";	1589	dec.err = "garbage after JSON object";
1446	SvREFCNT_dec (sv);	1590	SvREFCNT_dec (sv);
1447	sv = 0;	1591	sv = 0;
1448	}	1592	}
1449	}
1450
1451	if (offset_return \|\| !sv)
1452	{
1453	offset = dec.json.flags & F_UTF8
1454	? dec.cur - SvPVX (string)
1455	: utf8_distance (dec.cur, SvPVX (string));
1456
1457	if (offset_return)
1458	*offset_return = offset;
1459	}	1593	}
1460		1594
1461	if (!sv)	1595	if (!sv)
1462	{	1596	{
1463	SV *uni = sv_newmortal ();	1597	SV *uni = sv_newmortal ();
…		…
1469	SAVEVPTR (PL_curcop);	1603	SAVEVPTR (PL_curcop);
1470	PL_curcop = &cop;	1604	PL_curcop = &cop;
1471	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1605	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1472	LEAVE;	1606	LEAVE;
1473		1607
1474	croak ("%s, at character offset %d [\"%s\"]",	1608	croak ("%s, at character offset %d (before \"%s\")",
1475	dec.err,	1609	dec.err,
1476	(int)offset,	1610	ptr_to_index (string, dec.cur),
1477	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1611	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1478	}	1612	}
1479		1613
1480	sv = sv_2mortal (sv);	1614	sv = sv_2mortal (sv);
1481		1615
…		…
1490		1624
1491	static void	1625	static void
1492	incr_parse (JSON *self)	1626	incr_parse (JSON *self)
1493	{	1627	{
1494	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1628	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1629
		1630	// the state machine here is a bit convoluted and could be simplified a lot
		1631	// but this would make it slower, so...
1495		1632
1496	for (;;)	1633	for (;;)
1497	{	1634	{
1498	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D	1635	//printf ("loop pod %d p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), p, p, self->incr_mode, self->incr_nest);//D
1499	switch (self->incr_mode)	1636	switch (self->incr_mode)
1500	{	1637	{
1501	// only used for intiial whitespace skipping	1638	// only used for initial whitespace skipping
1502	case INCR_M_WS:	1639	case INCR_M_WS:
1503	for (;;)	1640	for (;;)
1504	{	1641	{
1505	if (*p > 0x20)	1642	if (*p > 0x20)
1506	{	1643	{
		1644	if (*p == '#')
		1645	{
		1646	self->incr_mode = INCR_M_C0;
		1647	goto incr_m_c;
		1648	}
		1649	else
		1650	{
1507	self->incr_mode = INCR_M_JSON;	1651	self->incr_mode = INCR_M_JSON;
1508	goto incr_m_json;	1652	goto incr_m_json;
		1653	}
1509	}	1654	}
1510	else if (!*p)	1655	else if (!*p)
1511	goto interrupt;	1656	goto interrupt;
1512		1657
1513	++p;	1658	++p;
…		…
1519	goto interrupt;	1664	goto interrupt;
1520		1665
1521	++p;	1666	++p;
1522	self->incr_mode = INCR_M_STR;	1667	self->incr_mode = INCR_M_STR;
1523	goto incr_m_str;	1668	goto incr_m_str;
		1669
		1670	// inside #-style comments
		1671	case INCR_M_C0:
		1672	case INCR_M_C1:
		1673	incr_m_c:
		1674	for (;;)
		1675	{
		1676	if (*p == '\n')
		1677	{
		1678	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1679	break;
		1680	}
		1681	else if (!*p)
		1682	goto interrupt;
		1683
		1684	++p;
		1685	}
		1686
		1687	break;
1524		1688
1525	// inside a string	1689	// inside a string
1526	case INCR_M_STR:	1690	case INCR_M_STR:
1527	incr_m_str:	1691	incr_m_str:
1528	for (;;)	1692	for (;;)
…		…
1579	self->incr_mode = INCR_M_STR;	1743	self->incr_mode = INCR_M_STR;
1580	goto incr_m_str;	1744	goto incr_m_str;
1581		1745
1582	case '[':	1746	case '[':
1583	case '{':	1747	case '{':
1584	++self->incr_nest;	1748	if (++self->incr_nest > self->max_depth)
		1749	croak (ERR_NESTING_EXCEEDED);
1585	break;	1750	break;
1586		1751
1587	case ']':	1752	case ']':
1588	case '}':	1753	case '}':
1589	if (!--self->incr_nest)	1754	if (--self->incr_nest <= 0)
1590	goto interrupt;	1755	goto interrupt;
		1756	break;
		1757
		1758	case '#':
		1759	self->incr_mode = INCR_M_C1;
		1760	goto incr_m_c;
1591	}	1761	}
1592	}	1762	}
1593	}	1763	}
1594		1764
1595	modechange:	1765	modechange:
1596	;	1766	;
1597	}	1767	}
1598		1768
1599	interrupt:	1769	interrupt:
1600	self->incr_pos = p - SvPVX (self->incr_text);	1770	self->incr_pos = p - SvPVX (self->incr_text);
		1771	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1601	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1772	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1602	}	1773	}
1603		1774
1604	/////////////////////////////////////////////////////////////////////////////	1775	/////////////////////////////////////////////////////////////////////////////
1605	// XS interface functions	1776	// XS interface functions
…		…
1620	json_stash = gv_stashpv ("JSON::XS" , 1);	1791	json_stash = gv_stashpv ("JSON::XS" , 1);
1621	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1792	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1622		1793
1623	json_true = get_bool ("JSON::XS::true");	1794	json_true = get_bool ("JSON::XS::true");
1624	json_false = get_bool ("JSON::XS::false");	1795	json_false = get_bool ("JSON::XS::false");
		1796
		1797	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1625	}	1798	}
1626		1799
1627	PROTOTYPES: DISABLE	1800	PROTOTYPES: DISABLE
1628		1801
1629	void CLONE (...)	1802	void CLONE (...)
…		…
1634	void new (char *klass)	1807	void new (char *klass)
1635	PPCODE:	1808	PPCODE:
1636	{	1809	{
1637	SV *pv = NEWSV (0, sizeof (JSON));	1810	SV *pv = NEWSV (0, sizeof (JSON));
1638	SvPOK_only (pv);	1811	SvPOK_only (pv);
1639	Zero (SvPVX (pv), 1, JSON);	1812	json_init ((JSON *)SvPVX (pv));
1640	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1641	XPUSHs (sv_2mortal (sv_bless (	1813	XPUSHs (sv_2mortal (sv_bless (
1642	newRV_noinc (pv),	1814	newRV_noinc (pv),
1643	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1815	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1644	)));	1816	)));
1645	}	1817	}
…		…
1657	allow_nonref = F_ALLOW_NONREF	1829	allow_nonref = F_ALLOW_NONREF
1658	shrink = F_SHRINK	1830	shrink = F_SHRINK
1659	allow_blessed = F_ALLOW_BLESSED	1831	allow_blessed = F_ALLOW_BLESSED
1660	convert_blessed = F_CONV_BLESSED	1832	convert_blessed = F_CONV_BLESSED
1661	relaxed = F_RELAXED	1833	relaxed = F_RELAXED
		1834	allow_unknown = F_ALLOW_UNKNOWN
1662	PPCODE:	1835	PPCODE:
1663	{	1836	{
1664	if (enable)	1837	if (enable)
1665	self->flags \|= ix;	1838	self->flags \|= ix;
1666	else	1839	else
…		…
1681	get_allow_nonref = F_ALLOW_NONREF	1854	get_allow_nonref = F_ALLOW_NONREF
1682	get_shrink = F_SHRINK	1855	get_shrink = F_SHRINK
1683	get_allow_blessed = F_ALLOW_BLESSED	1856	get_allow_blessed = F_ALLOW_BLESSED
1684	get_convert_blessed = F_CONV_BLESSED	1857	get_convert_blessed = F_CONV_BLESSED
1685	get_relaxed = F_RELAXED	1858	get_relaxed = F_RELAXED
		1859	get_allow_unknown = F_ALLOW_UNKNOWN
1686	PPCODE:	1860	PPCODE:
1687	XPUSHs (boolSV (self->flags & ix));	1861	XPUSHs (boolSV (self->flags & ix));
1688		1862
1689	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1863	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1690	PPCODE:	1864	PPCODE:
1691	{	1865	self->max_depth = max_depth;
1692	UV log2 = 0;
1693
1694	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1695
1696	while ((1UL << log2) < max_depth)
1697	++log2;
1698
1699	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1700
1701	XPUSHs (ST (0));	1866	XPUSHs (ST (0));
1702	}
1703		1867
1704	U32 get_max_depth (JSON *self)	1868	U32 get_max_depth (JSON *self)
1705	CODE:	1869	CODE:
1706	RETVAL = DEC_DEPTH (self->flags);	1870	RETVAL = self->max_depth;
1707	OUTPUT:	1871	OUTPUT:
1708	RETVAL	1872	RETVAL
1709		1873
1710	void max_size (JSON *self, UV max_size = 0)	1874	void max_size (JSON *self, U32 max_size = 0)
1711	PPCODE:	1875	PPCODE:
1712	{	1876	self->max_size = max_size;
1713	UV log2 = 0;
1714
1715	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1716	if (max_size == 1) max_size = 2;
1717
1718	while ((1UL << log2) < max_size)
1719	++log2;
1720
1721	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1722
1723	XPUSHs (ST (0));	1877	XPUSHs (ST (0));
1724	}
1725		1878
1726	int get_max_size (JSON *self)	1879	int get_max_size (JSON *self)
1727	CODE:	1880	CODE:
1728	RETVAL = DEC_SIZE (self->flags);	1881	RETVAL = self->max_size;
1729	OUTPUT:	1882	OUTPUT:
1730	RETVAL	1883	RETVAL
1731		1884
1732	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1885	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1733	PPCODE:	1886	PPCODE:
…		…
1769	XPUSHs (decode_json (jsonstr, self, 0));	1922	XPUSHs (decode_json (jsonstr, self, 0));
1770		1923
1771	void decode_prefix (JSON self, SV jsonstr)	1924	void decode_prefix (JSON self, SV jsonstr)
1772	PPCODE:	1925	PPCODE:
1773	{	1926	{
1774	STRLEN offset;	1927	char *offset;
1775	EXTEND (SP, 2);	1928	EXTEND (SP, 2);
1776	PUSHs (decode_json (jsonstr, self, &offset));	1929	PUSHs (decode_json (jsonstr, self, &offset));
1777	PUSHs (sv_2mortal (newSVuv (offset)));	1930	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1778	}	1931	}
1779		1932
1780	void incr_parse (JSON self, SV jsonstr = 0)	1933	void incr_parse (JSON self, SV jsonstr = 0)
1781	PPCODE:	1934	PPCODE:
1782	{	1935	{
1783	if (!self->incr_text)	1936	if (!self->incr_text)
1784	self->incr_text = newSVpvn ("", 0);	1937	self->incr_text = newSVpvn ("", 0);
		1938
		1939	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		1940	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		1941	if (DECODE_WANTS_OCTETS (self))
		1942	{
		1943	if (self->incr_pos)
		1944	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		1945	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		1946
		1947	sv_utf8_downgrade (self->incr_text, 0);
		1948	}
		1949	else
		1950	{
		1951	sv_utf8_upgrade (self->incr_text);
		1952
		1953	if (self->incr_pos)
		1954	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1955	- (U8 *)SvPVX (self->incr_text);
		1956	}
1785		1957
1786	// append data, if any	1958	// append data, if any
1787	if (jsonstr)	1959	if (jsonstr)
1788	{	1960	{
		1961	/* make sure both strings have same encoding */
1789	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1962	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		1963	if (SvUTF8 (jsonstr))
		1964	sv_utf8_downgrade (jsonstr, 0);
1790	{	1965	else
1791	/* utf-8-ness differs, need to upgrade */
1792	sv_utf8_upgrade (self->incr_text);	1966	sv_utf8_upgrade (jsonstr);
1793		1967
1794	if (self->incr_pos)	1968	/* and then just blindly append */
1795	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1796	- (U8 *)SvPVX (self->incr_text);
1797	}
1798
1799	{	1969	{
1800	STRLEN len;	1970	STRLEN len;
1801	const char *str = SvPV (jsonstr, len);	1971	const char *str = SvPV (jsonstr, len);
1802	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	1972	STRLEN cur = SvCUR (self->incr_text);
		1973
		1974	if (SvLEN (self->incr_text) <= cur + len)
		1975	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1976
1803	Move (str, SvEND (self->incr_text), len, char);	1977	Move (str, SvEND (self->incr_text), len, char);
1804	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1978	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1805	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	1979	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1806	}	1980	}
1807	}	1981	}
1808		1982
1809	if (GIMME_V != G_VOID)	1983	if (GIMME_V != G_VOID)
1810	do	1984	do
1811	{	1985	{
1812	STRLEN offset;	1986	char *offset;
1813		1987
1814	if (!INCR_DONE (self))	1988	if (!INCR_DONE (self))
1815	{	1989	{
1816	incr_parse (self);	1990	incr_parse (self);
		1991
		1992	if (self->incr_pos > self->max_size && self->max_size)
		1993	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1994	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1995
1817	if (!INCR_DONE (self))	1996	if (!INCR_DONE (self))
		1997	{
		1998	// as an optimisation, do not accumulate white space in the incr buffer
		1999	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2000	{
		2001	self->incr_pos = 0;
		2002	SvCUR_set (self->incr_text, 0);
		2003	}
		2004
1818	break;	2005	break;
		2006	}
1819	}	2007	}
1820		2008
1821	XPUSHs (decode_json (self->incr_text, self, &offset));	2009	XPUSHs (decode_json (self->incr_text, self, &offset));
1822		2010
1823	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1824	self->incr_pos -= offset;	2011	self->incr_pos -= offset - SvPVX (self->incr_text);
1825	self->incr_nest = 0;	2012	self->incr_nest = 0;
1826	self->incr_mode = 0;	2013	self->incr_mode = 0;
		2014
		2015	sv_chop (self->incr_text, offset);
1827	}	2016	}
1828	while (GIMME_V == G_ARRAY);	2017	while (GIMME_V == G_ARRAY);
1829	}	2018	}
1830		2019
1831	SV incr_text (JSON self)	2020	SV incr_text (JSON self)
…		…
1850	self->incr_nest = 0;	2039	self->incr_nest = 0;
1851	self->incr_mode = 0;	2040	self->incr_mode = 0;
1852	}	2041	}
1853	}	2042	}
1854		2043
		2044	void incr_reset (JSON *self)
		2045	CODE:
		2046	{
		2047	SvREFCNT_dec (self->incr_text);
		2048	self->incr_text = 0;
		2049	self->incr_pos = 0;
		2050	self->incr_nest = 0;
		2051	self->incr_mode = 0;
		2052	}
		2053
1855	void DESTROY (JSON *self)	2054	void DESTROY (JSON *self)
1856	CODE:	2055	CODE:
1857	SvREFCNT_dec (self->cb_sk_object);	2056	SvREFCNT_dec (self->cb_sk_object);
1858	SvREFCNT_dec (self->cb_object);	2057	SvREFCNT_dec (self->cb_object);
1859	SvREFCNT_dec (self->incr_text);	2058	SvREFCNT_dec (self->incr_text);
…		…
1864	ALIAS:	2063	ALIAS:
1865	to_json_ = 0	2064	to_json_ = 0
1866	encode_json = F_UTF8	2065	encode_json = F_UTF8
1867	PPCODE:	2066	PPCODE:
1868	{	2067	{
1869	JSON json = { F_DEFAULT \| ix };	2068	JSON json;
		2069	json_init (&json);
		2070	json.flags \|= ix;
1870	XPUSHs (encode_json (scalar, &json));	2071	XPUSHs (encode_json (scalar, &json));
1871	}	2072	}
1872		2073
1873	void decode_json (SV *jsonstr)	2074	void decode_json (SV *jsonstr)
1874	ALIAS:	2075	ALIAS:
1875	from_json_ = 0	2076	from_json_ = 0
1876	decode_json = F_UTF8	2077	decode_json = F_UTF8
1877	PPCODE:	2078	PPCODE:
1878	{	2079	{
1879	JSON json = { F_DEFAULT \| ix };	2080	JSON json;
		2081	json_init (&json);
		2082	json.flags \|= ix;
1880	XPUSHs (decode_json (jsonstr, &json, 0));	2083	XPUSHs (decode_json (jsonstr, &json, 0));
1881	}	2084	}
1882		2085
1883

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs. Revision 1.112 by root, Thu Aug 11 17:06:53 2011 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs.
Revision 1.112 by root, Thu Aug 11 17:06:53 2011 UTC