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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.43 by root, Sat Jun 23 23:49:29 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	// guarentees, though. if it breaks, you get to keep the pieces.	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
29	#define F_MAXDEPTH 0xf8000000UL	32	#define F_MAXDEPTH 0xf8000000UL
30	#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
31		37
32	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	38	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
33		39	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
34	// F_SELFCONVERT? <=> to_json/toJson
35	// F_BLESSED? <=> { $__class__$ => }
36		40
37	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
38	#define F_DEFAULT (9UL << S_MAXDEPTH)	42	#define F_DEFAULT (9UL << S_MAXDEPTH)
39		43
40	#define INIT_SIZE 32 // initial scalar size to be allocated	44	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
54	#endif	58	#endif
55		59
56	#define expect_false(expr) expect ((expr) != 0, 0)	60	#define expect_false(expr) expect ((expr) != 0, 0)
57	#define expect_true(expr) expect ((expr) != 0, 1)	61	#define expect_true(expr) expect ((expr) != 0, 1)
58		62
59	static HV *json_stash; // JSON::XS::	63	static HV json_stash, json_boolean_stash; // JSON::XS::
60	static SV json_true, json_false;	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;
61		71
62	/////////////////////////////////////////////////////////////////////////////	72	/////////////////////////////////////////////////////////////////////////////
63	// utility functions	73	// utility functions
64		74
65	static UV *	75	inline void
66	SvJSON (SV *sv)
67	{
68	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
69	croak ("object is not of type JSON::XS");
70
71	return &SvUVX (SvRV (sv));
72	}
73
74	static void
75	shrink (SV *sv)	76	shrink (SV *sv)
76	{	77	{
77	sv_utf8_downgrade (sv, 1);	78	sv_utf8_downgrade (sv, 1);
78	if (SvLEN (sv) > SvCUR (sv) + 1)	79	if (SvLEN (sv) > SvCUR (sv) + 1)
79	{	80	{
…		…
114	typedef struct	115	typedef struct
115	{	116	{
116	char *cur; // SvPVX (sv) + current output position	117	char *cur; // SvPVX (sv) + current output position
117	char *end; // SvEND (sv)	118	char *end; // SvEND (sv)
118	SV *sv; // result scalar	119	SV *sv; // result scalar
119	U32 flags; // F_*	120	JSON json;
120	U32 indent; // indentation level	121	U32 indent; // indentation level
121	U32 maxdepth; // max. indentation/recursion level	122	U32 maxdepth; // max. indentation/recursion level
122	} enc_t;	123	} enc_t;
123		124
124	inline void	125	inline void
…		…
198	}	199	}
199		200
200	if (uch > 0x10FFFFUL)	201	if (uch > 0x10FFFFUL)
201	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);
202		203
203	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))
204	{	205	{
205	if (uch > 0xFFFFUL)	206	if (uch > 0xFFFFUL)
206	{	207	{
207	need (enc, len += 11);	208	need (enc, len += 11);
208	sprintf (enc->cur, "\\u%04x\\u%04x",	209	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
222	*enc->cur++ = hexdigit [(uch >> 0) & 15];	223	*enc->cur++ = hexdigit [(uch >> 0) & 15];
223	}	224	}
224		225
225	str += clen;	226	str += clen;
226	}	227	}
227	else if (enc->flags & F_LATIN1)	228	else if (enc->json.flags & F_LATIN1)
228	{	229	{
229	*enc->cur++ = uch;	230	*enc->cur++ = uch;
230	str += clen;	231	str += clen;
231	}	232	}
232	else if (is_utf8)	233	else if (is_utf8)
…		…
253	}	254	}
254		255
255	inline void	256	inline void
256	encode_indent (enc_t *enc)	257	encode_indent (enc_t *enc)
257	{	258	{
258	if (enc->flags & F_INDENT)	259	if (enc->json.flags & F_INDENT)
259	{	260	{
260	int spaces = enc->indent * INDENT_STEP;	261	int spaces = enc->indent * INDENT_STEP;
261		262
262	need (enc, spaces);	263	need (enc, spaces);
263	memset (enc->cur, ' ', spaces);	264	memset (enc->cur, ' ', spaces);
…		…
273	}	274	}
274		275
275	inline void	276	inline void
276	encode_nl (enc_t *enc)	277	encode_nl (enc_t *enc)
277	{	278	{
278	if (enc->flags & F_INDENT)	279	if (enc->json.flags & F_INDENT)
279	{	280	{
280	need (enc, 1);	281	need (enc, 1);
281	encode_ch (enc, '\n');	282	encode_ch (enc, '\n');
282	}	283	}
283	}	284	}
…		…
285	inline void	286	inline void
286	encode_comma (enc_t *enc)	287	encode_comma (enc_t *enc)
287	{	288	{
288	encode_ch (enc, ',');	289	encode_ch (enc, ',');
289		290
290	if (enc->flags & F_INDENT)	291	if (enc->json.flags & F_INDENT)
291	encode_nl (enc);	292	encode_nl (enc);
292	else if (enc->flags & F_SPACE_AFTER)	293	else if (enc->json.flags & F_SPACE_AFTER)
293	encode_space (enc);	294	encode_space (enc);
294	}	295	}
295		296
296	static void encode_sv (enc_t enc, SV sv);	297	static void encode_sv (enc_t enc, SV sv);
297		298
…		…
306	encode_ch (enc, '['); encode_nl (enc);	307	encode_ch (enc, '['); encode_nl (enc);
307	++enc->indent;	308	++enc->indent;
308		309
309	for (i = 0; i <= len; ++i)	310	for (i = 0; i <= len; ++i)
310	{	311	{
		312	SV **svp = av_fetch (av, i, 0);
		313
311	encode_indent (enc);	314	encode_indent (enc);
312	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);
313		320
314	if (i < len)	321	if (i < len)
315	encode_comma (enc);	322	encode_comma (enc);
316	}	323	}
317		324
…		…
340	else	347	else
341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	348	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
342		349
343	encode_ch (enc, '"');	350	encode_ch (enc, '"');
344		351
345	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	352	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
346	encode_ch (enc, ':');	353	encode_ch (enc, ':');
347	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	354	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
348	encode_sv (enc, HeVAL (he));	355	encode_sv (enc, HeVAL (he));
349	}	356	}
350		357
351	// compare hash entries, used when all keys are bytestrings	358	// compare hash entries, used when all keys are bytestrings
352	static int	359	static int
…		…
387	{	394	{
388	// for canonical output we have to sort by keys first	395	// for canonical output we have to sort by keys first
389	// actually, this is mostly due to the stupid so-called	396	// actually, this is mostly due to the stupid so-called
390	// security workaround added somewhere in 5.8.x.	397	// security workaround added somewhere in 5.8.x.
391	// that randomises hash orderings	398	// that randomises hash orderings
392	if (enc->flags & F_CANONICAL)	399	if (enc->json.flags & F_CANONICAL)
393	{	400	{
394	int fast = 1;	401	int fast = 1;
395	HE *he;	402	HE *he;
396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	403	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
397	HE *hes = _alloca (count sizeof (HE));	404	HE *hes = _alloca (count sizeof (HE));
…		…
469	svtype svt;	476	svtype svt;
470		477
471	SvGETMAGIC (sv);	478	SvGETMAGIC (sv);
472	svt = SvTYPE (sv);	479	svt = SvTYPE (sv);
473		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	}
474	if (svt == SVt_PVHV)	540	else if (svt == SVt_PVHV)
475	encode_hv (enc, (HV *)sv);	541	encode_hv (enc, (HV *)sv);
476	else if (svt == SVt_PVAV)	542	else if (svt == SVt_PVAV)
477	encode_av (enc, (AV *)sv);	543	encode_av (enc, (AV *)sv);
478	else if (svt < SVt_PVAV)	544	else if (svt < SVt_PVAV)
479	{	545	{
480	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')
481	encode_str (enc, "false", 5, 0);	552	encode_str (enc, "false", 5, 0);
482	else if (SvNIOK (sv) && SvIV (sv) == 1)
483	encode_str (enc, "true", 4, 0);
484	else	553	else
485	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",
486	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	555	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
487	}	556	}
488	else	557	else
…		…
558	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",
559	SvPV_nolen (sv), SvFLAGS (sv));	628	SvPV_nolen (sv), SvFLAGS (sv));
560	}	629	}
561		630
562	static SV *	631	static SV *
563	encode_json (SV *scalar, U32 flags)	632	encode_json (SV scalar, JSON json)
564	{	633	{
565	enc_t enc;	634	enc_t enc;
566		635
567	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	636	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
568	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)");
569		638
570	enc.flags = flags;	639	enc.json = *json;
571	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	640	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
572	enc.cur = SvPVX (enc.sv);	641	enc.cur = SvPVX (enc.sv);
573	enc.end = SvEND (enc.sv);	642	enc.end = SvEND (enc.sv);
574	enc.indent = 0;	643	enc.indent = 0;
575	enc.maxdepth = DEC_DEPTH (flags);	644	enc.maxdepth = DEC_DEPTH (enc.json.flags);
576		645
577	SvPOK_only (enc.sv);	646	SvPOK_only (enc.sv);
578	encode_sv (&enc, scalar);	647	encode_sv (&enc, scalar);
579		648
580	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	649	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
581	*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
582		651
583	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	652	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
584	SvUTF8_on (enc.sv);	653	SvUTF8_on (enc.sv);
585		654
586	if (enc.flags & F_SHRINK)	655	if (enc.json.flags & F_SHRINK)
587	shrink (enc.sv);	656	shrink (enc.sv);
588		657
589	return enc.sv;	658	return enc.sv;
590	}	659	}
591		660
…		…
596	typedef struct	665	typedef struct
597	{	666	{
598	char *cur; // current parser pointer	667	char *cur; // current parser pointer
599	char *end; // end of input string	668	char *end; // end of input string
600	const char *err; // parse error, if != 0	669	const char *err; // parse error, if != 0
601	U32 flags; // F_*	670	JSON json;
602	U32 depth; // recursion depth	671	U32 depth; // recursion depth
603	U32 maxdepth; // recursion depth limit	672	U32 maxdepth; // recursion depth limit
604	} dec_t;	673	} dec_t;
605		674
606	inline void	675	inline void
…		…
869	is_nv = 1;	938	is_nv = 1;
870	}	939	}
871		940
872	if (!is_nv)	941	if (!is_nv)
873	{	942	{
		943	int len = dec->cur - start;
		944
874	// 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
875	if (*start == '-')	946	if (*start == '-')
876	switch (dec->cur - start)	947	switch (len)
877	{	948	{
878	case 2: return newSViv (-( start [1] - '0' * 1));	949	case 2: return newSViv (-( start [1] - '0' * 1));
879	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	950	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
880	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));
881	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));
882	}	953	}
883	else	954	else
884	switch (dec->cur - start)	955	switch (len)
885	{	956	{
886	case 1: return newSViv ( start [0] - '0' * 1);	957	case 1: return newSViv ( start [0] - '0' * 1);
887	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	958	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
888	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);
889	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);
890	}	961	}
891		962
892	{	963	{
893	UV uv;	964	UV uv;
894	int numtype = grok_number (start, dec->cur - start, &uv);	965	int numtype = grok_number (start, len, &uv);
895	if (numtype & IS_NUMBER_IN_UV)	966	if (numtype & IS_NUMBER_IN_UV)
896	if (numtype & IS_NUMBER_NEG)	967	if (numtype & IS_NUMBER_NEG)
897	{	968	{
898	if (uv < (UV)IV_MIN)	969	if (uv < (UV)IV_MIN)
899	return newSViv (-(IV)uv);	970	return newSViv (-(IV)uv);
900	}	971	}
901	else	972	else
902	return newSVuv (uv);	973	return newSVuv (uv);
903
904	// here would likely be the place for bigint support
905	}	974	}
906	}
907		975
908	// 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
909	return newSVnv (Atof (start));	992	return newSVnv (Atof (start));
910		993
911	fail:	994	fail:
912	return 0;	995	return 0;
913	}	996	}
…		…
957	}	1040	}
958		1041
959	static SV *	1042	static SV *
960	decode_hv (dec_t *dec)	1043	decode_hv (dec_t *dec)
961	{	1044	{
		1045	SV *sv;
962	HV *hv = newHV ();	1046	HV *hv = newHV ();
963		1047
964	DEC_INC_DEPTH;	1048	DEC_INC_DEPTH;
965	decode_ws (dec);	1049	decode_ws (dec);
966		1050
967	if (*dec->cur == '}')	1051	if (*dec->cur == '}')
968	++dec->cur;	1052	++dec->cur;
969	else	1053	else
970	for (;;)	1054	for (;;)
971	{	1055	{
972	SV key, value;
973
974	decode_ws (dec); EXPECT_CH ('"');	1056	decode_ws (dec); EXPECT_CH ('"');
975		1057
976	key = decode_str (dec);	1058	// heuristic: assume that
977	if (!key)	1059	// a) decode_str + hv_store_ent are abysmally slow.
978	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
979		1067
980	decode_ws (dec); EXPECT_CH (':');	1068	for (;;)
981
982	value = decode_sv (dec);
983	if (!value)
984	{	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);
985	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)
986	goto fail;	1103	goto fail;
		1104
		1105	hv_store (hv, key, len, value, 0);
		1106
		1107	break;
		1108	}
		1109
		1110	++p;
987	}	1111	}
988		1112	}
989	hv_store_ent (hv, key, value, 0);
990	SvREFCNT_dec (key);
991		1113
992	decode_ws (dec);	1114	decode_ws (dec);
993		1115
994	if (*dec->cur == '}')	1116	if (*dec->cur == '}')
995	{	1117	{
…		…
1002		1124
1003	++dec->cur;	1125	++dec->cur;
1004	}	1126	}
1005		1127
1006	DEC_DEC_DEPTH;	1128	DEC_DEC_DEPTH;
1007	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;
1008		1190
1009	fail:	1191	fail:
1010	SvREFCNT_dec (hv);	1192	SvREFCNT_dec (hv);
1011	DEC_DEC_DEPTH;	1193	DEC_DEC_DEPTH;
1012	return 0;	1194	return 0;
…		…
1071	fail:	1253	fail:
1072	return 0;	1254	return 0;
1073	}	1255	}
1074		1256
1075	static SV *	1257	static SV *
1076	decode_json (SV string, U32 flags, UV offset_return)	1258	decode_json (SV string, JSON json, UV *offset_return)
1077	{	1259	{
1078	dec_t dec;	1260	dec_t dec;
1079	UV offset;	1261	UV offset;
1080	SV *sv;	1262	SV *sv;
1081		1263
1082	SvGETMAGIC (string);	1264	SvGETMAGIC (string);
1083	SvUPGRADE (string, SVt_PV);	1265	SvUPGRADE (string, SVt_PV);
1084		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
1085	if (flags & F_UTF8)	1271	if (json->flags & F_UTF8)
1086	sv_utf8_downgrade (string, 0);	1272	sv_utf8_downgrade (string, 0);
1087	else	1273	else
1088	sv_utf8_upgrade (string);	1274	sv_utf8_upgrade (string);
1089		1275
1090	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1276	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1091		1277
1092	dec.flags = flags;	1278	dec.json = *json;
1093	dec.cur = SvPVX (string);	1279	dec.cur = SvPVX (string);
1094	dec.end = SvEND (string);	1280	dec.end = SvEND (string);
1095	dec.err = 0;	1281	dec.err = 0;
1096	dec.depth = 0;	1282	dec.depth = 0;
1097	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;
1098		1287
1099	*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
1100	sv = decode_sv (&dec);	1289	sv = decode_sv (&dec);
1101		1290
1102	if (!(offset_return \|\| !sv))	1291	if (!(offset_return \|\| !sv))
…		…
1112	}	1301	}
1113	}	1302	}
1114		1303
1115	if (offset_return \|\| !sv)	1304	if (offset_return \|\| !sv)
1116	{	1305	{
1117	offset = dec.flags & F_UTF8	1306	offset = dec.json.flags & F_UTF8
1118	? dec.cur - SvPVX (string)	1307	? dec.cur - SvPVX (string)
1119	: utf8_distance (dec.cur, SvPVX (string));	1308	: utf8_distance (dec.cur, SvPVX (string));
1120		1309
1121	if (offset_return)	1310	if (offset_return)
1122	*offset_return = offset;	1311	*offset_return = offset;
…		…
1141	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1330	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1142	}	1331	}
1143		1332
1144	sv = sv_2mortal (sv);	1333	sv = sv_2mortal (sv);
1145		1334
1146	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1335	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1147	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)");
1148		1337
1149	return sv;	1338	return sv;
1150	}	1339	}
1151		1340
…		…
1163	i >= '0' && i <= '9' ? i - '0'	1352	i >= '0' && i <= '9' ? i - '0'
1164	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1353	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1165	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1354	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1166	: -1;	1355	: -1;
1167		1356
1168	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);
1169		1359
1170	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1360	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1171	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1361	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1172	}	1362	}
1173		1363
1174	PROTOTYPES: DISABLE	1364	PROTOTYPES: DISABLE
1175		1365
1176	SV new (char dummy)	1366	void new (char *klass)
1177	CODE:	1367	PPCODE:
1178	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1368	{
1179	OUTPUT:	1369	SV *pv = NEWSV (0, sizeof (JSON));
1180	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	}
1181		1375
1182	SV ascii (SV self, int enable = 1)	1376	void ascii (JSON *self, int enable = 1)
1183	ALIAS:	1377	ALIAS:
1184	ascii = F_ASCII	1378	ascii = F_ASCII
1185	latin1 = F_LATIN1	1379	latin1 = F_LATIN1
1186	utf8 = F_UTF8	1380	utf8 = F_UTF8
1187	indent = F_INDENT	1381	indent = F_INDENT
1188	canonical = F_CANONICAL	1382	canonical = F_CANONICAL
1189	space_before = F_SPACE_BEFORE	1383	space_before = F_SPACE_BEFORE
1190	space_after = F_SPACE_AFTER	1384	space_after = F_SPACE_AFTER
1191	pretty = F_PRETTY	1385	pretty = F_PRETTY
1192	allow_nonref = F_ALLOW_NONREF	1386	allow_nonref = F_ALLOW_NONREF
1193	shrink = F_SHRINK	1387	shrink = F_SHRINK
		1388	allow_blessed = F_ALLOW_BLESSED
		1389	convert_blessed = F_CONV_BLESSED
1194	CODE:	1390	PPCODE:
1195	{	1391	{
1196	UV *uv = SvJSON (self);
1197	if (enable)	1392	if (enable)
1198	*uv \|= ix;	1393	self->flags \|= ix;
1199	else	1394	else
1200	*uv &= ~ix;	1395	self->flags &= ~ix;
1201		1396
1202	RETVAL = newSVsv (self);	1397	XPUSHs (ST (0));
1203	}	1398	}
1204	OUTPUT:
1205	RETVAL
1206		1399
1207	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1400	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1208	CODE:	1401	PPCODE:
1209	{	1402	{
1210	UV *uv = SvJSON (self);
1211	UV log2 = 0;	1403	UV log2 = 0;
1212		1404
1213	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1405	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1214		1406
1215	while ((1UL << log2) < max_depth)	1407	while ((1UL << log2) < max_depth)
1216	++log2;	1408	++log2;
1217		1409
1218	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1410	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1219		1411
1220	RETVAL = newSVsv (self);	1412	XPUSHs (ST (0));
1221	}	1413	}
1222	OUTPUT:
1223	RETVAL
1224		1414
1225	void encode (SV self, SV scalar)	1415	void max_size (JSON *self, UV max_size = 0)
1226	PPCODE:	1416	PPCODE:
1227	XPUSHs (encode_json (scalar, *SvJSON (self)));	1417	{
		1418	UV log2 = 0;
1228		1419
1229	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)
1230	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:
1231	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1468	XPUSHs (decode_json (jsonstr, self, 0));
1232		1469
1233	void decode_prefix (SV self, SV jsonstr)	1470	void decode_prefix (JSON self, SV jsonstr)
1234	PPCODE:	1471	PPCODE:
1235	{	1472	{
1236	UV offset;	1473	UV offset;
1237	EXTEND (SP, 2);	1474	EXTEND (SP, 2);
1238	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1475	PUSHs (decode_json (jsonstr, self, &offset));
1239	PUSHs (sv_2mortal (newSVuv (offset)));	1476	PUSHs (sv_2mortal (newSVuv (offset)));
1240	}	1477	}
1241		1478
		1479	void DESTROY (JSON *self)
		1480	CODE:
		1481	SvREFCNT_dec (self->cb_sk_object);
		1482	SvREFCNT_dec (self->cb_object);
		1483
1242	PROTOTYPES: ENABLE	1484	PROTOTYPES: ENABLE
1243		1485
1244	void to_json (SV *scalar)	1486	void to_json (SV *scalar)
1245	ALIAS:
1246	objToJson = 0
1247	PPCODE:	1487	PPCODE:
		1488	{
		1489	JSON json = { F_DEFAULT \| F_UTF8 };
1248	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1490	XPUSHs (encode_json (scalar, &json));
		1491	}
1249		1492
1250	void from_json (SV *jsonstr)	1493	void from_json (SV *jsonstr)
1251	ALIAS:
1252	jsonToObj = 0
1253	PPCODE:	1494	PPCODE:
		1495	{
		1496	JSON json = { F_DEFAULT \| F_UTF8 };
1254	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1497	XPUSHs (decode_json (jsonstr, &json, 0));
		1498	}
1255		1499

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.43 by root, Sat Jun 23 23:49:29 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.43 by root, Sat Jun 23 23:49:29 2007 UTC vs.
Revision 1.56 by root, Thu Jul 26 11:33:35 2007 UTC