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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.44 by root, Mon Jun 25 04:08:17 2007 UTC vs.
Revision 1.50 by root, Mon Jul 2 00:29:38 2007 UTC

…		…
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	29	#define F_ALLOW_BLESSED 0x00000400UL
30	#define F_CONV_BLESSED 0x00000800UL // NYI	30	#define F_CONV_BLESSED 0x00000800UL
31	#define F_MAXDEPTH 0xf8000000UL	31	#define F_MAXDEPTH 0xf8000000UL
32	#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
33		36
34	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	37	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
		38	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
35		39
36	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
37	#define F_DEFAULT (9UL << S_MAXDEPTH)	41	#define F_DEFAULT (9UL << S_MAXDEPTH)
38		42
39	#define INIT_SIZE 32 // initial scalar size to be allocated	43	#define INIT_SIZE 32 // initial scalar size to be allocated
…		…
56	#define expect_true(expr) expect ((expr) != 0, 1)	60	#define expect_true(expr) expect ((expr) != 0, 1)
57		61
58	static HV json_stash, json_boolean_stash; // JSON::XS::	62	static HV json_stash, json_boolean_stash; // JSON::XS::
59	static SV json_true, json_false;	63	static SV json_true, json_false;
60		64
		65	typedef struct {
		66	U32 flags;
		67	SV cb_object, cb_sk_object;
		68	} JSON;
		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));
…		…
485	if (0 && sv_derived_from (rv, "JSON::Literal"))	485	if (0 && sv_derived_from (rv, "JSON::Literal"))
486	{	486	{
487	// not yet	487	// not yet
488	}	488	}
489	#endif	489	#endif
490	if (enc->flags & F_CONV_BLESSED)	490	if (enc->json.flags & F_CONV_BLESSED)
491	{	491	{
492	// we re-bless the reference to get overload and other niceties right	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);	493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
494		494
495	if (to_json)	495	if (to_json)
496	{	496	{
497	dSP;	497	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
498	ENTER;
499	SAVETMPS;
500	PUSHMARK (SP);
501	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	498	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
502		499
503	// calling with G_SCALAR ensures that we always get a 1 reutrn value	500	// calling with G_SCALAR ensures that we always get a 1 reutrn value
504	// check anyways.	501	// check anyways.
505	PUTBACK;	502	PUTBACK;
506	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	503	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
507	SPAGAIN;	504	SPAGAIN;
508		505
509	encode_sv (enc, POPs);	506	encode_sv (enc, POPs);
510		507
511	FREETMPS;	508	FREETMPS; LEAVE;
512	LEAVE;
513	}	509	}
514	else if (enc->flags & F_ALLOW_BLESSED)	510	else if (enc->json.flags & F_ALLOW_BLESSED)
515	encode_str (enc, "null", 4, 0);	511	encode_str (enc, "null", 4, 0);
516	else	512	else
517	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	513	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
518	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	514	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
519	}	515	}
520	else if (enc->flags & F_ALLOW_BLESSED)	516	else if (enc->json.flags & F_ALLOW_BLESSED)
521	encode_str (enc, "null", 4, 0);	517	encode_str (enc, "null", 4, 0);
522	else	518	else
523	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	519	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
524	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	520	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
525	}	521	}
…		…
528	encode_hv (enc, (HV *)sv);	524	encode_hv (enc, (HV *)sv);
529	else if (svt == SVt_PVAV)	525	else if (svt == SVt_PVAV)
530	encode_av (enc, (AV *)sv);	526	encode_av (enc, (AV *)sv);
531	else if (svt < SVt_PVAV)	527	else if (svt < SVt_PVAV)
532	{	528	{
533	if (SvNIOK (sv) && SvIV (sv) == 0)	529	STRLEN len = 0;
		530	char *pv = svt ? SvPV (sv, len) : 0;
		531
		532	if (len == 1 && *pv == '0')
534	encode_str (enc, "false", 5, 0);	533	encode_str (enc, "false", 5, 0);
535	else if (SvNIOK (sv) && SvIV (sv) == 1)	534	else if (len == 1 && *pv == '1')
536	encode_str (enc, "true", 4, 0);	535	encode_str (enc, "true", 4, 0);
537	else	536	else
538	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	537	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
539	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	538	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
540	}	539	}
…		…
611	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	610	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
612	SvPV_nolen (sv), SvFLAGS (sv));	611	SvPV_nolen (sv), SvFLAGS (sv));
613	}	612	}
614		613
615	static SV *	614	static SV *
616	encode_json (SV *scalar, U32 flags)	615	encode_json (SV scalar, JSON json)
617	{	616	{
618	enc_t enc;	617	enc_t enc;
619		618
620	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	619	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
621	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	620	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
622		621
623	enc.flags = flags;	622	enc.json = *json;
624	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	623	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
625	enc.cur = SvPVX (enc.sv);	624	enc.cur = SvPVX (enc.sv);
626	enc.end = SvEND (enc.sv);	625	enc.end = SvEND (enc.sv);
627	enc.indent = 0;	626	enc.indent = 0;
628	enc.maxdepth = DEC_DEPTH (flags);	627	enc.maxdepth = DEC_DEPTH (enc.json.flags);
629		628
630	SvPOK_only (enc.sv);	629	SvPOK_only (enc.sv);
631	encode_sv (&enc, scalar);	630	encode_sv (&enc, scalar);
632		631
633	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	632	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
634	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	633	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
635		634
636	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	635	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
637	SvUTF8_on (enc.sv);	636	SvUTF8_on (enc.sv);
638		637
639	if (enc.flags & F_SHRINK)	638	if (enc.json.flags & F_SHRINK)
640	shrink (enc.sv);	639	shrink (enc.sv);
641		640
642	return enc.sv;	641	return enc.sv;
643	}	642	}
644		643
…		…
649	typedef struct	648	typedef struct
650	{	649	{
651	char *cur; // current parser pointer	650	char *cur; // current parser pointer
652	char *end; // end of input string	651	char *end; // end of input string
653	const char *err; // parse error, if != 0	652	const char *err; // parse error, if != 0
654	U32 flags; // F_*	653	JSON json;
655	U32 depth; // recursion depth	654	U32 depth; // recursion depth
656	U32 maxdepth; // recursion depth limit	655	U32 maxdepth; // recursion depth limit
657	} dec_t;	656	} dec_t;
658		657
659	inline void	658	inline void
…		…
1010	}	1009	}
1011		1010
1012	static SV *	1011	static SV *
1013	decode_hv (dec_t *dec)	1012	decode_hv (dec_t *dec)
1014	{	1013	{
		1014	SV *sv;
1015	HV *hv = newHV ();	1015	HV *hv = newHV ();
1016		1016
1017	DEC_INC_DEPTH;	1017	DEC_INC_DEPTH;
1018	decode_ws (dec);	1018	decode_ws (dec);
1019		1019
1020	if (*dec->cur == '}')	1020	if (*dec->cur == '}')
1021	++dec->cur;	1021	++dec->cur;
1022	else	1022	else
1023	for (;;)	1023	for (;;)
1024	{	1024	{
1025	SV key, value;
1026
1027	decode_ws (dec); EXPECT_CH ('"');	1025	decode_ws (dec); EXPECT_CH ('"');
1028		1026
1029	key = decode_str (dec);	1027	// heuristic: assume that
1030	if (!key)	1028	// a) decode_str + hv_store_ent are abysmally slow.
1031	goto fail;	1029	// b) most hash keys are short, simple ascii text.
		1030	// => try to "fast-match" such strings to avoid
		1031	// the overhead of decode_str + hv_store_ent.
		1032	{
		1033	SV *value;
		1034	char *p = dec->cur;
		1035	char *e = p + 24; // only try up to 24 bytes
1032		1036
1033	decode_ws (dec); EXPECT_CH (':');	1037	for (;;)
1034
1035	value = decode_sv (dec);
1036	if (!value)
1037	{	1038	{
		1039	// the >= 0x80 is true on most architectures
		1040	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1041	{
		1042	// slow path, back up and use decode_str
		1043	SV *key = decode_str (dec);
		1044	if (!key)
		1045	goto fail;
		1046
		1047	decode_ws (dec); EXPECT_CH (':');
		1048
		1049	value = decode_sv (dec);
		1050	if (!value)
		1051	{
		1052	SvREFCNT_dec (key);
		1053	goto fail;
		1054	}
		1055
		1056	hv_store_ent (hv, key, value, 0);
1038	SvREFCNT_dec (key);	1057	SvREFCNT_dec (key);
		1058
		1059	break;
		1060	}
		1061	else if (*p == '"')
		1062	{
		1063	// fast path, got a simple key
		1064	char *key = dec->cur;
		1065	int len = p - key;
		1066	dec->cur = p + 1;
		1067
		1068	decode_ws (dec); EXPECT_CH (':');
		1069
		1070	value = decode_sv (dec);
		1071	if (!value)
1039	goto fail;	1072	goto fail;
		1073
		1074	hv_store (hv, key, len, value, 0);
		1075
		1076	break;
		1077	}
		1078
		1079	++p;
1040	}	1080	}
1041		1081	}
1042	hv_store_ent (hv, key, value, 0);
1043	SvREFCNT_dec (key);
1044		1082
1045	decode_ws (dec);	1083	decode_ws (dec);
1046		1084
1047	if (*dec->cur == '}')	1085	if (*dec->cur == '}')
1048	{	1086	{
…		…
1055		1093
1056	++dec->cur;	1094	++dec->cur;
1057	}	1095	}
1058		1096
1059	DEC_DEC_DEPTH;	1097	DEC_DEC_DEPTH;
		1098	sv = newRV_noinc ((SV *)hv);
		1099
		1100	// check filter callbacks
		1101	if (dec->json.flags & F_HOOK)
		1102	{
		1103	ENTER; SAVETMPS;
		1104
		1105	if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
		1106	{
		1107	int count;
		1108
		1109	dSP; PUSHMARK (SP);
		1110	XPUSHs (sv_2mortal (sv));
		1111
		1112	PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;
		1113
		1114	if (count == 1)
		1115	sv = newSVsv (POPs);
		1116	else
		1117	SvREFCNT_inc (sv);
		1118	}
		1119
		1120	if (dec->json.cb_object)
		1121	{
		1122	int count;
		1123
		1124	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
		1125	XPUSHs (sv_2mortal (sv));
		1126
		1127	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1128
		1129	if (count == 1)
		1130	sv = newSVsv (POPs);
		1131	else
		1132	SvREFCNT_inc (sv);
		1133	}
		1134
		1135	FREETMPS; LEAVE;
		1136	}
		1137
1060	return newRV_noinc ((SV *)hv);	1138	return newRV_noinc ((SV *)hv);
1061		1139
1062	fail:	1140	fail:
1063	SvREFCNT_dec (hv);	1141	SvREFCNT_dec (hv);
1064	DEC_DEC_DEPTH;	1142	DEC_DEC_DEPTH;
…		…
1124	fail:	1202	fail:
1125	return 0;	1203	return 0;
1126	}	1204	}
1127		1205
1128	static SV *	1206	static SV *
1129	decode_json (SV string, U32 flags, UV offset_return)	1207	decode_json (SV string, JSON json, UV *offset_return)
1130	{	1208	{
1131	dec_t dec;	1209	dec_t dec;
1132	UV offset;	1210	UV offset;
1133	SV *sv;	1211	SV *sv;
1134		1212
1135	SvGETMAGIC (string);	1213	SvGETMAGIC (string);
1136	SvUPGRADE (string, SVt_PV);	1214	SvUPGRADE (string, SVt_PV);
1137		1215
		1216	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1217	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1218	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1219
1138	if (flags & F_UTF8)	1220	if (json->flags & F_UTF8)
1139	sv_utf8_downgrade (string, 0);	1221	sv_utf8_downgrade (string, 0);
1140	else	1222	else
1141	sv_utf8_upgrade (string);	1223	sv_utf8_upgrade (string);
1142		1224
1143	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1225	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1144		1226
1145	dec.flags = flags;	1227	dec.json = *json;
1146	dec.cur = SvPVX (string);	1228	dec.cur = SvPVX (string);
1147	dec.end = SvEND (string);	1229	dec.end = SvEND (string);
1148	dec.err = 0;	1230	dec.err = 0;
1149	dec.depth = 0;	1231	dec.depth = 0;
1150	dec.maxdepth = DEC_DEPTH (dec.flags);	1232	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1233
		1234	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1235	dec.json.flags \|= F_HOOK;
1151		1236
1152	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1237	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1153	sv = decode_sv (&dec);	1238	sv = decode_sv (&dec);
1154		1239
1155	if (!(offset_return \|\| !sv))	1240	if (!(offset_return \|\| !sv))
…		…
1165	}	1250	}
1166	}	1251	}
1167		1252
1168	if (offset_return \|\| !sv)	1253	if (offset_return \|\| !sv)
1169	{	1254	{
1170	offset = dec.flags & F_UTF8	1255	offset = dec.json.flags & F_UTF8
1171	? dec.cur - SvPVX (string)	1256	? dec.cur - SvPVX (string)
1172	: utf8_distance (dec.cur, SvPVX (string));	1257	: utf8_distance (dec.cur, SvPVX (string));
1173		1258
1174	if (offset_return)	1259	if (offset_return)
1175	*offset_return = offset;	1260	*offset_return = offset;
…		…
1194	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1279	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1195	}	1280	}
1196		1281
1197	sv = sv_2mortal (sv);	1282	sv = sv_2mortal (sv);
1198		1283
1199	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1284	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1200	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1285	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1201		1286
1202	return sv;	1287	return sv;
1203	}	1288	}
1204		1289
…		…
1225	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1310	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1226	}	1311	}
1227		1312
1228	PROTOTYPES: DISABLE	1313	PROTOTYPES: DISABLE
1229		1314
1230	SV new (char dummy)	1315	void new (char *klass)
1231	CODE:	1316	PPCODE:
1232	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1317	{
1233	OUTPUT:	1318	SV *pv = NEWSV (0, sizeof (JSON));
1234	RETVAL	1319	SvPOK_only (pv);
		1320	Zero (SvPVX (pv), 1, JSON);
		1321	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1322	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1323	}
1235		1324
1236	SV ascii (SV self, int enable = 1)	1325	void ascii (JSON *self, int enable = 1)
1237	ALIAS:	1326	ALIAS:
1238	ascii = F_ASCII	1327	ascii = F_ASCII
1239	latin1 = F_LATIN1	1328	latin1 = F_LATIN1
1240	utf8 = F_UTF8	1329	utf8 = F_UTF8
1241	indent = F_INDENT	1330	indent = F_INDENT
…		…
1245	pretty = F_PRETTY	1334	pretty = F_PRETTY
1246	allow_nonref = F_ALLOW_NONREF	1335	allow_nonref = F_ALLOW_NONREF
1247	shrink = F_SHRINK	1336	shrink = F_SHRINK
1248	allow_blessed = F_ALLOW_BLESSED	1337	allow_blessed = F_ALLOW_BLESSED
1249	convert_blessed = F_CONV_BLESSED	1338	convert_blessed = F_CONV_BLESSED
1250	CODE:	1339	PPCODE:
1251	{	1340	{
1252	UV *uv = SvJSON (self);
1253	if (enable)	1341	if (enable)
1254	*uv \|= ix;	1342	self->flags \|= ix;
1255	else	1343	else
1256	*uv &= ~ix;	1344	self->flags &= ~ix;
1257		1345
1258	RETVAL = newSVsv (self);	1346	XPUSHs (ST (0));
1259	}	1347	}
1260	OUTPUT:
1261	RETVAL
1262		1348
1263	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1349	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1264	CODE:	1350	PPCODE:
1265	{	1351	{
1266	UV *uv = SvJSON (self);
1267	UV log2 = 0;	1352	UV log2 = 0;
1268		1353
1269	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1354	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1270		1355
1271	while ((1UL << log2) < max_depth)	1356	while ((1UL << log2) < max_depth)
1272	++log2;	1357	++log2;
1273		1358
1274	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1359	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1275		1360
1276	RETVAL = newSVsv (self);	1361	XPUSHs (ST (0));
1277	}	1362	}
1278	OUTPUT:
1279	RETVAL
1280		1363
1281	void encode (SV self, SV scalar)	1364	void max_size (JSON *self, UV max_size = 0)
1282	PPCODE:	1365	PPCODE:
1283	XPUSHs (encode_json (scalar, *SvJSON (self)));	1366	{
		1367	UV log2 = 0;
1284		1368
1285	void decode (SV self, SV jsonstr)	1369	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1370	if (max_size == 1) max_size = 2;
		1371
		1372	while ((1UL << log2) < max_size)
		1373	++log2;
		1374
		1375	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1376
		1377	XPUSHs (ST (0));
		1378	}
		1379
		1380	void filter_json_objects (JSON self, SV cb = &PL_sv_undef)
		1381	ALIAS:
		1382	filter_sk_json_objects = 1
1286	PPCODE:	1383	PPCODE:
		1384	{
		1385	if (!SvOK (cb))
		1386	cb = 0;
		1387
		1388	switch (ix)
		1389	{
		1390	case 0: self->cb_object = cb; break;
		1391	case 1: self->cb_sk_object = cb; break;
		1392	}
		1393
		1394	XPUSHs (ST (0));
		1395	}
		1396
		1397	void encode (JSON self, SV scalar)
		1398	PPCODE:
		1399	XPUSHs (encode_json (scalar, self));
		1400
		1401	void decode (JSON self, SV jsonstr)
		1402	PPCODE:
1287	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1403	XPUSHs (decode_json (jsonstr, self, 0));
1288		1404
1289	void decode_prefix (SV self, SV jsonstr)	1405	void decode_prefix (JSON self, SV jsonstr)
1290	PPCODE:	1406	PPCODE:
1291	{	1407	{
1292	UV offset;	1408	UV offset;
1293	EXTEND (SP, 2);	1409	EXTEND (SP, 2);
1294	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1410	PUSHs (decode_json (jsonstr, self, &offset));
1295	PUSHs (sv_2mortal (newSVuv (offset)));	1411	PUSHs (sv_2mortal (newSVuv (offset)));
1296	}	1412	}
1297		1413
1298	PROTOTYPES: ENABLE	1414	PROTOTYPES: ENABLE
1299		1415
1300	void to_json (SV *scalar)	1416	void to_json (SV *scalar)
1301	ALIAS:
1302	objToJson = 0
1303	PPCODE:	1417	PPCODE:
		1418	{
		1419	JSON json = { F_DEFAULT \| F_UTF8 };
1304	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1420	XPUSHs (encode_json (scalar, &json));
		1421	}
1305		1422
1306	void from_json (SV *jsonstr)	1423	void from_json (SV *jsonstr)
1307	ALIAS:
1308	jsonToObj = 0
1309	PPCODE:	1424	PPCODE:
		1425	{
		1426	JSON json = { F_DEFAULT \| F_UTF8 };
1310	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1427	XPUSHs (decode_json (jsonstr, &json, 0));
		1428	}
1311		1429

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.44 by root, Mon Jun 25 04:08:17 2007 UTC vs. Revision 1.50 by root, Mon Jul 2 00:29:38 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.44 by root, Mon Jun 25 04:08:17 2007 UTC vs.
Revision 1.50 by root, Mon Jul 2 00:29:38 2007 UTC