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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC vs.
Revision 1.54 by root, Tue Jul 10 16:22:31 2007 UTC

…		…
9		9
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	11	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	12	#endif
13		13
		14	// some old perls do not have this, try to make it work, no
		15	// guarentees, though. if it breaks, you get to keep the pieces.
		16	#ifndef UTF8_MAXBYTES
		17	# define UTF8_MAXBYTES 13
		18	#endif
		19
14	#define F_ASCII 0x00000001UL	20	#define F_ASCII 0x00000001UL
15	#define F_LATIN1 0x00000002UL	21	#define F_LATIN1 0x00000002UL
16	#define F_UTF8 0x00000004UL	22	#define F_UTF8 0x00000004UL
17	#define F_INDENT 0x00000008UL	23	#define F_INDENT 0x00000008UL
18	#define F_CANONICAL 0x00000010UL	24	#define F_CANONICAL 0x00000010UL
19	#define F_SPACE_BEFORE 0x00000020UL	25	#define F_SPACE_BEFORE 0x00000020UL
20	#define F_SPACE_AFTER 0x00000040UL	26	#define F_SPACE_AFTER 0x00000040UL
21	#define F_ALLOW_NONREF 0x00000100UL	27	#define F_ALLOW_NONREF 0x00000100UL
22	#define F_SHRINK 0x00000200UL	28	#define F_SHRINK 0x00000200UL
		29	#define F_ALLOW_BLESSED 0x00000400UL
		30	#define F_CONV_BLESSED 0x00000800UL
23	#define F_MAXDEPTH 0xf8000000UL	31	#define F_MAXDEPTH 0xf8000000UL
24	#define S_MAXDEPTH 27	32	#define S_MAXDEPTH 27
		33	#define F_MAXSIZE 0x01f00000UL
		34	#define S_MAXSIZE 20
		35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
25		36
26	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	37	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27		38	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28	// F_SELFCONVERT? <=> to_json/toJson
29	// F_BLESSED? <=> { $__class__$ => }
30		39
31	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
32	#define F_DEFAULT (9UL << S_MAXDEPTH)	41	#define F_DEFAULT (9UL << S_MAXDEPTH)
33		42
34	#define INIT_SIZE 32 // initial scalar size to be allocated	43	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
48	#endif	57	#endif
49		58
50	#define expect_false(expr) expect ((expr) != 0, 0)	59	#define expect_false(expr) expect ((expr) != 0, 0)
51	#define expect_true(expr) expect ((expr) != 0, 1)	60	#define expect_true(expr) expect ((expr) != 0, 1)
52		61
53	static HV *json_stash; // JSON::XS::	62	static HV json_stash, json_boolean_stash; // JSON::XS::
		63	static SV json_true, json_false;
		64
		65	typedef struct {
		66	U32 flags;
		67	SV *cb_object;
		68	HV *cb_sk_object;
		69	} JSON;
54		70
55	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
56	// utility functions	72	// utility functions
57		73
58	static UV *	74	inline void
59	SvJSON (SV *sv)
60	{
61	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62	croak ("object is not of type JSON::XS");
63
64	return &SvUVX (SvRV (sv));
65	}
66
67	static void
68	shrink (SV *sv)	75	shrink (SV *sv)
69	{	76	{
70	sv_utf8_downgrade (sv, 1);	77	sv_utf8_downgrade (sv, 1);
71	if (SvLEN (sv) > SvCUR (sv) + 1)	78	if (SvLEN (sv) > SvCUR (sv) + 1)
72	{	79	{
…		…
107	typedef struct	114	typedef struct
108	{	115	{
109	char *cur; // SvPVX (sv) + current output position	116	char *cur; // SvPVX (sv) + current output position
110	char *end; // SvEND (sv)	117	char *end; // SvEND (sv)
111	SV *sv; // result scalar	118	SV *sv; // result scalar
112	U32 flags; // F_*	119	JSON json;
113	U32 indent; // indentation level	120	U32 indent; // indentation level
114	U32 maxdepth; // max. indentation/recursion level	121	U32 maxdepth; // max. indentation/recursion level
115	} enc_t;	122	} enc_t;
116		123
117	inline void	124	inline void
…		…
191	}	198	}
192		199
193	if (uch > 0x10FFFFUL)	200	if (uch > 0x10FFFFUL)
194	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	201	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
195		202
196	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	203	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
197	{	204	{
198	if (uch > 0xFFFFUL)	205	if (uch > 0xFFFFUL)
199	{	206	{
200	need (enc, len += 11);	207	need (enc, len += 11);
201	sprintf (enc->cur, "\\u%04x\\u%04x",	208	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
215	*enc->cur++ = hexdigit [(uch >> 0) & 15];	222	*enc->cur++ = hexdigit [(uch >> 0) & 15];
216	}	223	}
217		224
218	str += clen;	225	str += clen;
219	}	226	}
220	else if (enc->flags & F_LATIN1)	227	else if (enc->json.flags & F_LATIN1)
221	{	228	{
222	*enc->cur++ = uch;	229	*enc->cur++ = uch;
223	str += clen;	230	str += clen;
224	}	231	}
225	else if (is_utf8)	232	else if (is_utf8)
…		…
246	}	253	}
247		254
248	inline void	255	inline void
249	encode_indent (enc_t *enc)	256	encode_indent (enc_t *enc)
250	{	257	{
251	if (enc->flags & F_INDENT)	258	if (enc->json.flags & F_INDENT)
252	{	259	{
253	int spaces = enc->indent * INDENT_STEP;	260	int spaces = enc->indent * INDENT_STEP;
254		261
255	need (enc, spaces);	262	need (enc, spaces);
256	memset (enc->cur, ' ', spaces);	263	memset (enc->cur, ' ', spaces);
…		…
266	}	273	}
267		274
268	inline void	275	inline void
269	encode_nl (enc_t *enc)	276	encode_nl (enc_t *enc)
270	{	277	{
271	if (enc->flags & F_INDENT)	278	if (enc->json.flags & F_INDENT)
272	{	279	{
273	need (enc, 1);	280	need (enc, 1);
274	encode_ch (enc, '\n');	281	encode_ch (enc, '\n');
275	}	282	}
276	}	283	}
…		…
278	inline void	285	inline void
279	encode_comma (enc_t *enc)	286	encode_comma (enc_t *enc)
280	{	287	{
281	encode_ch (enc, ',');	288	encode_ch (enc, ',');
282		289
283	if (enc->flags & F_INDENT)	290	if (enc->json.flags & F_INDENT)
284	encode_nl (enc);	291	encode_nl (enc);
285	else if (enc->flags & F_SPACE_AFTER)	292	else if (enc->json.flags & F_SPACE_AFTER)
286	encode_space (enc);	293	encode_space (enc);
287	}	294	}
288		295
289	static void encode_sv (enc_t enc, SV sv);	296	static void encode_sv (enc_t enc, SV sv);
290		297
…		…
333	else	340	else
334	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
335		342
336	encode_ch (enc, '"');	343	encode_ch (enc, '"');
337		344
338	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	345	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
339	encode_ch (enc, ':');	346	encode_ch (enc, ':');
340	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	347	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
341	encode_sv (enc, HeVAL (he));	348	encode_sv (enc, HeVAL (he));
342	}	349	}
343		350
344	// compare hash entries, used when all keys are bytestrings	351	// compare hash entries, used when all keys are bytestrings
345	static int	352	static int
…		…
380	{	387	{
381	// for canonical output we have to sort by keys first	388	// for canonical output we have to sort by keys first
382	// actually, this is mostly due to the stupid so-called	389	// actually, this is mostly due to the stupid so-called
383	// security workaround added somewhere in 5.8.x.	390	// security workaround added somewhere in 5.8.x.
384	// that randomises hash orderings	391	// that randomises hash orderings
385	if (enc->flags & F_CANONICAL)	392	if (enc->json.flags & F_CANONICAL)
386	{	393	{
387	int fast = 1;	394	int fast = 1;
388	HE *he;	395	HE *he;
389	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
390	HE *hes = _alloca (count sizeof (HE));	397	HE *hes = _alloca (count sizeof (HE));
…		…
462	svtype svt;	469	svtype svt;
463		470
464	SvGETMAGIC (sv);	471	SvGETMAGIC (sv);
465	svt = SvTYPE (sv);	472	svt = SvTYPE (sv);
466		473
		474	if (expect_false (SvOBJECT (sv)))
		475	{
		476	if (SvSTASH (sv) == json_boolean_stash)
		477	{
		478	if (SvIV (sv))
		479	encode_str (enc, "true", 4, 0);
		480	else
		481	encode_str (enc, "false", 5, 0);
		482	}
		483	else
		484	{
		485	#if 0
		486	if (0 && sv_derived_from (rv, "JSON::Literal"))
		487	{
		488	// not yet
		489	}
		490	#endif
		491	if (enc->json.flags & F_CONV_BLESSED)
		492	{
		493	// we re-bless the reference to get overload and other niceties right
		494	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
		495
		496	if (to_json)
		497	{
		498	int count;
		499	dSP;
		500
		501	ENTER; SAVETMPS; PUSHMARK (SP);
		502	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		503
		504	// calling with G_SCALAR ensures that we always get a 1 return value
		505	PUTBACK;
		506	call_sv ((SV *)GvCV (to_json), G_SCALAR);
		507	SPAGAIN;
		508
		509	// catch this surprisingly common error
		510	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		511	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		512
		513	sv = POPs;
		514	PUTBACK;
		515
		516	encode_sv (enc, sv);
		517
		518	FREETMPS; LEAVE;
		519	}
		520	else if (enc->json.flags & F_ALLOW_BLESSED)
		521	encode_str (enc, "null", 4, 0);
		522	else
		523	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		524	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		525	}
		526	else if (enc->json.flags & F_ALLOW_BLESSED)
		527	encode_str (enc, "null", 4, 0);
		528	else
		529	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		530	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		531	}
		532	}
467	if (svt == SVt_PVHV)	533	else if (svt == SVt_PVHV)
468	encode_hv (enc, (HV *)sv);	534	encode_hv (enc, (HV *)sv);
469	else if (svt == SVt_PVAV)	535	else if (svt == SVt_PVAV)
470	encode_av (enc, (AV *)sv);	536	encode_av (enc, (AV *)sv);
471	else if (svt < SVt_PVAV)	537	else if (svt < SVt_PVAV)
472	{	538	{
473	if (SvNIOK (sv) && SvIV (sv) == 0)	539	STRLEN len = 0;
		540	char *pv = svt ? SvPV (sv, len) : 0;
		541
		542	if (len == 1 && *pv == '1')
		543	encode_str (enc, "true", 4, 0);
		544	else if (len == 1 && *pv == '0')
474	encode_str (enc, "false", 5, 0);	545	encode_str (enc, "false", 5, 0);
475	else if (SvNIOK (sv) && SvIV (sv) == 1)
476	encode_str (enc, "true", 4, 0);
477	else	546	else
478	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	547	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
479	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	548	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
480	}	549	}
481	else	550	else
…		…
551	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	620	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
552	SvPV_nolen (sv), SvFLAGS (sv));	621	SvPV_nolen (sv), SvFLAGS (sv));
553	}	622	}
554		623
555	static SV *	624	static SV *
556	encode_json (SV *scalar, U32 flags)	625	encode_json (SV scalar, JSON json)
557	{	626	{
558	enc_t enc;	627	enc_t enc;
559		628
560	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	629	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
561	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	630	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
562		631
563	enc.flags = flags;	632	enc.json = *json;
564	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	633	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
565	enc.cur = SvPVX (enc.sv);	634	enc.cur = SvPVX (enc.sv);
566	enc.end = SvEND (enc.sv);	635	enc.end = SvEND (enc.sv);
567	enc.indent = 0;	636	enc.indent = 0;
568	enc.maxdepth = DEC_DEPTH (flags);	637	enc.maxdepth = DEC_DEPTH (enc.json.flags);
569		638
570	SvPOK_only (enc.sv);	639	SvPOK_only (enc.sv);
571	encode_sv (&enc, scalar);	640	encode_sv (&enc, scalar);
572		641
573	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	642	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
574	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	643	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
575		644
576	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	645	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
577	SvUTF8_on (enc.sv);	646	SvUTF8_on (enc.sv);
578		647
579	if (enc.flags & F_SHRINK)	648	if (enc.json.flags & F_SHRINK)
580	shrink (enc.sv);	649	shrink (enc.sv);
581		650
582	return enc.sv;	651	return enc.sv;
583	}	652	}
584		653
…		…
589	typedef struct	658	typedef struct
590	{	659	{
591	char *cur; // current parser pointer	660	char *cur; // current parser pointer
592	char *end; // end of input string	661	char *end; // end of input string
593	const char *err; // parse error, if != 0	662	const char *err; // parse error, if != 0
594	U32 flags; // F_*	663	JSON json;
595	U32 depth; // recursion depth	664	U32 depth; // recursion depth
596	U32 maxdepth; // recursion depth limit	665	U32 maxdepth; // recursion depth limit
597	} dec_t;	666	} dec_t;
598		667
599	inline void	668	inline void
…		…
950	}	1019	}
951		1020
952	static SV *	1021	static SV *
953	decode_hv (dec_t *dec)	1022	decode_hv (dec_t *dec)
954	{	1023	{
		1024	SV *sv;
955	HV *hv = newHV ();	1025	HV *hv = newHV ();
956		1026
957	DEC_INC_DEPTH;	1027	DEC_INC_DEPTH;
958	decode_ws (dec);	1028	decode_ws (dec);
959		1029
960	if (*dec->cur == '}')	1030	if (*dec->cur == '}')
961	++dec->cur;	1031	++dec->cur;
962	else	1032	else
963	for (;;)	1033	for (;;)
964	{	1034	{
965	SV key, value;
966
967	decode_ws (dec); EXPECT_CH ('"');	1035	decode_ws (dec); EXPECT_CH ('"');
968		1036
969	key = decode_str (dec);	1037	// heuristic: assume that
970	if (!key)	1038	// a) decode_str + hv_store_ent are abysmally slow.
971	goto fail;	1039	// b) most hash keys are short, simple ascii text.
		1040	// => try to "fast-match" such strings to avoid
		1041	// the overhead of decode_str + hv_store_ent.
		1042	{
		1043	SV *value;
		1044	char *p = dec->cur;
		1045	char *e = p + 24; // only try up to 24 bytes
972		1046
973	decode_ws (dec); EXPECT_CH (':');	1047	for (;;)
974
975	value = decode_sv (dec);
976	if (!value)
977	{	1048	{
		1049	// the >= 0x80 is true on most architectures
		1050	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1051	{
		1052	// slow path, back up and use decode_str
		1053	SV *key = decode_str (dec);
		1054	if (!key)
		1055	goto fail;
		1056
		1057	decode_ws (dec); EXPECT_CH (':');
		1058
		1059	value = decode_sv (dec);
		1060	if (!value)
		1061	{
		1062	SvREFCNT_dec (key);
		1063	goto fail;
		1064	}
		1065
		1066	hv_store_ent (hv, key, value, 0);
978	SvREFCNT_dec (key);	1067	SvREFCNT_dec (key);
		1068
		1069	break;
		1070	}
		1071	else if (*p == '"')
		1072	{
		1073	// fast path, got a simple key
		1074	char *key = dec->cur;
		1075	int len = p - key;
		1076	dec->cur = p + 1;
		1077
		1078	decode_ws (dec); EXPECT_CH (':');
		1079
		1080	value = decode_sv (dec);
		1081	if (!value)
979	goto fail;	1082	goto fail;
		1083
		1084	hv_store (hv, key, len, value, 0);
		1085
		1086	break;
		1087	}
		1088
		1089	++p;
980	}	1090	}
981		1091	}
982	hv_store_ent (hv, key, value, 0);
983	SvREFCNT_dec (key);
984		1092
985	decode_ws (dec);	1093	decode_ws (dec);
986		1094
987	if (*dec->cur == '}')	1095	if (*dec->cur == '}')
988	{	1096	{
…		…
995		1103
996	++dec->cur;	1104	++dec->cur;
997	}	1105	}
998		1106
999	DEC_DEC_DEPTH;	1107	DEC_DEC_DEPTH;
1000	return newRV_noinc ((SV *)hv);	1108	sv = newRV_noinc ((SV *)hv);
		1109
		1110	// check filter callbacks
		1111	if (dec->json.flags & F_HOOK)
		1112	{
		1113	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1114	{
		1115	HE cb, he;
		1116
		1117	hv_iterinit (hv);
		1118	he = hv_iternext (hv);
		1119	hv_iterinit (hv);
		1120
		1121	// the next line creates a mortal sv each time its called.
		1122	// might want to optimise this for common cases.
		1123	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1124
		1125	if (cb)
		1126	{
		1127	dSP;
		1128	int count;
		1129
		1130	ENTER; SAVETMPS; PUSHMARK (SP);
		1131	XPUSHs (HeVAL (he));
		1132
		1133	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1134
		1135	if (count == 1)
		1136	{
		1137	sv = newSVsv (POPs);
		1138	FREETMPS; LEAVE;
		1139	return sv;
		1140	}
		1141
		1142	FREETMPS; LEAVE;
		1143	}
		1144	}
		1145
		1146	if (dec->json.cb_object)
		1147	{
		1148	dSP;
		1149	int count;
		1150
		1151	ENTER; SAVETMPS; PUSHMARK (SP);
		1152	XPUSHs (sv_2mortal (sv));
		1153
		1154	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1155
		1156	if (count == 1)
		1157	{
		1158	sv = newSVsv (POPs);
		1159	FREETMPS; LEAVE;
		1160	return sv;
		1161	}
		1162
		1163	SvREFCNT_inc (sv);
		1164	FREETMPS; LEAVE;
		1165	}
		1166	}
		1167
		1168	return sv;
1001		1169
1002	fail:	1170	fail:
1003	SvREFCNT_dec (hv);	1171	SvREFCNT_dec (hv);
1004	DEC_DEC_DEPTH;	1172	DEC_DEC_DEPTH;
1005	return 0;	1173	return 0;
…		…
1025		1193
1026	case 't':	1194	case 't':
1027	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1195	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1028	{	1196	{
1029	dec->cur += 4;	1197	dec->cur += 4;
1030	return newSViv (1);	1198	return SvREFCNT_inc (json_true);
1031	}	1199	}
1032	else	1200	else
1033	ERR ("'true' expected");	1201	ERR ("'true' expected");
1034		1202
1035	break;	1203	break;
1036		1204
1037	case 'f':	1205	case 'f':
1038	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1206	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1039	{	1207	{
1040	dec->cur += 5;	1208	dec->cur += 5;
1041	return newSViv (0);	1209	return SvREFCNT_inc (json_false);
1042	}	1210	}
1043	else	1211	else
1044	ERR ("'false' expected");	1212	ERR ("'false' expected");
1045		1213
1046	break;	1214	break;
…		…
1064	fail:	1232	fail:
1065	return 0;	1233	return 0;
1066	}	1234	}
1067		1235
1068	static SV *	1236	static SV *
1069	decode_json (SV string, U32 flags, UV offset_return)	1237	decode_json (SV string, JSON json, UV *offset_return)
1070	{	1238	{
1071	dec_t dec;	1239	dec_t dec;
1072	UV offset;	1240	UV offset;
1073	SV *sv;	1241	SV *sv;
1074		1242
1075	SvGETMAGIC (string);	1243	SvGETMAGIC (string);
1076	SvUPGRADE (string, SVt_PV);	1244	SvUPGRADE (string, SVt_PV);
1077		1245
		1246	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1247	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1248	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1249
1078	if (flags & F_UTF8)	1250	if (json->flags & F_UTF8)
1079	sv_utf8_downgrade (string, 0);	1251	sv_utf8_downgrade (string, 0);
1080	else	1252	else
1081	sv_utf8_upgrade (string);	1253	sv_utf8_upgrade (string);
1082		1254
1083	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1255	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1084		1256
1085	dec.flags = flags;	1257	dec.json = *json;
1086	dec.cur = SvPVX (string);	1258	dec.cur = SvPVX (string);
1087	dec.end = SvEND (string);	1259	dec.end = SvEND (string);
1088	dec.err = 0;	1260	dec.err = 0;
1089	dec.depth = 0;	1261	dec.depth = 0;
1090	dec.maxdepth = DEC_DEPTH (dec.flags);	1262	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1263
		1264	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1265	dec.json.flags \|= F_HOOK;
1091		1266
1092	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1267	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1093	sv = decode_sv (&dec);	1268	sv = decode_sv (&dec);
1094		1269
1095	if (!(offset_return \|\| !sv))	1270	if (!(offset_return \|\| !sv))
…		…
1105	}	1280	}
1106	}	1281	}
1107		1282
1108	if (offset_return \|\| !sv)	1283	if (offset_return \|\| !sv)
1109	{	1284	{
1110	offset = dec.flags & F_UTF8	1285	offset = dec.json.flags & F_UTF8
1111	? dec.cur - SvPVX (string)	1286	? dec.cur - SvPVX (string)
1112	: utf8_distance (dec.cur, SvPVX (string));	1287	: utf8_distance (dec.cur, SvPVX (string));
1113		1288
1114	if (offset_return)	1289	if (offset_return)
1115	*offset_return = offset;	1290	*offset_return = offset;
…		…
1134	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1309	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1135	}	1310	}
1136		1311
1137	sv = sv_2mortal (sv);	1312	sv = sv_2mortal (sv);
1138		1313
1139	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1314	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1140	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1315	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1141		1316
1142	return sv;	1317	return sv;
1143	}	1318	}
1144		1319
…		…
1156	i >= '0' && i <= '9' ? i - '0'	1331	i >= '0' && i <= '9' ? i - '0'
1157	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1332	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1158	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1333	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1159	: -1;	1334	: -1;
1160		1335
1161	json_stash = gv_stashpv ("JSON::XS", 1);	1336	json_stash = gv_stashpv ("JSON::XS" , 1);
		1337	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1338
		1339	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1340	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1162	}	1341	}
1163		1342
1164	PROTOTYPES: DISABLE	1343	PROTOTYPES: DISABLE
1165		1344
1166	SV new (char dummy)	1345	void new (char *klass)
1167	CODE:	1346	PPCODE:
1168	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1347	{
1169	OUTPUT:	1348	SV *pv = NEWSV (0, sizeof (JSON));
1170	RETVAL	1349	SvPOK_only (pv);
		1350	Zero (SvPVX (pv), 1, JSON);
		1351	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1352	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1353	}
1171		1354
1172	SV ascii (SV self, int enable = 1)	1355	void ascii (JSON *self, int enable = 1)
1173	ALIAS:	1356	ALIAS:
1174	ascii = F_ASCII	1357	ascii = F_ASCII
1175	latin1 = F_LATIN1	1358	latin1 = F_LATIN1
1176	utf8 = F_UTF8	1359	utf8 = F_UTF8
1177	indent = F_INDENT	1360	indent = F_INDENT
1178	canonical = F_CANONICAL	1361	canonical = F_CANONICAL
1179	space_before = F_SPACE_BEFORE	1362	space_before = F_SPACE_BEFORE
1180	space_after = F_SPACE_AFTER	1363	space_after = F_SPACE_AFTER
1181	pretty = F_PRETTY	1364	pretty = F_PRETTY
1182	allow_nonref = F_ALLOW_NONREF	1365	allow_nonref = F_ALLOW_NONREF
1183	shrink = F_SHRINK	1366	shrink = F_SHRINK
		1367	allow_blessed = F_ALLOW_BLESSED
		1368	convert_blessed = F_CONV_BLESSED
1184	CODE:	1369	PPCODE:
1185	{	1370	{
1186	UV *uv = SvJSON (self);
1187	if (enable)	1371	if (enable)
1188	*uv \|= ix;	1372	self->flags \|= ix;
1189	else	1373	else
1190	*uv &= ~ix;	1374	self->flags &= ~ix;
1191		1375
1192	RETVAL = newSVsv (self);	1376	XPUSHs (ST (0));
1193	}	1377	}
1194	OUTPUT:
1195	RETVAL
1196		1378
1197	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1379	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1198	CODE:	1380	PPCODE:
1199	{	1381	{
1200	UV *uv = SvJSON (self);
1201	UV log2 = 0;	1382	UV log2 = 0;
1202		1383
1203	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1384	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1204		1385
1205	while ((1UL << log2) < max_depth)	1386	while ((1UL << log2) < max_depth)
1206	++log2;	1387	++log2;
1207		1388
1208	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1389	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1209		1390
1210	RETVAL = newSVsv (self);	1391	XPUSHs (ST (0));
1211	}	1392	}
1212	OUTPUT:
1213	RETVAL
1214		1393
1215	void encode (SV self, SV scalar)	1394	void max_size (JSON *self, UV max_size = 0)
1216	PPCODE:	1395	PPCODE:
1217	XPUSHs (encode_json (scalar, *SvJSON (self)));	1396	{
		1397	UV log2 = 0;
1218		1398
1219	void decode (SV self, SV jsonstr)	1399	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1400	if (max_size == 1) max_size = 2;
		1401
		1402	while ((1UL << log2) < max_size)
		1403	++log2;
		1404
		1405	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1406
		1407	XPUSHs (ST (0));
		1408	}
		1409
		1410	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1220	PPCODE:	1411	PPCODE:
		1412	{
		1413	SvREFCNT_dec (self->cb_object);
		1414	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1415
		1416	XPUSHs (ST (0));
		1417	}
		1418
		1419	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1420	PPCODE:
		1421	{
		1422	if (!self->cb_sk_object)
		1423	self->cb_sk_object = newHV ();
		1424
		1425	if (SvOK (cb))
		1426	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1427	else
		1428	{
		1429	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1430
		1431	if (!HvKEYS (self->cb_sk_object))
		1432	{
		1433	SvREFCNT_dec (self->cb_sk_object);
		1434	self->cb_sk_object = 0;
		1435	}
		1436	}
		1437
		1438	XPUSHs (ST (0));
		1439	}
		1440
		1441	void encode (JSON self, SV scalar)
		1442	PPCODE:
		1443	XPUSHs (encode_json (scalar, self));
		1444
		1445	void decode (JSON self, SV jsonstr)
		1446	PPCODE:
1221	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1447	XPUSHs (decode_json (jsonstr, self, 0));
1222		1448
1223	void decode_prefix (SV self, SV jsonstr)	1449	void decode_prefix (JSON self, SV jsonstr)
1224	PPCODE:	1450	PPCODE:
1225	{	1451	{
1226	UV offset;	1452	UV offset;
1227	EXTEND (SP, 2);	1453	EXTEND (SP, 2);
1228	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1454	PUSHs (decode_json (jsonstr, self, &offset));
1229	PUSHs (sv_2mortal (newSVuv (offset)));	1455	PUSHs (sv_2mortal (newSVuv (offset)));
1230	}	1456	}
1231		1457
		1458	void DESTROY (JSON *self)
		1459	CODE:
		1460	SvREFCNT_dec (self->cb_sk_object);
		1461	SvREFCNT_dec (self->cb_object);
		1462
1232	PROTOTYPES: ENABLE	1463	PROTOTYPES: ENABLE
1233		1464
1234	void to_json (SV *scalar)	1465	void to_json (SV *scalar)
1235	ALIAS:
1236	objToJson = 0
1237	PPCODE:	1466	PPCODE:
		1467	{
		1468	JSON json = { F_DEFAULT \| F_UTF8 };
1238	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1469	XPUSHs (encode_json (scalar, &json));
		1470	}
1239		1471
1240	void from_json (SV *jsonstr)	1472	void from_json (SV *jsonstr)
1241	ALIAS:
1242	jsonToObj = 0
1243	PPCODE:	1473	PPCODE:
		1474	{
		1475	JSON json = { F_DEFAULT \| F_UTF8 };
1244	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1476	XPUSHs (decode_json (jsonstr, &json, 0));
		1477	}
1245		1478

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC vs. Revision 1.54 by root, Tue Jul 10 16:22:31 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC vs.
Revision 1.54 by root, Tue Jul 10 16:22:31 2007 UTC