[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.52 by root, Mon Jul 2 02:57:11 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
…		…
340	else	340	else
341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
342		342
343	encode_ch (enc, '"');	343	encode_ch (enc, '"');
344		344
345	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	345	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
346	encode_ch (enc, ':');	346	encode_ch (enc, ':');
347	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	347	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
348	encode_sv (enc, HeVAL (he));	348	encode_sv (enc, HeVAL (he));
349	}	349	}
350		350
351	// compare hash entries, used when all keys are bytestrings	351	// compare hash entries, used when all keys are bytestrings
352	static int	352	static int
…		…
387	{	387	{
388	// for canonical output we have to sort by keys first	388	// for canonical output we have to sort by keys first
389	// actually, this is mostly due to the stupid so-called	389	// actually, this is mostly due to the stupid so-called
390	// security workaround added somewhere in 5.8.x.	390	// security workaround added somewhere in 5.8.x.
391	// that randomises hash orderings	391	// that randomises hash orderings
392	if (enc->flags & F_CANONICAL)	392	if (enc->json.flags & F_CANONICAL)
393	{	393	{
394	int fast = 1;	394	int fast = 1;
395	HE *he;	395	HE *he;
396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
397	HE *hes = _alloca (count sizeof (HE));	397	HE *hes = _alloca (count sizeof (HE));
…		…
469	svtype svt;	469	svtype svt;
470		470
471	SvGETMAGIC (sv);	471	SvGETMAGIC (sv);
472	svt = SvTYPE (sv);	472	svt = SvTYPE (sv);
473		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", 1);
		495
		496	if (to_json)
		497	{
		498	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
		499	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		500
		501	// calling with G_SCALAR ensures that we always get a 1 reutrn value
		502	// check anyways.
		503	PUTBACK;
		504	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
		505	SPAGAIN;
		506
		507	encode_sv (enc, POPs);
		508
		509	FREETMPS; LEAVE;
		510	}
		511	else if (enc->json.flags & F_ALLOW_BLESSED)
		512	encode_str (enc, "null", 4, 0);
		513	else
		514	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		515	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		516	}
		517	else if (enc->json.flags & F_ALLOW_BLESSED)
		518	encode_str (enc, "null", 4, 0);
		519	else
		520	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		521	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		522	}
		523	}
474	if (svt == SVt_PVHV)	524	else if (svt == SVt_PVHV)
475	encode_hv (enc, (HV *)sv);	525	encode_hv (enc, (HV *)sv);
476	else if (svt == SVt_PVAV)	526	else if (svt == SVt_PVAV)
477	encode_av (enc, (AV *)sv);	527	encode_av (enc, (AV *)sv);
478	else if (svt < SVt_PVAV)	528	else if (svt < SVt_PVAV)
479	{	529	{
480	if (SvNIOK (sv) && SvIV (sv) == 0)	530	STRLEN len = 0;
		531	char *pv = svt ? SvPV (sv, len) : 0;
		532
		533	if (len == 1 && *pv == '1')
		534	encode_str (enc, "true", 4, 0);
		535	else if (len == 1 && *pv == '0')
481	encode_str (enc, "false", 5, 0);	536	encode_str (enc, "false", 5, 0);
482	else if (SvNIOK (sv) && SvIV (sv) == 1)
483	encode_str (enc, "true", 4, 0);
484	else	537	else
485	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	538	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
486	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	539	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
487	}	540	}
488	else	541	else
…		…
558	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	611	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
559	SvPV_nolen (sv), SvFLAGS (sv));	612	SvPV_nolen (sv), SvFLAGS (sv));
560	}	613	}
561		614
562	static SV *	615	static SV *
563	encode_json (SV *scalar, U32 flags)	616	encode_json (SV scalar, JSON json)
564	{	617	{
565	enc_t enc;	618	enc_t enc;
566		619
567	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	620	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
568	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	621	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
569		622
570	enc.flags = flags;	623	enc.json = *json;
571	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	624	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
572	enc.cur = SvPVX (enc.sv);	625	enc.cur = SvPVX (enc.sv);
573	enc.end = SvEND (enc.sv);	626	enc.end = SvEND (enc.sv);
574	enc.indent = 0;	627	enc.indent = 0;
575	enc.maxdepth = DEC_DEPTH (flags);	628	enc.maxdepth = DEC_DEPTH (enc.json.flags);
576		629
577	SvPOK_only (enc.sv);	630	SvPOK_only (enc.sv);
578	encode_sv (&enc, scalar);	631	encode_sv (&enc, scalar);
579		632
580	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	633	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
581	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	634	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
582		635
583	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	636	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
584	SvUTF8_on (enc.sv);	637	SvUTF8_on (enc.sv);
585		638
586	if (enc.flags & F_SHRINK)	639	if (enc.json.flags & F_SHRINK)
587	shrink (enc.sv);	640	shrink (enc.sv);
588		641
589	return enc.sv;	642	return enc.sv;
590	}	643	}
591		644
…		…
596	typedef struct	649	typedef struct
597	{	650	{
598	char *cur; // current parser pointer	651	char *cur; // current parser pointer
599	char *end; // end of input string	652	char *end; // end of input string
600	const char *err; // parse error, if != 0	653	const char *err; // parse error, if != 0
601	U32 flags; // F_*	654	JSON json;
602	U32 depth; // recursion depth	655	U32 depth; // recursion depth
603	U32 maxdepth; // recursion depth limit	656	U32 maxdepth; // recursion depth limit
604	} dec_t;	657	} dec_t;
605		658
606	inline void	659	inline void
…		…
957	}	1010	}
958		1011
959	static SV *	1012	static SV *
960	decode_hv (dec_t *dec)	1013	decode_hv (dec_t *dec)
961	{	1014	{
		1015	SV *sv;
962	HV *hv = newHV ();	1016	HV *hv = newHV ();
963		1017
964	DEC_INC_DEPTH;	1018	DEC_INC_DEPTH;
965	decode_ws (dec);	1019	decode_ws (dec);
966		1020
967	if (*dec->cur == '}')	1021	if (*dec->cur == '}')
968	++dec->cur;	1022	++dec->cur;
969	else	1023	else
970	for (;;)	1024	for (;;)
971	{	1025	{
972	SV key, value;
973
974	decode_ws (dec); EXPECT_CH ('"');	1026	decode_ws (dec); EXPECT_CH ('"');
975		1027
976	key = decode_str (dec);	1028	// heuristic: assume that
977	if (!key)	1029	// a) decode_str + hv_store_ent are abysmally slow.
978	goto fail;	1030	// b) most hash keys are short, simple ascii text.
		1031	// => try to "fast-match" such strings to avoid
		1032	// the overhead of decode_str + hv_store_ent.
		1033	{
		1034	SV *value;
		1035	char *p = dec->cur;
		1036	char *e = p + 24; // only try up to 24 bytes
979		1037
980	decode_ws (dec); EXPECT_CH (':');	1038	for (;;)
981
982	value = decode_sv (dec);
983	if (!value)
984	{	1039	{
		1040	// the >= 0x80 is true on most architectures
		1041	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1042	{
		1043	// slow path, back up and use decode_str
		1044	SV *key = decode_str (dec);
		1045	if (!key)
		1046	goto fail;
		1047
		1048	decode_ws (dec); EXPECT_CH (':');
		1049
		1050	value = decode_sv (dec);
		1051	if (!value)
		1052	{
		1053	SvREFCNT_dec (key);
		1054	goto fail;
		1055	}
		1056
		1057	hv_store_ent (hv, key, value, 0);
985	SvREFCNT_dec (key);	1058	SvREFCNT_dec (key);
		1059
		1060	break;
		1061	}
		1062	else if (*p == '"')
		1063	{
		1064	// fast path, got a simple key
		1065	char *key = dec->cur;
		1066	int len = p - key;
		1067	dec->cur = p + 1;
		1068
		1069	decode_ws (dec); EXPECT_CH (':');
		1070
		1071	value = decode_sv (dec);
		1072	if (!value)
986	goto fail;	1073	goto fail;
		1074
		1075	hv_store (hv, key, len, value, 0);
		1076
		1077	break;
		1078	}
		1079
		1080	++p;
987	}	1081	}
988		1082	}
989	hv_store_ent (hv, key, value, 0);
990	SvREFCNT_dec (key);
991		1083
992	decode_ws (dec);	1084	decode_ws (dec);
993		1085
994	if (*dec->cur == '}')	1086	if (*dec->cur == '}')
995	{	1087	{
…		…
1002		1094
1003	++dec->cur;	1095	++dec->cur;
1004	}	1096	}
1005		1097
1006	DEC_DEC_DEPTH;	1098	DEC_DEC_DEPTH;
1007	return newRV_noinc ((SV *)hv);	1099	sv = newRV_noinc ((SV *)hv);
		1100
		1101	// check filter callbacks
		1102	if (dec->json.flags & F_HOOK)
		1103	{
		1104	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1105	{
		1106	HE cb, he;
		1107
		1108	hv_iterinit (hv);
		1109	he = hv_iternext (hv);
		1110	hv_iterinit (hv);
		1111
		1112	// the next line creates a mortal sv each time its called.
		1113	// might want to optimise this for common cases.
		1114	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1115
		1116	if (cb)
		1117	{
		1118	int count;
		1119	ENTER; SAVETMPS;
		1120
		1121	dSP; PUSHMARK (SP);
		1122	XPUSHs (HeVAL (he));
		1123
		1124	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1125
		1126	if (count == 1)
		1127	{
		1128	sv = newSVsv (POPs);
		1129	FREETMPS; LEAVE;
		1130	return sv;
		1131	}
		1132
		1133	FREETMPS; LEAVE;
		1134	}
		1135	}
		1136
		1137	if (dec->json.cb_object)
		1138	{
		1139	int count;
		1140	ENTER; SAVETMPS;
		1141
		1142	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
		1143	XPUSHs (sv_2mortal (sv));
		1144
		1145	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1146
		1147	if (count == 1)
		1148	{
		1149	sv = newSVsv (POPs);
		1150	FREETMPS; LEAVE;
		1151	return sv;
		1152	}
		1153
		1154	SvREFCNT_inc (sv);
		1155	FREETMPS; LEAVE;
		1156	}
		1157	}
		1158
		1159	return sv;
1008		1160
1009	fail:	1161	fail:
1010	SvREFCNT_dec (hv);	1162	SvREFCNT_dec (hv);
1011	DEC_DEC_DEPTH;	1163	DEC_DEC_DEPTH;
1012	return 0;	1164	return 0;
…		…
1071	fail:	1223	fail:
1072	return 0;	1224	return 0;
1073	}	1225	}
1074		1226
1075	static SV *	1227	static SV *
1076	decode_json (SV string, U32 flags, UV offset_return)	1228	decode_json (SV string, JSON json, UV *offset_return)
1077	{	1229	{
1078	dec_t dec;	1230	dec_t dec;
1079	UV offset;	1231	UV offset;
1080	SV *sv;	1232	SV *sv;
1081		1233
1082	SvGETMAGIC (string);	1234	SvGETMAGIC (string);
1083	SvUPGRADE (string, SVt_PV);	1235	SvUPGRADE (string, SVt_PV);
1084		1236
		1237	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1238	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1239	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1240
1085	if (flags & F_UTF8)	1241	if (json->flags & F_UTF8)
1086	sv_utf8_downgrade (string, 0);	1242	sv_utf8_downgrade (string, 0);
1087	else	1243	else
1088	sv_utf8_upgrade (string);	1244	sv_utf8_upgrade (string);
1089		1245
1090	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1246	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1091		1247
1092	dec.flags = flags;	1248	dec.json = *json;
1093	dec.cur = SvPVX (string);	1249	dec.cur = SvPVX (string);
1094	dec.end = SvEND (string);	1250	dec.end = SvEND (string);
1095	dec.err = 0;	1251	dec.err = 0;
1096	dec.depth = 0;	1252	dec.depth = 0;
1097	dec.maxdepth = DEC_DEPTH (dec.flags);	1253	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1254
		1255	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1256	dec.json.flags \|= F_HOOK;
1098		1257
1099	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1258	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1100	sv = decode_sv (&dec);	1259	sv = decode_sv (&dec);
1101		1260
1102	if (!(offset_return \|\| !sv))	1261	if (!(offset_return \|\| !sv))
…		…
1112	}	1271	}
1113	}	1272	}
1114		1273
1115	if (offset_return \|\| !sv)	1274	if (offset_return \|\| !sv)
1116	{	1275	{
1117	offset = dec.flags & F_UTF8	1276	offset = dec.json.flags & F_UTF8
1118	? dec.cur - SvPVX (string)	1277	? dec.cur - SvPVX (string)
1119	: utf8_distance (dec.cur, SvPVX (string));	1278	: utf8_distance (dec.cur, SvPVX (string));
1120		1279
1121	if (offset_return)	1280	if (offset_return)
1122	*offset_return = offset;	1281	*offset_return = offset;
…		…
1141	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1300	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1142	}	1301	}
1143		1302
1144	sv = sv_2mortal (sv);	1303	sv = sv_2mortal (sv);
1145		1304
1146	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1305	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)");	1306	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1148		1307
1149	return sv;	1308	return sv;
1150	}	1309	}
1151		1310
…		…
1163	i >= '0' && i <= '9' ? i - '0'	1322	i >= '0' && i <= '9' ? i - '0'
1164	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1323	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1165	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1324	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1166	: -1;	1325	: -1;
1167		1326
1168	json_stash = gv_stashpv ("JSON::XS", 1);	1327	json_stash = gv_stashpv ("JSON::XS" , 1);
		1328	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1169		1329
1170	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1330	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);	1331	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1172	}	1332	}
1173		1333
1174	PROTOTYPES: DISABLE	1334	PROTOTYPES: DISABLE
1175		1335
1176	SV new (char dummy)	1336	void new (char *klass)
1177	CODE:	1337	PPCODE:
1178	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1338	{
1179	OUTPUT:	1339	SV *pv = NEWSV (0, sizeof (JSON));
1180	RETVAL	1340	SvPOK_only (pv);
		1341	Zero (SvPVX (pv), 1, JSON);
		1342	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1343	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1344	}
1181		1345
1182	SV ascii (SV self, int enable = 1)	1346	void ascii (JSON *self, int enable = 1)
1183	ALIAS:	1347	ALIAS:
1184	ascii = F_ASCII	1348	ascii = F_ASCII
1185	latin1 = F_LATIN1	1349	latin1 = F_LATIN1
1186	utf8 = F_UTF8	1350	utf8 = F_UTF8
1187	indent = F_INDENT	1351	indent = F_INDENT
1188	canonical = F_CANONICAL	1352	canonical = F_CANONICAL
1189	space_before = F_SPACE_BEFORE	1353	space_before = F_SPACE_BEFORE
1190	space_after = F_SPACE_AFTER	1354	space_after = F_SPACE_AFTER
1191	pretty = F_PRETTY	1355	pretty = F_PRETTY
1192	allow_nonref = F_ALLOW_NONREF	1356	allow_nonref = F_ALLOW_NONREF
1193	shrink = F_SHRINK	1357	shrink = F_SHRINK
		1358	allow_blessed = F_ALLOW_BLESSED
		1359	convert_blessed = F_CONV_BLESSED
1194	CODE:	1360	PPCODE:
1195	{	1361	{
1196	UV *uv = SvJSON (self);
1197	if (enable)	1362	if (enable)
1198	*uv \|= ix;	1363	self->flags \|= ix;
1199	else	1364	else
1200	*uv &= ~ix;	1365	self->flags &= ~ix;
1201		1366
1202	RETVAL = newSVsv (self);	1367	XPUSHs (ST (0));
1203	}	1368	}
1204	OUTPUT:
1205	RETVAL
1206		1369
1207	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1370	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1208	CODE:	1371	PPCODE:
1209	{	1372	{
1210	UV *uv = SvJSON (self);
1211	UV log2 = 0;	1373	UV log2 = 0;
1212		1374
1213	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1375	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1214		1376
1215	while ((1UL << log2) < max_depth)	1377	while ((1UL << log2) < max_depth)
1216	++log2;	1378	++log2;
1217		1379
1218	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1380	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1219		1381
1220	RETVAL = newSVsv (self);	1382	XPUSHs (ST (0));
1221	}	1383	}
1222	OUTPUT:
1223	RETVAL
1224		1384
1225	void encode (SV self, SV scalar)	1385	void max_size (JSON *self, UV max_size = 0)
1226	PPCODE:	1386	PPCODE:
1227	XPUSHs (encode_json (scalar, *SvJSON (self)));	1387	{
		1388	UV log2 = 0;
1228		1389
1229	void decode (SV self, SV jsonstr)	1390	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1391	if (max_size == 1) max_size = 2;
		1392
		1393	while ((1UL << log2) < max_size)
		1394	++log2;
		1395
		1396	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1397
		1398	XPUSHs (ST (0));
		1399	}
		1400
		1401	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1230	PPCODE:	1402	PPCODE:
		1403	{
		1404	SvREFCNT_dec (self->cb_object);
		1405	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1406
		1407	XPUSHs (ST (0));
		1408	}
		1409
		1410	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1411	PPCODE:
		1412	{
		1413	if (!self->cb_sk_object)
		1414	self->cb_sk_object = newHV ();
		1415
		1416	if (SvOK (cb))
		1417	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1418	else
		1419	{
		1420	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1421
		1422	if (!HvKEYS (self->cb_sk_object))
		1423	{
		1424	SvREFCNT_dec (self->cb_sk_object);
		1425	self->cb_sk_object = 0;
		1426	}
		1427	}
		1428
		1429	XPUSHs (ST (0));
		1430	}
		1431
		1432	void encode (JSON self, SV scalar)
		1433	PPCODE:
		1434	XPUSHs (encode_json (scalar, self));
		1435
		1436	void decode (JSON self, SV jsonstr)
		1437	PPCODE:
1231	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1438	XPUSHs (decode_json (jsonstr, self, 0));
1232		1439
1233	void decode_prefix (SV self, SV jsonstr)	1440	void decode_prefix (JSON self, SV jsonstr)
1234	PPCODE:	1441	PPCODE:
1235	{	1442	{
1236	UV offset;	1443	UV offset;
1237	EXTEND (SP, 2);	1444	EXTEND (SP, 2);
1238	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1445	PUSHs (decode_json (jsonstr, self, &offset));
1239	PUSHs (sv_2mortal (newSVuv (offset)));	1446	PUSHs (sv_2mortal (newSVuv (offset)));
1240	}	1447	}
1241		1448
		1449	void DESTROY (JSON *self)
		1450	CODE:
		1451	SvREFCNT_dec (self->cb_sk_object);
		1452	SvREFCNT_dec (self->cb_object);
		1453
1242	PROTOTYPES: ENABLE	1454	PROTOTYPES: ENABLE
1243		1455
1244	void to_json (SV *scalar)	1456	void to_json (SV *scalar)
1245	ALIAS:
1246	objToJson = 0
1247	PPCODE:	1457	PPCODE:
		1458	{
		1459	JSON json = { F_DEFAULT \| F_UTF8 };
1248	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1460	XPUSHs (encode_json (scalar, &json));
		1461	}
1249		1462
1250	void from_json (SV *jsonstr)	1463	void from_json (SV *jsonstr)
1251	ALIAS:
1252	jsonToObj = 0
1253	PPCODE:	1464	PPCODE:
		1465	{
		1466	JSON json = { F_DEFAULT \| F_UTF8 };
1254	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1467	XPUSHs (decode_json (jsonstr, &json, 0));
		1468	}
1255		1469

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.52 by root, Mon Jul 2 02:57:11 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.52 by root, Mon Jul 2 02:57:11 2007 UTC