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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.28 by root, Wed Apr 11 12:23:02 2007 UTC vs.
Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC

…		…
9		9
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	11	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	12	#endif
13		13
		14	// some old perls do not have this, try to make it work, no
		15	// guarentees, though. if it breaks, you get to keep the pieces.
		16	#ifndef UTF8_MAXBYTES
		17	# define UTF8_MAXBYTES 13
		18	#endif
		19
14	#define F_ASCII 0x00000001UL	20	#define F_ASCII 0x00000001UL
		21	#define F_LATIN1 0x00000002UL
15	#define F_UTF8 0x00000002UL	22	#define F_UTF8 0x00000004UL
16	#define F_INDENT 0x00000004UL	23	#define F_INDENT 0x00000008UL
17	#define F_CANONICAL 0x00000008UL	24	#define F_CANONICAL 0x00000010UL
18	#define F_SPACE_BEFORE 0x00000010UL	25	#define F_SPACE_BEFORE 0x00000020UL
19	#define F_SPACE_AFTER 0x00000020UL	26	#define F_SPACE_AFTER 0x00000040UL
20	#define F_ALLOW_NONREF 0x00000080UL	27	#define F_ALLOW_NONREF 0x00000100UL
21	#define F_SHRINK 0x00000100UL	28	#define F_SHRINK 0x00000200UL
		29	#define F_ALLOW_BLESSED 0x00000400UL
		30	#define F_CONV_BLESSED 0x00000800UL // NYI
22	#define F_MAXDEPTH 0xf8000000UL	31	#define F_MAXDEPTH 0xf8000000UL
23	#define S_MAXDEPTH 27	32	#define S_MAXDEPTH 27
		33	#define F_MAXSIZE 0x01f00000UL
		34	#define S_MAXSIZE 20
24		35
25	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
26		37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
27	// F_SELFCONVERT? <=> to_json/toJson
28	// F_BLESSED? <=> { $__class__$ => }
29		38
30	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
31	#define F_DEFAULT (9UL << S_MAXDEPTH)	40	#define F_DEFAULT (9UL << S_MAXDEPTH)
32		41
33	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
34	#define INDENT_STEP 3 // spaces per indentation level	43	#define INDENT_STEP 3 // spaces per indentation level
35		44
36	#define SHORT_STRING_LEN 512 // special-case strings of up to this size	45	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
37		46
38	#define SB do {	47	#define SB do {
39	#define SE } while (0)	48	#define SE } while (0)
40		49
		50	#if __GNUC__ >= 3
		51	# define expect(expr,value) __builtin_expect ((expr),(value))
		52	# define inline inline
		53	#else
		54	# define expect(expr,value) (expr)
		55	# define inline static
		56	#endif
		57
		58	#define expect_false(expr) expect ((expr) != 0, 0)
		59	#define expect_true(expr) expect ((expr) != 0, 1)
		60
41	static HV *json_stash; // JSON::XS::	61	static HV json_stash, json_boolean_stash; // JSON::XS::
		62	static SV json_true, json_false;
		63
		64	typedef struct {
		65	U32 flags;
		66	} JSON;
42		67
43	/////////////////////////////////////////////////////////////////////////////	68	/////////////////////////////////////////////////////////////////////////////
44	// utility functions	69	// utility functions
45		70
46	static UV *	71	inline void
47	SvJSON (SV *sv)
48	{
49	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
50	croak ("object is not of type JSON::XS");
51
52	return &SvUVX (SvRV (sv));
53	}
54
55	static void
56	shrink (SV *sv)	72	shrink (SV *sv)
57	{	73	{
58	sv_utf8_downgrade (sv, 1);	74	sv_utf8_downgrade (sv, 1);
59	if (SvLEN (sv) > SvCUR (sv) + 1)	75	if (SvLEN (sv) > SvCUR (sv) + 1)
60	{	76	{
…		…
69	// decode an utf-8 character and return it, or (UV)-1 in	85	// decode an utf-8 character and return it, or (UV)-1 in
70	// case of an error.	86	// case of an error.
71	// we special-case "safe" characters from U+80 .. U+7FF,	87	// we special-case "safe" characters from U+80 .. U+7FF,
72	// but use the very good perl function to parse anything else.	88	// but use the very good perl function to parse anything else.
73	// note that we never call this function for a ascii codepoints	89	// note that we never call this function for a ascii codepoints
74	static UV	90	inline UV
75	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)	91	decode_utf8 (unsigned char s, STRLEN len, STRLEN clen)
76	{	92	{
77	if (s[0] > 0xdf \|\| s[0] < 0xc2)	93	if (expect_false (s[0] > 0xdf \|\| s[0] < 0xc2))
78	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	94	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
79	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	95	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
80	{	96	{
81	*clen = 2;	97	*clen = 2;
82	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);	98	return ((s[0] & 0x1f) << 6) \| (s[1] & 0x3f);
…		…
95	typedef struct	111	typedef struct
96	{	112	{
97	char *cur; // SvPVX (sv) + current output position	113	char *cur; // SvPVX (sv) + current output position
98	char *end; // SvEND (sv)	114	char *end; // SvEND (sv)
99	SV *sv; // result scalar	115	SV *sv; // result scalar
100	U32 flags; // F_*	116	JSON json;
101	U32 indent; // indentation level	117	U32 indent; // indentation level
102	U32 maxdepth; // max. indentation/recursion level	118	U32 maxdepth; // max. indentation/recursion level
103	} enc_t;	119	} enc_t;
104		120
105	static void	121	inline void
106	need (enc_t *enc, STRLEN len)	122	need (enc_t *enc, STRLEN len)
107	{	123	{
108	if (enc->cur + len >= enc->end)	124	if (expect_false (enc->cur + len >= enc->end))
109	{	125	{
110	STRLEN cur = enc->cur - SvPVX (enc->sv);	126	STRLEN cur = enc->cur - SvPVX (enc->sv);
111	SvGROW (enc->sv, cur + len + 1);	127	SvGROW (enc->sv, cur + len + 1);
112	enc->cur = SvPVX (enc->sv) + cur;	128	enc->cur = SvPVX (enc->sv) + cur;
113	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	129	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
114	}	130	}
115	}	131	}
116		132
117	static void	133	inline void
118	encode_ch (enc_t *enc, char ch)	134	encode_ch (enc_t *enc, char ch)
119	{	135	{
120	need (enc, 1);	136	need (enc, 1);
121	*enc->cur++ = ch;	137	*enc->cur++ = ch;
122	}	138	}
…		…
130		146
131	while (str < end)	147	while (str < end)
132	{	148	{
133	unsigned char ch = (unsigned char )str;	149	unsigned char ch = (unsigned char )str;
134		150
135	if (ch >= 0x20 && ch < 0x80) // most common case	151	if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
136	{	152	{
137	if (ch == '"') // but with slow exceptions	153	if (expect_false (ch == '"')) // but with slow exceptions
138	{	154	{
139	need (enc, len += 1);	155	need (enc, len += 1);
140	*enc->cur++ = '\\';	156	*enc->cur++ = '\\';
141	*enc->cur++ = '"';	157	*enc->cur++ = '"';
142	}	158	}
143	else if (ch == '\\')	159	else if (expect_false (ch == '\\'))
144	{	160	{
145	need (enc, len += 1);	161	need (enc, len += 1);
146	*enc->cur++ = '\\';	162	*enc->cur++ = '\\';
147	*enc->cur++ = '\\';	163	*enc->cur++ = '\\';
148	}	164	}
…		…
166	STRLEN clen;	182	STRLEN clen;
167	UV uch;	183	UV uch;
168		184
169	if (is_utf8)	185	if (is_utf8)
170	{	186	{
171	//uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
172	uch = decode_utf8 (str, end - str, &clen);	187	uch = decode_utf8 (str, end - str, &clen);
173	if (clen == (STRLEN)-1)	188	if (clen == (STRLEN)-1)
174	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);	189	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
175	}	190	}
176	else	191	else
…		…
180	}	195	}
181		196
182	if (uch > 0x10FFFFUL)	197	if (uch > 0x10FFFFUL)
183	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	198	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
184		199
185	if (uch < 0x80 \|\| enc->flags & F_ASCII)	200	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
186	{	201	{
187	if (uch > 0xFFFFUL)	202	if (uch > 0xFFFFUL)
188	{	203	{
189	need (enc, len += 11);	204	need (enc, len += 11);
190	sprintf (enc->cur, "\\u%04x\\u%04x",	205	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
204	*enc->cur++ = hexdigit [(uch >> 0) & 15];	219	*enc->cur++ = hexdigit [(uch >> 0) & 15];
205	}	220	}
206		221
207	str += clen;	222	str += clen;
208	}	223	}
		224	else if (enc->json.flags & F_LATIN1)
		225	{
		226	*enc->cur++ = uch;
		227	str += clen;
		228	}
209	else if (is_utf8)	229	else if (is_utf8)
210	{	230	{
211	need (enc, len += clen);	231	need (enc, len += clen);
212	do	232	do
213	{	233	{
…		…
227		247
228	--len;	248	--len;
229	}	249	}
230	}	250	}
231		251
232	static void	252	inline void
233	encode_indent (enc_t *enc)	253	encode_indent (enc_t *enc)
234	{	254	{
235	if (enc->flags & F_INDENT)	255	if (enc->json.flags & F_INDENT)
236	{	256	{
237	int spaces = enc->indent * INDENT_STEP;	257	int spaces = enc->indent * INDENT_STEP;
238		258
239	need (enc, spaces);	259	need (enc, spaces);
240	memset (enc->cur, ' ', spaces);	260	memset (enc->cur, ' ', spaces);
241	enc->cur += spaces;	261	enc->cur += spaces;
242	}	262	}
243	}	263	}
244		264
245	static void	265	inline void
246	encode_space (enc_t *enc)	266	encode_space (enc_t *enc)
247	{	267	{
248	need (enc, 1);	268	need (enc, 1);
249	encode_ch (enc, ' ');	269	encode_ch (enc, ' ');
250	}	270	}
251		271
252	static void	272	inline void
253	encode_nl (enc_t *enc)	273	encode_nl (enc_t *enc)
254	{	274	{
255	if (enc->flags & F_INDENT)	275	if (enc->json.flags & F_INDENT)
256	{	276	{
257	need (enc, 1);	277	need (enc, 1);
258	encode_ch (enc, '\n');	278	encode_ch (enc, '\n');
259	}	279	}
260	}	280	}
261		281
262	static void	282	inline void
263	encode_comma (enc_t *enc)	283	encode_comma (enc_t *enc)
264	{	284	{
265	encode_ch (enc, ',');	285	encode_ch (enc, ',');
266		286
267	if (enc->flags & F_INDENT)	287	if (enc->json.flags & F_INDENT)
268	encode_nl (enc);	288	encode_nl (enc);
269	else if (enc->flags & F_SPACE_AFTER)	289	else if (enc->json.flags & F_SPACE_AFTER)
270	encode_space (enc);	290	encode_space (enc);
271	}	291	}
272		292
273	static void encode_sv (enc_t enc, SV sv);	293	static void encode_sv (enc_t enc, SV sv);
274		294
…		…
317	else	337	else
318	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	338	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
319		339
320	encode_ch (enc, '"');	340	encode_ch (enc, '"');
321		341
322	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	342	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
323	encode_ch (enc, ':');	343	encode_ch (enc, ':');
324	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	344	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
325	encode_sv (enc, HeVAL (he));	345	encode_sv (enc, HeVAL (he));
326	}	346	}
327		347
328	// compare hash entries, used when all keys are bytestrings	348	// compare hash entries, used when all keys are bytestrings
329	static int	349	static int
…		…
364	{	384	{
365	// for canonical output we have to sort by keys first	385	// for canonical output we have to sort by keys first
366	// actually, this is mostly due to the stupid so-called	386	// actually, this is mostly due to the stupid so-called
367	// security workaround added somewhere in 5.8.x.	387	// security workaround added somewhere in 5.8.x.
368	// that randomises hash orderings	388	// that randomises hash orderings
369	if (enc->flags & F_CANONICAL)	389	if (enc->json.flags & F_CANONICAL)
370	{	390	{
371	HE he, hes [count]; // if your compiler dies here, you need to enable C99 mode
372	int fast = 1;	391	int fast = 1;
		392	HE *he;
		393	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
		394	HE *hes = _alloca (count sizeof (HE));
		395	#else
		396	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
		397	#endif
373		398
374	i = 0;	399	i = 0;
375	while ((he = hv_iternext (hv)))	400	while ((he = hv_iternext (hv)))
376	{	401	{
377	hes [i++] = he;	402	hes [i++] = he;
…		…
441	svtype svt;	466	svtype svt;
442		467
443	SvGETMAGIC (sv);	468	SvGETMAGIC (sv);
444	svt = SvTYPE (sv);	469	svt = SvTYPE (sv);
445		470
		471	if (expect_false (SvOBJECT (sv)))
		472	{
		473	if (SvSTASH (sv) == json_boolean_stash)
		474	{
		475	if (SvIV (sv) == 0)
		476	encode_str (enc, "false", 5, 0);
		477	else
		478	encode_str (enc, "true", 4, 0);
		479	}
		480	else
		481	{
		482	#if 0
		483	if (0 && sv_derived_from (rv, "JSON::Literal"))
		484	{
		485	// not yet
		486	}
		487	#endif
		488	if (enc->json.flags & F_CONV_BLESSED)
		489	{
		490	// we re-bless the reference to get overload and other niceties right
		491	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
		492
		493	if (to_json)
		494	{
		495	dSP;
		496	ENTER;
		497	SAVETMPS;
		498	PUSHMARK (SP);
		499	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		500
		501	// calling with G_SCALAR ensures that we always get a 1 reutrn value
		502	// check anyways.
		503	PUTBACK;
		504	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
		505	SPAGAIN;
		506
		507	encode_sv (enc, POPs);
		508
		509	FREETMPS;
		510	LEAVE;
		511	}
		512	else if (enc->json.flags & F_ALLOW_BLESSED)
		513	encode_str (enc, "null", 4, 0);
		514	else
		515	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		516	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		517	}
		518	else if (enc->json.flags & F_ALLOW_BLESSED)
		519	encode_str (enc, "null", 4, 0);
		520	else
		521	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		522	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		523	}
		524	}
446	if (svt == SVt_PVHV)	525	else if (svt == SVt_PVHV)
447	encode_hv (enc, (HV *)sv);	526	encode_hv (enc, (HV *)sv);
448	else if (svt == SVt_PVAV)	527	else if (svt == SVt_PVAV)
449	encode_av (enc, (AV *)sv);	528	encode_av (enc, (AV *)sv);
450	else if (svt < SVt_PVAV)	529	else if (svt < SVt_PVAV)
451	{	530	{
…		…
475	encode_str (enc, str, len, SvUTF8 (sv));	554	encode_str (enc, str, len, SvUTF8 (sv));
476	encode_ch (enc, '"');	555	encode_ch (enc, '"');
477	}	556	}
478	else if (SvNOKp (sv))	557	else if (SvNOKp (sv))
479	{	558	{
		559	// trust that perl will do the right thing w.r.t. JSON syntax.
480	need (enc, NV_DIG + 32);	560	need (enc, NV_DIG + 32);
481	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	561	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
482	enc->cur += strlen (enc->cur);	562	enc->cur += strlen (enc->cur);
483	}	563	}
484	else if (SvIOKp (sv))	564	else if (SvIOKp (sv))
485	{	565	{
486	need (enc, 64);	566	// we assume we can always read an IV as a UV
		567	if (SvUV (sv) & ~(UV)0x7fff)
		568	{
		569	// large integer, use the (rather slow) snprintf way.
		570	need (enc, sizeof (UV) * 3);
487	enc->cur +=	571	enc->cur +=
488	SvIsUV(sv)	572	SvIsUV(sv)
489	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))	573	? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
490	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));	574	: snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
		575	}
		576	else
		577	{
		578	// optimise the "small number case"
		579	// code will likely be branchless and use only a single multiplication
		580	I32 i = SvIV (sv);
		581	U32 u;
		582	char digit, nz = 0;
		583
		584	need (enc, 6);
		585
		586	*enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
		587	u = i < 0 ? -i : i;
		588
		589	// convert to 4.28 fixed-point representation
		590	u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
		591
		592	// now output digit by digit, each time masking out the integer part
		593	// and multiplying by 5 while moving the decimal point one to the right,
		594	// resulting in a net multiplication by 10.
		595	// we always write the digit to memory but conditionally increment
		596	// the pointer, to ease the usage of conditional move instructions.
		597	digit = u >> 28; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0xfffffff) 5;
		598	digit = u >> 27; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x7ffffff) 5;
		599	digit = u >> 26; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x3ffffff) 5;
		600	digit = u >> 25; enc->cur = digit + '0'; enc->cur += (nz = nz \|\| digit); u = (u & 0x1ffffff) 5;
		601	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
		602	}
491	}	603	}
492	else if (SvROK (sv))	604	else if (SvROK (sv))
493	encode_rv (enc, SvRV (sv));	605	encode_rv (enc, SvRV (sv));
494	else if (!SvOK (sv))	606	else if (!SvOK (sv))
495	encode_str (enc, "null", 4, 0);	607	encode_str (enc, "null", 4, 0);
…		…
497	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	609	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
498	SvPV_nolen (sv), SvFLAGS (sv));	610	SvPV_nolen (sv), SvFLAGS (sv));
499	}	611	}
500		612
501	static SV *	613	static SV *
502	encode_json (SV *scalar, U32 flags)	614	encode_json (SV scalar, JSON json)
503	{	615	{
504	enc_t enc;	616	enc_t enc;
505		617
506	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	618	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
507	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	619	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
508		620
509	enc.flags = flags;	621	enc.json = *json;
510	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	622	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
511	enc.cur = SvPVX (enc.sv);	623	enc.cur = SvPVX (enc.sv);
512	enc.end = SvEND (enc.sv);	624	enc.end = SvEND (enc.sv);
513	enc.indent = 0;	625	enc.indent = 0;
514	enc.maxdepth = DEC_DEPTH (flags);	626	enc.maxdepth = DEC_DEPTH (enc.json.flags);
515		627
516	SvPOK_only (enc.sv);	628	SvPOK_only (enc.sv);
517	encode_sv (&enc, scalar);	629	encode_sv (&enc, scalar);
518		630
519	if (!(flags & (F_ASCII \| F_UTF8)))
520	SvUTF8_on (enc.sv);
521
522	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	631	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
523	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	632	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
524		633
		634	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
		635	SvUTF8_on (enc.sv);
		636
525	if (enc.flags & F_SHRINK)	637	if (enc.json.flags & F_SHRINK)
526	shrink (enc.sv);	638	shrink (enc.sv);
527		639
528	return enc.sv;	640	return enc.sv;
529	}	641	}
530		642
…		…
535	typedef struct	647	typedef struct
536	{	648	{
537	char *cur; // current parser pointer	649	char *cur; // current parser pointer
538	char *end; // end of input string	650	char *end; // end of input string
539	const char *err; // parse error, if != 0	651	const char *err; // parse error, if != 0
540	U32 flags; // F_*	652	JSON json;
541	U32 depth; // recursion depth	653	U32 depth; // recursion depth
542	U32 maxdepth; // recursion depth limit	654	U32 maxdepth; // recursion depth limit
543	} dec_t;	655	} dec_t;
544		656
545	static void	657	inline void
546	decode_ws (dec_t *dec)	658	decode_ws (dec_t *dec)
547	{	659	{
548	for (;;)	660	for (;;)
549	{	661	{
550	char ch = *dec->cur;	662	char ch = *dec->cur;
…		…
576	decode_4hex (dec_t *dec)	688	decode_4hex (dec_t *dec)
577	{	689	{
578	signed char d1, d2, d3, d4;	690	signed char d1, d2, d3, d4;
579	unsigned char cur = (unsigned char )dec->cur;	691	unsigned char cur = (unsigned char )dec->cur;
580		692
581	d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");	693	d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
582	d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");	694	d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
583	d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");	695	d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
584	d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");	696	d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
585		697
586	dec->cur += 4;	698	dec->cur += 4;
587		699
588	return ((UV)d1) << 12	700	return ((UV)d1) << 12
589	\| ((UV)d2) << 8	701	\| ((UV)d2) << 8
…		…
597	static SV *	709	static SV *
598	decode_str (dec_t *dec)	710	decode_str (dec_t *dec)
599	{	711	{
600	SV *sv = 0;	712	SV *sv = 0;
601	int utf8 = 0;	713	int utf8 = 0;
		714	char *dec_cur = dec->cur;
602		715
603	do	716	do
604	{	717	{
605	char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];	718	char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
606	char *cur = buf;	719	char *cur = buf;
607		720
608	do	721	do
609	{	722	{
610	unsigned char ch = (unsigned char )dec->cur++;	723	unsigned char ch = (unsigned char )dec_cur++;
611		724
612	if (ch == '"')	725	if (expect_false (ch == '"'))
613	{	726	{
614	--dec->cur;	727	--dec_cur;
615	break;	728	break;
616	}	729	}
617	else if (ch == '\\')	730	else if (expect_false (ch == '\\'))
618	{	731	{
619	switch (*dec->cur)	732	switch (*dec_cur)
620	{	733	{
621	case '\\':	734	case '\\':
622	case '/':	735	case '/':
623	case '"': cur++ = dec->cur++; break;	736	case '"': cur++ = dec_cur++; break;
624		737
625	case 'b': ++dec->cur; *cur++ = '\010'; break;	738	case 'b': ++dec_cur; *cur++ = '\010'; break;
626	case 't': ++dec->cur; *cur++ = '\011'; break;	739	case 't': ++dec_cur; *cur++ = '\011'; break;
627	case 'n': ++dec->cur; *cur++ = '\012'; break;	740	case 'n': ++dec_cur; *cur++ = '\012'; break;
628	case 'f': ++dec->cur; *cur++ = '\014'; break;	741	case 'f': ++dec_cur; *cur++ = '\014'; break;
629	case 'r': ++dec->cur; *cur++ = '\015'; break;	742	case 'r': ++dec_cur; *cur++ = '\015'; break;
630		743
631	case 'u':	744	case 'u':
632	{	745	{
633	UV lo, hi;	746	UV lo, hi;
634	++dec->cur;	747	++dec_cur;
635		748
		749	dec->cur = dec_cur;
636	hi = decode_4hex (dec);	750	hi = decode_4hex (dec);
		751	dec_cur = dec->cur;
637	if (hi == (UV)-1)	752	if (hi == (UV)-1)
638	goto fail;	753	goto fail;
639		754
640	// possibly a surrogate pair	755	// possibly a surrogate pair
641	if (hi >= 0xd800)	756	if (hi >= 0xd800)
642	if (hi < 0xdc00)	757	if (hi < 0xdc00)
643	{	758	{
644	if (dec->cur [0] != '\\' \|\| dec->cur [1] != 'u')	759	if (dec_cur [0] != '\\' \|\| dec_cur [1] != 'u')
645	ERR ("missing low surrogate character in surrogate pair");	760	ERR ("missing low surrogate character in surrogate pair");
646		761
647	dec->cur += 2;	762	dec_cur += 2;
648		763
		764	dec->cur = dec_cur;
649	lo = decode_4hex (dec);	765	lo = decode_4hex (dec);
		766	dec_cur = dec->cur;
650	if (lo == (UV)-1)	767	if (lo == (UV)-1)
651	goto fail;	768	goto fail;
652		769
653	if (lo < 0xdc00 \|\| lo >= 0xe000)	770	if (lo < 0xdc00 \|\| lo >= 0xe000)
654	ERR ("surrogate pair expected");	771	ERR ("surrogate pair expected");
…		…
668	*cur++ = hi;	785	*cur++ = hi;
669	}	786	}
670	break;	787	break;
671		788
672	default:	789	default:
673	--dec->cur;	790	--dec_cur;
674	ERR ("illegal backslash escape sequence in string");	791	ERR ("illegal backslash escape sequence in string");
675	}	792	}
676	}	793	}
677	else if (ch >= 0x20 && ch <= 0x7f)	794	else if (expect_true (ch >= 0x20 && ch <= 0x7f))
678	*cur++ = ch;	795	*cur++ = ch;
679	else if (ch >= 0x80)	796	else if (ch >= 0x80)
680	{	797	{
681	STRLEN clen;	798	STRLEN clen;
682	UV uch;	799	UV uch;
683		800
684	--dec->cur;	801	--dec_cur;
685		802
686	uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);	803	uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
687	if (clen == (STRLEN)-1)	804	if (clen == (STRLEN)-1)
688	ERR ("malformed UTF-8 character in JSON string");	805	ERR ("malformed UTF-8 character in JSON string");
689		806
690	do	807	do
691	cur++ = dec->cur++;	808	cur++ = dec_cur++;
692	while (--clen);	809	while (--clen);
693		810
694	utf8 = 1;	811	utf8 = 1;
695	}	812	}
696	else	813	else
697	{	814	{
698	--dec->cur;	815	--dec_cur;
699		816
700	if (!ch)	817	if (!ch)
701	ERR ("unexpected end of string while parsing JSON string");	818	ERR ("unexpected end of string while parsing JSON string");
702	else	819	else
703	ERR ("invalid character encountered while parsing JSON string");	820	ERR ("invalid character encountered while parsing JSON string");
…		…
716	}	833	}
717	else	834	else
718	sv = newSVpvn (buf, len);	835	sv = newSVpvn (buf, len);
719	}	836	}
720	}	837	}
721	while (*dec->cur != '"');	838	while (*dec_cur != '"');
722		839
723	++dec->cur;	840	++dec_cur;
724		841
725	if (sv)	842	if (sv)
726	{	843	{
727	SvPOK_only (sv);	844	SvPOK_only (sv);
728	*SvEND (sv) = 0;	845	*SvEND (sv) = 0;
…		…
731	SvUTF8_on (sv);	848	SvUTF8_on (sv);
732	}	849	}
733	else	850	else
734	sv = newSVpvn ("", 0);	851	sv = newSVpvn ("", 0);
735		852
		853	dec->cur = dec_cur;
736	return sv;	854	return sv;
737		855
738	fail:	856	fail:
		857	dec->cur = dec_cur;
739	return 0;	858	return 0;
740	}	859	}
741		860
742	static SV *	861	static SV *
743	decode_num (dec_t *dec)	862	decode_num (dec_t *dec)
…		…
801	is_nv = 1;	920	is_nv = 1;
802	}	921	}
803		922
804	if (!is_nv)	923	if (!is_nv)
805	{	924	{
806	UV uv;	925	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
807	int numtype = grok_number (start, dec->cur - start, &uv);	926	if (*start == '-')
808	if (numtype & IS_NUMBER_IN_UV)	927	switch (dec->cur - start)
809	if (numtype & IS_NUMBER_NEG)
810	{	928	{
811	if (uv < (UV)IV_MIN)	929	case 2: return newSViv (-( start [1] - '0' * 1));
812	return newSViv (-(IV)uv);	930	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
		931	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
		932	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
813	}	933	}
		934	else
		935	switch (dec->cur - start)
		936	{
		937	case 1: return newSViv ( start [0] - '0' * 1);
		938	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
		939	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
		940	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		941	}
		942
		943	{
		944	UV uv;
		945	int numtype = grok_number (start, dec->cur - start, &uv);
		946	if (numtype & IS_NUMBER_IN_UV)
		947	if (numtype & IS_NUMBER_NEG)
		948	{
		949	if (uv < (UV)IV_MIN)
		950	return newSViv (-(IV)uv);
		951	}
814	else	952	else
815	return newSVuv (uv);	953	return newSVuv (uv);
		954
		955	// here would likely be the place for bigint support
816	}	956	}
		957	}
817		958
		959	// if we ever support bigint or bigfloat, this is the place for bigfloat
818	return newSVnv (Atof (start));	960	return newSVnv (Atof (start));
819		961
820	fail:	962	fail:
821	return 0;	963	return 0;
822	}	964	}
…		…
876	if (*dec->cur == '}')	1018	if (*dec->cur == '}')
877	++dec->cur;	1019	++dec->cur;
878	else	1020	else
879	for (;;)	1021	for (;;)
880	{	1022	{
881	SV key, value;
882
883	decode_ws (dec); EXPECT_CH ('"');	1023	decode_ws (dec); EXPECT_CH ('"');
884		1024
885	key = decode_str (dec);	1025	// heuristic: assume that
886	if (!key)	1026	// a) decode_str + hv_store_ent are abysmally slow.
887	goto fail;	1027	// b) most hash keys are short, simple ascii text.
		1028	// => try to "fast-match" such strings to avoid
		1029	// the overhead of decode_str + hv_store_ent.
		1030	{
		1031	SV *value;
		1032	char *p = dec->cur;
		1033	char *e = p + 24; // only try up to 24 bytes
888		1034
889	decode_ws (dec); EXPECT_CH (':');	1035	for (;;)
890
891	value = decode_sv (dec);
892	if (!value)
893	{	1036	{
		1037	// the >= 0x80 is true on most architectures
		1038	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1039	{
		1040	// slow path, back up and use decode_str
		1041	SV *key = decode_str (dec);
		1042	if (!key)
		1043	goto fail;
		1044
		1045	decode_ws (dec); EXPECT_CH (':');
		1046
		1047	value = decode_sv (dec);
		1048	if (!value)
		1049	{
		1050	SvREFCNT_dec (key);
		1051	goto fail;
		1052	}
		1053
		1054	hv_store_ent (hv, key, value, 0);
894	SvREFCNT_dec (key);	1055	SvREFCNT_dec (key);
		1056
		1057	break;
		1058	}
		1059	else if (*p == '"')
		1060	{
		1061	// fast path, got a simple key
		1062	char *key = dec->cur;
		1063	int len = p - key;
		1064	dec->cur = p + 1;
		1065
		1066	decode_ws (dec); EXPECT_CH (':');
		1067
		1068	value = decode_sv (dec);
		1069	if (!value)
895	goto fail;	1070	goto fail;
		1071
		1072	hv_store (hv, key, len, value, 0);
		1073
		1074	break;
		1075	}
		1076
		1077	++p;
896	}	1078	}
897		1079	}
898	hv_store_ent (hv, key, value, 0);
899	SvREFCNT_dec (key);
900		1080
901	decode_ws (dec);	1081	decode_ws (dec);
902		1082
903	if (*dec->cur == '}')	1083	if (*dec->cur == '}')
904	{	1084	{
…		…
923		1103
924	static SV *	1104	static SV *
925	decode_sv (dec_t *dec)	1105	decode_sv (dec_t *dec)
926	{	1106	{
927	decode_ws (dec);	1107	decode_ws (dec);
		1108
		1109	// the beauty of JSON: you need exactly one character lookahead
		1110	// to parse anything.
928	switch (*dec->cur)	1111	switch (*dec->cur)
929	{	1112	{
930	case '"': ++dec->cur; return decode_str (dec);	1113	case '"': ++dec->cur; return decode_str (dec);
931	case '[': ++dec->cur; return decode_av (dec);	1114	case '[': ++dec->cur; return decode_av (dec);
932	case '{': ++dec->cur; return decode_hv (dec);	1115	case '{': ++dec->cur; return decode_hv (dec);
…		…
938		1121
939	case 't':	1122	case 't':
940	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1123	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
941	{	1124	{
942	dec->cur += 4;	1125	dec->cur += 4;
943	return newSViv (1);	1126	return SvREFCNT_inc (json_true);
944	}	1127	}
945	else	1128	else
946	ERR ("'true' expected");	1129	ERR ("'true' expected");
947		1130
948	break;	1131	break;
949		1132
950	case 'f':	1133	case 'f':
951	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1134	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
952	{	1135	{
953	dec->cur += 5;	1136	dec->cur += 5;
954	return newSViv (0);	1137	return SvREFCNT_inc (json_false);
955	}	1138	}
956	else	1139	else
957	ERR ("'false' expected");	1140	ERR ("'false' expected");
958		1141
959	break;	1142	break;
…		…
977	fail:	1160	fail:
978	return 0;	1161	return 0;
979	}	1162	}
980		1163
981	static SV *	1164	static SV *
982	decode_json (SV *string, U32 flags)	1165	decode_json (SV string, JSON json, UV *offset_return)
983	{	1166	{
984	dec_t dec;	1167	dec_t dec;
		1168	UV offset;
985	SV *sv;	1169	SV *sv;
986		1170
		1171	SvGETMAGIC (string);
987	SvUPGRADE (string, SVt_PV);	1172	SvUPGRADE (string, SVt_PV);
988		1173
		1174	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1175	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1176	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1177
989	if (flags & F_UTF8)	1178	if (json->flags & F_UTF8)
990	sv_utf8_downgrade (string, 0);	1179	sv_utf8_downgrade (string, 0);
991	else	1180	else
992	sv_utf8_upgrade (string);	1181	sv_utf8_upgrade (string);
993		1182
994	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1183	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
995		1184
996	dec.flags = flags;	1185	dec.json = *json;
997	dec.cur = SvPVX (string);	1186	dec.cur = SvPVX (string);
998	dec.end = SvEND (string);	1187	dec.end = SvEND (string);
999	dec.err = 0;	1188	dec.err = 0;
1000	dec.depth = 0;	1189	dec.depth = 0;
1001	dec.maxdepth = DEC_DEPTH (dec.flags);	1190	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1002		1191
1003	*dec.end = 0; // this should basically be a nop, too, but make sure its there	1192	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1004	sv = decode_sv (&dec);	1193	sv = decode_sv (&dec);
1005		1194
		1195	if (!(offset_return \|\| !sv))
		1196	{
		1197	// check for trailing garbage
		1198	decode_ws (&dec);
		1199
		1200	if (*dec.cur)
		1201	{
		1202	dec.err = "garbage after JSON object";
		1203	SvREFCNT_dec (sv);
		1204	sv = 0;
		1205	}
		1206	}
		1207
		1208	if (offset_return \|\| !sv)
		1209	{
		1210	offset = dec.json.flags & F_UTF8
		1211	? dec.cur - SvPVX (string)
		1212	: utf8_distance (dec.cur, SvPVX (string));
		1213
		1214	if (offset_return)
		1215	*offset_return = offset;
		1216	}
		1217
1006	if (!sv)	1218	if (!sv)
1007	{	1219	{
1008	IV offset = dec.flags & F_UTF8
1009	? dec.cur - SvPVX (string)
1010	: utf8_distance (dec.cur, SvPVX (string));
1011	SV *uni = sv_newmortal ();	1220	SV *uni = sv_newmortal ();
1012		1221
1013	// horrible hack to silence warning inside pv_uni_display	1222	// horrible hack to silence warning inside pv_uni_display
1014	COP cop = *PL_curcop;	1223	COP cop = *PL_curcop;
1015	cop.cop_warnings = pWARN_NONE;	1224	cop.cop_warnings = pWARN_NONE;
…		…
1025	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1234	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1026	}	1235	}
1027		1236
1028	sv = sv_2mortal (sv);	1237	sv = sv_2mortal (sv);
1029		1238
1030	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1239	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1031	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1240	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1032		1241
1033	return sv;	1242	return sv;
1034	}	1243	}
1035		1244
…		…
1039	MODULE = JSON::XS PACKAGE = JSON::XS	1248	MODULE = JSON::XS PACKAGE = JSON::XS
1040		1249
1041	BOOT:	1250	BOOT:
1042	{	1251	{
1043	int i;	1252	int i;
1044
1045	memset (decode_hexdigit, 0xff, 256);
1046		1253
1047	for (i = 0; i < 256; ++i)	1254	for (i = 0; i < 256; ++i)
1048	decode_hexdigit [i] =	1255	decode_hexdigit [i] =
1049	i >= '0' && i <= '9' ? i - '0'	1256	i >= '0' && i <= '9' ? i - '0'
1050	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1257	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1051	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1258	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1052	: -1;	1259	: -1;
1053		1260
1054	json_stash = gv_stashpv ("JSON::XS", 1);	1261	json_stash = gv_stashpv ("JSON::XS" , 1);
		1262	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1263
		1264	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1265	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1055	}	1266	}
1056		1267
1057	PROTOTYPES: DISABLE	1268	PROTOTYPES: DISABLE
1058		1269
1059	SV new (char dummy)	1270	void new (char *klass)
1060	CODE:	1271	PPCODE:
1061	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1272	{
1062	OUTPUT:	1273	SV *pv = NEWSV (0, sizeof (JSON));
1063	RETVAL	1274	SvPOK_only (pv);
		1275	Zero (SvPVX (pv), 1, sizeof (JSON));
		1276	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1277	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1278	}
1064		1279
1065	SV ascii (SV self, int enable = 1)	1280	void ascii (JSON *self, int enable = 1)
1066	ALIAS:	1281	ALIAS:
1067	ascii = F_ASCII	1282	ascii = F_ASCII
		1283	latin1 = F_LATIN1
1068	utf8 = F_UTF8	1284	utf8 = F_UTF8
1069	indent = F_INDENT	1285	indent = F_INDENT
1070	canonical = F_CANONICAL	1286	canonical = F_CANONICAL
1071	space_before = F_SPACE_BEFORE	1287	space_before = F_SPACE_BEFORE
1072	space_after = F_SPACE_AFTER	1288	space_after = F_SPACE_AFTER
1073	pretty = F_PRETTY	1289	pretty = F_PRETTY
1074	allow_nonref = F_ALLOW_NONREF	1290	allow_nonref = F_ALLOW_NONREF
1075	shrink = F_SHRINK	1291	shrink = F_SHRINK
		1292	allow_blessed = F_ALLOW_BLESSED
		1293	convert_blessed = F_CONV_BLESSED
1076	CODE:	1294	PPCODE:
1077	{	1295	{
1078	UV *uv = SvJSON (self);
1079	if (enable)	1296	if (enable)
1080	*uv \|= ix;	1297	self->flags \|= ix;
1081	else	1298	else
1082	*uv &= ~ix;	1299	self->flags &= ~ix;
1083		1300
1084	RETVAL = newSVsv (self);	1301	XPUSHs (ST (0));
1085	}	1302	}
1086	OUTPUT:
1087	RETVAL
1088		1303
1089	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1304	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1090	CODE:	1305	PPCODE:
1091	{	1306	{
1092	UV *uv = SvJSON (self);
1093	UV log2 = 0;	1307	UV log2 = 0;
1094		1308
1095	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1309	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1096		1310
1097	while ((1UL << log2) < max_depth)	1311	while ((1UL << log2) < max_depth)
1098	++log2;	1312	++log2;
1099		1313
1100	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1314	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1101		1315
1102	RETVAL = newSVsv (self);	1316	XPUSHs (ST (0));
1103	}	1317	}
1104	OUTPUT:
1105	RETVAL
1106		1318
1107	void encode (SV self, SV scalar)	1319	void max_size (JSON *self, UV max_size = 0)
1108	PPCODE:	1320	PPCODE:
1109	XPUSHs (encode_json (scalar, *SvJSON (self)));	1321	{
		1322	UV log2 = 0;
1110		1323
		1324	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1325	if (max_size == 1) max_size = 2;
		1326
		1327	while ((1UL << log2) < max_size)
		1328	++log2;
		1329
		1330	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1331
		1332	XPUSHs (ST (0));
		1333	}
		1334
1111	void decode (SV self, SV jsonstr)	1335	void encode (JSON self, SV scalar)
1112	PPCODE:	1336	PPCODE:
		1337	XPUSHs (encode_json (scalar, self));
		1338
		1339	void decode (JSON self, SV jsonstr)
		1340	PPCODE:
1113	XPUSHs (decode_json (jsonstr, *SvJSON (self)));	1341	XPUSHs (decode_json (jsonstr, self, 0));
		1342
		1343	void decode_prefix (JSON self, SV jsonstr)
		1344	PPCODE:
		1345	{
		1346	UV offset;
		1347	EXTEND (SP, 2);
		1348	PUSHs (decode_json (jsonstr, self, &offset));
		1349	PUSHs (sv_2mortal (newSVuv (offset)));
		1350	}
1114		1351
1115	PROTOTYPES: ENABLE	1352	PROTOTYPES: ENABLE
1116		1353
1117	void to_json (SV *scalar)	1354	void to_json (SV *scalar)
1118	ALIAS:
1119	objToJson = 0
1120	PPCODE:	1355	PPCODE:
		1356	{
		1357	JSON json = { F_DEFAULT \| F_UTF8 };
1121	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1358	XPUSHs (encode_json (scalar, &json));
		1359	}
1122		1360
1123	void from_json (SV *jsonstr)	1361	void from_json (SV *jsonstr)
1124	ALIAS:
1125	jsonToObj = 0
1126	PPCODE:	1362	PPCODE:
		1363	{
		1364	JSON json = { F_DEFAULT \| F_UTF8 };
1127	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8));	1365	XPUSHs (decode_json (jsonstr, &json, 0));
		1366	}
1128		1367

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.28 by root, Wed Apr 11 12:23:02 2007 UTC vs. Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.28 by root, Wed Apr 11 12:23:02 2007 UTC vs.
Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC