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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.105 by root, Tue Jan 19 01:07:27 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)
		198	{
		199	UV uaccum = 0;
		200	int eaccum = 0;
		201
		202	for (;;)
		203	{
		204	U8 dig = (U8)*s - '0';
		205
		206	if (expect_false (dig >= 10))
		207	{
		208	if (dig == (U8)((U8)'.' - (U8)'0'))
		209	{
		210	++s;
		211	json_atof_scan1 (s, accum, expo, 1);
		212	}
		213	else if ((dig \| ' ') == 'e' - '0')
		214	{
		215	int exp2 = 0;
		216	int neg = 0;
		217
		218	++s;
		219
		220	if (*s == '-')
		221	{
		222	++s;
		223	neg = 1;
		224	}
		225	else if (*s == '+')
		226	++s;
		227
		228	while ((dig = (U8)*s - '0') < 10)
		229	exp2 = exp2 * 10 + *s++ - '0';
		230
		231	*expo += neg ? -exp2 : exp2;
		232	}
		233
		234	break;
		235	}
		236
		237	++s;
		238
		239	uaccum = uaccum * 10 + dig;
		240	++eaccum;
		241
		242	// if we have too many digits, then recurse for more
		243	// we actually do this for rather few digits
		244	if (uaccum >= (UV_MAX - 9) / 10)
		245	{
		246	if (postdp) *expo -= eaccum;
		247	json_atof_scan1 (s, accum, expo, postdp);
		248	if (postdp) *expo += eaccum;
		249
		250	break;
		251	}
		252	}
		253
		254	// this relies greatly on the quality of the pow ()
		255	// implementation of the platform, but a good
		256	// implementation is hard to beat.
		257	if (postdp) *expo -= eaccum;
		258	accum += uaccum Perl_pow (10., *expo);
		259	*expo += eaccum;
		260	}
		261
		262	static NV
		263	json_atof (const char *s)
		264	{
		265	NV accum = 0.;
		266	int expo = 0;
		267	int neg = 0;
		268
		269	if (*s == '-')
		270	{
		271	++s;
		272	neg = 1;
		273	}
		274
		275	json_atof_scan1 (s, &accum, &expo, 0);
		276
		277	return neg ? -accum : accum;
		278	}
149	/////////////////////////////////////////////////////////////////////////////	279	/////////////////////////////////////////////////////////////////////////////
150	// encoder	280	// encoder
151		281
152	// structure used for encoding JSON	282	// structure used for encoding JSON
153	typedef struct	283	typedef struct
…		…
155	char *cur; // SvPVX (sv) + current output position	285	char *cur; // SvPVX (sv) + current output position
156	char *end; // SvEND (sv)	286	char *end; // SvEND (sv)
157	SV *sv; // result scalar	287	SV *sv; // result scalar
158	JSON json;	288	JSON json;
159	U32 indent; // indentation level	289	U32 indent; // indentation level
160	U32 maxdepth; // max. indentation/recursion level
161	UV limit; // escape character values >= this value when encoding	290	UV limit; // escape character values >= this value when encoding
162	} enc_t;	291	} enc_t;
163		292
164	INLINE void	293	INLINE void
165	need (enc_t *enc, STRLEN len)	294	need (enc_t *enc, STRLEN len)
166	{	295	{
167	if (expect_false (enc->cur + len >= enc->end))	296	if (expect_false (enc->cur + len >= enc->end))
168	{	297	{
169	STRLEN cur = enc->cur - SvPVX (enc->sv);	298	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
170	SvGROW (enc->sv, cur + len + 1);	299	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
171	enc->cur = SvPVX (enc->sv) + cur;	300	enc->cur = SvPVX (enc->sv) + cur;
172	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	301	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
173	}	302	}
174	}	303	}
175		304
…		…
250	(int)((uch - 0x10000) % 0x400 + 0xDC00));	379	(int)((uch - 0x10000) % 0x400 + 0xDC00));
251	enc->cur += 12;	380	enc->cur += 12;
252	}	381	}
253	else	382	else
254	{	383	{
255	static char hexdigit [16] = "0123456789abcdef";
256	need (enc, len += 5);	384	need (enc, len += 5);
257	*enc->cur++ = '\\';	385	*enc->cur++ = '\\';
258	*enc->cur++ = 'u';	386	*enc->cur++ = 'u';
259	*enc->cur++ = hexdigit [ uch >> 12 ];	387	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
260	*enc->cur++ = hexdigit [(uch >> 8) & 15];	388	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
261	*enc->cur++ = hexdigit [(uch >> 4) & 15];	389	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
262	*enc->cur++ = hexdigit [(uch >> 0) & 15];	390	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
263	}	391	}
264		392
265	str += clen;	393	str += clen;
266	}	394	}
267	else if (enc->json.flags & F_LATIN1)	395	else if (enc->json.flags & F_LATIN1)
…		…
338	static void	466	static void
339	encode_av (enc_t enc, AV av)	467	encode_av (enc_t enc, AV av)
340	{	468	{
341	int i, len = av_len (av);	469	int i, len = av_len (av);
342		470
343	if (enc->indent >= enc->maxdepth)	471	if (enc->indent >= enc->json.max_depth)
344	croak ("data structure too deep (hit recursion limit)");	472	croak (ERR_NESTING_EXCEEDED);
345		473
346	encode_ch (enc, '[');	474	encode_ch (enc, '[');
347		475
348	if (len >= 0)	476	if (len >= 0)
349	{	477	{
…		…
423		551
424	static void	552	static void
425	encode_hv (enc_t enc, HV hv)	553	encode_hv (enc_t enc, HV hv)
426	{	554	{
427	HE *he;	555	HE *he;
428	int count;
429		556
430	if (enc->indent >= enc->maxdepth)	557	if (enc->indent >= enc->json.max_depth)
431	croak ("data structure too deep (hit recursion limit)");	558	croak (ERR_NESTING_EXCEEDED);
432		559
433	encode_ch (enc, '{');	560	encode_ch (enc, '{');
434		561
435	// for canonical output we have to sort by keys first	562	// for canonical output we have to sort by keys first
436	// actually, this is mostly due to the stupid so-called	563	// actually, this is mostly due to the stupid so-called
437	// security workaround added somewhere in 5.8.x.	564	// security workaround added somewhere in 5.8.x
438	// that randomises hash orderings	565	// that randomises hash orderings
439	if (enc->json.flags & F_CANONICAL)	566	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
440	{	567	{
441	int count = hv_iterinit (hv);	568	int count = hv_iterinit (hv);
442		569
443	if (SvMAGICAL (hv))	570	if (SvMAGICAL (hv))
444	{	571	{
…		…
617		744
618	if (len == 1 && *pv == '1')	745	if (len == 1 && *pv == '1')
619	encode_str (enc, "true", 4, 0);	746	encode_str (enc, "true", 4, 0);
620	else if (len == 1 && *pv == '0')	747	else if (len == 1 && *pv == '0')
621	encode_str (enc, "false", 5, 0);	748	encode_str (enc, "false", 5, 0);
		749	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		750	encode_str (enc, "null", 4, 0);
622	else	751	else
623	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	752	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
624	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	753	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625	}	754	}
		755	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		756	encode_str (enc, "null", 4, 0);
626	else	757	else
627	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	758	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
628	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	759	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629	}	760	}
630		761
…		…
692	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	823	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693	}	824	}
694	}	825	}
695	else if (SvROK (sv))	826	else if (SvROK (sv))
696	encode_rv (enc, SvRV (sv));	827	encode_rv (enc, SvRV (sv));
697	else if (!SvOK (sv))	828	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
698	encode_str (enc, "null", 4, 0);	829	encode_str (enc, "null", 4, 0);
699	else	830	else
700	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	831	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
701	SvPV_nolen (sv), SvFLAGS (sv));	832	SvPV_nolen (sv), SvFLAGS (sv));
702	}	833	}
…		…
712	enc.json = *json;	843	enc.json = *json;
713	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	844	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
714	enc.cur = SvPVX (enc.sv);	845	enc.cur = SvPVX (enc.sv);
715	enc.end = SvEND (enc.sv);	846	enc.end = SvEND (enc.sv);
716	enc.indent = 0;	847	enc.indent = 0;
717	enc.maxdepth = DEC_DEPTH (enc.json.flags);
718	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	848	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719	: enc.json.flags & F_LATIN1 ? 0x000100UL	849	: enc.json.flags & F_LATIN1 ? 0x000100UL
720	: 0x110000UL;	850	: 0x110000UL;
721		851
722	SvPOK_only (enc.sv);	852	SvPOK_only (enc.sv);
723	encode_sv (&enc, scalar);	853	encode_sv (&enc, scalar);
		854	encode_nl (&enc);
724		855
725	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	856	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
726	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	857	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
727		858
728	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	859	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
789	if (*dec->cur != ch) \	920	if (*dec->cur != ch) \
790	ERR (# ch " expected"); \	921	ERR (# ch " expected"); \
791	++dec->cur; \	922	++dec->cur; \
792	SE	923	SE
793		924
794	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	925	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
795	#define DEC_DEC_DEPTH --dec->depth	926	#define DEC_DEC_DEPTH --dec->depth
796		927
797	static SV decode_sv (dec_t dec);	928	static SV decode_sv (dec_t dec);
798		929
799	static signed char decode_hexdigit[256];	930	static signed char decode_hexdigit[256];
…		…
908	else if (expect_true (ch >= 0x20 && ch < 0x80))	1039	else if (expect_true (ch >= 0x20 && ch < 0x80))
909	*cur++ = ch;	1040	*cur++ = ch;
910	else if (ch >= 0x80)	1041	else if (ch >= 0x80)
911	{	1042	{
912	STRLEN clen;	1043	STRLEN clen;
913	UV uch;
914		1044
915	--dec_cur;	1045	--dec_cur;
916		1046
917	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1047	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
918	if (clen == (STRLEN)-1)	1048	if (clen == (STRLEN)-1)
919	ERR ("malformed UTF-8 character in JSON string");	1049	ERR ("malformed UTF-8 character in JSON string");
920		1050
921	do	1051	do
922	cur++ = dec_cur++;	1052	cur++ = dec_cur++;
…		…
939	{	1069	{
940	STRLEN len = cur - buf;	1070	STRLEN len = cur - buf;
941		1071
942	if (sv)	1072	if (sv)
943	{	1073	{
944	SvGROW (sv, SvCUR (sv) + len + 1);	1074	STRLEN cur = SvCUR (sv);
		1075
		1076	if (SvLEN (sv) <= cur + len)
		1077	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1078
945	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1079	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
946	SvCUR_set (sv, SvCUR (sv) + len);	1080	SvCUR_set (sv, SvCUR (sv) + len);
947	}	1081	}
948	else	1082	else
949	sv = newSVpvn (buf, len);	1083	sv = newSVpvn (buf, len);
…		…
1040		1174
1041	// special case the rather common 1..5-digit-int case	1175	// special case the rather common 1..5-digit-int case
1042	if (*start == '-')	1176	if (*start == '-')
1043	switch (len)	1177	switch (len)
1044	{	1178	{
1045	case 2: return newSViv (-( start [1] - '0' * 1));	1179	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1046	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1180	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));	1181	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));	1182	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));	1183	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1050	}	1184	}
1051	else	1185	else
1052	switch (len)	1186	switch (len)
1053	{	1187	{
1054	case 1: return newSViv ( start [0] - '0' * 1);	1188	case 1: return newSViv ( start [0] - '0' * 1);
1055	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1189	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);	1190	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);	1191	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);	1192	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1059	}	1193	}
1060		1194
1061	{	1195	{
1062	UV uv;	1196	UV uv;
1063	int numtype = grok_number (start, len, &uv);	1197	int numtype = grok_number (start, len, &uv);
…		…
1072	}	1206	}
1073		1207
1074	len -= *start == '-' ? 1 : 0;	1208	len -= *start == '-' ? 1 : 0;
1075		1209
1076	// does not fit into IV or UV, try NV	1210	// does not fit into IV or UV, try NV
1077	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1211	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	1212	// fits into NV without loss of precision
1083	return newSVnv (Atof (start));	1213	return newSVnv (json_atof (start));
1084		1214
1085	// everything else fails, convert it to a string	1215	// everything else fails, convert it to a string
1086	return newSVpvn (start, dec->cur - start);	1216	return newSVpvn (start, dec->cur - start);
1087	}	1217	}
1088		1218
1089	// loss of precision here	1219	// loss of precision here
1090	return newSVnv (Atof (start));	1220	return newSVnv (json_atof (start));
1091		1221
1092	fail:	1222	fail:
1093	return 0;	1223	return 0;
1094	}	1224	}
1095		1225
…		…
1171	char *p = dec->cur;	1301	char *p = dec->cur;
1172	char *e = p + 24; // only try up to 24 bytes	1302	char *e = p + 24; // only try up to 24 bytes
1173		1303
1174	for (;;)	1304	for (;;)
1175	{	1305	{
1176	// the >= 0x80 is true on most architectures	1306	// the >= 0x80 is false on most architectures
1177	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1307	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1178	{	1308	{
1179	// slow path, back up and use decode_str	1309	// slow path, back up and use decode_str
1180	SV *key = decode_str (dec);	1310	SV *key = decode_str (dec);
1181	if (!key)	1311	if (!key)
…		…
1329	case 't':	1459	case 't':
1330	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1460	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331	{	1461	{
1332	dec->cur += 4;	1462	dec->cur += 4;
1333	#if JSON_SLOW	1463	#if JSON_SLOW
1334	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1464	json_true = get_bool ("JSON::XS::true");
1335	#endif	1465	#endif
1336	return SvREFCNT_inc (json_true);	1466	return newSVsv (json_true);
1337	}	1467	}
1338	else	1468	else
1339	ERR ("'true' expected");	1469	ERR ("'true' expected");
1340		1470
1341	break;	1471	break;
…		…
1343	case 'f':	1473	case 'f':
1344	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1474	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345	{	1475	{
1346	dec->cur += 5;	1476	dec->cur += 5;
1347	#if JSON_SLOW	1477	#if JSON_SLOW
1348	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1478	json_false = get_bool ("JSON::XS::false");
1349	#endif	1479	#endif
1350	return SvREFCNT_inc (json_false);	1480	return newSVsv (json_false);
1351	}	1481	}
1352	else	1482	else
1353	ERR ("'false' expected");	1483	ERR ("'false' expected");
1354		1484
1355	break;	1485	break;
…		…
1373	fail:	1503	fail:
1374	return 0;	1504	return 0;
1375	}	1505	}
1376		1506
1377	static SV *	1507	static SV *
1378	decode_json (SV string, JSON json, UV *offset_return)	1508	decode_json (SV string, JSON json, char **offset_return)
1379	{	1509	{
1380	dec_t dec;	1510	dec_t dec;
1381	UV offset;
1382	SV *sv;	1511	SV *sv;
1383		1512
		1513	/* work around bugs in 5.10 where manipulating magic values
		1514	* will perl ignore the magic in subsequent accesses
		1515	*/
1384	SvGETMAGIC (string);	1516	/SvGETMAGIC (string);/
		1517	if (SvMAGICAL (string))
		1518	string = sv_2mortal (newSVsv (string));
		1519
1385	SvUPGRADE (string, SVt_PV);	1520	SvUPGRADE (string, SVt_PV);
1386		1521
1387	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1522	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1523	* assertion with -DDEBUGGING, although SvCUR is documented to
		1524	* return the xpv_cur field which certainly exists after upgrading.
		1525	* according to nicholas clark, calling SvPOK fixes this.
		1526	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1527	* and hope for the best.
		1528	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1529	* assertion business is seriously broken, try yet another workaround
		1530	* for the broken -DDEBUGGING.
		1531	*/
		1532	{
		1533	#ifdef DEBUGGING
		1534	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1535	#else
		1536	STRLEN offset = SvCUR (string);
		1537	#endif
		1538
		1539	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",	1540	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));	1541	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1542	}
1390		1543
1391	if (json->flags & F_UTF8)	1544	if (json->flags & F_UTF8)
1392	sv_utf8_downgrade (string, 0);	1545	sv_utf8_downgrade (string, 0);
1393	else	1546	else
1394	sv_utf8_upgrade (string);	1547	sv_utf8_upgrade (string);
1395		1548
1396	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1549	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1397		1550
1398	dec.json = *json;	1551	dec.json = *json;
1399	dec.cur = SvPVX (string);	1552	dec.cur = SvPVX (string);
1400	dec.end = SvEND (string);	1553	dec.end = SvEND (string);
1401	dec.err = 0;	1554	dec.err = 0;
1402	dec.depth = 0;	1555	dec.depth = 0;
1403	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1404		1556
1405	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1557	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1406	dec.json.flags \|= F_HOOK;	1558	dec.json.flags \|= F_HOOK;
1407		1559
1408	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1560	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1409		1561
1410	decode_ws (&dec);	1562	decode_ws (&dec);
1411	sv = decode_sv (&dec);	1563	sv = decode_sv (&dec);
		1564
		1565	if (offset_return)
		1566	*offset_return = dec.cur;
1412		1567
1413	if (!(offset_return \|\| !sv))	1568	if (!(offset_return \|\| !sv))
1414	{	1569	{
1415	// check for trailing garbage	1570	// check for trailing garbage
1416	decode_ws (&dec);	1571	decode_ws (&dec);
…		…
1419	{	1574	{
1420	dec.err = "garbage after JSON object";	1575	dec.err = "garbage after JSON object";
1421	SvREFCNT_dec (sv);	1576	SvREFCNT_dec (sv);
1422	sv = 0;	1577	sv = 0;
1423	}	1578	}
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	}	1579	}
1435		1580
1436	if (!sv)	1581	if (!sv)
1437	{	1582	{
1438	SV *uni = sv_newmortal ();	1583	SV *uni = sv_newmortal ();
…		…
1444	SAVEVPTR (PL_curcop);	1589	SAVEVPTR (PL_curcop);
1445	PL_curcop = &cop;	1590	PL_curcop = &cop;
1446	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1591	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1447	LEAVE;	1592	LEAVE;
1448		1593
1449	croak ("%s, at character offset %d [\"%s\"]",	1594	croak ("%s, at character offset %d (before \"%s\")",
1450	dec.err,	1595	dec.err,
1451	(int)offset,	1596	ptr_to_index (string, dec.cur),
1452	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1597	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1453	}	1598	}
1454		1599
1455	sv = sv_2mortal (sv);	1600	sv = sv_2mortal (sv);
1456		1601
1457	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))	1602	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)");	1603	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1459		1604
1460	return sv;	1605	return sv;
		1606	}
		1607
		1608	/////////////////////////////////////////////////////////////////////////////
		1609	// incremental parser
		1610
		1611	static void
		1612	incr_parse (JSON *self)
		1613	{
		1614	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1615
		1616	// the state machine here is a bit convoluted and could be simplified a lot
		1617	// but this would make it slower, so...
		1618
		1619	for (;;)
		1620	{
		1621	//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
		1622	switch (self->incr_mode)
		1623	{
		1624	// only used for initial whitespace skipping
		1625	case INCR_M_WS:
		1626	for (;;)
		1627	{
		1628	if (*p > 0x20)
		1629	{
		1630	if (*p == '#')
		1631	{
		1632	self->incr_mode = INCR_M_C0;
		1633	goto incr_m_c;
		1634	}
		1635	else
		1636	{
		1637	self->incr_mode = INCR_M_JSON;
		1638	goto incr_m_json;
		1639	}
		1640	}
		1641	else if (!*p)
		1642	goto interrupt;
		1643
		1644	++p;
		1645	}
		1646
		1647	// skip a single char inside a string (for \\-processing)
		1648	case INCR_M_BS:
		1649	if (!*p)
		1650	goto interrupt;
		1651
		1652	++p;
		1653	self->incr_mode = INCR_M_STR;
		1654	goto incr_m_str;
		1655
		1656	// inside #-style comments
		1657	case INCR_M_C0:
		1658	case INCR_M_C1:
		1659	incr_m_c:
		1660	for (;;)
		1661	{
		1662	if (*p == '\n')
		1663	{
		1664	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1665	break;
		1666	}
		1667	else if (!*p)
		1668	goto interrupt;
		1669
		1670	++p;
		1671	}
		1672
		1673	break;
		1674
		1675	// inside a string
		1676	case INCR_M_STR:
		1677	incr_m_str:
		1678	for (;;)
		1679	{
		1680	if (*p == '"')
		1681	{
		1682	++p;
		1683	self->incr_mode = INCR_M_JSON;
		1684
		1685	if (!self->incr_nest)
		1686	goto interrupt;
		1687
		1688	goto incr_m_json;
		1689	}
		1690	else if (*p == '\\')
		1691	{
		1692	++p; // "virtually" consumes character after \
		1693
		1694	if (!*p) // if at end of string we have to switch modes
		1695	{
		1696	self->incr_mode = INCR_M_BS;
		1697	goto interrupt;
		1698	}
		1699	}
		1700	else if (!*p)
		1701	goto interrupt;
		1702
		1703	++p;
		1704	}
		1705
		1706	// after initial ws, outside string
		1707	case INCR_M_JSON:
		1708	incr_m_json:
		1709	for (;;)
		1710	{
		1711	switch (*p++)
		1712	{
		1713	case 0:
		1714	--p;
		1715	goto interrupt;
		1716
		1717	case 0x09:
		1718	case 0x0a:
		1719	case 0x0d:
		1720	case 0x20:
		1721	if (!self->incr_nest)
		1722	{
		1723	--p; // do not eat the whitespace, let the next round do it
		1724	goto interrupt;
		1725	}
		1726	break;
		1727
		1728	case '"':
		1729	self->incr_mode = INCR_M_STR;
		1730	goto incr_m_str;
		1731
		1732	case '[':
		1733	case '{':
		1734	if (++self->incr_nest > self->max_depth)
		1735	croak (ERR_NESTING_EXCEEDED);
		1736	break;
		1737
		1738	case ']':
		1739	case '}':
		1740	if (--self->incr_nest <= 0)
		1741	goto interrupt;
		1742	break;
		1743
		1744	case '#':
		1745	self->incr_mode = INCR_M_C1;
		1746	goto incr_m_c;
		1747	}
		1748	}
		1749	}
		1750
		1751	modechange:
		1752	;
		1753	}
		1754
		1755	interrupt:
		1756	self->incr_pos = p - SvPVX (self->incr_text);
		1757	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
		1758	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1461	}	1759	}
1462		1760
1463	/////////////////////////////////////////////////////////////////////////////	1761	/////////////////////////////////////////////////////////////////////////////
1464	// XS interface functions	1762	// XS interface functions
1465		1763
…		…
1477	: -1;	1775	: -1;
1478		1776
1479	json_stash = gv_stashpv ("JSON::XS" , 1);	1777	json_stash = gv_stashpv ("JSON::XS" , 1);
1480	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1778	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481		1779
1482	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1780	json_true = get_bool ("JSON::XS::true");
1483	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1781	json_false = get_bool ("JSON::XS::false");
		1782
		1783	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1484	}	1784	}
1485		1785
1486	PROTOTYPES: DISABLE	1786	PROTOTYPES: DISABLE
1487		1787
1488	void CLONE (...)	1788	void CLONE (...)
…		…
1493	void new (char *klass)	1793	void new (char *klass)
1494	PPCODE:	1794	PPCODE:
1495	{	1795	{
1496	SV *pv = NEWSV (0, sizeof (JSON));	1796	SV *pv = NEWSV (0, sizeof (JSON));
1497	SvPOK_only (pv);	1797	SvPOK_only (pv);
1498	Zero (SvPVX (pv), 1, JSON);	1798	json_init ((JSON *)SvPVX (pv));
1499	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500	XPUSHs (sv_2mortal (sv_bless (	1799	XPUSHs (sv_2mortal (sv_bless (
1501	newRV_noinc (pv),	1800	newRV_noinc (pv),
1502	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1801	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503	)));	1802	)));
1504	}	1803	}
…		…
1516	allow_nonref = F_ALLOW_NONREF	1815	allow_nonref = F_ALLOW_NONREF
1517	shrink = F_SHRINK	1816	shrink = F_SHRINK
1518	allow_blessed = F_ALLOW_BLESSED	1817	allow_blessed = F_ALLOW_BLESSED
1519	convert_blessed = F_CONV_BLESSED	1818	convert_blessed = F_CONV_BLESSED
1520	relaxed = F_RELAXED	1819	relaxed = F_RELAXED
		1820	allow_unknown = F_ALLOW_UNKNOWN
1521	PPCODE:	1821	PPCODE:
1522	{	1822	{
1523	if (enable)	1823	if (enable)
1524	self->flags \|= ix;	1824	self->flags \|= ix;
1525	else	1825	else
…		…
1540	get_allow_nonref = F_ALLOW_NONREF	1840	get_allow_nonref = F_ALLOW_NONREF
1541	get_shrink = F_SHRINK	1841	get_shrink = F_SHRINK
1542	get_allow_blessed = F_ALLOW_BLESSED	1842	get_allow_blessed = F_ALLOW_BLESSED
1543	get_convert_blessed = F_CONV_BLESSED	1843	get_convert_blessed = F_CONV_BLESSED
1544	get_relaxed = F_RELAXED	1844	get_relaxed = F_RELAXED
		1845	get_allow_unknown = F_ALLOW_UNKNOWN
1545	PPCODE:	1846	PPCODE:
1546	XPUSHs (boolSV (self->flags & ix));	1847	XPUSHs (boolSV (self->flags & ix));
1547		1848
1548	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1849	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1549	PPCODE:	1850	PPCODE:
1550	{	1851	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));	1852	XPUSHs (ST (0));
1561	}
1562		1853
1563	U32 get_max_depth (JSON *self)	1854	U32 get_max_depth (JSON *self)
1564	CODE:	1855	CODE:
1565	RETVAL = DEC_DEPTH (self->flags);	1856	RETVAL = self->max_depth;
1566	OUTPUT:	1857	OUTPUT:
1567	RETVAL	1858	RETVAL
1568		1859
1569	void max_size (JSON *self, UV max_size = 0)	1860	void max_size (JSON *self, U32 max_size = 0)
1570	PPCODE:	1861	PPCODE:
1571	{	1862	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));	1863	XPUSHs (ST (0));
1583	}
1584		1864
1585	int get_max_size (JSON *self)	1865	int get_max_size (JSON *self)
1586	CODE:	1866	CODE:
1587	RETVAL = DEC_SIZE (self->flags);	1867	RETVAL = self->max_size;
1588	OUTPUT:	1868	OUTPUT:
1589	RETVAL	1869	RETVAL
1590		1870
1591	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1871	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1592	PPCODE:	1872	PPCODE:
…		…
1628	XPUSHs (decode_json (jsonstr, self, 0));	1908	XPUSHs (decode_json (jsonstr, self, 0));
1629		1909
1630	void decode_prefix (JSON self, SV jsonstr)	1910	void decode_prefix (JSON self, SV jsonstr)
1631	PPCODE:	1911	PPCODE:
1632	{	1912	{
1633	UV offset;	1913	char *offset;
1634	EXTEND (SP, 2);	1914	EXTEND (SP, 2);
1635	PUSHs (decode_json (jsonstr, self, &offset));	1915	PUSHs (decode_json (jsonstr, self, &offset));
1636	PUSHs (sv_2mortal (newSVuv (offset)));	1916	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
		1917	}
		1918
		1919	void incr_parse (JSON self, SV jsonstr = 0)
		1920	PPCODE:
		1921	{
		1922	if (!self->incr_text)
		1923	self->incr_text = newSVpvn ("", 0);
		1924
		1925	// append data, if any
		1926	if (jsonstr)
		1927	{
		1928	if (SvUTF8 (jsonstr))
		1929	{
		1930	if (!SvUTF8 (self->incr_text))
		1931	{
		1932	/* utf-8-ness differs, need to upgrade */
		1933	sv_utf8_upgrade (self->incr_text);
		1934
		1935	if (self->incr_pos)
		1936	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		1937	- (U8 *)SvPVX (self->incr_text);
		1938	}
		1939	}
		1940	else if (SvUTF8 (self->incr_text))
		1941	sv_utf8_upgrade (jsonstr);
		1942
		1943	{
		1944	STRLEN len;
		1945	const char *str = SvPV (jsonstr, len);
		1946	STRLEN cur = SvCUR (self->incr_text);
		1947
		1948	if (SvLEN (self->incr_text) <= cur + len)
		1949	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1950
		1951	Move (str, SvEND (self->incr_text), len, char);
		1952	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		1953	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		1954	}
		1955	}
		1956
		1957	if (GIMME_V != G_VOID)
		1958	do
		1959	{
		1960	char *offset;
		1961
		1962	if (!INCR_DONE (self))
		1963	{
		1964	incr_parse (self);
		1965
		1966	if (self->incr_pos > self->max_size && self->max_size)
		1967	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1968	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1969
		1970	if (!INCR_DONE (self))
		1971	break;
		1972	}
		1973
		1974	XPUSHs (decode_json (self->incr_text, self, &offset));
		1975
		1976	self->incr_pos -= offset - SvPVX (self->incr_text);
		1977	self->incr_nest = 0;
		1978	self->incr_mode = 0;
		1979
		1980	sv_chop (self->incr_text, offset);
		1981	}
		1982	while (GIMME_V == G_ARRAY);
		1983	}
		1984
		1985	SV incr_text (JSON self)
		1986	ATTRS: lvalue
		1987	CODE:
		1988	{
		1989	if (self->incr_pos)
		1990	croak ("incr_text can not be called when the incremental parser already started parsing");
		1991
		1992	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
		1993	}
		1994	OUTPUT:
		1995	RETVAL
		1996
		1997	void incr_skip (JSON *self)
		1998	CODE:
		1999	{
		2000	if (self->incr_pos)
		2001	{
		2002	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		2003	self->incr_pos = 0;
		2004	self->incr_nest = 0;
		2005	self->incr_mode = 0;
		2006	}
		2007	}
		2008
		2009	void incr_reset (JSON *self)
		2010	CODE:
		2011	{
		2012	SvREFCNT_dec (self->incr_text);
		2013	self->incr_text = 0;
		2014	self->incr_pos = 0;
		2015	self->incr_nest = 0;
		2016	self->incr_mode = 0;
1637	}	2017	}
1638		2018
1639	void DESTROY (JSON *self)	2019	void DESTROY (JSON *self)
1640	CODE:	2020	CODE:
1641	SvREFCNT_dec (self->cb_sk_object);	2021	SvREFCNT_dec (self->cb_sk_object);
1642	SvREFCNT_dec (self->cb_object);	2022	SvREFCNT_dec (self->cb_object);
		2023	SvREFCNT_dec (self->incr_text);
1643		2024
1644	PROTOTYPES: ENABLE	2025	PROTOTYPES: ENABLE
1645		2026
1646	void encode_json (SV *scalar)	2027	void encode_json (SV *scalar)
1647	ALIAS:	2028	ALIAS:
1648	to_json_ = 0	2029	to_json_ = 0
1649	encode_json = F_UTF8	2030	encode_json = F_UTF8
1650	PPCODE:	2031	PPCODE:
1651	{	2032	{
1652	JSON json = { F_DEFAULT \| ix };	2033	JSON json;
		2034	json_init (&json);
		2035	json.flags \|= ix;
1653	XPUSHs (encode_json (scalar, &json));	2036	XPUSHs (encode_json (scalar, &json));
1654	}	2037	}
1655		2038
1656	void decode_json (SV *jsonstr)	2039	void decode_json (SV *jsonstr)
1657	ALIAS:	2040	ALIAS:
1658	from_json_ = 0	2041	from_json_ = 0
1659	decode_json = F_UTF8	2042	decode_json = F_UTF8
1660	PPCODE:	2043	PPCODE:
1661	{	2044	{
1662	JSON json = { F_DEFAULT \| ix };	2045	JSON json;
		2046	json_init (&json);
		2047	json.flags \|= ix;
1663	XPUSHs (decode_json (jsonstr, &json, 0));	2048	XPUSHs (decode_json (jsonstr, &json, 0));
1664	}	2049	}
1665		2050

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs. Revision 1.105 by root, Tue Jan 19 01:07:27 2010 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.105 by root, Tue Jan 19 01:07:27 2010 UTC