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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC vs.
Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC

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

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC vs. Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC vs.
Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC