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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC vs.
Revision 1.49 by root, Sun Jul 1 23:40:07 2007 UTC

…		…
10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	10	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	11	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	12	#endif
13		13
14	// some old perls do not have this, try to make it work, no	14	// some old perls do not have this, try to make it work, no
15	// guarentees, though.	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::
		63	static SV json_true, json_false;
		64
		65	typedef struct {
		66	U32 flags;
		67	SV cb_object, cb_sk_object;
		68	} JSON;
60		69
61	/////////////////////////////////////////////////////////////////////////////	70	/////////////////////////////////////////////////////////////////////////////
62	// utility functions	71	// utility functions
63		72
64	static UV *	73	inline void
65	SvJSON (SV *sv)
66	{
67	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
68	croak ("object is not of type JSON::XS");
69
70	return &SvUVX (SvRV (sv));
71	}
72
73	static void
74	shrink (SV *sv)	74	shrink (SV *sv)
75	{	75	{
76	sv_utf8_downgrade (sv, 1);	76	sv_utf8_downgrade (sv, 1);
77	if (SvLEN (sv) > SvCUR (sv) + 1)	77	if (SvLEN (sv) > SvCUR (sv) + 1)
78	{	78	{
…		…
113	typedef struct	113	typedef struct
114	{	114	{
115	char *cur; // SvPVX (sv) + current output position	115	char *cur; // SvPVX (sv) + current output position
116	char *end; // SvEND (sv)	116	char *end; // SvEND (sv)
117	SV *sv; // result scalar	117	SV *sv; // result scalar
118	U32 flags; // F_*	118	JSON json;
119	U32 indent; // indentation level	119	U32 indent; // indentation level
120	U32 maxdepth; // max. indentation/recursion level	120	U32 maxdepth; // max. indentation/recursion level
121	} enc_t;	121	} enc_t;
122		122
123	inline void	123	inline void
…		…
197	}	197	}
198		198
199	if (uch > 0x10FFFFUL)	199	if (uch > 0x10FFFFUL)
200	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	200	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
201		201
202	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	202	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
203	{	203	{
204	if (uch > 0xFFFFUL)	204	if (uch > 0xFFFFUL)
205	{	205	{
206	need (enc, len += 11);	206	need (enc, len += 11);
207	sprintf (enc->cur, "\\u%04x\\u%04x",	207	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
221	*enc->cur++ = hexdigit [(uch >> 0) & 15];	221	*enc->cur++ = hexdigit [(uch >> 0) & 15];
222	}	222	}
223		223
224	str += clen;	224	str += clen;
225	}	225	}
226	else if (enc->flags & F_LATIN1)	226	else if (enc->json.flags & F_LATIN1)
227	{	227	{
228	*enc->cur++ = uch;	228	*enc->cur++ = uch;
229	str += clen;	229	str += clen;
230	}	230	}
231	else if (is_utf8)	231	else if (is_utf8)
…		…
252	}	252	}
253		253
254	inline void	254	inline void
255	encode_indent (enc_t *enc)	255	encode_indent (enc_t *enc)
256	{	256	{
257	if (enc->flags & F_INDENT)	257	if (enc->json.flags & F_INDENT)
258	{	258	{
259	int spaces = enc->indent * INDENT_STEP;	259	int spaces = enc->indent * INDENT_STEP;
260		260
261	need (enc, spaces);	261	need (enc, spaces);
262	memset (enc->cur, ' ', spaces);	262	memset (enc->cur, ' ', spaces);
…		…
272	}	272	}
273		273
274	inline void	274	inline void
275	encode_nl (enc_t *enc)	275	encode_nl (enc_t *enc)
276	{	276	{
277	if (enc->flags & F_INDENT)	277	if (enc->json.flags & F_INDENT)
278	{	278	{
279	need (enc, 1);	279	need (enc, 1);
280	encode_ch (enc, '\n');	280	encode_ch (enc, '\n');
281	}	281	}
282	}	282	}
…		…
284	inline void	284	inline void
285	encode_comma (enc_t *enc)	285	encode_comma (enc_t *enc)
286	{	286	{
287	encode_ch (enc, ',');	287	encode_ch (enc, ',');
288		288
289	if (enc->flags & F_INDENT)	289	if (enc->json.flags & F_INDENT)
290	encode_nl (enc);	290	encode_nl (enc);
291	else if (enc->flags & F_SPACE_AFTER)	291	else if (enc->json.flags & F_SPACE_AFTER)
292	encode_space (enc);	292	encode_space (enc);
293	}	293	}
294		294
295	static void encode_sv (enc_t enc, SV sv);	295	static void encode_sv (enc_t enc, SV sv);
296		296
…		…
339	else	339	else
340	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	340	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
341		341
342	encode_ch (enc, '"');	342	encode_ch (enc, '"');
343		343
344	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	344	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345	encode_ch (enc, ':');	345	encode_ch (enc, ':');
346	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	346	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347	encode_sv (enc, HeVAL (he));	347	encode_sv (enc, HeVAL (he));
348	}	348	}
349		349
350	// compare hash entries, used when all keys are bytestrings	350	// compare hash entries, used when all keys are bytestrings
351	static int	351	static int
…		…
386	{	386	{
387	// for canonical output we have to sort by keys first	387	// for canonical output we have to sort by keys first
388	// actually, this is mostly due to the stupid so-called	388	// actually, this is mostly due to the stupid so-called
389	// security workaround added somewhere in 5.8.x.	389	// security workaround added somewhere in 5.8.x.
390	// that randomises hash orderings	390	// that randomises hash orderings
391	if (enc->flags & F_CANONICAL)	391	if (enc->json.flags & F_CANONICAL)
392	{	392	{
393	int fast = 1;	393	int fast = 1;
394	HE *he;	394	HE *he;
395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
396	HE *hes = _alloca (count sizeof (HE));	396	HE *hes = _alloca (count sizeof (HE));
…		…
468	svtype svt;	468	svtype svt;
469		469
470	SvGETMAGIC (sv);	470	SvGETMAGIC (sv);
471	svt = SvTYPE (sv);	471	svt = SvTYPE (sv);
472		472
		473	if (expect_false (SvOBJECT (sv)))
		474	{
		475	if (SvSTASH (sv) == json_boolean_stash)
		476	{
		477	if (SvIV (sv) == 0)
		478	encode_str (enc, "false", 5, 0);
		479	else
		480	encode_str (enc, "true", 4, 0);
		481	}
		482	else
		483	{
		484	#if 0
		485	if (0 && sv_derived_from (rv, "JSON::Literal"))
		486	{
		487	// not yet
		488	}
		489	#endif
		490	if (enc->json.flags & F_CONV_BLESSED)
		491	{
		492	// we re-bless the reference to get overload and other niceties right
		493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
		494
		495	if (to_json)
		496	{
		497	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
		498	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		499
		500	// calling with G_SCALAR ensures that we always get a 1 reutrn value
		501	// check anyways.
		502	PUTBACK;
		503	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
		504	SPAGAIN;
		505
		506	encode_sv (enc, POPs);
		507
		508	FREETMPS; LEAVE;
		509	}
		510	else if (enc->json.flags & F_ALLOW_BLESSED)
		511	encode_str (enc, "null", 4, 0);
		512	else
		513	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		514	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		515	}
		516	else if (enc->json.flags & F_ALLOW_BLESSED)
		517	encode_str (enc, "null", 4, 0);
		518	else
		519	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		520	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		521	}
		522	}
473	if (svt == SVt_PVHV)	523	else if (svt == SVt_PVHV)
474	encode_hv (enc, (HV *)sv);	524	encode_hv (enc, (HV *)sv);
475	else if (svt == SVt_PVAV)	525	else if (svt == SVt_PVAV)
476	encode_av (enc, (AV *)sv);	526	encode_av (enc, (AV *)sv);
477	else if (svt < SVt_PVAV)	527	else if (svt < SVt_PVAV)
478	{	528	{
…		…
557	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	607	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
558	SvPV_nolen (sv), SvFLAGS (sv));	608	SvPV_nolen (sv), SvFLAGS (sv));
559	}	609	}
560		610
561	static SV *	611	static SV *
562	encode_json (SV *scalar, U32 flags)	612	encode_json (SV scalar, JSON json)
563	{	613	{
564	enc_t enc;	614	enc_t enc;
565		615
566	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	616	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
567	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	617	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
568		618
569	enc.flags = flags;	619	enc.json = *json;
570	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	620	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
571	enc.cur = SvPVX (enc.sv);	621	enc.cur = SvPVX (enc.sv);
572	enc.end = SvEND (enc.sv);	622	enc.end = SvEND (enc.sv);
573	enc.indent = 0;	623	enc.indent = 0;
574	enc.maxdepth = DEC_DEPTH (flags);	624	enc.maxdepth = DEC_DEPTH (enc.json.flags);
575		625
576	SvPOK_only (enc.sv);	626	SvPOK_only (enc.sv);
577	encode_sv (&enc, scalar);	627	encode_sv (&enc, scalar);
578		628
579	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	629	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
580	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	630	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
581		631
582	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	632	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
583	SvUTF8_on (enc.sv);	633	SvUTF8_on (enc.sv);
584		634
585	if (enc.flags & F_SHRINK)	635	if (enc.json.flags & F_SHRINK)
586	shrink (enc.sv);	636	shrink (enc.sv);
587		637
588	return enc.sv;	638	return enc.sv;
589	}	639	}
590		640
…		…
595	typedef struct	645	typedef struct
596	{	646	{
597	char *cur; // current parser pointer	647	char *cur; // current parser pointer
598	char *end; // end of input string	648	char *end; // end of input string
599	const char *err; // parse error, if != 0	649	const char *err; // parse error, if != 0
600	U32 flags; // F_*	650	JSON json;
601	U32 depth; // recursion depth	651	U32 depth; // recursion depth
602	U32 maxdepth; // recursion depth limit	652	U32 maxdepth; // recursion depth limit
603	} dec_t;	653	} dec_t;
604		654
605	inline void	655	inline void
…		…
956	}	1006	}
957		1007
958	static SV *	1008	static SV *
959	decode_hv (dec_t *dec)	1009	decode_hv (dec_t *dec)
960	{	1010	{
		1011	SV *sv;
961	HV *hv = newHV ();	1012	HV *hv = newHV ();
962		1013
963	DEC_INC_DEPTH;	1014	DEC_INC_DEPTH;
964	decode_ws (dec);	1015	decode_ws (dec);
965		1016
966	if (*dec->cur == '}')	1017	if (*dec->cur == '}')
967	++dec->cur;	1018	++dec->cur;
968	else	1019	else
969	for (;;)	1020	for (;;)
970	{	1021	{
971	SV key, value;
972
973	decode_ws (dec); EXPECT_CH ('"');	1022	decode_ws (dec); EXPECT_CH ('"');
974		1023
975	key = decode_str (dec);	1024	// heuristic: assume that
976	if (!key)	1025	// a) decode_str + hv_store_ent are abysmally slow.
977	goto fail;	1026	// b) most hash keys are short, simple ascii text.
		1027	// => try to "fast-match" such strings to avoid
		1028	// the overhead of decode_str + hv_store_ent.
		1029	{
		1030	SV *value;
		1031	char *p = dec->cur;
		1032	char *e = p + 24; // only try up to 24 bytes
978		1033
979	decode_ws (dec); EXPECT_CH (':');	1034	for (;;)
980
981	value = decode_sv (dec);
982	if (!value)
983	{	1035	{
		1036	// the >= 0x80 is true on most architectures
		1037	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1038	{
		1039	// slow path, back up and use decode_str
		1040	SV *key = decode_str (dec);
		1041	if (!key)
		1042	goto fail;
		1043
		1044	decode_ws (dec); EXPECT_CH (':');
		1045
		1046	value = decode_sv (dec);
		1047	if (!value)
		1048	{
		1049	SvREFCNT_dec (key);
		1050	goto fail;
		1051	}
		1052
		1053	hv_store_ent (hv, key, value, 0);
984	SvREFCNT_dec (key);	1054	SvREFCNT_dec (key);
		1055
		1056	break;
		1057	}
		1058	else if (*p == '"')
		1059	{
		1060	// fast path, got a simple key
		1061	char *key = dec->cur;
		1062	int len = p - key;
		1063	dec->cur = p + 1;
		1064
		1065	decode_ws (dec); EXPECT_CH (':');
		1066
		1067	value = decode_sv (dec);
		1068	if (!value)
985	goto fail;	1069	goto fail;
		1070
		1071	hv_store (hv, key, len, value, 0);
		1072
		1073	break;
		1074	}
		1075
		1076	++p;
986	}	1077	}
987		1078	}
988	hv_store_ent (hv, key, value, 0);
989	SvREFCNT_dec (key);
990		1079
991	decode_ws (dec);	1080	decode_ws (dec);
992		1081
993	if (*dec->cur == '}')	1082	if (*dec->cur == '}')
994	{	1083	{
…		…
1001		1090
1002	++dec->cur;	1091	++dec->cur;
1003	}	1092	}
1004		1093
1005	DEC_DEC_DEPTH;	1094	DEC_DEC_DEPTH;
		1095	sv = newRV_noinc ((SV *)hv);
		1096
		1097	// check filter callbacks
		1098	if (dec->json.flags & F_HOOK)
		1099	{
		1100	ENTER; SAVETMPS;
		1101
		1102	if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
		1103	{
		1104	int count;
		1105
		1106	dSP; PUSHMARK (SP);
		1107	XPUSHs (sv_2mortal (sv));
		1108
		1109	PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;
		1110
		1111	if (count == 1)
		1112	sv = newSVsv (POPs);
		1113	else
		1114	SvREFCNT_inc (sv);
		1115	}
		1116
		1117	if (dec->json.cb_object)
		1118	{
		1119	int count;
		1120
		1121	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
		1122	XPUSHs (sv_2mortal (sv));
		1123
		1124	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1125
		1126	if (count == 1)
		1127	sv = newSVsv (POPs);
		1128	else
		1129	SvREFCNT_inc (sv);
		1130	}
		1131
		1132	FREETMPS; LEAVE;
		1133	}
		1134
1006	return newRV_noinc ((SV *)hv);	1135	return newRV_noinc ((SV *)hv);
1007		1136
1008	fail:	1137	fail:
1009	SvREFCNT_dec (hv);	1138	SvREFCNT_dec (hv);
1010	DEC_DEC_DEPTH;	1139	DEC_DEC_DEPTH;
…		…
1031		1160
1032	case 't':	1161	case 't':
1033	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1162	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1034	{	1163	{
1035	dec->cur += 4;	1164	dec->cur += 4;
1036	return newSViv (1);	1165	return SvREFCNT_inc (json_true);
1037	}	1166	}
1038	else	1167	else
1039	ERR ("'true' expected");	1168	ERR ("'true' expected");
1040		1169
1041	break;	1170	break;
1042		1171
1043	case 'f':	1172	case 'f':
1044	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1173	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1045	{	1174	{
1046	dec->cur += 5;	1175	dec->cur += 5;
1047	return newSViv (0);	1176	return SvREFCNT_inc (json_false);
1048	}	1177	}
1049	else	1178	else
1050	ERR ("'false' expected");	1179	ERR ("'false' expected");
1051		1180
1052	break;	1181	break;
…		…
1070	fail:	1199	fail:
1071	return 0;	1200	return 0;
1072	}	1201	}
1073		1202
1074	static SV *	1203	static SV *
1075	decode_json (SV string, U32 flags, UV offset_return)	1204	decode_json (SV string, JSON json, UV *offset_return)
1076	{	1205	{
1077	dec_t dec;	1206	dec_t dec;
1078	UV offset;	1207	UV offset;
1079	SV *sv;	1208	SV *sv;
1080		1209
1081	SvGETMAGIC (string);	1210	SvGETMAGIC (string);
1082	SvUPGRADE (string, SVt_PV);	1211	SvUPGRADE (string, SVt_PV);
1083		1212
		1213	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1214	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1215	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1216
1084	if (flags & F_UTF8)	1217	if (json->flags & F_UTF8)
1085	sv_utf8_downgrade (string, 0);	1218	sv_utf8_downgrade (string, 0);
1086	else	1219	else
1087	sv_utf8_upgrade (string);	1220	sv_utf8_upgrade (string);
1088		1221
1089	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1222	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1090		1223
1091	dec.flags = flags;	1224	dec.json = *json;
1092	dec.cur = SvPVX (string);	1225	dec.cur = SvPVX (string);
1093	dec.end = SvEND (string);	1226	dec.end = SvEND (string);
1094	dec.err = 0;	1227	dec.err = 0;
1095	dec.depth = 0;	1228	dec.depth = 0;
1096	dec.maxdepth = DEC_DEPTH (dec.flags);	1229	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1230
		1231	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1232	dec.json.flags \|= F_HOOK;
1097		1233
1098	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1234	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1099	sv = decode_sv (&dec);	1235	sv = decode_sv (&dec);
1100		1236
1101	if (!(offset_return \|\| !sv))	1237	if (!(offset_return \|\| !sv))
…		…
1111	}	1247	}
1112	}	1248	}
1113		1249
1114	if (offset_return \|\| !sv)	1250	if (offset_return \|\| !sv)
1115	{	1251	{
1116	offset = dec.flags & F_UTF8	1252	offset = dec.json.flags & F_UTF8
1117	? dec.cur - SvPVX (string)	1253	? dec.cur - SvPVX (string)
1118	: utf8_distance (dec.cur, SvPVX (string));	1254	: utf8_distance (dec.cur, SvPVX (string));
1119		1255
1120	if (offset_return)	1256	if (offset_return)
1121	*offset_return = offset;	1257	*offset_return = offset;
…		…
1140	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1276	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1141	}	1277	}
1142		1278
1143	sv = sv_2mortal (sv);	1279	sv = sv_2mortal (sv);
1144		1280
1145	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1281	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1146	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1282	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1147		1283
1148	return sv;	1284	return sv;
1149	}	1285	}
1150		1286
…		…
1162	i >= '0' && i <= '9' ? i - '0'	1298	i >= '0' && i <= '9' ? i - '0'
1163	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1299	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1164	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1300	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1165	: -1;	1301	: -1;
1166		1302
1167	json_stash = gv_stashpv ("JSON::XS", 1);	1303	json_stash = gv_stashpv ("JSON::XS" , 1);
		1304	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1305
		1306	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1307	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1168	}	1308	}
1169		1309
1170	PROTOTYPES: DISABLE	1310	PROTOTYPES: DISABLE
1171		1311
1172	SV new (char dummy)	1312	void new (char *klass)
1173	CODE:	1313	PPCODE:
1174	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1314	{
1175	OUTPUT:	1315	SV *pv = NEWSV (0, sizeof (JSON));
1176	RETVAL	1316	SvPOK_only (pv);
		1317	Zero (SvPVX (pv), 1, JSON);
		1318	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1319	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1320	}
1177		1321
1178	SV ascii (SV self, int enable = 1)	1322	void ascii (JSON *self, int enable = 1)
1179	ALIAS:	1323	ALIAS:
1180	ascii = F_ASCII	1324	ascii = F_ASCII
1181	latin1 = F_LATIN1	1325	latin1 = F_LATIN1
1182	utf8 = F_UTF8	1326	utf8 = F_UTF8
1183	indent = F_INDENT	1327	indent = F_INDENT
1184	canonical = F_CANONICAL	1328	canonical = F_CANONICAL
1185	space_before = F_SPACE_BEFORE	1329	space_before = F_SPACE_BEFORE
1186	space_after = F_SPACE_AFTER	1330	space_after = F_SPACE_AFTER
1187	pretty = F_PRETTY	1331	pretty = F_PRETTY
1188	allow_nonref = F_ALLOW_NONREF	1332	allow_nonref = F_ALLOW_NONREF
1189	shrink = F_SHRINK	1333	shrink = F_SHRINK
		1334	allow_blessed = F_ALLOW_BLESSED
		1335	convert_blessed = F_CONV_BLESSED
1190	CODE:	1336	PPCODE:
1191	{	1337	{
1192	UV *uv = SvJSON (self);
1193	if (enable)	1338	if (enable)
1194	*uv \|= ix;	1339	self->flags \|= ix;
1195	else	1340	else
1196	*uv &= ~ix;	1341	self->flags &= ~ix;
1197		1342
1198	RETVAL = newSVsv (self);	1343	XPUSHs (ST (0));
1199	}	1344	}
1200	OUTPUT:
1201	RETVAL
1202		1345
1203	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1346	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1204	CODE:	1347	PPCODE:
1205	{	1348	{
1206	UV *uv = SvJSON (self);
1207	UV log2 = 0;	1349	UV log2 = 0;
1208		1350
1209	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1351	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1210		1352
1211	while ((1UL << log2) < max_depth)	1353	while ((1UL << log2) < max_depth)
1212	++log2;	1354	++log2;
1213		1355
1214	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1356	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1215		1357
1216	RETVAL = newSVsv (self);	1358	XPUSHs (ST (0));
1217	}	1359	}
1218	OUTPUT:
1219	RETVAL
1220		1360
1221	void encode (SV self, SV scalar)	1361	void max_size (JSON *self, UV max_size = 0)
1222	PPCODE:	1362	PPCODE:
1223	XPUSHs (encode_json (scalar, *SvJSON (self)));	1363	{
		1364	UV log2 = 0;
1224		1365
1225	void decode (SV self, SV jsonstr)	1366	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1367	if (max_size == 1) max_size = 2;
		1368
		1369	while ((1UL << log2) < max_size)
		1370	++log2;
		1371
		1372	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1373
		1374	XPUSHs (ST (0));
		1375	}
		1376
		1377	void filter_json_objects (JSON self, SV cb = &PL_sv_undef)
		1378	ALIAS:
		1379	filter_sk_json_objects = 1
1226	PPCODE:	1380	PPCODE:
		1381	{
		1382	if (!SvOK (cb))
		1383	cb = 0;
		1384
		1385	switch (ix)
		1386	{
		1387	case 0: self->cb_object = cb; break;
		1388	case 1: self->cb_sk_object = cb; break;
		1389	}
		1390
		1391	XPUSHs (ST (0));
		1392	}
		1393
		1394	void encode (JSON self, SV scalar)
		1395	PPCODE:
		1396	XPUSHs (encode_json (scalar, self));
		1397
		1398	void decode (JSON self, SV jsonstr)
		1399	PPCODE:
1227	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1400	XPUSHs (decode_json (jsonstr, self, 0));
1228		1401
1229	void decode_prefix (SV self, SV jsonstr)	1402	void decode_prefix (JSON self, SV jsonstr)
1230	PPCODE:	1403	PPCODE:
1231	{	1404	{
1232	UV offset;	1405	UV offset;
1233	EXTEND (SP, 2);	1406	EXTEND (SP, 2);
1234	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1407	PUSHs (decode_json (jsonstr, self, &offset));
1235	PUSHs (sv_2mortal (newSVuv (offset)));	1408	PUSHs (sv_2mortal (newSVuv (offset)));
1236	}	1409	}
1237		1410
1238	PROTOTYPES: ENABLE	1411	PROTOTYPES: ENABLE
1239		1412
1240	void to_json (SV *scalar)	1413	void to_json (SV *scalar)
1241	ALIAS:
1242	objToJson = 0
1243	PPCODE:	1414	PPCODE:
		1415	{
		1416	JSON json = { F_DEFAULT \| F_UTF8 };
1244	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1417	XPUSHs (encode_json (scalar, &json));
		1418	}
1245		1419
1246	void from_json (SV *jsonstr)	1420	void from_json (SV *jsonstr)
1247	ALIAS:
1248	jsonToObj = 0
1249	PPCODE:	1421	PPCODE:
		1422	{
		1423	JSON json = { F_DEFAULT \| F_UTF8 };
1250	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1424	XPUSHs (decode_json (jsonstr, &json, 0));
		1425	}
1251		1426

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC vs. Revision 1.49 by root, Sun Jul 1 23:40:07 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.41 by root, Sat Jun 23 22:53:16 2007 UTC vs.
Revision 1.49 by root, Sun Jul 1 23:40:07 2007 UTC