[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.108 by root, Tue Aug 17 23:27:36 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
		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	if (postdp) *expo -= eaccum;
		266	accum += uaccum Perl_pow (10., *expo);
		267	*expo += eaccum;
		268	}
		269
		270	static NV
		271	json_atof (const char *s)
		272	{
		273	NV accum = 0.;
		274	int expo = 0;
		275	int neg = 0;
		276
		277	if (*s == '-')
		278	{
		279	++s;
		280	neg = 1;
		281	}
		282
		283	// a recursion depth of ten gives us >>500 bits
		284	json_atof_scan1 (s, &accum, &expo, 0, 10);
		285
		286	return neg ? -accum : accum;
		287	}
175	/////////////////////////////////////////////////////////////////////////////	288	/////////////////////////////////////////////////////////////////////////////
176	// encoder	289	// encoder
177		290
178	// structure used for encoding JSON	291	// structure used for encoding JSON
179	typedef struct	292	typedef struct
…		…
181	char *cur; // SvPVX (sv) + current output position	294	char *cur; // SvPVX (sv) + current output position
182	char *end; // SvEND (sv)	295	char *end; // SvEND (sv)
183	SV *sv; // result scalar	296	SV *sv; // result scalar
184	JSON json;	297	JSON json;
185	U32 indent; // indentation level	298	U32 indent; // indentation level
186	U32 maxdepth; // max. indentation/recursion level
187	UV limit; // escape character values >= this value when encoding	299	UV limit; // escape character values >= this value when encoding
188	} enc_t;	300	} enc_t;
189		301
190	INLINE void	302	INLINE void
191	need (enc_t *enc, STRLEN len)	303	need (enc_t *enc, STRLEN len)
192	{	304	{
193	if (expect_false (enc->cur + len >= enc->end))	305	if (expect_false (enc->cur + len >= enc->end))
194	{	306	{
195	STRLEN cur = enc->cur - SvPVX (enc->sv);	307	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
196	SvGROW (enc->sv, cur + len + 1);	308	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
197	enc->cur = SvPVX (enc->sv) + cur;	309	enc->cur = SvPVX (enc->sv) + cur;
198	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	310	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
199	}	311	}
200	}	312	}
201		313
…		…
276	(int)((uch - 0x10000) % 0x400 + 0xDC00));	388	(int)((uch - 0x10000) % 0x400 + 0xDC00));
277	enc->cur += 12;	389	enc->cur += 12;
278	}	390	}
279	else	391	else
280	{	392	{
281	static char hexdigit [16] = "0123456789abcdef";
282	need (enc, len += 5);	393	need (enc, len += 5);
283	*enc->cur++ = '\\';	394	*enc->cur++ = '\\';
284	*enc->cur++ = 'u';	395	*enc->cur++ = 'u';
285	*enc->cur++ = hexdigit [ uch >> 12 ];	396	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
286	*enc->cur++ = hexdigit [(uch >> 8) & 15];	397	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
287	*enc->cur++ = hexdigit [(uch >> 4) & 15];	398	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
288	*enc->cur++ = hexdigit [(uch >> 0) & 15];	399	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
289	}	400	}
290		401
291	str += clen;	402	str += clen;
292	}	403	}
293	else if (enc->json.flags & F_LATIN1)	404	else if (enc->json.flags & F_LATIN1)
…		…
364	static void	475	static void
365	encode_av (enc_t enc, AV av)	476	encode_av (enc_t enc, AV av)
366	{	477	{
367	int i, len = av_len (av);	478	int i, len = av_len (av);
368		479
369	if (enc->indent >= enc->maxdepth)	480	if (enc->indent >= enc->json.max_depth)
370	croak ("data structure too deep (hit recursion limit)");	481	croak (ERR_NESTING_EXCEEDED);
371		482
372	encode_ch (enc, '[');	483	encode_ch (enc, '[');
373		484
374	if (len >= 0)	485	if (len >= 0)
375	{	486	{
…		…
450	static void	561	static void
451	encode_hv (enc_t enc, HV hv)	562	encode_hv (enc_t enc, HV hv)
452	{	563	{
453	HE *he;	564	HE *he;
454		565
455	if (enc->indent >= enc->maxdepth)	566	if (enc->indent >= enc->json.max_depth)
456	croak ("data structure too deep (hit recursion limit)");	567	croak (ERR_NESTING_EXCEEDED);
457		568
458	encode_ch (enc, '{');	569	encode_ch (enc, '{');
459		570
460	// for canonical output we have to sort by keys first	571	// for canonical output we have to sort by keys first
461	// actually, this is mostly due to the stupid so-called	572	// actually, this is mostly due to the stupid so-called
462	// security workaround added somewhere in 5.8.x.	573	// security workaround added somewhere in 5.8.x
463	// that randomises hash orderings	574	// that randomises hash orderings
464	if (enc->json.flags & F_CANONICAL)	575	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
465	{	576	{
466	int count = hv_iterinit (hv);	577	int count = hv_iterinit (hv);
467		578
468	if (SvMAGICAL (hv))	579	if (SvMAGICAL (hv))
469	{	580	{
…		…
642		753
643	if (len == 1 && *pv == '1')	754	if (len == 1 && *pv == '1')
644	encode_str (enc, "true", 4, 0);	755	encode_str (enc, "true", 4, 0);
645	else if (len == 1 && *pv == '0')	756	else if (len == 1 && *pv == '0')
646	encode_str (enc, "false", 5, 0);	757	encode_str (enc, "false", 5, 0);
		758	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		759	encode_str (enc, "null", 4, 0);
647	else	760	else
648	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	761	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
649	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	762	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
650	}	763	}
		764	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		765	encode_str (enc, "null", 4, 0);
651	else	766	else
652	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	767	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
653	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	768	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
654	}	769	}
655		770
…		…
717	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	832	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
718	}	833	}
719	}	834	}
720	else if (SvROK (sv))	835	else if (SvROK (sv))
721	encode_rv (enc, SvRV (sv));	836	encode_rv (enc, SvRV (sv));
722	else if (!SvOK (sv))	837	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
723	encode_str (enc, "null", 4, 0);	838	encode_str (enc, "null", 4, 0);
724	else	839	else
725	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	840	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
726	SvPV_nolen (sv), SvFLAGS (sv));	841	SvPV_nolen (sv), SvFLAGS (sv));
727	}	842	}
…		…
737	enc.json = *json;	852	enc.json = *json;
738	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	853	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
739	enc.cur = SvPVX (enc.sv);	854	enc.cur = SvPVX (enc.sv);
740	enc.end = SvEND (enc.sv);	855	enc.end = SvEND (enc.sv);
741	enc.indent = 0;	856	enc.indent = 0;
742	enc.maxdepth = DEC_DEPTH (enc.json.flags);
743	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	857	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
744	: enc.json.flags & F_LATIN1 ? 0x000100UL	858	: enc.json.flags & F_LATIN1 ? 0x000100UL
745	: 0x110000UL;	859	: 0x110000UL;
746		860
747	SvPOK_only (enc.sv);	861	SvPOK_only (enc.sv);
748	encode_sv (&enc, scalar);	862	encode_sv (&enc, scalar);
		863	encode_nl (&enc);
749		864
750	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	865	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
751	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	866	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
752		867
753	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	868	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
814	if (*dec->cur != ch) \	929	if (*dec->cur != ch) \
815	ERR (# ch " expected"); \	930	ERR (# ch " expected"); \
816	++dec->cur; \	931	++dec->cur; \
817	SE	932	SE
818		933
819	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	934	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
820	#define DEC_DEC_DEPTH --dec->depth	935	#define DEC_DEC_DEPTH --dec->depth
821		936
822	static SV decode_sv (dec_t dec);	937	static SV decode_sv (dec_t dec);
823		938
824	static signed char decode_hexdigit[256];	939	static signed char decode_hexdigit[256];
…		…
933	else if (expect_true (ch >= 0x20 && ch < 0x80))	1048	else if (expect_true (ch >= 0x20 && ch < 0x80))
934	*cur++ = ch;	1049	*cur++ = ch;
935	else if (ch >= 0x80)	1050	else if (ch >= 0x80)
936	{	1051	{
937	STRLEN clen;	1052	STRLEN clen;
938	UV uch;
939		1053
940	--dec_cur;	1054	--dec_cur;
941		1055
942	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1056	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
943	if (clen == (STRLEN)-1)	1057	if (clen == (STRLEN)-1)
944	ERR ("malformed UTF-8 character in JSON string");	1058	ERR ("malformed UTF-8 character in JSON string");
945		1059
946	do	1060	do
947	cur++ = dec_cur++;	1061	cur++ = dec_cur++;
…		…
964	{	1078	{
965	STRLEN len = cur - buf;	1079	STRLEN len = cur - buf;
966		1080
967	if (sv)	1081	if (sv)
968	{	1082	{
969	SvGROW (sv, SvCUR (sv) + len + 1);	1083	STRLEN cur = SvCUR (sv);
		1084
		1085	if (SvLEN (sv) <= cur + len)
		1086	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1087
970	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1088	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
971	SvCUR_set (sv, SvCUR (sv) + len);	1089	SvCUR_set (sv, SvCUR (sv) + len);
972	}	1090	}
973	else	1091	else
974	sv = newSVpvn (buf, len);	1092	sv = newSVpvn (buf, len);
…		…
1065		1183
1066	// special case the rather common 1..5-digit-int case	1184	// special case the rather common 1..5-digit-int case
1067	if (*start == '-')	1185	if (*start == '-')
1068	switch (len)	1186	switch (len)
1069	{	1187	{
1070	case 2: return newSViv (-( start [1] - '0' * 1));	1188	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1071	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1189	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));	1190	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));	1191	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));	1192	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1075	}	1193	}
1076	else	1194	else
1077	switch (len)	1195	switch (len)
1078	{	1196	{
1079	case 1: return newSViv ( start [0] - '0' * 1);	1197	case 1: return newSViv ( start [0] - '0' * 1);
1080	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1198	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);	1199	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);	1200	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);	1201	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1084	}	1202	}
1085		1203
1086	{	1204	{
1087	UV uv;	1205	UV uv;
1088	int numtype = grok_number (start, len, &uv);	1206	int numtype = grok_number (start, len, &uv);
…		…
1097	}	1215	}
1098		1216
1099	len -= *start == '-' ? 1 : 0;	1217	len -= *start == '-' ? 1 : 0;
1100		1218
1101	// does not fit into IV or UV, try NV	1219	// does not fit into IV or UV, try NV
1102	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1220	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	1221	// fits into NV without loss of precision
1108	return newSVnv (Atof (start));	1222	return newSVnv (json_atof (start));
1109		1223
1110	// everything else fails, convert it to a string	1224	// everything else fails, convert it to a string
1111	return newSVpvn (start, dec->cur - start);	1225	return newSVpvn (start, dec->cur - start);
1112	}	1226	}
1113		1227
1114	// loss of precision here	1228	// loss of precision here
1115	return newSVnv (Atof (start));	1229	return newSVnv (json_atof (start));
1116		1230
1117	fail:	1231	fail:
1118	return 0;	1232	return 0;
1119	}	1233	}
1120		1234
…		…
1289	dSP;	1403	dSP;
1290	int count;	1404	int count;
1291		1405
1292	ENTER; SAVETMPS; PUSHMARK (SP);	1406	ENTER; SAVETMPS; PUSHMARK (SP);
1293	XPUSHs (HeVAL (he));	1407	XPUSHs (HeVAL (he));
		1408	sv_2mortal (sv);
1294		1409
1295	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;	1410	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1296		1411
1297	if (count == 1)	1412	if (count == 1)
1298	{	1413	{
1299	sv = newSVsv (POPs);	1414	sv = newSVsv (POPs);
1300	FREETMPS; LEAVE;	1415	FREETMPS; LEAVE;
1301	return sv;	1416	return sv;
1302	}	1417	}
1303		1418
		1419	SvREFCNT_inc (sv);
1304	FREETMPS; LEAVE;	1420	FREETMPS; LEAVE;
1305	}	1421	}
1306	}	1422	}
1307		1423
1308	if (dec->json.cb_object)	1424	if (dec->json.cb_object)
…		…
1398	fail:	1514	fail:
1399	return 0;	1515	return 0;
1400	}	1516	}
1401		1517
1402	static SV *	1518	static SV *
1403	decode_json (SV string, JSON json, STRLEN *offset_return)	1519	decode_json (SV string, JSON json, char **offset_return)
1404	{	1520	{
1405	dec_t dec;	1521	dec_t dec;
1406	STRLEN offset;
1407	SV *sv;	1522	SV *sv;
1408		1523
		1524	/* work around bugs in 5.10 where manipulating magic values
		1525	* will perl ignore the magic in subsequent accesses
		1526	*/
1409	SvGETMAGIC (string);	1527	/SvGETMAGIC (string);/
		1528	if (SvMAGICAL (string))
		1529	string = sv_2mortal (newSVsv (string));
		1530
1410	SvUPGRADE (string, SVt_PV);	1531	SvUPGRADE (string, SVt_PV);
1411		1532
1412	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1533	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1534	* assertion with -DDEBUGGING, although SvCUR is documented to
		1535	* return the xpv_cur field which certainly exists after upgrading.
		1536	* according to nicholas clark, calling SvPOK fixes this.
		1537	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1538	* and hope for the best.
		1539	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1540	* assertion business is seriously broken, try yet another workaround
		1541	* for the broken -DDEBUGGING.
		1542	*/
		1543	{
		1544	#ifdef DEBUGGING
		1545	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1546	#else
		1547	STRLEN offset = SvCUR (string);
		1548	#endif
		1549
		1550	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",	1551	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));	1552	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1553	}
1415		1554
1416	if (json->flags & F_UTF8)	1555	if (DECODE_WANTS_OCTETS (json))
1417	sv_utf8_downgrade (string, 0);	1556	sv_utf8_downgrade (string, 0);
1418	else	1557	else
1419	sv_utf8_upgrade (string);	1558	sv_utf8_upgrade (string);
1420		1559
1421	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1560	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1422		1561
1423	dec.json = *json;	1562	dec.json = *json;
1424	dec.cur = SvPVX (string);	1563	dec.cur = SvPVX (string);
1425	dec.end = SvEND (string);	1564	dec.end = SvEND (string);
1426	dec.err = 0;	1565	dec.err = 0;
1427	dec.depth = 0;	1566	dec.depth = 0;
1428	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1429		1567
1430	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1568	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1431	dec.json.flags \|= F_HOOK;	1569	dec.json.flags \|= F_HOOK;
1432		1570
1433	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1571	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1434		1572
1435	decode_ws (&dec);	1573	decode_ws (&dec);
1436	sv = decode_sv (&dec);	1574	sv = decode_sv (&dec);
		1575
		1576	if (offset_return)
		1577	*offset_return = dec.cur;
1437		1578
1438	if (!(offset_return \|\| !sv))	1579	if (!(offset_return \|\| !sv))
1439	{	1580	{
1440	// check for trailing garbage	1581	// check for trailing garbage
1441	decode_ws (&dec);	1582	decode_ws (&dec);
…		…
1444	{	1585	{
1445	dec.err = "garbage after JSON object";	1586	dec.err = "garbage after JSON object";
1446	SvREFCNT_dec (sv);	1587	SvREFCNT_dec (sv);
1447	sv = 0;	1588	sv = 0;
1448	}	1589	}
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	}	1590	}
1460		1591
1461	if (!sv)	1592	if (!sv)
1462	{	1593	{
1463	SV *uni = sv_newmortal ();	1594	SV *uni = sv_newmortal ();
…		…
1469	SAVEVPTR (PL_curcop);	1600	SAVEVPTR (PL_curcop);
1470	PL_curcop = &cop;	1601	PL_curcop = &cop;
1471	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1602	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1472	LEAVE;	1603	LEAVE;
1473		1604
1474	croak ("%s, at character offset %d [\"%s\"]",	1605	croak ("%s, at character offset %d (before \"%s\")",
1475	dec.err,	1606	dec.err,
1476	(int)offset,	1607	ptr_to_index (string, dec.cur),
1477	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1608	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1478	}	1609	}
1479		1610
1480	sv = sv_2mortal (sv);	1611	sv = sv_2mortal (sv);
1481		1612
…		…
1490		1621
1491	static void	1622	static void
1492	incr_parse (JSON *self)	1623	incr_parse (JSON *self)
1493	{	1624	{
1494	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1625	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1626
		1627	// the state machine here is a bit convoluted and could be simplified a lot
		1628	// but this would make it slower, so...
1495		1629
1496	for (;;)	1630	for (;;)
1497	{	1631	{
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	1632	//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)	1633	switch (self->incr_mode)
1500	{	1634	{
1501	// only used for intiial whitespace skipping	1635	// only used for initial whitespace skipping
1502	case INCR_M_WS:	1636	case INCR_M_WS:
1503	for (;;)	1637	for (;;)
1504	{	1638	{
1505	if (*p > 0x20)	1639	if (*p > 0x20)
1506	{	1640	{
		1641	if (*p == '#')
		1642	{
		1643	self->incr_mode = INCR_M_C0;
		1644	goto incr_m_c;
		1645	}
		1646	else
		1647	{
1507	self->incr_mode = INCR_M_JSON;	1648	self->incr_mode = INCR_M_JSON;
1508	goto incr_m_json;	1649	goto incr_m_json;
		1650	}
1509	}	1651	}
1510	else if (!*p)	1652	else if (!*p)
1511	goto interrupt;	1653	goto interrupt;
1512		1654
1513	++p;	1655	++p;
…		…
1519	goto interrupt;	1661	goto interrupt;
1520		1662
1521	++p;	1663	++p;
1522	self->incr_mode = INCR_M_STR;	1664	self->incr_mode = INCR_M_STR;
1523	goto incr_m_str;	1665	goto incr_m_str;
		1666
		1667	// inside #-style comments
		1668	case INCR_M_C0:
		1669	case INCR_M_C1:
		1670	incr_m_c:
		1671	for (;;)
		1672	{
		1673	if (*p == '\n')
		1674	{
		1675	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1676	break;
		1677	}
		1678	else if (!*p)
		1679	goto interrupt;
		1680
		1681	++p;
		1682	}
		1683
		1684	break;
1524		1685
1525	// inside a string	1686	// inside a string
1526	case INCR_M_STR:	1687	case INCR_M_STR:
1527	incr_m_str:	1688	incr_m_str:
1528	for (;;)	1689	for (;;)
…		…
1579	self->incr_mode = INCR_M_STR;	1740	self->incr_mode = INCR_M_STR;
1580	goto incr_m_str;	1741	goto incr_m_str;
1581		1742
1582	case '[':	1743	case '[':
1583	case '{':	1744	case '{':
1584	++self->incr_nest;	1745	if (++self->incr_nest > self->max_depth)
		1746	croak (ERR_NESTING_EXCEEDED);
1585	break;	1747	break;
1586		1748
1587	case ']':	1749	case ']':
1588	case '}':	1750	case '}':
1589	if (!--self->incr_nest)	1751	if (--self->incr_nest <= 0)
1590	goto interrupt;	1752	goto interrupt;
		1753	break;
		1754
		1755	case '#':
		1756	self->incr_mode = INCR_M_C1;
		1757	goto incr_m_c;
1591	}	1758	}
1592	}	1759	}
1593	}	1760	}
1594		1761
1595	modechange:	1762	modechange:
1596	;	1763	;
1597	}	1764	}
1598		1765
1599	interrupt:	1766	interrupt:
1600	self->incr_pos = p - SvPVX (self->incr_text);	1767	self->incr_pos = p - SvPVX (self->incr_text);
		1768	//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	1769	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1602	}	1770	}
1603		1771
1604	/////////////////////////////////////////////////////////////////////////////	1772	/////////////////////////////////////////////////////////////////////////////
1605	// XS interface functions	1773	// XS interface functions
…		…
1620	json_stash = gv_stashpv ("JSON::XS" , 1);	1788	json_stash = gv_stashpv ("JSON::XS" , 1);
1621	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1789	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1622		1790
1623	json_true = get_bool ("JSON::XS::true");	1791	json_true = get_bool ("JSON::XS::true");
1624	json_false = get_bool ("JSON::XS::false");	1792	json_false = get_bool ("JSON::XS::false");
		1793
		1794	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1625	}	1795	}
1626		1796
1627	PROTOTYPES: DISABLE	1797	PROTOTYPES: DISABLE
1628		1798
1629	void CLONE (...)	1799	void CLONE (...)
…		…
1634	void new (char *klass)	1804	void new (char *klass)
1635	PPCODE:	1805	PPCODE:
1636	{	1806	{
1637	SV *pv = NEWSV (0, sizeof (JSON));	1807	SV *pv = NEWSV (0, sizeof (JSON));
1638	SvPOK_only (pv);	1808	SvPOK_only (pv);
1639	Zero (SvPVX (pv), 1, JSON);	1809	json_init ((JSON *)SvPVX (pv));
1640	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1641	XPUSHs (sv_2mortal (sv_bless (	1810	XPUSHs (sv_2mortal (sv_bless (
1642	newRV_noinc (pv),	1811	newRV_noinc (pv),
1643	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1812	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1644	)));	1813	)));
1645	}	1814	}
…		…
1657	allow_nonref = F_ALLOW_NONREF	1826	allow_nonref = F_ALLOW_NONREF
1658	shrink = F_SHRINK	1827	shrink = F_SHRINK
1659	allow_blessed = F_ALLOW_BLESSED	1828	allow_blessed = F_ALLOW_BLESSED
1660	convert_blessed = F_CONV_BLESSED	1829	convert_blessed = F_CONV_BLESSED
1661	relaxed = F_RELAXED	1830	relaxed = F_RELAXED
		1831	allow_unknown = F_ALLOW_UNKNOWN
1662	PPCODE:	1832	PPCODE:
1663	{	1833	{
1664	if (enable)	1834	if (enable)
1665	self->flags \|= ix;	1835	self->flags \|= ix;
1666	else	1836	else
…		…
1681	get_allow_nonref = F_ALLOW_NONREF	1851	get_allow_nonref = F_ALLOW_NONREF
1682	get_shrink = F_SHRINK	1852	get_shrink = F_SHRINK
1683	get_allow_blessed = F_ALLOW_BLESSED	1853	get_allow_blessed = F_ALLOW_BLESSED
1684	get_convert_blessed = F_CONV_BLESSED	1854	get_convert_blessed = F_CONV_BLESSED
1685	get_relaxed = F_RELAXED	1855	get_relaxed = F_RELAXED
		1856	get_allow_unknown = F_ALLOW_UNKNOWN
1686	PPCODE:	1857	PPCODE:
1687	XPUSHs (boolSV (self->flags & ix));	1858	XPUSHs (boolSV (self->flags & ix));
1688		1859
1689	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1860	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1690	PPCODE:	1861	PPCODE:
1691	{	1862	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));	1863	XPUSHs (ST (0));
1702	}
1703		1864
1704	U32 get_max_depth (JSON *self)	1865	U32 get_max_depth (JSON *self)
1705	CODE:	1866	CODE:
1706	RETVAL = DEC_DEPTH (self->flags);	1867	RETVAL = self->max_depth;
1707	OUTPUT:	1868	OUTPUT:
1708	RETVAL	1869	RETVAL
1709		1870
1710	void max_size (JSON *self, UV max_size = 0)	1871	void max_size (JSON *self, U32 max_size = 0)
1711	PPCODE:	1872	PPCODE:
1712	{	1873	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));	1874	XPUSHs (ST (0));
1724	}
1725		1875
1726	int get_max_size (JSON *self)	1876	int get_max_size (JSON *self)
1727	CODE:	1877	CODE:
1728	RETVAL = DEC_SIZE (self->flags);	1878	RETVAL = self->max_size;
1729	OUTPUT:	1879	OUTPUT:
1730	RETVAL	1880	RETVAL
1731		1881
1732	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1882	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1733	PPCODE:	1883	PPCODE:
…		…
1769	XPUSHs (decode_json (jsonstr, self, 0));	1919	XPUSHs (decode_json (jsonstr, self, 0));
1770		1920
1771	void decode_prefix (JSON self, SV jsonstr)	1921	void decode_prefix (JSON self, SV jsonstr)
1772	PPCODE:	1922	PPCODE:
1773	{	1923	{
1774	STRLEN offset;	1924	char *offset;
1775	EXTEND (SP, 2);	1925	EXTEND (SP, 2);
1776	PUSHs (decode_json (jsonstr, self, &offset));	1926	PUSHs (decode_json (jsonstr, self, &offset));
1777	PUSHs (sv_2mortal (newSVuv (offset)));	1927	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1778	}	1928	}
1779		1929
1780	void incr_parse (JSON self, SV jsonstr = 0)	1930	void incr_parse (JSON self, SV jsonstr = 0)
1781	PPCODE:	1931	PPCODE:
1782	{	1932	{
1783	if (!self->incr_text)	1933	if (!self->incr_text)
1784	self->incr_text = newSVpvn ("", 0);	1934	self->incr_text = newSVpvn ("", 0);
		1935
		1936	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		1937	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		1938	if (DECODE_WANTS_OCTETS (self))
		1939	{
		1940	if (self->incr_pos)
		1941	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		1942	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		1943
		1944	sv_utf8_downgrade (self->incr_text, 0);
		1945	}
		1946	else
		1947	{
		1948	sv_utf8_upgrade (self->incr_text);
		1949
		1950	if (self->incr_pos)
		1951	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1952	- (U8 *)SvPVX (self->incr_text);
		1953	}
1785		1954
1786	// append data, if any	1955	// append data, if any
1787	if (jsonstr)	1956	if (jsonstr)
1788	{	1957	{
		1958	/* make sure both strings have same encoding */
1789	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1959	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		1960	if (SvUTF8 (jsonstr))
		1961	sv_utf8_downgrade (jsonstr, 0);
1790	{	1962	else
1791	/* utf-8-ness differs, need to upgrade */
1792	sv_utf8_upgrade (self->incr_text);	1963	sv_utf8_upgrade (jsonstr);
1793		1964
1794	if (self->incr_pos)	1965	/* 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	{	1966	{
1800	STRLEN len;	1967	STRLEN len;
1801	const char *str = SvPV (jsonstr, len);	1968	const char *str = SvPV (jsonstr, len);
1802	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	1969	STRLEN cur = SvCUR (self->incr_text);
		1970
		1971	if (SvLEN (self->incr_text) <= cur + len)
		1972	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1973
1803	Move (str, SvEND (self->incr_text), len, char);	1974	Move (str, SvEND (self->incr_text), len, char);
1804	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1975	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	1976	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1806	}	1977	}
1807	}	1978	}
1808		1979
1809	if (GIMME_V != G_VOID)	1980	if (GIMME_V != G_VOID)
1810	do	1981	do
1811	{	1982	{
1812	STRLEN offset;	1983	char *offset;
1813		1984
1814	if (!INCR_DONE (self))	1985	if (!INCR_DONE (self))
1815	{	1986	{
1816	incr_parse (self);	1987	incr_parse (self);
		1988
		1989	if (self->incr_pos > self->max_size && self->max_size)
		1990	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1991	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1992
1817	if (!INCR_DONE (self))	1993	if (!INCR_DONE (self))
1818	break;	1994	break;
1819	}	1995	}
1820		1996
1821	XPUSHs (decode_json (self->incr_text, self, &offset));	1997	XPUSHs (decode_json (self->incr_text, self, &offset));
1822		1998
1823	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1824	self->incr_pos -= offset;	1999	self->incr_pos -= offset - SvPVX (self->incr_text);
1825	self->incr_nest = 0;	2000	self->incr_nest = 0;
1826	self->incr_mode = 0;	2001	self->incr_mode = 0;
		2002
		2003	sv_chop (self->incr_text, offset);
1827	}	2004	}
1828	while (GIMME_V == G_ARRAY);	2005	while (GIMME_V == G_ARRAY);
1829	}	2006	}
1830		2007
1831	SV incr_text (JSON self)	2008	SV incr_text (JSON self)
…		…
1850	self->incr_nest = 0;	2027	self->incr_nest = 0;
1851	self->incr_mode = 0;	2028	self->incr_mode = 0;
1852	}	2029	}
1853	}	2030	}
1854		2031
		2032	void incr_reset (JSON *self)
		2033	CODE:
		2034	{
		2035	SvREFCNT_dec (self->incr_text);
		2036	self->incr_text = 0;
		2037	self->incr_pos = 0;
		2038	self->incr_nest = 0;
		2039	self->incr_mode = 0;
		2040	}
		2041
1855	void DESTROY (JSON *self)	2042	void DESTROY (JSON *self)
1856	CODE:	2043	CODE:
1857	SvREFCNT_dec (self->cb_sk_object);	2044	SvREFCNT_dec (self->cb_sk_object);
1858	SvREFCNT_dec (self->cb_object);	2045	SvREFCNT_dec (self->cb_object);
1859	SvREFCNT_dec (self->incr_text);	2046	SvREFCNT_dec (self->incr_text);
…		…
1864	ALIAS:	2051	ALIAS:
1865	to_json_ = 0	2052	to_json_ = 0
1866	encode_json = F_UTF8	2053	encode_json = F_UTF8
1867	PPCODE:	2054	PPCODE:
1868	{	2055	{
1869	JSON json = { F_DEFAULT \| ix };	2056	JSON json;
		2057	json_init (&json);
		2058	json.flags \|= ix;
1870	XPUSHs (encode_json (scalar, &json));	2059	XPUSHs (encode_json (scalar, &json));
1871	}	2060	}
1872		2061
1873	void decode_json (SV *jsonstr)	2062	void decode_json (SV *jsonstr)
1874	ALIAS:	2063	ALIAS:
1875	from_json_ = 0	2064	from_json_ = 0
1876	decode_json = F_UTF8	2065	decode_json = F_UTF8
1877	PPCODE:	2066	PPCODE:
1878	{	2067	{
1879	JSON json = { F_DEFAULT \| ix };	2068	JSON json;
		2069	json_init (&json);
		2070	json.flags \|= ix;
1880	XPUSHs (decode_json (jsonstr, &json, 0));	2071	XPUSHs (decode_json (jsonstr, &json, 0));
1881	}	2072	}
1882		2073
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.108 by root, Tue Aug 17 23:27:36 2010 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.108 by root, Tue Aug 17 23:27:36 2010 UTC