[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.56 by root, Thu Jul 26 11:33:35 2007 UTC

…		…
1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#include "assert.h"	5	#include <assert.h>
6	#include "string.h"	6	#include <string.h>
7	#include "stdlib.h"	7	#include <stdlib.h>
8	#include "stdio.h"	8	#include <stdio.h>
		9	#include <float.h>
9		10
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	11	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	12	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	13	#endif
13		14
25	#define F_SPACE_BEFORE 0x00000020UL	26	#define F_SPACE_BEFORE 0x00000020UL
26	#define F_SPACE_AFTER 0x00000040UL	27	#define F_SPACE_AFTER 0x00000040UL
27	#define F_ALLOW_NONREF 0x00000100UL	28	#define F_ALLOW_NONREF 0x00000100UL
28	#define F_SHRINK 0x00000200UL	29	#define F_SHRINK 0x00000200UL
29	#define F_ALLOW_BLESSED 0x00000400UL	30	#define F_ALLOW_BLESSED 0x00000400UL
30	#define F_CONV_BLESSED 0x00000800UL // NYI	31	#define F_CONV_BLESSED 0x00000800UL
31	#define F_MAXDEPTH 0xf8000000UL	32	#define F_MAXDEPTH 0xf8000000UL
32	#define S_MAXDEPTH 27	33	#define S_MAXDEPTH 27
33	#define F_MAXSIZE 0x01f00000UL	34	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	35	#define S_MAXSIZE 20
		36	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35		37
36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	38	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))	39	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38		40
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	41	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
…		…
61	static HV json_stash, json_boolean_stash; // JSON::XS::	63	static HV json_stash, json_boolean_stash; // JSON::XS::
62	static SV json_true, json_false;	64	static SV json_true, json_false;
63		65
64	typedef struct {	66	typedef struct {
65	U32 flags;	67	U32 flags;
		68	SV *cb_object;
		69	HV *cb_sk_object;
66	} JSON;	70	} JSON;
67		71
68	/////////////////////////////////////////////////////////////////////////////	72	/////////////////////////////////////////////////////////////////////////////
69	// utility functions	73	// utility functions
70		74
…		…
303	encode_ch (enc, '['); encode_nl (enc);	307	encode_ch (enc, '['); encode_nl (enc);
304	++enc->indent;	308	++enc->indent;
305		309
306	for (i = 0; i <= len; ++i)	310	for (i = 0; i <= len; ++i)
307	{	311	{
		312	SV **svp = av_fetch (av, i, 0);
		313
308	encode_indent (enc);	314	encode_indent (enc);
309	encode_sv (enc, *av_fetch (av, i, 0));	315
		316	if (svp)
		317	encode_sv (enc, *svp);
		318	else
		319	encode_str (enc, "null", 4, 0);
310		320
311	if (i < len)	321	if (i < len)
312	encode_comma (enc);	322	encode_comma (enc);
313	}	323	}
314		324
…		…
470		480
471	if (expect_false (SvOBJECT (sv)))	481	if (expect_false (SvOBJECT (sv)))
472	{	482	{
473	if (SvSTASH (sv) == json_boolean_stash)	483	if (SvSTASH (sv) == json_boolean_stash)
474	{	484	{
475	if (SvIV (sv) == 0)	485	if (SvIV (sv))
		486	encode_str (enc, "true", 4, 0);
		487	else
476	encode_str (enc, "false", 5, 0);	488	encode_str (enc, "false", 5, 0);
477	else
478	encode_str (enc, "true", 4, 0);
479	}	489	}
480	else	490	else
481	{	491	{
482	#if 0	492	#if 0
483	if (0 && sv_derived_from (rv, "JSON::Literal"))	493	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
486	}	496	}
487	#endif	497	#endif
488	if (enc->json.flags & F_CONV_BLESSED)	498	if (enc->json.flags & F_CONV_BLESSED)
489	{	499	{
490	// we re-bless the reference to get overload and other niceties right	500	// we re-bless the reference to get overload and other niceties right
491	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	501	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
492		502
493	if (to_json)	503	if (to_json)
494	{	504	{
		505	int count;
495	dSP;	506	dSP;
496	ENTER;	507
497	SAVETMPS;
498	PUSHMARK (SP);	508	ENTER; SAVETMPS; PUSHMARK (SP);
499	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	509	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500		510
501	// calling with G_SCALAR ensures that we always get a 1 reutrn value	511	// calling with G_SCALAR ensures that we always get a 1 return value
502	// check anyways.
503	PUTBACK;	512	PUTBACK;
504	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	513	call_sv ((SV *)GvCV (to_json), G_SCALAR);
505	SPAGAIN;	514	SPAGAIN;
506		515
		516	// catch this surprisingly common error
		517	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		518	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		519
		520	sv = POPs;
		521	PUTBACK;
		522
507	encode_sv (enc, POPs);	523	encode_sv (enc, sv);
508		524
509	FREETMPS;	525	FREETMPS; LEAVE;
510	LEAVE;
511	}	526	}
512	else if (enc->json.flags & F_ALLOW_BLESSED)	527	else if (enc->json.flags & F_ALLOW_BLESSED)
513	encode_str (enc, "null", 4, 0);	528	encode_str (enc, "null", 4, 0);
514	else	529	else
515	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	530	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
…		…
526	encode_hv (enc, (HV *)sv);	541	encode_hv (enc, (HV *)sv);
527	else if (svt == SVt_PVAV)	542	else if (svt == SVt_PVAV)
528	encode_av (enc, (AV *)sv);	543	encode_av (enc, (AV *)sv);
529	else if (svt < SVt_PVAV)	544	else if (svt < SVt_PVAV)
530	{	545	{
531	if (SvNIOK (sv) && SvIV (sv) == 0)	546	STRLEN len = 0;
		547	char *pv = svt ? SvPV (sv, len) : 0;
		548
		549	if (len == 1 && *pv == '1')
		550	encode_str (enc, "true", 4, 0);
		551	else if (len == 1 && *pv == '0')
532	encode_str (enc, "false", 5, 0);	552	encode_str (enc, "false", 5, 0);
533	else if (SvNIOK (sv) && SvIV (sv) == 1)
534	encode_str (enc, "true", 4, 0);
535	else	553	else
536	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	554	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
537	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	555	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538	}	556	}
539	else	557	else
…		…
920	is_nv = 1;	938	is_nv = 1;
921	}	939	}
922		940
923	if (!is_nv)	941	if (!is_nv)
924	{	942	{
		943	int len = dec->cur - start;
		944
925	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	945	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
926	if (*start == '-')	946	if (*start == '-')
927	switch (dec->cur - start)	947	switch (len)
928	{	948	{
929	case 2: return newSViv (-( start [1] - '0' * 1));	949	case 2: return newSViv (-( start [1] - '0' * 1));
930	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	950	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
931	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	951	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
932	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	952	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
933	}	953	}
934	else	954	else
935	switch (dec->cur - start)	955	switch (len)
936	{	956	{
937	case 1: return newSViv ( start [0] - '0' * 1);	957	case 1: return newSViv ( start [0] - '0' * 1);
938	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	958	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
939	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	959	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
940	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	960	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
941	}	961	}
942		962
943	{	963	{
944	UV uv;	964	UV uv;
945	int numtype = grok_number (start, dec->cur - start, &uv);	965	int numtype = grok_number (start, len, &uv);
946	if (numtype & IS_NUMBER_IN_UV)	966	if (numtype & IS_NUMBER_IN_UV)
947	if (numtype & IS_NUMBER_NEG)	967	if (numtype & IS_NUMBER_NEG)
948	{	968	{
949	if (uv < (UV)IV_MIN)	969	if (uv < (UV)IV_MIN)
950	return newSViv (-(IV)uv);	970	return newSViv (-(IV)uv);
951	}	971	}
952	else	972	else
953	return newSVuv (uv);	973	return newSVuv (uv);
954
955	// here would likely be the place for bigint support
956	}	974	}
957	}
958		975
959	// if we ever support bigint or bigfloat, this is the place for bigfloat	976	len -= *start == '-' ? 1 : 0;
		977
		978	// does not fit into IV or UV, try NV
		979	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		980	#if defined (LDBL_DIG)
		981	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		982	#endif
		983	)
		984	// fits into NV without loss of precision
		985	return newSVnv (Atof (start));
		986
		987	// everything else fails, convert it to a string
		988	return newSVpvn (start, dec->cur - start);
		989	}
		990
		991	// loss of precision here
960	return newSVnv (Atof (start));	992	return newSVnv (Atof (start));
961		993
962	fail:	994	fail:
963	return 0;	995	return 0;
964	}	996	}
…		…
1008	}	1040	}
1009		1041
1010	static SV *	1042	static SV *
1011	decode_hv (dec_t *dec)	1043	decode_hv (dec_t *dec)
1012	{	1044	{
		1045	SV *sv;
1013	HV *hv = newHV ();	1046	HV *hv = newHV ();
1014		1047
1015	DEC_INC_DEPTH;	1048	DEC_INC_DEPTH;
1016	decode_ws (dec);	1049	decode_ws (dec);
1017		1050
…		…
1091		1124
1092	++dec->cur;	1125	++dec->cur;
1093	}	1126	}
1094		1127
1095	DEC_DEC_DEPTH;	1128	DEC_DEC_DEPTH;
1096	return newRV_noinc ((SV *)hv);	1129	sv = newRV_noinc ((SV *)hv);
		1130
		1131	// check filter callbacks
		1132	if (dec->json.flags & F_HOOK)
		1133	{
		1134	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1135	{
		1136	HE cb, he;
		1137
		1138	hv_iterinit (hv);
		1139	he = hv_iternext (hv);
		1140	hv_iterinit (hv);
		1141
		1142	// the next line creates a mortal sv each time its called.
		1143	// might want to optimise this for common cases.
		1144	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1145
		1146	if (cb)
		1147	{
		1148	dSP;
		1149	int count;
		1150
		1151	ENTER; SAVETMPS; PUSHMARK (SP);
		1152	XPUSHs (HeVAL (he));
		1153
		1154	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1155
		1156	if (count == 1)
		1157	{
		1158	sv = newSVsv (POPs);
		1159	FREETMPS; LEAVE;
		1160	return sv;
		1161	}
		1162
		1163	FREETMPS; LEAVE;
		1164	}
		1165	}
		1166
		1167	if (dec->json.cb_object)
		1168	{
		1169	dSP;
		1170	int count;
		1171
		1172	ENTER; SAVETMPS; PUSHMARK (SP);
		1173	XPUSHs (sv_2mortal (sv));
		1174
		1175	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1176
		1177	if (count == 1)
		1178	{
		1179	sv = newSVsv (POPs);
		1180	FREETMPS; LEAVE;
		1181	return sv;
		1182	}
		1183
		1184	SvREFCNT_inc (sv);
		1185	FREETMPS; LEAVE;
		1186	}
		1187	}
		1188
		1189	return sv;
1097		1190
1098	fail:	1191	fail:
1099	SvREFCNT_dec (hv);	1192	SvREFCNT_dec (hv);
1100	DEC_DEC_DEPTH;	1193	DEC_DEC_DEPTH;
1101	return 0;	1194	return 0;
…		…
1187	dec.end = SvEND (string);	1280	dec.end = SvEND (string);
1188	dec.err = 0;	1281	dec.err = 0;
1189	dec.depth = 0;	1282	dec.depth = 0;
1190	dec.maxdepth = DEC_DEPTH (dec.json.flags);	1283	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1191		1284
		1285	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1286	dec.json.flags \|= F_HOOK;
		1287
1192	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1288	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1193	sv = decode_sv (&dec);	1289	sv = decode_sv (&dec);
1194		1290
1195	if (!(offset_return \|\| !sv))	1291	if (!(offset_return \|\| !sv))
1196	{	1292	{
…		…
1270	void new (char *klass)	1366	void new (char *klass)
1271	PPCODE:	1367	PPCODE:
1272	{	1368	{
1273	SV *pv = NEWSV (0, sizeof (JSON));	1369	SV *pv = NEWSV (0, sizeof (JSON));
1274	SvPOK_only (pv);	1370	SvPOK_only (pv);
1275	Zero (SvPVX (pv), 1, sizeof (JSON));	1371	Zero (SvPVX (pv), 1, JSON);
1276	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1372	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1277	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1373	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1278	}	1374	}
1279		1375
1280	void ascii (JSON *self, int enable = 1)	1376	void ascii (JSON *self, int enable = 1)
…		…
1330	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1426	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1331		1427
1332	XPUSHs (ST (0));	1428	XPUSHs (ST (0));
1333	}	1429	}
1334		1430
		1431	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
		1432	PPCODE:
		1433	{
		1434	SvREFCNT_dec (self->cb_object);
		1435	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1436
		1437	XPUSHs (ST (0));
		1438	}
		1439
		1440	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1441	PPCODE:
		1442	{
		1443	if (!self->cb_sk_object)
		1444	self->cb_sk_object = newHV ();
		1445
		1446	if (SvOK (cb))
		1447	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1448	else
		1449	{
		1450	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1451
		1452	if (!HvKEYS (self->cb_sk_object))
		1453	{
		1454	SvREFCNT_dec (self->cb_sk_object);
		1455	self->cb_sk_object = 0;
		1456	}
		1457	}
		1458
		1459	XPUSHs (ST (0));
		1460	}
		1461
1335	void encode (JSON self, SV scalar)	1462	void encode (JSON self, SV scalar)
1336	PPCODE:	1463	PPCODE:
1337	XPUSHs (encode_json (scalar, self));	1464	XPUSHs (encode_json (scalar, self));
1338		1465
1339	void decode (JSON self, SV jsonstr)	1466	void decode (JSON self, SV jsonstr)
…		…
1347	EXTEND (SP, 2);	1474	EXTEND (SP, 2);
1348	PUSHs (decode_json (jsonstr, self, &offset));	1475	PUSHs (decode_json (jsonstr, self, &offset));
1349	PUSHs (sv_2mortal (newSVuv (offset)));	1476	PUSHs (sv_2mortal (newSVuv (offset)));
1350	}	1477	}
1351		1478
		1479	void DESTROY (JSON *self)
		1480	CODE:
		1481	SvREFCNT_dec (self->cb_sk_object);
		1482	SvREFCNT_dec (self->cb_object);
		1483
1352	PROTOTYPES: ENABLE	1484	PROTOTYPES: ENABLE
1353		1485
1354	void to_json (SV *scalar)	1486	void to_json (SV *scalar)
1355	PPCODE:	1487	PPCODE:
1356	{	1488	{

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.56 by root, Thu Jul 26 11:33:35 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.56 by root, Thu Jul 26 11:33:35 2007 UTC