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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.45 by root, Mon Jun 25 06:57:42 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	33	#define F_MAXSIZE 0x01f00000UL
34	#define S_MAXSIZE 20	34	#define S_MAXSIZE 20
		35	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
35		36
36	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	37	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))	38	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38		39
39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	40	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
…		…
59	#define expect_true(expr) expect ((expr) != 0, 1)	60	#define expect_true(expr) expect ((expr) != 0, 1)
60		61
61	static HV json_stash, json_boolean_stash; // JSON::XS::	62	static HV json_stash, json_boolean_stash; // JSON::XS::
62	static SV json_true, json_false;	63	static SV json_true, json_false;
63		64
		65	typedef struct {
		66	U32 flags;
		67	SV cb_object, cb_sk_object;
		68	} JSON;
		69
64	/////////////////////////////////////////////////////////////////////////////	70	/////////////////////////////////////////////////////////////////////////////
65	// utility functions	71	// utility functions
66		72
67	static UV *	73	inline void
68	SvJSON (SV *sv)
69	{
70	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
71	croak ("object is not of type JSON::XS");
72
73	return &SvUVX (SvRV (sv));
74	}
75
76	static void
77	shrink (SV *sv)	74	shrink (SV *sv)
78	{	75	{
79	sv_utf8_downgrade (sv, 1);	76	sv_utf8_downgrade (sv, 1);
80	if (SvLEN (sv) > SvCUR (sv) + 1)	77	if (SvLEN (sv) > SvCUR (sv) + 1)
81	{	78	{
…		…
116	typedef struct	113	typedef struct
117	{	114	{
118	char *cur; // SvPVX (sv) + current output position	115	char *cur; // SvPVX (sv) + current output position
119	char *end; // SvEND (sv)	116	char *end; // SvEND (sv)
120	SV *sv; // result scalar	117	SV *sv; // result scalar
121	U32 flags; // F_*	118	JSON json;
122	U32 indent; // indentation level	119	U32 indent; // indentation level
123	U32 maxdepth; // max. indentation/recursion level	120	U32 maxdepth; // max. indentation/recursion level
124	} enc_t;	121	} enc_t;
125		122
126	inline void	123	inline void
…		…
200	}	197	}
201		198
202	if (uch > 0x10FFFFUL)	199	if (uch > 0x10FFFFUL)
203	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);
204		201
205	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))
206	{	203	{
207	if (uch > 0xFFFFUL)	204	if (uch > 0xFFFFUL)
208	{	205	{
209	need (enc, len += 11);	206	need (enc, len += 11);
210	sprintf (enc->cur, "\\u%04x\\u%04x",	207	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
224	*enc->cur++ = hexdigit [(uch >> 0) & 15];	221	*enc->cur++ = hexdigit [(uch >> 0) & 15];
225	}	222	}
226		223
227	str += clen;	224	str += clen;
228	}	225	}
229	else if (enc->flags & F_LATIN1)	226	else if (enc->json.flags & F_LATIN1)
230	{	227	{
231	*enc->cur++ = uch;	228	*enc->cur++ = uch;
232	str += clen;	229	str += clen;
233	}	230	}
234	else if (is_utf8)	231	else if (is_utf8)
…		…
255	}	252	}
256		253
257	inline void	254	inline void
258	encode_indent (enc_t *enc)	255	encode_indent (enc_t *enc)
259	{	256	{
260	if (enc->flags & F_INDENT)	257	if (enc->json.flags & F_INDENT)
261	{	258	{
262	int spaces = enc->indent * INDENT_STEP;	259	int spaces = enc->indent * INDENT_STEP;
263		260
264	need (enc, spaces);	261	need (enc, spaces);
265	memset (enc->cur, ' ', spaces);	262	memset (enc->cur, ' ', spaces);
…		…
275	}	272	}
276		273
277	inline void	274	inline void
278	encode_nl (enc_t *enc)	275	encode_nl (enc_t *enc)
279	{	276	{
280	if (enc->flags & F_INDENT)	277	if (enc->json.flags & F_INDENT)
281	{	278	{
282	need (enc, 1);	279	need (enc, 1);
283	encode_ch (enc, '\n');	280	encode_ch (enc, '\n');
284	}	281	}
285	}	282	}
…		…
287	inline void	284	inline void
288	encode_comma (enc_t *enc)	285	encode_comma (enc_t *enc)
289	{	286	{
290	encode_ch (enc, ',');	287	encode_ch (enc, ',');
291		288
292	if (enc->flags & F_INDENT)	289	if (enc->json.flags & F_INDENT)
293	encode_nl (enc);	290	encode_nl (enc);
294	else if (enc->flags & F_SPACE_AFTER)	291	else if (enc->json.flags & F_SPACE_AFTER)
295	encode_space (enc);	292	encode_space (enc);
296	}	293	}
297		294
298	static void encode_sv (enc_t enc, SV sv);	295	static void encode_sv (enc_t enc, SV sv);
299		296
…		…
342	else	339	else
343	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	340	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
344		341
345	encode_ch (enc, '"');	342	encode_ch (enc, '"');
346		343
347	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	344	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
348	encode_ch (enc, ':');	345	encode_ch (enc, ':');
349	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	346	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
350	encode_sv (enc, HeVAL (he));	347	encode_sv (enc, HeVAL (he));
351	}	348	}
352		349
353	// compare hash entries, used when all keys are bytestrings	350	// compare hash entries, used when all keys are bytestrings
354	static int	351	static int
…		…
389	{	386	{
390	// for canonical output we have to sort by keys first	387	// for canonical output we have to sort by keys first
391	// actually, this is mostly due to the stupid so-called	388	// actually, this is mostly due to the stupid so-called
392	// security workaround added somewhere in 5.8.x.	389	// security workaround added somewhere in 5.8.x.
393	// that randomises hash orderings	390	// that randomises hash orderings
394	if (enc->flags & F_CANONICAL)	391	if (enc->json.flags & F_CANONICAL)
395	{	392	{
396	int fast = 1;	393	int fast = 1;
397	HE *he;	394	HE *he;
398	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
399	HE *hes = _alloca (count sizeof (HE));	396	HE *hes = _alloca (count sizeof (HE));
…		…
488	if (0 && sv_derived_from (rv, "JSON::Literal"))	485	if (0 && sv_derived_from (rv, "JSON::Literal"))
489	{	486	{
490	// not yet	487	// not yet
491	}	488	}
492	#endif	489	#endif
493	if (enc->flags & F_CONV_BLESSED)	490	if (enc->json.flags & F_CONV_BLESSED)
494	{	491	{
495	// 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
496	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
497		494
498	if (to_json)	495	if (to_json)
499	{	496	{
500	dSP;	497	dSP; ENTER; SAVETMPS; PUSHMARK (SP);
501	ENTER;
502	SAVETMPS;
503	PUSHMARK (SP);
504	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	498	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505		499
506	// 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
507	// check anyways.	501	// check anyways.
508	PUTBACK;	502	PUTBACK;
509	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	503	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
510	SPAGAIN;	504	SPAGAIN;
511		505
512	encode_sv (enc, POPs);	506	encode_sv (enc, POPs);
513		507
514	FREETMPS;	508	FREETMPS; LEAVE;
515	LEAVE;
516	}	509	}
517	else if (enc->flags & F_ALLOW_BLESSED)	510	else if (enc->json.flags & F_ALLOW_BLESSED)
518	encode_str (enc, "null", 4, 0);	511	encode_str (enc, "null", 4, 0);
519	else	512	else
520	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",
521	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	514	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522	}	515	}
523	else if (enc->flags & F_ALLOW_BLESSED)	516	else if (enc->json.flags & F_ALLOW_BLESSED)
524	encode_str (enc, "null", 4, 0);	517	encode_str (enc, "null", 4, 0);
525	else	518	else
526	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",
527	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	520	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528	}	521	}
…		…
531	encode_hv (enc, (HV *)sv);	524	encode_hv (enc, (HV *)sv);
532	else if (svt == SVt_PVAV)	525	else if (svt == SVt_PVAV)
533	encode_av (enc, (AV *)sv);	526	encode_av (enc, (AV *)sv);
534	else if (svt < SVt_PVAV)	527	else if (svt < SVt_PVAV)
535	{	528	{
536	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')
537	encode_str (enc, "false", 5, 0);	533	encode_str (enc, "false", 5, 0);
538	else if (SvNIOK (sv) && SvIV (sv) == 1)	534	else if (len == 1 && *pv == '1')
539	encode_str (enc, "true", 4, 0);	535	encode_str (enc, "true", 4, 0);
540	else	536	else
541	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",
542	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	538	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543	}	539	}
…		…
614	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",
615	SvPV_nolen (sv), SvFLAGS (sv));	611	SvPV_nolen (sv), SvFLAGS (sv));
616	}	612	}
617		613
618	static SV *	614	static SV *
619	encode_json (SV *scalar, U32 flags)	615	encode_json (SV scalar, JSON json)
620	{	616	{
621	enc_t enc;	617	enc_t enc;
622		618
623	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	619	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
624	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)");
625		621
626	enc.flags = flags;	622	enc.json = *json;
627	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	623	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628	enc.cur = SvPVX (enc.sv);	624	enc.cur = SvPVX (enc.sv);
629	enc.end = SvEND (enc.sv);	625	enc.end = SvEND (enc.sv);
630	enc.indent = 0;	626	enc.indent = 0;
631	enc.maxdepth = DEC_DEPTH (flags);	627	enc.maxdepth = DEC_DEPTH (enc.json.flags);
632		628
633	SvPOK_only (enc.sv);	629	SvPOK_only (enc.sv);
634	encode_sv (&enc, scalar);	630	encode_sv (&enc, scalar);
635		631
636	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	632	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
637	*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
638		634
639	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	635	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
640	SvUTF8_on (enc.sv);	636	SvUTF8_on (enc.sv);
641		637
642	if (enc.flags & F_SHRINK)	638	if (enc.json.flags & F_SHRINK)
643	shrink (enc.sv);	639	shrink (enc.sv);
644		640
645	return enc.sv;	641	return enc.sv;
646	}	642	}
647		643
…		…
652	typedef struct	648	typedef struct
653	{	649	{
654	char *cur; // current parser pointer	650	char *cur; // current parser pointer
655	char *end; // end of input string	651	char *end; // end of input string
656	const char *err; // parse error, if != 0	652	const char *err; // parse error, if != 0
657	U32 flags; // F_*	653	JSON json;
658	U32 depth; // recursion depth	654	U32 depth; // recursion depth
659	U32 maxdepth; // recursion depth limit	655	U32 maxdepth; // recursion depth limit
660	} dec_t;	656	} dec_t;
661		657
662	inline void	658	inline void
…		…
1013	}	1009	}
1014		1010
1015	static SV *	1011	static SV *
1016	decode_hv (dec_t *dec)	1012	decode_hv (dec_t *dec)
1017	{	1013	{
		1014	SV *sv;
1018	HV *hv = newHV ();	1015	HV *hv = newHV ();
1019		1016
1020	DEC_INC_DEPTH;	1017	DEC_INC_DEPTH;
1021	decode_ws (dec);	1018	decode_ws (dec);
1022		1019
1023	if (*dec->cur == '}')	1020	if (*dec->cur == '}')
1024	++dec->cur;	1021	++dec->cur;
1025	else	1022	else
1026	for (;;)	1023	for (;;)
1027	{	1024	{
1028	SV key, value;
1029
1030	decode_ws (dec); EXPECT_CH ('"');	1025	decode_ws (dec); EXPECT_CH ('"');
1031		1026
1032	key = decode_str (dec);	1027	// heuristic: assume that
1033	if (!key)	1028	// a) decode_str + hv_store_ent are abysmally slow.
1034	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
1035		1036
1036	decode_ws (dec); EXPECT_CH (':');	1037	for (;;)
1037
1038	value = decode_sv (dec);
1039	if (!value)
1040	{	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);
1041	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)
1042	goto fail;	1072	goto fail;
		1073
		1074	hv_store (hv, key, len, value, 0);
		1075
		1076	break;
		1077	}
		1078
		1079	++p;
1043	}	1080	}
1044		1081	}
1045	hv_store_ent (hv, key, value, 0);
1046	SvREFCNT_dec (key);
1047		1082
1048	decode_ws (dec);	1083	decode_ws (dec);
1049		1084
1050	if (*dec->cur == '}')	1085	if (*dec->cur == '}')
1051	{	1086	{
…		…
1058		1093
1059	++dec->cur;	1094	++dec->cur;
1060	}	1095	}
1061		1096
1062	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
1063	return newRV_noinc ((SV *)hv);	1138	return newRV_noinc ((SV *)hv);
1064		1139
1065	fail:	1140	fail:
1066	SvREFCNT_dec (hv);	1141	SvREFCNT_dec (hv);
1067	DEC_DEC_DEPTH;	1142	DEC_DEC_DEPTH;
…		…
1127	fail:	1202	fail:
1128	return 0;	1203	return 0;
1129	}	1204	}
1130		1205
1131	static SV *	1206	static SV *
1132	decode_json (SV string, U32 flags, UV offset_return)	1207	decode_json (SV string, JSON json, UV *offset_return)
1133	{	1208	{
1134	dec_t dec;	1209	dec_t dec;
1135	UV offset;	1210	UV offset;
1136	SV *sv;	1211	SV *sv;
1137		1212
1138	SvGETMAGIC (string);	1213	SvGETMAGIC (string);
1139	SvUPGRADE (string, SVt_PV);	1214	SvUPGRADE (string, SVt_PV);
1140		1215
1141	if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags))	1216	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1142	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1217	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1143	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (flags));	1218	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1144		1219
1145	if (flags & F_UTF8)	1220	if (json->flags & F_UTF8)
1146	sv_utf8_downgrade (string, 0);	1221	sv_utf8_downgrade (string, 0);
1147	else	1222	else
1148	sv_utf8_upgrade (string);	1223	sv_utf8_upgrade (string);
1149		1224
1150	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1225	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1151		1226
1152	dec.flags = flags;	1227	dec.json = *json;
1153	dec.cur = SvPVX (string);	1228	dec.cur = SvPVX (string);
1154	dec.end = SvEND (string);	1229	dec.end = SvEND (string);
1155	dec.err = 0;	1230	dec.err = 0;
1156	dec.depth = 0;	1231	dec.depth = 0;
1157	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;
1158		1236
1159	*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
1160	sv = decode_sv (&dec);	1238	sv = decode_sv (&dec);
1161		1239
1162	if (!(offset_return \|\| !sv))	1240	if (!(offset_return \|\| !sv))
…		…
1172	}	1250	}
1173	}	1251	}
1174		1252
1175	if (offset_return \|\| !sv)	1253	if (offset_return \|\| !sv)
1176	{	1254	{
1177	offset = dec.flags & F_UTF8	1255	offset = dec.json.flags & F_UTF8
1178	? dec.cur - SvPVX (string)	1256	? dec.cur - SvPVX (string)
1179	: utf8_distance (dec.cur, SvPVX (string));	1257	: utf8_distance (dec.cur, SvPVX (string));
1180		1258
1181	if (offset_return)	1259	if (offset_return)
1182	*offset_return = offset;	1260	*offset_return = offset;
…		…
1201	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1279	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1202	}	1280	}
1203		1281
1204	sv = sv_2mortal (sv);	1282	sv = sv_2mortal (sv);
1205		1283
1206	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1284	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1207	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)");
1208		1286
1209	return sv;	1287	return sv;
1210	}	1288	}
1211		1289
…		…
1232	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);
1233	}	1311	}
1234		1312
1235	PROTOTYPES: DISABLE	1313	PROTOTYPES: DISABLE
1236		1314
1237	SV new (char dummy)	1315	void new (char *klass)
1238	CODE:	1316	PPCODE:
1239	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1317	{
1240	OUTPUT:	1318	SV *pv = NEWSV (0, sizeof (JSON));
1241	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	}
1242		1324
1243	SV ascii (SV self, int enable = 1)	1325	void ascii (JSON *self, int enable = 1)
1244	ALIAS:	1326	ALIAS:
1245	ascii = F_ASCII	1327	ascii = F_ASCII
1246	latin1 = F_LATIN1	1328	latin1 = F_LATIN1
1247	utf8 = F_UTF8	1329	utf8 = F_UTF8
1248	indent = F_INDENT	1330	indent = F_INDENT
…		…
1252	pretty = F_PRETTY	1334	pretty = F_PRETTY
1253	allow_nonref = F_ALLOW_NONREF	1335	allow_nonref = F_ALLOW_NONREF
1254	shrink = F_SHRINK	1336	shrink = F_SHRINK
1255	allow_blessed = F_ALLOW_BLESSED	1337	allow_blessed = F_ALLOW_BLESSED
1256	convert_blessed = F_CONV_BLESSED	1338	convert_blessed = F_CONV_BLESSED
1257	CODE:	1339	PPCODE:
1258	{	1340	{
1259	UV *uv = SvJSON (self);
1260	if (enable)	1341	if (enable)
1261	*uv \|= ix;	1342	self->flags \|= ix;
1262	else	1343	else
1263	*uv &= ~ix;	1344	self->flags &= ~ix;
1264		1345
1265	RETVAL = newSVsv (self);	1346	XPUSHs (ST (0));
1266	}	1347	}
1267	OUTPUT:
1268	RETVAL
1269		1348
1270	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1349	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1271	CODE:	1350	PPCODE:
1272	{	1351	{
1273	UV *uv = SvJSON (self);
1274	UV log2 = 0;	1352	UV log2 = 0;
1275		1353
1276	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1354	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1277		1355
1278	while ((1UL << log2) < max_depth)	1356	while ((1UL << log2) < max_depth)
1279	++log2;	1357	++log2;
1280		1358
1281	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1359	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1282		1360
1283	RETVAL = newSVsv (self);	1361	XPUSHs (ST (0));
1284	}	1362	}
1285	OUTPUT:
1286	RETVAL
1287		1363
1288	SV max_size (SV self, UV max_size = 0)	1364	void max_size (JSON *self, UV max_size = 0)
1289	CODE:	1365	PPCODE:
1290	{	1366	{
1291	UV *uv = SvJSON (self);
1292	UV log2 = 0;	1367	UV log2 = 0;
1293		1368
1294	if (max_size > 0x80000000UL) max_size = 0x80000000UL;	1369	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1295	if (max_size == 1) max_size = 2;	1370	if (max_size == 1) max_size = 2;
1296		1371
1297	while ((1UL << log2) < max_size)	1372	while ((1UL << log2) < max_size)
1298	++log2;	1373	++log2;
1299		1374
1300	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1375	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1301		1376
1302	RETVAL = newSVsv (self);	1377	XPUSHs (ST (0));
1303	}	1378	}
1304	OUTPUT:
1305	RETVAL
1306		1379
1307	void encode (SV self, SV scalar)	1380	void filter_json_objects (JSON self, SV cb = &PL_sv_undef)
		1381	ALIAS:
		1382	filter_sk_json_objects = 1
1308	PPCODE:	1383	PPCODE:
1309	XPUSHs (encode_json (scalar, *SvJSON (self)));	1384	{
		1385	if (!SvOK (cb))
		1386	cb = 0;
1310		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
1311	void decode (SV self, SV jsonstr)	1397	void encode (JSON self, SV scalar)
1312	PPCODE:	1398	PPCODE:
		1399	XPUSHs (encode_json (scalar, self));
		1400
		1401	void decode (JSON self, SV jsonstr)
		1402	PPCODE:
1313	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1403	XPUSHs (decode_json (jsonstr, self, 0));
1314		1404
1315	void decode_prefix (SV self, SV jsonstr)	1405	void decode_prefix (JSON self, SV jsonstr)
1316	PPCODE:	1406	PPCODE:
1317	{	1407	{
1318	UV offset;	1408	UV offset;
1319	EXTEND (SP, 2);	1409	EXTEND (SP, 2);
1320	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1410	PUSHs (decode_json (jsonstr, self, &offset));
1321	PUSHs (sv_2mortal (newSVuv (offset)));	1411	PUSHs (sv_2mortal (newSVuv (offset)));
1322	}	1412	}
1323		1413
1324	PROTOTYPES: ENABLE	1414	PROTOTYPES: ENABLE
1325		1415
1326	void to_json (SV *scalar)	1416	void to_json (SV *scalar)
1327	ALIAS:
1328	objToJson = 0
1329	PPCODE:	1417	PPCODE:
		1418	{
		1419	JSON json = { F_DEFAULT \| F_UTF8 };
1330	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1420	XPUSHs (encode_json (scalar, &json));
		1421	}
1331		1422
1332	void from_json (SV *jsonstr)	1423	void from_json (SV *jsonstr)
1333	ALIAS:
1334	jsonToObj = 0
1335	PPCODE:	1424	PPCODE:
		1425	{
		1426	JSON json = { F_DEFAULT \| F_UTF8 };
1336	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1427	XPUSHs (decode_json (jsonstr, &json, 0));
		1428	}
1337		1429

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.45 by root, Mon Jun 25 06:57:42 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.45 by root, Mon Jun 25 06:57:42 2007 UTC vs.
Revision 1.50 by root, Mon Jul 2 00:29:38 2007 UTC