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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.75 by root, Wed Mar 19 15:37:54 2008 UTC vs.
Revision 1.106 by root, Tue Jan 19 01:36:34 2010 UTC

…		…
12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
13	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
14	#endif	14	#endif
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
20	#endif	20	#endif
21		21
		22	// three extra for rounding, sign, and end of string
22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	23	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23		24
24	#define F_ASCII 0x00000001UL	25	#define F_ASCII 0x00000001UL
25	#define F_LATIN1 0x00000002UL	26	#define F_LATIN1 0x00000002UL
26	#define F_UTF8 0x00000004UL	27	#define F_UTF8 0x00000004UL
27	#define F_INDENT 0x00000008UL	28	#define F_INDENT 0x00000008UL
…		…
31	#define F_ALLOW_NONREF 0x00000100UL	32	#define F_ALLOW_NONREF 0x00000100UL
32	#define F_SHRINK 0x00000200UL	33	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	34	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	35	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	36	#define F_RELAXED 0x00001000UL
36		37	#define F_ALLOW_UNKNOWN 0x00002000UL
37	#define F_MAXDEPTH 0xf8000000UL
38	#define S_MAXDEPTH 27
39	#define F_MAXSIZE 0x01f00000UL
40	#define S_MAXSIZE 20
41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42		39
43	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
47	#define F_DEFAULT (9UL << S_MAXDEPTH)
48		41
49	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
50	#define INDENT_STEP 3 // spaces per indentation level	43	#define INDENT_STEP 3 // spaces per indentation level
51		44
52	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
…		…
67		60
68	#define IN_RANGE_INC(type,val,beg,end) \	61	#define IN_RANGE_INC(type,val,beg,end) \
69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	62	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	63	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71		64
		65	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		66
72	#ifdef USE_ITHREADS	67	#ifdef USE_ITHREADS
73	# define JSON_SLOW 1	68	# define JSON_SLOW 1
74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	69	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75	#else	70	#else
76	# define JSON_SLOW 0	71	# define JSON_SLOW 0
…		…
78	#endif	73	#endif
79		74
80	static HV json_stash, json_boolean_stash; // JSON::XS::	75	static HV json_stash, json_boolean_stash; // JSON::XS::
81	static SV json_true, json_false;	76	static SV json_true, json_false;
82		77
		78	enum {
		79	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		80	INCR_M_STR, // inside string
		81	INCR_M_BS, // inside backslash
		82	INCR_M_C0, // inside comment in initial whitespace sequence
		83	INCR_M_C1, // inside comment in other places
		84	INCR_M_JSON // outside anything, count nesting
		85	};
		86
		87	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
		88
83	typedef struct {	89	typedef struct {
84	U32 flags;	90	U32 flags;
		91	U32 max_depth;
		92	STRLEN max_size;
		93
85	SV *cb_object;	94	SV *cb_object;
86	HV *cb_sk_object;	95	HV *cb_sk_object;
		96
		97	// for the incremental parser
		98	SV *incr_text; // the source text so far
		99	STRLEN incr_pos; // the current offset into the text
		100	int incr_nest; // {[]}-nesting level
		101	unsigned char incr_mode;
87	} JSON;	102	} JSON;
		103
		104	INLINE void
		105	json_init (JSON *json)
		106	{
		107	Zero (json, 1, JSON);
		108	json->max_depth = 512;
		109	}
88		110
89	/////////////////////////////////////////////////////////////////////////////	111	/////////////////////////////////////////////////////////////////////////////
90	// utility functions	112	// utility functions
91		113
		114	INLINE SV *
		115	get_bool (const char *name)
		116	{
		117	SV *sv = get_sv (name, 1);
		118
		119	SvREADONLY_on (sv);
		120	SvREADONLY_on (SvRV (sv));
		121
		122	return sv;
		123	}
		124
92	INLINE void	125	INLINE void
93	shrink (SV *sv)	126	shrink (SV *sv)
94	{	127	{
95	sv_utf8_downgrade (sv, 1);	128	sv_utf8_downgrade (sv, 1);
		129
96	if (SvLEN (sv) > SvCUR (sv) + 1)	130	if (SvLEN (sv) > SvCUR (sv) + 1)
97	{	131	{
98	#ifdef SvPV_shrink_to_cur	132	#ifdef SvPV_shrink_to_cur
99	SvPV_shrink_to_cur (sv);	133	SvPV_shrink_to_cur (sv);
100	#elif defined (SvPV_renew)	134	#elif defined (SvPV_renew)
…		…
144	*s++ = 0x80 \| ( ch & 0x3f);	178	*s++ = 0x80 \| ( ch & 0x3f);
145		179
146	return s;	180	return s;
147	}	181	}
148		182
		183	// convert offset pointer to character index, sv must be string
		184	static STRLEN
		185	ptr_to_index (SV sv, char offset)
		186	{
		187	return SvUTF8 (sv)
		188	? utf8_distance (offset, SvPVX (sv))
		189	: offset - SvPVX (sv);
		190	}
		191
		192	/////////////////////////////////////////////////////////////////////////////
		193	// fp hell
		194
		195	// scan a group of digits, and a trailing exponent
		196	static void
		197	json_atof_scan1 (const char s, NV accum, int *expo, int postdp, int maxdepth)
		198	{
		199	UV uaccum = 0;
		200	int eaccum = 0;
		201
		202	// if we recurse too deep, skip all remaining digits
		203	// to avoid a stack overflow attack
		204	if (expect_false (--maxdepth <= 0))
		205	while (((U8)*s - '0') < 10)
		206	++s;
		207
		208	for (;;)
		209	{
		210	U8 dig = (U8)*s - '0';
		211
		212	if (expect_false (dig >= 10))
		213	{
		214	if (dig == (U8)((U8)'.' - (U8)'0'))
		215	{
		216	++s;
		217	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		218	}
		219	else if ((dig \| ' ') == 'e' - '0')
		220	{
		221	int exp2 = 0;
		222	int neg = 0;
		223
		224	++s;
		225
		226	if (*s == '-')
		227	{
		228	++s;
		229	neg = 1;
		230	}
		231	else if (*s == '+')
		232	++s;
		233
		234	while ((dig = (U8)*s - '0') < 10)
		235	exp2 = exp2 * 10 + *s++ - '0';
		236
		237	*expo += neg ? -exp2 : exp2;
		238	}
		239
		240	break;
		241	}
		242
		243	++s;
		244
		245	uaccum = uaccum * 10 + dig;
		246	++eaccum;
		247
		248	// if we have too many digits, then recurse for more
		249	// we actually do this for rather few digits
		250	if (uaccum >= (UV_MAX - 9) / 10)
		251	{
		252	if (postdp) *expo -= eaccum;
		253	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		254	if (postdp) *expo += eaccum;
		255
		256	break;
		257	}
		258	}
		259
		260	// this relies greatly on the quality of the pow ()
		261	// implementation of the platform, but a good
		262	// implementation is hard to beat.
		263	if (postdp) *expo -= eaccum;
		264	accum += uaccum Perl_pow (10., *expo);
		265	*expo += eaccum;
		266	}
		267
		268	static NV
		269	json_atof (const char *s)
		270	{
		271	NV accum = 0.;
		272	int expo = 0;
		273	int neg = 0;
		274
		275	if (*s == '-')
		276	{
		277	++s;
		278	neg = 1;
		279	}
		280
		281	// a recursion depth of ten gives us >>500 bits
		282	json_atof_scan1 (s, &accum, &expo, 0, 10);
		283
		284	return neg ? -accum : accum;
		285	}
149	/////////////////////////////////////////////////////////////////////////////	286	/////////////////////////////////////////////////////////////////////////////
150	// encoder	287	// encoder
151		288
152	// structure used for encoding JSON	289	// structure used for encoding JSON
153	typedef struct	290	typedef struct
…		…
155	char *cur; // SvPVX (sv) + current output position	292	char *cur; // SvPVX (sv) + current output position
156	char *end; // SvEND (sv)	293	char *end; // SvEND (sv)
157	SV *sv; // result scalar	294	SV *sv; // result scalar
158	JSON json;	295	JSON json;
159	U32 indent; // indentation level	296	U32 indent; // indentation level
160	U32 maxdepth; // max. indentation/recursion level
161	UV limit; // escape character values >= this value when encoding	297	UV limit; // escape character values >= this value when encoding
162	} enc_t;	298	} enc_t;
163		299
164	INLINE void	300	INLINE void
165	need (enc_t *enc, STRLEN len)	301	need (enc_t *enc, STRLEN len)
166	{	302	{
167	if (expect_false (enc->cur + len >= enc->end))	303	if (expect_false (enc->cur + len >= enc->end))
168	{	304	{
169	STRLEN cur = enc->cur - SvPVX (enc->sv);	305	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
170	SvGROW (enc->sv, cur + len + 1);	306	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
171	enc->cur = SvPVX (enc->sv) + cur;	307	enc->cur = SvPVX (enc->sv) + cur;
172	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	308	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
173	}	309	}
174	}	310	}
175		311
…		…
250	(int)((uch - 0x10000) % 0x400 + 0xDC00));	386	(int)((uch - 0x10000) % 0x400 + 0xDC00));
251	enc->cur += 12;	387	enc->cur += 12;
252	}	388	}
253	else	389	else
254	{	390	{
255	static char hexdigit [16] = "0123456789abcdef";
256	need (enc, len += 5);	391	need (enc, len += 5);
257	*enc->cur++ = '\\';	392	*enc->cur++ = '\\';
258	*enc->cur++ = 'u';	393	*enc->cur++ = 'u';
259	*enc->cur++ = hexdigit [ uch >> 12 ];	394	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
260	*enc->cur++ = hexdigit [(uch >> 8) & 15];	395	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
261	*enc->cur++ = hexdigit [(uch >> 4) & 15];	396	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
262	*enc->cur++ = hexdigit [(uch >> 0) & 15];	397	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
263	}	398	}
264		399
265	str += clen;	400	str += clen;
266	}	401	}
267	else if (enc->json.flags & F_LATIN1)	402	else if (enc->json.flags & F_LATIN1)
…		…
338	static void	473	static void
339	encode_av (enc_t enc, AV av)	474	encode_av (enc_t enc, AV av)
340	{	475	{
341	int i, len = av_len (av);	476	int i, len = av_len (av);
342		477
343	if (enc->indent >= enc->maxdepth)	478	if (enc->indent >= enc->json.max_depth)
344	croak ("data structure too deep (hit recursion limit)");	479	croak (ERR_NESTING_EXCEEDED);
345		480
346	encode_ch (enc, '[');	481	encode_ch (enc, '[');
347		482
348	if (len >= 0)	483	if (len >= 0)
349	{	484	{
…		…
423		558
424	static void	559	static void
425	encode_hv (enc_t enc, HV hv)	560	encode_hv (enc_t enc, HV hv)
426	{	561	{
427	HE *he;	562	HE *he;
428	int count;
429		563
430	if (enc->indent >= enc->maxdepth)	564	if (enc->indent >= enc->json.max_depth)
431	croak ("data structure too deep (hit recursion limit)");	565	croak (ERR_NESTING_EXCEEDED);
432		566
433	encode_ch (enc, '{');	567	encode_ch (enc, '{');
434		568
435	// for canonical output we have to sort by keys first	569	// for canonical output we have to sort by keys first
436	// actually, this is mostly due to the stupid so-called	570	// actually, this is mostly due to the stupid so-called
437	// security workaround added somewhere in 5.8.x.	571	// security workaround added somewhere in 5.8.x
438	// that randomises hash orderings	572	// that randomises hash orderings
439	if (enc->json.flags & F_CANONICAL)	573	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
440	{	574	{
441	int count = hv_iterinit (hv);	575	int count = hv_iterinit (hv);
442		576
443	if (SvMAGICAL (hv))	577	if (SvMAGICAL (hv))
444	{	578	{
…		…
617		751
618	if (len == 1 && *pv == '1')	752	if (len == 1 && *pv == '1')
619	encode_str (enc, "true", 4, 0);	753	encode_str (enc, "true", 4, 0);
620	else if (len == 1 && *pv == '0')	754	else if (len == 1 && *pv == '0')
621	encode_str (enc, "false", 5, 0);	755	encode_str (enc, "false", 5, 0);
		756	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		757	encode_str (enc, "null", 4, 0);
622	else	758	else
623	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	759	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
624	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	760	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625	}	761	}
		762	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		763	encode_str (enc, "null", 4, 0);
626	else	764	else
627	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	765	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
628	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	766	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629	}	767	}
630		768
…		…
692	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	830	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693	}	831	}
694	}	832	}
695	else if (SvROK (sv))	833	else if (SvROK (sv))
696	encode_rv (enc, SvRV (sv));	834	encode_rv (enc, SvRV (sv));
697	else if (!SvOK (sv))	835	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
698	encode_str (enc, "null", 4, 0);	836	encode_str (enc, "null", 4, 0);
699	else	837	else
700	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	838	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
701	SvPV_nolen (sv), SvFLAGS (sv));	839	SvPV_nolen (sv), SvFLAGS (sv));
702	}	840	}
…		…
712	enc.json = *json;	850	enc.json = *json;
713	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	851	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
714	enc.cur = SvPVX (enc.sv);	852	enc.cur = SvPVX (enc.sv);
715	enc.end = SvEND (enc.sv);	853	enc.end = SvEND (enc.sv);
716	enc.indent = 0;	854	enc.indent = 0;
717	enc.maxdepth = DEC_DEPTH (enc.json.flags);
718	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	855	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719	: enc.json.flags & F_LATIN1 ? 0x000100UL	856	: enc.json.flags & F_LATIN1 ? 0x000100UL
720	: 0x110000UL;	857	: 0x110000UL;
721		858
722	SvPOK_only (enc.sv);	859	SvPOK_only (enc.sv);
723	encode_sv (&enc, scalar);	860	encode_sv (&enc, scalar);
		861	encode_nl (&enc);
724		862
725	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	863	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
726	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	864	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
727		865
728	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	866	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
789	if (*dec->cur != ch) \	927	if (*dec->cur != ch) \
790	ERR (# ch " expected"); \	928	ERR (# ch " expected"); \
791	++dec->cur; \	929	++dec->cur; \
792	SE	930	SE
793		931
794	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	932	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
795	#define DEC_DEC_DEPTH --dec->depth	933	#define DEC_DEC_DEPTH --dec->depth
796		934
797	static SV decode_sv (dec_t dec);	935	static SV decode_sv (dec_t dec);
798		936
799	static signed char decode_hexdigit[256];	937	static signed char decode_hexdigit[256];
…		…
908	else if (expect_true (ch >= 0x20 && ch < 0x80))	1046	else if (expect_true (ch >= 0x20 && ch < 0x80))
909	*cur++ = ch;	1047	*cur++ = ch;
910	else if (ch >= 0x80)	1048	else if (ch >= 0x80)
911	{	1049	{
912	STRLEN clen;	1050	STRLEN clen;
913	UV uch;
914		1051
915	--dec_cur;	1052	--dec_cur;
916		1053
917	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1054	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
918	if (clen == (STRLEN)-1)	1055	if (clen == (STRLEN)-1)
919	ERR ("malformed UTF-8 character in JSON string");	1056	ERR ("malformed UTF-8 character in JSON string");
920		1057
921	do	1058	do
922	cur++ = dec_cur++;	1059	cur++ = dec_cur++;
…		…
939	{	1076	{
940	STRLEN len = cur - buf;	1077	STRLEN len = cur - buf;
941		1078
942	if (sv)	1079	if (sv)
943	{	1080	{
944	SvGROW (sv, SvCUR (sv) + len + 1);	1081	STRLEN cur = SvCUR (sv);
		1082
		1083	if (SvLEN (sv) <= cur + len)
		1084	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1085
945	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1086	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
946	SvCUR_set (sv, SvCUR (sv) + len);	1087	SvCUR_set (sv, SvCUR (sv) + len);
947	}	1088	}
948	else	1089	else
949	sv = newSVpvn (buf, len);	1090	sv = newSVpvn (buf, len);
…		…
1040		1181
1041	// special case the rather common 1..5-digit-int case	1182	// special case the rather common 1..5-digit-int case
1042	if (*start == '-')	1183	if (*start == '-')
1043	switch (len)	1184	switch (len)
1044	{	1185	{
1045	case 2: return newSViv (-( start [1] - '0' * 1));	1186	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1046	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1187	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1047	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1188	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1048	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1189	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1049	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1190	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1050	}	1191	}
1051	else	1192	else
1052	switch (len)	1193	switch (len)
1053	{	1194	{
1054	case 1: return newSViv ( start [0] - '0' * 1);	1195	case 1: return newSViv ( start [0] - '0' * 1);
1055	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1196	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1056	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1197	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1057	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1198	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1058	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1199	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1059	}	1200	}
1060		1201
1061	{	1202	{
1062	UV uv;	1203	UV uv;
1063	int numtype = grok_number (start, len, &uv);	1204	int numtype = grok_number (start, len, &uv);
…		…
1072	}	1213	}
1073		1214
1074	len -= *start == '-' ? 1 : 0;	1215	len -= *start == '-' ? 1 : 0;
1075		1216
1076	// does not fit into IV or UV, try NV	1217	// does not fit into IV or UV, try NV
1077	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1218	if (len <= NV_DIG)
1078	#if defined (LDBL_DIG)
1079	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1080	#endif
1081	)
1082	// fits into NV without loss of precision	1219	// fits into NV without loss of precision
1083	return newSVnv (Atof (start));	1220	return newSVnv (json_atof (start));
1084		1221
1085	// everything else fails, convert it to a string	1222	// everything else fails, convert it to a string
1086	return newSVpvn (start, dec->cur - start);	1223	return newSVpvn (start, dec->cur - start);
1087	}	1224	}
1088		1225
1089	// loss of precision here	1226	// loss of precision here
1090	return newSVnv (Atof (start));	1227	return newSVnv (json_atof (start));
1091		1228
1092	fail:	1229	fail:
1093	return 0;	1230	return 0;
1094	}	1231	}
1095		1232
…		…
1171	char *p = dec->cur;	1308	char *p = dec->cur;
1172	char *e = p + 24; // only try up to 24 bytes	1309	char *e = p + 24; // only try up to 24 bytes
1173		1310
1174	for (;;)	1311	for (;;)
1175	{	1312	{
1176	// the >= 0x80 is true on most architectures	1313	// the >= 0x80 is false on most architectures
1177	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1314	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1178	{	1315	{
1179	// slow path, back up and use decode_str	1316	// slow path, back up and use decode_str
1180	SV *key = decode_str (dec);	1317	SV *key = decode_str (dec);
1181	if (!key)	1318	if (!key)
…		…
1329	case 't':	1466	case 't':
1330	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1467	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331	{	1468	{
1332	dec->cur += 4;	1469	dec->cur += 4;
1333	#if JSON_SLOW	1470	#if JSON_SLOW
1334	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1471	json_true = get_bool ("JSON::XS::true");
1335	#endif	1472	#endif
1336	return SvREFCNT_inc (json_true);	1473	return newSVsv (json_true);
1337	}	1474	}
1338	else	1475	else
1339	ERR ("'true' expected");	1476	ERR ("'true' expected");
1340		1477
1341	break;	1478	break;
…		…
1343	case 'f':	1480	case 'f':
1344	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1481	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345	{	1482	{
1346	dec->cur += 5;	1483	dec->cur += 5;
1347	#if JSON_SLOW	1484	#if JSON_SLOW
1348	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1485	json_false = get_bool ("JSON::XS::false");
1349	#endif	1486	#endif
1350	return SvREFCNT_inc (json_false);	1487	return newSVsv (json_false);
1351	}	1488	}
1352	else	1489	else
1353	ERR ("'false' expected");	1490	ERR ("'false' expected");
1354		1491
1355	break;	1492	break;
…		…
1373	fail:	1510	fail:
1374	return 0;	1511	return 0;
1375	}	1512	}
1376		1513
1377	static SV *	1514	static SV *
1378	decode_json (SV string, JSON json, UV *offset_return)	1515	decode_json (SV string, JSON json, char **offset_return)
1379	{	1516	{
1380	dec_t dec;	1517	dec_t dec;
1381	UV offset;
1382	SV *sv;	1518	SV *sv;
1383		1519
		1520	/* work around bugs in 5.10 where manipulating magic values
		1521	* will perl ignore the magic in subsequent accesses
		1522	*/
1384	SvGETMAGIC (string);	1523	/SvGETMAGIC (string);/
		1524	if (SvMAGICAL (string))
		1525	string = sv_2mortal (newSVsv (string));
		1526
1385	SvUPGRADE (string, SVt_PV);	1527	SvUPGRADE (string, SVt_PV);
1386		1528
1387	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1529	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1530	* assertion with -DDEBUGGING, although SvCUR is documented to
		1531	* return the xpv_cur field which certainly exists after upgrading.
		1532	* according to nicholas clark, calling SvPOK fixes this.
		1533	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1534	* and hope for the best.
		1535	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1536	* assertion business is seriously broken, try yet another workaround
		1537	* for the broken -DDEBUGGING.
		1538	*/
		1539	{
		1540	#ifdef DEBUGGING
		1541	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1542	#else
		1543	STRLEN offset = SvCUR (string);
		1544	#endif
		1545
		1546	if (offset > json->max_size && json->max_size)
1388	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1547	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1389	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1548	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1549	}
1390		1550
1391	if (json->flags & F_UTF8)	1551	if (json->flags & F_UTF8)
1392	sv_utf8_downgrade (string, 0);	1552	sv_utf8_downgrade (string, 0);
1393	else	1553	else
1394	sv_utf8_upgrade (string);	1554	sv_utf8_upgrade (string);
1395		1555
1396	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1556	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1397		1557
1398	dec.json = *json;	1558	dec.json = *json;
1399	dec.cur = SvPVX (string);	1559	dec.cur = SvPVX (string);
1400	dec.end = SvEND (string);	1560	dec.end = SvEND (string);
1401	dec.err = 0;	1561	dec.err = 0;
1402	dec.depth = 0;	1562	dec.depth = 0;
1403	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1404		1563
1405	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1564	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1406	dec.json.flags \|= F_HOOK;	1565	dec.json.flags \|= F_HOOK;
1407		1566
1408	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1567	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1409		1568
1410	decode_ws (&dec);	1569	decode_ws (&dec);
1411	sv = decode_sv (&dec);	1570	sv = decode_sv (&dec);
		1571
		1572	if (offset_return)
		1573	*offset_return = dec.cur;
1412		1574
1413	if (!(offset_return \|\| !sv))	1575	if (!(offset_return \|\| !sv))
1414	{	1576	{
1415	// check for trailing garbage	1577	// check for trailing garbage
1416	decode_ws (&dec);	1578	decode_ws (&dec);
…		…
1419	{	1581	{
1420	dec.err = "garbage after JSON object";	1582	dec.err = "garbage after JSON object";
1421	SvREFCNT_dec (sv);	1583	SvREFCNT_dec (sv);
1422	sv = 0;	1584	sv = 0;
1423	}	1585	}
1424	}
1425
1426	if (offset_return \|\| !sv)
1427	{
1428	offset = dec.json.flags & F_UTF8
1429	? dec.cur - SvPVX (string)
1430	: utf8_distance (dec.cur, SvPVX (string));
1431
1432	if (offset_return)
1433	*offset_return = offset;
1434	}	1586	}
1435		1587
1436	if (!sv)	1588	if (!sv)
1437	{	1589	{
1438	SV *uni = sv_newmortal ();	1590	SV *uni = sv_newmortal ();
…		…
1444	SAVEVPTR (PL_curcop);	1596	SAVEVPTR (PL_curcop);
1445	PL_curcop = &cop;	1597	PL_curcop = &cop;
1446	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1598	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1447	LEAVE;	1599	LEAVE;
1448		1600
1449	croak ("%s, at character offset %d [\"%s\"]",	1601	croak ("%s, at character offset %d (before \"%s\")",
1450	dec.err,	1602	dec.err,
1451	(int)offset,	1603	ptr_to_index (string, dec.cur),
1452	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1604	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1453	}	1605	}
1454		1606
1455	sv = sv_2mortal (sv);	1607	sv = sv_2mortal (sv);
1456		1608
1457	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1609	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1458	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1610	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1459		1611
1460	return sv;	1612	return sv;
		1613	}
		1614
		1615	/////////////////////////////////////////////////////////////////////////////
		1616	// incremental parser
		1617
		1618	static void
		1619	incr_parse (JSON *self)
		1620	{
		1621	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1622
		1623	// the state machine here is a bit convoluted and could be simplified a lot
		1624	// but this would make it slower, so...
		1625
		1626	for (;;)
		1627	{
		1628	//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
		1629	switch (self->incr_mode)
		1630	{
		1631	// only used for initial whitespace skipping
		1632	case INCR_M_WS:
		1633	for (;;)
		1634	{
		1635	if (*p > 0x20)
		1636	{
		1637	if (*p == '#')
		1638	{
		1639	self->incr_mode = INCR_M_C0;
		1640	goto incr_m_c;
		1641	}
		1642	else
		1643	{
		1644	self->incr_mode = INCR_M_JSON;
		1645	goto incr_m_json;
		1646	}
		1647	}
		1648	else if (!*p)
		1649	goto interrupt;
		1650
		1651	++p;
		1652	}
		1653
		1654	// skip a single char inside a string (for \\-processing)
		1655	case INCR_M_BS:
		1656	if (!*p)
		1657	goto interrupt;
		1658
		1659	++p;
		1660	self->incr_mode = INCR_M_STR;
		1661	goto incr_m_str;
		1662
		1663	// inside #-style comments
		1664	case INCR_M_C0:
		1665	case INCR_M_C1:
		1666	incr_m_c:
		1667	for (;;)
		1668	{
		1669	if (*p == '\n')
		1670	{
		1671	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1672	break;
		1673	}
		1674	else if (!*p)
		1675	goto interrupt;
		1676
		1677	++p;
		1678	}
		1679
		1680	break;
		1681
		1682	// inside a string
		1683	case INCR_M_STR:
		1684	incr_m_str:
		1685	for (;;)
		1686	{
		1687	if (*p == '"')
		1688	{
		1689	++p;
		1690	self->incr_mode = INCR_M_JSON;
		1691
		1692	if (!self->incr_nest)
		1693	goto interrupt;
		1694
		1695	goto incr_m_json;
		1696	}
		1697	else if (*p == '\\')
		1698	{
		1699	++p; // "virtually" consumes character after \
		1700
		1701	if (!*p) // if at end of string we have to switch modes
		1702	{
		1703	self->incr_mode = INCR_M_BS;
		1704	goto interrupt;
		1705	}
		1706	}
		1707	else if (!*p)
		1708	goto interrupt;
		1709
		1710	++p;
		1711	}
		1712
		1713	// after initial ws, outside string
		1714	case INCR_M_JSON:
		1715	incr_m_json:
		1716	for (;;)
		1717	{
		1718	switch (*p++)
		1719	{
		1720	case 0:
		1721	--p;
		1722	goto interrupt;
		1723
		1724	case 0x09:
		1725	case 0x0a:
		1726	case 0x0d:
		1727	case 0x20:
		1728	if (!self->incr_nest)
		1729	{
		1730	--p; // do not eat the whitespace, let the next round do it
		1731	goto interrupt;
		1732	}
		1733	break;
		1734
		1735	case '"':
		1736	self->incr_mode = INCR_M_STR;
		1737	goto incr_m_str;
		1738
		1739	case '[':
		1740	case '{':
		1741	if (++self->incr_nest > self->max_depth)
		1742	croak (ERR_NESTING_EXCEEDED);
		1743	break;
		1744
		1745	case ']':
		1746	case '}':
		1747	if (--self->incr_nest <= 0)
		1748	goto interrupt;
		1749	break;
		1750
		1751	case '#':
		1752	self->incr_mode = INCR_M_C1;
		1753	goto incr_m_c;
		1754	}
		1755	}
		1756	}
		1757
		1758	modechange:
		1759	;
		1760	}
		1761
		1762	interrupt:
		1763	self->incr_pos = p - SvPVX (self->incr_text);
		1764	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
		1765	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1461	}	1766	}
1462		1767
1463	/////////////////////////////////////////////////////////////////////////////	1768	/////////////////////////////////////////////////////////////////////////////
1464	// XS interface functions	1769	// XS interface functions
1465		1770
…		…
1477	: -1;	1782	: -1;
1478		1783
1479	json_stash = gv_stashpv ("JSON::XS" , 1);	1784	json_stash = gv_stashpv ("JSON::XS" , 1);
1480	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1785	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481		1786
1482	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1787	json_true = get_bool ("JSON::XS::true");
1483	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1788	json_false = get_bool ("JSON::XS::false");
		1789
		1790	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1484	}	1791	}
1485		1792
1486	PROTOTYPES: DISABLE	1793	PROTOTYPES: DISABLE
1487		1794
1488	void CLONE (...)	1795	void CLONE (...)
…		…
1493	void new (char *klass)	1800	void new (char *klass)
1494	PPCODE:	1801	PPCODE:
1495	{	1802	{
1496	SV *pv = NEWSV (0, sizeof (JSON));	1803	SV *pv = NEWSV (0, sizeof (JSON));
1497	SvPOK_only (pv);	1804	SvPOK_only (pv);
1498	Zero (SvPVX (pv), 1, JSON);	1805	json_init ((JSON *)SvPVX (pv));
1499	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500	XPUSHs (sv_2mortal (sv_bless (	1806	XPUSHs (sv_2mortal (sv_bless (
1501	newRV_noinc (pv),	1807	newRV_noinc (pv),
1502	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1808	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503	)));	1809	)));
1504	}	1810	}
…		…
1516	allow_nonref = F_ALLOW_NONREF	1822	allow_nonref = F_ALLOW_NONREF
1517	shrink = F_SHRINK	1823	shrink = F_SHRINK
1518	allow_blessed = F_ALLOW_BLESSED	1824	allow_blessed = F_ALLOW_BLESSED
1519	convert_blessed = F_CONV_BLESSED	1825	convert_blessed = F_CONV_BLESSED
1520	relaxed = F_RELAXED	1826	relaxed = F_RELAXED
		1827	allow_unknown = F_ALLOW_UNKNOWN
1521	PPCODE:	1828	PPCODE:
1522	{	1829	{
1523	if (enable)	1830	if (enable)
1524	self->flags \|= ix;	1831	self->flags \|= ix;
1525	else	1832	else
…		…
1540	get_allow_nonref = F_ALLOW_NONREF	1847	get_allow_nonref = F_ALLOW_NONREF
1541	get_shrink = F_SHRINK	1848	get_shrink = F_SHRINK
1542	get_allow_blessed = F_ALLOW_BLESSED	1849	get_allow_blessed = F_ALLOW_BLESSED
1543	get_convert_blessed = F_CONV_BLESSED	1850	get_convert_blessed = F_CONV_BLESSED
1544	get_relaxed = F_RELAXED	1851	get_relaxed = F_RELAXED
		1852	get_allow_unknown = F_ALLOW_UNKNOWN
1545	PPCODE:	1853	PPCODE:
1546	XPUSHs (boolSV (self->flags & ix));	1854	XPUSHs (boolSV (self->flags & ix));
1547		1855
1548	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1856	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1549	PPCODE:	1857	PPCODE:
1550	{	1858	self->max_depth = max_depth;
1551	UV log2 = 0;
1552
1553	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1554
1555	while ((1UL << log2) < max_depth)
1556	++log2;
1557
1558	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1559
1560	XPUSHs (ST (0));	1859	XPUSHs (ST (0));
1561	}
1562		1860
1563	U32 get_max_depth (JSON *self)	1861	U32 get_max_depth (JSON *self)
1564	CODE:	1862	CODE:
1565	RETVAL = DEC_DEPTH (self->flags);	1863	RETVAL = self->max_depth;
1566	OUTPUT:	1864	OUTPUT:
1567	RETVAL	1865	RETVAL
1568		1866
1569	void max_size (JSON *self, UV max_size = 0)	1867	void max_size (JSON *self, U32 max_size = 0)
1570	PPCODE:	1868	PPCODE:
1571	{	1869	self->max_size = max_size;
1572	UV log2 = 0;
1573
1574	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1575	if (max_size == 1) max_size = 2;
1576
1577	while ((1UL << log2) < max_size)
1578	++log2;
1579
1580	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1581
1582	XPUSHs (ST (0));	1870	XPUSHs (ST (0));
1583	}
1584		1871
1585	int get_max_size (JSON *self)	1872	int get_max_size (JSON *self)
1586	CODE:	1873	CODE:
1587	RETVAL = DEC_SIZE (self->flags);	1874	RETVAL = self->max_size;
1588	OUTPUT:	1875	OUTPUT:
1589	RETVAL	1876	RETVAL
1590		1877
1591	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1878	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1592	PPCODE:	1879	PPCODE:
…		…
1628	XPUSHs (decode_json (jsonstr, self, 0));	1915	XPUSHs (decode_json (jsonstr, self, 0));
1629		1916
1630	void decode_prefix (JSON self, SV jsonstr)	1917	void decode_prefix (JSON self, SV jsonstr)
1631	PPCODE:	1918	PPCODE:
1632	{	1919	{
1633	UV offset;	1920	char *offset;
1634	EXTEND (SP, 2);	1921	EXTEND (SP, 2);
1635	PUSHs (decode_json (jsonstr, self, &offset));	1922	PUSHs (decode_json (jsonstr, self, &offset));
1636	PUSHs (sv_2mortal (newSVuv (offset)));	1923	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
		1924	}
		1925
		1926	void incr_parse (JSON self, SV jsonstr = 0)
		1927	PPCODE:
		1928	{
		1929	if (!self->incr_text)
		1930	self->incr_text = newSVpvn ("", 0);
		1931
		1932	// append data, if any
		1933	if (jsonstr)
		1934	{
		1935	if (SvUTF8 (jsonstr))
		1936	{
		1937	if (!SvUTF8 (self->incr_text))
		1938	{
		1939	/* utf-8-ness differs, need to upgrade */
		1940	sv_utf8_upgrade (self->incr_text);
		1941
		1942	if (self->incr_pos)
		1943	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1944	- (U8 *)SvPVX (self->incr_text);
		1945	}
		1946	}
		1947	else if (SvUTF8 (self->incr_text))
		1948	sv_utf8_upgrade (jsonstr);
		1949
		1950	{
		1951	STRLEN len;
		1952	const char *str = SvPV (jsonstr, len);
		1953	STRLEN cur = SvCUR (self->incr_text);
		1954
		1955	if (SvLEN (self->incr_text) <= cur + len)
		1956	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1957
		1958	Move (str, SvEND (self->incr_text), len, char);
		1959	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1960	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1961	}
		1962	}
		1963
		1964	if (GIMME_V != G_VOID)
		1965	do
		1966	{
		1967	char *offset;
		1968
		1969	if (!INCR_DONE (self))
		1970	{
		1971	incr_parse (self);
		1972
		1973	if (self->incr_pos > self->max_size && self->max_size)
		1974	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1975	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1976
		1977	if (!INCR_DONE (self))
		1978	break;
		1979	}
		1980
		1981	XPUSHs (decode_json (self->incr_text, self, &offset));
		1982
		1983	self->incr_pos -= offset - SvPVX (self->incr_text);
		1984	self->incr_nest = 0;
		1985	self->incr_mode = 0;
		1986
		1987	sv_chop (self->incr_text, offset);
		1988	}
		1989	while (GIMME_V == G_ARRAY);
		1990	}
		1991
		1992	SV incr_text (JSON self)
		1993	ATTRS: lvalue
		1994	CODE:
		1995	{
		1996	if (self->incr_pos)
		1997	croak ("incr_text can not be called when the incremental parser already started parsing");
		1998
		1999	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		2000	}
		2001	OUTPUT:
		2002	RETVAL
		2003
		2004	void incr_skip (JSON *self)
		2005	CODE:
		2006	{
		2007	if (self->incr_pos)
		2008	{
		2009	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		2010	self->incr_pos = 0;
		2011	self->incr_nest = 0;
		2012	self->incr_mode = 0;
		2013	}
		2014	}
		2015
		2016	void incr_reset (JSON *self)
		2017	CODE:
		2018	{
		2019	SvREFCNT_dec (self->incr_text);
		2020	self->incr_text = 0;
		2021	self->incr_pos = 0;
		2022	self->incr_nest = 0;
		2023	self->incr_mode = 0;
1637	}	2024	}
1638		2025
1639	void DESTROY (JSON *self)	2026	void DESTROY (JSON *self)
1640	CODE:	2027	CODE:
1641	SvREFCNT_dec (self->cb_sk_object);	2028	SvREFCNT_dec (self->cb_sk_object);
1642	SvREFCNT_dec (self->cb_object);	2029	SvREFCNT_dec (self->cb_object);
		2030	SvREFCNT_dec (self->incr_text);
1643		2031
1644	PROTOTYPES: ENABLE	2032	PROTOTYPES: ENABLE
1645		2033
1646	void encode_json (SV *scalar)	2034	void encode_json (SV *scalar)
		2035	ALIAS:
		2036	to_json_ = 0
		2037	encode_json = F_UTF8
1647	PPCODE:	2038	PPCODE:
1648	{	2039	{
1649	JSON json = { F_DEFAULT \| F_UTF8 };	2040	JSON json;
		2041	json_init (&json);
		2042	json.flags \|= ix;
1650	XPUSHs (encode_json (scalar, &json));	2043	XPUSHs (encode_json (scalar, &json));
1651	}	2044	}
1652		2045
1653	void decode_json (SV *jsonstr)	2046	void decode_json (SV *jsonstr)
		2047	ALIAS:
		2048	from_json_ = 0
		2049	decode_json = F_UTF8
1654	PPCODE:	2050	PPCODE:
1655	{	2051	{
1656	JSON json = { F_DEFAULT \| F_UTF8 };	2052	JSON json;
		2053	json_init (&json);
		2054	json.flags \|= ix;
1657	XPUSHs (decode_json (jsonstr, &json, 0));	2055	XPUSHs (decode_json (jsonstr, &json, 0));
1658	}	2056	}
1659		2057

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.75 by root, Wed Mar 19 15:37:54 2008 UTC vs. Revision 1.106 by root, Tue Jan 19 01:36:34 2010 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.75 by root, Wed Mar 19 15:37:54 2008 UTC vs.
Revision 1.106 by root, Tue Jan 19 01:36:34 2010 UTC