[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.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
62	static HV json_stash, json_boolean_stash; // JSON::XS::	63	static HV json_stash, json_boolean_stash; // JSON::XS::
63	static SV json_true, json_false;	64	static SV json_true, json_false;
64		65
65	typedef struct {	66	typedef struct {
66	U32 flags;	67	U32 flags;
67	SV cb_object, cb_sk_object;	68	SV *cb_object;
		69	HV *cb_sk_object;
68	} JSON;	70	} JSON;
69		71
70	/////////////////////////////////////////////////////////////////////////////	72	/////////////////////////////////////////////////////////////////////////////
71	// utility functions	73	// utility functions
72		74
…		…
305	encode_ch (enc, '['); encode_nl (enc);	307	encode_ch (enc, '['); encode_nl (enc);
306	++enc->indent;	308	++enc->indent;
307		309
308	for (i = 0; i <= len; ++i)	310	for (i = 0; i <= len; ++i)
309	{	311	{
		312	SV **svp = av_fetch (av, i, 0);
		313
310	encode_indent (enc);	314	encode_indent (enc);
311	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);
312		320
313	if (i < len)	321	if (i < len)
314	encode_comma (enc);	322	encode_comma (enc);
315	}	323	}
316		324
…		…
472		480
473	if (expect_false (SvOBJECT (sv)))	481	if (expect_false (SvOBJECT (sv)))
474	{	482	{
475	if (SvSTASH (sv) == json_boolean_stash)	483	if (SvSTASH (sv) == json_boolean_stash)
476	{	484	{
477	if (SvIV (sv) == 0)	485	if (SvIV (sv))
		486	encode_str (enc, "true", 4, 0);
		487	else
478	encode_str (enc, "false", 5, 0);	488	encode_str (enc, "false", 5, 0);
479	else
480	encode_str (enc, "true", 4, 0);
481	}	489	}
482	else	490	else
483	{	491	{
484	#if 0	492	#if 0
485	if (0 && sv_derived_from (rv, "JSON::Literal"))	493	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
488	}	496	}
489	#endif	497	#endif
490	if (enc->json.flags & F_CONV_BLESSED)	498	if (enc->json.flags & F_CONV_BLESSED)
491	{	499	{
492	// 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
493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	501	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494		502
495	if (to_json)	503	if (to_json)
496	{	504	{
		505	int count;
		506	dSP;
		507
497	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	508	ENTER; SAVETMPS; PUSHMARK (SP);
498	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	509	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499		510
500	// 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
501	// check anyways.
502	PUTBACK;	512	PUTBACK;
503	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	513	call_sv ((SV *)GvCV (to_json), G_SCALAR);
504	SPAGAIN;	514	SPAGAIN;
505		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
506	encode_sv (enc, POPs);	523	encode_sv (enc, sv);
507		524
508	FREETMPS; LEAVE;	525	FREETMPS; LEAVE;
509	}	526	}
510	else if (enc->json.flags & F_ALLOW_BLESSED)	527	else if (enc->json.flags & F_ALLOW_BLESSED)
511	encode_str (enc, "null", 4, 0);	528	encode_str (enc, "null", 4, 0);
…		…
524	encode_hv (enc, (HV *)sv);	541	encode_hv (enc, (HV *)sv);
525	else if (svt == SVt_PVAV)	542	else if (svt == SVt_PVAV)
526	encode_av (enc, (AV *)sv);	543	encode_av (enc, (AV *)sv);
527	else if (svt < SVt_PVAV)	544	else if (svt < SVt_PVAV)
528	{	545	{
529	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')
530	encode_str (enc, "false", 5, 0);	552	encode_str (enc, "false", 5, 0);
531	else if (SvNIOK (sv) && SvIV (sv) == 1)
532	encode_str (enc, "true", 4, 0);
533	else	553	else
534	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",
535	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	555	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536	}	556	}
537	else	557	else
…		…
918	is_nv = 1;	938	is_nv = 1;
919	}	939	}
920		940
921	if (!is_nv)	941	if (!is_nv)
922	{	942	{
		943	int len = dec->cur - start;
		944
923	// 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
924	if (*start == '-')	946	if (*start == '-')
925	switch (dec->cur - start)	947	switch (len)
926	{	948	{
927	case 2: return newSViv (-( start [1] - '0' * 1));	949	case 2: return newSViv (-( start [1] - '0' * 1));
928	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	950	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));	951	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));	952	case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
931	}	953	}
932	else	954	else
933	switch (dec->cur - start)	955	switch (len)
934	{	956	{
935	case 1: return newSViv ( start [0] - '0' * 1);	957	case 1: return newSViv ( start [0] - '0' * 1);
936	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	958	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);	959	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);	960	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
939	}	961	}
940		962
941	{	963	{
942	UV uv;	964	UV uv;
943	int numtype = grok_number (start, dec->cur - start, &uv);	965	int numtype = grok_number (start, len, &uv);
944	if (numtype & IS_NUMBER_IN_UV)	966	if (numtype & IS_NUMBER_IN_UV)
945	if (numtype & IS_NUMBER_NEG)	967	if (numtype & IS_NUMBER_NEG)
946	{	968	{
947	if (uv < (UV)IV_MIN)	969	if (uv < (UV)IV_MIN)
948	return newSViv (-(IV)uv);	970	return newSViv (-(IV)uv);
949	}	971	}
950	else	972	else
951	return newSVuv (uv);	973	return newSVuv (uv);
952
953	// here would likely be the place for bigint support
954	}	974	}
955	}
956		975
957	// 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
958	return newSVnv (Atof (start));	992	return newSVnv (Atof (start));
959		993
960	fail:	994	fail:
961	return 0;	995	return 0;
962	}	996	}
…		…
1095	sv = newRV_noinc ((SV *)hv);	1129	sv = newRV_noinc ((SV *)hv);
1096		1130
1097	// check filter callbacks	1131	// check filter callbacks
1098	if (dec->json.flags & F_HOOK)	1132	if (dec->json.flags & F_HOOK)
1099	{	1133	{
1100	ENTER; SAVETMPS;	1134	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1101
1102	if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103	{	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;
1104	int count;	1149	int count;
1105		1150
1106	dSP; PUSHMARK (SP);	1151	ENTER; SAVETMPS; PUSHMARK (SP);
1107	XPUSHs (sv_2mortal (sv));	1152	XPUSHs (HeVAL (he));
1108		1153
1109	PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;	1154	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1110		1155
1111	if (count == 1)	1156	if (count == 1)
		1157	{
1112	sv = newSVsv (POPs);	1158	sv = newSVsv (POPs);
1113	else	1159	FREETMPS; LEAVE;
1114	SvREFCNT_inc (sv);	1160	return sv;
		1161	}
		1162
		1163	FREETMPS; LEAVE;
		1164	}
1115	}	1165	}
1116		1166
1117	if (dec->json.cb_object)	1167	if (dec->json.cb_object)
1118	{	1168	{
		1169	dSP;
1119	int count;	1170	int count;
1120		1171
1121	dSP; ENTER; SAVETMPS; PUSHMARK (SP);	1172	ENTER; SAVETMPS; PUSHMARK (SP);
1122	XPUSHs (sv_2mortal (sv));	1173	XPUSHs (sv_2mortal (sv));
1123		1174
1124	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;	1175	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125		1176
1126	if (count == 1)	1177	if (count == 1)
		1178	{
1127	sv = newSVsv (POPs);	1179	sv = newSVsv (POPs);
1128	else	1180	FREETMPS; LEAVE;
		1181	return sv;
		1182	}
		1183
1129	SvREFCNT_inc (sv);	1184	SvREFCNT_inc (sv);
		1185	FREETMPS; LEAVE;
1130	}	1186	}
1131
1132	FREETMPS; LEAVE;
1133	}	1187	}
1134		1188
1135	return newRV_noinc ((SV *)hv);	1189	return sv;
1136		1190
1137	fail:	1191	fail:
1138	SvREFCNT_dec (hv);	1192	SvREFCNT_dec (hv);
1139	DEC_DEC_DEPTH;	1193	DEC_DEC_DEPTH;
1140	return 0;	1194	return 0;
…		…
1372	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1426	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1373		1427
1374	XPUSHs (ST (0));	1428	XPUSHs (ST (0));
1375	}	1429	}
1376		1430
1377	void filter_json_objects (JSON self, SV cb = &PL_sv_undef)	1431	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1378	ALIAS:
1379	filter_sk_json_objects = 1
1380	PPCODE:	1432	PPCODE:
1381	{	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
1382	if (!SvOK (cb))	1446	if (SvOK (cb))
1383	cb = 0;	1447	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1384		1448	else
1385	switch (ix)
1386	{	1449	{
1387	case 0: self->cb_object = cb; break;	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);
1388	case 1: self->cb_sk_object = cb; break;	1455	self->cb_sk_object = 0;
		1456	}
1389	}	1457	}
1390		1458
1391	XPUSHs (ST (0));	1459	XPUSHs (ST (0));
1392	}	1460	}
1393		1461
…		…
1406	EXTEND (SP, 2);	1474	EXTEND (SP, 2);
1407	PUSHs (decode_json (jsonstr, self, &offset));	1475	PUSHs (decode_json (jsonstr, self, &offset));
1408	PUSHs (sv_2mortal (newSVuv (offset)));	1476	PUSHs (sv_2mortal (newSVuv (offset)));
1409	}	1477	}
1410		1478
		1479	void DESTROY (JSON *self)
		1480	CODE:
		1481	SvREFCNT_dec (self->cb_sk_object);
		1482	SvREFCNT_dec (self->cb_object);
		1483
1411	PROTOTYPES: ENABLE	1484	PROTOTYPES: ENABLE
1412		1485
1413	void to_json (SV *scalar)	1486	void to_json (SV *scalar)
1414	PPCODE:	1487	PPCODE:
1415	{	1488	{

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