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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.64 by root, Mon Aug 27 02:03:23 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
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
29	#define F_ALLOW_BLESSED 0x00000400UL	30	#define F_ALLOW_BLESSED 0x00000400UL
30	#define F_CONV_BLESSED 0x00000800UL // NYI	31	#define F_CONV_BLESSED 0x00000800UL
		32	#define F_RELAXED 0x00001000UL
		33
31	#define F_MAXDEPTH 0xf8000000UL	34	#define F_MAXDEPTH 0xf8000000UL
32	#define S_MAXDEPTH 27	35	#define S_MAXDEPTH 27
33	#define F_MAXSIZE 0x01f00000UL	36	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	37	#define S_MAXSIZE 20
		38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35		39
36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	40	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))	41	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38		42
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	43	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
…		…
56	#endif	60	#endif
57		61
58	#define expect_false(expr) expect ((expr) != 0, 0)	62	#define expect_false(expr) expect ((expr) != 0, 0)
59	#define expect_true(expr) expect ((expr) != 0, 1)	63	#define expect_true(expr) expect ((expr) != 0, 1)
60		64
		65	#ifdef USE_ITHREADS
		66	# define JSON_SLOW 1
		67	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		68	#else
		69	# define JSON_SLOW 0
		70	# define JSON_STASH json_stash
		71	#endif
		72
61	static HV json_stash, json_boolean_stash; // JSON::XS::	73	static HV json_stash, json_boolean_stash; // JSON::XS::
62	static SV json_true, json_false;	74	static SV json_true, json_false;
63		75
64	typedef struct json {	76	typedef struct {
65	U32 flags;	77	U32 flags;
		78	SV *cb_object;
		79	HV *cb_sk_object;
66	} JSON__XS;	80	} JSON;
67		81
68	/////////////////////////////////////////////////////////////////////////////	82	/////////////////////////////////////////////////////////////////////////////
69	// utility functions	83	// utility functions
70		84
71	static UV *	85	inline void
72	SvJSON (SV *sv)
73	{
74	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
75	croak ("object is not of type JSON::XS");
76
77	return &SvUVX (SvRV (sv));
78	}
79
80	static void
81	shrink (SV *sv)	86	shrink (SV *sv)
82	{	87	{
83	sv_utf8_downgrade (sv, 1);	88	sv_utf8_downgrade (sv, 1);
84	if (SvLEN (sv) > SvCUR (sv) + 1)	89	if (SvLEN (sv) > SvCUR (sv) + 1)
85	{	90	{
…		…
120	typedef struct	125	typedef struct
121	{	126	{
122	char *cur; // SvPVX (sv) + current output position	127	char *cur; // SvPVX (sv) + current output position
123	char *end; // SvEND (sv)	128	char *end; // SvEND (sv)
124	SV *sv; // result scalar	129	SV *sv; // result scalar
125	struct json json;	130	JSON json;
126	U32 indent; // indentation level	131	U32 indent; // indentation level
127	U32 maxdepth; // max. indentation/recursion level	132	U32 maxdepth; // max. indentation/recursion level
128	} enc_t;	133	} enc_t;
129		134
130	inline void	135	inline void
…		…
312	encode_ch (enc, '['); encode_nl (enc);	317	encode_ch (enc, '['); encode_nl (enc);
313	++enc->indent;	318	++enc->indent;
314		319
315	for (i = 0; i <= len; ++i)	320	for (i = 0; i <= len; ++i)
316	{	321	{
		322	SV **svp = av_fetch (av, i, 0);
		323
317	encode_indent (enc);	324	encode_indent (enc);
318	encode_sv (enc, *av_fetch (av, i, 0));	325
		326	if (svp)
		327	encode_sv (enc, *svp);
		328	else
		329	encode_str (enc, "null", 4, 0);
319		330
320	if (i < len)	331	if (i < len)
321	encode_comma (enc);	332	encode_comma (enc);
322	}	333	}
323		334
…		…
326	--enc->indent;	337	--enc->indent;
327	encode_indent (enc); encode_ch (enc, ']');	338	encode_indent (enc); encode_ch (enc, ']');
328	}	339	}
329		340
330	static void	341	static void
331	encode_he (enc_t enc, HE he)	342	encode_hk (enc_t enc, HE he)
332	{	343	{
333	encode_ch (enc, '"');	344	encode_ch (enc, '"');
334		345
335	if (HeKLEN (he) == HEf_SVKEY)	346	if (HeKLEN (he) == HEf_SVKEY)
336	{	347	{
…		…
349	encode_ch (enc, '"');	360	encode_ch (enc, '"');
350		361
351	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	362	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
352	encode_ch (enc, ':');	363	encode_ch (enc, ':');
353	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	364	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
354	encode_sv (enc, HeVAL (he));
355	}	365	}
356		366
357	// compare hash entries, used when all keys are bytestrings	367	// compare hash entries, used when all keys are bytestrings
358	static int	368	static int
359	he_cmp_fast (const void a_, const void b_)	369	he_cmp_fast (const void a_, const void b_)
…		…
364	HE b = (HE **)b_;	374	HE b = (HE **)b_;
365		375
366	STRLEN la = HeKLEN (a);	376	STRLEN la = HeKLEN (a);
367	STRLEN lb = HeKLEN (b);	377	STRLEN lb = HeKLEN (b);
368		378
369	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	379	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
370	cmp = la - lb;	380	cmp = lb - la;
371		381
372	return cmp;	382	return cmp;
373	}	383	}
374		384
375	// compare hash entries, used when some keys are sv's or utf-x	385	// compare hash entries, used when some keys are sv's or utf-x
376	static int	386	static int
377	he_cmp_slow (const void a, const void b)	387	he_cmp_slow (const void a, const void b)
378	{	388	{
379	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	389	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
380	}	390	}
381		391
382	static void	392	static void
383	encode_hv (enc_t enc, HV hv)	393	encode_hv (enc_t enc, HV hv)
384	{	394	{
		395	HE *he;
385	int count, i;	396	int count;
386		397
387	if (enc->indent >= enc->maxdepth)	398	if (enc->indent >= enc->maxdepth)
388	croak ("data structure too deep (hit recursion limit)");	399	croak ("data structure too deep (hit recursion limit)");
389		400
390	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	401	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
391		402
392	if ((count = hv_iterinit (hv)))
393	{
394	// for canonical output we have to sort by keys first	403	// for canonical output we have to sort by keys first
395	// actually, this is mostly due to the stupid so-called	404	// actually, this is mostly due to the stupid so-called
396	// security workaround added somewhere in 5.8.x.	405	// security workaround added somewhere in 5.8.x.
397	// that randomises hash orderings	406	// that randomises hash orderings
398	if (enc->json.flags & F_CANONICAL)	407	if (enc->json.flags & F_CANONICAL)
		408	{
		409	int count = hv_iterinit (hv);
		410
		411	if (SvMAGICAL (hv))
399	{	412	{
		413	// need to count by iterating. could improve by dynamically building the vector below
		414	// but I don't care for the speed of this special case.
		415	// note also that we will run into undefined behaviour when the two iterations
		416	// do not result in the same count, something I might care for in some later release.
		417
		418	count = 0;
		419	while (hv_iternext (hv))
		420	++count;
		421
		422	hv_iterinit (hv);
		423	}
		424
		425	if (count)
		426	{
400	int fast = 1;	427	int i, fast = 1;
401	HE *he;
402	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	428	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
403	HE *hes = _alloca (count sizeof (HE));	429	HE *hes = _alloca (count sizeof (HE));
404	#else	430	#else
405	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	431	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
406	#endif	432	#endif
…		…
433		459
434	FREETMPS;	460	FREETMPS;
435	LEAVE;	461	LEAVE;
436	}	462	}
437		463
438	for (i = 0; i < count; ++i)	464	while (count--)
439	{	465	{
440	encode_indent (enc);	466	encode_indent (enc);
		467	he = hes [count];
441	encode_he (enc, hes [i]);	468	encode_hk (enc, he);
		469	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
442		470
443	if (i < count - 1)	471	if (count)
444	encode_comma (enc);	472	encode_comma (enc);
445	}	473	}
446
447	encode_nl (enc);
448	}	474	}
		475	}
449	else	476	else
450	{	477	{
		478	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
451	HE *he = hv_iternext (hv);	479	if ((he = hv_iternext (hv)))
452
453	for (;;)	480	for (;;)
454	{	481	{
455	encode_indent (enc);	482	encode_indent (enc);
456	encode_he (enc, he);	483	encode_hk (enc, he);
		484	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
457		485
458	if (!(he = hv_iternext (hv)))	486	if (!(he = hv_iternext (hv)))
459	break;	487	break;
460		488
461	encode_comma (enc);	489	encode_comma (enc);
462	}	490	}
		491	}
463		492
464	encode_nl (enc);	493	encode_nl (enc);
465	}
466	}
467		494
468	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	495	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
469	}	496	}
470		497
471	// encode objects, arrays and special \0=false and \1=true values.	498	// encode objects, arrays and special \0=false and \1=true values.
…		…
477	SvGETMAGIC (sv);	504	SvGETMAGIC (sv);
478	svt = SvTYPE (sv);	505	svt = SvTYPE (sv);
479		506
480	if (expect_false (SvOBJECT (sv)))	507	if (expect_false (SvOBJECT (sv)))
481	{	508	{
		509	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		510	? json_boolean_stash
		511	: gv_stashpv ("JSON::XS::Boolean", 1);
		512
482	if (SvSTASH (sv) == json_boolean_stash)	513	if (SvSTASH (sv) == stash)
483	{	514	{
484	if (SvIV (sv) == 0)	515	if (SvIV (sv))
		516	encode_str (enc, "true", 4, 0);
		517	else
485	encode_str (enc, "false", 5, 0);	518	encode_str (enc, "false", 5, 0);
486	else
487	encode_str (enc, "true", 4, 0);
488	}	519	}
489	else	520	else
490	{	521	{
491	#if 0	522	#if 0
492	if (0 && sv_derived_from (rv, "JSON::Literal"))	523	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
495	}	526	}
496	#endif	527	#endif
497	if (enc->json.flags & F_CONV_BLESSED)	528	if (enc->json.flags & F_CONV_BLESSED)
498	{	529	{
499	// we re-bless the reference to get overload and other niceties right	530	// we re-bless the reference to get overload and other niceties right
500	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	531	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501		532
502	if (to_json)	533	if (to_json)
503	{	534	{
504	dSP;	535	dSP;
505	ENTER;	536
506	SAVETMPS;
507	PUSHMARK (SP);	537	ENTER; SAVETMPS; PUSHMARK (SP);
508	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	538	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509		539
510	// calling with G_SCALAR ensures that we always get a 1 reutrn value	540	// calling with G_SCALAR ensures that we always get a 1 return value
511	// check anyways.
512	PUTBACK;	541	PUTBACK;
513	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	542	call_sv ((SV *)GvCV (to_json), G_SCALAR);
514	SPAGAIN;	543	SPAGAIN;
515		544
		545	// catch this surprisingly common error
		546	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		547	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		548
		549	sv = POPs;
		550	PUTBACK;
		551
516	encode_sv (enc, POPs);	552	encode_sv (enc, sv);
517		553
518	FREETMPS;	554	FREETMPS; LEAVE;
519	LEAVE;
520	}	555	}
521	else if (enc->json.flags & F_ALLOW_BLESSED)	556	else if (enc->json.flags & F_ALLOW_BLESSED)
522	encode_str (enc, "null", 4, 0);	557	encode_str (enc, "null", 4, 0);
523	else	558	else
524	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	559	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
…		…
535	encode_hv (enc, (HV *)sv);	570	encode_hv (enc, (HV *)sv);
536	else if (svt == SVt_PVAV)	571	else if (svt == SVt_PVAV)
537	encode_av (enc, (AV *)sv);	572	encode_av (enc, (AV *)sv);
538	else if (svt < SVt_PVAV)	573	else if (svt < SVt_PVAV)
539	{	574	{
540	if (SvNIOK (sv) && SvIV (sv) == 0)	575	STRLEN len = 0;
		576	char *pv = svt ? SvPV (sv, len) : 0;
		577
		578	if (len == 1 && *pv == '1')
		579	encode_str (enc, "true", 4, 0);
		580	else if (len == 1 && *pv == '0')
541	encode_str (enc, "false", 5, 0);	581	encode_str (enc, "false", 5, 0);
542	else if (SvNIOK (sv) && SvIV (sv) == 1)
543	encode_str (enc, "true", 4, 0);
544	else	582	else
545	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	583	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
546	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	584	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
547	}	585	}
548	else	586	else
…		…
618	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	656	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
619	SvPV_nolen (sv), SvFLAGS (sv));	657	SvPV_nolen (sv), SvFLAGS (sv));
620	}	658	}
621		659
622	static SV *	660	static SV *
623	encode_json (SV scalar, struct json json)	661	encode_json (SV scalar, JSON json)
624	{	662	{
625	enc_t enc;	663	enc_t enc;
626		664
627	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	665	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
628	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	666	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
…		…
656	typedef struct	694	typedef struct
657	{	695	{
658	char *cur; // current parser pointer	696	char *cur; // current parser pointer
659	char *end; // end of input string	697	char *end; // end of input string
660	const char *err; // parse error, if != 0	698	const char *err; // parse error, if != 0
661	struct json json;	699	JSON json;
662	U32 depth; // recursion depth	700	U32 depth; // recursion depth
663	U32 maxdepth; // recursion depth limit	701	U32 maxdepth; // recursion depth limit
664	} dec_t;	702	} dec_t;
665		703
666	inline void	704	inline void
		705	decode_comment (dec_t *dec)
		706	{
		707	// only '#'-style comments allowed a.t.m.
		708
		709	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		710	++dec->cur;
		711	}
		712
		713	inline void
667	decode_ws (dec_t *dec)	714	decode_ws (dec_t *dec)
668	{	715	{
669	for (;;)	716	for (;;)
670	{	717	{
671	char ch = *dec->cur;	718	char ch = *dec->cur;
672		719
673	if (ch > 0x20	720	if (ch > 0x20)
		721	{
		722	if (expect_false (ch == '#'))
		723	{
		724	if (dec->json.flags & F_RELAXED)
		725	decode_comment (dec);
		726	else
		727	break;
		728	}
		729	else
		730	break;
		731	}
674	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	732	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
675	break;	733	break; // parse error, but let higher level handle it, gives better error messages
676		734
677	++dec->cur;	735	++dec->cur;
678	}	736	}
679	}	737	}
680		738
…		…
929	is_nv = 1;	987	is_nv = 1;
930	}	988	}
931		989
932	if (!is_nv)	990	if (!is_nv)
933	{	991	{
		992	int len = dec->cur - start;
		993
934	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	994	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
935	if (*start == '-')	995	if (*start == '-')
936	switch (dec->cur - start)	996	switch (len)
937	{	997	{
938	case 2: return newSViv (-( start [1] - '0' * 1));	998	case 2: return newSViv (-( start [1] - '0' * 1));
939	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	999	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
940	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1000	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
941	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1001	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
942	}	1002	}
943	else	1003	else
944	switch (dec->cur - start)	1004	switch (len)
945	{	1005	{
946	case 1: return newSViv ( start [0] - '0' * 1);	1006	case 1: return newSViv ( start [0] - '0' * 1);
947	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1007	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
948	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1008	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
949	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1009	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
950	}	1010	}
951		1011
952	{	1012	{
953	UV uv;	1013	UV uv;
954	int numtype = grok_number (start, dec->cur - start, &uv);	1014	int numtype = grok_number (start, len, &uv);
955	if (numtype & IS_NUMBER_IN_UV)	1015	if (numtype & IS_NUMBER_IN_UV)
956	if (numtype & IS_NUMBER_NEG)	1016	if (numtype & IS_NUMBER_NEG)
957	{	1017	{
958	if (uv < (UV)IV_MIN)	1018	if (uv < (UV)IV_MIN)
959	return newSViv (-(IV)uv);	1019	return newSViv (-(IV)uv);
960	}	1020	}
961	else	1021	else
962	return newSVuv (uv);	1022	return newSVuv (uv);
963
964	// here would likely be the place for bigint support
965	}	1023	}
966	}
967		1024
968	// if we ever support bigint or bigfloat, this is the place for bigfloat	1025	len -= *start == '-' ? 1 : 0;
		1026
		1027	// does not fit into IV or UV, try NV
		1028	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1029	#if defined (LDBL_DIG)
		1030	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1031	#endif
		1032	)
		1033	// fits into NV without loss of precision
		1034	return newSVnv (Atof (start));
		1035
		1036	// everything else fails, convert it to a string
		1037	return newSVpvn (start, dec->cur - start);
		1038	}
		1039
		1040	// loss of precision here
969	return newSVnv (Atof (start));	1041	return newSVnv (Atof (start));
970		1042
971	fail:	1043	fail:
972	return 0;	1044	return 0;
973	}	1045	}
…		…
1003		1075
1004	if (*dec->cur != ',')	1076	if (*dec->cur != ',')
1005	ERR (", or ] expected while parsing array");	1077	ERR (", or ] expected while parsing array");
1006		1078
1007	++dec->cur;	1079	++dec->cur;
		1080
		1081	decode_ws (dec);
		1082
		1083	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1084	{
		1085	++dec->cur;
		1086	break;
		1087	}
1008	}	1088	}
1009		1089
1010	DEC_DEC_DEPTH;	1090	DEC_DEC_DEPTH;
1011	return newRV_noinc ((SV *)av);	1091	return newRV_noinc ((SV *)av);
1012		1092
…		…
1017	}	1097	}
1018		1098
1019	static SV *	1099	static SV *
1020	decode_hv (dec_t *dec)	1100	decode_hv (dec_t *dec)
1021	{	1101	{
		1102	SV *sv;
1022	HV *hv = newHV ();	1103	HV *hv = newHV ();
1023		1104
1024	DEC_INC_DEPTH;	1105	DEC_INC_DEPTH;
1025	decode_ws (dec);	1106	decode_ws (dec);
1026		1107
1027	if (*dec->cur == '}')	1108	if (*dec->cur == '}')
1028	++dec->cur;	1109	++dec->cur;
1029	else	1110	else
1030	for (;;)	1111	for (;;)
1031	{	1112	{
1032	decode_ws (dec); EXPECT_CH ('"');	1113	EXPECT_CH ('"');
1033		1114
1034	// heuristic: assume that	1115	// heuristic: assume that
1035	// a) decode_str + hv_store_ent are abysmally slow.	1116	// a) decode_str + hv_store_ent are abysmally slow.
1036	// b) most hash keys are short, simple ascii text.	1117	// b) most hash keys are short, simple ascii text.
1037	// => try to "fast-match" such strings to avoid	1118	// => try to "fast-match" such strings to avoid
…		…
1051	if (!key)	1132	if (!key)
1052	goto fail;	1133	goto fail;
1053		1134
1054	decode_ws (dec); EXPECT_CH (':');	1135	decode_ws (dec); EXPECT_CH (':');
1055		1136
		1137	decode_ws (dec);
1056	value = decode_sv (dec);	1138	value = decode_sv (dec);
1057	if (!value)	1139	if (!value)
1058	{	1140	{
1059	SvREFCNT_dec (key);	1141	SvREFCNT_dec (key);
1060	goto fail;	1142	goto fail;
…		…
1072	int len = p - key;	1154	int len = p - key;
1073	dec->cur = p + 1;	1155	dec->cur = p + 1;
1074		1156
1075	decode_ws (dec); EXPECT_CH (':');	1157	decode_ws (dec); EXPECT_CH (':');
1076		1158
		1159	decode_ws (dec);
1077	value = decode_sv (dec);	1160	value = decode_sv (dec);
1078	if (!value)	1161	if (!value)
1079	goto fail;	1162	goto fail;
1080		1163
1081	hv_store (hv, key, len, value, 0);	1164	hv_store (hv, key, len, value, 0);
…		…
1097		1180
1098	if (*dec->cur != ',')	1181	if (*dec->cur != ',')
1099	ERR (", or } expected while parsing object/hash");	1182	ERR (", or } expected while parsing object/hash");
1100		1183
1101	++dec->cur;	1184	++dec->cur;
		1185
		1186	decode_ws (dec);
		1187
		1188	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1189	{
		1190	++dec->cur;
		1191	break;
		1192	}
1102	}	1193	}
1103		1194
1104	DEC_DEC_DEPTH;	1195	DEC_DEC_DEPTH;
1105	return newRV_noinc ((SV *)hv);	1196	sv = newRV_noinc ((SV *)hv);
		1197
		1198	// check filter callbacks
		1199	if (dec->json.flags & F_HOOK)
		1200	{
		1201	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1202	{
		1203	HE cb, he;
		1204
		1205	hv_iterinit (hv);
		1206	he = hv_iternext (hv);
		1207	hv_iterinit (hv);
		1208
		1209	// the next line creates a mortal sv each time its called.
		1210	// might want to optimise this for common cases.
		1211	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1212
		1213	if (cb)
		1214	{
		1215	dSP;
		1216	int count;
		1217
		1218	ENTER; SAVETMPS; PUSHMARK (SP);
		1219	XPUSHs (HeVAL (he));
		1220
		1221	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1222
		1223	if (count == 1)
		1224	{
		1225	sv = newSVsv (POPs);
		1226	FREETMPS; LEAVE;
		1227	return sv;
		1228	}
		1229
		1230	FREETMPS; LEAVE;
		1231	}
		1232	}
		1233
		1234	if (dec->json.cb_object)
		1235	{
		1236	dSP;
		1237	int count;
		1238
		1239	ENTER; SAVETMPS; PUSHMARK (SP);
		1240	XPUSHs (sv_2mortal (sv));
		1241
		1242	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1243
		1244	if (count == 1)
		1245	{
		1246	sv = newSVsv (POPs);
		1247	FREETMPS; LEAVE;
		1248	return sv;
		1249	}
		1250
		1251	SvREFCNT_inc (sv);
		1252	FREETMPS; LEAVE;
		1253	}
		1254	}
		1255
		1256	return sv;
1106		1257
1107	fail:	1258	fail:
1108	SvREFCNT_dec (hv);	1259	SvREFCNT_dec (hv);
1109	DEC_DEC_DEPTH;	1260	DEC_DEC_DEPTH;
1110	return 0;	1261	return 0;
1111	}	1262	}
1112		1263
1113	static SV *	1264	static SV *
1114	decode_sv (dec_t *dec)	1265	decode_sv (dec_t *dec)
1115	{	1266	{
1116	decode_ws (dec);
1117
1118	// the beauty of JSON: you need exactly one character lookahead	1267	// the beauty of JSON: you need exactly one character lookahead
1119	// to parse anything.	1268	// to parse anything.
1120	switch (*dec->cur)	1269	switch (*dec->cur)
1121	{	1270	{
1122	case '"': ++dec->cur; return decode_str (dec);	1271	case '"': ++dec->cur; return decode_str (dec);
…		…
1130		1279
1131	case 't':	1280	case 't':
1132	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1281	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1133	{	1282	{
1134	dec->cur += 4;	1283	dec->cur += 4;
		1284	#if JSON_SLOW
		1285	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1286	#endif
1135	return SvREFCNT_inc (json_true);	1287	return SvREFCNT_inc (json_true);
1136	}	1288	}
1137	else	1289	else
1138	ERR ("'true' expected");	1290	ERR ("'true' expected");
1139		1291
…		…
1141		1293
1142	case 'f':	1294	case 'f':
1143	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1295	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1144	{	1296	{
1145	dec->cur += 5;	1297	dec->cur += 5;
		1298	#if JSON_SLOW
		1299	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1300	#endif
1146	return SvREFCNT_inc (json_false);	1301	return SvREFCNT_inc (json_false);
1147	}	1302	}
1148	else	1303	else
1149	ERR ("'false' expected");	1304	ERR ("'false' expected");
1150		1305
…		…
1169	fail:	1324	fail:
1170	return 0;	1325	return 0;
1171	}	1326	}
1172		1327
1173	static SV *	1328	static SV *
1174	decode_json (SV string, struct json json, UV *offset_return)	1329	decode_json (SV string, JSON json, UV *offset_return)
1175	{	1330	{
1176	dec_t dec;	1331	dec_t dec;
1177	UV offset;	1332	UV offset;
1178	SV *sv;	1333	SV *sv;
1179		1334
…		…
1196	dec.end = SvEND (string);	1351	dec.end = SvEND (string);
1197	dec.err = 0;	1352	dec.err = 0;
1198	dec.depth = 0;	1353	dec.depth = 0;
1199	dec.maxdepth = DEC_DEPTH (dec.json.flags);	1354	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1200		1355
		1356	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1357	dec.json.flags \|= F_HOOK;
		1358
1201	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1359	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1360
		1361	decode_ws (&dec);
1202	sv = decode_sv (&dec);	1362	sv = decode_sv (&dec);
1203		1363
1204	if (!(offset_return \|\| !sv))	1364	if (!(offset_return \|\| !sv))
1205	{	1365	{
1206	// check for trailing garbage	1366	// check for trailing garbage
…		…
1274	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1434	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1275	}	1435	}
1276		1436
1277	PROTOTYPES: DISABLE	1437	PROTOTYPES: DISABLE
1278		1438
1279	SV new (char dummy)	1439	void CLONE (...)
1280	CODE:	1440	CODE:
1281	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1441	json_stash = 0;
1282	OUTPUT:	1442	json_boolean_stash = 0;
1283	RETVAL
1284		1443
		1444	void new (char *klass)
		1445	PPCODE:
		1446	{
		1447	SV *pv = NEWSV (0, sizeof (JSON));
		1448	SvPOK_only (pv);
		1449	Zero (SvPVX (pv), 1, JSON);
		1450	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1451	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
		1452	}
		1453
1285	SV ascii (SV self, int enable = 1)	1454	void ascii (JSON *self, int enable = 1)
1286	ALIAS:	1455	ALIAS:
1287	ascii = F_ASCII	1456	ascii = F_ASCII
1288	latin1 = F_LATIN1	1457	latin1 = F_LATIN1
1289	utf8 = F_UTF8	1458	utf8 = F_UTF8
1290	indent = F_INDENT	1459	indent = F_INDENT
…		…
1294	pretty = F_PRETTY	1463	pretty = F_PRETTY
1295	allow_nonref = F_ALLOW_NONREF	1464	allow_nonref = F_ALLOW_NONREF
1296	shrink = F_SHRINK	1465	shrink = F_SHRINK
1297	allow_blessed = F_ALLOW_BLESSED	1466	allow_blessed = F_ALLOW_BLESSED
1298	convert_blessed = F_CONV_BLESSED	1467	convert_blessed = F_CONV_BLESSED
		1468	relaxed = F_RELAXED
1299	CODE:	1469	PPCODE:
1300	{	1470	{
1301	UV *uv = SvJSON (self);
1302	if (enable)	1471	if (enable)
1303	*uv \|= ix;	1472	self->flags \|= ix;
1304	else	1473	else
1305	*uv &= ~ix;	1474	self->flags &= ~ix;
1306		1475
1307	RETVAL = newSVsv (self);	1476	XPUSHs (ST (0));
1308	}	1477	}
1309	OUTPUT:
1310	RETVAL
1311		1478
1312	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1479	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1313	CODE:	1480	PPCODE:
1314	{	1481	{
1315	UV *uv = SvJSON (self);
1316	UV log2 = 0;	1482	UV log2 = 0;
1317		1483
1318	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1484	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1319		1485
1320	while ((1UL << log2) < max_depth)	1486	while ((1UL << log2) < max_depth)
1321	++log2;	1487	++log2;
1322		1488
1323	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1489	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1324		1490
1325	RETVAL = newSVsv (self);	1491	XPUSHs (ST (0));
1326	}	1492	}
1327	OUTPUT:
1328	RETVAL
1329		1493
1330	SV max_size (SV self, UV max_size = 0)	1494	void max_size (JSON *self, UV max_size = 0)
1331	CODE:	1495	PPCODE:
1332	{	1496	{
1333	UV *uv = SvJSON (self);
1334	UV log2 = 0;	1497	UV log2 = 0;
1335		1498
1336	if (max_size > 0x80000000UL) max_size = 0x80000000UL;	1499	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1337	if (max_size == 1) max_size = 2;	1500	if (max_size == 1) max_size = 2;
1338		1501
1339	while ((1UL << log2) < max_size)	1502	while ((1UL << log2) < max_size)
1340	++log2;	1503	++log2;
1341		1504
1342	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1505	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1343		1506
1344	RETVAL = newSVsv (self);	1507	XPUSHs (ST (0));
1345	}	1508	}
1346	OUTPUT:
1347	RETVAL
1348		1509
1349	void encode (SV self, SV scalar)	1510	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1350	PPCODE:	1511	PPCODE:
1351	{	1512	{
1352	struct json json = { *SvJSON (self) };	1513	SvREFCNT_dec (self->cb_object);
1353	XPUSHs (encode_json (scalar, &json));	1514	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1354	}
1355		1515
1356	void decode (SV self, SV jsonstr)	1516	XPUSHs (ST (0));
		1517	}
		1518
		1519	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1357	PPCODE:	1520	PPCODE:
1358	{	1521	{
1359	struct json json = { *SvJSON (self) };	1522	if (!self->cb_sk_object)
1360	XPUSHs (decode_json (jsonstr, &json, 0));	1523	self->cb_sk_object = newHV ();
1361	}
1362		1524
1363	void decode_prefix (SV self, SV jsonstr)	1525	if (SvOK (cb))
		1526	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1527	else
		1528	{
		1529	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1530
		1531	if (!HvKEYS (self->cb_sk_object))
		1532	{
		1533	SvREFCNT_dec (self->cb_sk_object);
		1534	self->cb_sk_object = 0;
		1535	}
		1536	}
		1537
		1538	XPUSHs (ST (0));
		1539	}
		1540
		1541	void encode (JSON self, SV scalar)
1364	PPCODE:	1542	PPCODE:
		1543	XPUSHs (encode_json (scalar, self));
		1544
		1545	void decode (JSON self, SV jsonstr)
		1546	PPCODE:
		1547	XPUSHs (decode_json (jsonstr, self, 0));
		1548
		1549	void decode_prefix (JSON self, SV jsonstr)
		1550	PPCODE:
1365	{	1551	{
1366	UV offset;	1552	UV offset;
1367	struct json json = { *SvJSON (self) };
1368	EXTEND (SP, 2);	1553	EXTEND (SP, 2);
1369	PUSHs (decode_json (jsonstr, &json, &offset));	1554	PUSHs (decode_json (jsonstr, self, &offset));
1370	PUSHs (sv_2mortal (newSVuv (offset)));	1555	PUSHs (sv_2mortal (newSVuv (offset)));
1371	}	1556	}
		1557
		1558	void DESTROY (JSON *self)
		1559	CODE:
		1560	SvREFCNT_dec (self->cb_sk_object);
		1561	SvREFCNT_dec (self->cb_object);
1372		1562
1373	PROTOTYPES: ENABLE	1563	PROTOTYPES: ENABLE
1374		1564
1375	void to_json (SV *scalar)	1565	void to_json (SV *scalar)
1376	PPCODE:	1566	PPCODE:
1377	{	1567	{
1378	struct json json = { F_DEFAULT \| F_UTF8 };	1568	JSON json = { F_DEFAULT \| F_UTF8 };
1379	XPUSHs (encode_json (scalar, &json));	1569	XPUSHs (encode_json (scalar, &json));
1380	}	1570	}
1381		1571
1382	void from_json (SV *jsonstr)	1572	void from_json (SV *jsonstr)
1383	PPCODE:	1573	PPCODE:
1384	{	1574	{
1385	struct json json = { F_DEFAULT \| F_UTF8 };	1575	JSON json = { F_DEFAULT \| F_UTF8 };
1386	XPUSHs (decode_json (jsonstr, &json, 0));	1576	XPUSHs (decode_json (jsonstr, &json, 0));
1387	}	1577	}
1388		1578

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC vs. Revision 1.64 by root, Mon Aug 27 02:03:23 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.64 by root, Mon Aug 27 02:03:23 2007 UTC