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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.78 by root, Tue Mar 25 19:31:02 2008 UTC vs.
Revision 1.104 by root, Tue Jan 19 00:31:13 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
…		…
82		77
83	enum {	78	enum {
84	INCR_M_WS = 0, // initial whitespace skipping, must be 0	79	INCR_M_WS = 0, // initial whitespace skipping, must be 0
85	INCR_M_STR, // inside string	80	INCR_M_STR, // inside string
86	INCR_M_BS, // inside backslash	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
87	INCR_M_JSON // outside anything, count nesting	84	INCR_M_JSON // outside anything, count nesting
88	};	85	};
89		86
90	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	87	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91		88
92	typedef struct {	89	typedef struct {
93	U32 flags;	90	U32 flags;
		91	U32 max_depth;
		92	STRLEN max_size;
		93
94	SV *cb_object;	94	SV *cb_object;
95	HV *cb_sk_object;	95	HV *cb_sk_object;
96		96
97	// for the incremental parser	97	// for the incremental parser
98	SV *incr_text; // the source text so far	98	SV *incr_text; // the source text so far
99	STRLEN incr_pos; // the current offset into the text	99	STRLEN incr_pos; // the current offset into the text
100	int incr_nest; // {[]}-nesting level	100	int incr_nest; // {[]}-nesting level
101	int incr_mode;	101	unsigned char incr_mode;
102	} JSON;	102	} JSON;
		103
		104	INLINE void
		105	json_init (JSON *json)
		106	{
		107	Zero (json, 1, JSON);
		108	json->max_depth = 512;
		109	}
103		110
104	/////////////////////////////////////////////////////////////////////////////	111	/////////////////////////////////////////////////////////////////////////////
105	// utility functions	112	// utility functions
106		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
107	INLINE void	125	INLINE void
108	shrink (SV *sv)	126	shrink (SV *sv)
109	{	127	{
110	sv_utf8_downgrade (sv, 1);	128	sv_utf8_downgrade (sv, 1);
		129
111	if (SvLEN (sv) > SvCUR (sv) + 1)	130	if (SvLEN (sv) > SvCUR (sv) + 1)
112	{	131	{
113	#ifdef SvPV_shrink_to_cur	132	#ifdef SvPV_shrink_to_cur
114	SvPV_shrink_to_cur (sv);	133	SvPV_shrink_to_cur (sv);
115	#elif defined (SvPV_renew)	134	#elif defined (SvPV_renew)
…		…
159	*s++ = 0x80 \| ( ch & 0x3f);	178	*s++ = 0x80 \| ( ch & 0x3f);
160		179
161	return s;	180	return s;
162	}	181	}
163		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	if (postdp) *expo -= eaccum;
		255	accum += uaccum pow (10., *expo);
		256	*expo += eaccum;
		257	}
		258
		259	static NV
		260	json_atof (const char *s)
		261	{
		262	NV accum = 0.;
		263	int expo = 0;
		264	int neg = 0;
		265
		266	if (*s == '-')
		267	{
		268	++s;
		269	neg = 1;
		270	}
		271
		272	json_atof_scan1 (s, &accum, &expo, 0);
		273
		274	return neg ? -accum : accum;
		275	}
164	/////////////////////////////////////////////////////////////////////////////	276	/////////////////////////////////////////////////////////////////////////////
165	// encoder	277	// encoder
166		278
167	// structure used for encoding JSON	279	// structure used for encoding JSON
168	typedef struct	280	typedef struct
…		…
170	char *cur; // SvPVX (sv) + current output position	282	char *cur; // SvPVX (sv) + current output position
171	char *end; // SvEND (sv)	283	char *end; // SvEND (sv)
172	SV *sv; // result scalar	284	SV *sv; // result scalar
173	JSON json;	285	JSON json;
174	U32 indent; // indentation level	286	U32 indent; // indentation level
175	U32 maxdepth; // max. indentation/recursion level
176	UV limit; // escape character values >= this value when encoding	287	UV limit; // escape character values >= this value when encoding
177	} enc_t;	288	} enc_t;
178		289
179	INLINE void	290	INLINE void
180	need (enc_t *enc, STRLEN len)	291	need (enc_t *enc, STRLEN len)
181	{	292	{
182	if (expect_false (enc->cur + len >= enc->end))	293	if (expect_false (enc->cur + len >= enc->end))
183	{	294	{
184	STRLEN cur = enc->cur - SvPVX (enc->sv);	295	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
185	SvGROW (enc->sv, cur + len + 1);	296	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
186	enc->cur = SvPVX (enc->sv) + cur;	297	enc->cur = SvPVX (enc->sv) + cur;
187	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	298	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
188	}	299	}
189	}	300	}
190		301
…		…
265	(int)((uch - 0x10000) % 0x400 + 0xDC00));	376	(int)((uch - 0x10000) % 0x400 + 0xDC00));
266	enc->cur += 12;	377	enc->cur += 12;
267	}	378	}
268	else	379	else
269	{	380	{
270	static char hexdigit [16] = "0123456789abcdef";
271	need (enc, len += 5);	381	need (enc, len += 5);
272	*enc->cur++ = '\\';	382	*enc->cur++ = '\\';
273	*enc->cur++ = 'u';	383	*enc->cur++ = 'u';
274	*enc->cur++ = hexdigit [ uch >> 12 ];	384	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
275	*enc->cur++ = hexdigit [(uch >> 8) & 15];	385	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
276	*enc->cur++ = hexdigit [(uch >> 4) & 15];	386	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
277	*enc->cur++ = hexdigit [(uch >> 0) & 15];	387	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
278	}	388	}
279		389
280	str += clen;	390	str += clen;
281	}	391	}
282	else if (enc->json.flags & F_LATIN1)	392	else if (enc->json.flags & F_LATIN1)
…		…
353	static void	463	static void
354	encode_av (enc_t enc, AV av)	464	encode_av (enc_t enc, AV av)
355	{	465	{
356	int i, len = av_len (av);	466	int i, len = av_len (av);
357		467
358	if (enc->indent >= enc->maxdepth)	468	if (enc->indent >= enc->json.max_depth)
359	croak ("data structure too deep (hit recursion limit)");	469	croak (ERR_NESTING_EXCEEDED);
360		470
361	encode_ch (enc, '[');	471	encode_ch (enc, '[');
362		472
363	if (len >= 0)	473	if (len >= 0)
364	{	474	{
…		…
439	static void	549	static void
440	encode_hv (enc_t enc, HV hv)	550	encode_hv (enc_t enc, HV hv)
441	{	551	{
442	HE *he;	552	HE *he;
443		553
444	if (enc->indent >= enc->maxdepth)	554	if (enc->indent >= enc->json.max_depth)
445	croak ("data structure too deep (hit recursion limit)");	555	croak (ERR_NESTING_EXCEEDED);
446		556
447	encode_ch (enc, '{');	557	encode_ch (enc, '{');
448		558
449	// for canonical output we have to sort by keys first	559	// for canonical output we have to sort by keys first
450	// actually, this is mostly due to the stupid so-called	560	// actually, this is mostly due to the stupid so-called
451	// security workaround added somewhere in 5.8.x.	561	// security workaround added somewhere in 5.8.x
452	// that randomises hash orderings	562	// that randomises hash orderings
453	if (enc->json.flags & F_CANONICAL)	563	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
454	{	564	{
455	int count = hv_iterinit (hv);	565	int count = hv_iterinit (hv);
456		566
457	if (SvMAGICAL (hv))	567	if (SvMAGICAL (hv))
458	{	568	{
…		…
631		741
632	if (len == 1 && *pv == '1')	742	if (len == 1 && *pv == '1')
633	encode_str (enc, "true", 4, 0);	743	encode_str (enc, "true", 4, 0);
634	else if (len == 1 && *pv == '0')	744	else if (len == 1 && *pv == '0')
635	encode_str (enc, "false", 5, 0);	745	encode_str (enc, "false", 5, 0);
		746	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		747	encode_str (enc, "null", 4, 0);
636	else	748	else
637	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	749	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
638	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	750	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
639	}	751	}
		752	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		753	encode_str (enc, "null", 4, 0);
640	else	754	else
641	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	755	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
642	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	756	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
643	}	757	}
644		758
…		…
706	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	820	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
707	}	821	}
708	}	822	}
709	else if (SvROK (sv))	823	else if (SvROK (sv))
710	encode_rv (enc, SvRV (sv));	824	encode_rv (enc, SvRV (sv));
711	else if (!SvOK (sv))	825	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
712	encode_str (enc, "null", 4, 0);	826	encode_str (enc, "null", 4, 0);
713	else	827	else
714	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	828	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
715	SvPV_nolen (sv), SvFLAGS (sv));	829	SvPV_nolen (sv), SvFLAGS (sv));
716	}	830	}
…		…
726	enc.json = *json;	840	enc.json = *json;
727	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	841	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
728	enc.cur = SvPVX (enc.sv);	842	enc.cur = SvPVX (enc.sv);
729	enc.end = SvEND (enc.sv);	843	enc.end = SvEND (enc.sv);
730	enc.indent = 0;	844	enc.indent = 0;
731	enc.maxdepth = DEC_DEPTH (enc.json.flags);
732	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	845	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
733	: enc.json.flags & F_LATIN1 ? 0x000100UL	846	: enc.json.flags & F_LATIN1 ? 0x000100UL
734	: 0x110000UL;	847	: 0x110000UL;
735		848
736	SvPOK_only (enc.sv);	849	SvPOK_only (enc.sv);
737	encode_sv (&enc, scalar);	850	encode_sv (&enc, scalar);
		851	encode_nl (&enc);
738		852
739	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	853	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
740	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	854	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
741		855
742	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	856	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
803	if (*dec->cur != ch) \	917	if (*dec->cur != ch) \
804	ERR (# ch " expected"); \	918	ERR (# ch " expected"); \
805	++dec->cur; \	919	++dec->cur; \
806	SE	920	SE
807		921
808	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	922	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
809	#define DEC_DEC_DEPTH --dec->depth	923	#define DEC_DEC_DEPTH --dec->depth
810		924
811	static SV decode_sv (dec_t dec);	925	static SV decode_sv (dec_t dec);
812		926
813	static signed char decode_hexdigit[256];	927	static signed char decode_hexdigit[256];
…		…
922	else if (expect_true (ch >= 0x20 && ch < 0x80))	1036	else if (expect_true (ch >= 0x20 && ch < 0x80))
923	*cur++ = ch;	1037	*cur++ = ch;
924	else if (ch >= 0x80)	1038	else if (ch >= 0x80)
925	{	1039	{
926	STRLEN clen;	1040	STRLEN clen;
927	UV uch;
928		1041
929	--dec_cur;	1042	--dec_cur;
930		1043
931	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);	1044	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
932	if (clen == (STRLEN)-1)	1045	if (clen == (STRLEN)-1)
933	ERR ("malformed UTF-8 character in JSON string");	1046	ERR ("malformed UTF-8 character in JSON string");
934		1047
935	do	1048	do
936	cur++ = dec_cur++;	1049	cur++ = dec_cur++;
…		…
953	{	1066	{
954	STRLEN len = cur - buf;	1067	STRLEN len = cur - buf;
955		1068
956	if (sv)	1069	if (sv)
957	{	1070	{
958	SvGROW (sv, SvCUR (sv) + len + 1);	1071	STRLEN cur = SvCUR (sv);
		1072
		1073	if (SvLEN (sv) <= cur + len)
		1074	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1075
959	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1076	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
960	SvCUR_set (sv, SvCUR (sv) + len);	1077	SvCUR_set (sv, SvCUR (sv) + len);
961	}	1078	}
962	else	1079	else
963	sv = newSVpvn (buf, len);	1080	sv = newSVpvn (buf, len);
…		…
1054		1171
1055	// special case the rather common 1..5-digit-int case	1172	// special case the rather common 1..5-digit-int case
1056	if (*start == '-')	1173	if (*start == '-')
1057	switch (len)	1174	switch (len)
1058	{	1175	{
1059	case 2: return newSViv (-( start [1] - '0' * 1));	1176	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1060	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1177	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1061	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1178	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1062	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1179	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1063	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1180	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1064	}	1181	}
1065	else	1182	else
1066	switch (len)	1183	switch (len)
1067	{	1184	{
1068	case 1: return newSViv ( start [0] - '0' * 1);	1185	case 1: return newSViv ( start [0] - '0' * 1);
1069	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1186	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1070	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1187	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1071	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1188	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1072	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1189	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1073	}	1190	}
1074		1191
1075	{	1192	{
1076	UV uv;	1193	UV uv;
1077	int numtype = grok_number (start, len, &uv);	1194	int numtype = grok_number (start, len, &uv);
…		…
1086	}	1203	}
1087		1204
1088	len -= *start == '-' ? 1 : 0;	1205	len -= *start == '-' ? 1 : 0;
1089		1206
1090	// does not fit into IV or UV, try NV	1207	// does not fit into IV or UV, try NV
1091	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)	1208	if (len <= NV_DIG)
1092	#if defined (LDBL_DIG)
1093	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1094	#endif
1095	)
1096	// fits into NV without loss of precision	1209	// fits into NV without loss of precision
1097	return newSVnv (Atof (start));	1210	return newSVnv (json_atof (start));
1098		1211
1099	// everything else fails, convert it to a string	1212	// everything else fails, convert it to a string
1100	return newSVpvn (start, dec->cur - start);	1213	return newSVpvn (start, dec->cur - start);
1101	}	1214	}
1102		1215
1103	// loss of precision here	1216	// loss of precision here
1104	return newSVnv (Atof (start));	1217	return newSVnv (json_atof (start));
1105		1218
1106	fail:	1219	fail:
1107	return 0;	1220	return 0;
1108	}	1221	}
1109		1222
…		…
1343	case 't':	1456	case 't':
1344	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1457	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1345	{	1458	{
1346	dec->cur += 4;	1459	dec->cur += 4;
1347	#if JSON_SLOW	1460	#if JSON_SLOW
1348	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1461	json_true = get_bool ("JSON::XS::true");
1349	#endif	1462	#endif
1350	return SvREFCNT_inc (json_true);	1463	return newSVsv (json_true);
1351	}	1464	}
1352	else	1465	else
1353	ERR ("'true' expected");	1466	ERR ("'true' expected");
1354		1467
1355	break;	1468	break;
…		…
1357	case 'f':	1470	case 'f':
1358	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1471	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1359	{	1472	{
1360	dec->cur += 5;	1473	dec->cur += 5;
1361	#if JSON_SLOW	1474	#if JSON_SLOW
1362	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1475	json_false = get_bool ("JSON::XS::false");
1363	#endif	1476	#endif
1364	return SvREFCNT_inc (json_false);	1477	return newSVsv (json_false);
1365	}	1478	}
1366	else	1479	else
1367	ERR ("'false' expected");	1480	ERR ("'false' expected");
1368		1481
1369	break;	1482	break;
…		…
1387	fail:	1500	fail:
1388	return 0;	1501	return 0;
1389	}	1502	}
1390		1503
1391	static SV *	1504	static SV *
1392	decode_json (SV string, JSON json, STRLEN *offset_return)	1505	decode_json (SV string, JSON json, char **offset_return)
1393	{	1506	{
1394	dec_t dec;	1507	dec_t dec;
1395	STRLEN offset;
1396	SV *sv;	1508	SV *sv;
1397		1509
		1510	/* work around bugs in 5.10 where manipulating magic values
		1511	* will perl ignore the magic in subsequent accesses
		1512	*/
1398	SvGETMAGIC (string);	1513	/SvGETMAGIC (string);/
		1514	if (SvMAGICAL (string))
		1515	string = sv_2mortal (newSVsv (string));
		1516
1399	SvUPGRADE (string, SVt_PV);	1517	SvUPGRADE (string, SVt_PV);
1400		1518
1401	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1519	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1520	* assertion with -DDEBUGGING, although SvCUR is documented to
		1521	* return the xpv_cur field which certainly exists after upgrading.
		1522	* according to nicholas clark, calling SvPOK fixes this.
		1523	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1524	* and hope for the best.
		1525	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1526	* assertion business is seriously broken, try yet another workaround
		1527	* for the broken -DDEBUGGING.
		1528	*/
		1529	{
		1530	#ifdef DEBUGGING
		1531	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1532	#else
		1533	STRLEN offset = SvCUR (string);
		1534	#endif
		1535
		1536	if (offset > json->max_size && json->max_size)
1402	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1537	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1403	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1538	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1539	}
1404		1540
1405	if (json->flags & F_UTF8)	1541	if (json->flags & F_UTF8)
1406	sv_utf8_downgrade (string, 0);	1542	sv_utf8_downgrade (string, 0);
1407	else	1543	else
1408	sv_utf8_upgrade (string);	1544	sv_utf8_upgrade (string);
1409		1545
1410	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1546	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1411		1547
1412	dec.json = *json;	1548	dec.json = *json;
1413	dec.cur = SvPVX (string);	1549	dec.cur = SvPVX (string);
1414	dec.end = SvEND (string);	1550	dec.end = SvEND (string);
1415	dec.err = 0;	1551	dec.err = 0;
1416	dec.depth = 0;	1552	dec.depth = 0;
1417	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1418		1553
1419	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1554	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1420	dec.json.flags \|= F_HOOK;	1555	dec.json.flags \|= F_HOOK;
1421		1556
1422	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1557	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1423		1558
1424	decode_ws (&dec);	1559	decode_ws (&dec);
1425	sv = decode_sv (&dec);	1560	sv = decode_sv (&dec);
		1561
		1562	if (offset_return)
		1563	*offset_return = dec.cur;
1426		1564
1427	if (!(offset_return \|\| !sv))	1565	if (!(offset_return \|\| !sv))
1428	{	1566	{
1429	// check for trailing garbage	1567	// check for trailing garbage
1430	decode_ws (&dec);	1568	decode_ws (&dec);
…		…
1433	{	1571	{
1434	dec.err = "garbage after JSON object";	1572	dec.err = "garbage after JSON object";
1435	SvREFCNT_dec (sv);	1573	SvREFCNT_dec (sv);
1436	sv = 0;	1574	sv = 0;
1437	}	1575	}
1438	}
1439
1440	if (offset_return \|\| !sv)
1441	{
1442	offset = dec.json.flags & F_UTF8
1443	? dec.cur - SvPVX (string)
1444	: utf8_distance (dec.cur, SvPVX (string));
1445
1446	if (offset_return)
1447	*offset_return = offset;
1448	}	1576	}
1449		1577
1450	if (!sv)	1578	if (!sv)
1451	{	1579	{
1452	SV *uni = sv_newmortal ();	1580	SV *uni = sv_newmortal ();
…		…
1458	SAVEVPTR (PL_curcop);	1586	SAVEVPTR (PL_curcop);
1459	PL_curcop = &cop;	1587	PL_curcop = &cop;
1460	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1588	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1461	LEAVE;	1589	LEAVE;
1462		1590
1463	croak ("%s, at character offset %d [\"%s\"]",	1591	croak ("%s, at character offset %d (before \"%s\")",
1464	dec.err,	1592	dec.err,
1465	(int)offset,	1593	ptr_to_index (string, dec.cur),
1466	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1594	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1467	}	1595	}
1468		1596
1469	sv = sv_2mortal (sv);	1597	sv = sv_2mortal (sv);
1470		1598
…		…
1479		1607
1480	static void	1608	static void
1481	incr_parse (JSON *self)	1609	incr_parse (JSON *self)
1482	{	1610	{
1483	const char *p = SvPVX (self->incr_text) + self->incr_pos;	1611	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1612
		1613	// the state machine here is a bit convoluted and could be simplified a lot
		1614	// but this would make it slower, so...
1484		1615
1485	for (;;)	1616	for (;;)
1486	{	1617	{
1487	//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	1618	//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
1488	switch (self->incr_mode)	1619	switch (self->incr_mode)
1489	{	1620	{
1490	// only used for intiial whitespace skipping	1621	// only used for initial whitespace skipping
1491	case INCR_M_WS:	1622	case INCR_M_WS:
1492	for (;;)	1623	for (;;)
1493	{	1624	{
1494	if (*p > 0x20)	1625	if (*p > 0x20)
1495	{	1626	{
		1627	if (*p == '#')
		1628	{
		1629	self->incr_mode = INCR_M_C0;
		1630	goto incr_m_c;
		1631	}
		1632	else
		1633	{
1496	self->incr_mode = INCR_M_JSON;	1634	self->incr_mode = INCR_M_JSON;
1497	goto incr_m_json;	1635	goto incr_m_json;
		1636	}
1498	}	1637	}
1499	else if (!*p)	1638	else if (!*p)
1500	goto interrupt;	1639	goto interrupt;
1501		1640
1502	++p;	1641	++p;
…		…
1508	goto interrupt;	1647	goto interrupt;
1509		1648
1510	++p;	1649	++p;
1511	self->incr_mode = INCR_M_STR;	1650	self->incr_mode = INCR_M_STR;
1512	goto incr_m_str;	1651	goto incr_m_str;
		1652
		1653	// inside #-style comments
		1654	case INCR_M_C0:
		1655	case INCR_M_C1:
		1656	incr_m_c:
		1657	for (;;)
		1658	{
		1659	if (*p == '\n')
		1660	{
		1661	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1662	break;
		1663	}
		1664	else if (!*p)
		1665	goto interrupt;
		1666
		1667	++p;
		1668	}
		1669
		1670	break;
1513		1671
1514	// inside a string	1672	// inside a string
1515	case INCR_M_STR:	1673	case INCR_M_STR:
1516	incr_m_str:	1674	incr_m_str:
1517	for (;;)	1675	for (;;)
…		…
1568	self->incr_mode = INCR_M_STR;	1726	self->incr_mode = INCR_M_STR;
1569	goto incr_m_str;	1727	goto incr_m_str;
1570		1728
1571	case '[':	1729	case '[':
1572	case '{':	1730	case '{':
1573	++self->incr_nest;	1731	if (++self->incr_nest > self->max_depth)
		1732	croak (ERR_NESTING_EXCEEDED);
1574	break;	1733	break;
1575		1734
1576	case ']':	1735	case ']':
1577	case '}':	1736	case '}':
1578	if (!--self->incr_nest)	1737	if (--self->incr_nest <= 0)
1579	goto interrupt;	1738	goto interrupt;
		1739	break;
		1740
		1741	case '#':
		1742	self->incr_mode = INCR_M_C1;
		1743	goto incr_m_c;
1580	}	1744	}
1581	}	1745	}
1582	}	1746	}
1583		1747
1584	modechange:	1748	modechange:
1585	;	1749	;
1586	}	1750	}
1587		1751
1588	interrupt:	1752	interrupt:
1589	self->incr_pos = p - SvPVX (self->incr_text);	1753	self->incr_pos = p - SvPVX (self->incr_text);
		1754	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1590	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D	1755	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1591	}	1756	}
1592		1757
1593	/////////////////////////////////////////////////////////////////////////////	1758	/////////////////////////////////////////////////////////////////////////////
1594	// XS interface functions	1759	// XS interface functions
…		…
1607	: -1;	1772	: -1;
1608		1773
1609	json_stash = gv_stashpv ("JSON::XS" , 1);	1774	json_stash = gv_stashpv ("JSON::XS" , 1);
1610	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1775	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1611		1776
1612	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1777	json_true = get_bool ("JSON::XS::true");
1613	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1778	json_false = get_bool ("JSON::XS::false");
		1779
		1780	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1614	}	1781	}
1615		1782
1616	PROTOTYPES: DISABLE	1783	PROTOTYPES: DISABLE
1617		1784
1618	void CLONE (...)	1785	void CLONE (...)
…		…
1623	void new (char *klass)	1790	void new (char *klass)
1624	PPCODE:	1791	PPCODE:
1625	{	1792	{
1626	SV *pv = NEWSV (0, sizeof (JSON));	1793	SV *pv = NEWSV (0, sizeof (JSON));
1627	SvPOK_only (pv);	1794	SvPOK_only (pv);
1628	Zero (SvPVX (pv), 1, JSON);	1795	json_init ((JSON *)SvPVX (pv));
1629	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1630	XPUSHs (sv_2mortal (sv_bless (	1796	XPUSHs (sv_2mortal (sv_bless (
1631	newRV_noinc (pv),	1797	newRV_noinc (pv),
1632	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1798	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1633	)));	1799	)));
1634	}	1800	}
…		…
1646	allow_nonref = F_ALLOW_NONREF	1812	allow_nonref = F_ALLOW_NONREF
1647	shrink = F_SHRINK	1813	shrink = F_SHRINK
1648	allow_blessed = F_ALLOW_BLESSED	1814	allow_blessed = F_ALLOW_BLESSED
1649	convert_blessed = F_CONV_BLESSED	1815	convert_blessed = F_CONV_BLESSED
1650	relaxed = F_RELAXED	1816	relaxed = F_RELAXED
		1817	allow_unknown = F_ALLOW_UNKNOWN
1651	PPCODE:	1818	PPCODE:
1652	{	1819	{
1653	if (enable)	1820	if (enable)
1654	self->flags \|= ix;	1821	self->flags \|= ix;
1655	else	1822	else
…		…
1670	get_allow_nonref = F_ALLOW_NONREF	1837	get_allow_nonref = F_ALLOW_NONREF
1671	get_shrink = F_SHRINK	1838	get_shrink = F_SHRINK
1672	get_allow_blessed = F_ALLOW_BLESSED	1839	get_allow_blessed = F_ALLOW_BLESSED
1673	get_convert_blessed = F_CONV_BLESSED	1840	get_convert_blessed = F_CONV_BLESSED
1674	get_relaxed = F_RELAXED	1841	get_relaxed = F_RELAXED
		1842	get_allow_unknown = F_ALLOW_UNKNOWN
1675	PPCODE:	1843	PPCODE:
1676	XPUSHs (boolSV (self->flags & ix));	1844	XPUSHs (boolSV (self->flags & ix));
1677		1845
1678	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1846	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1679	PPCODE:	1847	PPCODE:
1680	{	1848	self->max_depth = max_depth;
1681	UV log2 = 0;
1682
1683	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1684
1685	while ((1UL << log2) < max_depth)
1686	++log2;
1687
1688	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1689
1690	XPUSHs (ST (0));	1849	XPUSHs (ST (0));
1691	}
1692		1850
1693	U32 get_max_depth (JSON *self)	1851	U32 get_max_depth (JSON *self)
1694	CODE:	1852	CODE:
1695	RETVAL = DEC_DEPTH (self->flags);	1853	RETVAL = self->max_depth;
1696	OUTPUT:	1854	OUTPUT:
1697	RETVAL	1855	RETVAL
1698		1856
1699	void max_size (JSON *self, UV max_size = 0)	1857	void max_size (JSON *self, U32 max_size = 0)
1700	PPCODE:	1858	PPCODE:
1701	{	1859	self->max_size = max_size;
1702	UV log2 = 0;
1703
1704	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1705	if (max_size == 1) max_size = 2;
1706
1707	while ((1UL << log2) < max_size)
1708	++log2;
1709
1710	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1711
1712	XPUSHs (ST (0));	1860	XPUSHs (ST (0));
1713	}
1714		1861
1715	int get_max_size (JSON *self)	1862	int get_max_size (JSON *self)
1716	CODE:	1863	CODE:
1717	RETVAL = DEC_SIZE (self->flags);	1864	RETVAL = self->max_size;
1718	OUTPUT:	1865	OUTPUT:
1719	RETVAL	1866	RETVAL
1720		1867
1721	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1868	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1722	PPCODE:	1869	PPCODE:
…		…
1758	XPUSHs (decode_json (jsonstr, self, 0));	1905	XPUSHs (decode_json (jsonstr, self, 0));
1759		1906
1760	void decode_prefix (JSON self, SV jsonstr)	1907	void decode_prefix (JSON self, SV jsonstr)
1761	PPCODE:	1908	PPCODE:
1762	{	1909	{
1763	STRLEN offset;	1910	char *offset;
1764	EXTEND (SP, 2);	1911	EXTEND (SP, 2);
1765	PUSHs (decode_json (jsonstr, self, &offset));	1912	PUSHs (decode_json (jsonstr, self, &offset));
1766	PUSHs (sv_2mortal (newSVuv (offset)));	1913	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1767	}	1914	}
1768		1915
1769	void incr_parse (JSON self, SV jsonstr = 0)	1916	void incr_parse (JSON self, SV jsonstr = 0)
1770	PPCODE:	1917	PPCODE:
1771	{	1918	{
…		…
1773	self->incr_text = newSVpvn ("", 0);	1920	self->incr_text = newSVpvn ("", 0);
1774		1921
1775	// append data, if any	1922	// append data, if any
1776	if (jsonstr)	1923	if (jsonstr)
1777	{	1924	{
1778	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1925	if (SvUTF8 (jsonstr))
1779	{	1926	{
		1927	if (!SvUTF8 (self->incr_text))
		1928	{
1780	/* utf-8-ness differs, need to upgrade */	1929	/* utf-8-ness differs, need to upgrade */
1781	sv_utf8_upgrade (self->incr_text);	1930	sv_utf8_upgrade (self->incr_text);
1782		1931
1783	if (self->incr_pos)	1932	if (self->incr_pos)
1784	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)	1933	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1785	- (U8 *)SvPVX (self->incr_text);	1934	- (U8 *)SvPVX (self->incr_text);
		1935	}
1786	}	1936	}
		1937	else if (SvUTF8 (self->incr_text))
		1938	sv_utf8_upgrade (jsonstr);
1787		1939
1788	{	1940	{
1789	STRLEN len;	1941	STRLEN len;
1790	const char *str = SvPV (jsonstr, len);	1942	const char *str = SvPV (jsonstr, len);
1791	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	1943	STRLEN cur = SvCUR (self->incr_text);
		1944
		1945	if (SvLEN (self->incr_text) <= cur + len)
		1946	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1947
1792	Move (str, SvEND (self->incr_text), len, char);	1948	Move (str, SvEND (self->incr_text), len, char);
1793	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1949	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1794	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	1950	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1795	}	1951	}
1796	}	1952	}
1797		1953
1798	if (GIMME_V != G_VOID)	1954	if (GIMME_V != G_VOID)
1799	do	1955	do
1800	{	1956	{
1801	STRLEN offset;	1957	char *offset;
1802
1803	incr_parse (self);
1804		1958
1805	if (!INCR_DONE (self))	1959	if (!INCR_DONE (self))
		1960	{
		1961	incr_parse (self);
		1962
		1963	if (self->incr_pos > self->max_size && self->max_size)
		1964	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1965	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1966
		1967	if (!INCR_DONE (self))
1806	break;	1968	break;
		1969	}
1807		1970
1808	XPUSHs (decode_json (self->incr_text, self, &offset));	1971	XPUSHs (decode_json (self->incr_text, self, &offset));
1809		1972
1810	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1811	self->incr_pos -= offset;	1973	self->incr_pos -= offset - SvPVX (self->incr_text);
1812	self->incr_nest = 0;	1974	self->incr_nest = 0;
1813	self->incr_mode = 0;	1975	self->incr_mode = 0;
		1976
		1977	sv_chop (self->incr_text, offset);
1814	}	1978	}
1815	while (GIMME_V == G_ARRAY);	1979	while (GIMME_V == G_ARRAY);
1816	}	1980	}
1817		1981
1818	SV incr_text (JSON self)	1982	SV incr_text (JSON self)
1819	ATTRS: lvalue	1983	ATTRS: lvalue
1820	CODE:	1984	CODE:
1821	{	1985	{
1822	if (self->incr_pos)	1986	if (self->incr_pos)
1823	croak ("incr_text can only be called after a successful incr_parse call in scalar context %d", self->incr_pos);//D	1987	croak ("incr_text can not be called when the incremental parser already started parsing");
1824		1988
1825	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;	1989	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1826	}	1990	}
1827	OUTPUT:	1991	OUTPUT:
1828	RETVAL	1992	RETVAL
		1993
		1994	void incr_skip (JSON *self)
		1995	CODE:
		1996	{
		1997	if (self->incr_pos)
		1998	{
		1999	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		2000	self->incr_pos = 0;
		2001	self->incr_nest = 0;
		2002	self->incr_mode = 0;
		2003	}
		2004	}
		2005
		2006	void incr_reset (JSON *self)
		2007	CODE:
		2008	{
		2009	SvREFCNT_dec (self->incr_text);
		2010	self->incr_text = 0;
		2011	self->incr_pos = 0;
		2012	self->incr_nest = 0;
		2013	self->incr_mode = 0;
		2014	}
1829		2015
1830	void DESTROY (JSON *self)	2016	void DESTROY (JSON *self)
1831	CODE:	2017	CODE:
1832	SvREFCNT_dec (self->cb_sk_object);	2018	SvREFCNT_dec (self->cb_sk_object);
1833	SvREFCNT_dec (self->cb_object);	2019	SvREFCNT_dec (self->cb_object);
…		…
1839	ALIAS:	2025	ALIAS:
1840	to_json_ = 0	2026	to_json_ = 0
1841	encode_json = F_UTF8	2027	encode_json = F_UTF8
1842	PPCODE:	2028	PPCODE:
1843	{	2029	{
1844	JSON json = { F_DEFAULT \| ix };	2030	JSON json;
		2031	json_init (&json);
		2032	json.flags \|= ix;
1845	XPUSHs (encode_json (scalar, &json));	2033	XPUSHs (encode_json (scalar, &json));
1846	}	2034	}
1847		2035
1848	void decode_json (SV *jsonstr)	2036	void decode_json (SV *jsonstr)
1849	ALIAS:	2037	ALIAS:
1850	from_json_ = 0	2038	from_json_ = 0
1851	decode_json = F_UTF8	2039	decode_json = F_UTF8
1852	PPCODE:	2040	PPCODE:
1853	{	2041	{
1854	JSON json = { F_DEFAULT \| ix };	2042	JSON json;
		2043	json_init (&json);
		2044	json.flags \|= ix;
1855	XPUSHs (decode_json (jsonstr, &json, 0));	2045	XPUSHs (decode_json (jsonstr, &json, 0));
1856	}	2046	}
1857		2047
1858

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.78 by root, Tue Mar 25 19:31:02 2008 UTC vs. Revision 1.104 by root, Tue Jan 19 00:31:13 2010 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.78 by root, Tue Mar 25 19:31:02 2008 UTC vs.
Revision 1.104 by root, Tue Jan 19 00:31:13 2010 UTC