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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.49 by root, Sun Jul 1 23:40:07 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
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	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
35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	38	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
…		…
57	#endif	60	#endif
58		61
59	#define expect_false(expr) expect ((expr) != 0, 0)	62	#define expect_false(expr) expect ((expr) != 0, 0)
60	#define expect_true(expr) expect ((expr) != 0, 1)	63	#define expect_true(expr) expect ((expr) != 0, 1)
61		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
62	static HV json_stash, json_boolean_stash; // JSON::XS::	73	static HV json_stash, json_boolean_stash; // JSON::XS::
63	static SV json_true, json_false;	74	static SV json_true, json_false;
64		75
65	typedef struct {	76	typedef struct {
66	U32 flags;	77	U32 flags;
67	SV cb_object, cb_sk_object;	78	SV *cb_object;
		79	HV *cb_sk_object;
68	} JSON;	80	} JSON;
69		81
70	/////////////////////////////////////////////////////////////////////////////	82	/////////////////////////////////////////////////////////////////////////////
71	// utility functions	83	// utility functions
72		84
…		…
305	encode_ch (enc, '['); encode_nl (enc);	317	encode_ch (enc, '['); encode_nl (enc);
306	++enc->indent;	318	++enc->indent;
307		319
308	for (i = 0; i <= len; ++i)	320	for (i = 0; i <= len; ++i)
309	{	321	{
		322	SV **svp = av_fetch (av, i, 0);
		323
310	encode_indent (enc);	324	encode_indent (enc);
311	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);
312		330
313	if (i < len)	331	if (i < len)
314	encode_comma (enc);	332	encode_comma (enc);
315	}	333	}
316		334
…		…
319	--enc->indent;	337	--enc->indent;
320	encode_indent (enc); encode_ch (enc, ']');	338	encode_indent (enc); encode_ch (enc, ']');
321	}	339	}
322		340
323	static void	341	static void
324	encode_he (enc_t enc, HE he)	342	encode_hk (enc_t enc, HE he)
325	{	343	{
326	encode_ch (enc, '"');	344	encode_ch (enc, '"');
327		345
328	if (HeKLEN (he) == HEf_SVKEY)	346	if (HeKLEN (he) == HEf_SVKEY)
329	{	347	{
…		…
342	encode_ch (enc, '"');	360	encode_ch (enc, '"');
343		361
344	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);	362	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345	encode_ch (enc, ':');	363	encode_ch (enc, ':');
346	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);	364	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347	encode_sv (enc, HeVAL (he));
348	}	365	}
349		366
350	// compare hash entries, used when all keys are bytestrings	367	// compare hash entries, used when all keys are bytestrings
351	static int	368	static int
352	he_cmp_fast (const void a_, const void b_)	369	he_cmp_fast (const void a_, const void b_)
…		…
357	HE b = (HE **)b_;	374	HE b = (HE **)b_;
358		375
359	STRLEN la = HeKLEN (a);	376	STRLEN la = HeKLEN (a);
360	STRLEN lb = HeKLEN (b);	377	STRLEN lb = HeKLEN (b);
361		378
362	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	379	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
363	cmp = la - lb;	380	cmp = lb - la;
364		381
365	return cmp;	382	return cmp;
366	}	383	}
367		384
368	// 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
369	static int	386	static int
370	he_cmp_slow (const void a, const void b)	387	he_cmp_slow (const void a, const void b)
371	{	388	{
372	return sv_cmp (HeSVKEY_force ((HE )a), HeSVKEY_force ((HE **)b));	389	return sv_cmp (HeSVKEY_force ((HE )b), HeSVKEY_force ((HE **)a));
373	}	390	}
374		391
375	static void	392	static void
376	encode_hv (enc_t enc, HV hv)	393	encode_hv (enc_t enc, HV hv)
377	{	394	{
		395	HE *he;
378	int count, i;	396	int count;
379		397
380	if (enc->indent >= enc->maxdepth)	398	if (enc->indent >= enc->maxdepth)
381	croak ("data structure too deep (hit recursion limit)");	399	croak ("data structure too deep (hit recursion limit)");
382		400
383	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	401	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
384		402
385	if ((count = hv_iterinit (hv)))
386	{
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->json.flags & F_CANONICAL)	407	if (enc->json.flags & F_CANONICAL)
		408	{
		409	int count = hv_iterinit (hv);
		410
		411	if (SvMAGICAL (hv))
392	{	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	{
393	int fast = 1;	427	int i, fast = 1;
394	HE *he;
395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	428	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
396	HE *hes = _alloca (count sizeof (HE));	429	HE *hes = _alloca (count sizeof (HE));
397	#else	430	#else
398	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
399	#endif	432	#endif
…		…
426		459
427	FREETMPS;	460	FREETMPS;
428	LEAVE;	461	LEAVE;
429	}	462	}
430		463
431	for (i = 0; i < count; ++i)	464	while (count--)
432	{	465	{
433	encode_indent (enc);	466	encode_indent (enc);
		467	he = hes [count];
434	encode_he (enc, hes [i]);	468	encode_hk (enc, he);
		469	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
435		470
436	if (i < count - 1)	471	if (count)
437	encode_comma (enc);	472	encode_comma (enc);
438	}	473	}
439
440	encode_nl (enc);
441	}	474	}
		475	}
442	else	476	else
443	{	477	{
		478	if (hv_iterinit (hv) \|\| SvMAGICAL (hv))
444	HE *he = hv_iternext (hv);	479	if ((he = hv_iternext (hv)))
445
446	for (;;)	480	for (;;)
447	{	481	{
448	encode_indent (enc);	482	encode_indent (enc);
449	encode_he (enc, he);	483	encode_hk (enc, he);
		484	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
450		485
451	if (!(he = hv_iternext (hv)))	486	if (!(he = hv_iternext (hv)))
452	break;	487	break;
453		488
454	encode_comma (enc);	489	encode_comma (enc);
455	}	490	}
		491	}
456		492
457	encode_nl (enc);	493	encode_nl (enc);
458	}
459	}
460		494
461	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	495	--enc->indent; encode_indent (enc); encode_ch (enc, '}');
462	}	496	}
463		497
464	// encode objects, arrays and special \0=false and \1=true values.	498	// encode objects, arrays and special \0=false and \1=true values.
…		…
470	SvGETMAGIC (sv);	504	SvGETMAGIC (sv);
471	svt = SvTYPE (sv);	505	svt = SvTYPE (sv);
472		506
473	if (expect_false (SvOBJECT (sv)))	507	if (expect_false (SvOBJECT (sv)))
474	{	508	{
		509	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		510	? json_boolean_stash
		511	: gv_stashpv ("JSON::XS::Boolean", 1);
		512
475	if (SvSTASH (sv) == json_boolean_stash)	513	if (SvSTASH (sv) == stash)
476	{	514	{
477	if (SvIV (sv) == 0)	515	if (SvIV (sv))
		516	encode_str (enc, "true", 4, 0);
		517	else
478	encode_str (enc, "false", 5, 0);	518	encode_str (enc, "false", 5, 0);
479	else
480	encode_str (enc, "true", 4, 0);
481	}	519	}
482	else	520	else
483	{	521	{
484	#if 0	522	#if 0
485	if (0 && sv_derived_from (rv, "JSON::Literal"))	523	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
488	}	526	}
489	#endif	527	#endif
490	if (enc->json.flags & F_CONV_BLESSED)	528	if (enc->json.flags & F_CONV_BLESSED)
491	{	529	{
492	// 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
493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	531	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494		532
495	if (to_json)	533	if (to_json)
496	{	534	{
		535	dSP;
		536
497	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	537	ENTER; SAVETMPS; PUSHMARK (SP);
498	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	538	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499		539
500	// 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
501	// check anyways.
502	PUTBACK;	541	PUTBACK;
503	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	542	call_sv ((SV *)GvCV (to_json), G_SCALAR);
504	SPAGAIN;	543	SPAGAIN;
505		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
506	encode_sv (enc, POPs);	552	encode_sv (enc, sv);
507		553
508	FREETMPS; LEAVE;	554	FREETMPS; LEAVE;
509	}	555	}
510	else if (enc->json.flags & F_ALLOW_BLESSED)	556	else if (enc->json.flags & F_ALLOW_BLESSED)
511	encode_str (enc, "null", 4, 0);	557	encode_str (enc, "null", 4, 0);
…		…
524	encode_hv (enc, (HV *)sv);	570	encode_hv (enc, (HV *)sv);
525	else if (svt == SVt_PVAV)	571	else if (svt == SVt_PVAV)
526	encode_av (enc, (AV *)sv);	572	encode_av (enc, (AV *)sv);
527	else if (svt < SVt_PVAV)	573	else if (svt < SVt_PVAV)
528	{	574	{
529	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')
530	encode_str (enc, "false", 5, 0);	581	encode_str (enc, "false", 5, 0);
531	else if (SvNIOK (sv) && SvIV (sv) == 1)
532	encode_str (enc, "true", 4, 0);
533	else	582	else
534	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",
535	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	584	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536	}	585	}
537	else	586	else
…		…
661		710
662	if (ch > 0x20	711	if (ch > 0x20
663	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	712	\|\| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
664	break;	713	break;
665		714
		715	if (ch == '#' && dec->json.flags & F_RELAXED)
		716	++dec->cur;
		717
666	++dec->cur;	718	++dec->cur;
667	}	719	}
668	}	720	}
669		721
670	#define ERR(reason) SB dec->err = reason; goto fail; SE	722	#define ERR(reason) SB dec->err = reason; goto fail; SE
…		…
918	is_nv = 1;	970	is_nv = 1;
919	}	971	}
920		972
921	if (!is_nv)	973	if (!is_nv)
922	{	974	{
		975	int len = dec->cur - start;
		976
923	// 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
924	if (*start == '-')	978	if (*start == '-')
925	switch (dec->cur - start)	979	switch (len)
926	{	980	{
927	case 2: return newSViv (-( start [1] - '0' * 1));	981	case 2: return newSViv (-( start [1] - '0' * 1));
928	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	982	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
929	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));
930	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));
931	}	985	}
932	else	986	else
933	switch (dec->cur - start)	987	switch (len)
934	{	988	{
935	case 1: return newSViv ( start [0] - '0' * 1);	989	case 1: return newSViv ( start [0] - '0' * 1);
936	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	990	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
937	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);
938	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);
939	}	993	}
940		994
941	{	995	{
942	UV uv;	996	UV uv;
943	int numtype = grok_number (start, dec->cur - start, &uv);	997	int numtype = grok_number (start, len, &uv);
944	if (numtype & IS_NUMBER_IN_UV)	998	if (numtype & IS_NUMBER_IN_UV)
945	if (numtype & IS_NUMBER_NEG)	999	if (numtype & IS_NUMBER_NEG)
946	{	1000	{
947	if (uv < (UV)IV_MIN)	1001	if (uv < (UV)IV_MIN)
948	return newSViv (-(IV)uv);	1002	return newSViv (-(IV)uv);
949	}	1003	}
950	else	1004	else
951	return newSVuv (uv);	1005	return newSVuv (uv);
952
953	// here would likely be the place for bigint support
954	}	1006	}
955	}
956		1007
957	// 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
958	return newSVnv (Atof (start));	1024	return newSVnv (Atof (start));
959		1025
960	fail:	1026	fail:
961	return 0;	1027	return 0;
962	}	1028	}
…		…
992		1058
993	if (*dec->cur != ',')	1059	if (*dec->cur != ',')
994	ERR (", or ] expected while parsing array");	1060	ERR (", or ] expected while parsing array");
995		1061
996	++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	}
997	}	1071	}
998		1072
999	DEC_DEC_DEPTH;	1073	DEC_DEC_DEPTH;
1000	return newRV_noinc ((SV *)av);	1074	return newRV_noinc ((SV *)av);
1001		1075
…		…
1017	if (*dec->cur == '}')	1091	if (*dec->cur == '}')
1018	++dec->cur;	1092	++dec->cur;
1019	else	1093	else
1020	for (;;)	1094	for (;;)
1021	{	1095	{
1022	decode_ws (dec); EXPECT_CH ('"');	1096	EXPECT_CH ('"');
1023		1097
1024	// heuristic: assume that	1098	// heuristic: assume that
1025	// a) decode_str + hv_store_ent are abysmally slow.	1099	// a) decode_str + hv_store_ent are abysmally slow.
1026	// b) most hash keys are short, simple ascii text.	1100	// b) most hash keys are short, simple ascii text.
1027	// => try to "fast-match" such strings to avoid	1101	// => try to "fast-match" such strings to avoid
…		…
1041	if (!key)	1115	if (!key)
1042	goto fail;	1116	goto fail;
1043		1117
1044	decode_ws (dec); EXPECT_CH (':');	1118	decode_ws (dec); EXPECT_CH (':');
1045		1119
		1120	decode_ws (dec);
1046	value = decode_sv (dec);	1121	value = decode_sv (dec);
1047	if (!value)	1122	if (!value)
1048	{	1123	{
1049	SvREFCNT_dec (key);	1124	SvREFCNT_dec (key);
1050	goto fail;	1125	goto fail;
…		…
1062	int len = p - key;	1137	int len = p - key;
1063	dec->cur = p + 1;	1138	dec->cur = p + 1;
1064		1139
1065	decode_ws (dec); EXPECT_CH (':');	1140	decode_ws (dec); EXPECT_CH (':');
1066		1141
		1142	decode_ws (dec);
1067	value = decode_sv (dec);	1143	value = decode_sv (dec);
1068	if (!value)	1144	if (!value)
1069	goto fail;	1145	goto fail;
1070		1146
1071	hv_store (hv, key, len, value, 0);	1147	hv_store (hv, key, len, value, 0);
…		…
1087		1163
1088	if (*dec->cur != ',')	1164	if (*dec->cur != ',')
1089	ERR (", or } expected while parsing object/hash");	1165	ERR (", or } expected while parsing object/hash");
1090		1166
1091	++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	}
1092	}	1176	}
1093		1177
1094	DEC_DEC_DEPTH;	1178	DEC_DEC_DEPTH;
1095	sv = newRV_noinc ((SV *)hv);	1179	sv = newRV_noinc ((SV *)hv);
1096		1180
1097	// check filter callbacks	1181	// check filter callbacks
1098	if (dec->json.flags & F_HOOK)	1182	if (dec->json.flags & F_HOOK)
1099	{	1183	{
1100	ENTER; SAVETMPS;	1184	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1101
1102	if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103	{	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;
1104	int count;	1199	int count;
1105		1200
1106	dSP; PUSHMARK (SP);	1201	ENTER; SAVETMPS; PUSHMARK (SP);
1107	XPUSHs (sv_2mortal (sv));	1202	XPUSHs (HeVAL (he));
1108		1203
1109	PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;	1204	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1110		1205
1111	if (count == 1)	1206	if (count == 1)
		1207	{
1112	sv = newSVsv (POPs);	1208	sv = newSVsv (POPs);
1113	else	1209	FREETMPS; LEAVE;
1114	SvREFCNT_inc (sv);	1210	return sv;
		1211	}
		1212
		1213	FREETMPS; LEAVE;
		1214	}
1115	}	1215	}
1116		1216
1117	if (dec->json.cb_object)	1217	if (dec->json.cb_object)
1118	{	1218	{
		1219	dSP;
1119	int count;	1220	int count;
1120		1221
1121	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	1222	ENTER; SAVETMPS; PUSHMARK (SP);
1122	XPUSHs (sv_2mortal (sv));	1223	XPUSHs (sv_2mortal (sv));
1123		1224
1124	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1225	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125		1226
1126	if (count == 1)	1227	if (count == 1)
		1228	{
1127	sv = newSVsv (POPs);	1229	sv = newSVsv (POPs);
1128	else	1230	FREETMPS; LEAVE;
		1231	return sv;
		1232	}
		1233
1129	SvREFCNT_inc (sv);	1234	SvREFCNT_inc (sv);
		1235	FREETMPS; LEAVE;
1130	}	1236	}
1131
1132	FREETMPS; LEAVE;
1133	}	1237	}
1134		1238
1135	return newRV_noinc ((SV *)hv);	1239	return sv;
1136		1240
1137	fail:	1241	fail:
1138	SvREFCNT_dec (hv);	1242	SvREFCNT_dec (hv);
1139	DEC_DEC_DEPTH;	1243	DEC_DEC_DEPTH;
1140	return 0;	1244	return 0;
1141	}	1245	}
1142		1246
1143	static SV *	1247	static SV *
1144	decode_sv (dec_t *dec)	1248	decode_sv (dec_t *dec)
1145	{	1249	{
1146	decode_ws (dec);
1147
1148	// the beauty of JSON: you need exactly one character lookahead	1250	// the beauty of JSON: you need exactly one character lookahead
1149	// to parse anything.	1251	// to parse anything.
1150	switch (*dec->cur)	1252	switch (*dec->cur)
1151	{	1253	{
1152	case '"': ++dec->cur; return decode_str (dec);	1254	case '"': ++dec->cur; return decode_str (dec);
…		…
1160		1262
1161	case 't':	1263	case 't':
1162	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1264	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1163	{	1265	{
1164	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
1165	return SvREFCNT_inc (json_true);	1270	return SvREFCNT_inc (json_true);
1166	}	1271	}
1167	else	1272	else
1168	ERR ("'true' expected");	1273	ERR ("'true' expected");
1169		1274
…		…
1171		1276
1172	case 'f':	1277	case 'f':
1173	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1278	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1174	{	1279	{
1175	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
1176	return SvREFCNT_inc (json_false);	1284	return SvREFCNT_inc (json_false);
1177	}	1285	}
1178	else	1286	else
1179	ERR ("'false' expected");	1287	ERR ("'false' expected");
1180		1288
…		…
1230		1338
1231	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1339	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1232	dec.json.flags \|= F_HOOK;	1340	dec.json.flags \|= F_HOOK;
1233		1341
1234	*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);
1235	sv = decode_sv (&dec);	1345	sv = decode_sv (&dec);
1236		1346
1237	if (!(offset_return \|\| !sv))	1347	if (!(offset_return \|\| !sv))
1238	{	1348	{
1239	// check for trailing garbage	1349	// check for trailing garbage
…		…
1307	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);
1308	}	1418	}
1309		1419
1310	PROTOTYPES: DISABLE	1420	PROTOTYPES: DISABLE
1311		1421
		1422	void CLONE (...)
		1423	CODE:
		1424	json_stash = 0;
		1425	json_boolean_stash = 0;
		1426
1312	void new (char *klass)	1427	void new (char *klass)
1313	PPCODE:	1428	PPCODE:
1314	{	1429	{
1315	SV *pv = NEWSV (0, sizeof (JSON));	1430	SV *pv = NEWSV (0, sizeof (JSON));
1316	SvPOK_only (pv);	1431	SvPOK_only (pv);
1317	Zero (SvPVX (pv), 1, JSON);	1432	Zero (SvPVX (pv), 1, JSON);
1318	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1433	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1319	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1434	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1320	}	1435	}
1321		1436
1322	void ascii (JSON *self, int enable = 1)	1437	void ascii (JSON *self, int enable = 1)
1323	ALIAS:	1438	ALIAS:
1324	ascii = F_ASCII	1439	ascii = F_ASCII
…		…
1331	pretty = F_PRETTY	1446	pretty = F_PRETTY
1332	allow_nonref = F_ALLOW_NONREF	1447	allow_nonref = F_ALLOW_NONREF
1333	shrink = F_SHRINK	1448	shrink = F_SHRINK
1334	allow_blessed = F_ALLOW_BLESSED	1449	allow_blessed = F_ALLOW_BLESSED
1335	convert_blessed = F_CONV_BLESSED	1450	convert_blessed = F_CONV_BLESSED
		1451	relaxed = F_RELAXED
1336	PPCODE:	1452	PPCODE:
1337	{	1453	{
1338	if (enable)	1454	if (enable)
1339	self->flags \|= ix;	1455	self->flags \|= ix;
1340	else	1456	else
…		…
1372	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1488	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1373		1489
1374	XPUSHs (ST (0));	1490	XPUSHs (ST (0));
1375	}	1491	}
1376		1492
1377	void filter_json_objects (JSON self, SV cb = &PL_sv_undef)	1493	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1378	ALIAS:
1379	filter_sk_json_objects = 1
1380	PPCODE:	1494	PPCODE:
1381	{	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
1382	if (!SvOK (cb))	1508	if (SvOK (cb))
1383	cb = 0;	1509	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1384		1510	else
1385	switch (ix)
1386	{	1511	{
1387	case 0: self->cb_object = cb; break;	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);
1388	case 1: self->cb_sk_object = cb; break;	1517	self->cb_sk_object = 0;
		1518	}
1389	}	1519	}
1390		1520
1391	XPUSHs (ST (0));	1521	XPUSHs (ST (0));
1392	}	1522	}
1393		1523
…		…
1406	EXTEND (SP, 2);	1536	EXTEND (SP, 2);
1407	PUSHs (decode_json (jsonstr, self, &offset));	1537	PUSHs (decode_json (jsonstr, self, &offset));
1408	PUSHs (sv_2mortal (newSVuv (offset)));	1538	PUSHs (sv_2mortal (newSVuv (offset)));
1409	}	1539	}
1410		1540
		1541	void DESTROY (JSON *self)
		1542	CODE:
		1543	SvREFCNT_dec (self->cb_sk_object);
		1544	SvREFCNT_dec (self->cb_object);
		1545
1411	PROTOTYPES: ENABLE	1546	PROTOTYPES: ENABLE
1412		1547
1413	void to_json (SV *scalar)	1548	void to_json (SV *scalar)
1414	PPCODE:	1549	PPCODE:
1415	{	1550	{

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.49 by root, Sun Jul 1 23:40:07 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.49 by root, Sun Jul 1 23:40:07 2007 UTC vs.
Revision 1.63 by root, Mon Aug 27 01:49:01 2007 UTC