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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.42 by root, Sat Jun 23 22:56:08 2007 UTC vs.
Revision 1.47 by root, Sun Jul 1 14:08:03 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 // NYI
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
31		35
32	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
33		37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
34	// F_SELFCONVERT? <=> to_json/toJson
35	// F_BLESSED? <=> { $__class__$ => }
36		38
37	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
38	#define F_DEFAULT (9UL << S_MAXDEPTH)	40	#define F_DEFAULT (9UL << S_MAXDEPTH)
39		41
40	#define INIT_SIZE 32 // initial scalar size to be allocated	42	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
54	#endif	56	#endif
55		57
56	#define expect_false(expr) expect ((expr) != 0, 0)	58	#define expect_false(expr) expect ((expr) != 0, 0)
57	#define expect_true(expr) expect ((expr) != 0, 1)	59	#define expect_true(expr) expect ((expr) != 0, 1)
58		60
59	static HV *json_stash; // JSON::XS::	61	static HV json_stash, json_boolean_stash; // JSON::XS::
		62	static SV json_true, json_false;
		63
		64	typedef struct json {
		65	U32 flags;
		66	} JSON__XS;
60		67
61	/////////////////////////////////////////////////////////////////////////////	68	/////////////////////////////////////////////////////////////////////////////
62	// utility functions	69	// utility functions
63		70
64	static UV *	71	static UV *
…		…
113	typedef struct	120	typedef struct
114	{	121	{
115	char *cur; // SvPVX (sv) + current output position	122	char *cur; // SvPVX (sv) + current output position
116	char *end; // SvEND (sv)	123	char *end; // SvEND (sv)
117	SV *sv; // result scalar	124	SV *sv; // result scalar
118	U32 flags; // F_*	125	struct json json;
119	U32 indent; // indentation level	126	U32 indent; // indentation level
120	U32 maxdepth; // max. indentation/recursion level	127	U32 maxdepth; // max. indentation/recursion level
121	} enc_t;	128	} enc_t;
122		129
123	inline void	130	inline void
…		…
197	}	204	}
198		205
199	if (uch > 0x10FFFFUL)	206	if (uch > 0x10FFFFUL)
200	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	207	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
201		208
202	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	209	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
203	{	210	{
204	if (uch > 0xFFFFUL)	211	if (uch > 0xFFFFUL)
205	{	212	{
206	need (enc, len += 11);	213	need (enc, len += 11);
207	sprintf (enc->cur, "\\u%04x\\u%04x",	214	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
221	*enc->cur++ = hexdigit [(uch >> 0) & 15];	228	*enc->cur++ = hexdigit [(uch >> 0) & 15];
222	}	229	}
223		230
224	str += clen;	231	str += clen;
225	}	232	}
226	else if (enc->flags & F_LATIN1)	233	else if (enc->json.flags & F_LATIN1)
227	{	234	{
228	*enc->cur++ = uch;	235	*enc->cur++ = uch;
229	str += clen;	236	str += clen;
230	}	237	}
231	else if (is_utf8)	238	else if (is_utf8)
…		…
252	}	259	}
253		260
254	inline void	261	inline void
255	encode_indent (enc_t *enc)	262	encode_indent (enc_t *enc)
256	{	263	{
257	if (enc->flags & F_INDENT)	264	if (enc->json.flags & F_INDENT)
258	{	265	{
259	int spaces = enc->indent * INDENT_STEP;	266	int spaces = enc->indent * INDENT_STEP;
260		267
261	need (enc, spaces);	268	need (enc, spaces);
262	memset (enc->cur, ' ', spaces);	269	memset (enc->cur, ' ', spaces);
…		…
272	}	279	}
273		280
274	inline void	281	inline void
275	encode_nl (enc_t *enc)	282	encode_nl (enc_t *enc)
276	{	283	{
277	if (enc->flags & F_INDENT)	284	if (enc->json.flags & F_INDENT)
278	{	285	{
279	need (enc, 1);	286	need (enc, 1);
280	encode_ch (enc, '\n');	287	encode_ch (enc, '\n');
281	}	288	}
282	}	289	}
…		…
284	inline void	291	inline void
285	encode_comma (enc_t *enc)	292	encode_comma (enc_t *enc)
286	{	293	{
287	encode_ch (enc, ',');	294	encode_ch (enc, ',');
288		295
289	if (enc->flags & F_INDENT)	296	if (enc->json.flags & F_INDENT)
290	encode_nl (enc);	297	encode_nl (enc);
291	else if (enc->flags & F_SPACE_AFTER)	298	else if (enc->json.flags & F_SPACE_AFTER)
292	encode_space (enc);	299	encode_space (enc);
293	}	300	}
294		301
295	static void encode_sv (enc_t enc, SV sv);	302	static void encode_sv (enc_t enc, SV sv);
296		303
…		…
339	else	346	else
340	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	347	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
341		348
342	encode_ch (enc, '"');	349	encode_ch (enc, '"');
343		350
344	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	351	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345	encode_ch (enc, ':');	352	encode_ch (enc, ':');
346	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	353	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347	encode_sv (enc, HeVAL (he));	354	encode_sv (enc, HeVAL (he));
348	}	355	}
349		356
350	// compare hash entries, used when all keys are bytestrings	357	// compare hash entries, used when all keys are bytestrings
351	static int	358	static int
…		…
386	{	393	{
387	// for canonical output we have to sort by keys first	394	// for canonical output we have to sort by keys first
388	// actually, this is mostly due to the stupid so-called	395	// actually, this is mostly due to the stupid so-called
389	// security workaround added somewhere in 5.8.x.	396	// security workaround added somewhere in 5.8.x.
390	// that randomises hash orderings	397	// that randomises hash orderings
391	if (enc->flags & F_CANONICAL)	398	if (enc->json.flags & F_CANONICAL)
392	{	399	{
393	int fast = 1;	400	int fast = 1;
394	HE *he;	401	HE *he;
395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	402	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
396	HE *hes = _alloca (count sizeof (HE));	403	HE *hes = _alloca (count sizeof (HE));
…		…
468	svtype svt;	475	svtype svt;
469		476
470	SvGETMAGIC (sv);	477	SvGETMAGIC (sv);
471	svt = SvTYPE (sv);	478	svt = SvTYPE (sv);
472		479
		480	if (expect_false (SvOBJECT (sv)))
		481	{
		482	if (SvSTASH (sv) == json_boolean_stash)
		483	{
		484	if (SvIV (sv) == 0)
		485	encode_str (enc, "false", 5, 0);
		486	else
		487	encode_str (enc, "true", 4, 0);
		488	}
		489	else
		490	{
		491	#if 0
		492	if (0 && sv_derived_from (rv, "JSON::Literal"))
		493	{
		494	// not yet
		495	}
		496	#endif
		497	if (enc->json.flags & F_CONV_BLESSED)
		498	{
		499	// we re-bless the reference to get overload and other niceties right
		500	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
		501
		502	if (to_json)
		503	{
		504	dSP;
		505	ENTER;
		506	SAVETMPS;
		507	PUSHMARK (SP);
		508	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
		509
		510	// calling with G_SCALAR ensures that we always get a 1 reutrn value
		511	// check anyways.
		512	PUTBACK;
		513	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
		514	SPAGAIN;
		515
		516	encode_sv (enc, POPs);
		517
		518	FREETMPS;
		519	LEAVE;
		520	}
		521	else if (enc->json.flags & F_ALLOW_BLESSED)
		522	encode_str (enc, "null", 4, 0);
		523	else
		524	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
		525	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		526	}
		527	else if (enc->json.flags & F_ALLOW_BLESSED)
		528	encode_str (enc, "null", 4, 0);
		529	else
		530	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
		531	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		532	}
		533	}
473	if (svt == SVt_PVHV)	534	else if (svt == SVt_PVHV)
474	encode_hv (enc, (HV *)sv);	535	encode_hv (enc, (HV *)sv);
475	else if (svt == SVt_PVAV)	536	else if (svt == SVt_PVAV)
476	encode_av (enc, (AV *)sv);	537	encode_av (enc, (AV *)sv);
477	else if (svt < SVt_PVAV)	538	else if (svt < SVt_PVAV)
478	{	539	{
…		…
557	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	618	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
558	SvPV_nolen (sv), SvFLAGS (sv));	619	SvPV_nolen (sv), SvFLAGS (sv));
559	}	620	}
560		621
561	static SV *	622	static SV *
562	encode_json (SV *scalar, U32 flags)	623	encode_json (SV scalar, struct json json)
563	{	624	{
564	enc_t enc;	625	enc_t enc;
565		626
566	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	627	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
567	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	628	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
568		629
569	enc.flags = flags;	630	enc.json = *json;
570	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	631	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
571	enc.cur = SvPVX (enc.sv);	632	enc.cur = SvPVX (enc.sv);
572	enc.end = SvEND (enc.sv);	633	enc.end = SvEND (enc.sv);
573	enc.indent = 0;	634	enc.indent = 0;
574	enc.maxdepth = DEC_DEPTH (flags);	635	enc.maxdepth = DEC_DEPTH (enc.json.flags);
575		636
576	SvPOK_only (enc.sv);	637	SvPOK_only (enc.sv);
577	encode_sv (&enc, scalar);	638	encode_sv (&enc, scalar);
578		639
579	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	640	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
580	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	641	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
581		642
582	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	643	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
583	SvUTF8_on (enc.sv);	644	SvUTF8_on (enc.sv);
584		645
585	if (enc.flags & F_SHRINK)	646	if (enc.json.flags & F_SHRINK)
586	shrink (enc.sv);	647	shrink (enc.sv);
587		648
588	return enc.sv;	649	return enc.sv;
589	}	650	}
590		651
…		…
595	typedef struct	656	typedef struct
596	{	657	{
597	char *cur; // current parser pointer	658	char *cur; // current parser pointer
598	char *end; // end of input string	659	char *end; // end of input string
599	const char *err; // parse error, if != 0	660	const char *err; // parse error, if != 0
600	U32 flags; // F_*	661	struct json json;
601	U32 depth; // recursion depth	662	U32 depth; // recursion depth
602	U32 maxdepth; // recursion depth limit	663	U32 maxdepth; // recursion depth limit
603	} dec_t;	664	} dec_t;
604		665
605	inline void	666	inline void
…		…
966	if (*dec->cur == '}')	1027	if (*dec->cur == '}')
967	++dec->cur;	1028	++dec->cur;
968	else	1029	else
969	for (;;)	1030	for (;;)
970	{	1031	{
971	SV key, value;
972
973	decode_ws (dec); EXPECT_CH ('"');	1032	decode_ws (dec); EXPECT_CH ('"');
974		1033
975	key = decode_str (dec);	1034	// heuristic: assume that
976	if (!key)	1035	// a) decode_str + hv_store_ent are abysmally slow.
977	goto fail;	1036	// b) most hash keys are short, simple ascii text.
		1037	// => try to "fast-match" such strings to avoid
		1038	// the overhead of decode_str + hv_store_ent.
		1039	{
		1040	SV *value;
		1041	char *p = dec->cur;
		1042	char *e = p + 24; // only try up to 24 bytes
978		1043
979	decode_ws (dec); EXPECT_CH (':');	1044	for (;;)
980
981	value = decode_sv (dec);
982	if (!value)
983	{	1045	{
		1046	// the >= 0x80 is true on most architectures
		1047	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1048	{
		1049	// slow path, back up and use decode_str
		1050	SV *key = decode_str (dec);
		1051	if (!key)
		1052	goto fail;
		1053
		1054	decode_ws (dec); EXPECT_CH (':');
		1055
		1056	value = decode_sv (dec);
		1057	if (!value)
		1058	{
		1059	SvREFCNT_dec (key);
		1060	goto fail;
		1061	}
		1062
		1063	hv_store_ent (hv, key, value, 0);
984	SvREFCNT_dec (key);	1064	SvREFCNT_dec (key);
		1065
		1066	break;
		1067	}
		1068	else if (*p == '"')
		1069	{
		1070	// fast path, got a simple key
		1071	char *key = dec->cur;
		1072	int len = p - key;
		1073	dec->cur = p + 1;
		1074
		1075	decode_ws (dec); EXPECT_CH (':');
		1076
		1077	value = decode_sv (dec);
		1078	if (!value)
985	goto fail;	1079	goto fail;
		1080
		1081	hv_store (hv, key, len, value, 0);
		1082
		1083	break;
		1084	}
		1085
		1086	++p;
986	}	1087	}
987		1088	}
988	hv_store_ent (hv, key, value, 0);
989	SvREFCNT_dec (key);
990		1089
991	decode_ws (dec);	1090	decode_ws (dec);
992		1091
993	if (*dec->cur == '}')	1092	if (*dec->cur == '}')
994	{	1093	{
…		…
1031		1130
1032	case 't':	1131	case 't':
1033	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1132	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1034	{	1133	{
1035	dec->cur += 4;	1134	dec->cur += 4;
1036	return newSViv (1);	1135	return SvREFCNT_inc (json_true);
1037	}	1136	}
1038	else	1137	else
1039	ERR ("'true' expected");	1138	ERR ("'true' expected");
1040		1139
1041	break;	1140	break;
1042		1141
1043	case 'f':	1142	case 'f':
1044	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1143	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1045	{	1144	{
1046	dec->cur += 5;	1145	dec->cur += 5;
1047	return newSViv (0);	1146	return SvREFCNT_inc (json_false);
1048	}	1147	}
1049	else	1148	else
1050	ERR ("'false' expected");	1149	ERR ("'false' expected");
1051		1150
1052	break;	1151	break;
…		…
1070	fail:	1169	fail:
1071	return 0;	1170	return 0;
1072	}	1171	}
1073		1172
1074	static SV *	1173	static SV *
1075	decode_json (SV string, U32 flags, UV offset_return)	1174	decode_json (SV string, struct json json, UV *offset_return)
1076	{	1175	{
1077	dec_t dec;	1176	dec_t dec;
1078	UV offset;	1177	UV offset;
1079	SV *sv;	1178	SV *sv;
1080		1179
1081	SvGETMAGIC (string);	1180	SvGETMAGIC (string);
1082	SvUPGRADE (string, SVt_PV);	1181	SvUPGRADE (string, SVt_PV);
1083		1182
		1183	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1184	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1185	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1186
1084	if (flags & F_UTF8)	1187	if (json->flags & F_UTF8)
1085	sv_utf8_downgrade (string, 0);	1188	sv_utf8_downgrade (string, 0);
1086	else	1189	else
1087	sv_utf8_upgrade (string);	1190	sv_utf8_upgrade (string);
1088		1191
1089	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1192	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1090		1193
1091	dec.flags = flags;	1194	dec.json = *json;
1092	dec.cur = SvPVX (string);	1195	dec.cur = SvPVX (string);
1093	dec.end = SvEND (string);	1196	dec.end = SvEND (string);
1094	dec.err = 0;	1197	dec.err = 0;
1095	dec.depth = 0;	1198	dec.depth = 0;
1096	dec.maxdepth = DEC_DEPTH (dec.flags);	1199	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1097		1200
1098	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1201	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1099	sv = decode_sv (&dec);	1202	sv = decode_sv (&dec);
1100		1203
1101	if (!(offset_return \|\| !sv))	1204	if (!(offset_return \|\| !sv))
…		…
1111	}	1214	}
1112	}	1215	}
1113		1216
1114	if (offset_return \|\| !sv)	1217	if (offset_return \|\| !sv)
1115	{	1218	{
1116	offset = dec.flags & F_UTF8	1219	offset = dec.json.flags & F_UTF8
1117	? dec.cur - SvPVX (string)	1220	? dec.cur - SvPVX (string)
1118	: utf8_distance (dec.cur, SvPVX (string));	1221	: utf8_distance (dec.cur, SvPVX (string));
1119		1222
1120	if (offset_return)	1223	if (offset_return)
1121	*offset_return = offset;	1224	*offset_return = offset;
…		…
1140	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1243	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1141	}	1244	}
1142		1245
1143	sv = sv_2mortal (sv);	1246	sv = sv_2mortal (sv);
1144		1247
1145	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1248	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)");	1249	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1147		1250
1148	return sv;	1251	return sv;
1149	}	1252	}
1150		1253
…		…
1162	i >= '0' && i <= '9' ? i - '0'	1265	i >= '0' && i <= '9' ? i - '0'
1163	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1266	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1164	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1267	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1165	: -1;	1268	: -1;
1166		1269
1167	json_stash = gv_stashpv ("JSON::XS", 1);	1270	json_stash = gv_stashpv ("JSON::XS" , 1);
		1271	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
		1272
		1273	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
		1274	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1168	}	1275	}
1169		1276
1170	PROTOTYPES: DISABLE	1277	PROTOTYPES: DISABLE
1171		1278
1172	SV new (char dummy)	1279	SV new (char dummy)
…		…
1175	OUTPUT:	1282	OUTPUT:
1176	RETVAL	1283	RETVAL
1177		1284
1178	SV ascii (SV self, int enable = 1)	1285	SV ascii (SV self, int enable = 1)
1179	ALIAS:	1286	ALIAS:
1180	ascii = F_ASCII	1287	ascii = F_ASCII
1181	latin1 = F_LATIN1	1288	latin1 = F_LATIN1
1182	utf8 = F_UTF8	1289	utf8 = F_UTF8
1183	indent = F_INDENT	1290	indent = F_INDENT
1184	canonical = F_CANONICAL	1291	canonical = F_CANONICAL
1185	space_before = F_SPACE_BEFORE	1292	space_before = F_SPACE_BEFORE
1186	space_after = F_SPACE_AFTER	1293	space_after = F_SPACE_AFTER
1187	pretty = F_PRETTY	1294	pretty = F_PRETTY
1188	allow_nonref = F_ALLOW_NONREF	1295	allow_nonref = F_ALLOW_NONREF
1189	shrink = F_SHRINK	1296	shrink = F_SHRINK
		1297	allow_blessed = F_ALLOW_BLESSED
		1298	convert_blessed = F_CONV_BLESSED
1190	CODE:	1299	CODE:
1191	{	1300	{
1192	UV *uv = SvJSON (self);	1301	UV *uv = SvJSON (self);
1193	if (enable)	1302	if (enable)
1194	*uv \|= ix;	1303	*uv \|= ix;
…		…
1216	RETVAL = newSVsv (self);	1325	RETVAL = newSVsv (self);
1217	}	1326	}
1218	OUTPUT:	1327	OUTPUT:
1219	RETVAL	1328	RETVAL
1220		1329
		1330	SV max_size (SV self, UV max_size = 0)
		1331	CODE:
		1332	{
		1333	UV *uv = SvJSON (self);
		1334	UV log2 = 0;
		1335
		1336	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1337	if (max_size == 1) max_size = 2;
		1338
		1339	while ((1UL << log2) < max_size)
		1340	++log2;
		1341
		1342	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1343
		1344	RETVAL = newSVsv (self);
		1345	}
		1346	OUTPUT:
		1347	RETVAL
		1348
1221	void encode (SV self, SV scalar)	1349	void encode (SV self, SV scalar)
1222	PPCODE:	1350	PPCODE:
		1351	{
		1352	struct json json = { *SvJSON (self) };
1223	XPUSHs (encode_json (scalar, *SvJSON (self)));	1353	XPUSHs (encode_json (scalar, &json));
		1354	}
1224		1355
1225	void decode (SV self, SV jsonstr)	1356	void decode (SV self, SV jsonstr)
1226	PPCODE:	1357	PPCODE:
		1358	{
		1359	struct json json = { *SvJSON (self) };
1227	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1360	XPUSHs (decode_json (jsonstr, &json, 0));
		1361	}
1228		1362
1229	void decode_prefix (SV self, SV jsonstr)	1363	void decode_prefix (SV self, SV jsonstr)
1230	PPCODE:	1364	PPCODE:
1231	{	1365	{
1232	UV offset;	1366	UV offset;
		1367	struct json json = { *SvJSON (self) };
1233	EXTEND (SP, 2);	1368	EXTEND (SP, 2);
1234	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1369	PUSHs (decode_json (jsonstr, &json, &offset));
1235	PUSHs (sv_2mortal (newSVuv (offset)));	1370	PUSHs (sv_2mortal (newSVuv (offset)));
1236	}	1371	}
1237		1372
1238	PROTOTYPES: ENABLE	1373	PROTOTYPES: ENABLE
1239		1374
1240	void to_json (SV *scalar)	1375	void to_json (SV *scalar)
1241	ALIAS:
1242	objToJson = 0
1243	PPCODE:	1376	PPCODE:
		1377	{
		1378	struct json json = { F_DEFAULT \| F_UTF8 };
1244	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1379	XPUSHs (encode_json (scalar, &json));
		1380	}
1245		1381
1246	void from_json (SV *jsonstr)	1382	void from_json (SV *jsonstr)
1247	ALIAS:
1248	jsonToObj = 0
1249	PPCODE:	1383	PPCODE:
		1384	{
		1385	struct json json = { F_DEFAULT \| F_UTF8 };
1250	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1386	XPUSHs (decode_json (jsonstr, &json, 0));
		1387	}
1251		1388

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.42 by root, Sat Jun 23 22:56:08 2007 UTC vs. Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.42 by root, Sat Jun 23 22:56:08 2007 UTC vs.
Revision 1.47 by root, Sun Jul 1 14:08:03 2007 UTC