[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.57 by root, Mon Aug 13 16:05:42 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
		63	#ifdef USE_ITHREADS
		64	# define JSON_SLOW 1
		65	#else
		66	# define JSON_SLOW 1
		67	#endif
		68
59	static HV *json_stash; // JSON::XS::	69	static HV json_stash, json_boolean_stash; // JSON::XS::
60	static SV json_true, json_false;	70	static SV json_true, json_false;
		71
		72	typedef struct {
		73	U32 flags;
		74	SV *cb_object;
		75	HV *cb_sk_object;
		76	} JSON;
61		77
62	/////////////////////////////////////////////////////////////////////////////	78	/////////////////////////////////////////////////////////////////////////////
63	// utility functions	79	// utility functions
64		80
65	static UV *	81	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)	82	shrink (SV *sv)
76	{	83	{
77	sv_utf8_downgrade (sv, 1);	84	sv_utf8_downgrade (sv, 1);
78	if (SvLEN (sv) > SvCUR (sv) + 1)	85	if (SvLEN (sv) > SvCUR (sv) + 1)
79	{	86	{
…		…
114	typedef struct	121	typedef struct
115	{	122	{
116	char *cur; // SvPVX (sv) + current output position	123	char *cur; // SvPVX (sv) + current output position
117	char *end; // SvEND (sv)	124	char *end; // SvEND (sv)
118	SV *sv; // result scalar	125	SV *sv; // result scalar
119	U32 flags; // F_*	126	JSON json;
120	U32 indent; // indentation level	127	U32 indent; // indentation level
121	U32 maxdepth; // max. indentation/recursion level	128	U32 maxdepth; // max. indentation/recursion level
122	} enc_t;	129	} enc_t;
123		130
124	inline void	131	inline void
…		…
198	}	205	}
199		206
200	if (uch > 0x10FFFFUL)	207	if (uch > 0x10FFFFUL)
201	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	208	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
202		209
203	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	210	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
204	{	211	{
205	if (uch > 0xFFFFUL)	212	if (uch > 0xFFFFUL)
206	{	213	{
207	need (enc, len += 11);	214	need (enc, len += 11);
208	sprintf (enc->cur, "\\u%04x\\u%04x",	215	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
222	*enc->cur++ = hexdigit [(uch >> 0) & 15];	229	*enc->cur++ = hexdigit [(uch >> 0) & 15];
223	}	230	}
224		231
225	str += clen;	232	str += clen;
226	}	233	}
227	else if (enc->flags & F_LATIN1)	234	else if (enc->json.flags & F_LATIN1)
228	{	235	{
229	*enc->cur++ = uch;	236	*enc->cur++ = uch;
230	str += clen;	237	str += clen;
231	}	238	}
232	else if (is_utf8)	239	else if (is_utf8)
…		…
253	}	260	}
254		261
255	inline void	262	inline void
256	encode_indent (enc_t *enc)	263	encode_indent (enc_t *enc)
257	{	264	{
258	if (enc->flags & F_INDENT)	265	if (enc->json.flags & F_INDENT)
259	{	266	{
260	int spaces = enc->indent * INDENT_STEP;	267	int spaces = enc->indent * INDENT_STEP;
261		268
262	need (enc, spaces);	269	need (enc, spaces);
263	memset (enc->cur, ' ', spaces);	270	memset (enc->cur, ' ', spaces);
…		…
273	}	280	}
274		281
275	inline void	282	inline void
276	encode_nl (enc_t *enc)	283	encode_nl (enc_t *enc)
277	{	284	{
278	if (enc->flags & F_INDENT)	285	if (enc->json.flags & F_INDENT)
279	{	286	{
280	need (enc, 1);	287	need (enc, 1);
281	encode_ch (enc, '\n');	288	encode_ch (enc, '\n');
282	}	289	}
283	}	290	}
…		…
285	inline void	292	inline void
286	encode_comma (enc_t *enc)	293	encode_comma (enc_t *enc)
287	{	294	{
288	encode_ch (enc, ',');	295	encode_ch (enc, ',');
289		296
290	if (enc->flags & F_INDENT)	297	if (enc->json.flags & F_INDENT)
291	encode_nl (enc);	298	encode_nl (enc);
292	else if (enc->flags & F_SPACE_AFTER)	299	else if (enc->json.flags & F_SPACE_AFTER)
293	encode_space (enc);	300	encode_space (enc);
294	}	301	}
295		302
296	static void encode_sv (enc_t enc, SV sv);	303	static void encode_sv (enc_t enc, SV sv);
297		304
…		…
306	encode_ch (enc, '['); encode_nl (enc);	313	encode_ch (enc, '['); encode_nl (enc);
307	++enc->indent;	314	++enc->indent;
308		315
309	for (i = 0; i <= len; ++i)	316	for (i = 0; i <= len; ++i)
310	{	317	{
		318	SV **svp = av_fetch (av, i, 0);
		319
311	encode_indent (enc);	320	encode_indent (enc);
312	encode_sv (enc, *av_fetch (av, i, 0));	321
		322	if (svp)
		323	encode_sv (enc, *svp);
		324	else
		325	encode_str (enc, "null", 4, 0);
313		326
314	if (i < len)	327	if (i < len)
315	encode_comma (enc);	328	encode_comma (enc);
316	}	329	}
317		330
…		…
340	else	353	else
341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	354	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
342		355
343	encode_ch (enc, '"');	356	encode_ch (enc, '"');
344		357
345	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	358	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
346	encode_ch (enc, ':');	359	encode_ch (enc, ':');
347	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	360	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
348	encode_sv (enc, HeVAL (he));	361	encode_sv (enc, HeVAL (he));
349	}	362	}
350		363
351	// compare hash entries, used when all keys are bytestrings	364	// compare hash entries, used when all keys are bytestrings
352	static int	365	static int
…		…
387	{	400	{
388	// for canonical output we have to sort by keys first	401	// for canonical output we have to sort by keys first
389	// actually, this is mostly due to the stupid so-called	402	// actually, this is mostly due to the stupid so-called
390	// security workaround added somewhere in 5.8.x.	403	// security workaround added somewhere in 5.8.x.
391	// that randomises hash orderings	404	// that randomises hash orderings
392	if (enc->flags & F_CANONICAL)	405	if (enc->json.flags & F_CANONICAL)
393	{	406	{
394	int fast = 1;	407	int fast = 1;
395	HE *he;	408	HE *he;
396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	409	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
397	HE *hes = _alloca (count sizeof (HE));	410	HE *hes = _alloca (count sizeof (HE));
…		…
469	svtype svt;	482	svtype svt;
470		483
471	SvGETMAGIC (sv);	484	SvGETMAGIC (sv);
472	svt = SvTYPE (sv);	485	svt = SvTYPE (sv);
473		486
		487	if (expect_false (SvOBJECT (sv)))
		488	{
		489	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		490	? json_boolean_stash
		491	: gv_stashpv ("JSON::XS::Boolean", 1);
		492
		493	if (SvSTASH (sv) == stash)
		494	{
		495	if (SvIV (sv))
		496	encode_str (enc, "true", 4, 0);
		497	else
		498	encode_str (enc, "false", 5, 0);
		499	}
		500	else
		501	{
		502	#if 0
		503	if (0 && sv_derived_from (rv, "JSON::Literal"))
		504	{
		505	// not yet
		506	}
		507	#endif
		508	if (enc->json.flags & F_CONV_BLESSED)
		509	{
		510	// we re-bless the reference to get overload and other niceties right
		511	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
		512
		513	if (to_json)
		514	{
		515	int count;
		516	dSP;
		517
		518	ENTER; SAVETMPS; PUSHMARK (SP);
		519	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		520
		521	// calling with G_SCALAR ensures that we always get a 1 return value
		522	PUTBACK;
		523	call_sv ((SV *)GvCV (to_json), G_SCALAR);
		524	SPAGAIN;
		525
		526	// catch this surprisingly common error
		527	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		528	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		529
		530	sv = POPs;
		531	PUTBACK;
		532
		533	encode_sv (enc, sv);
		534
		535	FREETMPS; LEAVE;
		536	}
		537	else if (enc->json.flags & F_ALLOW_BLESSED)
		538	encode_str (enc, "null", 4, 0);
		539	else
		540	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		541	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		542	}
		543	else if (enc->json.flags & F_ALLOW_BLESSED)
		544	encode_str (enc, "null", 4, 0);
		545	else
		546	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		547	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		548	}
		549	}
474	if (svt == SVt_PVHV)	550	else if (svt == SVt_PVHV)
475	encode_hv (enc, (HV *)sv);	551	encode_hv (enc, (HV *)sv);
476	else if (svt == SVt_PVAV)	552	else if (svt == SVt_PVAV)
477	encode_av (enc, (AV *)sv);	553	encode_av (enc, (AV *)sv);
478	else if (svt < SVt_PVAV)	554	else if (svt < SVt_PVAV)
479	{	555	{
480	if (SvNIOK (sv) && SvIV (sv) == 0)	556	STRLEN len = 0;
		557	char *pv = svt ? SvPV (sv, len) : 0;
		558
		559	if (len == 1 && *pv == '1')
		560	encode_str (enc, "true", 4, 0);
		561	else if (len == 1 && *pv == '0')
481	encode_str (enc, "false", 5, 0);	562	encode_str (enc, "false", 5, 0);
482	else if (SvNIOK (sv) && SvIV (sv) == 1)
483	encode_str (enc, "true", 4, 0);
484	else	563	else
485	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	564	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
486	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	565	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
487	}	566	}
488	else	567	else
…		…
558	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	637	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
559	SvPV_nolen (sv), SvFLAGS (sv));	638	SvPV_nolen (sv), SvFLAGS (sv));
560	}	639	}
561		640
562	static SV *	641	static SV *
563	encode_json (SV *scalar, U32 flags)	642	encode_json (SV scalar, JSON json)
564	{	643	{
565	enc_t enc;	644	enc_t enc;
566		645
567	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	646	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
568	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	647	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
569		648
570	enc.flags = flags;	649	enc.json = *json;
571	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	650	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
572	enc.cur = SvPVX (enc.sv);	651	enc.cur = SvPVX (enc.sv);
573	enc.end = SvEND (enc.sv);	652	enc.end = SvEND (enc.sv);
574	enc.indent = 0;	653	enc.indent = 0;
575	enc.maxdepth = DEC_DEPTH (flags);	654	enc.maxdepth = DEC_DEPTH (enc.json.flags);
576		655
577	SvPOK_only (enc.sv);	656	SvPOK_only (enc.sv);
578	encode_sv (&enc, scalar);	657	encode_sv (&enc, scalar);
579		658
580	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	659	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
581	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	660	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
582		661
583	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	662	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
584	SvUTF8_on (enc.sv);	663	SvUTF8_on (enc.sv);
585		664
586	if (enc.flags & F_SHRINK)	665	if (enc.json.flags & F_SHRINK)
587	shrink (enc.sv);	666	shrink (enc.sv);
588		667
589	return enc.sv;	668	return enc.sv;
590	}	669	}
591		670
…		…
596	typedef struct	675	typedef struct
597	{	676	{
598	char *cur; // current parser pointer	677	char *cur; // current parser pointer
599	char *end; // end of input string	678	char *end; // end of input string
600	const char *err; // parse error, if != 0	679	const char *err; // parse error, if != 0
601	U32 flags; // F_*	680	JSON json;
602	U32 depth; // recursion depth	681	U32 depth; // recursion depth
603	U32 maxdepth; // recursion depth limit	682	U32 maxdepth; // recursion depth limit
604	} dec_t;	683	} dec_t;
605		684
606	inline void	685	inline void
…		…
869	is_nv = 1;	948	is_nv = 1;
870	}	949	}
871		950
872	if (!is_nv)	951	if (!is_nv)
873	{	952	{
		953	int len = dec->cur - start;
		954
874	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	955	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
875	if (*start == '-')	956	if (*start == '-')
876	switch (dec->cur - start)	957	switch (len)
877	{	958	{
878	case 2: return newSViv (-( start [1] - '0' * 1));	959	case 2: return newSViv (-( start [1] - '0' * 1));
879	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	960	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));	961	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));	962	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
882	}	963	}
883	else	964	else
884	switch (dec->cur - start)	965	switch (len)
885	{	966	{
886	case 1: return newSViv ( start [0] - '0' * 1);	967	case 1: return newSViv ( start [0] - '0' * 1);
887	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	968	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);	969	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);	970	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
890	}	971	}
891		972
892	{	973	{
893	UV uv;	974	UV uv;
894	int numtype = grok_number (start, dec->cur - start, &uv);	975	int numtype = grok_number (start, len, &uv);
895	if (numtype & IS_NUMBER_IN_UV)	976	if (numtype & IS_NUMBER_IN_UV)
896	if (numtype & IS_NUMBER_NEG)	977	if (numtype & IS_NUMBER_NEG)
897	{	978	{
898	if (uv < (UV)IV_MIN)	979	if (uv < (UV)IV_MIN)
899	return newSViv (-(IV)uv);	980	return newSViv (-(IV)uv);
900	}	981	}
901	else	982	else
902	return newSVuv (uv);	983	return newSVuv (uv);
903
904	// here would likely be the place for bigint support
905	}	984	}
906	}
907		985
908	// if we ever support bigint or bigfloat, this is the place for bigfloat	986	len -= *start == '-' ? 1 : 0;
		987
		988	// does not fit into IV or UV, try NV
		989	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		990	#if defined (LDBL_DIG)
		991	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		992	#endif
		993	)
		994	// fits into NV without loss of precision
		995	return newSVnv (Atof (start));
		996
		997	// everything else fails, convert it to a string
		998	return newSVpvn (start, dec->cur - start);
		999	}
		1000
		1001	// loss of precision here
909	return newSVnv (Atof (start));	1002	return newSVnv (Atof (start));
910		1003
911	fail:	1004	fail:
912	return 0;	1005	return 0;
913	}	1006	}
…		…
957	}	1050	}
958		1051
959	static SV *	1052	static SV *
960	decode_hv (dec_t *dec)	1053	decode_hv (dec_t *dec)
961	{	1054	{
		1055	SV *sv;
962	HV *hv = newHV ();	1056	HV *hv = newHV ();
963		1057
964	DEC_INC_DEPTH;	1058	DEC_INC_DEPTH;
965	decode_ws (dec);	1059	decode_ws (dec);
966		1060
967	if (*dec->cur == '}')	1061	if (*dec->cur == '}')
968	++dec->cur;	1062	++dec->cur;
969	else	1063	else
970	for (;;)	1064	for (;;)
971	{	1065	{
972	SV key, value;
973
974	decode_ws (dec); EXPECT_CH ('"');	1066	decode_ws (dec); EXPECT_CH ('"');
975		1067
976	key = decode_str (dec);	1068	// heuristic: assume that
977	if (!key)	1069	// a) decode_str + hv_store_ent are abysmally slow.
978	goto fail;	1070	// b) most hash keys are short, simple ascii text.
		1071	// => try to "fast-match" such strings to avoid
		1072	// the overhead of decode_str + hv_store_ent.
		1073	{
		1074	SV *value;
		1075	char *p = dec->cur;
		1076	char *e = p + 24; // only try up to 24 bytes
979		1077
980	decode_ws (dec); EXPECT_CH (':');	1078	for (;;)
981
982	value = decode_sv (dec);
983	if (!value)
984	{	1079	{
		1080	// the >= 0x80 is true on most architectures
		1081	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1082	{
		1083	// slow path, back up and use decode_str
		1084	SV *key = decode_str (dec);
		1085	if (!key)
		1086	goto fail;
		1087
		1088	decode_ws (dec); EXPECT_CH (':');
		1089
		1090	value = decode_sv (dec);
		1091	if (!value)
		1092	{
		1093	SvREFCNT_dec (key);
		1094	goto fail;
		1095	}
		1096
		1097	hv_store_ent (hv, key, value, 0);
985	SvREFCNT_dec (key);	1098	SvREFCNT_dec (key);
		1099
		1100	break;
		1101	}
		1102	else if (*p == '"')
		1103	{
		1104	// fast path, got a simple key
		1105	char *key = dec->cur;
		1106	int len = p - key;
		1107	dec->cur = p + 1;
		1108
		1109	decode_ws (dec); EXPECT_CH (':');
		1110
		1111	value = decode_sv (dec);
		1112	if (!value)
986	goto fail;	1113	goto fail;
		1114
		1115	hv_store (hv, key, len, value, 0);
		1116
		1117	break;
		1118	}
		1119
		1120	++p;
987	}	1121	}
988		1122	}
989	hv_store_ent (hv, key, value, 0);
990	SvREFCNT_dec (key);
991		1123
992	decode_ws (dec);	1124	decode_ws (dec);
993		1125
994	if (*dec->cur == '}')	1126	if (*dec->cur == '}')
995	{	1127	{
…		…
1002		1134
1003	++dec->cur;	1135	++dec->cur;
1004	}	1136	}
1005		1137
1006	DEC_DEC_DEPTH;	1138	DEC_DEC_DEPTH;
1007	return newRV_noinc ((SV *)hv);	1139	sv = newRV_noinc ((SV *)hv);
		1140
		1141	// check filter callbacks
		1142	if (dec->json.flags & F_HOOK)
		1143	{
		1144	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1145	{
		1146	HE cb, he;
		1147
		1148	hv_iterinit (hv);
		1149	he = hv_iternext (hv);
		1150	hv_iterinit (hv);
		1151
		1152	// the next line creates a mortal sv each time its called.
		1153	// might want to optimise this for common cases.
		1154	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1155
		1156	if (cb)
		1157	{
		1158	dSP;
		1159	int count;
		1160
		1161	ENTER; SAVETMPS; PUSHMARK (SP);
		1162	XPUSHs (HeVAL (he));
		1163
		1164	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1165
		1166	if (count == 1)
		1167	{
		1168	sv = newSVsv (POPs);
		1169	FREETMPS; LEAVE;
		1170	return sv;
		1171	}
		1172
		1173	FREETMPS; LEAVE;
		1174	}
		1175	}
		1176
		1177	if (dec->json.cb_object)
		1178	{
		1179	dSP;
		1180	int count;
		1181
		1182	ENTER; SAVETMPS; PUSHMARK (SP);
		1183	XPUSHs (sv_2mortal (sv));
		1184
		1185	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1186
		1187	if (count == 1)
		1188	{
		1189	sv = newSVsv (POPs);
		1190	FREETMPS; LEAVE;
		1191	return sv;
		1192	}
		1193
		1194	SvREFCNT_inc (sv);
		1195	FREETMPS; LEAVE;
		1196	}
		1197	}
		1198
		1199	return sv;
1008		1200
1009	fail:	1201	fail:
1010	SvREFCNT_dec (hv);	1202	SvREFCNT_dec (hv);
1011	DEC_DEC_DEPTH;	1203	DEC_DEC_DEPTH;
1012	return 0;	1204	return 0;
…		…
1071	fail:	1263	fail:
1072	return 0;	1264	return 0;
1073	}	1265	}
1074		1266
1075	static SV *	1267	static SV *
1076	decode_json (SV string, U32 flags, UV offset_return)	1268	decode_json (SV string, JSON json, UV *offset_return)
1077	{	1269	{
1078	dec_t dec;	1270	dec_t dec;
1079	UV offset;	1271	UV offset;
1080	SV *sv;	1272	SV *sv;
1081		1273
1082	SvGETMAGIC (string);	1274	SvGETMAGIC (string);
1083	SvUPGRADE (string, SVt_PV);	1275	SvUPGRADE (string, SVt_PV);
1084		1276
		1277	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1278	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1279	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1280
1085	if (flags & F_UTF8)	1281	if (json->flags & F_UTF8)
1086	sv_utf8_downgrade (string, 0);	1282	sv_utf8_downgrade (string, 0);
1087	else	1283	else
1088	sv_utf8_upgrade (string);	1284	sv_utf8_upgrade (string);
1089		1285
1090	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1286	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1091		1287
1092	dec.flags = flags;	1288	dec.json = *json;
1093	dec.cur = SvPVX (string);	1289	dec.cur = SvPVX (string);
1094	dec.end = SvEND (string);	1290	dec.end = SvEND (string);
1095	dec.err = 0;	1291	dec.err = 0;
1096	dec.depth = 0;	1292	dec.depth = 0;
1097	dec.maxdepth = DEC_DEPTH (dec.flags);	1293	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1294
		1295	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1296	dec.json.flags \|= F_HOOK;
1098		1297
1099	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1298	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1100	sv = decode_sv (&dec);	1299	sv = decode_sv (&dec);
1101		1300
1102	if (!(offset_return \|\| !sv))	1301	if (!(offset_return \|\| !sv))
…		…
1112	}	1311	}
1113	}	1312	}
1114		1313
1115	if (offset_return \|\| !sv)	1314	if (offset_return \|\| !sv)
1116	{	1315	{
1117	offset = dec.flags & F_UTF8	1316	offset = dec.json.flags & F_UTF8
1118	? dec.cur - SvPVX (string)	1317	? dec.cur - SvPVX (string)
1119	: utf8_distance (dec.cur, SvPVX (string));	1318	: utf8_distance (dec.cur, SvPVX (string));
1120		1319
1121	if (offset_return)	1320	if (offset_return)
1122	*offset_return = offset;	1321	*offset_return = offset;
…		…
1141	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1340	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1142	}	1341	}
1143		1342
1144	sv = sv_2mortal (sv);	1343	sv = sv_2mortal (sv);
1145		1344
1146	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1345	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)");	1346	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1148		1347
1149	return sv;	1348	return sv;
1150	}	1349	}
1151		1350
…		…
1163	i >= '0' && i <= '9' ? i - '0'	1362	i >= '0' && i <= '9' ? i - '0'
1164	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1363	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1165	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1364	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1166	: -1;	1365	: -1;
1167		1366
1168	json_stash = gv_stashpv ("JSON::XS", 1);	1367	json_stash = gv_stashpv ("JSON::XS" , 1);
		1368	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1169		1369
1170	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1370	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);	1371	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1172	}	1372	}
1173		1373
1174	PROTOTYPES: DISABLE	1374	PROTOTYPES: DISABLE
1175		1375
1176	SV new (char dummy)	1376	void CLONE (...)
1177	CODE:	1377	CODE:
1178	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1378	json_stash = 0;
1179	OUTPUT:	1379	json_boolean_stash = 0;
1180	RETVAL
1181		1380
		1381	void new (char *klass)
		1382	PPCODE:
		1383	{
		1384	HV *stash = !JSON_SLOW \|\| json_stash
		1385	? json_stash
		1386	: gv_stashpv ("JSON::XS", 1);
		1387	SV *pv = NEWSV (0, sizeof (JSON));
		1388	SvPOK_only (pv);
		1389	Zero (SvPVX (pv), 1, JSON);
		1390	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1391	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), stash)));
		1392	}
		1393
1182	SV ascii (SV self, int enable = 1)	1394	void ascii (JSON *self, int enable = 1)
1183	ALIAS:	1395	ALIAS:
1184	ascii = F_ASCII	1396	ascii = F_ASCII
1185	latin1 = F_LATIN1	1397	latin1 = F_LATIN1
1186	utf8 = F_UTF8	1398	utf8 = F_UTF8
1187	indent = F_INDENT	1399	indent = F_INDENT
1188	canonical = F_CANONICAL	1400	canonical = F_CANONICAL
1189	space_before = F_SPACE_BEFORE	1401	space_before = F_SPACE_BEFORE
1190	space_after = F_SPACE_AFTER	1402	space_after = F_SPACE_AFTER
1191	pretty = F_PRETTY	1403	pretty = F_PRETTY
1192	allow_nonref = F_ALLOW_NONREF	1404	allow_nonref = F_ALLOW_NONREF
1193	shrink = F_SHRINK	1405	shrink = F_SHRINK
		1406	allow_blessed = F_ALLOW_BLESSED
		1407	convert_blessed = F_CONV_BLESSED
1194	CODE:	1408	PPCODE:
1195	{	1409	{
1196	UV *uv = SvJSON (self);
1197	if (enable)	1410	if (enable)
1198	*uv \|= ix;	1411	self->flags \|= ix;
1199	else	1412	else
1200	*uv &= ~ix;	1413	self->flags &= ~ix;
1201		1414
1202	RETVAL = newSVsv (self);	1415	XPUSHs (ST (0));
1203	}	1416	}
1204	OUTPUT:
1205	RETVAL
1206		1417
1207	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1418	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1208	CODE:	1419	PPCODE:
1209	{	1420	{
1210	UV *uv = SvJSON (self);
1211	UV log2 = 0;	1421	UV log2 = 0;
1212		1422
1213	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1423	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1214		1424
1215	while ((1UL << log2) < max_depth)	1425	while ((1UL << log2) < max_depth)
1216	++log2;	1426	++log2;
1217		1427
1218	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1428	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1219		1429
1220	RETVAL = newSVsv (self);	1430	XPUSHs (ST (0));
1221	}	1431	}
1222	OUTPUT:
1223	RETVAL
1224		1432
1225	void encode (SV self, SV scalar)	1433	void max_size (JSON *self, UV max_size = 0)
1226	PPCODE:	1434	PPCODE:
1227	XPUSHs (encode_json (scalar, *SvJSON (self)));	1435	{
		1436	UV log2 = 0;
1228		1437
1229	void decode (SV self, SV jsonstr)	1438	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1439	if (max_size == 1) max_size = 2;
		1440
		1441	while ((1UL << log2) < max_size)
		1442	++log2;
		1443
		1444	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1445
		1446	XPUSHs (ST (0));
		1447	}
		1448
		1449	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1230	PPCODE:	1450	PPCODE:
		1451	{
		1452	SvREFCNT_dec (self->cb_object);
		1453	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1454
		1455	XPUSHs (ST (0));
		1456	}
		1457
		1458	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1459	PPCODE:
		1460	{
		1461	if (!self->cb_sk_object)
		1462	self->cb_sk_object = newHV ();
		1463
		1464	if (SvOK (cb))
		1465	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1466	else
		1467	{
		1468	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1469
		1470	if (!HvKEYS (self->cb_sk_object))
		1471	{
		1472	SvREFCNT_dec (self->cb_sk_object);
		1473	self->cb_sk_object = 0;
		1474	}
		1475	}
		1476
		1477	XPUSHs (ST (0));
		1478	}
		1479
		1480	void encode (JSON self, SV scalar)
		1481	PPCODE:
		1482	XPUSHs (encode_json (scalar, self));
		1483
		1484	void decode (JSON self, SV jsonstr)
		1485	PPCODE:
1231	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1486	XPUSHs (decode_json (jsonstr, self, 0));
1232		1487
1233	void decode_prefix (SV self, SV jsonstr)	1488	void decode_prefix (JSON self, SV jsonstr)
1234	PPCODE:	1489	PPCODE:
1235	{	1490	{
1236	UV offset;	1491	UV offset;
1237	EXTEND (SP, 2);	1492	EXTEND (SP, 2);
1238	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1493	PUSHs (decode_json (jsonstr, self, &offset));
1239	PUSHs (sv_2mortal (newSVuv (offset)));	1494	PUSHs (sv_2mortal (newSVuv (offset)));
1240	}	1495	}
1241		1496
		1497	void DESTROY (JSON *self)
		1498	CODE:
		1499	SvREFCNT_dec (self->cb_sk_object);
		1500	SvREFCNT_dec (self->cb_object);
		1501
1242	PROTOTYPES: ENABLE	1502	PROTOTYPES: ENABLE
1243		1503
1244	void to_json (SV *scalar)	1504	void to_json (SV *scalar)
1245	ALIAS:
1246	objToJson = 0
1247	PPCODE:	1505	PPCODE:
		1506	{
		1507	JSON json = { F_DEFAULT \| F_UTF8 };
1248	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1508	XPUSHs (encode_json (scalar, &json));
		1509	}
1249		1510
1250	void from_json (SV *jsonstr)	1511	void from_json (SV *jsonstr)
1251	ALIAS:
1252	jsonToObj = 0
1253	PPCODE:	1512	PPCODE:
		1513	{
		1514	JSON json = { F_DEFAULT \| F_UTF8 };
1254	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1515	XPUSHs (decode_json (jsonstr, &json, 0));
		1516	}
1255		1517

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.57 by root, Mon Aug 13 16:05:42 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.57 by root, Mon Aug 13 16:05:42 2007 UTC