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

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.59 by root, Mon Aug 13 16:14:20 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.59 by root, Mon Aug 13 16:14:20 2007 UTC