[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.63 by root, Mon Aug 27 01:49:01 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
…		…
303	encode_ch (enc, '['); encode_nl (enc);	317	encode_ch (enc, '['); encode_nl (enc);
304	++enc->indent;	318	++enc->indent;
305		319
306	for (i = 0; i <= len; ++i)	320	for (i = 0; i <= len; ++i)
307	{	321	{
		322	SV **svp = av_fetch (av, i, 0);
		323
308	encode_indent (enc);	324	encode_indent (enc);
309	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);
310		330
311	if (i < len)	331	if (i < len)
312	encode_comma (enc);	332	encode_comma (enc);
313	}	333	}
314		334
…		…
317	--enc->indent;	337	--enc->indent;
318	encode_indent (enc); encode_ch (enc, ']');	338	encode_indent (enc); encode_ch (enc, ']');
319	}	339	}
320		340
321	static void	341	static void
322	encode_he (enc_t enc, HE he)	342	encode_hk (enc_t enc, HE he)
323	{	343	{
324	encode_ch (enc, '"');	344	encode_ch (enc, '"');
325		345
326	if (HeKLEN (he) == HEf_SVKEY)	346	if (HeKLEN (he) == HEf_SVKEY)
327	{	347	{
…		…
340	encode_ch (enc, '"');	360	encode_ch (enc, '"');
341		361
342	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	362	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
343	encode_ch (enc, ':');	363	encode_ch (enc, ':');
344	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	364	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
345	encode_sv (enc, HeVAL (he));
346	}	365	}
347		366
348	// compare hash entries, used when all keys are bytestrings	367	// compare hash entries, used when all keys are bytestrings
349	static int	368	static int
350	he_cmp_fast (const void a_, const void b_)	369	he_cmp_fast (const void a_, const void b_)
…		…
355	HE b = (HE **)b_;	374	HE b = (HE **)b_;
356		375
357	STRLEN la = HeKLEN (a);	376	STRLEN la = HeKLEN (a);
358	STRLEN lb = HeKLEN (b);	377	STRLEN lb = HeKLEN (b);
359		378
360	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	379	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
361	cmp = la - lb;	380	cmp = lb - la;
362		381
363	return cmp;	382	return cmp;
364	}	383	}
365		384
366	// 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
367	static int	386	static int
368	he_cmp_slow (const void a, const void b)	387	he_cmp_slow (const void a, const void b)
369	{	388	{
370	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	389	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
371	}	390	}
372		391
373	static void	392	static void
374	encode_hv (enc_t enc, HV hv)	393	encode_hv (enc_t enc, HV hv)
375	{	394	{
		395	HE *he;
376	int count, i;	396	int count;
377		397
378	if (enc->indent >= enc->maxdepth)	398	if (enc->indent >= enc->maxdepth)
379	croak ("data structure too deep (hit recursion limit)");	399	croak ("data structure too deep (hit recursion limit)");
380		400
381	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	401	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
382		402
383	if ((count = hv_iterinit (hv)))
384	{
385	// for canonical output we have to sort by keys first	403	// for canonical output we have to sort by keys first
386	// actually, this is mostly due to the stupid so-called	404	// actually, this is mostly due to the stupid so-called
387	// security workaround added somewhere in 5.8.x.	405	// security workaround added somewhere in 5.8.x.
388	// that randomises hash orderings	406	// that randomises hash orderings
389	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))
390	{	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	{
391	int fast = 1;	427	int i, fast = 1;
392	HE *he;
393	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	428	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
394	HE *hes = _alloca (count sizeof (HE));	429	HE *hes = _alloca (count sizeof (HE));
395	#else	430	#else
396	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
397	#endif	432	#endif
…		…
424		459
425	FREETMPS;	460	FREETMPS;
426	LEAVE;	461	LEAVE;
427	}	462	}
428		463
429	for (i = 0; i < count; ++i)	464	while (count--)
430	{	465	{
431	encode_indent (enc);	466	encode_indent (enc);
		467	he = hes [count];
432	encode_he (enc, hes [i]);	468	encode_hk (enc, he);
		469	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
433		470
434	if (i < count - 1)	471	if (count)
435	encode_comma (enc);	472	encode_comma (enc);
436	}	473	}
437
438	encode_nl (enc);
439	}	474	}
		475	}
440	else	476	else
441	{	477	{
		478	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
442	HE *he = hv_iternext (hv);	479	if ((he = hv_iternext (hv)))
443
444	for (;;)	480	for (;;)
445	{	481	{
446	encode_indent (enc);	482	encode_indent (enc);
447	encode_he (enc, he);	483	encode_hk (enc, he);
		484	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
448		485
449	if (!(he = hv_iternext (hv)))	486	if (!(he = hv_iternext (hv)))
450	break;	487	break;
451		488
452	encode_comma (enc);	489	encode_comma (enc);
453	}	490	}
		491	}
454		492
455	encode_nl (enc);	493	encode_nl (enc);
456	}
457	}
458		494
459	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	495	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
460	}	496	}
461		497
462	// encode objects, arrays and special \0=false and \1=true values.	498	// encode objects, arrays and special \0=false and \1=true values.
…		…
468	SvGETMAGIC (sv);	504	SvGETMAGIC (sv);
469	svt = SvTYPE (sv);	505	svt = SvTYPE (sv);
470		506
471	if (expect_false (SvOBJECT (sv)))	507	if (expect_false (SvOBJECT (sv)))
472	{	508	{
		509	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		510	? json_boolean_stash
		511	: gv_stashpv ("JSON::XS::Boolean", 1);
		512
473	if (SvSTASH (sv) == json_boolean_stash)	513	if (SvSTASH (sv) == stash)
474	{	514	{
475	if (SvIV (sv) == 0)	515	if (SvIV (sv))
		516	encode_str (enc, "true", 4, 0);
		517	else
476	encode_str (enc, "false", 5, 0);	518	encode_str (enc, "false", 5, 0);
477	else
478	encode_str (enc, "true", 4, 0);
479	}	519	}
480	else	520	else
481	{	521	{
482	#if 0	522	#if 0
483	if (0 && sv_derived_from (rv, "JSON::Literal"))	523	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
486	}	526	}
487	#endif	527	#endif
488	if (enc->json.flags & F_CONV_BLESSED)	528	if (enc->json.flags & F_CONV_BLESSED)
489	{	529	{
490	// 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
491	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	531	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
492		532
493	if (to_json)	533	if (to_json)
494	{	534	{
495	dSP;	535	dSP;
496	ENTER;	536
497	SAVETMPS;
498	PUSHMARK (SP);	537	ENTER; SAVETMPS; PUSHMARK (SP);
499	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	538	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500		539
501	// 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
502	// check anyways.
503	PUTBACK;	541	PUTBACK;
504	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	542	call_sv ((SV *)GvCV (to_json), G_SCALAR);
505	SPAGAIN;	543	SPAGAIN;
506		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
507	encode_sv (enc, POPs);	552	encode_sv (enc, sv);
508		553
509	FREETMPS;	554	FREETMPS; LEAVE;
510	LEAVE;
511	}	555	}
512	else if (enc->json.flags & F_ALLOW_BLESSED)	556	else if (enc->json.flags & F_ALLOW_BLESSED)
513	encode_str (enc, "null", 4, 0);	557	encode_str (enc, "null", 4, 0);
514	else	558	else
515	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",
…		…
526	encode_hv (enc, (HV *)sv);	570	encode_hv (enc, (HV *)sv);
527	else if (svt == SVt_PVAV)	571	else if (svt == SVt_PVAV)
528	encode_av (enc, (AV *)sv);	572	encode_av (enc, (AV *)sv);
529	else if (svt < SVt_PVAV)	573	else if (svt < SVt_PVAV)
530	{	574	{
531	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')
532	encode_str (enc, "false", 5, 0);	581	encode_str (enc, "false", 5, 0);
533	else if (SvNIOK (sv) && SvIV (sv) == 1)
534	encode_str (enc, "true", 4, 0);
535	else	582	else
536	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",
537	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	584	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538	}	585	}
539	else	586	else
…		…
663		710
664	if (ch > 0x20	711	if (ch > 0x20
665	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	712	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
666	break;	713	break;
667		714
		715	if (ch == '#' && dec->json.flags & F_RELAXED)
		716	++dec->cur;
		717
668	++dec->cur;	718	++dec->cur;
669	}	719	}
670	}	720	}
671		721
672	#define ERR(reason) SB dec->err = reason; goto fail; SE	722	#define ERR(reason) SB dec->err = reason; goto fail; SE
…		…
920	is_nv = 1;	970	is_nv = 1;
921	}	971	}
922		972
923	if (!is_nv)	973	if (!is_nv)
924	{	974	{
		975	int len = dec->cur - start;
		976
925	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	977	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
926	if (*start == '-')	978	if (*start == '-')
927	switch (dec->cur - start)	979	switch (len)
928	{	980	{
929	case 2: return newSViv (-( start [1] - '0' * 1));	981	case 2: return newSViv (-( start [1] - '0' * 1));
930	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	982	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));	983	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));	984	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
933	}	985	}
934	else	986	else
935	switch (dec->cur - start)	987	switch (len)
936	{	988	{
937	case 1: return newSViv ( start [0] - '0' * 1);	989	case 1: return newSViv ( start [0] - '0' * 1);
938	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	990	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);	991	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);	992	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
941	}	993	}
942		994
943	{	995	{
944	UV uv;	996	UV uv;
945	int numtype = grok_number (start, dec->cur - start, &uv);	997	int numtype = grok_number (start, len, &uv);
946	if (numtype & IS_NUMBER_IN_UV)	998	if (numtype & IS_NUMBER_IN_UV)
947	if (numtype & IS_NUMBER_NEG)	999	if (numtype & IS_NUMBER_NEG)
948	{	1000	{
949	if (uv < (UV)IV_MIN)	1001	if (uv < (UV)IV_MIN)
950	return newSViv (-(IV)uv);	1002	return newSViv (-(IV)uv);
951	}	1003	}
952	else	1004	else
953	return newSVuv (uv);	1005	return newSVuv (uv);
954
955	// here would likely be the place for bigint support
956	}	1006	}
957	}
958		1007
959	// if we ever support bigint or bigfloat, this is the place for bigfloat	1008	len -= *start == '-' ? 1 : 0;
		1009
		1010	// does not fit into IV or UV, try NV
		1011	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		1012	#if defined (LDBL_DIG)
		1013	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		1014	#endif
		1015	)
		1016	// fits into NV without loss of precision
		1017	return newSVnv (Atof (start));
		1018
		1019	// everything else fails, convert it to a string
		1020	return newSVpvn (start, dec->cur - start);
		1021	}
		1022
		1023	// loss of precision here
960	return newSVnv (Atof (start));	1024	return newSVnv (Atof (start));
961		1025
962	fail:	1026	fail:
963	return 0;	1027	return 0;
964	}	1028	}
…		…
994		1058
995	if (*dec->cur != ',')	1059	if (*dec->cur != ',')
996	ERR (", or ] expected while parsing array");	1060	ERR (", or ] expected while parsing array");
997		1061
998	++dec->cur;	1062	++dec->cur;
		1063
		1064	decode_ws (dec);
		1065
		1066	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1067	{
		1068	++dec->cur;
		1069	break;
		1070	}
999	}	1071	}
1000		1072
1001	DEC_DEC_DEPTH;	1073	DEC_DEC_DEPTH;
1002	return newRV_noinc ((SV *)av);	1074	return newRV_noinc ((SV *)av);
1003		1075
…		…
1008	}	1080	}
1009		1081
1010	static SV *	1082	static SV *
1011	decode_hv (dec_t *dec)	1083	decode_hv (dec_t *dec)
1012	{	1084	{
		1085	SV *sv;
1013	HV *hv = newHV ();	1086	HV *hv = newHV ();
1014		1087
1015	DEC_INC_DEPTH;	1088	DEC_INC_DEPTH;
1016	decode_ws (dec);	1089	decode_ws (dec);
1017		1090
1018	if (*dec->cur == '}')	1091	if (*dec->cur == '}')
1019	++dec->cur;	1092	++dec->cur;
1020	else	1093	else
1021	for (;;)	1094	for (;;)
1022	{	1095	{
1023	decode_ws (dec); EXPECT_CH ('"');	1096	EXPECT_CH ('"');
1024		1097
1025	// heuristic: assume that	1098	// heuristic: assume that
1026	// a) decode_str + hv_store_ent are abysmally slow.	1099	// a) decode_str + hv_store_ent are abysmally slow.
1027	// b) most hash keys are short, simple ascii text.	1100	// b) most hash keys are short, simple ascii text.
1028	// => try to "fast-match" such strings to avoid	1101	// => try to "fast-match" such strings to avoid
…		…
1042	if (!key)	1115	if (!key)
1043	goto fail;	1116	goto fail;
1044		1117
1045	decode_ws (dec); EXPECT_CH (':');	1118	decode_ws (dec); EXPECT_CH (':');
1046		1119
		1120	decode_ws (dec);
1047	value = decode_sv (dec);	1121	value = decode_sv (dec);
1048	if (!value)	1122	if (!value)
1049	{	1123	{
1050	SvREFCNT_dec (key);	1124	SvREFCNT_dec (key);
1051	goto fail;	1125	goto fail;
…		…
1063	int len = p - key;	1137	int len = p - key;
1064	dec->cur = p + 1;	1138	dec->cur = p + 1;
1065		1139
1066	decode_ws (dec); EXPECT_CH (':');	1140	decode_ws (dec); EXPECT_CH (':');
1067		1141
		1142	decode_ws (dec);
1068	value = decode_sv (dec);	1143	value = decode_sv (dec);
1069	if (!value)	1144	if (!value)
1070	goto fail;	1145	goto fail;
1071		1146
1072	hv_store (hv, key, len, value, 0);	1147	hv_store (hv, key, len, value, 0);
…		…
1088		1163
1089	if (*dec->cur != ',')	1164	if (*dec->cur != ',')
1090	ERR (", or } expected while parsing object/hash");	1165	ERR (", or } expected while parsing object/hash");
1091		1166
1092	++dec->cur;	1167	++dec->cur;
		1168
		1169	decode_ws (dec);
		1170
		1171	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1172	{
		1173	++dec->cur;
		1174	break;
		1175	}
1093	}	1176	}
1094		1177
1095	DEC_DEC_DEPTH;	1178	DEC_DEC_DEPTH;
1096	return newRV_noinc ((SV *)hv);	1179	sv = newRV_noinc ((SV *)hv);
		1180
		1181	// check filter callbacks
		1182	if (dec->json.flags & F_HOOK)
		1183	{
		1184	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1185	{
		1186	HE cb, he;
		1187
		1188	hv_iterinit (hv);
		1189	he = hv_iternext (hv);
		1190	hv_iterinit (hv);
		1191
		1192	// the next line creates a mortal sv each time its called.
		1193	// might want to optimise this for common cases.
		1194	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1195
		1196	if (cb)
		1197	{
		1198	dSP;
		1199	int count;
		1200
		1201	ENTER; SAVETMPS; PUSHMARK (SP);
		1202	XPUSHs (HeVAL (he));
		1203
		1204	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1205
		1206	if (count == 1)
		1207	{
		1208	sv = newSVsv (POPs);
		1209	FREETMPS; LEAVE;
		1210	return sv;
		1211	}
		1212
		1213	FREETMPS; LEAVE;
		1214	}
		1215	}
		1216
		1217	if (dec->json.cb_object)
		1218	{
		1219	dSP;
		1220	int count;
		1221
		1222	ENTER; SAVETMPS; PUSHMARK (SP);
		1223	XPUSHs (sv_2mortal (sv));
		1224
		1225	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1226
		1227	if (count == 1)
		1228	{
		1229	sv = newSVsv (POPs);
		1230	FREETMPS; LEAVE;
		1231	return sv;
		1232	}
		1233
		1234	SvREFCNT_inc (sv);
		1235	FREETMPS; LEAVE;
		1236	}
		1237	}
		1238
		1239	return sv;
1097		1240
1098	fail:	1241	fail:
1099	SvREFCNT_dec (hv);	1242	SvREFCNT_dec (hv);
1100	DEC_DEC_DEPTH;	1243	DEC_DEC_DEPTH;
1101	return 0;	1244	return 0;
1102	}	1245	}
1103		1246
1104	static SV *	1247	static SV *
1105	decode_sv (dec_t *dec)	1248	decode_sv (dec_t *dec)
1106	{	1249	{
1107	decode_ws (dec);
1108
1109	// the beauty of JSON: you need exactly one character lookahead	1250	// the beauty of JSON: you need exactly one character lookahead
1110	// to parse anything.	1251	// to parse anything.
1111	switch (*dec->cur)	1252	switch (*dec->cur)
1112	{	1253	{
1113	case '"': ++dec->cur; return decode_str (dec);	1254	case '"': ++dec->cur; return decode_str (dec);
…		…
1121		1262
1122	case 't':	1263	case 't':
1123	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1264	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1124	{	1265	{
1125	dec->cur += 4;	1266	dec->cur += 4;
		1267	#if JSON_SLOW
		1268	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1269	#endif
1126	return SvREFCNT_inc (json_true);	1270	return SvREFCNT_inc (json_true);
1127	}	1271	}
1128	else	1272	else
1129	ERR ("'true' expected");	1273	ERR ("'true' expected");
1130		1274
…		…
1132		1276
1133	case 'f':	1277	case 'f':
1134	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1278	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1135	{	1279	{
1136	dec->cur += 5;	1280	dec->cur += 5;
		1281	#if JSON_SLOW
		1282	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1283	#endif
1137	return SvREFCNT_inc (json_false);	1284	return SvREFCNT_inc (json_false);
1138	}	1285	}
1139	else	1286	else
1140	ERR ("'false' expected");	1287	ERR ("'false' expected");
1141		1288
…		…
1187	dec.end = SvEND (string);	1334	dec.end = SvEND (string);
1188	dec.err = 0;	1335	dec.err = 0;
1189	dec.depth = 0;	1336	dec.depth = 0;
1190	dec.maxdepth = DEC_DEPTH (dec.json.flags);	1337	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1191		1338
		1339	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1340	dec.json.flags \|= F_HOOK;
		1341
1192	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1342	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1343
		1344	decode_ws (&dec);
1193	sv = decode_sv (&dec);	1345	sv = decode_sv (&dec);
1194		1346
1195	if (!(offset_return \|\| !sv))	1347	if (!(offset_return \|\| !sv))
1196	{	1348	{
1197	// check for trailing garbage	1349	// check for trailing garbage
…		…
1265	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1417	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1266	}	1418	}
1267		1419
1268	PROTOTYPES: DISABLE	1420	PROTOTYPES: DISABLE
1269		1421
		1422	void CLONE (...)
		1423	CODE:
		1424	json_stash = 0;
		1425	json_boolean_stash = 0;
		1426
1270	void new (char *klass)	1427	void new (char *klass)
1271	PPCODE:	1428	PPCODE:
1272	{	1429	{
1273	SV *pv = NEWSV (0, sizeof (JSON));	1430	SV *pv = NEWSV (0, sizeof (JSON));
1274	SvPOK_only (pv);	1431	SvPOK_only (pv);
1275	Zero (SvPVX (pv), 1, sizeof (JSON));	1432	Zero (SvPVX (pv), 1, JSON);
1276	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1433	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1434	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1278	}	1435	}
1279		1436
1280	void ascii (JSON *self, int enable = 1)	1437	void ascii (JSON *self, int enable = 1)
1281	ALIAS:	1438	ALIAS:
1282	ascii = F_ASCII	1439	ascii = F_ASCII
…		…
1289	pretty = F_PRETTY	1446	pretty = F_PRETTY
1290	allow_nonref = F_ALLOW_NONREF	1447	allow_nonref = F_ALLOW_NONREF
1291	shrink = F_SHRINK	1448	shrink = F_SHRINK
1292	allow_blessed = F_ALLOW_BLESSED	1449	allow_blessed = F_ALLOW_BLESSED
1293	convert_blessed = F_CONV_BLESSED	1450	convert_blessed = F_CONV_BLESSED
		1451	relaxed = F_RELAXED
1294	PPCODE:	1452	PPCODE:
1295	{	1453	{
1296	if (enable)	1454	if (enable)
1297	self->flags \|= ix;	1455	self->flags \|= ix;
1298	else	1456	else
…		…
1330	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1488	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1331		1489
1332	XPUSHs (ST (0));	1490	XPUSHs (ST (0));
1333	}	1491	}
1334		1492
		1493	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
		1494	PPCODE:
		1495	{
		1496	SvREFCNT_dec (self->cb_object);
		1497	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1498
		1499	XPUSHs (ST (0));
		1500	}
		1501
		1502	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1503	PPCODE:
		1504	{
		1505	if (!self->cb_sk_object)
		1506	self->cb_sk_object = newHV ();
		1507
		1508	if (SvOK (cb))
		1509	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1510	else
		1511	{
		1512	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1513
		1514	if (!HvKEYS (self->cb_sk_object))
		1515	{
		1516	SvREFCNT_dec (self->cb_sk_object);
		1517	self->cb_sk_object = 0;
		1518	}
		1519	}
		1520
		1521	XPUSHs (ST (0));
		1522	}
		1523
1335	void encode (JSON self, SV scalar)	1524	void encode (JSON self, SV scalar)
1336	PPCODE:	1525	PPCODE:
1337	XPUSHs (encode_json (scalar, self));	1526	XPUSHs (encode_json (scalar, self));
1338		1527
1339	void decode (JSON self, SV jsonstr)	1528	void decode (JSON self, SV jsonstr)
…		…
1347	EXTEND (SP, 2);	1536	EXTEND (SP, 2);
1348	PUSHs (decode_json (jsonstr, self, &offset));	1537	PUSHs (decode_json (jsonstr, self, &offset));
1349	PUSHs (sv_2mortal (newSVuv (offset)));	1538	PUSHs (sv_2mortal (newSVuv (offset)));
1350	}	1539	}
1351		1540
		1541	void DESTROY (JSON *self)
		1542	CODE:
		1543	SvREFCNT_dec (self->cb_sk_object);
		1544	SvREFCNT_dec (self->cb_object);
		1545
1352	PROTOTYPES: ENABLE	1546	PROTOTYPES: ENABLE
1353		1547
1354	void to_json (SV *scalar)	1548	void to_json (SV *scalar)
1355	PPCODE:	1549	PPCODE:
1356	{	1550	{

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.63 by root, Mon Aug 27 01:49:01 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.63 by root, Mon Aug 27 01:49:01 2007 UTC