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

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

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs. Revision 1.107 by root, Wed Mar 17 01:45:43 2010 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.83 by root, Wed Mar 26 22:54:38 2008 UTC vs.
Revision 1.107 by root, Wed Mar 17 01:45:43 2010 UTC