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

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.58 by root, Mon Aug 13 16:06:25 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.58 by root, Mon Aug 13 16:06:25 2007 UTC