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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.50 by root, Mon Jul 2 00:29:38 2007 UTC vs.
Revision 1.60 by root, Mon Aug 13 16:19:13 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
57	#endif	58	#endif
58		59
59	#define expect_false(expr) expect ((expr) != 0, 0)	60	#define expect_false(expr) expect ((expr) != 0, 0)
60	#define expect_true(expr) expect ((expr) != 0, 1)	61	#define expect_true(expr) expect ((expr) != 0, 1)
61		62
		63	#ifdef USE_ITHREADS
		64	# define JSON_SLOW 1
		65	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		66	#else
		67	# define JSON_SLOW 0
		68	# define JSON_STASH json_stash
		69	#endif
		70
62	static HV json_stash, json_boolean_stash; // JSON::XS::	71	static HV json_stash, json_boolean_stash; // JSON::XS::
63	static SV json_true, json_false;	72	static SV json_true, json_false;
64		73
65	typedef struct {	74	typedef struct {
66	U32 flags;	75	U32 flags;
67	SV cb_object, cb_sk_object;	76	SV *cb_object;
		77	HV *cb_sk_object;
68	} JSON;	78	} JSON;
69		79
70	/////////////////////////////////////////////////////////////////////////////	80	/////////////////////////////////////////////////////////////////////////////
71	// utility functions	81	// utility functions
72		82
…		…
305	encode_ch (enc, '['); encode_nl (enc);	315	encode_ch (enc, '['); encode_nl (enc);
306	++enc->indent;	316	++enc->indent;
307		317
308	for (i = 0; i <= len; ++i)	318	for (i = 0; i <= len; ++i)
309	{	319	{
		320	SV **svp = av_fetch (av, i, 0);
		321
310	encode_indent (enc);	322	encode_indent (enc);
311	encode_sv (enc, *av_fetch (av, i, 0));	323
		324	if (svp)
		325	encode_sv (enc, *svp);
		326	else
		327	encode_str (enc, "null", 4, 0);
312		328
313	if (i < len)	329	if (i < len)
314	encode_comma (enc);	330	encode_comma (enc);
315	}	331	}
316		332
…		…
470	SvGETMAGIC (sv);	486	SvGETMAGIC (sv);
471	svt = SvTYPE (sv);	487	svt = SvTYPE (sv);
472		488
473	if (expect_false (SvOBJECT (sv)))	489	if (expect_false (SvOBJECT (sv)))
474	{	490	{
		491	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		492	? json_boolean_stash
		493	: gv_stashpv ("JSON::XS::Boolean", 1);
		494
475	if (SvSTASH (sv) == json_boolean_stash)	495	if (SvSTASH (sv) == stash)
476	{	496	{
477	if (SvIV (sv) == 0)	497	if (SvIV (sv))
		498	encode_str (enc, "true", 4, 0);
		499	else
478	encode_str (enc, "false", 5, 0);	500	encode_str (enc, "false", 5, 0);
479	else
480	encode_str (enc, "true", 4, 0);
481	}	501	}
482	else	502	else
483	{	503	{
484	#if 0	504	#if 0
485	if (0 && sv_derived_from (rv, "JSON::Literal"))	505	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
488	}	508	}
489	#endif	509	#endif
490	if (enc->json.flags & F_CONV_BLESSED)	510	if (enc->json.flags & F_CONV_BLESSED)
491	{	511	{
492	// we re-bless the reference to get overload and other niceties right	512	// we re-bless the reference to get overload and other niceties right
493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	513	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494		514
495	if (to_json)	515	if (to_json)
496	{	516	{
		517	dSP;
		518
497	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	519	ENTER; SAVETMPS; PUSHMARK (SP);
498	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	520	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499		521
500	// calling with G_SCALAR ensures that we always get a 1 reutrn value	522	// calling with G_SCALAR ensures that we always get a 1 return value
501	// check anyways.
502	PUTBACK;	523	PUTBACK;
503	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	524	call_sv ((SV *)GvCV (to_json), G_SCALAR);
504	SPAGAIN;	525	SPAGAIN;
505		526
		527	// catch this surprisingly common error
		528	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		529	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		530
		531	sv = POPs;
		532	PUTBACK;
		533
506	encode_sv (enc, POPs);	534	encode_sv (enc, sv);
507		535
508	FREETMPS; LEAVE;	536	FREETMPS; LEAVE;
509	}	537	}
510	else if (enc->json.flags & F_ALLOW_BLESSED)	538	else if (enc->json.flags & F_ALLOW_BLESSED)
511	encode_str (enc, "null", 4, 0);	539	encode_str (enc, "null", 4, 0);
…		…
527	else if (svt < SVt_PVAV)	555	else if (svt < SVt_PVAV)
528	{	556	{
529	STRLEN len = 0;	557	STRLEN len = 0;
530	char *pv = svt ? SvPV (sv, len) : 0;	558	char *pv = svt ? SvPV (sv, len) : 0;
531		559
532	if (len == 1 && *pv == '0')	560	if (len == 1 && *pv == '1')
		561	encode_str (enc, "true", 4, 0);
		562	else if (len == 1 && *pv == '0')
533	encode_str (enc, "false", 5, 0);	563	encode_str (enc, "false", 5, 0);
534	else if (len == 1 && *pv == '1')
535	encode_str (enc, "true", 4, 0);
536	else	564	else
537	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	565	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
538	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	566	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
539	}	567	}
540	else	568	else
…		…
921	is_nv = 1;	949	is_nv = 1;
922	}	950	}
923		951
924	if (!is_nv)	952	if (!is_nv)
925	{	953	{
		954	int len = dec->cur - start;
		955
926	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so	956	// special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
927	if (*start == '-')	957	if (*start == '-')
928	switch (dec->cur - start)	958	switch (len)
929	{	959	{
930	case 2: return newSViv (-( start [1] - '0' * 1));	960	case 2: return newSViv (-( start [1] - '0' * 1));
931	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	961	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
932	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	962	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
933	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	963	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
934	}	964	}
935	else	965	else
936	switch (dec->cur - start)	966	switch (len)
937	{	967	{
938	case 1: return newSViv ( start [0] - '0' * 1);	968	case 1: return newSViv ( start [0] - '0' * 1);
939	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	969	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
940	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	970	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
941	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	971	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
942	}	972	}
943		973
944	{	974	{
945	UV uv;	975	UV uv;
946	int numtype = grok_number (start, dec->cur - start, &uv);	976	int numtype = grok_number (start, len, &uv);
947	if (numtype & IS_NUMBER_IN_UV)	977	if (numtype & IS_NUMBER_IN_UV)
948	if (numtype & IS_NUMBER_NEG)	978	if (numtype & IS_NUMBER_NEG)
949	{	979	{
950	if (uv < (UV)IV_MIN)	980	if (uv < (UV)IV_MIN)
951	return newSViv (-(IV)uv);	981	return newSViv (-(IV)uv);
952	}	982	}
953	else	983	else
954	return newSVuv (uv);	984	return newSVuv (uv);
955
956	// here would likely be the place for bigint support
957	}	985	}
958	}
959		986
960	// if we ever support bigint or bigfloat, this is the place for bigfloat	987	len -= *start == '-' ? 1 : 0;
		988
		989	// does not fit into IV or UV, try NV
		990	if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
		991	#if defined (LDBL_DIG)
		992	\|\| (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
		993	#endif
		994	)
		995	// fits into NV without loss of precision
		996	return newSVnv (Atof (start));
		997
		998	// everything else fails, convert it to a string
		999	return newSVpvn (start, dec->cur - start);
		1000	}
		1001
		1002	// loss of precision here
961	return newSVnv (Atof (start));	1003	return newSVnv (Atof (start));
962		1004
963	fail:	1005	fail:
964	return 0;	1006	return 0;
965	}	1007	}
…		…
1098	sv = newRV_noinc ((SV *)hv);	1140	sv = newRV_noinc ((SV *)hv);
1099		1141
1100	// check filter callbacks	1142	// check filter callbacks
1101	if (dec->json.flags & F_HOOK)	1143	if (dec->json.flags & F_HOOK)
1102	{	1144	{
1103	ENTER; SAVETMPS;	1145	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1104
1105	if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1106	{	1146	{
		1147	HE cb, he;
		1148
		1149	hv_iterinit (hv);
		1150	he = hv_iternext (hv);
		1151	hv_iterinit (hv);
		1152
		1153	// the next line creates a mortal sv each time its called.
		1154	// might want to optimise this for common cases.
		1155	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1156
		1157	if (cb)
		1158	{
		1159	dSP;
1107	int count;	1160	int count;
1108		1161
1109	dSP; PUSHMARK (SP);	1162	ENTER; SAVETMPS; PUSHMARK (SP);
1110	XPUSHs (sv_2mortal (sv));	1163	XPUSHs (HeVAL (he));
1111		1164
1112	PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;	1165	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1113		1166
1114	if (count == 1)	1167	if (count == 1)
		1168	{
1115	sv = newSVsv (POPs);	1169	sv = newSVsv (POPs);
1116	else	1170	FREETMPS; LEAVE;
1117	SvREFCNT_inc (sv);	1171	return sv;
		1172	}
		1173
		1174	FREETMPS; LEAVE;
		1175	}
1118	}	1176	}
1119		1177
1120	if (dec->json.cb_object)	1178	if (dec->json.cb_object)
1121	{	1179	{
		1180	dSP;
1122	int count;	1181	int count;
1123		1182
1124	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	1183	ENTER; SAVETMPS; PUSHMARK (SP);
1125	XPUSHs (sv_2mortal (sv));	1184	XPUSHs (sv_2mortal (sv));
1126		1185
1127	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1186	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1128		1187
1129	if (count == 1)	1188	if (count == 1)
		1189	{
1130	sv = newSVsv (POPs);	1190	sv = newSVsv (POPs);
1131	else	1191	FREETMPS; LEAVE;
		1192	return sv;
		1193	}
		1194
1132	SvREFCNT_inc (sv);	1195	SvREFCNT_inc (sv);
		1196	FREETMPS; LEAVE;
1133	}	1197	}
1134
1135	FREETMPS; LEAVE;
1136	}	1198	}
1137		1199
1138	return newRV_noinc ((SV *)hv);	1200	return sv;
1139		1201
1140	fail:	1202	fail:
1141	SvREFCNT_dec (hv);	1203	SvREFCNT_dec (hv);
1142	DEC_DEC_DEPTH;	1204	DEC_DEC_DEPTH;
1143	return 0;	1205	return 0;
…		…
1163		1225
1164	case 't':	1226	case 't':
1165	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1227	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1166	{	1228	{
1167	dec->cur += 4;	1229	dec->cur += 4;
		1230	#if JSON_SLOW
		1231	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
		1232	#endif
1168	return SvREFCNT_inc (json_true);	1233	return SvREFCNT_inc (json_true);
1169	}	1234	}
1170	else	1235	else
1171	ERR ("'true' expected");	1236	ERR ("'true' expected");
1172		1237
…		…
1174		1239
1175	case 'f':	1240	case 'f':
1176	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1241	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1177	{	1242	{
1178	dec->cur += 5;	1243	dec->cur += 5;
		1244	#if JSON_SLOW
		1245	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
		1246	#endif
1179	return SvREFCNT_inc (json_false);	1247	return SvREFCNT_inc (json_false);
1180	}	1248	}
1181	else	1249	else
1182	ERR ("'false' expected");	1250	ERR ("'false' expected");
1183		1251
…		…
1310	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1378	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1311	}	1379	}
1312		1380
1313	PROTOTYPES: DISABLE	1381	PROTOTYPES: DISABLE
1314		1382
		1383	void CLONE (...)
		1384	CODE:
		1385	json_stash = 0;
		1386	json_boolean_stash = 0;
		1387
1315	void new (char *klass)	1388	void new (char *klass)
1316	PPCODE:	1389	PPCODE:
1317	{	1390	{
1318	SV *pv = NEWSV (0, sizeof (JSON));	1391	SV *pv = NEWSV (0, sizeof (JSON));
1319	SvPOK_only (pv);	1392	SvPOK_only (pv);
1320	Zero (SvPVX (pv), 1, JSON);	1393	Zero (SvPVX (pv), 1, JSON);
1321	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1394	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1322	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1395	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1323	}	1396	}
1324		1397
1325	void ascii (JSON *self, int enable = 1)	1398	void ascii (JSON *self, int enable = 1)
1326	ALIAS:	1399	ALIAS:
1327	ascii = F_ASCII	1400	ascii = F_ASCII
…		…
1375	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1448	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1376		1449
1377	XPUSHs (ST (0));	1450	XPUSHs (ST (0));
1378	}	1451	}
1379		1452
1380	void filter_json_objects (JSON self, SV cb = &PL_sv_undef)	1453	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1381	ALIAS:
1382	filter_sk_json_objects = 1
1383	PPCODE:	1454	PPCODE:
1384	{	1455	{
		1456	SvREFCNT_dec (self->cb_object);
		1457	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1458
		1459	XPUSHs (ST (0));
		1460	}
		1461
		1462	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1463	PPCODE:
		1464	{
		1465	if (!self->cb_sk_object)
		1466	self->cb_sk_object = newHV ();
		1467
1385	if (!SvOK (cb))	1468	if (SvOK (cb))
1386	cb = 0;	1469	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1387		1470	else
1388	switch (ix)
1389	{	1471	{
1390	case 0: self->cb_object = cb; break;	1472	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1473
		1474	if (!HvKEYS (self->cb_sk_object))
		1475	{
		1476	SvREFCNT_dec (self->cb_sk_object);
1391	case 1: self->cb_sk_object = cb; break;	1477	self->cb_sk_object = 0;
		1478	}
1392	}	1479	}
1393		1480
1394	XPUSHs (ST (0));	1481	XPUSHs (ST (0));
1395	}	1482	}
1396		1483
…		…
1409	EXTEND (SP, 2);	1496	EXTEND (SP, 2);
1410	PUSHs (decode_json (jsonstr, self, &offset));	1497	PUSHs (decode_json (jsonstr, self, &offset));
1411	PUSHs (sv_2mortal (newSVuv (offset)));	1498	PUSHs (sv_2mortal (newSVuv (offset)));
1412	}	1499	}
1413		1500
		1501	void DESTROY (JSON *self)
		1502	CODE:
		1503	SvREFCNT_dec (self->cb_sk_object);
		1504	SvREFCNT_dec (self->cb_object);
		1505
1414	PROTOTYPES: ENABLE	1506	PROTOTYPES: ENABLE
1415		1507
1416	void to_json (SV *scalar)	1508	void to_json (SV *scalar)
1417	PPCODE:	1509	PPCODE:
1418	{	1510	{

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.50 by root, Mon Jul 2 00:29:38 2007 UTC vs. Revision 1.60 by root, Mon Aug 13 16:19:13 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.50 by root, Mon Jul 2 00:29:38 2007 UTC vs.
Revision 1.60 by root, Mon Aug 13 16:19:13 2007 UTC