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

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.59 by root, Mon Aug 13 16:14:20 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.59 by root, Mon Aug 13 16:14:20 2007 UTC