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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.48 by root, Sun Jul 1 22:20:00 2007 UTC vs.
Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC

…		…
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	29	#define F_ALLOW_BLESSED 0x00000400UL
30	#define F_CONV_BLESSED 0x00000800UL // NYI	30	#define F_CONV_BLESSED 0x00000800UL
31	#define F_MAXDEPTH 0xf8000000UL	31	#define F_MAXDEPTH 0xf8000000UL
32	#define S_MAXDEPTH 27	32	#define S_MAXDEPTH 27
33	#define F_MAXSIZE 0x01f00000UL	33	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	34	#define S_MAXSIZE 20
		35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35		36
36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	37	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))	38	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38		39
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
…		…
61	static HV json_stash, json_boolean_stash; // JSON::XS::	62	static HV json_stash, json_boolean_stash; // JSON::XS::
62	static SV json_true, json_false;	63	static SV json_true, json_false;
63		64
64	typedef struct {	65	typedef struct {
65	U32 flags;	66	U32 flags;
		67	SV *cb_object;
		68	HV *cb_sk_object;
66	} JSON;	69	} JSON;
67		70
68	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
69	// utility functions	72	// utility functions
70		73
…		…
303	encode_ch (enc, '['); encode_nl (enc);	306	encode_ch (enc, '['); encode_nl (enc);
304	++enc->indent;	307	++enc->indent;
305		308
306	for (i = 0; i <= len; ++i)	309	for (i = 0; i <= len; ++i)
307	{	310	{
		311	SV **svp = av_fetch (av, i, 0);
		312
308	encode_indent (enc);	313	encode_indent (enc);
309	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);
310		319
311	if (i < len)	320	if (i < len)
312	encode_comma (enc);	321	encode_comma (enc);
313	}	322	}
314		323
…		…
470		479
471	if (expect_false (SvOBJECT (sv)))	480	if (expect_false (SvOBJECT (sv)))
472	{	481	{
473	if (SvSTASH (sv) == json_boolean_stash)	482	if (SvSTASH (sv) == json_boolean_stash)
474	{	483	{
475	if (SvIV (sv) == 0)	484	if (SvIV (sv))
		485	encode_str (enc, "true", 4, 0);
		486	else
476	encode_str (enc, "false", 5, 0);	487	encode_str (enc, "false", 5, 0);
477	else
478	encode_str (enc, "true", 4, 0);
479	}	488	}
480	else	489	else
481	{	490	{
482	#if 0	491	#if 0
483	if (0 && sv_derived_from (rv, "JSON::Literal"))	492	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
486	}	495	}
487	#endif	496	#endif
488	if (enc->json.flags & F_CONV_BLESSED)	497	if (enc->json.flags & F_CONV_BLESSED)
489	{	498	{
490	// we re-bless the reference to get overload and other niceties right	499	// we re-bless the reference to get overload and other niceties right
491	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	500	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
492		501
493	if (to_json)	502	if (to_json)
494	{	503	{
		504	int count;
495	dSP;	505	dSP;
496	ENTER;	506
497	SAVETMPS;
498	PUSHMARK (SP);	507	ENTER; SAVETMPS; PUSHMARK (SP);
499	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	508	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500		509
501	// calling with G_SCALAR ensures that we always get a 1 reutrn value	510	// calling with G_SCALAR ensures that we always get a 1 return value
502	// check anyways.
503	PUTBACK;	511	PUTBACK;
504	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	512	call_sv ((SV *)GvCV (to_json), G_SCALAR);
505	SPAGAIN;	513	SPAGAIN;
506		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
507	encode_sv (enc, POPs);	522	encode_sv (enc, sv);
508		523
509	FREETMPS;	524	FREETMPS; LEAVE;
510	LEAVE;
511	}	525	}
512	else if (enc->json.flags & F_ALLOW_BLESSED)	526	else if (enc->json.flags & F_ALLOW_BLESSED)
513	encode_str (enc, "null", 4, 0);	527	encode_str (enc, "null", 4, 0);
514	else	528	else
515	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	529	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
…		…
526	encode_hv (enc, (HV *)sv);	540	encode_hv (enc, (HV *)sv);
527	else if (svt == SVt_PVAV)	541	else if (svt == SVt_PVAV)
528	encode_av (enc, (AV *)sv);	542	encode_av (enc, (AV *)sv);
529	else if (svt < SVt_PVAV)	543	else if (svt < SVt_PVAV)
530	{	544	{
531	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')
532	encode_str (enc, "false", 5, 0);	551	encode_str (enc, "false", 5, 0);
533	else if (SvNIOK (sv) && SvIV (sv) == 1)
534	encode_str (enc, "true", 4, 0);
535	else	552	else
536	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",
537	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	554	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538	}	555	}
539	else	556	else
…		…
1008	}	1025	}
1009		1026
1010	static SV *	1027	static SV *
1011	decode_hv (dec_t *dec)	1028	decode_hv (dec_t *dec)
1012	{	1029	{
		1030	SV *sv;
1013	HV *hv = newHV ();	1031	HV *hv = newHV ();
1014		1032
1015	DEC_INC_DEPTH;	1033	DEC_INC_DEPTH;
1016	decode_ws (dec);	1034	decode_ws (dec);
1017		1035
…		…
1091		1109
1092	++dec->cur;	1110	++dec->cur;
1093	}	1111	}
1094		1112
1095	DEC_DEC_DEPTH;	1113	DEC_DEC_DEPTH;
1096	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;
1097		1175
1098	fail:	1176	fail:
1099	SvREFCNT_dec (hv);	1177	SvREFCNT_dec (hv);
1100	DEC_DEC_DEPTH;	1178	DEC_DEC_DEPTH;
1101	return 0;	1179	return 0;
…		…
1187	dec.end = SvEND (string);	1265	dec.end = SvEND (string);
1188	dec.err = 0;	1266	dec.err = 0;
1189	dec.depth = 0;	1267	dec.depth = 0;
1190	dec.maxdepth = DEC_DEPTH (dec.json.flags);	1268	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1191		1269
		1270	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1271	dec.json.flags \|= F_HOOK;
		1272
1192	*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
1193	sv = decode_sv (&dec);	1274	sv = decode_sv (&dec);
1194		1275
1195	if (!(offset_return \|\| !sv))	1276	if (!(offset_return \|\| !sv))
1196	{	1277	{
…		…
1270	void new (char *klass)	1351	void new (char *klass)
1271	PPCODE:	1352	PPCODE:
1272	{	1353	{
1273	SV *pv = NEWSV (0, sizeof (JSON));	1354	SV *pv = NEWSV (0, sizeof (JSON));
1274	SvPOK_only (pv);	1355	SvPOK_only (pv);
1275	Zero (SvPVX (pv), 1, sizeof (JSON));	1356	Zero (SvPVX (pv), 1, JSON);
1276	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1357	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1358	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1278	}	1359	}
1279		1360
1280	void ascii (JSON *self, int enable = 1)	1361	void ascii (JSON *self, int enable = 1)
…		…
1330	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1411	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1331		1412
1332	XPUSHs (ST (0));	1413	XPUSHs (ST (0));
1333	}	1414	}
1334		1415
		1416	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
		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
1335	void encode (JSON self, SV scalar)	1447	void encode (JSON self, SV scalar)
1336	PPCODE:	1448	PPCODE:
1337	XPUSHs (encode_json (scalar, self));	1449	XPUSHs (encode_json (scalar, self));
1338		1450
1339	void decode (JSON self, SV jsonstr)	1451	void decode (JSON self, SV jsonstr)
…		…
1347	EXTEND (SP, 2);	1459	EXTEND (SP, 2);
1348	PUSHs (decode_json (jsonstr, self, &offset));	1460	PUSHs (decode_json (jsonstr, self, &offset));
1349	PUSHs (sv_2mortal (newSVuv (offset)));	1461	PUSHs (sv_2mortal (newSVuv (offset)));
1350	}	1462	}
1351		1463
		1464	void DESTROY (JSON *self)
		1465	CODE:
		1466	SvREFCNT_dec (self->cb_sk_object);
		1467	SvREFCNT_dec (self->cb_object);
		1468
1352	PROTOTYPES: ENABLE	1469	PROTOTYPES: ENABLE
1353		1470
1354	void to_json (SV *scalar)	1471	void to_json (SV *scalar)
1355	PPCODE:	1472	PPCODE:
1356	{	1473	{

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.48 by root, Sun Jul 1 22:20:00 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.48 by root, Sun Jul 1 22:20:00 2007 UTC vs.
Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC