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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.47 by root, Sun Jul 1 14:08:03 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
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
…		…
56	#endif	58	#endif
57		59
58	#define expect_false(expr) expect ((expr) != 0, 0)	60	#define expect_false(expr) expect ((expr) != 0, 0)
59	#define expect_true(expr) expect ((expr) != 0, 1)	61	#define expect_true(expr) expect ((expr) != 0, 1)
60		62
		63	#ifdef USE_ITHREADS
		64	# define JSON_SLOW 1
		65	#else
		66	# define JSON_SLOW 0
		67	#endif
		68
61	static HV json_stash, json_boolean_stash; // JSON::XS::	69	static HV json_stash, json_boolean_stash; // JSON::XS::
62	static SV json_true, json_false;	70	static SV json_true, json_false;
63		71
64	typedef struct json {	72	typedef struct {
65	U32 flags;	73	U32 flags;
		74	SV *cb_object;
		75	HV *cb_sk_object;
66	} JSON__XS;	76	} JSON;
67		77
68	/////////////////////////////////////////////////////////////////////////////	78	/////////////////////////////////////////////////////////////////////////////
69	// utility functions	79	// utility functions
70		80
71	static UV *	81	inline void
72	SvJSON (SV *sv)
73	{
74	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
75	croak ("object is not of type JSON::XS");
76
77	return &SvUVX (SvRV (sv));
78	}
79
80	static void
81	shrink (SV *sv)	82	shrink (SV *sv)
82	{	83	{
83	sv_utf8_downgrade (sv, 1);	84	sv_utf8_downgrade (sv, 1);
84	if (SvLEN (sv) > SvCUR (sv) + 1)	85	if (SvLEN (sv) > SvCUR (sv) + 1)
85	{	86	{
…		…
120	typedef struct	121	typedef struct
121	{	122	{
122	char *cur; // SvPVX (sv) + current output position	123	char *cur; // SvPVX (sv) + current output position
123	char *end; // SvEND (sv)	124	char *end; // SvEND (sv)
124	SV *sv; // result scalar	125	SV *sv; // result scalar
125	struct json json;	126	JSON json;
126	U32 indent; // indentation level	127	U32 indent; // indentation level
127	U32 maxdepth; // max. indentation/recursion level	128	U32 maxdepth; // max. indentation/recursion level
128	} enc_t;	129	} enc_t;
129		130
130	inline void	131	inline void
…		…
312	encode_ch (enc, '['); encode_nl (enc);	313	encode_ch (enc, '['); encode_nl (enc);
313	++enc->indent;	314	++enc->indent;
314		315
315	for (i = 0; i <= len; ++i)	316	for (i = 0; i <= len; ++i)
316	{	317	{
		318	SV **svp = av_fetch (av, i, 0);
		319
317	encode_indent (enc);	320	encode_indent (enc);
318	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);
319		326
320	if (i < len)	327	if (i < len)
321	encode_comma (enc);	328	encode_comma (enc);
322	}	329	}
323		330
…		…
477	SvGETMAGIC (sv);	484	SvGETMAGIC (sv);
478	svt = SvTYPE (sv);	485	svt = SvTYPE (sv);
479		486
480	if (expect_false (SvOBJECT (sv)))	487	if (expect_false (SvOBJECT (sv)))
481	{	488	{
		489	HV *stash = !JSON_SLOW \|\| json_boolean_stash
		490	? json_boolean_stash
		491	: gv_stashpv ("JSON::XS::Boolean", 1);
		492
482	if (SvSTASH (sv) == json_boolean_stash)	493	if (SvSTASH (sv) == stash)
483	{	494	{
484	if (SvIV (sv) == 0)	495	if (SvIV (sv))
		496	encode_str (enc, "true", 4, 0);
		497	else
485	encode_str (enc, "false", 5, 0);	498	encode_str (enc, "false", 5, 0);
486	else
487	encode_str (enc, "true", 4, 0);
488	}	499	}
489	else	500	else
490	{	501	{
491	#if 0	502	#if 0
492	if (0 && sv_derived_from (rv, "JSON::Literal"))	503	if (0 && sv_derived_from (rv, "JSON::Literal"))
…		…
495	}	506	}
496	#endif	507	#endif
497	if (enc->json.flags & F_CONV_BLESSED)	508	if (enc->json.flags & F_CONV_BLESSED)
498	{	509	{
499	// 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
500	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	511	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501		512
502	if (to_json)	513	if (to_json)
503	{	514	{
504	dSP;	515	dSP;
505	ENTER;	516
506	SAVETMPS;
507	PUSHMARK (SP);	517	ENTER; SAVETMPS; PUSHMARK (SP);
508	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	518	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509		519
510	// 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
511	// check anyways.
512	PUTBACK;	521	PUTBACK;
513	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	522	call_sv ((SV *)GvCV (to_json), G_SCALAR);
514	SPAGAIN;	523	SPAGAIN;
515		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
516	encode_sv (enc, POPs);	532	encode_sv (enc, sv);
517		533
518	FREETMPS;	534	FREETMPS; LEAVE;
519	LEAVE;
520	}	535	}
521	else if (enc->json.flags & F_ALLOW_BLESSED)	536	else if (enc->json.flags & F_ALLOW_BLESSED)
522	encode_str (enc, "null", 4, 0);	537	encode_str (enc, "null", 4, 0);
523	else	538	else
524	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	539	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
…		…
535	encode_hv (enc, (HV *)sv);	550	encode_hv (enc, (HV *)sv);
536	else if (svt == SVt_PVAV)	551	else if (svt == SVt_PVAV)
537	encode_av (enc, (AV *)sv);	552	encode_av (enc, (AV *)sv);
538	else if (svt < SVt_PVAV)	553	else if (svt < SVt_PVAV)
539	{	554	{
540	if (SvNIOK (sv) && SvIV (sv) == 0)	555	STRLEN len = 0;
		556	char *pv = svt ? SvPV (sv, len) : 0;
		557
		558	if (len == 1 && *pv == '1')
		559	encode_str (enc, "true", 4, 0);
		560	else if (len == 1 && *pv == '0')
541	encode_str (enc, "false", 5, 0);	561	encode_str (enc, "false", 5, 0);
542	else if (SvNIOK (sv) && SvIV (sv) == 1)
543	encode_str (enc, "true", 4, 0);
544	else	562	else
545	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",
546	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	564	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
547	}	565	}
548	else	566	else
…		…
618	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	636	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
619	SvPV_nolen (sv), SvFLAGS (sv));	637	SvPV_nolen (sv), SvFLAGS (sv));
620	}	638	}
621		639
622	static SV *	640	static SV *
623	encode_json (SV scalar, struct json json)	641	encode_json (SV scalar, JSON json)
624	{	642	{
625	enc_t enc;	643	enc_t enc;
626		644
627	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))	645	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
628	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	646	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
…		…
656	typedef struct	674	typedef struct
657	{	675	{
658	char *cur; // current parser pointer	676	char *cur; // current parser pointer
659	char *end; // end of input string	677	char *end; // end of input string
660	const char *err; // parse error, if != 0	678	const char *err; // parse error, if != 0
661	struct json json;	679	JSON json;
662	U32 depth; // recursion depth	680	U32 depth; // recursion depth
663	U32 maxdepth; // recursion depth limit	681	U32 maxdepth; // recursion depth limit
664	} dec_t;	682	} dec_t;
665		683
666	inline void	684	inline void
…		…
929	is_nv = 1;	947	is_nv = 1;
930	}	948	}
931		949
932	if (!is_nv)	950	if (!is_nv)
933	{	951	{
		952	int len = dec->cur - start;
		953
934	// 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
935	if (*start == '-')	955	if (*start == '-')
936	switch (dec->cur - start)	956	switch (len)
937	{	957	{
938	case 2: return newSViv (-( start [1] - '0' * 1));	958	case 2: return newSViv (-( start [1] - '0' * 1));
939	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	959	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
940	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));
941	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));
942	}	962	}
943	else	963	else
944	switch (dec->cur - start)	964	switch (len)
945	{	965	{
946	case 1: return newSViv ( start [0] - '0' * 1);	966	case 1: return newSViv ( start [0] - '0' * 1);
947	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	967	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
948	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);
949	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);
950	}	970	}
951		971
952	{	972	{
953	UV uv;	973	UV uv;
954	int numtype = grok_number (start, dec->cur - start, &uv);	974	int numtype = grok_number (start, len, &uv);
955	if (numtype & IS_NUMBER_IN_UV)	975	if (numtype & IS_NUMBER_IN_UV)
956	if (numtype & IS_NUMBER_NEG)	976	if (numtype & IS_NUMBER_NEG)
957	{	977	{
958	if (uv < (UV)IV_MIN)	978	if (uv < (UV)IV_MIN)
959	return newSViv (-(IV)uv);	979	return newSViv (-(IV)uv);
960	}	980	}
961	else	981	else
962	return newSVuv (uv);	982	return newSVuv (uv);
963
964	// here would likely be the place for bigint support
965	}	983	}
966	}
967		984
968	// 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
969	return newSVnv (Atof (start));	1001	return newSVnv (Atof (start));
970		1002
971	fail:	1003	fail:
972	return 0;	1004	return 0;
973	}	1005	}
…		…
1017	}	1049	}
1018		1050
1019	static SV *	1051	static SV *
1020	decode_hv (dec_t *dec)	1052	decode_hv (dec_t *dec)
1021	{	1053	{
		1054	SV *sv;
1022	HV *hv = newHV ();	1055	HV *hv = newHV ();
1023		1056
1024	DEC_INC_DEPTH;	1057	DEC_INC_DEPTH;
1025	decode_ws (dec);	1058	decode_ws (dec);
1026		1059
…		…
1100		1133
1101	++dec->cur;	1134	++dec->cur;
1102	}	1135	}
1103		1136
1104	DEC_DEC_DEPTH;	1137	DEC_DEC_DEPTH;
1105	return newRV_noinc ((SV *)hv);	1138	sv = newRV_noinc ((SV *)hv);
		1139
		1140	// check filter callbacks
		1141	if (dec->json.flags & F_HOOK)
		1142	{
		1143	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		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;
		1158	int count;
		1159
		1160	ENTER; SAVETMPS; PUSHMARK (SP);
		1161	XPUSHs (HeVAL (he));
		1162
		1163	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1164
		1165	if (count == 1)
		1166	{
		1167	sv = newSVsv (POPs);
		1168	FREETMPS; LEAVE;
		1169	return sv;
		1170	}
		1171
		1172	FREETMPS; LEAVE;
		1173	}
		1174	}
		1175
		1176	if (dec->json.cb_object)
		1177	{
		1178	dSP;
		1179	int count;
		1180
		1181	ENTER; SAVETMPS; PUSHMARK (SP);
		1182	XPUSHs (sv_2mortal (sv));
		1183
		1184	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1185
		1186	if (count == 1)
		1187	{
		1188	sv = newSVsv (POPs);
		1189	FREETMPS; LEAVE;
		1190	return sv;
		1191	}
		1192
		1193	SvREFCNT_inc (sv);
		1194	FREETMPS; LEAVE;
		1195	}
		1196	}
		1197
		1198	return sv;
1106		1199
1107	fail:	1200	fail:
1108	SvREFCNT_dec (hv);	1201	SvREFCNT_dec (hv);
1109	DEC_DEC_DEPTH;	1202	DEC_DEC_DEPTH;
1110	return 0;	1203	return 0;
…		…
1169	fail:	1262	fail:
1170	return 0;	1263	return 0;
1171	}	1264	}
1172		1265
1173	static SV *	1266	static SV *
1174	decode_json (SV string, struct json json, UV *offset_return)	1267	decode_json (SV string, JSON json, UV *offset_return)
1175	{	1268	{
1176	dec_t dec;	1269	dec_t dec;
1177	UV offset;	1270	UV offset;
1178	SV *sv;	1271	SV *sv;
1179		1272
…		…
1195	dec.cur = SvPVX (string);	1288	dec.cur = SvPVX (string);
1196	dec.end = SvEND (string);	1289	dec.end = SvEND (string);
1197	dec.err = 0;	1290	dec.err = 0;
1198	dec.depth = 0;	1291	dec.depth = 0;
1199	dec.maxdepth = DEC_DEPTH (dec.json.flags);	1292	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1293
		1294	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1295	dec.json.flags \|= F_HOOK;
1200		1296
1201	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1297	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1202	sv = decode_sv (&dec);	1298	sv = decode_sv (&dec);
1203		1299
1204	if (!(offset_return \|\| !sv))	1300	if (!(offset_return \|\| !sv))
…		…
1274	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);
1275	}	1371	}
1276		1372
1277	PROTOTYPES: DISABLE	1373	PROTOTYPES: DISABLE
1278		1374
1279	SV new (char dummy)	1375	void CLONE (...)
1280	CODE:	1376	CODE:
1281	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1377	json_stash = 0;
1282	OUTPUT:	1378	json_boolean_stash = 0;
1283	RETVAL
1284		1379
		1380	void new (char *klass)
		1381	PPCODE:
		1382	{
		1383	HV *stash = !JSON_SLOW \|\| json_stash
		1384	? json_stash
		1385	: gv_stashpv ("JSON::XS", 1);
		1386	SV *pv = NEWSV (0, sizeof (JSON));
		1387	SvPOK_only (pv);
		1388	Zero (SvPVX (pv), 1, JSON);
		1389	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1390	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), stash)));
		1391	}
		1392
1285	SV ascii (SV self, int enable = 1)	1393	void ascii (JSON *self, int enable = 1)
1286	ALIAS:	1394	ALIAS:
1287	ascii = F_ASCII	1395	ascii = F_ASCII
1288	latin1 = F_LATIN1	1396	latin1 = F_LATIN1
1289	utf8 = F_UTF8	1397	utf8 = F_UTF8
1290	indent = F_INDENT	1398	indent = F_INDENT
…		…
1294	pretty = F_PRETTY	1402	pretty = F_PRETTY
1295	allow_nonref = F_ALLOW_NONREF	1403	allow_nonref = F_ALLOW_NONREF
1296	shrink = F_SHRINK	1404	shrink = F_SHRINK
1297	allow_blessed = F_ALLOW_BLESSED	1405	allow_blessed = F_ALLOW_BLESSED
1298	convert_blessed = F_CONV_BLESSED	1406	convert_blessed = F_CONV_BLESSED
1299	CODE:	1407	PPCODE:
1300	{	1408	{
1301	UV *uv = SvJSON (self);
1302	if (enable)	1409	if (enable)
1303	*uv \|= ix;	1410	self->flags \|= ix;
1304	else	1411	else
1305	*uv &= ~ix;	1412	self->flags &= ~ix;
1306		1413
1307	RETVAL = newSVsv (self);	1414	XPUSHs (ST (0));
1308	}	1415	}
1309	OUTPUT:
1310	RETVAL
1311		1416
1312	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1417	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1313	CODE:	1418	PPCODE:
1314	{	1419	{
1315	UV *uv = SvJSON (self);
1316	UV log2 = 0;	1420	UV log2 = 0;
1317		1421
1318	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1422	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1319		1423
1320	while ((1UL << log2) < max_depth)	1424	while ((1UL << log2) < max_depth)
1321	++log2;	1425	++log2;
1322		1426
1323	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1427	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1324		1428
1325	RETVAL = newSVsv (self);	1429	XPUSHs (ST (0));
1326	}	1430	}
1327	OUTPUT:
1328	RETVAL
1329		1431
1330	SV max_size (SV self, UV max_size = 0)	1432	void max_size (JSON *self, UV max_size = 0)
1331	CODE:	1433	PPCODE:
1332	{	1434	{
1333	UV *uv = SvJSON (self);
1334	UV log2 = 0;	1435	UV log2 = 0;
1335		1436
1336	if (max_size > 0x80000000UL) max_size = 0x80000000UL;	1437	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1337	if (max_size == 1) max_size = 2;	1438	if (max_size == 1) max_size = 2;
1338		1439
1339	while ((1UL << log2) < max_size)	1440	while ((1UL << log2) < max_size)
1340	++log2;	1441	++log2;
1341		1442
1342	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1443	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1343		1444
1344	RETVAL = newSVsv (self);	1445	XPUSHs (ST (0));
1345	}	1446	}
1346	OUTPUT:
1347	RETVAL
1348		1447
1349	void encode (SV self, SV scalar)	1448	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1350	PPCODE:	1449	PPCODE:
1351	{	1450	{
1352	struct json json = { *SvJSON (self) };	1451	SvREFCNT_dec (self->cb_object);
1353	XPUSHs (encode_json (scalar, &json));	1452	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1354	}
1355		1453
1356	void decode (SV self, SV jsonstr)	1454	XPUSHs (ST (0));
		1455	}
		1456
		1457	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1357	PPCODE:	1458	PPCODE:
1358	{	1459	{
1359	struct json json = { *SvJSON (self) };	1460	if (!self->cb_sk_object)
1360	XPUSHs (decode_json (jsonstr, &json, 0));	1461	self->cb_sk_object = newHV ();
1361	}
1362		1462
1363	void decode_prefix (SV self, SV jsonstr)	1463	if (SvOK (cb))
		1464	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1465	else
		1466	{
		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);
		1472	self->cb_sk_object = 0;
		1473	}
		1474	}
		1475
		1476	XPUSHs (ST (0));
		1477	}
		1478
		1479	void encode (JSON self, SV scalar)
1364	PPCODE:	1480	PPCODE:
		1481	XPUSHs (encode_json (scalar, self));
		1482
		1483	void decode (JSON self, SV jsonstr)
		1484	PPCODE:
		1485	XPUSHs (decode_json (jsonstr, self, 0));
		1486
		1487	void decode_prefix (JSON self, SV jsonstr)
		1488	PPCODE:
1365	{	1489	{
1366	UV offset;	1490	UV offset;
1367	struct json json = { *SvJSON (self) };
1368	EXTEND (SP, 2);	1491	EXTEND (SP, 2);
1369	PUSHs (decode_json (jsonstr, &json, &offset));	1492	PUSHs (decode_json (jsonstr, self, &offset));
1370	PUSHs (sv_2mortal (newSVuv (offset)));	1493	PUSHs (sv_2mortal (newSVuv (offset)));
1371	}	1494	}
		1495
		1496	void DESTROY (JSON *self)
		1497	CODE:
		1498	SvREFCNT_dec (self->cb_sk_object);
		1499	SvREFCNT_dec (self->cb_object);
1372		1500
1373	PROTOTYPES: ENABLE	1501	PROTOTYPES: ENABLE
1374		1502
1375	void to_json (SV *scalar)	1503	void to_json (SV *scalar)
1376	PPCODE:	1504	PPCODE:
1377	{	1505	{
1378	struct json json = { F_DEFAULT \| F_UTF8 };	1506	JSON json = { F_DEFAULT \| F_UTF8 };
1379	XPUSHs (encode_json (scalar, &json));	1507	XPUSHs (encode_json (scalar, &json));
1380	}	1508	}
1381		1509
1382	void from_json (SV *jsonstr)	1510	void from_json (SV *jsonstr)
1383	PPCODE:	1511	PPCODE:
1384	{	1512	{
1385	struct json json = { F_DEFAULT \| F_UTF8 };	1513	JSON json = { F_DEFAULT \| F_UTF8 };
1386	XPUSHs (decode_json (jsonstr, &json, 0));	1514	XPUSHs (decode_json (jsonstr, &json, 0));
1387	}	1515	}
1388		1516

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.47 by root, Sun Jul 1 14:08:03 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.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.58 by root, Mon Aug 13 16:06:25 2007 UTC