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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC vs.
Revision 1.63 by root, Mon Aug 27 01:49:01 2007 UTC

…		…
1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#include "assert.h"	5	#include <assert.h>
6	#include "string.h"	6	#include <string.h>
7	#include "stdlib.h"	7	#include <stdlib.h>
8	#include "stdio.h"	8	#include <stdio.h>
		9	#include <float.h>
9		10
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	12	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	13	#endif
13		14
14	// some old perls do not have this, try to make it work, no	15	// some old perls do not have this, try to make it work, no
15	// guarentees, though.	16	// guarentees, though. if it breaks, you get to keep the pieces.
16	#ifndef UTF8_MAXBYTES	17	#ifndef UTF8_MAXBYTES
17	# define UTF8_MAXBYTES 13	18	# define UTF8_MAXBYTES 13
18	#endif	19	#endif
19		20
20	#define F_ASCII 0x00000001UL	21	#define F_ASCII 0x00000001UL
21	#define F_LATIN1 0x00000002UL	22	#define F_LATIN1 0x00000002UL
22	#define F_UTF8 0x00000004UL	23	#define F_UTF8 0x00000004UL
23	#define F_INDENT 0x00000008UL	24	#define F_INDENT 0x00000008UL
24	#define F_CANONICAL 0x00000010UL	25	#define F_CANONICAL 0x00000010UL
25	#define F_SPACE_BEFORE 0x00000020UL	26	#define F_SPACE_BEFORE 0x00000020UL
26	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
27	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
28	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
		30	#define F_ALLOW_BLESSED 0x00000400UL
		31	#define F_CONV_BLESSED 0x00000800UL
		32	#define F_RELAXED 0x00001000UL
		33
29	#define F_MAXDEPTH 0xf8000000UL	34	#define F_MAXDEPTH 0xf8000000UL
30	#define S_MAXDEPTH 27	35	#define S_MAXDEPTH 27
		36	#define F_MAXSIZE 0x01f00000UL
		37	#define S_MAXSIZE 20
		38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
31		39
32	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	40	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
33		41	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
34	// F_SELFCONVERT? <=> to_json/toJson
35	// F_BLESSED? <=> { $__class__$ => }
36		42
37	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	43	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
38	#define F_DEFAULT (9UL << S_MAXDEPTH)	44	#define F_DEFAULT (9UL << S_MAXDEPTH)
39		45
40	#define INIT_SIZE 32 // initial scalar size to be allocated	46	#define INIT_SIZE 32 // initial scalar size to be allocated
54	#endif	60	#endif
55		61
56	#define expect_false(expr) expect ((expr) != 0, 0)	62	#define expect_false(expr) expect ((expr) != 0, 0)
57	#define expect_true(expr) expect ((expr) != 0, 1)	63	#define expect_true(expr) expect ((expr) != 0, 1)
58		64
		65	#ifdef USE_ITHREADS
		66	# define JSON_SLOW 1
		67	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		68	#else
		69	# define JSON_SLOW 0
		70	# define JSON_STASH json_stash
		71	#endif
		72
59	static HV *json_stash; // JSON::XS::	73	static HV json_stash, json_boolean_stash; // JSON::XS::
		74	static SV json_true, json_false;
		75
		76	typedef struct {
		77	U32 flags;
		78	SV *cb_object;
		79	HV *cb_sk_object;
		80	} JSON;
60		81
61	/////////////////////////////////////////////////////////////////////////////	82	/////////////////////////////////////////////////////////////////////////////
62	// utility functions	83	// utility functions
63		84
64	static UV *	85	inline void
65	SvJSON (SV *sv)
66	{
67	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
68	croak ("object is not of type JSON::XS");
69
70	return &SvUVX (SvRV (sv));
71	}
72
73	static void
74	shrink (SV *sv)	86	shrink (SV *sv)
75	{	87	{
76	sv_utf8_downgrade (sv, 1);	88	sv_utf8_downgrade (sv, 1);
77	if (SvLEN (sv) > SvCUR (sv) + 1)	89	if (SvLEN (sv) > SvCUR (sv) + 1)
78	{	90	{
…		…
113	typedef struct	125	typedef struct
114	{	126	{
115	char *cur; // SvPVX (sv) + current output position	127	char *cur; // SvPVX (sv) + current output position
116	char *end; // SvEND (sv)	128	char *end; // SvEND (sv)
117	SV *sv; // result scalar	129	SV *sv; // result scalar
118	U32 flags; // F_*	130	JSON json;
119	U32 indent; // indentation level	131	U32 indent; // indentation level
120	U32 maxdepth; // max. indentation/recursion level	132	U32 maxdepth; // max. indentation/recursion level
121	} enc_t;	133	} enc_t;
122		134
123	inline void	135	inline void
…		…
197	}	209	}
198		210
199	if (uch > 0x10FFFFUL)	211	if (uch > 0x10FFFFUL)
200	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	212	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
201		213
202	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	214	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
203	{	215	{
204	if (uch > 0xFFFFUL)	216	if (uch > 0xFFFFUL)
205	{	217	{
206	need (enc, len += 11);	218	need (enc, len += 11);
207	sprintf (enc->cur, "\\u%04x\\u%04x",	219	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
221	*enc->cur++ = hexdigit [(uch >> 0) & 15];	233	*enc->cur++ = hexdigit [(uch >> 0) & 15];
222	}	234	}
223		235
224	str += clen;	236	str += clen;
225	}	237	}
226	else if (enc->flags & F_LATIN1)	238	else if (enc->json.flags & F_LATIN1)
227	{	239	{
228	*enc->cur++ = uch;	240	*enc->cur++ = uch;
229	str += clen;	241	str += clen;
230	}	242	}
231	else if (is_utf8)	243	else if (is_utf8)
…		…
252	}	264	}
253		265
254	inline void	266	inline void
255	encode_indent (enc_t *enc)	267	encode_indent (enc_t *enc)
256	{	268	{
257	if (enc->flags & F_INDENT)	269	if (enc->json.flags & F_INDENT)
258	{	270	{
259	int spaces = enc->indent * INDENT_STEP;	271	int spaces = enc->indent * INDENT_STEP;
260		272
261	need (enc, spaces);	273	need (enc, spaces);
262	memset (enc->cur, ' ', spaces);	274	memset (enc->cur, ' ', spaces);
…		…
272	}	284	}
273		285
274	inline void	286	inline void
275	encode_nl (enc_t *enc)	287	encode_nl (enc_t *enc)
276	{	288	{
277	if (enc->flags & F_INDENT)	289	if (enc->json.flags & F_INDENT)
278	{	290	{
279	need (enc, 1);	291	need (enc, 1);
280	encode_ch (enc, '\n');	292	encode_ch (enc, '\n');
281	}	293	}
282	}	294	}
…		…
284	inline void	296	inline void
285	encode_comma (enc_t *enc)	297	encode_comma (enc_t *enc)
286	{	298	{
287	encode_ch (enc, ',');	299	encode_ch (enc, ',');
288		300
289	if (enc->flags & F_INDENT)	301	if (enc->json.flags & F_INDENT)
290	encode_nl (enc);	302	encode_nl (enc);
291	else if (enc->flags & F_SPACE_AFTER)	303	else if (enc->json.flags & F_SPACE_AFTER)
292	encode_space (enc);	304	encode_space (enc);
293	}	305	}
294		306
295	static void encode_sv (enc_t enc, SV sv);	307	static void encode_sv (enc_t enc, SV sv);
296		308
…		…
305	encode_ch (enc, '['); encode_nl (enc);	317	encode_ch (enc, '['); encode_nl (enc);
306	++enc->indent;	318	++enc->indent;
307		319
308	for (i = 0; i <= len; ++i)	320	for (i = 0; i <= len; ++i)
309	{	321	{
		322	SV **svp = av_fetch (av, i, 0);
		323
310	encode_indent (enc);	324	encode_indent (enc);
311	encode_sv (enc, *av_fetch (av, i, 0));	325
		326	if (svp)
		327	encode_sv (enc, *svp);
		328	else
		329	encode_str (enc, "null", 4, 0);
312		330
313	if (i < len)	331	if (i < len)
314	encode_comma (enc);	332	encode_comma (enc);
315	}	333	}
316		334
…		…
319	--enc->indent;	337	--enc->indent;
320	encode_indent (enc); encode_ch (enc, ']');	338	encode_indent (enc); encode_ch (enc, ']');
321	}	339	}
322		340
323	static void	341	static void
324	encode_he (enc_t enc, HE he)	342	encode_hk (enc_t enc, HE he)
325	{	343	{
326	encode_ch (enc, '"');	344	encode_ch (enc, '"');
327		345
328	if (HeKLEN (he) == HEf_SVKEY)	346	if (HeKLEN (he) == HEf_SVKEY)
329	{	347	{
…		…
339	else	357	else
340	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	358	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
341		359
342	encode_ch (enc, '"');	360	encode_ch (enc, '"');
343		361
344	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	362	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345	encode_ch (enc, ':');	363	encode_ch (enc, ':');
346	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	364	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347	encode_sv (enc, HeVAL (he));
348	}	365	}
349		366
350	// compare hash entries, used when all keys are bytestrings	367	// compare hash entries, used when all keys are bytestrings
351	static int	368	static int
352	he_cmp_fast (const void a_, const void b_)	369	he_cmp_fast (const void a_, const void b_)
…		…
357	HE b = (HE **)b_;	374	HE b = (HE **)b_;
358		375
359	STRLEN la = HeKLEN (a);	376	STRLEN la = HeKLEN (a);
360	STRLEN lb = HeKLEN (b);	377	STRLEN lb = HeKLEN (b);
361		378
362	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	379	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
363	cmp = la - lb;	380	cmp = lb - la;
364		381
365	return cmp;	382	return cmp;
366	}	383	}
367		384
368	// compare hash entries, used when some keys are sv's or utf-x	385	// compare hash entries, used when some keys are sv's or utf-x
369	static int	386	static int
370	he_cmp_slow (const void a, const void b)	387	he_cmp_slow (const void a, const void b)
371	{	388	{
372	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	389	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
373	}	390	}
374		391
375	static void	392	static void
376	encode_hv (enc_t enc, HV hv)	393	encode_hv (enc_t enc, HV hv)
377	{	394	{
		395	HE *he;
378	int count, i;	396	int count;
379		397
380	if (enc->indent >= enc->maxdepth)	398	if (enc->indent >= enc->maxdepth)
381	croak ("data structure too deep (hit recursion limit)");	399	croak ("data structure too deep (hit recursion limit)");
382		400
383	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	401	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
384		402
385	if ((count = hv_iterinit (hv)))
386	{
387	// for canonical output we have to sort by keys first	403	// for canonical output we have to sort by keys first
388	// actually, this is mostly due to the stupid so-called	404	// actually, this is mostly due to the stupid so-called
389	// security workaround added somewhere in 5.8.x.	405	// security workaround added somewhere in 5.8.x.
390	// that randomises hash orderings	406	// that randomises hash orderings
391	if (enc->flags & F_CANONICAL)	407	if (enc->json.flags & F_CANONICAL)
		408	{
		409	int count = hv_iterinit (hv);
		410
		411	if (SvMAGICAL (hv))
392	{	412	{
		413	// need to count by iterating. could improve by dynamically building the vector below
		414	// but I don't care for the speed of this special case.
		415	// note also that we will run into undefined behaviour when the two iterations
		416	// do not result in the same count, something I might care for in some later release.
		417
		418	count = 0;
		419	while (hv_iternext (hv))
		420	++count;
		421
		422	hv_iterinit (hv);
		423	}
		424
		425	if (count)
		426	{
393	int fast = 1;	427	int i, fast = 1;
394	HE *he;
395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	428	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
396	HE *hes = _alloca (count sizeof (HE));	429	HE *hes = _alloca (count sizeof (HE));
397	#else	430	#else
398	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	431	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
399	#endif	432	#endif
…		…
426		459
427	FREETMPS;	460	FREETMPS;
428	LEAVE;	461	LEAVE;
429	}	462	}
430		463
431	for (i = 0; i < count; ++i)	464	while (count--)
432	{	465	{
433	encode_indent (enc);	466	encode_indent (enc);
		467	he = hes [count];
434	encode_he (enc, hes [i]);	468	encode_hk (enc, he);
		469	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
435		470
436	if (i < count - 1)	471	if (count)
437	encode_comma (enc);	472	encode_comma (enc);
438	}	473	}
439		474	}
		475	}
		476	else
		477	{
		478	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		479	if ((he = hv_iternext (hv)))
		480	for (;;)
		481	{
440	encode_nl (enc);	482	encode_indent (enc);
		483	encode_hk (enc, he);
		484	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
		485
		486	if (!(he = hv_iternext (hv)))
		487	break;
		488
		489	encode_comma (enc);
		490	}
		491	}
		492
		493	encode_nl (enc);
		494
		495	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
		496	}
		497
		498	// encode objects, arrays and special \0=false and \1=true values.
		499	static void
		500	encode_rv (enc_t enc, SV sv)
		501	{
		502	svtype svt;
		503
		504	SvGETMAGIC (sv);
		505	svt = SvTYPE (sv);
		506
		507	if (expect_false (SvOBJECT (sv)))
		508	{
		509	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		510	? json_boolean_stash
		511	: gv_stashpv ("JSON::XS::Boolean", 1);
		512
		513	if (SvSTASH (sv) == stash)
		514	{
		515	if (SvIV (sv))
		516	encode_str (enc, "true", 4, 0);
		517	else
		518	encode_str (enc, "false", 5, 0);
441	}	519	}
442	else	520	else
443	{	521	{
444	HE *he = hv_iternext (hv);	522	#if 0
445		523	if (0 && sv_derived_from (rv, "JSON::Literal"))
446	for (;;)
447	{
448	encode_indent (enc);
449	encode_he (enc, he);
450
451	if (!(he = hv_iternext (hv)))
452	break;
453
454	encode_comma (enc);
455	}	524	{
		525	// not yet
		526	}
		527	#endif
		528	if (enc->json.flags & F_CONV_BLESSED)
		529	{
		530	// we re-bless the reference to get overload and other niceties right
		531	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
456		532
		533	if (to_json)
		534	{
		535	dSP;
		536
		537	ENTER; SAVETMPS; PUSHMARK (SP);
		538	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		539
		540	// calling with G_SCALAR ensures that we always get a 1 return value
		541	PUTBACK;
		542	call_sv ((SV *)GvCV (to_json), G_SCALAR);
		543	SPAGAIN;
		544
		545	// catch this surprisingly common error
		546	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		547	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		548
		549	sv = POPs;
		550	PUTBACK;
		551
457	encode_nl (enc);	552	encode_sv (enc, sv);
		553
		554	FREETMPS; LEAVE;
		555	}
		556	else if (enc->json.flags & F_ALLOW_BLESSED)
		557	encode_str (enc, "null", 4, 0);
		558	else
		559	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		560	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		561	}
		562	else if (enc->json.flags & F_ALLOW_BLESSED)
		563	encode_str (enc, "null", 4, 0);
		564	else
		565	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		566	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
458	}	567	}
459	}	568	}
460
461	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
462	}
463
464	// encode objects, arrays and special \0=false and \1=true values.
465	static void
466	encode_rv (enc_t enc, SV sv)
467	{
468	svtype svt;
469
470	SvGETMAGIC (sv);
471	svt = SvTYPE (sv);
472
473	if (svt == SVt_PVHV)	569	else if (svt == SVt_PVHV)
474	encode_hv (enc, (HV *)sv);	570	encode_hv (enc, (HV *)sv);
475	else if (svt == SVt_PVAV)	571	else if (svt == SVt_PVAV)
476	encode_av (enc, (AV *)sv);	572	encode_av (enc, (AV *)sv);
477	else if (svt < SVt_PVAV)	573	else if (svt < SVt_PVAV)
478	{	574	{
479	if (SvNIOK (sv) && SvIV (sv) == 0)	575	STRLEN len = 0;
		576	char *pv = svt ? SvPV (sv, len) : 0;
		577
		578	if (len == 1 && *pv == '1')
		579	encode_str (enc, "true", 4, 0);
		580	else if (len == 1 && *pv == '0')
480	encode_str (enc, "false", 5, 0);	581	encode_str (enc, "false", 5, 0);
481	else if (SvNIOK (sv) && SvIV (sv) == 1)
482	encode_str (enc, "true", 4, 0);
483	else	582	else
484	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	583	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
485	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	584	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
486	}	585	}
487	else	586	else
…		…
557	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	656	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
558	SvPV_nolen (sv), SvFLAGS (sv));	657	SvPV_nolen (sv), SvFLAGS (sv));
559	}	658	}
560		659
561	static SV *	660	static SV *
562	encode_json (SV *scalar, U32 flags)	661	encode_json (SV scalar, JSON json)
563	{	662	{
564	enc_t enc;	663	enc_t enc;
565		664
566	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	665	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
567	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	666	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
568		667
569	enc.flags = flags;	668	enc.json = *json;
570	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	669	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
571	enc.cur = SvPVX (enc.sv);	670	enc.cur = SvPVX (enc.sv);
572	enc.end = SvEND (enc.sv);	671	enc.end = SvEND (enc.sv);
573	enc.indent = 0;	672	enc.indent = 0;
574	enc.maxdepth = DEC_DEPTH (flags);	673	enc.maxdepth = DEC_DEPTH (enc.json.flags);
575		674
576	SvPOK_only (enc.sv);	675	SvPOK_only (enc.sv);
577	encode_sv (&enc, scalar);	676	encode_sv (&enc, scalar);
578		677
579	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	678	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
580	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	679	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
581		680
582	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	681	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
583	SvUTF8_on (enc.sv);	682	SvUTF8_on (enc.sv);
584		683
585	if (enc.flags & F_SHRINK)	684	if (enc.json.flags & F_SHRINK)
586	shrink (enc.sv);	685	shrink (enc.sv);
587		686
588	return enc.sv;	687	return enc.sv;
589	}	688	}
590		689
…		…
595	typedef struct	694	typedef struct
596	{	695	{
597	char *cur; // current parser pointer	696	char *cur; // current parser pointer
598	char *end; // end of input string	697	char *end; // end of input string
599	const char *err; // parse error, if != 0	698	const char *err; // parse error, if != 0
600	U32 flags; // F_*	699	JSON json;
601	U32 depth; // recursion depth	700	U32 depth; // recursion depth
602	U32 maxdepth; // recursion depth limit	701	U32 maxdepth; // recursion depth limit
603	} dec_t;	702	} dec_t;
604		703
605	inline void	704	inline void
…		…
610	char ch = *dec->cur;	709	char ch = *dec->cur;
611		710
612	if (ch > 0x20	711	if (ch > 0x20
613	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	712	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
614	break;	713	break;
		714
		715	if (ch == '#' && dec->json.flags & F_RELAXED)
		716	++dec->cur;
615		717
616	++dec->cur;	718	++dec->cur;
617	}	719	}
618	}	720	}
619		721
…		…
868	is_nv = 1;	970	is_nv = 1;
869	}	971	}
870		972
871	if (!is_nv)	973	if (!is_nv)
872	{	974	{
		975	int len = dec->cur - start;
		976
873	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	977	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
874	if (*start == '-')	978	if (*start == '-')
875	switch (dec->cur - start)	979	switch (len)
876	{	980	{
877	case 2: return newSViv (-( start [1] - '0' * 1));	981	case 2: return newSViv (-( start [1] - '0' * 1));
878	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	982	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
879	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	983	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
880	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	984	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
881	}	985	}
882	else	986	else
883	switch (dec->cur - start)	987	switch (len)
884	{	988	{
885	case 1: return newSViv ( start [0] - '0' * 1);	989	case 1: return newSViv ( start [0] - '0' * 1);
886	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	990	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
887	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	991	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
888	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	992	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
889	}	993	}
890		994
891	{	995	{
892	UV uv;	996	UV uv;
893	int numtype = grok_number (start, dec->cur - start, &uv);	997	int numtype = grok_number (start, len, &uv);
894	if (numtype & IS_NUMBER_IN_UV)	998	if (numtype & IS_NUMBER_IN_UV)
895	if (numtype & IS_NUMBER_NEG)	999	if (numtype & IS_NUMBER_NEG)
896	{	1000	{
897	if (uv < (UV)IV_MIN)	1001	if (uv < (UV)IV_MIN)
898	return newSViv (-(IV)uv);	1002	return newSViv (-(IV)uv);
899	}	1003	}
900	else	1004	else
901	return newSVuv (uv);	1005	return newSVuv (uv);
902
903	// here would likely be the place for bigint support
904	}	1006	}
905	}
906		1007
907	// if we ever support bigint or bigfloat, this is the place for bigfloat	1008	len -= *start == '-' ? 1 : 0;
		1009
		1010	// does not fit into IV or UV, try NV
		1011	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1012	#if defined (LDBL_DIG)
		1013	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1014	#endif
		1015	)
		1016	// fits into NV without loss of precision
		1017	return newSVnv (Atof (start));
		1018
		1019	// everything else fails, convert it to a string
		1020	return newSVpvn (start, dec->cur - start);
		1021	}
		1022
		1023	// loss of precision here
908	return newSVnv (Atof (start));	1024	return newSVnv (Atof (start));
909		1025
910	fail:	1026	fail:
911	return 0;	1027	return 0;
912	}	1028	}
…		…
942		1058
943	if (*dec->cur != ',')	1059	if (*dec->cur != ',')
944	ERR (", or ] expected while parsing array");	1060	ERR (", or ] expected while parsing array");
945		1061
946	++dec->cur;	1062	++dec->cur;
		1063
		1064	decode_ws (dec);
		1065
		1066	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1067	{
		1068	++dec->cur;
		1069	break;
		1070	}
947	}	1071	}
948		1072
949	DEC_DEC_DEPTH;	1073	DEC_DEC_DEPTH;
950	return newRV_noinc ((SV *)av);	1074	return newRV_noinc ((SV *)av);
951		1075
…		…
956	}	1080	}
957		1081
958	static SV *	1082	static SV *
959	decode_hv (dec_t *dec)	1083	decode_hv (dec_t *dec)
960	{	1084	{
		1085	SV *sv;
961	HV *hv = newHV ();	1086	HV *hv = newHV ();
962		1087
963	DEC_INC_DEPTH;	1088	DEC_INC_DEPTH;
964	decode_ws (dec);	1089	decode_ws (dec);
965		1090
966	if (*dec->cur == '}')	1091	if (*dec->cur == '}')
967	++dec->cur;	1092	++dec->cur;
968	else	1093	else
969	for (;;)	1094	for (;;)
970	{	1095	{
		1096	EXPECT_CH ('"');
		1097
		1098	// heuristic: assume that
		1099	// a) decode_str + hv_store_ent are abysmally slow.
		1100	// b) most hash keys are short, simple ascii text.
		1101	// => try to "fast-match" such strings to avoid
		1102	// the overhead of decode_str + hv_store_ent.
		1103	{
971	SV key, value;	1104	SV *value;
		1105	char *p = dec->cur;
		1106	char *e = p + 24; // only try up to 24 bytes
972		1107
973	decode_ws (dec); EXPECT_CH ('"');	1108	for (;;)
974
975	key = decode_str (dec);
976	if (!key)
977	goto fail;
978
979	decode_ws (dec); EXPECT_CH (':');
980
981	value = decode_sv (dec);
982	if (!value)
983	{	1109	{
		1110	// the >= 0x80 is true on most architectures
		1111	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1112	{
		1113	// slow path, back up and use decode_str
		1114	SV *key = decode_str (dec);
		1115	if (!key)
		1116	goto fail;
		1117
		1118	decode_ws (dec); EXPECT_CH (':');
		1119
		1120	decode_ws (dec);
		1121	value = decode_sv (dec);
		1122	if (!value)
		1123	{
		1124	SvREFCNT_dec (key);
		1125	goto fail;
		1126	}
		1127
		1128	hv_store_ent (hv, key, value, 0);
984	SvREFCNT_dec (key);	1129	SvREFCNT_dec (key);
		1130
		1131	break;
		1132	}
		1133	else if (*p == '"')
		1134	{
		1135	// fast path, got a simple key
		1136	char *key = dec->cur;
		1137	int len = p - key;
		1138	dec->cur = p + 1;
		1139
		1140	decode_ws (dec); EXPECT_CH (':');
		1141
		1142	decode_ws (dec);
		1143	value = decode_sv (dec);
		1144	if (!value)
985	goto fail;	1145	goto fail;
		1146
		1147	hv_store (hv, key, len, value, 0);
		1148
		1149	break;
		1150	}
		1151
		1152	++p;
986	}	1153	}
987		1154	}
988	hv_store_ent (hv, key, value, 0);
989	SvREFCNT_dec (key);
990		1155
991	decode_ws (dec);	1156	decode_ws (dec);
992		1157
993	if (*dec->cur == '}')	1158	if (*dec->cur == '}')
994	{	1159	{
…		…
998		1163
999	if (*dec->cur != ',')	1164	if (*dec->cur != ',')
1000	ERR (", or } expected while parsing object/hash");	1165	ERR (", or } expected while parsing object/hash");
1001		1166
1002	++dec->cur;	1167	++dec->cur;
		1168
		1169	decode_ws (dec);
		1170
		1171	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1172	{
		1173	++dec->cur;
		1174	break;
		1175	}
1003	}	1176	}
1004		1177
1005	DEC_DEC_DEPTH;	1178	DEC_DEC_DEPTH;
1006	return newRV_noinc ((SV *)hv);	1179	sv = newRV_noinc ((SV *)hv);
		1180
		1181	// check filter callbacks
		1182	if (dec->json.flags & F_HOOK)
		1183	{
		1184	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1185	{
		1186	HE cb, he;
		1187
		1188	hv_iterinit (hv);
		1189	he = hv_iternext (hv);
		1190	hv_iterinit (hv);
		1191
		1192	// the next line creates a mortal sv each time its called.
		1193	// might want to optimise this for common cases.
		1194	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1195
		1196	if (cb)
		1197	{
		1198	dSP;
		1199	int count;
		1200
		1201	ENTER; SAVETMPS; PUSHMARK (SP);
		1202	XPUSHs (HeVAL (he));
		1203
		1204	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1205
		1206	if (count == 1)
		1207	{
		1208	sv = newSVsv (POPs);
		1209	FREETMPS; LEAVE;
		1210	return sv;
		1211	}
		1212
		1213	FREETMPS; LEAVE;
		1214	}
		1215	}
		1216
		1217	if (dec->json.cb_object)
		1218	{
		1219	dSP;
		1220	int count;
		1221
		1222	ENTER; SAVETMPS; PUSHMARK (SP);
		1223	XPUSHs (sv_2mortal (sv));
		1224
		1225	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1226
		1227	if (count == 1)
		1228	{
		1229	sv = newSVsv (POPs);
		1230	FREETMPS; LEAVE;
		1231	return sv;
		1232	}
		1233
		1234	SvREFCNT_inc (sv);
		1235	FREETMPS; LEAVE;
		1236	}
		1237	}
		1238
		1239	return sv;
1007		1240
1008	fail:	1241	fail:
1009	SvREFCNT_dec (hv);	1242	SvREFCNT_dec (hv);
1010	DEC_DEC_DEPTH;	1243	DEC_DEC_DEPTH;
1011	return 0;	1244	return 0;
1012	}	1245	}
1013		1246
1014	static SV *	1247	static SV *
1015	decode_sv (dec_t *dec)	1248	decode_sv (dec_t *dec)
1016	{	1249	{
1017	decode_ws (dec);
1018
1019	// the beauty of JSON: you need exactly one character lookahead	1250	// the beauty of JSON: you need exactly one character lookahead
1020	// to parse anything.	1251	// to parse anything.
1021	switch (*dec->cur)	1252	switch (*dec->cur)
1022	{	1253	{
1023	case '"': ++dec->cur; return decode_str (dec);	1254	case '"': ++dec->cur; return decode_str (dec);
…		…
1031		1262
1032	case 't':	1263	case 't':
1033	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1264	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1034	{	1265	{
1035	dec->cur += 4;	1266	dec->cur += 4;
1036	return newSViv (1);	1267	#if JSON_SLOW
		1268	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1269	#endif
		1270	return SvREFCNT_inc (json_true);
1037	}	1271	}
1038	else	1272	else
1039	ERR ("'true' expected");	1273	ERR ("'true' expected");
1040		1274
1041	break;	1275	break;
1042		1276
1043	case 'f':	1277	case 'f':
1044	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1278	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1045	{	1279	{
1046	dec->cur += 5;	1280	dec->cur += 5;
1047	return newSViv (0);	1281	#if JSON_SLOW
		1282	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1283	#endif
		1284	return SvREFCNT_inc (json_false);
1048	}	1285	}
1049	else	1286	else
1050	ERR ("'false' expected");	1287	ERR ("'false' expected");
1051		1288
1052	break;	1289	break;
…		…
1070	fail:	1307	fail:
1071	return 0;	1308	return 0;
1072	}	1309	}
1073		1310
1074	static SV *	1311	static SV *
1075	decode_json (SV string, U32 flags, UV offset_return)	1312	decode_json (SV string, JSON json, UV *offset_return)
1076	{	1313	{
1077	dec_t dec;	1314	dec_t dec;
1078	UV offset;	1315	UV offset;
1079	SV *sv;	1316	SV *sv;
1080		1317
1081	SvGETMAGIC (string);	1318	SvGETMAGIC (string);
1082	SvUPGRADE (string, SVt_PV);	1319	SvUPGRADE (string, SVt_PV);
1083		1320
		1321	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1322	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1323	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1324
1084	if (flags & F_UTF8)	1325	if (json->flags & F_UTF8)
1085	sv_utf8_downgrade (string, 0);	1326	sv_utf8_downgrade (string, 0);
1086	else	1327	else
1087	sv_utf8_upgrade (string);	1328	sv_utf8_upgrade (string);
1088		1329
1089	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1330	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1090		1331
1091	dec.flags = flags;	1332	dec.json = *json;
1092	dec.cur = SvPVX (string);	1333	dec.cur = SvPVX (string);
1093	dec.end = SvEND (string);	1334	dec.end = SvEND (string);
1094	dec.err = 0;	1335	dec.err = 0;
1095	dec.depth = 0;	1336	dec.depth = 0;
1096	dec.maxdepth = DEC_DEPTH (dec.flags);	1337	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1338
		1339	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1340	dec.json.flags \|= F_HOOK;
1097		1341
1098	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1342	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1343
		1344	decode_ws (&dec);
1099	sv = decode_sv (&dec);	1345	sv = decode_sv (&dec);
1100		1346
1101	if (!(offset_return \|\| !sv))	1347	if (!(offset_return \|\| !sv))
1102	{	1348	{
1103	// check for trailing garbage	1349	// check for trailing garbage
…		…
1111	}	1357	}
1112	}	1358	}
1113		1359
1114	if (offset_return \|\| !sv)	1360	if (offset_return \|\| !sv)
1115	{	1361	{
1116	offset = dec.flags & F_UTF8	1362	offset = dec.json.flags & F_UTF8
1117	? dec.cur - SvPVX (string)	1363	? dec.cur - SvPVX (string)
1118	: utf8_distance (dec.cur, SvPVX (string));	1364	: utf8_distance (dec.cur, SvPVX (string));
1119		1365
1120	if (offset_return)	1366	if (offset_return)
1121	*offset_return = offset;	1367	*offset_return = offset;
…		…
1140	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1386	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1141	}	1387	}
1142		1388
1143	sv = sv_2mortal (sv);	1389	sv = sv_2mortal (sv);
1144		1390
1145	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1391	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1146	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1392	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1147		1393
1148	return sv;	1394	return sv;
1149	}	1395	}
1150		1396
…		…
1162	i >= '0' && i <= '9' ? i - '0'	1408	i >= '0' && i <= '9' ? i - '0'
1163	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1409	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1164	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1410	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1165	: -1;	1411	: -1;
1166		1412
1167	json_stash = gv_stashpv ("JSON::XS", 1);	1413	json_stash = gv_stashpv ("JSON::XS" , 1);
		1414	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1415
		1416	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1417	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1168	}	1418	}
1169		1419
1170	PROTOTYPES: DISABLE	1420	PROTOTYPES: DISABLE
1171		1421
1172	SV new (char dummy)	1422	void CLONE (...)
1173	CODE:	1423	CODE:
1174	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1424	json_stash = 0;
1175	OUTPUT:	1425	json_boolean_stash = 0;
1176	RETVAL
1177		1426
		1427	void new (char *klass)
		1428	PPCODE:
		1429	{
		1430	SV *pv = NEWSV (0, sizeof (JSON));
		1431	SvPOK_only (pv);
		1432	Zero (SvPVX (pv), 1, JSON);
		1433	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1434	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
		1435	}
		1436
1178	SV ascii (SV self, int enable = 1)	1437	void ascii (JSON *self, int enable = 1)
1179	ALIAS:	1438	ALIAS:
1180	ascii = F_ASCII	1439	ascii = F_ASCII
1181	latin1 = F_LATIN1	1440	latin1 = F_LATIN1
1182	utf8 = F_UTF8	1441	utf8 = F_UTF8
1183	indent = F_INDENT	1442	indent = F_INDENT
1184	canonical = F_CANONICAL	1443	canonical = F_CANONICAL
1185	space_before = F_SPACE_BEFORE	1444	space_before = F_SPACE_BEFORE
1186	space_after = F_SPACE_AFTER	1445	space_after = F_SPACE_AFTER
1187	pretty = F_PRETTY	1446	pretty = F_PRETTY
1188	allow_nonref = F_ALLOW_NONREF	1447	allow_nonref = F_ALLOW_NONREF
1189	shrink = F_SHRINK	1448	shrink = F_SHRINK
		1449	allow_blessed = F_ALLOW_BLESSED
		1450	convert_blessed = F_CONV_BLESSED
		1451	relaxed = F_RELAXED
1190	CODE:	1452	PPCODE:
1191	{	1453	{
1192	UV *uv = SvJSON (self);
1193	if (enable)	1454	if (enable)
1194	*uv \|= ix;	1455	self->flags \|= ix;
1195	else	1456	else
1196	*uv &= ~ix;	1457	self->flags &= ~ix;
1197		1458
1198	RETVAL = newSVsv (self);	1459	XPUSHs (ST (0));
1199	}	1460	}
1200	OUTPUT:
1201	RETVAL
1202		1461
1203	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1462	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1204	CODE:	1463	PPCODE:
1205	{	1464	{
1206	UV *uv = SvJSON (self);
1207	UV log2 = 0;	1465	UV log2 = 0;
1208		1466
1209	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1467	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1210		1468
1211	while ((1UL << log2) < max_depth)	1469	while ((1UL << log2) < max_depth)
1212	++log2;	1470	++log2;
1213		1471
1214	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1472	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1215		1473
1216	RETVAL = newSVsv (self);	1474	XPUSHs (ST (0));
1217	}	1475	}
1218	OUTPUT:
1219	RETVAL
1220		1476
1221	void encode (SV self, SV scalar)	1477	void max_size (JSON *self, UV max_size = 0)
1222	PPCODE:	1478	PPCODE:
1223	XPUSHs (encode_json (scalar, *SvJSON (self)));	1479	{
		1480	UV log2 = 0;
1224		1481
1225	void decode (SV self, SV jsonstr)	1482	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1483	if (max_size == 1) max_size = 2;
		1484
		1485	while ((1UL << log2) < max_size)
		1486	++log2;
		1487
		1488	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1489
		1490	XPUSHs (ST (0));
		1491	}
		1492
		1493	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1226	PPCODE:	1494	PPCODE:
		1495	{
		1496	SvREFCNT_dec (self->cb_object);
		1497	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1498
		1499	XPUSHs (ST (0));
		1500	}
		1501
		1502	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1503	PPCODE:
		1504	{
		1505	if (!self->cb_sk_object)
		1506	self->cb_sk_object = newHV ();
		1507
		1508	if (SvOK (cb))
		1509	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1510	else
		1511	{
		1512	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1513
		1514	if (!HvKEYS (self->cb_sk_object))
		1515	{
		1516	SvREFCNT_dec (self->cb_sk_object);
		1517	self->cb_sk_object = 0;
		1518	}
		1519	}
		1520
		1521	XPUSHs (ST (0));
		1522	}
		1523
		1524	void encode (JSON self, SV scalar)
		1525	PPCODE:
		1526	XPUSHs (encode_json (scalar, self));
		1527
		1528	void decode (JSON self, SV jsonstr)
		1529	PPCODE:
1227	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1530	XPUSHs (decode_json (jsonstr, self, 0));
1228		1531
1229	void decode_prefix (SV self, SV jsonstr)	1532	void decode_prefix (JSON self, SV jsonstr)
1230	PPCODE:	1533	PPCODE:
1231	{	1534	{
1232	UV offset;	1535	UV offset;
1233	EXTEND (SP, 2);	1536	EXTEND (SP, 2);
1234	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1537	PUSHs (decode_json (jsonstr, self, &offset));
1235	PUSHs (sv_2mortal (newSVuv (offset)));	1538	PUSHs (sv_2mortal (newSVuv (offset)));
1236	}	1539	}
1237		1540
		1541	void DESTROY (JSON *self)
		1542	CODE:
		1543	SvREFCNT_dec (self->cb_sk_object);
		1544	SvREFCNT_dec (self->cb_object);
		1545
1238	PROTOTYPES: ENABLE	1546	PROTOTYPES: ENABLE
1239		1547
1240	void to_json (SV *scalar)	1548	void to_json (SV *scalar)
1241	ALIAS:
1242	objToJson = 0
1243	PPCODE:	1549	PPCODE:
		1550	{
		1551	JSON json = { F_DEFAULT \| F_UTF8 };
1244	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1552	XPUSHs (encode_json (scalar, &json));
		1553	}
1245		1554
1246	void from_json (SV *jsonstr)	1555	void from_json (SV *jsonstr)
1247	ALIAS:
1248	jsonToObj = 0
1249	PPCODE:	1556	PPCODE:
		1557	{
		1558	JSON json = { F_DEFAULT \| F_UTF8 };
1250	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1559	XPUSHs (decode_json (jsonstr, &json, 0));
		1560	}
1251		1561

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC vs. Revision 1.63 by root, Mon Aug 27 01:49:01 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC vs.
Revision 1.63 by root, Mon Aug 27 01:49:01 2007 UTC