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

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

…		…
1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#include "assert.h"	5	#include <assert.h>
6	#include "string.h"	6	#include <string.h>
7	#include "stdlib.h"	7	#include <stdlib.h>
8	#include "stdio.h"	8	#include <stdio.h>
		9	#include <float.h>
9		10
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	12	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	13	#endif
13		14
14	// some old perls do not have this, try to make it work, no	15	// some old perls do not have this, try to make it work, no
15	// guarentees, though.	16	// guarentees, though. if it breaks, you get to keep the pieces.
16	#ifndef UTF8_MAXBYTES	17	#ifndef UTF8_MAXBYTES
17	# define UTF8_MAXBYTES 13	18	# define UTF8_MAXBYTES 13
18	#endif	19	#endif
19		20
20	#define F_ASCII 0x00000001UL	21	#define F_ASCII 0x00000001UL
21	#define F_LATIN1 0x00000002UL	22	#define F_LATIN1 0x00000002UL
22	#define F_UTF8 0x00000004UL	23	#define F_UTF8 0x00000004UL
23	#define F_INDENT 0x00000008UL	24	#define F_INDENT 0x00000008UL
24	#define F_CANONICAL 0x00000010UL	25	#define F_CANONICAL 0x00000010UL
25	#define F_SPACE_BEFORE 0x00000020UL	26	#define F_SPACE_BEFORE 0x00000020UL
26	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
27	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
28	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
		30	#define F_ALLOW_BLESSED 0x00000400UL
		31	#define F_CONV_BLESSED 0x00000800UL
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::
		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;
60		79
61	/////////////////////////////////////////////////////////////////////////////	80	/////////////////////////////////////////////////////////////////////////////
62	// utility functions	81	// utility functions
63		82
64	static UV *	83	inline void
65	SvJSON (SV *sv)
66	{
67	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
68	croak ("object is not of type JSON::XS");
69
70	return &SvUVX (SvRV (sv));
71	}
72
73	static void
74	shrink (SV *sv)	84	shrink (SV *sv)
75	{	85	{
76	sv_utf8_downgrade (sv, 1);	86	sv_utf8_downgrade (sv, 1);
77	if (SvLEN (sv) > SvCUR (sv) + 1)	87	if (SvLEN (sv) > SvCUR (sv) + 1)
78	{	88	{
…		…
113	typedef struct	123	typedef struct
114	{	124	{
115	char *cur; // SvPVX (sv) + current output position	125	char *cur; // SvPVX (sv) + current output position
116	char *end; // SvEND (sv)	126	char *end; // SvEND (sv)
117	SV *sv; // result scalar	127	SV *sv; // result scalar
118	U32 flags; // F_*	128	JSON json;
119	U32 indent; // indentation level	129	U32 indent; // indentation level
120	U32 maxdepth; // max. indentation/recursion level	130	U32 maxdepth; // max. indentation/recursion level
121	} enc_t;	131	} enc_t;
122		132
123	inline void	133	inline void
…		…
197	}	207	}
198		208
199	if (uch > 0x10FFFFUL)	209	if (uch > 0x10FFFFUL)
200	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);
201		211
202	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))
203	{	213	{
204	if (uch > 0xFFFFUL)	214	if (uch > 0xFFFFUL)
205	{	215	{
206	need (enc, len += 11);	216	need (enc, len += 11);
207	sprintf (enc->cur, "\\u%04x\\u%04x",	217	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
221	*enc->cur++ = hexdigit [(uch >> 0) & 15];	231	*enc->cur++ = hexdigit [(uch >> 0) & 15];
222	}	232	}
223		233
224	str += clen;	234	str += clen;
225	}	235	}
226	else if (enc->flags & F_LATIN1)	236	else if (enc->json.flags & F_LATIN1)
227	{	237	{
228	*enc->cur++ = uch;	238	*enc->cur++ = uch;
229	str += clen;	239	str += clen;
230	}	240	}
231	else if (is_utf8)	241	else if (is_utf8)
…		…
252	}	262	}
253		263
254	inline void	264	inline void
255	encode_indent (enc_t *enc)	265	encode_indent (enc_t *enc)
256	{	266	{
257	if (enc->flags & F_INDENT)	267	if (enc->json.flags & F_INDENT)
258	{	268	{
259	int spaces = enc->indent * INDENT_STEP;	269	int spaces = enc->indent * INDENT_STEP;
260		270
261	need (enc, spaces);	271	need (enc, spaces);
262	memset (enc->cur, ' ', spaces);	272	memset (enc->cur, ' ', spaces);
…		…
272	}	282	}
273		283
274	inline void	284	inline void
275	encode_nl (enc_t *enc)	285	encode_nl (enc_t *enc)
276	{	286	{
277	if (enc->flags & F_INDENT)	287	if (enc->json.flags & F_INDENT)
278	{	288	{
279	need (enc, 1);	289	need (enc, 1);
280	encode_ch (enc, '\n');	290	encode_ch (enc, '\n');
281	}	291	}
282	}	292	}
…		…
284	inline void	294	inline void
285	encode_comma (enc_t *enc)	295	encode_comma (enc_t *enc)
286	{	296	{
287	encode_ch (enc, ',');	297	encode_ch (enc, ',');
288		298
289	if (enc->flags & F_INDENT)	299	if (enc->json.flags & F_INDENT)
290	encode_nl (enc);	300	encode_nl (enc);
291	else if (enc->flags & F_SPACE_AFTER)	301	else if (enc->json.flags & F_SPACE_AFTER)
292	encode_space (enc);	302	encode_space (enc);
293	}	303	}
294		304
295	static void encode_sv (enc_t enc, SV sv);	305	static void encode_sv (enc_t enc, SV sv);
296		306
…		…
305	encode_ch (enc, '['); encode_nl (enc);	315	encode_ch (enc, '['); encode_nl (enc);
306	++enc->indent;	316	++enc->indent;
307		317
308	for (i = 0; i <= len; ++i)	318	for (i = 0; i <= len; ++i)
309	{	319	{
		320	SV **svp = av_fetch (av, i, 0);
		321
310	encode_indent (enc);	322	encode_indent (enc);
311	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);
312		328
313	if (i < len)	329	if (i < len)
314	encode_comma (enc);	330	encode_comma (enc);
315	}	331	}
316		332
…		…
339	else	355	else
340	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	356	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
341		357
342	encode_ch (enc, '"');	358	encode_ch (enc, '"');
343		359
344	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	360	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345	encode_ch (enc, ':');	361	encode_ch (enc, ':');
346	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	362	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347	encode_sv (enc, HeVAL (he));	363	encode_sv (enc, HeVAL (he));
348	}	364	}
349		365
350	// compare hash entries, used when all keys are bytestrings	366	// compare hash entries, used when all keys are bytestrings
351	static int	367	static int
…		…
386	{	402	{
387	// for canonical output we have to sort by keys first	403	// for canonical output we have to sort by keys first
388	// actually, this is mostly due to the stupid so-called	404	// actually, this is mostly due to the stupid so-called
389	// security workaround added somewhere in 5.8.x.	405	// security workaround added somewhere in 5.8.x.
390	// that randomises hash orderings	406	// that randomises hash orderings
391	if (enc->flags & F_CANONICAL)	407	if (enc->json.flags & F_CANONICAL)
392	{	408	{
393	int fast = 1;	409	int fast = 1;
394	HE *he;	410	HE *he;
395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	411	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
396	HE *hes = _alloca (count sizeof (HE));	412	HE *hes = _alloca (count sizeof (HE));
…		…
468	svtype svt;	484	svtype svt;
469		485
470	SvGETMAGIC (sv);	486	SvGETMAGIC (sv);
471	svt = SvTYPE (sv);	487	svt = SvTYPE (sv);
472		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	}
473	if (svt == SVt_PVHV)	551	else if (svt == SVt_PVHV)
474	encode_hv (enc, (HV *)sv);	552	encode_hv (enc, (HV *)sv);
475	else if (svt == SVt_PVAV)	553	else if (svt == SVt_PVAV)
476	encode_av (enc, (AV *)sv);	554	encode_av (enc, (AV *)sv);
477	else if (svt < SVt_PVAV)	555	else if (svt < SVt_PVAV)
478	{	556	{
479	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')
480	encode_str (enc, "false", 5, 0);	563	encode_str (enc, "false", 5, 0);
481	else if (SvNIOK (sv) && SvIV (sv) == 1)
482	encode_str (enc, "true", 4, 0);
483	else	564	else
484	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",
485	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	566	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
486	}	567	}
487	else	568	else
…		…
557	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",
558	SvPV_nolen (sv), SvFLAGS (sv));	639	SvPV_nolen (sv), SvFLAGS (sv));
559	}	640	}
560		641
561	static SV *	642	static SV *
562	encode_json (SV *scalar, U32 flags)	643	encode_json (SV scalar, JSON json)
563	{	644	{
564	enc_t enc;	645	enc_t enc;
565		646
566	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	647	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
567	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)");
568		649
569	enc.flags = flags;	650	enc.json = *json;
570	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	651	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
571	enc.cur = SvPVX (enc.sv);	652	enc.cur = SvPVX (enc.sv);
572	enc.end = SvEND (enc.sv);	653	enc.end = SvEND (enc.sv);
573	enc.indent = 0;	654	enc.indent = 0;
574	enc.maxdepth = DEC_DEPTH (flags);	655	enc.maxdepth = DEC_DEPTH (enc.json.flags);
575		656
576	SvPOK_only (enc.sv);	657	SvPOK_only (enc.sv);
577	encode_sv (&enc, scalar);	658	encode_sv (&enc, scalar);
578		659
579	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	660	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
580	*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
581		662
582	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	663	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
583	SvUTF8_on (enc.sv);	664	SvUTF8_on (enc.sv);
584		665
585	if (enc.flags & F_SHRINK)	666	if (enc.json.flags & F_SHRINK)
586	shrink (enc.sv);	667	shrink (enc.sv);
587		668
588	return enc.sv;	669	return enc.sv;
589	}	670	}
590		671
…		…
595	typedef struct	676	typedef struct
596	{	677	{
597	char *cur; // current parser pointer	678	char *cur; // current parser pointer
598	char *end; // end of input string	679	char *end; // end of input string
599	const char *err; // parse error, if != 0	680	const char *err; // parse error, if != 0
600	U32 flags; // F_*	681	JSON json;
601	U32 depth; // recursion depth	682	U32 depth; // recursion depth
602	U32 maxdepth; // recursion depth limit	683	U32 maxdepth; // recursion depth limit
603	} dec_t;	684	} dec_t;
604		685
605	inline void	686	inline void
…		…
868	is_nv = 1;	949	is_nv = 1;
869	}	950	}
870		951
871	if (!is_nv)	952	if (!is_nv)
872	{	953	{
		954	int len = dec->cur - start;
		955
873	// 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
874	if (*start == '-')	957	if (*start == '-')
875	switch (dec->cur - start)	958	switch (len)
876	{	959	{
877	case 2: return newSViv (-( start [1] - '0' * 1));	960	case 2: return newSViv (-( start [1] - '0' * 1));
878	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	961	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
879	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	962	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
880	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	963	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
881	}	964	}
882	else	965	else
883	switch (dec->cur - start)	966	switch (len)
884	{	967	{
885	case 1: return newSViv ( start [0] - '0' * 1);	968	case 1: return newSViv ( start [0] - '0' * 1);
886	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	969	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
887	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	970	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
888	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	971	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
889	}	972	}
890		973
891	{	974	{
892	UV uv;	975	UV uv;
893	int numtype = grok_number (start, dec->cur - start, &uv);	976	int numtype = grok_number (start, len, &uv);
894	if (numtype & IS_NUMBER_IN_UV)	977	if (numtype & IS_NUMBER_IN_UV)
895	if (numtype & IS_NUMBER_NEG)	978	if (numtype & IS_NUMBER_NEG)
896	{	979	{
897	if (uv < (UV)IV_MIN)	980	if (uv < (UV)IV_MIN)
898	return newSViv (-(IV)uv);	981	return newSViv (-(IV)uv);
899	}	982	}
900	else	983	else
901	return newSVuv (uv);	984	return newSVuv (uv);
902
903	// here would likely be the place for bigint support
904	}	985	}
905	}
906		986
907	// 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
908	return newSVnv (Atof (start));	1003	return newSVnv (Atof (start));
909		1004
910	fail:	1005	fail:
911	return 0;	1006	return 0;
912	}	1007	}
…		…
956	}	1051	}
957		1052
958	static SV *	1053	static SV *
959	decode_hv (dec_t *dec)	1054	decode_hv (dec_t *dec)
960	{	1055	{
		1056	SV *sv;
961	HV *hv = newHV ();	1057	HV *hv = newHV ();
962		1058
963	DEC_INC_DEPTH;	1059	DEC_INC_DEPTH;
964	decode_ws (dec);	1060	decode_ws (dec);
965		1061
966	if (*dec->cur == '}')	1062	if (*dec->cur == '}')
967	++dec->cur;	1063	++dec->cur;
968	else	1064	else
969	for (;;)	1065	for (;;)
970	{	1066	{
971	SV key, value;
972
973	decode_ws (dec); EXPECT_CH ('"');	1067	decode_ws (dec); EXPECT_CH ('"');
974		1068
975	key = decode_str (dec);	1069	// heuristic: assume that
976	if (!key)	1070	// a) decode_str + hv_store_ent are abysmally slow.
977	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
978		1078
979	decode_ws (dec); EXPECT_CH (':');	1079	for (;;)
980
981	value = decode_sv (dec);
982	if (!value)
983	{	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);
984	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)
985	goto fail;	1114	goto fail;
		1115
		1116	hv_store (hv, key, len, value, 0);
		1117
		1118	break;
		1119	}
		1120
		1121	++p;
986	}	1122	}
987		1123	}
988	hv_store_ent (hv, key, value, 0);
989	SvREFCNT_dec (key);
990		1124
991	decode_ws (dec);	1125	decode_ws (dec);
992		1126
993	if (*dec->cur == '}')	1127	if (*dec->cur == '}')
994	{	1128	{
…		…
1001		1135
1002	++dec->cur;	1136	++dec->cur;
1003	}	1137	}
1004		1138
1005	DEC_DEC_DEPTH;	1139	DEC_DEC_DEPTH;
1006	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;
1007		1201
1008	fail:	1202	fail:
1009	SvREFCNT_dec (hv);	1203	SvREFCNT_dec (hv);
1010	DEC_DEC_DEPTH;	1204	DEC_DEC_DEPTH;
1011	return 0;	1205	return 0;
…		…
1031		1225
1032	case 't':	1226	case 't':
1033	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1227	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1034	{	1228	{
1035	dec->cur += 4;	1229	dec->cur += 4;
1036	return newSViv (1);	1230	#if JSON_SLOW
		1231	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1232	#endif
		1233	return SvREFCNT_inc (json_true);
1037	}	1234	}
1038	else	1235	else
1039	ERR ("'true' expected");	1236	ERR ("'true' expected");
1040		1237
1041	break;	1238	break;
1042		1239
1043	case 'f':	1240	case 'f':
1044	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1241	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1045	{	1242	{
1046	dec->cur += 5;	1243	dec->cur += 5;
1047	return newSViv (0);	1244	#if JSON_SLOW
		1245	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1246	#endif
		1247	return SvREFCNT_inc (json_false);
1048	}	1248	}
1049	else	1249	else
1050	ERR ("'false' expected");	1250	ERR ("'false' expected");
1051		1251
1052	break;	1252	break;
…		…
1070	fail:	1270	fail:
1071	return 0;	1271	return 0;
1072	}	1272	}
1073		1273
1074	static SV *	1274	static SV *
1075	decode_json (SV string, U32 flags, UV offset_return)	1275	decode_json (SV string, JSON json, UV *offset_return)
1076	{	1276	{
1077	dec_t dec;	1277	dec_t dec;
1078	UV offset;	1278	UV offset;
1079	SV *sv;	1279	SV *sv;
1080		1280
1081	SvGETMAGIC (string);	1281	SvGETMAGIC (string);
1082	SvUPGRADE (string, SVt_PV);	1282	SvUPGRADE (string, SVt_PV);
1083		1283
		1284	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1285	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1286	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1287
1084	if (flags & F_UTF8)	1288	if (json->flags & F_UTF8)
1085	sv_utf8_downgrade (string, 0);	1289	sv_utf8_downgrade (string, 0);
1086	else	1290	else
1087	sv_utf8_upgrade (string);	1291	sv_utf8_upgrade (string);
1088		1292
1089	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1293	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1090		1294
1091	dec.flags = flags;	1295	dec.json = *json;
1092	dec.cur = SvPVX (string);	1296	dec.cur = SvPVX (string);
1093	dec.end = SvEND (string);	1297	dec.end = SvEND (string);
1094	dec.err = 0;	1298	dec.err = 0;
1095	dec.depth = 0;	1299	dec.depth = 0;
1096	dec.maxdepth = DEC_DEPTH (dec.flags);	1300	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1301
		1302	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1303	dec.json.flags \|= F_HOOK;
1097		1304
1098	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1305	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1099	sv = decode_sv (&dec);	1306	sv = decode_sv (&dec);
1100		1307
1101	if (!(offset_return \|\| !sv))	1308	if (!(offset_return \|\| !sv))
…		…
1111	}	1318	}
1112	}	1319	}
1113		1320
1114	if (offset_return \|\| !sv)	1321	if (offset_return \|\| !sv)
1115	{	1322	{
1116	offset = dec.flags & F_UTF8	1323	offset = dec.json.flags & F_UTF8
1117	? dec.cur - SvPVX (string)	1324	? dec.cur - SvPVX (string)
1118	: utf8_distance (dec.cur, SvPVX (string));	1325	: utf8_distance (dec.cur, SvPVX (string));
1119		1326
1120	if (offset_return)	1327	if (offset_return)
1121	*offset_return = offset;	1328	*offset_return = offset;
…		…
1140	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1347	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1141	}	1348	}
1142		1349
1143	sv = sv_2mortal (sv);	1350	sv = sv_2mortal (sv);
1144		1351
1145	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1352	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1146	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1353	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1147		1354
1148	return sv;	1355	return sv;
1149	}	1356	}
1150		1357
…		…
1162	i >= '0' && i <= '9' ? i - '0'	1369	i >= '0' && i <= '9' ? i - '0'
1163	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1370	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1164	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1371	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1165	: -1;	1372	: -1;
1166		1373
1167	json_stash = gv_stashpv ("JSON::XS", 1);	1374	json_stash = gv_stashpv ("JSON::XS" , 1);
		1375	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1376
		1377	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1378	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1168	}	1379	}
1169		1380
1170	PROTOTYPES: DISABLE	1381	PROTOTYPES: DISABLE
1171		1382
1172	SV new (char dummy)	1383	void CLONE (...)
1173	CODE:	1384	CODE:
1174	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1385	json_stash = 0;
1175	OUTPUT:	1386	json_boolean_stash = 0;
1176	RETVAL
1177		1387
		1388	void new (char *klass)
		1389	PPCODE:
		1390	{
		1391	SV *pv = NEWSV (0, sizeof (JSON));
		1392	SvPOK_only (pv);
		1393	Zero (SvPVX (pv), 1, JSON);
		1394	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1395	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
		1396	}
		1397
1178	SV ascii (SV self, int enable = 1)	1398	void ascii (JSON *self, int enable = 1)
1179	ALIAS:	1399	ALIAS:
1180	ascii = F_ASCII	1400	ascii = F_ASCII
1181	latin1 = F_LATIN1	1401	latin1 = F_LATIN1
1182	utf8 = F_UTF8	1402	utf8 = F_UTF8
1183	indent = F_INDENT	1403	indent = F_INDENT
1184	canonical = F_CANONICAL	1404	canonical = F_CANONICAL
1185	space_before = F_SPACE_BEFORE	1405	space_before = F_SPACE_BEFORE
1186	space_after = F_SPACE_AFTER	1406	space_after = F_SPACE_AFTER
1187	pretty = F_PRETTY	1407	pretty = F_PRETTY
1188	allow_nonref = F_ALLOW_NONREF	1408	allow_nonref = F_ALLOW_NONREF
1189	shrink = F_SHRINK	1409	shrink = F_SHRINK
		1410	allow_blessed = F_ALLOW_BLESSED
		1411	convert_blessed = F_CONV_BLESSED
1190	CODE:	1412	PPCODE:
1191	{	1413	{
1192	UV *uv = SvJSON (self);
1193	if (enable)	1414	if (enable)
1194	*uv \|= ix;	1415	self->flags \|= ix;
1195	else	1416	else
1196	*uv &= ~ix;	1417	self->flags &= ~ix;
1197		1418
1198	RETVAL = newSVsv (self);	1419	XPUSHs (ST (0));
1199	}	1420	}
1200	OUTPUT:
1201	RETVAL
1202		1421
1203	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1422	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1204	CODE:	1423	PPCODE:
1205	{	1424	{
1206	UV *uv = SvJSON (self);
1207	UV log2 = 0;	1425	UV log2 = 0;
1208		1426
1209	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1427	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1210		1428
1211	while ((1UL << log2) < max_depth)	1429	while ((1UL << log2) < max_depth)
1212	++log2;	1430	++log2;
1213		1431
1214	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1432	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1215		1433
1216	RETVAL = newSVsv (self);	1434	XPUSHs (ST (0));
1217	}	1435	}
1218	OUTPUT:
1219	RETVAL
1220		1436
1221	void encode (SV self, SV scalar)	1437	void max_size (JSON *self, UV max_size = 0)
1222	PPCODE:	1438	PPCODE:
1223	XPUSHs (encode_json (scalar, *SvJSON (self)));	1439	{
		1440	UV log2 = 0;
1224		1441
1225	void decode (SV self, SV jsonstr)	1442	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1443	if (max_size == 1) max_size = 2;
		1444
		1445	while ((1UL << log2) < max_size)
		1446	++log2;
		1447
		1448	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1449
		1450	XPUSHs (ST (0));
		1451	}
		1452
		1453	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1226	PPCODE:	1454	PPCODE:
		1455	{
		1456	SvREFCNT_dec (self->cb_object);
		1457	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1458
		1459	XPUSHs (ST (0));
		1460	}
		1461
		1462	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1463	PPCODE:
		1464	{
		1465	if (!self->cb_sk_object)
		1466	self->cb_sk_object = newHV ();
		1467
		1468	if (SvOK (cb))
		1469	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1470	else
		1471	{
		1472	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1473
		1474	if (!HvKEYS (self->cb_sk_object))
		1475	{
		1476	SvREFCNT_dec (self->cb_sk_object);
		1477	self->cb_sk_object = 0;
		1478	}
		1479	}
		1480
		1481	XPUSHs (ST (0));
		1482	}
		1483
		1484	void encode (JSON self, SV scalar)
		1485	PPCODE:
		1486	XPUSHs (encode_json (scalar, self));
		1487
		1488	void decode (JSON self, SV jsonstr)
		1489	PPCODE:
1227	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1490	XPUSHs (decode_json (jsonstr, self, 0));
1228		1491
1229	void decode_prefix (SV self, SV jsonstr)	1492	void decode_prefix (JSON self, SV jsonstr)
1230	PPCODE:	1493	PPCODE:
1231	{	1494	{
1232	UV offset;	1495	UV offset;
1233	EXTEND (SP, 2);	1496	EXTEND (SP, 2);
1234	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1497	PUSHs (decode_json (jsonstr, self, &offset));
1235	PUSHs (sv_2mortal (newSVuv (offset)));	1498	PUSHs (sv_2mortal (newSVuv (offset)));
1236	}	1499	}
1237		1500
		1501	void DESTROY (JSON *self)
		1502	CODE:
		1503	SvREFCNT_dec (self->cb_sk_object);
		1504	SvREFCNT_dec (self->cb_object);
		1505
1238	PROTOTYPES: ENABLE	1506	PROTOTYPES: ENABLE
1239		1507
1240	void to_json (SV *scalar)	1508	void to_json (SV *scalar)
1241	ALIAS:
1242	objToJson = 0
1243	PPCODE:	1509	PPCODE:
		1510	{
		1511	JSON json = { F_DEFAULT \| F_UTF8 };
1244	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1512	XPUSHs (encode_json (scalar, &json));
		1513	}
1245		1514
1246	void from_json (SV *jsonstr)	1515	void from_json (SV *jsonstr)
1247	ALIAS:
1248	jsonToObj = 0
1249	PPCODE:	1516	PPCODE:
		1517	{
		1518	JSON json = { F_DEFAULT \| F_UTF8 };
1250	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1519	XPUSHs (decode_json (jsonstr, &json, 0));
		1520	}
1251		1521

Diff Legend

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

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

Diff Legend

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