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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC vs.
Revision 1.54 by root, Tue Jul 10 16:22:31 2007 UTC

…		…
15	// guarentees, though. if it breaks, you get to keep the pieces.	15	// guarentees, though. if it breaks, you get to keep the pieces.
16	#ifndef UTF8_MAXBYTES	16	#ifndef UTF8_MAXBYTES
17	# define UTF8_MAXBYTES 13	17	# define UTF8_MAXBYTES 13
18	#endif	18	#endif
19		19
20	#define F_ASCII 0x00000001UL	20	#define F_ASCII 0x00000001UL
21	#define F_LATIN1 0x00000002UL	21	#define F_LATIN1 0x00000002UL
22	#define F_UTF8 0x00000004UL	22	#define F_UTF8 0x00000004UL
23	#define F_INDENT 0x00000008UL	23	#define F_INDENT 0x00000008UL
24	#define F_CANONICAL 0x00000010UL	24	#define F_CANONICAL 0x00000010UL
25	#define F_SPACE_BEFORE 0x00000020UL	25	#define F_SPACE_BEFORE 0x00000020UL
26	#define F_SPACE_AFTER 0x00000040UL	26	#define F_SPACE_AFTER 0x00000040UL
27	#define F_ALLOW_NONREF 0x00000100UL	27	#define F_ALLOW_NONREF 0x00000100UL
28	#define F_SHRINK 0x00000200UL	28	#define F_SHRINK 0x00000200UL
		29	#define F_ALLOW_BLESSED 0x00000400UL
		30	#define F_CONV_BLESSED 0x00000800UL
29	#define F_MAXDEPTH 0xf8000000UL	31	#define F_MAXDEPTH 0xf8000000UL
30	#define S_MAXDEPTH 27	32	#define S_MAXDEPTH 27
		33	#define F_MAXSIZE 0x01f00000UL
		34	#define S_MAXSIZE 20
		35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
31		36
32	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	37	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
33		38	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
34	// F_SELFCONVERT? <=> to_json/toJson
35	// F_BLESSED? <=> { $__class__$ => }
36		39
37	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
38	#define F_DEFAULT (9UL << S_MAXDEPTH)	41	#define F_DEFAULT (9UL << S_MAXDEPTH)
39		42
40	#define INIT_SIZE 32 // initial scalar size to be allocated	43	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
54	#endif	57	#endif
55		58
56	#define expect_false(expr) expect ((expr) != 0, 0)	59	#define expect_false(expr) expect ((expr) != 0, 0)
57	#define expect_true(expr) expect ((expr) != 0, 1)	60	#define expect_true(expr) expect ((expr) != 0, 1)
58		61
59	static HV *json_stash; // JSON::XS::	62	static HV json_stash, json_boolean_stash; // JSON::XS::
60	static SV json_true, json_false;	63	static SV json_true, json_false;
		64
		65	typedef struct {
		66	U32 flags;
		67	SV *cb_object;
		68	HV *cb_sk_object;
		69	} JSON;
61		70
62	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
63	// utility functions	72	// utility functions
64		73
65	static UV *	74	inline void
66	SvJSON (SV *sv)
67	{
68	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
69	croak ("object is not of type JSON::XS");
70
71	return &SvUVX (SvRV (sv));
72	}
73
74	static void
75	shrink (SV *sv)	75	shrink (SV *sv)
76	{	76	{
77	sv_utf8_downgrade (sv, 1);	77	sv_utf8_downgrade (sv, 1);
78	if (SvLEN (sv) > SvCUR (sv) + 1)	78	if (SvLEN (sv) > SvCUR (sv) + 1)
79	{	79	{
…		…
114	typedef struct	114	typedef struct
115	{	115	{
116	char *cur; // SvPVX (sv) + current output position	116	char *cur; // SvPVX (sv) + current output position
117	char *end; // SvEND (sv)	117	char *end; // SvEND (sv)
118	SV *sv; // result scalar	118	SV *sv; // result scalar
119	U32 flags; // F_*	119	JSON json;
120	U32 indent; // indentation level	120	U32 indent; // indentation level
121	U32 maxdepth; // max. indentation/recursion level	121	U32 maxdepth; // max. indentation/recursion level
122	} enc_t;	122	} enc_t;
123		123
124	inline void	124	inline void
…		…
198	}	198	}
199		199
200	if (uch > 0x10FFFFUL)	200	if (uch > 0x10FFFFUL)
201	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	201	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
202		202
203	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	203	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
204	{	204	{
205	if (uch > 0xFFFFUL)	205	if (uch > 0xFFFFUL)
206	{	206	{
207	need (enc, len += 11);	207	need (enc, len += 11);
208	sprintf (enc->cur, "\\u%04x\\u%04x",	208	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
222	*enc->cur++ = hexdigit [(uch >> 0) & 15];	222	*enc->cur++ = hexdigit [(uch >> 0) & 15];
223	}	223	}
224		224
225	str += clen;	225	str += clen;
226	}	226	}
227	else if (enc->flags & F_LATIN1)	227	else if (enc->json.flags & F_LATIN1)
228	{	228	{
229	*enc->cur++ = uch;	229	*enc->cur++ = uch;
230	str += clen;	230	str += clen;
231	}	231	}
232	else if (is_utf8)	232	else if (is_utf8)
…		…
253	}	253	}
254		254
255	inline void	255	inline void
256	encode_indent (enc_t *enc)	256	encode_indent (enc_t *enc)
257	{	257	{
258	if (enc->flags & F_INDENT)	258	if (enc->json.flags & F_INDENT)
259	{	259	{
260	int spaces = enc->indent * INDENT_STEP;	260	int spaces = enc->indent * INDENT_STEP;
261		261
262	need (enc, spaces);	262	need (enc, spaces);
263	memset (enc->cur, ' ', spaces);	263	memset (enc->cur, ' ', spaces);
…		…
273	}	273	}
274		274
275	inline void	275	inline void
276	encode_nl (enc_t *enc)	276	encode_nl (enc_t *enc)
277	{	277	{
278	if (enc->flags & F_INDENT)	278	if (enc->json.flags & F_INDENT)
279	{	279	{
280	need (enc, 1);	280	need (enc, 1);
281	encode_ch (enc, '\n');	281	encode_ch (enc, '\n');
282	}	282	}
283	}	283	}
…		…
285	inline void	285	inline void
286	encode_comma (enc_t *enc)	286	encode_comma (enc_t *enc)
287	{	287	{
288	encode_ch (enc, ',');	288	encode_ch (enc, ',');
289		289
290	if (enc->flags & F_INDENT)	290	if (enc->json.flags & F_INDENT)
291	encode_nl (enc);	291	encode_nl (enc);
292	else if (enc->flags & F_SPACE_AFTER)	292	else if (enc->json.flags & F_SPACE_AFTER)
293	encode_space (enc);	293	encode_space (enc);
294	}	294	}
295		295
296	static void encode_sv (enc_t enc, SV sv);	296	static void encode_sv (enc_t enc, SV sv);
297		297
…		…
340	else	340	else
341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
342		342
343	encode_ch (enc, '"');	343	encode_ch (enc, '"');
344		344
345	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	345	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
346	encode_ch (enc, ':');	346	encode_ch (enc, ':');
347	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	347	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
348	encode_sv (enc, HeVAL (he));	348	encode_sv (enc, HeVAL (he));
349	}	349	}
350		350
351	// compare hash entries, used when all keys are bytestrings	351	// compare hash entries, used when all keys are bytestrings
352	static int	352	static int
…		…
387	{	387	{
388	// for canonical output we have to sort by keys first	388	// for canonical output we have to sort by keys first
389	// actually, this is mostly due to the stupid so-called	389	// actually, this is mostly due to the stupid so-called
390	// security workaround added somewhere in 5.8.x.	390	// security workaround added somewhere in 5.8.x.
391	// that randomises hash orderings	391	// that randomises hash orderings
392	if (enc->flags & F_CANONICAL)	392	if (enc->json.flags & F_CANONICAL)
393	{	393	{
394	int fast = 1;	394	int fast = 1;
395	HE *he;	395	HE *he;
396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
397	HE *hes = _alloca (count sizeof (HE));	397	HE *hes = _alloca (count sizeof (HE));
…		…
469	svtype svt;	469	svtype svt;
470		470
471	SvGETMAGIC (sv);	471	SvGETMAGIC (sv);
472	svt = SvTYPE (sv);	472	svt = SvTYPE (sv);
473		473
		474	if (expect_false (SvOBJECT (sv)))
		475	{
		476	if (SvSTASH (sv) == json_boolean_stash)
		477	{
		478	if (SvIV (sv))
		479	encode_str (enc, "true", 4, 0);
		480	else
		481	encode_str (enc, "false", 5, 0);
		482	}
		483	else
		484	{
		485	#if 0
		486	if (0 && sv_derived_from (rv, "JSON::Literal"))
		487	{
		488	// not yet
		489	}
		490	#endif
		491	if (enc->json.flags & F_CONV_BLESSED)
		492	{
		493	// we re-bless the reference to get overload and other niceties right
		494	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
		495
		496	if (to_json)
		497	{
		498	int count;
		499	dSP;
		500
		501	ENTER; SAVETMPS; PUSHMARK (SP);
		502	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		503
		504	// calling with G_SCALAR ensures that we always get a 1 return value
		505	PUTBACK;
		506	call_sv ((SV *)GvCV (to_json), G_SCALAR);
		507	SPAGAIN;
		508
		509	// catch this surprisingly common error
		510	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		511	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		512
		513	sv = POPs;
		514	PUTBACK;
		515
		516	encode_sv (enc, sv);
		517
		518	FREETMPS; LEAVE;
		519	}
		520	else if (enc->json.flags & F_ALLOW_BLESSED)
		521	encode_str (enc, "null", 4, 0);
		522	else
		523	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		524	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		525	}
		526	else if (enc->json.flags & F_ALLOW_BLESSED)
		527	encode_str (enc, "null", 4, 0);
		528	else
		529	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		530	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		531	}
		532	}
474	if (svt == SVt_PVHV)	533	else if (svt == SVt_PVHV)
475	encode_hv (enc, (HV *)sv);	534	encode_hv (enc, (HV *)sv);
476	else if (svt == SVt_PVAV)	535	else if (svt == SVt_PVAV)
477	encode_av (enc, (AV *)sv);	536	encode_av (enc, (AV *)sv);
478	else if (svt < SVt_PVAV)	537	else if (svt < SVt_PVAV)
479	{	538	{
480	if (SvNIOK (sv) && SvIV (sv) == 0)	539	STRLEN len = 0;
		540	char *pv = svt ? SvPV (sv, len) : 0;
		541
		542	if (len == 1 && *pv == '1')
		543	encode_str (enc, "true", 4, 0);
		544	else if (len == 1 && *pv == '0')
481	encode_str (enc, "false", 5, 0);	545	encode_str (enc, "false", 5, 0);
482	else if (SvNIOK (sv) && SvIV (sv) == 1)
483	encode_str (enc, "true", 4, 0);
484	else	546	else
485	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	547	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
486	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	548	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
487	}	549	}
488	else	550	else
…		…
558	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	620	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
559	SvPV_nolen (sv), SvFLAGS (sv));	621	SvPV_nolen (sv), SvFLAGS (sv));
560	}	622	}
561		623
562	static SV *	624	static SV *
563	encode_json (SV *scalar, U32 flags)	625	encode_json (SV scalar, JSON json)
564	{	626	{
565	enc_t enc;	627	enc_t enc;
566		628
567	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	629	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
568	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	630	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
569		631
570	enc.flags = flags;	632	enc.json = *json;
571	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	633	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
572	enc.cur = SvPVX (enc.sv);	634	enc.cur = SvPVX (enc.sv);
573	enc.end = SvEND (enc.sv);	635	enc.end = SvEND (enc.sv);
574	enc.indent = 0;	636	enc.indent = 0;
575	enc.maxdepth = DEC_DEPTH (flags);	637	enc.maxdepth = DEC_DEPTH (enc.json.flags);
576		638
577	SvPOK_only (enc.sv);	639	SvPOK_only (enc.sv);
578	encode_sv (&enc, scalar);	640	encode_sv (&enc, scalar);
579		641
580	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	642	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
581	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	643	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
582		644
583	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	645	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
584	SvUTF8_on (enc.sv);	646	SvUTF8_on (enc.sv);
585		647
586	if (enc.flags & F_SHRINK)	648	if (enc.json.flags & F_SHRINK)
587	shrink (enc.sv);	649	shrink (enc.sv);
588		650
589	return enc.sv;	651	return enc.sv;
590	}	652	}
591		653
…		…
596	typedef struct	658	typedef struct
597	{	659	{
598	char *cur; // current parser pointer	660	char *cur; // current parser pointer
599	char *end; // end of input string	661	char *end; // end of input string
600	const char *err; // parse error, if != 0	662	const char *err; // parse error, if != 0
601	U32 flags; // F_*	663	JSON json;
602	U32 depth; // recursion depth	664	U32 depth; // recursion depth
603	U32 maxdepth; // recursion depth limit	665	U32 maxdepth; // recursion depth limit
604	} dec_t;	666	} dec_t;
605		667
606	inline void	668	inline void
…		…
957	}	1019	}
958		1020
959	static SV *	1021	static SV *
960	decode_hv (dec_t *dec)	1022	decode_hv (dec_t *dec)
961	{	1023	{
		1024	SV *sv;
962	HV *hv = newHV ();	1025	HV *hv = newHV ();
963		1026
964	DEC_INC_DEPTH;	1027	DEC_INC_DEPTH;
965	decode_ws (dec);	1028	decode_ws (dec);
966		1029
967	if (*dec->cur == '}')	1030	if (*dec->cur == '}')
968	++dec->cur;	1031	++dec->cur;
969	else	1032	else
970	for (;;)	1033	for (;;)
971	{	1034	{
972	SV key, value;
973
974	decode_ws (dec); EXPECT_CH ('"');	1035	decode_ws (dec); EXPECT_CH ('"');
975		1036
976	key = decode_str (dec);	1037	// heuristic: assume that
977	if (!key)	1038	// a) decode_str + hv_store_ent are abysmally slow.
978	goto fail;	1039	// b) most hash keys are short, simple ascii text.
		1040	// => try to "fast-match" such strings to avoid
		1041	// the overhead of decode_str + hv_store_ent.
		1042	{
		1043	SV *value;
		1044	char *p = dec->cur;
		1045	char *e = p + 24; // only try up to 24 bytes
979		1046
980	decode_ws (dec); EXPECT_CH (':');	1047	for (;;)
981
982	value = decode_sv (dec);
983	if (!value)
984	{	1048	{
		1049	// the >= 0x80 is true on most architectures
		1050	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1051	{
		1052	// slow path, back up and use decode_str
		1053	SV *key = decode_str (dec);
		1054	if (!key)
		1055	goto fail;
		1056
		1057	decode_ws (dec); EXPECT_CH (':');
		1058
		1059	value = decode_sv (dec);
		1060	if (!value)
		1061	{
		1062	SvREFCNT_dec (key);
		1063	goto fail;
		1064	}
		1065
		1066	hv_store_ent (hv, key, value, 0);
985	SvREFCNT_dec (key);	1067	SvREFCNT_dec (key);
		1068
		1069	break;
		1070	}
		1071	else if (*p == '"')
		1072	{
		1073	// fast path, got a simple key
		1074	char *key = dec->cur;
		1075	int len = p - key;
		1076	dec->cur = p + 1;
		1077
		1078	decode_ws (dec); EXPECT_CH (':');
		1079
		1080	value = decode_sv (dec);
		1081	if (!value)
986	goto fail;	1082	goto fail;
		1083
		1084	hv_store (hv, key, len, value, 0);
		1085
		1086	break;
		1087	}
		1088
		1089	++p;
987	}	1090	}
988		1091	}
989	hv_store_ent (hv, key, value, 0);
990	SvREFCNT_dec (key);
991		1092
992	decode_ws (dec);	1093	decode_ws (dec);
993		1094
994	if (*dec->cur == '}')	1095	if (*dec->cur == '}')
995	{	1096	{
…		…
1002		1103
1003	++dec->cur;	1104	++dec->cur;
1004	}	1105	}
1005		1106
1006	DEC_DEC_DEPTH;	1107	DEC_DEC_DEPTH;
1007	return newRV_noinc ((SV *)hv);	1108	sv = newRV_noinc ((SV *)hv);
		1109
		1110	// check filter callbacks
		1111	if (dec->json.flags & F_HOOK)
		1112	{
		1113	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1114	{
		1115	HE cb, he;
		1116
		1117	hv_iterinit (hv);
		1118	he = hv_iternext (hv);
		1119	hv_iterinit (hv);
		1120
		1121	// the next line creates a mortal sv each time its called.
		1122	// might want to optimise this for common cases.
		1123	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1124
		1125	if (cb)
		1126	{
		1127	dSP;
		1128	int count;
		1129
		1130	ENTER; SAVETMPS; PUSHMARK (SP);
		1131	XPUSHs (HeVAL (he));
		1132
		1133	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1134
		1135	if (count == 1)
		1136	{
		1137	sv = newSVsv (POPs);
		1138	FREETMPS; LEAVE;
		1139	return sv;
		1140	}
		1141
		1142	FREETMPS; LEAVE;
		1143	}
		1144	}
		1145
		1146	if (dec->json.cb_object)
		1147	{
		1148	dSP;
		1149	int count;
		1150
		1151	ENTER; SAVETMPS; PUSHMARK (SP);
		1152	XPUSHs (sv_2mortal (sv));
		1153
		1154	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1155
		1156	if (count == 1)
		1157	{
		1158	sv = newSVsv (POPs);
		1159	FREETMPS; LEAVE;
		1160	return sv;
		1161	}
		1162
		1163	SvREFCNT_inc (sv);
		1164	FREETMPS; LEAVE;
		1165	}
		1166	}
		1167
		1168	return sv;
1008		1169
1009	fail:	1170	fail:
1010	SvREFCNT_dec (hv);	1171	SvREFCNT_dec (hv);
1011	DEC_DEC_DEPTH;	1172	DEC_DEC_DEPTH;
1012	return 0;	1173	return 0;
…		…
1071	fail:	1232	fail:
1072	return 0;	1233	return 0;
1073	}	1234	}
1074		1235
1075	static SV *	1236	static SV *
1076	decode_json (SV string, U32 flags, UV offset_return)	1237	decode_json (SV string, JSON json, UV *offset_return)
1077	{	1238	{
1078	dec_t dec;	1239	dec_t dec;
1079	UV offset;	1240	UV offset;
1080	SV *sv;	1241	SV *sv;
1081		1242
1082	SvGETMAGIC (string);	1243	SvGETMAGIC (string);
1083	SvUPGRADE (string, SVt_PV);	1244	SvUPGRADE (string, SVt_PV);
1084		1245
		1246	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1247	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1248	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1249
1085	if (flags & F_UTF8)	1250	if (json->flags & F_UTF8)
1086	sv_utf8_downgrade (string, 0);	1251	sv_utf8_downgrade (string, 0);
1087	else	1252	else
1088	sv_utf8_upgrade (string);	1253	sv_utf8_upgrade (string);
1089		1254
1090	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1255	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1091		1256
1092	dec.flags = flags;	1257	dec.json = *json;
1093	dec.cur = SvPVX (string);	1258	dec.cur = SvPVX (string);
1094	dec.end = SvEND (string);	1259	dec.end = SvEND (string);
1095	dec.err = 0;	1260	dec.err = 0;
1096	dec.depth = 0;	1261	dec.depth = 0;
1097	dec.maxdepth = DEC_DEPTH (dec.flags);	1262	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1263
		1264	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1265	dec.json.flags \|= F_HOOK;
1098		1266
1099	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1267	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1100	sv = decode_sv (&dec);	1268	sv = decode_sv (&dec);
1101		1269
1102	if (!(offset_return \|\| !sv))	1270	if (!(offset_return \|\| !sv))
…		…
1112	}	1280	}
1113	}	1281	}
1114		1282
1115	if (offset_return \|\| !sv)	1283	if (offset_return \|\| !sv)
1116	{	1284	{
1117	offset = dec.flags & F_UTF8	1285	offset = dec.json.flags & F_UTF8
1118	? dec.cur - SvPVX (string)	1286	? dec.cur - SvPVX (string)
1119	: utf8_distance (dec.cur, SvPVX (string));	1287	: utf8_distance (dec.cur, SvPVX (string));
1120		1288
1121	if (offset_return)	1289	if (offset_return)
1122	*offset_return = offset;	1290	*offset_return = offset;
…		…
1141	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1309	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1142	}	1310	}
1143		1311
1144	sv = sv_2mortal (sv);	1312	sv = sv_2mortal (sv);
1145		1313
1146	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1314	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1147	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1315	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1148		1316
1149	return sv;	1317	return sv;
1150	}	1318	}
1151		1319
…		…
1163	i >= '0' && i <= '9' ? i - '0'	1331	i >= '0' && i <= '9' ? i - '0'
1164	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1332	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1165	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1333	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1166	: -1;	1334	: -1;
1167		1335
1168	json_stash = gv_stashpv ("JSON::XS", 1);	1336	json_stash = gv_stashpv ("JSON::XS" , 1);
		1337	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1169		1338
1170	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1339	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1171	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1340	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1172	}	1341	}
1173		1342
1174	PROTOTYPES: DISABLE	1343	PROTOTYPES: DISABLE
1175		1344
1176	SV new (char dummy)	1345	void new (char *klass)
1177	CODE:	1346	PPCODE:
1178	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1347	{
1179	OUTPUT:	1348	SV *pv = NEWSV (0, sizeof (JSON));
1180	RETVAL	1349	SvPOK_only (pv);
		1350	Zero (SvPVX (pv), 1, JSON);
		1351	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1352	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1353	}
1181		1354
1182	SV ascii (SV self, int enable = 1)	1355	void ascii (JSON *self, int enable = 1)
1183	ALIAS:	1356	ALIAS:
1184	ascii = F_ASCII	1357	ascii = F_ASCII
1185	latin1 = F_LATIN1	1358	latin1 = F_LATIN1
1186	utf8 = F_UTF8	1359	utf8 = F_UTF8
1187	indent = F_INDENT	1360	indent = F_INDENT
1188	canonical = F_CANONICAL	1361	canonical = F_CANONICAL
1189	space_before = F_SPACE_BEFORE	1362	space_before = F_SPACE_BEFORE
1190	space_after = F_SPACE_AFTER	1363	space_after = F_SPACE_AFTER
1191	pretty = F_PRETTY	1364	pretty = F_PRETTY
1192	allow_nonref = F_ALLOW_NONREF	1365	allow_nonref = F_ALLOW_NONREF
1193	shrink = F_SHRINK	1366	shrink = F_SHRINK
		1367	allow_blessed = F_ALLOW_BLESSED
		1368	convert_blessed = F_CONV_BLESSED
1194	CODE:	1369	PPCODE:
1195	{	1370	{
1196	UV *uv = SvJSON (self);
1197	if (enable)	1371	if (enable)
1198	*uv \|= ix;	1372	self->flags \|= ix;
1199	else	1373	else
1200	*uv &= ~ix;	1374	self->flags &= ~ix;
1201		1375
1202	RETVAL = newSVsv (self);	1376	XPUSHs (ST (0));
1203	}	1377	}
1204	OUTPUT:
1205	RETVAL
1206		1378
1207	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1379	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1208	CODE:	1380	PPCODE:
1209	{	1381	{
1210	UV *uv = SvJSON (self);
1211	UV log2 = 0;	1382	UV log2 = 0;
1212		1383
1213	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1384	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1214		1385
1215	while ((1UL << log2) < max_depth)	1386	while ((1UL << log2) < max_depth)
1216	++log2;	1387	++log2;
1217		1388
1218	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1389	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1219		1390
1220	RETVAL = newSVsv (self);	1391	XPUSHs (ST (0));
1221	}	1392	}
1222	OUTPUT:
1223	RETVAL
1224		1393
1225	void encode (SV self, SV scalar)	1394	void max_size (JSON *self, UV max_size = 0)
1226	PPCODE:	1395	PPCODE:
1227	XPUSHs (encode_json (scalar, *SvJSON (self)));	1396	{
		1397	UV log2 = 0;
1228		1398
1229	void decode (SV self, SV jsonstr)	1399	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1400	if (max_size == 1) max_size = 2;
		1401
		1402	while ((1UL << log2) < max_size)
		1403	++log2;
		1404
		1405	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1406
		1407	XPUSHs (ST (0));
		1408	}
		1409
		1410	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1230	PPCODE:	1411	PPCODE:
		1412	{
		1413	SvREFCNT_dec (self->cb_object);
		1414	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1415
		1416	XPUSHs (ST (0));
		1417	}
		1418
		1419	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		1420	PPCODE:
		1421	{
		1422	if (!self->cb_sk_object)
		1423	self->cb_sk_object = newHV ();
		1424
		1425	if (SvOK (cb))
		1426	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1427	else
		1428	{
		1429	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1430
		1431	if (!HvKEYS (self->cb_sk_object))
		1432	{
		1433	SvREFCNT_dec (self->cb_sk_object);
		1434	self->cb_sk_object = 0;
		1435	}
		1436	}
		1437
		1438	XPUSHs (ST (0));
		1439	}
		1440
		1441	void encode (JSON self, SV scalar)
		1442	PPCODE:
		1443	XPUSHs (encode_json (scalar, self));
		1444
		1445	void decode (JSON self, SV jsonstr)
		1446	PPCODE:
1231	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1447	XPUSHs (decode_json (jsonstr, self, 0));
1232		1448
1233	void decode_prefix (SV self, SV jsonstr)	1449	void decode_prefix (JSON self, SV jsonstr)
1234	PPCODE:	1450	PPCODE:
1235	{	1451	{
1236	UV offset;	1452	UV offset;
1237	EXTEND (SP, 2);	1453	EXTEND (SP, 2);
1238	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1454	PUSHs (decode_json (jsonstr, self, &offset));
1239	PUSHs (sv_2mortal (newSVuv (offset)));	1455	PUSHs (sv_2mortal (newSVuv (offset)));
1240	}	1456	}
1241		1457
		1458	void DESTROY (JSON *self)
		1459	CODE:
		1460	SvREFCNT_dec (self->cb_sk_object);
		1461	SvREFCNT_dec (self->cb_object);
		1462
1242	PROTOTYPES: ENABLE	1463	PROTOTYPES: ENABLE
1243		1464
1244	void to_json (SV *scalar)	1465	void to_json (SV *scalar)
1245	ALIAS:
1246	objToJson = 0
1247	PPCODE:	1466	PPCODE:
		1467	{
		1468	JSON json = { F_DEFAULT \| F_UTF8 };
1248	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1469	XPUSHs (encode_json (scalar, &json));
		1470	}
1249		1471
1250	void from_json (SV *jsonstr)	1472	void from_json (SV *jsonstr)
1251	ALIAS:
1252	jsonToObj = 0
1253	PPCODE:	1473	PPCODE:
		1474	{
		1475	JSON json = { F_DEFAULT \| F_UTF8 };
1254	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1476	XPUSHs (decode_json (jsonstr, &json, 0));
		1477	}
1255		1478

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC vs. Revision 1.54 by root, Tue Jul 10 16:22:31 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.43 by root, Sat Jun 23 23:49:29 2007 UTC vs.
Revision 1.54 by root, Tue Jul 10 16:22:31 2007 UTC