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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC vs.
Revision 1.56 by root, Thu Jul 26 11:33:35 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
		15	// some old perls do not have this, try to make it work, no
		16	// guarentees, though. if it breaks, you get to keep the pieces.
		17	#ifndef UTF8_MAXBYTES
		18	# define UTF8_MAXBYTES 13
		19	#endif
		20
14	#define F_ASCII 0x00000001UL	21	#define F_ASCII 0x00000001UL
15	#define F_LATIN1 0x00000002UL	22	#define F_LATIN1 0x00000002UL
16	#define F_UTF8 0x00000004UL	23	#define F_UTF8 0x00000004UL
17	#define F_INDENT 0x00000008UL	24	#define F_INDENT 0x00000008UL
18	#define F_CANONICAL 0x00000010UL	25	#define F_CANONICAL 0x00000010UL
19	#define F_SPACE_BEFORE 0x00000020UL	26	#define F_SPACE_BEFORE 0x00000020UL
20	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
21	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
22	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
		30	#define F_ALLOW_BLESSED 0x00000400UL
		31	#define F_CONV_BLESSED 0x00000800UL
23	#define F_MAXDEPTH 0xf8000000UL	32	#define F_MAXDEPTH 0xf8000000UL
24	#define S_MAXDEPTH 27	33	#define S_MAXDEPTH 27
		34	#define F_MAXSIZE 0x01f00000UL
		35	#define S_MAXSIZE 20
		36	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
25		37
26	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	38	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27		39	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28	// F_SELFCONVERT? <=> to_json/toJson
29	// F_BLESSED? <=> { $__class__$ => }
30		40
31	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
32	#define F_DEFAULT (9UL << S_MAXDEPTH)	42	#define F_DEFAULT (9UL << S_MAXDEPTH)
33		43
34	#define INIT_SIZE 32 // initial scalar size to be allocated	44	#define INIT_SIZE 32 // initial scalar size to be allocated
48	#endif	58	#endif
49		59
50	#define expect_false(expr) expect ((expr) != 0, 0)	60	#define expect_false(expr) expect ((expr) != 0, 0)
51	#define expect_true(expr) expect ((expr) != 0, 1)	61	#define expect_true(expr) expect ((expr) != 0, 1)
52		62
53	static HV *json_stash; // JSON::XS::	63	static HV json_stash, json_boolean_stash; // JSON::XS::
		64	static SV json_true, json_false;
		65
		66	typedef struct {
		67	U32 flags;
		68	SV *cb_object;
		69	HV *cb_sk_object;
		70	} JSON;
54		71
55	/////////////////////////////////////////////////////////////////////////////	72	/////////////////////////////////////////////////////////////////////////////
56	// utility functions	73	// utility functions
57		74
58	static UV *	75	inline void
59	SvJSON (SV *sv)
60	{
61	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62	croak ("object is not of type JSON::XS");
63
64	return &SvUVX (SvRV (sv));
65	}
66
67	static void
68	shrink (SV *sv)	76	shrink (SV *sv)
69	{	77	{
70	sv_utf8_downgrade (sv, 1);	78	sv_utf8_downgrade (sv, 1);
71	if (SvLEN (sv) > SvCUR (sv) + 1)	79	if (SvLEN (sv) > SvCUR (sv) + 1)
72	{	80	{
…		…
107	typedef struct	115	typedef struct
108	{	116	{
109	char *cur; // SvPVX (sv) + current output position	117	char *cur; // SvPVX (sv) + current output position
110	char *end; // SvEND (sv)	118	char *end; // SvEND (sv)
111	SV *sv; // result scalar	119	SV *sv; // result scalar
112	U32 flags; // F_*	120	JSON json;
113	U32 indent; // indentation level	121	U32 indent; // indentation level
114	U32 maxdepth; // max. indentation/recursion level	122	U32 maxdepth; // max. indentation/recursion level
115	} enc_t;	123	} enc_t;
116		124
117	inline void	125	inline void
…		…
191	}	199	}
192		200
193	if (uch > 0x10FFFFUL)	201	if (uch > 0x10FFFFUL)
194	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	202	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
195		203
196	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	204	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
197	{	205	{
198	if (uch > 0xFFFFUL)	206	if (uch > 0xFFFFUL)
199	{	207	{
200	need (enc, len += 11);	208	need (enc, len += 11);
201	sprintf (enc->cur, "\\u%04x\\u%04x",	209	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
215	*enc->cur++ = hexdigit [(uch >> 0) & 15];	223	*enc->cur++ = hexdigit [(uch >> 0) & 15];
216	}	224	}
217		225
218	str += clen;	226	str += clen;
219	}	227	}
220	else if (enc->flags & F_LATIN1)	228	else if (enc->json.flags & F_LATIN1)
221	{	229	{
222	*enc->cur++ = uch;	230	*enc->cur++ = uch;
223	str += clen;	231	str += clen;
224	}	232	}
225	else if (is_utf8)	233	else if (is_utf8)
…		…
246	}	254	}
247		255
248	inline void	256	inline void
249	encode_indent (enc_t *enc)	257	encode_indent (enc_t *enc)
250	{	258	{
251	if (enc->flags & F_INDENT)	259	if (enc->json.flags & F_INDENT)
252	{	260	{
253	int spaces = enc->indent * INDENT_STEP;	261	int spaces = enc->indent * INDENT_STEP;
254		262
255	need (enc, spaces);	263	need (enc, spaces);
256	memset (enc->cur, ' ', spaces);	264	memset (enc->cur, ' ', spaces);
…		…
266	}	274	}
267		275
268	inline void	276	inline void
269	encode_nl (enc_t *enc)	277	encode_nl (enc_t *enc)
270	{	278	{
271	if (enc->flags & F_INDENT)	279	if (enc->json.flags & F_INDENT)
272	{	280	{
273	need (enc, 1);	281	need (enc, 1);
274	encode_ch (enc, '\n');	282	encode_ch (enc, '\n');
275	}	283	}
276	}	284	}
…		…
278	inline void	286	inline void
279	encode_comma (enc_t *enc)	287	encode_comma (enc_t *enc)
280	{	288	{
281	encode_ch (enc, ',');	289	encode_ch (enc, ',');
282		290
283	if (enc->flags & F_INDENT)	291	if (enc->json.flags & F_INDENT)
284	encode_nl (enc);	292	encode_nl (enc);
285	else if (enc->flags & F_SPACE_AFTER)	293	else if (enc->json.flags & F_SPACE_AFTER)
286	encode_space (enc);	294	encode_space (enc);
287	}	295	}
288		296
289	static void encode_sv (enc_t enc, SV sv);	297	static void encode_sv (enc_t enc, SV sv);
290		298
…		…
299	encode_ch (enc, '['); encode_nl (enc);	307	encode_ch (enc, '['); encode_nl (enc);
300	++enc->indent;	308	++enc->indent;
301		309
302	for (i = 0; i <= len; ++i)	310	for (i = 0; i <= len; ++i)
303	{	311	{
		312	SV **svp = av_fetch (av, i, 0);
		313
304	encode_indent (enc);	314	encode_indent (enc);
305	encode_sv (enc, *av_fetch (av, i, 0));	315
		316	if (svp)
		317	encode_sv (enc, *svp);
		318	else
		319	encode_str (enc, "null", 4, 0);
306		320
307	if (i < len)	321	if (i < len)
308	encode_comma (enc);	322	encode_comma (enc);
309	}	323	}
310		324
…		…
333	else	347	else
334	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	348	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
335		349
336	encode_ch (enc, '"');	350	encode_ch (enc, '"');
337		351
338	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	352	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
339	encode_ch (enc, ':');	353	encode_ch (enc, ':');
340	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	354	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
341	encode_sv (enc, HeVAL (he));	355	encode_sv (enc, HeVAL (he));
342	}	356	}
343		357
344	// compare hash entries, used when all keys are bytestrings	358	// compare hash entries, used when all keys are bytestrings
345	static int	359	static int
…		…
380	{	394	{
381	// for canonical output we have to sort by keys first	395	// for canonical output we have to sort by keys first
382	// actually, this is mostly due to the stupid so-called	396	// actually, this is mostly due to the stupid so-called
383	// security workaround added somewhere in 5.8.x.	397	// security workaround added somewhere in 5.8.x.
384	// that randomises hash orderings	398	// that randomises hash orderings
385	if (enc->flags & F_CANONICAL)	399	if (enc->json.flags & F_CANONICAL)
386	{	400	{
387	int fast = 1;	401	int fast = 1;
388	HE *he;	402	HE *he;
389	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	403	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
390	HE *hes = _alloca (count sizeof (HE));	404	HE *hes = _alloca (count sizeof (HE));
…		…
462	svtype svt;	476	svtype svt;
463		477
464	SvGETMAGIC (sv);	478	SvGETMAGIC (sv);
465	svt = SvTYPE (sv);	479	svt = SvTYPE (sv);
466		480
		481	if (expect_false (SvOBJECT (sv)))
		482	{
		483	if (SvSTASH (sv) == json_boolean_stash)
		484	{
		485	if (SvIV (sv))
		486	encode_str (enc, "true", 4, 0);
		487	else
		488	encode_str (enc, "false", 5, 0);
		489	}
		490	else
		491	{
		492	#if 0
		493	if (0 && sv_derived_from (rv, "JSON::Literal"))
		494	{
		495	// not yet
		496	}
		497	#endif
		498	if (enc->json.flags & F_CONV_BLESSED)
		499	{
		500	// we re-bless the reference to get overload and other niceties right
		501	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
		502
		503	if (to_json)
		504	{
		505	int count;
		506	dSP;
		507
		508	ENTER; SAVETMPS; PUSHMARK (SP);
		509	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		510
		511	// calling with G_SCALAR ensures that we always get a 1 return value
		512	PUTBACK;
		513	call_sv ((SV *)GvCV (to_json), G_SCALAR);
		514	SPAGAIN;
		515
		516	// catch this surprisingly common error
		517	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		518	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		519
		520	sv = POPs;
		521	PUTBACK;
		522
		523	encode_sv (enc, sv);
		524
		525	FREETMPS; LEAVE;
		526	}
		527	else if (enc->json.flags & F_ALLOW_BLESSED)
		528	encode_str (enc, "null", 4, 0);
		529	else
		530	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		531	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		532	}
		533	else if (enc->json.flags & F_ALLOW_BLESSED)
		534	encode_str (enc, "null", 4, 0);
		535	else
		536	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		537	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		538	}
		539	}
467	if (svt == SVt_PVHV)	540	else if (svt == SVt_PVHV)
468	encode_hv (enc, (HV *)sv);	541	encode_hv (enc, (HV *)sv);
469	else if (svt == SVt_PVAV)	542	else if (svt == SVt_PVAV)
470	encode_av (enc, (AV *)sv);	543	encode_av (enc, (AV *)sv);
471	else if (svt < SVt_PVAV)	544	else if (svt < SVt_PVAV)
472	{	545	{
473	if (SvNIOK (sv) && SvIV (sv) == 0)	546	STRLEN len = 0;
		547	char *pv = svt ? SvPV (sv, len) : 0;
		548
		549	if (len == 1 && *pv == '1')
		550	encode_str (enc, "true", 4, 0);
		551	else if (len == 1 && *pv == '0')
474	encode_str (enc, "false", 5, 0);	552	encode_str (enc, "false", 5, 0);
475	else if (SvNIOK (sv) && SvIV (sv) == 1)
476	encode_str (enc, "true", 4, 0);
477	else	553	else
478	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	554	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
479	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	555	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
480	}	556	}
481	else	557	else
…		…
551	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	627	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
552	SvPV_nolen (sv), SvFLAGS (sv));	628	SvPV_nolen (sv), SvFLAGS (sv));
553	}	629	}
554		630
555	static SV *	631	static SV *
556	encode_json (SV *scalar, U32 flags)	632	encode_json (SV scalar, JSON json)
557	{	633	{
558	enc_t enc;	634	enc_t enc;
559		635
560	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	636	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
561	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	637	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
562		638
563	enc.flags = flags;	639	enc.json = *json;
564	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	640	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
565	enc.cur = SvPVX (enc.sv);	641	enc.cur = SvPVX (enc.sv);
566	enc.end = SvEND (enc.sv);	642	enc.end = SvEND (enc.sv);
567	enc.indent = 0;	643	enc.indent = 0;
568	enc.maxdepth = DEC_DEPTH (flags);	644	enc.maxdepth = DEC_DEPTH (enc.json.flags);
569		645
570	SvPOK_only (enc.sv);	646	SvPOK_only (enc.sv);
571	encode_sv (&enc, scalar);	647	encode_sv (&enc, scalar);
572		648
573	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	649	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
574	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	650	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
575		651
576	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	652	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
577	SvUTF8_on (enc.sv);	653	SvUTF8_on (enc.sv);
578		654
579	if (enc.flags & F_SHRINK)	655	if (enc.json.flags & F_SHRINK)
580	shrink (enc.sv);	656	shrink (enc.sv);
581		657
582	return enc.sv;	658	return enc.sv;
583	}	659	}
584		660
…		…
589	typedef struct	665	typedef struct
590	{	666	{
591	char *cur; // current parser pointer	667	char *cur; // current parser pointer
592	char *end; // end of input string	668	char *end; // end of input string
593	const char *err; // parse error, if != 0	669	const char *err; // parse error, if != 0
594	U32 flags; // F_*	670	JSON json;
595	U32 depth; // recursion depth	671	U32 depth; // recursion depth
596	U32 maxdepth; // recursion depth limit	672	U32 maxdepth; // recursion depth limit
597	} dec_t;	673	} dec_t;
598		674
599	inline void	675	inline void
…		…
862	is_nv = 1;	938	is_nv = 1;
863	}	939	}
864		940
865	if (!is_nv)	941	if (!is_nv)
866	{	942	{
		943	int len = dec->cur - start;
		944
867	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	945	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
868	if (*start == '-')	946	if (*start == '-')
869	switch (dec->cur - start)	947	switch (len)
870	{	948	{
871	case 2: return newSViv (-( start [1] - '0' * 1));	949	case 2: return newSViv (-( start [1] - '0' * 1));
872	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	950	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
873	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	951	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
874	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	952	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
875	}	953	}
876	else	954	else
877	switch (dec->cur - start)	955	switch (len)
878	{	956	{
879	case 1: return newSViv ( start [0] - '0' * 1);	957	case 1: return newSViv ( start [0] - '0' * 1);
880	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	958	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
881	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	959	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
882	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	960	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
883	}	961	}
884		962
885	{	963	{
886	UV uv;	964	UV uv;
887	int numtype = grok_number (start, dec->cur - start, &uv);	965	int numtype = grok_number (start, len, &uv);
888	if (numtype & IS_NUMBER_IN_UV)	966	if (numtype & IS_NUMBER_IN_UV)
889	if (numtype & IS_NUMBER_NEG)	967	if (numtype & IS_NUMBER_NEG)
890	{	968	{
891	if (uv < (UV)IV_MIN)	969	if (uv < (UV)IV_MIN)
892	return newSViv (-(IV)uv);	970	return newSViv (-(IV)uv);
893	}	971	}
894	else	972	else
895	return newSVuv (uv);	973	return newSVuv (uv);
896
897	// here would likely be the place for bigint support
898	}	974	}
899	}
900		975
901	// if we ever support bigint or bigfloat, this is the place for bigfloat	976	len -= *start == '-' ? 1 : 0;
		977
		978	// does not fit into IV or UV, try NV
		979	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		980	#if defined (LDBL_DIG)
		981	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		982	#endif
		983	)
		984	// fits into NV without loss of precision
		985	return newSVnv (Atof (start));
		986
		987	// everything else fails, convert it to a string
		988	return newSVpvn (start, dec->cur - start);
		989	}
		990
		991	// loss of precision here
902	return newSVnv (Atof (start));	992	return newSVnv (Atof (start));
903		993
904	fail:	994	fail:
905	return 0;	995	return 0;
906	}	996	}
…		…
950	}	1040	}
951		1041
952	static SV *	1042	static SV *
953	decode_hv (dec_t *dec)	1043	decode_hv (dec_t *dec)
954	{	1044	{
		1045	SV *sv;
955	HV *hv = newHV ();	1046	HV *hv = newHV ();
956		1047
957	DEC_INC_DEPTH;	1048	DEC_INC_DEPTH;
958	decode_ws (dec);	1049	decode_ws (dec);
959		1050
960	if (*dec->cur == '}')	1051	if (*dec->cur == '}')
961	++dec->cur;	1052	++dec->cur;
962	else	1053	else
963	for (;;)	1054	for (;;)
964	{	1055	{
965	SV key, value;
966
967	decode_ws (dec); EXPECT_CH ('"');	1056	decode_ws (dec); EXPECT_CH ('"');
968		1057
969	key = decode_str (dec);	1058	// heuristic: assume that
970	if (!key)	1059	// a) decode_str + hv_store_ent are abysmally slow.
971	goto fail;	1060	// b) most hash keys are short, simple ascii text.
		1061	// => try to "fast-match" such strings to avoid
		1062	// the overhead of decode_str + hv_store_ent.
		1063	{
		1064	SV *value;
		1065	char *p = dec->cur;
		1066	char *e = p + 24; // only try up to 24 bytes
972		1067
973	decode_ws (dec); EXPECT_CH (':');	1068	for (;;)
974
975	value = decode_sv (dec);
976	if (!value)
977	{	1069	{
		1070	// the >= 0x80 is true on most architectures
		1071	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1072	{
		1073	// slow path, back up and use decode_str
		1074	SV *key = decode_str (dec);
		1075	if (!key)
		1076	goto fail;
		1077
		1078	decode_ws (dec); EXPECT_CH (':');
		1079
		1080	value = decode_sv (dec);
		1081	if (!value)
		1082	{
		1083	SvREFCNT_dec (key);
		1084	goto fail;
		1085	}
		1086
		1087	hv_store_ent (hv, key, value, 0);
978	SvREFCNT_dec (key);	1088	SvREFCNT_dec (key);
		1089
		1090	break;
		1091	}
		1092	else if (*p == '"')
		1093	{
		1094	// fast path, got a simple key
		1095	char *key = dec->cur;
		1096	int len = p - key;
		1097	dec->cur = p + 1;
		1098
		1099	decode_ws (dec); EXPECT_CH (':');
		1100
		1101	value = decode_sv (dec);
		1102	if (!value)
979	goto fail;	1103	goto fail;
		1104
		1105	hv_store (hv, key, len, value, 0);
		1106
		1107	break;
		1108	}
		1109
		1110	++p;
980	}	1111	}
981		1112	}
982	hv_store_ent (hv, key, value, 0);
983	SvREFCNT_dec (key);
984		1113
985	decode_ws (dec);	1114	decode_ws (dec);
986		1115
987	if (*dec->cur == '}')	1116	if (*dec->cur == '}')
988	{	1117	{
…		…
995		1124
996	++dec->cur;	1125	++dec->cur;
997	}	1126	}
998		1127
999	DEC_DEC_DEPTH;	1128	DEC_DEC_DEPTH;
1000	return newRV_noinc ((SV *)hv);	1129	sv = newRV_noinc ((SV *)hv);
		1130
		1131	// check filter callbacks
		1132	if (dec->json.flags & F_HOOK)
		1133	{
		1134	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1135	{
		1136	HE cb, he;
		1137
		1138	hv_iterinit (hv);
		1139	he = hv_iternext (hv);
		1140	hv_iterinit (hv);
		1141
		1142	// the next line creates a mortal sv each time its called.
		1143	// might want to optimise this for common cases.
		1144	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1145
		1146	if (cb)
		1147	{
		1148	dSP;
		1149	int count;
		1150
		1151	ENTER; SAVETMPS; PUSHMARK (SP);
		1152	XPUSHs (HeVAL (he));
		1153
		1154	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1155
		1156	if (count == 1)
		1157	{
		1158	sv = newSVsv (POPs);
		1159	FREETMPS; LEAVE;
		1160	return sv;
		1161	}
		1162
		1163	FREETMPS; LEAVE;
		1164	}
		1165	}
		1166
		1167	if (dec->json.cb_object)
		1168	{
		1169	dSP;
		1170	int count;
		1171
		1172	ENTER; SAVETMPS; PUSHMARK (SP);
		1173	XPUSHs (sv_2mortal (sv));
		1174
		1175	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1176
		1177	if (count == 1)
		1178	{
		1179	sv = newSVsv (POPs);
		1180	FREETMPS; LEAVE;
		1181	return sv;
		1182	}
		1183
		1184	SvREFCNT_inc (sv);
		1185	FREETMPS; LEAVE;
		1186	}
		1187	}
		1188
		1189	return sv;
1001		1190
1002	fail:	1191	fail:
1003	SvREFCNT_dec (hv);	1192	SvREFCNT_dec (hv);
1004	DEC_DEC_DEPTH;	1193	DEC_DEC_DEPTH;
1005	return 0;	1194	return 0;
…		…
1025		1214
1026	case 't':	1215	case 't':
1027	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1216	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1028	{	1217	{
1029	dec->cur += 4;	1218	dec->cur += 4;
1030	return newSViv (1);	1219	return SvREFCNT_inc (json_true);
1031	}	1220	}
1032	else	1221	else
1033	ERR ("'true' expected");	1222	ERR ("'true' expected");
1034		1223
1035	break;	1224	break;
1036		1225
1037	case 'f':	1226	case 'f':
1038	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1227	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1039	{	1228	{
1040	dec->cur += 5;	1229	dec->cur += 5;
1041	return newSViv (0);	1230	return SvREFCNT_inc (json_false);
1042	}	1231	}
1043	else	1232	else
1044	ERR ("'false' expected");	1233	ERR ("'false' expected");
1045		1234
1046	break;	1235	break;
…		…
1064	fail:	1253	fail:
1065	return 0;	1254	return 0;
1066	}	1255	}
1067		1256
1068	static SV *	1257	static SV *
1069	decode_json (SV string, U32 flags, UV offset_return)	1258	decode_json (SV string, JSON json, UV *offset_return)
1070	{	1259	{
1071	dec_t dec;	1260	dec_t dec;
1072	UV offset;	1261	UV offset;
1073	SV *sv;	1262	SV *sv;
1074		1263
1075	SvGETMAGIC (string);	1264	SvGETMAGIC (string);
1076	SvUPGRADE (string, SVt_PV);	1265	SvUPGRADE (string, SVt_PV);
1077		1266
		1267	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1268	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1269	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1270
1078	if (flags & F_UTF8)	1271	if (json->flags & F_UTF8)
1079	sv_utf8_downgrade (string, 0);	1272	sv_utf8_downgrade (string, 0);
1080	else	1273	else
1081	sv_utf8_upgrade (string);	1274	sv_utf8_upgrade (string);
1082		1275
1083	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1276	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1084		1277
1085	dec.flags = flags;	1278	dec.json = *json;
1086	dec.cur = SvPVX (string);	1279	dec.cur = SvPVX (string);
1087	dec.end = SvEND (string);	1280	dec.end = SvEND (string);
1088	dec.err = 0;	1281	dec.err = 0;
1089	dec.depth = 0;	1282	dec.depth = 0;
1090	dec.maxdepth = DEC_DEPTH (dec.flags);	1283	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1284
		1285	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1286	dec.json.flags \|= F_HOOK;
1091		1287
1092	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1288	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1093	sv = decode_sv (&dec);	1289	sv = decode_sv (&dec);
1094		1290
1095	if (!(offset_return \|\| !sv))	1291	if (!(offset_return \|\| !sv))
…		…
1105	}	1301	}
1106	}	1302	}
1107		1303
1108	if (offset_return \|\| !sv)	1304	if (offset_return \|\| !sv)
1109	{	1305	{
1110	offset = dec.flags & F_UTF8	1306	offset = dec.json.flags & F_UTF8
1111	? dec.cur - SvPVX (string)	1307	? dec.cur - SvPVX (string)
1112	: utf8_distance (dec.cur, SvPVX (string));	1308	: utf8_distance (dec.cur, SvPVX (string));
1113		1309
1114	if (offset_return)	1310	if (offset_return)
1115	*offset_return = offset;	1311	*offset_return = offset;
…		…
1134	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1330	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1135	}	1331	}
1136		1332
1137	sv = sv_2mortal (sv);	1333	sv = sv_2mortal (sv);
1138		1334
1139	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1335	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1140	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1336	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1141		1337
1142	return sv;	1338	return sv;
1143	}	1339	}
1144		1340
…		…
1156	i >= '0' && i <= '9' ? i - '0'	1352	i >= '0' && i <= '9' ? i - '0'
1157	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1353	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1158	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1354	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1159	: -1;	1355	: -1;
1160		1356
1161	json_stash = gv_stashpv ("JSON::XS", 1);	1357	json_stash = gv_stashpv ("JSON::XS" , 1);
		1358	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1359
		1360	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1361	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1162	}	1362	}
1163		1363
1164	PROTOTYPES: DISABLE	1364	PROTOTYPES: DISABLE
1165		1365
1166	SV new (char dummy)	1366	void new (char *klass)
1167	CODE:	1367	PPCODE:
1168	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1368	{
1169	OUTPUT:	1369	SV *pv = NEWSV (0, sizeof (JSON));
1170	RETVAL	1370	SvPOK_only (pv);
		1371	Zero (SvPVX (pv), 1, JSON);
		1372	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1373	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1374	}
1171		1375
1172	SV ascii (SV self, int enable = 1)	1376	void ascii (JSON *self, int enable = 1)
1173	ALIAS:	1377	ALIAS:
1174	ascii = F_ASCII	1378	ascii = F_ASCII
1175	latin1 = F_LATIN1	1379	latin1 = F_LATIN1
1176	utf8 = F_UTF8	1380	utf8 = F_UTF8
1177	indent = F_INDENT	1381	indent = F_INDENT
1178	canonical = F_CANONICAL	1382	canonical = F_CANONICAL
1179	space_before = F_SPACE_BEFORE	1383	space_before = F_SPACE_BEFORE
1180	space_after = F_SPACE_AFTER	1384	space_after = F_SPACE_AFTER
1181	pretty = F_PRETTY	1385	pretty = F_PRETTY
1182	allow_nonref = F_ALLOW_NONREF	1386	allow_nonref = F_ALLOW_NONREF
1183	shrink = F_SHRINK	1387	shrink = F_SHRINK
		1388	allow_blessed = F_ALLOW_BLESSED
		1389	convert_blessed = F_CONV_BLESSED
1184	CODE:	1390	PPCODE:
1185	{	1391	{
1186	UV *uv = SvJSON (self);
1187	if (enable)	1392	if (enable)
1188	*uv \|= ix;	1393	self->flags \|= ix;
1189	else	1394	else
1190	*uv &= ~ix;	1395	self->flags &= ~ix;
1191		1396
1192	RETVAL = newSVsv (self);	1397	XPUSHs (ST (0));
1193	}	1398	}
1194	OUTPUT:
1195	RETVAL
1196		1399
1197	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1400	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1198	CODE:	1401	PPCODE:
1199	{	1402	{
1200	UV *uv = SvJSON (self);
1201	UV log2 = 0;	1403	UV log2 = 0;
1202		1404
1203	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1405	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1204		1406
1205	while ((1UL << log2) < max_depth)	1407	while ((1UL << log2) < max_depth)
1206	++log2;	1408	++log2;
1207		1409
1208	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1410	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1209		1411
1210	RETVAL = newSVsv (self);	1412	XPUSHs (ST (0));
1211	}	1413	}
1212	OUTPUT:
1213	RETVAL
1214		1414
1215	void encode (SV self, SV scalar)	1415	void max_size (JSON *self, UV max_size = 0)
1216	PPCODE:	1416	PPCODE:
1217	XPUSHs (encode_json (scalar, *SvJSON (self)));	1417	{
		1418	UV log2 = 0;
1218		1419
1219	void decode (SV self, SV jsonstr)	1420	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1421	if (max_size == 1) max_size = 2;
		1422
		1423	while ((1UL << log2) < max_size)
		1424	++log2;
		1425
		1426	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1427
		1428	XPUSHs (ST (0));
		1429	}
		1430
		1431	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1220	PPCODE:	1432	PPCODE:
		1433	{
		1434	SvREFCNT_dec (self->cb_object);
		1435	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1436
		1437	XPUSHs (ST (0));
		1438	}
		1439
		1440	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1441	PPCODE:
		1442	{
		1443	if (!self->cb_sk_object)
		1444	self->cb_sk_object = newHV ();
		1445
		1446	if (SvOK (cb))
		1447	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1448	else
		1449	{
		1450	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1451
		1452	if (!HvKEYS (self->cb_sk_object))
		1453	{
		1454	SvREFCNT_dec (self->cb_sk_object);
		1455	self->cb_sk_object = 0;
		1456	}
		1457	}
		1458
		1459	XPUSHs (ST (0));
		1460	}
		1461
		1462	void encode (JSON self, SV scalar)
		1463	PPCODE:
		1464	XPUSHs (encode_json (scalar, self));
		1465
		1466	void decode (JSON self, SV jsonstr)
		1467	PPCODE:
1221	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1468	XPUSHs (decode_json (jsonstr, self, 0));
1222		1469
1223	void decode_prefix (SV self, SV jsonstr)	1470	void decode_prefix (JSON self, SV jsonstr)
1224	PPCODE:	1471	PPCODE:
1225	{	1472	{
1226	UV offset;	1473	UV offset;
1227	EXTEND (SP, 2);	1474	EXTEND (SP, 2);
1228	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1475	PUSHs (decode_json (jsonstr, self, &offset));
1229	PUSHs (sv_2mortal (newSVuv (offset)));	1476	PUSHs (sv_2mortal (newSVuv (offset)));
1230	}	1477	}
1231		1478
		1479	void DESTROY (JSON *self)
		1480	CODE:
		1481	SvREFCNT_dec (self->cb_sk_object);
		1482	SvREFCNT_dec (self->cb_object);
		1483
1232	PROTOTYPES: ENABLE	1484	PROTOTYPES: ENABLE
1233		1485
1234	void to_json (SV *scalar)	1486	void to_json (SV *scalar)
1235	ALIAS:
1236	objToJson = 0
1237	PPCODE:	1487	PPCODE:
		1488	{
		1489	JSON json = { F_DEFAULT \| F_UTF8 };
1238	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1490	XPUSHs (encode_json (scalar, &json));
		1491	}
1239		1492
1240	void from_json (SV *jsonstr)	1493	void from_json (SV *jsonstr)
1241	ALIAS:
1242	jsonToObj = 0
1243	PPCODE:	1494	PPCODE:
		1495	{
		1496	JSON json = { F_DEFAULT \| F_UTF8 };
1244	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1497	XPUSHs (decode_json (jsonstr, &json, 0));
		1498	}
1245		1499

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC vs. Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC vs.
Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC