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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.49 by root, Sun Jul 1 23:40:07 2007 UTC vs.
Revision 1.59 by root, Mon Aug 13 16:14:20 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);
…		…
524	encode_hv (enc, (HV *)sv);	552	encode_hv (enc, (HV *)sv);
525	else if (svt == SVt_PVAV)	553	else if (svt == SVt_PVAV)
526	encode_av (enc, (AV *)sv);	554	encode_av (enc, (AV *)sv);
527	else if (svt < SVt_PVAV)	555	else if (svt < SVt_PVAV)
528	{	556	{
529	if (SvNIOK (sv) && SvIV (sv) == 0)	557	STRLEN len = 0;
		558	char *pv = svt ? SvPV (sv, len) : 0;
		559
		560	if (len == 1 && *pv == '1')
		561	encode_str (enc, "true", 4, 0);
		562	else if (len == 1 && *pv == '0')
530	encode_str (enc, "false", 5, 0);	563	encode_str (enc, "false", 5, 0);
531	else if (SvNIOK (sv) && SvIV (sv) == 1)
532	encode_str (enc, "true", 4, 0);
533	else	564	else
534	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",
535	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	566	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536	}	567	}
537	else	568	else
…		…
918	is_nv = 1;	949	is_nv = 1;
919	}	950	}
920		951
921	if (!is_nv)	952	if (!is_nv)
922	{	953	{
		954	int len = dec->cur - start;
		955
923	// 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
924	if (*start == '-')	957	if (*start == '-')
925	switch (dec->cur - start)	958	switch (len)
926	{	959	{
927	case 2: return newSViv (-( start [1] - '0' * 1));	960	case 2: return newSViv (-( start [1] - '0' * 1));
928	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	961	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
929	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));
930	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));
931	}	964	}
932	else	965	else
933	switch (dec->cur - start)	966	switch (len)
934	{	967	{
935	case 1: return newSViv ( start [0] - '0' * 1);	968	case 1: return newSViv ( start [0] - '0' * 1);
936	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	969	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
937	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);
938	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);
939	}	972	}
940		973
941	{	974	{
942	UV uv;	975	UV uv;
943	int numtype = grok_number (start, dec->cur - start, &uv);	976	int numtype = grok_number (start, len, &uv);
944	if (numtype & IS_NUMBER_IN_UV)	977	if (numtype & IS_NUMBER_IN_UV)
945	if (numtype & IS_NUMBER_NEG)	978	if (numtype & IS_NUMBER_NEG)
946	{	979	{
947	if (uv < (UV)IV_MIN)	980	if (uv < (UV)IV_MIN)
948	return newSViv (-(IV)uv);	981	return newSViv (-(IV)uv);
949	}	982	}
950	else	983	else
951	return newSVuv (uv);	984	return newSVuv (uv);
952
953	// here would likely be the place for bigint support
954	}	985	}
955	}
956		986
957	// 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
958	return newSVnv (Atof (start));	1003	return newSVnv (Atof (start));
959		1004
960	fail:	1005	fail:
961	return 0;	1006	return 0;
962	}	1007	}
…		…
1095	sv = newRV_noinc ((SV *)hv);	1140	sv = newRV_noinc ((SV *)hv);
1096		1141
1097	// check filter callbacks	1142	// check filter callbacks
1098	if (dec->json.flags & F_HOOK)	1143	if (dec->json.flags & F_HOOK)
1099	{	1144	{
1100	ENTER; SAVETMPS;	1145	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1101
1102	if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103	{	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;
1104	int count;	1160	int count;
1105		1161
1106	dSP; PUSHMARK (SP);	1162	ENTER; SAVETMPS; PUSHMARK (SP);
1107	XPUSHs (sv_2mortal (sv));	1163	XPUSHs (HeVAL (he));
1108		1164
1109	PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;	1165	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1110		1166
1111	if (count == 1)	1167	if (count == 1)
		1168	{
1112	sv = newSVsv (POPs);	1169	sv = newSVsv (POPs);
1113	else	1170	FREETMPS; LEAVE;
1114	SvREFCNT_inc (sv);	1171	return sv;
		1172	}
		1173
		1174	FREETMPS; LEAVE;
		1175	}
1115	}	1176	}
1116		1177
1117	if (dec->json.cb_object)	1178	if (dec->json.cb_object)
1118	{	1179	{
		1180	dSP;
1119	int count;	1181	int count;
1120		1182
1121	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	1183	ENTER; SAVETMPS; PUSHMARK (SP);
1122	XPUSHs (sv_2mortal (sv));	1184	XPUSHs (sv_2mortal (sv));
1123		1185
1124	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1186	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125		1187
1126	if (count == 1)	1188	if (count == 1)
		1189	{
1127	sv = newSVsv (POPs);	1190	sv = newSVsv (POPs);
1128	else	1191	FREETMPS; LEAVE;
		1192	return sv;
		1193	}
		1194
1129	SvREFCNT_inc (sv);	1195	SvREFCNT_inc (sv);
		1196	FREETMPS; LEAVE;
1130	}	1197	}
1131
1132	FREETMPS; LEAVE;
1133	}	1198	}
1134		1199
1135	return newRV_noinc ((SV *)hv);	1200	return sv;
1136		1201
1137	fail:	1202	fail:
1138	SvREFCNT_dec (hv);	1203	SvREFCNT_dec (hv);
1139	DEC_DEC_DEPTH;	1204	DEC_DEC_DEPTH;
1140	return 0;	1205	return 0;
…		…
1307	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1372	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1308	}	1373	}
1309		1374
1310	PROTOTYPES: DISABLE	1375	PROTOTYPES: DISABLE
1311		1376
		1377	void CLONE (...)
		1378	CODE:
		1379	json_stash = 0;
		1380	json_boolean_stash = 0;
		1381
1312	void new (char *klass)	1382	void new (char *klass)
1313	PPCODE:	1383	PPCODE:
1314	{	1384	{
1315	SV *pv = NEWSV (0, sizeof (JSON));	1385	SV *pv = NEWSV (0, sizeof (JSON));
1316	SvPOK_only (pv);	1386	SvPOK_only (pv);
1317	Zero (SvPVX (pv), 1, JSON);	1387	Zero (SvPVX (pv), 1, JSON);
1318	((JSON *)SvPVX (pv))->flags = F_DEFAULT;	1388	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1319	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));	1389	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1320	}	1390	}
1321		1391
1322	void ascii (JSON *self, int enable = 1)	1392	void ascii (JSON *self, int enable = 1)
1323	ALIAS:	1393	ALIAS:
1324	ascii = F_ASCII	1394	ascii = F_ASCII
…		…
1372	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1442	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1373		1443
1374	XPUSHs (ST (0));	1444	XPUSHs (ST (0));
1375	}	1445	}
1376		1446
1377	void filter_json_objects (JSON self, SV cb = &PL_sv_undef)	1447	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1378	ALIAS:
1379	filter_sk_json_objects = 1
1380	PPCODE:	1448	PPCODE:
1381	{	1449	{
		1450	SvREFCNT_dec (self->cb_object);
		1451	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1452
		1453	XPUSHs (ST (0));
		1454	}
		1455
		1456	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1457	PPCODE:
		1458	{
		1459	if (!self->cb_sk_object)
		1460	self->cb_sk_object = newHV ();
		1461
1382	if (!SvOK (cb))	1462	if (SvOK (cb))
1383	cb = 0;	1463	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1384		1464	else
1385	switch (ix)
1386	{	1465	{
1387	case 0: self->cb_object = cb; break;	1466	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1467
		1468	if (!HvKEYS (self->cb_sk_object))
		1469	{
		1470	SvREFCNT_dec (self->cb_sk_object);
1388	case 1: self->cb_sk_object = cb; break;	1471	self->cb_sk_object = 0;
		1472	}
1389	}	1473	}
1390		1474
1391	XPUSHs (ST (0));	1475	XPUSHs (ST (0));
1392	}	1476	}
1393		1477
…		…
1406	EXTEND (SP, 2);	1490	EXTEND (SP, 2);
1407	PUSHs (decode_json (jsonstr, self, &offset));	1491	PUSHs (decode_json (jsonstr, self, &offset));
1408	PUSHs (sv_2mortal (newSVuv (offset)));	1492	PUSHs (sv_2mortal (newSVuv (offset)));
1409	}	1493	}
1410		1494
		1495	void DESTROY (JSON *self)
		1496	CODE:
		1497	SvREFCNT_dec (self->cb_sk_object);
		1498	SvREFCNT_dec (self->cb_object);
		1499
1411	PROTOTYPES: ENABLE	1500	PROTOTYPES: ENABLE
1412		1501
1413	void to_json (SV *scalar)	1502	void to_json (SV *scalar)
1414	PPCODE:	1503	PPCODE:
1415	{	1504	{

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.49 by root, Sun Jul 1 23:40:07 2007 UTC vs. Revision 1.59 by root, Mon Aug 13 16:14:20 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.49 by root, Sun Jul 1 23:40:07 2007 UTC vs.
Revision 1.59 by root, Mon Aug 13 16:14:20 2007 UTC