[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.46 by root, Mon Jun 25 22:11:39 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 // NYI
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
31		35
32	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
33		37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
34	// F_SELFCONVERT? <=> to_json/toJson
35	// F_BLESSED? <=> { $__class__$ => }
36		38
37	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
38	#define F_DEFAULT (9UL << S_MAXDEPTH)	40	#define F_DEFAULT (9UL << S_MAXDEPTH)
39		41
40	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
54	#endif	56	#endif
55		57
56	#define expect_false(expr) expect ((expr) != 0, 0)	58	#define expect_false(expr) expect ((expr) != 0, 0)
57	#define expect_true(expr) expect ((expr) != 0, 1)	59	#define expect_true(expr) expect ((expr) != 0, 1)
58		60
59	static HV *json_stash; // JSON::XS::	61	static HV json_stash, json_boolean_stash; // JSON::XS::
60	static SV json_true, json_false;	62	static SV json_true, json_false;
61		63
62	/////////////////////////////////////////////////////////////////////////////	64	/////////////////////////////////////////////////////////////////////////////
63	// utility functions	65	// utility functions
64		66
…		…
469	svtype svt;	471	svtype svt;
470		472
471	SvGETMAGIC (sv);	473	SvGETMAGIC (sv);
472	svt = SvTYPE (sv);	474	svt = SvTYPE (sv);
473		475
		476	if (expect_false (SvOBJECT (sv)))
		477	{
		478	if (SvSTASH (sv) == json_boolean_stash)
		479	{
		480	if (SvIV (sv) == 0)
		481	encode_str (enc, "false", 5, 0);
		482	else
		483	encode_str (enc, "true", 4, 0);
		484	}
		485	else
		486	{
		487	#if 0
		488	if (0 && sv_derived_from (rv, "JSON::Literal"))
		489	{
		490	// not yet
		491	}
		492	#endif
		493	if (enc->flags & F_CONV_BLESSED)
		494	{
		495	// we re-bless the reference to get overload and other niceties right
		496	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
		497
		498	if (to_json)
		499	{
		500	dSP;
		501	ENTER;
		502	SAVETMPS;
		503	PUSHMARK (SP);
		504	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		505
		506	// calling with G_SCALAR ensures that we always get a 1 reutrn value
		507	// check anyways.
		508	PUTBACK;
		509	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
		510	SPAGAIN;
		511
		512	encode_sv (enc, POPs);
		513
		514	FREETMPS;
		515	LEAVE;
		516	}
		517	else if (enc->flags & F_ALLOW_BLESSED)
		518	encode_str (enc, "null", 4, 0);
		519	else
		520	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		521	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		522	}
		523	else if (enc->flags & F_ALLOW_BLESSED)
		524	encode_str (enc, "null", 4, 0);
		525	else
		526	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		527	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		528	}
		529	}
474	if (svt == SVt_PVHV)	530	else if (svt == SVt_PVHV)
475	encode_hv (enc, (HV *)sv);	531	encode_hv (enc, (HV *)sv);
476	else if (svt == SVt_PVAV)	532	else if (svt == SVt_PVAV)
477	encode_av (enc, (AV *)sv);	533	encode_av (enc, (AV *)sv);
478	else if (svt < SVt_PVAV)	534	else if (svt < SVt_PVAV)
479	{	535	{
…		…
967	if (*dec->cur == '}')	1023	if (*dec->cur == '}')
968	++dec->cur;	1024	++dec->cur;
969	else	1025	else
970	for (;;)	1026	for (;;)
971	{	1027	{
972	SV key, value;
973
974	decode_ws (dec); EXPECT_CH ('"');	1028	decode_ws (dec); EXPECT_CH ('"');
975		1029
976	key = decode_str (dec);	1030	// heuristic: assume that
977	if (!key)	1031	// a) decode_str + hv_store_ent are abysmally slow
978	goto fail;	1032	// b) most hash keys are short, simple ascii text
		1033	// so try to "fast-match" such strings to avoid
		1034	// the overhead of hv_store_ent.
		1035	{
		1036	SV *value;
		1037	char *p = dec->cur;
		1038	char *e = p + 24; // only try up to 24 bytes
979		1039
980	decode_ws (dec); EXPECT_CH (':');	1040	for (;;)
981
982	value = decode_sv (dec);
983	if (!value)
984	{	1041	{
		1042	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1043	{
		1044	// slow path, back up and use decode_str
		1045	SV *key = decode_str (dec);
		1046	if (!key)
		1047	goto fail;
		1048
		1049	decode_ws (dec); EXPECT_CH (':');
		1050
		1051	value = decode_sv (dec);
		1052	if (!value)
		1053	{
		1054	SvREFCNT_dec (key);
		1055	goto fail;
		1056	}
		1057
		1058	hv_store_ent (hv, key, value, 0);
985	SvREFCNT_dec (key);	1059	SvREFCNT_dec (key);
		1060
		1061	break;
		1062	}
		1063	else if (*p == '"')
		1064	{
		1065	// fast path, got a simple key
		1066	char *key = dec->cur;
		1067	int len = p - key;
		1068	dec->cur = p + 1;
		1069
		1070	decode_ws (dec); EXPECT_CH (':');
		1071
		1072	value = decode_sv (dec);
		1073	if (!value)
986	goto fail;	1074	goto fail;
		1075
		1076	hv_store (hv, key, len, value, 0);
		1077
		1078	break;
		1079	}
		1080
		1081	++p;
987	}	1082	}
988		1083	}
989	hv_store_ent (hv, key, value, 0);
990	SvREFCNT_dec (key);
991		1084
992	decode_ws (dec);	1085	decode_ws (dec);
993		1086
994	if (*dec->cur == '}')	1087	if (*dec->cur == '}')
995	{	1088	{
…		…
1080	SV *sv;	1173	SV *sv;
1081		1174
1082	SvGETMAGIC (string);	1175	SvGETMAGIC (string);
1083	SvUPGRADE (string, SVt_PV);	1176	SvUPGRADE (string, SVt_PV);
1084		1177
		1178	if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags))
		1179	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1180	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (flags));
		1181
1085	if (flags & F_UTF8)	1182	if (flags & F_UTF8)
1086	sv_utf8_downgrade (string, 0);	1183	sv_utf8_downgrade (string, 0);
1087	else	1184	else
1088	sv_utf8_upgrade (string);	1185	sv_utf8_upgrade (string);
1089		1186
…		…
1163	i >= '0' && i <= '9' ? i - '0'	1260	i >= '0' && i <= '9' ? i - '0'
1164	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1261	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1165	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1262	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1166	: -1;	1263	: -1;
1167		1264
1168	json_stash = gv_stashpv ("JSON::XS", 1);	1265	json_stash = gv_stashpv ("JSON::XS" , 1);
		1266	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1169		1267
1170	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1268	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);	1269	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1172	}	1270	}
1173		1271
…		…
1179	OUTPUT:	1277	OUTPUT:
1180	RETVAL	1278	RETVAL
1181		1279
1182	SV ascii (SV self, int enable = 1)	1280	SV ascii (SV self, int enable = 1)
1183	ALIAS:	1281	ALIAS:
1184	ascii = F_ASCII	1282	ascii = F_ASCII
1185	latin1 = F_LATIN1	1283	latin1 = F_LATIN1
1186	utf8 = F_UTF8	1284	utf8 = F_UTF8
1187	indent = F_INDENT	1285	indent = F_INDENT
1188	canonical = F_CANONICAL	1286	canonical = F_CANONICAL
1189	space_before = F_SPACE_BEFORE	1287	space_before = F_SPACE_BEFORE
1190	space_after = F_SPACE_AFTER	1288	space_after = F_SPACE_AFTER
1191	pretty = F_PRETTY	1289	pretty = F_PRETTY
1192	allow_nonref = F_ALLOW_NONREF	1290	allow_nonref = F_ALLOW_NONREF
1193	shrink = F_SHRINK	1291	shrink = F_SHRINK
		1292	allow_blessed = F_ALLOW_BLESSED
		1293	convert_blessed = F_CONV_BLESSED
1194	CODE:	1294	CODE:
1195	{	1295	{
1196	UV *uv = SvJSON (self);	1296	UV *uv = SvJSON (self);
1197	if (enable)	1297	if (enable)
1198	*uv \|= ix;	1298	*uv \|= ix;
…		…
1220	RETVAL = newSVsv (self);	1320	RETVAL = newSVsv (self);
1221	}	1321	}
1222	OUTPUT:	1322	OUTPUT:
1223	RETVAL	1323	RETVAL
1224		1324
		1325	SV max_size (SV self, UV max_size = 0)
		1326	CODE:
		1327	{
		1328	UV *uv = SvJSON (self);
		1329	UV log2 = 0;
		1330
		1331	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1332	if (max_size == 1) max_size = 2;
		1333
		1334	while ((1UL << log2) < max_size)
		1335	++log2;
		1336
		1337	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1338
		1339	RETVAL = newSVsv (self);
		1340	}
		1341	OUTPUT:
		1342	RETVAL
		1343
1225	void encode (SV self, SV scalar)	1344	void encode (SV self, SV scalar)
1226	PPCODE:	1345	PPCODE:
1227	XPUSHs (encode_json (scalar, *SvJSON (self)));	1346	XPUSHs (encode_json (scalar, *SvJSON (self)));
1228		1347
1229	void decode (SV self, SV jsonstr)	1348	void decode (SV self, SV jsonstr)

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.46 by root, Mon Jun 25 22:11:39 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.46 by root, Mon Jun 25 22:11:39 2007 UTC