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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC vs.
Revision 1.69 by root, Wed Dec 5 10:59:28 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 {	76	typedef struct {
65	U32 flags;	77	U32 flags;
		78	SV *cb_object;
		79	HV *cb_sk_object;
66	} JSON;	80	} JSON;
67		81
68	/////////////////////////////////////////////////////////////////////////////	82	/////////////////////////////////////////////////////////////////////////////
69	// utility functions	83	// utility functions
70		84
…		…
298	int i, len = av_len (av);	312	int i, len = av_len (av);
299		313
300	if (enc->indent >= enc->maxdepth)	314	if (enc->indent >= enc->maxdepth)
301	croak ("data structure too deep (hit recursion limit)");	315	croak ("data structure too deep (hit recursion limit)");
302		316
303	encode_ch (enc, '['); encode_nl (enc);	317	encode_ch (enc, '[');
304	++enc->indent;	318
		319	if (len >= 0)
		320	{
		321	encode_nl (enc); ++enc->indent;
305		322
306	for (i = 0; i <= len; ++i)	323	for (i = 0; i <= len; ++i)
307	{	324	{
		325	SV **svp = av_fetch (av, i, 0);
		326
308	encode_indent (enc);	327	encode_indent (enc);
309	encode_sv (enc, *av_fetch (av, i, 0));
310		328
		329	if (svp)
		330	encode_sv (enc, *svp);
		331	else
		332	encode_str (enc, "null", 4, 0);
		333
311	if (i < len)	334	if (i < len)
312	encode_comma (enc);	335	encode_comma (enc);
313	}	336	}
314		337
		338	encode_nl (enc); --enc->indent; encode_indent (enc);
		339	}
		340
315	encode_nl (enc);	341	encode_ch (enc, ']');
316
317	--enc->indent;
318	encode_indent (enc); encode_ch (enc, ']');
319	}	342	}
320		343
321	static void	344	static void
322	encode_he (enc_t enc, HE he)	345	encode_hk (enc_t enc, HE he)
323	{	346	{
324	encode_ch (enc, '"');	347	encode_ch (enc, '"');
325		348
326	if (HeKLEN (he) == HEf_SVKEY)	349	if (HeKLEN (he) == HEf_SVKEY)
327	{	350	{
…		…
340	encode_ch (enc, '"');	363	encode_ch (enc, '"');
341		364
342	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	365	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
343	encode_ch (enc, ':');	366	encode_ch (enc, ':');
344	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	367	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
345	encode_sv (enc, HeVAL (he));
346	}	368	}
347		369
348	// compare hash entries, used when all keys are bytestrings	370	// compare hash entries, used when all keys are bytestrings
349	static int	371	static int
350	he_cmp_fast (const void a_, const void b_)	372	he_cmp_fast (const void a_, const void b_)
…		…
355	HE b = (HE **)b_;	377	HE b = (HE **)b_;
356		378
357	STRLEN la = HeKLEN (a);	379	STRLEN la = HeKLEN (a);
358	STRLEN lb = HeKLEN (b);	380	STRLEN lb = HeKLEN (b);
359		381
360	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	382	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
361	cmp = la - lb;	383	cmp = lb - la;
362		384
363	return cmp;	385	return cmp;
364	}	386	}
365		387
366	// compare hash entries, used when some keys are sv's or utf-x	388	// compare hash entries, used when some keys are sv's or utf-x
367	static int	389	static int
368	he_cmp_slow (const void a, const void b)	390	he_cmp_slow (const void a, const void b)
369	{	391	{
370	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	392	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
371	}	393	}
372		394
373	static void	395	static void
374	encode_hv (enc_t enc, HV hv)	396	encode_hv (enc_t enc, HV hv)
375	{	397	{
		398	HE *he;
376	int count, i;	399	int count;
377		400
378	if (enc->indent >= enc->maxdepth)	401	if (enc->indent >= enc->maxdepth)
379	croak ("data structure too deep (hit recursion limit)");	402	croak ("data structure too deep (hit recursion limit)");
380		403
381	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	404	encode_ch (enc, '{');
382		405
383	if ((count = hv_iterinit (hv)))
384	{
385	// for canonical output we have to sort by keys first	406	// for canonical output we have to sort by keys first
386	// actually, this is mostly due to the stupid so-called	407	// actually, this is mostly due to the stupid so-called
387	// security workaround added somewhere in 5.8.x.	408	// security workaround added somewhere in 5.8.x.
388	// that randomises hash orderings	409	// that randomises hash orderings
389	if (enc->json.flags & F_CANONICAL)	410	if (enc->json.flags & F_CANONICAL)
		411	{
		412	int count = hv_iterinit (hv);
		413
		414	if (SvMAGICAL (hv))
390	{	415	{
		416	// need to count by iterating. could improve by dynamically building the vector below
		417	// but I don't care for the speed of this special case.
		418	// note also that we will run into undefined behaviour when the two iterations
		419	// do not result in the same count, something I might care for in some later release.
		420
		421	count = 0;
		422	while (hv_iternext (hv))
		423	++count;
		424
		425	hv_iterinit (hv);
		426	}
		427
		428	if (count)
		429	{
391	int fast = 1;	430	int i, fast = 1;
392	HE *he;
393	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	431	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
394	HE *hes = _alloca (count sizeof (HE));	432	HE *hes = _alloca (count sizeof (HE));
395	#else	433	#else
396	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode	434	HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
397	#endif	435	#endif
…		…
424		462
425	FREETMPS;	463	FREETMPS;
426	LEAVE;	464	LEAVE;
427	}	465	}
428		466
429	for (i = 0; i < count; ++i)	467	encode_nl (enc); ++enc->indent;
		468
		469	while (count--)
430	{	470	{
431	encode_indent (enc);	471	encode_indent (enc);
		472	he = hes [count];
432	encode_he (enc, hes [i]);	473	encode_hk (enc, he);
		474	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
433		475
434	if (i < count - 1)	476	if (count)
435	encode_comma (enc);	477	encode_comma (enc);
436	}	478	}
437		479
438	encode_nl (enc);	480	encode_nl (enc); --enc->indent; encode_indent (enc);
439	}	481	}
		482	}
440	else	483	else
		484	{
		485	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
		486	if ((he = hv_iternext (hv)))
441	{	487	{
442	HE *he = hv_iternext (hv);	488	encode_nl (enc); ++enc->indent;
443		489
444	for (;;)	490	for (;;)
445	{	491	{
446	encode_indent (enc);	492	encode_indent (enc);
447	encode_he (enc, he);	493	encode_hk (enc, he);
		494	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
448		495
449	if (!(he = hv_iternext (hv)))	496	if (!(he = hv_iternext (hv)))
450	break;	497	break;
451		498
452	encode_comma (enc);	499	encode_comma (enc);
453	}	500	}
454		501
455	encode_nl (enc);	502	encode_nl (enc); --enc->indent; encode_indent (enc);
456	}	503	}
457	}	504	}
458		505
459	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	506	encode_ch (enc, '}');
460	}	507	}
461		508
462	// encode objects, arrays and special \0=false and \1=true values.	509	// encode objects, arrays and special \0=false and \1=true values.
463	static void	510	static void
464	encode_rv (enc_t enc, SV sv)	511	encode_rv (enc_t enc, SV sv)
…		…
468	SvGETMAGIC (sv);	515	SvGETMAGIC (sv);
469	svt = SvTYPE (sv);	516	svt = SvTYPE (sv);
470		517
471	if (expect_false (SvOBJECT (sv)))	518	if (expect_false (SvOBJECT (sv)))
472	{	519	{
		520	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		521	? json_boolean_stash
		522	: gv_stashpv ("JSON::XS::Boolean", 1);
		523
473	if (SvSTASH (sv) == json_boolean_stash)	524	if (SvSTASH (sv) == stash)
474	{	525	{
475	if (SvIV (sv) == 0)	526	if (SvIV (sv))
		527	encode_str (enc, "true", 4, 0);
		528	else
476	encode_str (enc, "false", 5, 0);	529	encode_str (enc, "false", 5, 0);
477	else
478	encode_str (enc, "true", 4, 0);
479	}	530	}
480	else	531	else
481	{	532	{
482	#if 0	533	#if 0
483	if (0 && sv_derived_from (rv, "JSON::Literal"))	534	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
486	}	537	}
487	#endif	538	#endif
488	if (enc->json.flags & F_CONV_BLESSED)	539	if (enc->json.flags & F_CONV_BLESSED)
489	{	540	{
490	// we re-bless the reference to get overload and other niceties right	541	// we re-bless the reference to get overload and other niceties right
491	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	542	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
492		543
493	if (to_json)	544	if (to_json)
494	{	545	{
495	dSP;	546	dSP;
496	ENTER;	547
497	SAVETMPS;
498	PUSHMARK (SP);	548	ENTER; SAVETMPS; PUSHMARK (SP);
499	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	549	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500		550
501	// calling with G_SCALAR ensures that we always get a 1 reutrn value	551	// calling with G_SCALAR ensures that we always get a 1 return value
502	// check anyways.
503	PUTBACK;	552	PUTBACK;
504	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	553	call_sv ((SV *)GvCV (to_json), G_SCALAR);
505	SPAGAIN;	554	SPAGAIN;
506		555
		556	// catch this surprisingly common error
		557	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		558	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		559
		560	sv = POPs;
		561	PUTBACK;
		562
507	encode_sv (enc, POPs);	563	encode_sv (enc, sv);
508		564
509	FREETMPS;	565	FREETMPS; LEAVE;
510	LEAVE;
511	}	566	}
512	else if (enc->json.flags & F_ALLOW_BLESSED)	567	else if (enc->json.flags & F_ALLOW_BLESSED)
513	encode_str (enc, "null", 4, 0);	568	encode_str (enc, "null", 4, 0);
514	else	569	else
515	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	570	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
…		…
526	encode_hv (enc, (HV *)sv);	581	encode_hv (enc, (HV *)sv);
527	else if (svt == SVt_PVAV)	582	else if (svt == SVt_PVAV)
528	encode_av (enc, (AV *)sv);	583	encode_av (enc, (AV *)sv);
529	else if (svt < SVt_PVAV)	584	else if (svt < SVt_PVAV)
530	{	585	{
531	if (SvNIOK (sv) && SvIV (sv) == 0)	586	STRLEN len = 0;
		587	char *pv = svt ? SvPV (sv, len) : 0;
		588
		589	if (len == 1 && *pv == '1')
		590	encode_str (enc, "true", 4, 0);
		591	else if (len == 1 && *pv == '0')
532	encode_str (enc, "false", 5, 0);	592	encode_str (enc, "false", 5, 0);
533	else if (SvNIOK (sv) && SvIV (sv) == 1)
534	encode_str (enc, "true", 4, 0);
535	else	593	else
536	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	594	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
537	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	595	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538	}	596	}
539	else	597	else
…		…
653	U32 depth; // recursion depth	711	U32 depth; // recursion depth
654	U32 maxdepth; // recursion depth limit	712	U32 maxdepth; // recursion depth limit
655	} dec_t;	713	} dec_t;
656		714
657	inline void	715	inline void
		716	decode_comment (dec_t *dec)
		717	{
		718	// only '#'-style comments allowed a.t.m.
		719
		720	while (dec->cur && dec->cur != 0x0a && *dec->cur != 0x0d)
		721	++dec->cur;
		722	}
		723
		724	inline void
658	decode_ws (dec_t *dec)	725	decode_ws (dec_t *dec)
659	{	726	{
660	for (;;)	727	for (;;)
661	{	728	{
662	char ch = *dec->cur;	729	char ch = *dec->cur;
663		730
664	if (ch > 0x20	731	if (ch > 0x20)
		732	{
		733	if (expect_false (ch == '#'))
		734	{
		735	if (dec->json.flags & F_RELAXED)
		736	decode_comment (dec);
		737	else
		738	break;
		739	}
		740	else
		741	break;
		742	}
665	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	743	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
666	break;	744	break; // parse error, but let higher level handle it, gives better error messages
667		745
668	++dec->cur;	746	++dec->cur;
669	}	747	}
670	}	748	}
671		749
…		…
920	is_nv = 1;	998	is_nv = 1;
921	}	999	}
922		1000
923	if (!is_nv)	1001	if (!is_nv)
924	{	1002	{
		1003	int len = dec->cur - start;
		1004
925	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	1005	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
926	if (*start == '-')	1006	if (*start == '-')
927	switch (dec->cur - start)	1007	switch (len)
928	{	1008	{
929	case 2: return newSViv (-( start [1] - '0' * 1));	1009	case 2: return newSViv (-( start [1] - '0' * 1));
930	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1010	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
931	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1011	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
932	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1012	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
933	}	1013	}
934	else	1014	else
935	switch (dec->cur - start)	1015	switch (len)
936	{	1016	{
937	case 1: return newSViv ( start [0] - '0' * 1);	1017	case 1: return newSViv ( start [0] - '0' * 1);
938	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1018	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
939	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1019	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
940	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1020	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
941	}	1021	}
942		1022
943	{	1023	{
944	UV uv;	1024	UV uv;
945	int numtype = grok_number (start, dec->cur - start, &uv);	1025	int numtype = grok_number (start, len, &uv);
946	if (numtype & IS_NUMBER_IN_UV)	1026	if (numtype & IS_NUMBER_IN_UV)
947	if (numtype & IS_NUMBER_NEG)	1027	if (numtype & IS_NUMBER_NEG)
948	{	1028	{
949	if (uv < (UV)IV_MIN)	1029	if (uv < (UV)IV_MIN)
950	return newSViv (-(IV)uv);	1030	return newSViv (-(IV)uv);
951	}	1031	}
952	else	1032	else
953	return newSVuv (uv);	1033	return newSVuv (uv);
954
955	// here would likely be the place for bigint support
956	}	1034	}
957	}
958		1035
959	// if we ever support bigint or bigfloat, this is the place for bigfloat	1036	len -= *start == '-' ? 1 : 0;
		1037
		1038	// does not fit into IV or UV, try NV
		1039	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1040	#if defined (LDBL_DIG)
		1041	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1042	#endif
		1043	)
		1044	// fits into NV without loss of precision
		1045	return newSVnv (Atof (start));
		1046
		1047	// everything else fails, convert it to a string
		1048	return newSVpvn (start, dec->cur - start);
		1049	}
		1050
		1051	// loss of precision here
960	return newSVnv (Atof (start));	1052	return newSVnv (Atof (start));
961		1053
962	fail:	1054	fail:
963	return 0;	1055	return 0;
964	}	1056	}
…		…
994		1086
995	if (*dec->cur != ',')	1087	if (*dec->cur != ',')
996	ERR (", or ] expected while parsing array");	1088	ERR (", or ] expected while parsing array");
997		1089
998	++dec->cur;	1090	++dec->cur;
		1091
		1092	decode_ws (dec);
		1093
		1094	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1095	{
		1096	++dec->cur;
		1097	break;
		1098	}
999	}	1099	}
1000		1100
1001	DEC_DEC_DEPTH;	1101	DEC_DEC_DEPTH;
1002	return newRV_noinc ((SV *)av);	1102	return newRV_noinc ((SV *)av);
1003		1103
…		…
1008	}	1108	}
1009		1109
1010	static SV *	1110	static SV *
1011	decode_hv (dec_t *dec)	1111	decode_hv (dec_t *dec)
1012	{	1112	{
		1113	SV *sv;
1013	HV *hv = newHV ();	1114	HV *hv = newHV ();
1014		1115
1015	DEC_INC_DEPTH;	1116	DEC_INC_DEPTH;
1016	decode_ws (dec);	1117	decode_ws (dec);
1017		1118
1018	if (*dec->cur == '}')	1119	if (*dec->cur == '}')
1019	++dec->cur;	1120	++dec->cur;
1020	else	1121	else
1021	for (;;)	1122	for (;;)
1022	{	1123	{
1023	decode_ws (dec); EXPECT_CH ('"');	1124	EXPECT_CH ('"');
1024		1125
1025	// heuristic: assume that	1126	// heuristic: assume that
1026	// a) decode_str + hv_store_ent are abysmally slow.	1127	// a) decode_str + hv_store_ent are abysmally slow.
1027	// b) most hash keys are short, simple ascii text.	1128	// b) most hash keys are short, simple ascii text.
1028	// => try to "fast-match" such strings to avoid	1129	// => try to "fast-match" such strings to avoid
…		…
1042	if (!key)	1143	if (!key)
1043	goto fail;	1144	goto fail;
1044		1145
1045	decode_ws (dec); EXPECT_CH (':');	1146	decode_ws (dec); EXPECT_CH (':');
1046		1147
		1148	decode_ws (dec);
1047	value = decode_sv (dec);	1149	value = decode_sv (dec);
1048	if (!value)	1150	if (!value)
1049	{	1151	{
1050	SvREFCNT_dec (key);	1152	SvREFCNT_dec (key);
1051	goto fail;	1153	goto fail;
…		…
1063	int len = p - key;	1165	int len = p - key;
1064	dec->cur = p + 1;	1166	dec->cur = p + 1;
1065		1167
1066	decode_ws (dec); EXPECT_CH (':');	1168	decode_ws (dec); EXPECT_CH (':');
1067		1169
		1170	decode_ws (dec);
1068	value = decode_sv (dec);	1171	value = decode_sv (dec);
1069	if (!value)	1172	if (!value)
1070	goto fail;	1173	goto fail;
1071		1174
1072	hv_store (hv, key, len, value, 0);	1175	hv_store (hv, key, len, value, 0);
…		…
1088		1191
1089	if (*dec->cur != ',')	1192	if (*dec->cur != ',')
1090	ERR (", or } expected while parsing object/hash");	1193	ERR (", or } expected while parsing object/hash");
1091		1194
1092	++dec->cur;	1195	++dec->cur;
		1196
		1197	decode_ws (dec);
		1198
		1199	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1200	{
		1201	++dec->cur;
		1202	break;
		1203	}
1093	}	1204	}
1094		1205
1095	DEC_DEC_DEPTH;	1206	DEC_DEC_DEPTH;
1096	return newRV_noinc ((SV *)hv);	1207	sv = newRV_noinc ((SV *)hv);
		1208
		1209	// check filter callbacks
		1210	if (dec->json.flags & F_HOOK)
		1211	{
		1212	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1213	{
		1214	HE cb, he;
		1215
		1216	hv_iterinit (hv);
		1217	he = hv_iternext (hv);
		1218	hv_iterinit (hv);
		1219
		1220	// the next line creates a mortal sv each time its called.
		1221	// might want to optimise this for common cases.
		1222	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1223
		1224	if (cb)
		1225	{
		1226	dSP;
		1227	int count;
		1228
		1229	ENTER; SAVETMPS; PUSHMARK (SP);
		1230	XPUSHs (HeVAL (he));
		1231
		1232	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1233
		1234	if (count == 1)
		1235	{
		1236	sv = newSVsv (POPs);
		1237	FREETMPS; LEAVE;
		1238	return sv;
		1239	}
		1240
		1241	FREETMPS; LEAVE;
		1242	}
		1243	}
		1244
		1245	if (dec->json.cb_object)
		1246	{
		1247	dSP;
		1248	int count;
		1249
		1250	ENTER; SAVETMPS; PUSHMARK (SP);
		1251	XPUSHs (sv_2mortal (sv));
		1252
		1253	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1254
		1255	if (count == 1)
		1256	{
		1257	sv = newSVsv (POPs);
		1258	FREETMPS; LEAVE;
		1259	return sv;
		1260	}
		1261
		1262	SvREFCNT_inc (sv);
		1263	FREETMPS; LEAVE;
		1264	}
		1265	}
		1266
		1267	return sv;
1097		1268
1098	fail:	1269	fail:
1099	SvREFCNT_dec (hv);	1270	SvREFCNT_dec (hv);
1100	DEC_DEC_DEPTH;	1271	DEC_DEC_DEPTH;
1101	return 0;	1272	return 0;
1102	}	1273	}
1103		1274
1104	static SV *	1275	static SV *
1105	decode_sv (dec_t *dec)	1276	decode_sv (dec_t *dec)
1106	{	1277	{
1107	decode_ws (dec);
1108
1109	// the beauty of JSON: you need exactly one character lookahead	1278	// the beauty of JSON: you need exactly one character lookahead
1110	// to parse anything.	1279	// to parse anything.
1111	switch (*dec->cur)	1280	switch (*dec->cur)
1112	{	1281	{
1113	case '"': ++dec->cur; return decode_str (dec);	1282	case '"': ++dec->cur; return decode_str (dec);
…		…
1121		1290
1122	case 't':	1291	case 't':
1123	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1292	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1124	{	1293	{
1125	dec->cur += 4;	1294	dec->cur += 4;
		1295	#if JSON_SLOW
		1296	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1297	#endif
1126	return SvREFCNT_inc (json_true);	1298	return SvREFCNT_inc (json_true);
1127	}	1299	}
1128	else	1300	else
1129	ERR ("'true' expected");	1301	ERR ("'true' expected");
1130		1302
…		…
1132		1304
1133	case 'f':	1305	case 'f':
1134	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1306	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1135	{	1307	{
1136	dec->cur += 5;	1308	dec->cur += 5;
		1309	#if JSON_SLOW
		1310	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1311	#endif
1137	return SvREFCNT_inc (json_false);	1312	return SvREFCNT_inc (json_false);
1138	}	1313	}
1139	else	1314	else
1140	ERR ("'false' expected");	1315	ERR ("'false' expected");
1141		1316
…		…
1187	dec.end = SvEND (string);	1362	dec.end = SvEND (string);
1188	dec.err = 0;	1363	dec.err = 0;
1189	dec.depth = 0;	1364	dec.depth = 0;
1190	dec.maxdepth = DEC_DEPTH (dec.json.flags);	1365	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1191		1366
		1367	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1368	dec.json.flags \|= F_HOOK;
		1369
1192	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1370	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1371
		1372	decode_ws (&dec);
1193	sv = decode_sv (&dec);	1373	sv = decode_sv (&dec);
1194		1374
1195	if (!(offset_return \|\| !sv))	1375	if (!(offset_return \|\| !sv))
1196	{	1376	{
1197	// check for trailing garbage	1377	// check for trailing garbage
…		…
1265	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1445	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1266	}	1446	}
1267		1447
1268	PROTOTYPES: DISABLE	1448	PROTOTYPES: DISABLE
1269		1449
		1450	void CLONE (...)
		1451	CODE:
		1452	json_stash = 0;
		1453	json_boolean_stash = 0;
		1454
1270	void new (char *klass)	1455	void new (char *klass)
1271	PPCODE:	1456	PPCODE:
1272	{	1457	{
1273	SV *pv = NEWSV (0, sizeof (JSON));	1458	SV *pv = NEWSV (0, sizeof (JSON));
1274	SvPOK_only (pv);	1459	SvPOK_only (pv);
1275	Zero (SvPVX (pv), 1, sizeof (JSON));	1460	Zero (SvPVX (pv), 1, JSON);
1276	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1461	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1462	XPUSHs (sv_2mortal (sv_bless (
		1463	newRV_noinc (pv),
		1464	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		1465	)));
1278	}	1466	}
1279		1467
1280	void ascii (JSON *self, int enable = 1)	1468	void ascii (JSON *self, int enable = 1)
1281	ALIAS:	1469	ALIAS:
1282	ascii = F_ASCII	1470	ascii = F_ASCII
…		…
1289	pretty = F_PRETTY	1477	pretty = F_PRETTY
1290	allow_nonref = F_ALLOW_NONREF	1478	allow_nonref = F_ALLOW_NONREF
1291	shrink = F_SHRINK	1479	shrink = F_SHRINK
1292	allow_blessed = F_ALLOW_BLESSED	1480	allow_blessed = F_ALLOW_BLESSED
1293	convert_blessed = F_CONV_BLESSED	1481	convert_blessed = F_CONV_BLESSED
		1482	relaxed = F_RELAXED
1294	PPCODE:	1483	PPCODE:
1295	{	1484	{
1296	if (enable)	1485	if (enable)
1297	self->flags \|= ix;	1486	self->flags \|= ix;
1298	else	1487	else
1299	self->flags &= ~ix;	1488	self->flags &= ~ix;
1300		1489
1301	XPUSHs (ST (0));	1490	XPUSHs (ST (0));
1302	}	1491	}
1303		1492
		1493	void get_ascii (JSON *self)
		1494	ALIAS:
		1495	get_ascii = F_ASCII
		1496	get_latin1 = F_LATIN1
		1497	get_utf8 = F_UTF8
		1498	get_indent = F_INDENT
		1499	get_canonical = F_CANONICAL
		1500	get_space_before = F_SPACE_BEFORE
		1501	get_space_after = F_SPACE_AFTER
		1502	get_allow_nonref = F_ALLOW_NONREF
		1503	get_shrink = F_SHRINK
		1504	get_allow_blessed = F_ALLOW_BLESSED
		1505	get_convert_blessed = F_CONV_BLESSED
		1506	get_relaxed = F_RELAXED
		1507	PPCODE:
		1508	XPUSHs (boolSV (self->flags & ix));
		1509
1304	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1510	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1305	PPCODE:	1511	PPCODE:
1306	{	1512	{
1307	UV log2 = 0;	1513	UV log2 = 0;
1308		1514
…		…
1314	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1520	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1315		1521
1316	XPUSHs (ST (0));	1522	XPUSHs (ST (0));
1317	}	1523	}
1318		1524
		1525	U32 get_max_depth (JSON *self)
		1526	CODE:
		1527	RETVAL = DEC_DEPTH (self->flags);
		1528	OUTPUT:
		1529	RETVAL
		1530
1319	void max_size (JSON *self, UV max_size = 0)	1531	void max_size (JSON *self, UV max_size = 0)
1320	PPCODE:	1532	PPCODE:
1321	{	1533	{
1322	UV log2 = 0;	1534	UV log2 = 0;
1323		1535
…		…
1326		1538
1327	while ((1UL << log2) < max_size)	1539	while ((1UL << log2) < max_size)
1328	++log2;	1540	++log2;
1329		1541
1330	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1542	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1543
		1544	XPUSHs (ST (0));
		1545	}
		1546
		1547	int get_max_size (JSON *self)
		1548	CODE:
		1549	RETVAL = DEC_SIZE (self->flags);
		1550	OUTPUT:
		1551	RETVAL
		1552
		1553	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
		1554	PPCODE:
		1555	{
		1556	SvREFCNT_dec (self->cb_object);
		1557	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1558
		1559	XPUSHs (ST (0));
		1560	}
		1561
		1562	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1563	PPCODE:
		1564	{
		1565	if (!self->cb_sk_object)
		1566	self->cb_sk_object = newHV ();
		1567
		1568	if (SvOK (cb))
		1569	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1570	else
		1571	{
		1572	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1573
		1574	if (!HvKEYS (self->cb_sk_object))
		1575	{
		1576	SvREFCNT_dec (self->cb_sk_object);
		1577	self->cb_sk_object = 0;
		1578	}
		1579	}
1331		1580
1332	XPUSHs (ST (0));	1581	XPUSHs (ST (0));
1333	}	1582	}
1334		1583
1335	void encode (JSON self, SV scalar)	1584	void encode (JSON self, SV scalar)
…		…
1347	EXTEND (SP, 2);	1596	EXTEND (SP, 2);
1348	PUSHs (decode_json (jsonstr, self, &offset));	1597	PUSHs (decode_json (jsonstr, self, &offset));
1349	PUSHs (sv_2mortal (newSVuv (offset)));	1598	PUSHs (sv_2mortal (newSVuv (offset)));
1350	}	1599	}
1351		1600
		1601	void DESTROY (JSON *self)
		1602	CODE:
		1603	SvREFCNT_dec (self->cb_sk_object);
		1604	SvREFCNT_dec (self->cb_object);
		1605
1352	PROTOTYPES: ENABLE	1606	PROTOTYPES: ENABLE
1353		1607
1354	void to_json (SV *scalar)	1608	void encode_json (SV *scalar)
1355	PPCODE:	1609	PPCODE:
1356	{	1610	{
1357	JSON json = { F_DEFAULT \| F_UTF8 };	1611	JSON json = { F_DEFAULT \| F_UTF8 };
1358	XPUSHs (encode_json (scalar, &json));	1612	XPUSHs (encode_json (scalar, &json));
1359	}	1613	}
1360		1614
1361	void from_json (SV *jsonstr)	1615	void decode_json (SV *jsonstr)
1362	PPCODE:	1616	PPCODE:
1363	{	1617	{
1364	JSON json = { F_DEFAULT \| F_UTF8 };	1618	JSON json = { F_DEFAULT \| F_UTF8 };
1365	XPUSHs (decode_json (jsonstr, &json, 0));	1619	XPUSHs (decode_json (jsonstr, &json, 0));
1366	}	1620	}

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC vs. Revision 1.69 by root, Wed Dec 5 10:59:28 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC vs.
Revision 1.69 by root, Wed Dec 5 10:59:28 2007 UTC