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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.46 by root, Mon Jun 25 22:11:39 2007 UTC vs.
Revision 1.53 by root, Tue Jul 10 15:45:34 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;
		68	HV *cb_sk_object;
		69	} JSON;
		70
64	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
65	// utility functions	72	// utility functions
66		73
67	static UV *	74	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)	75	shrink (SV *sv)
78	{	76	{
79	sv_utf8_downgrade (sv, 1);	77	sv_utf8_downgrade (sv, 1);
80	if (SvLEN (sv) > SvCUR (sv) + 1)	78	if (SvLEN (sv) > SvCUR (sv) + 1)
81	{	79	{
…		…
116	typedef struct	114	typedef struct
117	{	115	{
118	char *cur; // SvPVX (sv) + current output position	116	char *cur; // SvPVX (sv) + current output position
119	char *end; // SvEND (sv)	117	char *end; // SvEND (sv)
120	SV *sv; // result scalar	118	SV *sv; // result scalar
121	U32 flags; // F_*	119	JSON json;
122	U32 indent; // indentation level	120	U32 indent; // indentation level
123	U32 maxdepth; // max. indentation/recursion level	121	U32 maxdepth; // max. indentation/recursion level
124	} enc_t;	122	} enc_t;
125		123
126	inline void	124	inline void
…		…
200	}	198	}
201		199
202	if (uch > 0x10FFFFUL)	200	if (uch > 0x10FFFFUL)
203	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);	201	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
204		202
205	if (uch < 0x80 \|\| enc->flags & F_ASCII \|\| (enc->flags & F_LATIN1 && uch > 0xFF))	203	if (uch < 0x80 \|\| enc->json.flags & F_ASCII \|\| (enc->json.flags & F_LATIN1 && uch > 0xFF))
206	{	204	{
207	if (uch > 0xFFFFUL)	205	if (uch > 0xFFFFUL)
208	{	206	{
209	need (enc, len += 11);	207	need (enc, len += 11);
210	sprintf (enc->cur, "\\u%04x\\u%04x",	208	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
224	*enc->cur++ = hexdigit [(uch >> 0) & 15];	222	*enc->cur++ = hexdigit [(uch >> 0) & 15];
225	}	223	}
226		224
227	str += clen;	225	str += clen;
228	}	226	}
229	else if (enc->flags & F_LATIN1)	227	else if (enc->json.flags & F_LATIN1)
230	{	228	{
231	*enc->cur++ = uch;	229	*enc->cur++ = uch;
232	str += clen;	230	str += clen;
233	}	231	}
234	else if (is_utf8)	232	else if (is_utf8)
…		…
255	}	253	}
256		254
257	inline void	255	inline void
258	encode_indent (enc_t *enc)	256	encode_indent (enc_t *enc)
259	{	257	{
260	if (enc->flags & F_INDENT)	258	if (enc->json.flags & F_INDENT)
261	{	259	{
262	int spaces = enc->indent * INDENT_STEP;	260	int spaces = enc->indent * INDENT_STEP;
263		261
264	need (enc, spaces);	262	need (enc, spaces);
265	memset (enc->cur, ' ', spaces);	263	memset (enc->cur, ' ', spaces);
…		…
275	}	273	}
276		274
277	inline void	275	inline void
278	encode_nl (enc_t *enc)	276	encode_nl (enc_t *enc)
279	{	277	{
280	if (enc->flags & F_INDENT)	278	if (enc->json.flags & F_INDENT)
281	{	279	{
282	need (enc, 1);	280	need (enc, 1);
283	encode_ch (enc, '\n');	281	encode_ch (enc, '\n');
284	}	282	}
285	}	283	}
…		…
287	inline void	285	inline void
288	encode_comma (enc_t *enc)	286	encode_comma (enc_t *enc)
289	{	287	{
290	encode_ch (enc, ',');	288	encode_ch (enc, ',');
291		289
292	if (enc->flags & F_INDENT)	290	if (enc->json.flags & F_INDENT)
293	encode_nl (enc);	291	encode_nl (enc);
294	else if (enc->flags & F_SPACE_AFTER)	292	else if (enc->json.flags & F_SPACE_AFTER)
295	encode_space (enc);	293	encode_space (enc);
296	}	294	}
297		295
298	static void encode_sv (enc_t enc, SV sv);	296	static void encode_sv (enc_t enc, SV sv);
299		297
…		…
342	else	340	else
343	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
344		342
345	encode_ch (enc, '"');	343	encode_ch (enc, '"');
346		344
347	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	345	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
348	encode_ch (enc, ':');	346	encode_ch (enc, ':');
349	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	347	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
350	encode_sv (enc, HeVAL (he));	348	encode_sv (enc, HeVAL (he));
351	}	349	}
352		350
353	// compare hash entries, used when all keys are bytestrings	351	// compare hash entries, used when all keys are bytestrings
354	static int	352	static int
…		…
389	{	387	{
390	// for canonical output we have to sort by keys first	388	// for canonical output we have to sort by keys first
391	// actually, this is mostly due to the stupid so-called	389	// actually, this is mostly due to the stupid so-called
392	// security workaround added somewhere in 5.8.x.	390	// security workaround added somewhere in 5.8.x.
393	// that randomises hash orderings	391	// that randomises hash orderings
394	if (enc->flags & F_CANONICAL)	392	if (enc->json.flags & F_CANONICAL)
395	{	393	{
396	int fast = 1;	394	int fast = 1;
397	HE *he;	395	HE *he;
398	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
399	HE *hes = _alloca (count sizeof (HE));	397	HE *hes = _alloca (count sizeof (HE));
…		…
475		473
476	if (expect_false (SvOBJECT (sv)))	474	if (expect_false (SvOBJECT (sv)))
477	{	475	{
478	if (SvSTASH (sv) == json_boolean_stash)	476	if (SvSTASH (sv) == json_boolean_stash)
479	{	477	{
480	if (SvIV (sv) == 0)	478	if (SvIV (sv))
		479	encode_str (enc, "true", 4, 0);
		480	else
481	encode_str (enc, "false", 5, 0);	481	encode_str (enc, "false", 5, 0);
482	else
483	encode_str (enc, "true", 4, 0);
484	}	482	}
485	else	483	else
486	{	484	{
487	#if 0	485	#if 0
488	if (0 && sv_derived_from (rv, "JSON::Literal"))	486	if (0 && sv_derived_from (rv, "JSON::Literal"))
489	{	487	{
490	// not yet	488	// not yet
491	}	489	}
492	#endif	490	#endif
493	if (enc->flags & F_CONV_BLESSED)	491	if (enc->json.flags & F_CONV_BLESSED)
494	{	492	{
495	// we re-bless the reference to get overload and other niceties right	493	// we re-bless the reference to get overload and other niceties right
496	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	494	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
497		495
498	if (to_json)	496	if (to_json)
499	{	497	{
500	dSP;	498	dSP;
501	ENTER;	499
502	SAVETMPS;
503	PUSHMARK (SP);	500	ENTER; SAVETMPS; PUSHMARK (SP);
504	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	501	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505		502
506	// calling with G_SCALAR ensures that we always get a 1 reutrn value	503	// calling with G_SCALAR ensures that we always get a 1 return value
507	// check anyways.	504	// check anyways.
508	PUTBACK;	505	PUTBACK;
509	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	506	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
510	SPAGAIN;	507	SPAGAIN;
511		508
		509	// catch this surprisingly common error
		510	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		511	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		512
		513	sv = POPs;
		514	PUTBACK;
		515
512	encode_sv (enc, POPs);	516	encode_sv (enc, sv);
513		517
514	FREETMPS;	518	FREETMPS; LEAVE;
515	LEAVE;
516	}	519	}
517	else if (enc->flags & F_ALLOW_BLESSED)	520	else if (enc->json.flags & F_ALLOW_BLESSED)
518	encode_str (enc, "null", 4, 0);	521	encode_str (enc, "null", 4, 0);
519	else	522	else
520	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	523	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	524	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522	}	525	}
523	else if (enc->flags & F_ALLOW_BLESSED)	526	else if (enc->json.flags & F_ALLOW_BLESSED)
524	encode_str (enc, "null", 4, 0);	527	encode_str (enc, "null", 4, 0);
525	else	528	else
526	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	529	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	530	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528	}	531	}
…		…
531	encode_hv (enc, (HV *)sv);	534	encode_hv (enc, (HV *)sv);
532	else if (svt == SVt_PVAV)	535	else if (svt == SVt_PVAV)
533	encode_av (enc, (AV *)sv);	536	encode_av (enc, (AV *)sv);
534	else if (svt < SVt_PVAV)	537	else if (svt < SVt_PVAV)
535	{	538	{
536	if (SvNIOK (sv) && SvIV (sv) == 0)	539	STRLEN len = 0;
		540	char *pv = svt ? SvPV (sv, len) : 0;
		541
		542	if (len == 1 && *pv == '1')
		543	encode_str (enc, "true", 4, 0);
		544	else if (len == 1 && *pv == '0')
537	encode_str (enc, "false", 5, 0);	545	encode_str (enc, "false", 5, 0);
538	else if (SvNIOK (sv) && SvIV (sv) == 1)
539	encode_str (enc, "true", 4, 0);
540	else	546	else
541	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	547	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
542	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	548	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543	}	549	}
544	else	550	else
…		…
614	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	620	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
615	SvPV_nolen (sv), SvFLAGS (sv));	621	SvPV_nolen (sv), SvFLAGS (sv));
616	}	622	}
617		623
618	static SV *	624	static SV *
619	encode_json (SV *scalar, U32 flags)	625	encode_json (SV scalar, JSON json)
620	{	626	{
621	enc_t enc;	627	enc_t enc;
622		628
623	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	629	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
624	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	630	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
625		631
626	enc.flags = flags;	632	enc.json = *json;
627	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	633	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628	enc.cur = SvPVX (enc.sv);	634	enc.cur = SvPVX (enc.sv);
629	enc.end = SvEND (enc.sv);	635	enc.end = SvEND (enc.sv);
630	enc.indent = 0;	636	enc.indent = 0;
631	enc.maxdepth = DEC_DEPTH (flags);	637	enc.maxdepth = DEC_DEPTH (enc.json.flags);
632		638
633	SvPOK_only (enc.sv);	639	SvPOK_only (enc.sv);
634	encode_sv (&enc, scalar);	640	encode_sv (&enc, scalar);
635		641
636	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	642	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
637	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	643	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
638		644
639	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	645	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
640	SvUTF8_on (enc.sv);	646	SvUTF8_on (enc.sv);
641		647
642	if (enc.flags & F_SHRINK)	648	if (enc.json.flags & F_SHRINK)
643	shrink (enc.sv);	649	shrink (enc.sv);
644		650
645	return enc.sv;	651	return enc.sv;
646	}	652	}
647		653
…		…
652	typedef struct	658	typedef struct
653	{	659	{
654	char *cur; // current parser pointer	660	char *cur; // current parser pointer
655	char *end; // end of input string	661	char *end; // end of input string
656	const char *err; // parse error, if != 0	662	const char *err; // parse error, if != 0
657	U32 flags; // F_*	663	JSON json;
658	U32 depth; // recursion depth	664	U32 depth; // recursion depth
659	U32 maxdepth; // recursion depth limit	665	U32 maxdepth; // recursion depth limit
660	} dec_t;	666	} dec_t;
661		667
662	inline void	668	inline void
…		…
1013	}	1019	}
1014		1020
1015	static SV *	1021	static SV *
1016	decode_hv (dec_t *dec)	1022	decode_hv (dec_t *dec)
1017	{	1023	{
		1024	SV *sv;
1018	HV *hv = newHV ();	1025	HV *hv = newHV ();
1019		1026
1020	DEC_INC_DEPTH;	1027	DEC_INC_DEPTH;
1021	decode_ws (dec);	1028	decode_ws (dec);
1022		1029
…		…
1026	for (;;)	1033	for (;;)
1027	{	1034	{
1028	decode_ws (dec); EXPECT_CH ('"');	1035	decode_ws (dec); EXPECT_CH ('"');
1029		1036
1030	// heuristic: assume that	1037	// heuristic: assume that
1031	// a) decode_str + hv_store_ent are abysmally slow	1038	// a) decode_str + hv_store_ent are abysmally slow.
1032	// b) most hash keys are short, simple ascii text	1039	// b) most hash keys are short, simple ascii text.
1033	// so try to "fast-match" such strings to avoid	1040	// => try to "fast-match" such strings to avoid
1034	// the overhead of hv_store_ent.	1041	// the overhead of decode_str + hv_store_ent.
1035	{	1042	{
1036	SV *value;	1043	SV *value;
1037	char *p = dec->cur;	1044	char *p = dec->cur;
1038	char *e = p + 24; // only try up to 24 bytes	1045	char *e = p + 24; // only try up to 24 bytes
1039		1046
1040	for (;;)	1047	for (;;)
1041	{	1048	{
		1049	// the >= 0x80 is true on most architectures
1042	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')	1050	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
1043	{	1051	{
1044	// slow path, back up and use decode_str	1052	// slow path, back up and use decode_str
1045	SV *key = decode_str (dec);	1053	SV *key = decode_str (dec);
1046	if (!key)	1054	if (!key)
…		…
1095		1103
1096	++dec->cur;	1104	++dec->cur;
1097	}	1105	}
1098		1106
1099	DEC_DEC_DEPTH;	1107	DEC_DEC_DEPTH;
1100	return newRV_noinc ((SV *)hv);	1108	sv = newRV_noinc ((SV *)hv);
		1109
		1110	// check filter callbacks
		1111	if (dec->json.flags & F_HOOK)
		1112	{
		1113	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1114	{
		1115	HE cb, he;
		1116
		1117	hv_iterinit (hv);
		1118	he = hv_iternext (hv);
		1119	hv_iterinit (hv);
		1120
		1121	// the next line creates a mortal sv each time its called.
		1122	// might want to optimise this for common cases.
		1123	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1124
		1125	if (cb)
		1126	{
		1127	dSP;
		1128	int count;
		1129
		1130	ENTER; SAVETMPS; PUSHMARK (SP);
		1131	XPUSHs (HeVAL (he));
		1132
		1133	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1134
		1135	if (count == 1)
		1136	{
		1137	sv = newSVsv (POPs);
		1138	FREETMPS; LEAVE;
		1139	return sv;
		1140	}
		1141
		1142	FREETMPS; LEAVE;
		1143	}
		1144	}
		1145
		1146	if (dec->json.cb_object)
		1147	{
		1148	dSP;
		1149	int count;
		1150
		1151	ENTER; SAVETMPS; PUSHMARK (SP);
		1152	XPUSHs (sv_2mortal (sv));
		1153
		1154	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1155
		1156	if (count == 1)
		1157	{
		1158	sv = newSVsv (POPs);
		1159	FREETMPS; LEAVE;
		1160	return sv;
		1161	}
		1162
		1163	SvREFCNT_inc (sv);
		1164	FREETMPS; LEAVE;
		1165	}
		1166	}
		1167
		1168	return sv;
1101		1169
1102	fail:	1170	fail:
1103	SvREFCNT_dec (hv);	1171	SvREFCNT_dec (hv);
1104	DEC_DEC_DEPTH;	1172	DEC_DEC_DEPTH;
1105	return 0;	1173	return 0;
…		…
1164	fail:	1232	fail:
1165	return 0;	1233	return 0;
1166	}	1234	}
1167		1235
1168	static SV *	1236	static SV *
1169	decode_json (SV string, U32 flags, UV offset_return)	1237	decode_json (SV string, JSON json, UV *offset_return)
1170	{	1238	{
1171	dec_t dec;	1239	dec_t dec;
1172	UV offset;	1240	UV offset;
1173	SV *sv;	1241	SV *sv;
1174		1242
1175	SvGETMAGIC (string);	1243	SvGETMAGIC (string);
1176	SvUPGRADE (string, SVt_PV);	1244	SvUPGRADE (string, SVt_PV);
1177		1245
1178	if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags))	1246	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1179	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1247	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1180	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (flags));	1248	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1181		1249
1182	if (flags & F_UTF8)	1250	if (json->flags & F_UTF8)
1183	sv_utf8_downgrade (string, 0);	1251	sv_utf8_downgrade (string, 0);
1184	else	1252	else
1185	sv_utf8_upgrade (string);	1253	sv_utf8_upgrade (string);
1186		1254
1187	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1255	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1188		1256
1189	dec.flags = flags;	1257	dec.json = *json;
1190	dec.cur = SvPVX (string);	1258	dec.cur = SvPVX (string);
1191	dec.end = SvEND (string);	1259	dec.end = SvEND (string);
1192	dec.err = 0;	1260	dec.err = 0;
1193	dec.depth = 0;	1261	dec.depth = 0;
1194	dec.maxdepth = DEC_DEPTH (dec.flags);	1262	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1263
		1264	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1265	dec.json.flags \|= F_HOOK;
1195		1266
1196	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1267	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1197	sv = decode_sv (&dec);	1268	sv = decode_sv (&dec);
1198		1269
1199	if (!(offset_return \|\| !sv))	1270	if (!(offset_return \|\| !sv))
…		…
1209	}	1280	}
1210	}	1281	}
1211		1282
1212	if (offset_return \|\| !sv)	1283	if (offset_return \|\| !sv)
1213	{	1284	{
1214	offset = dec.flags & F_UTF8	1285	offset = dec.json.flags & F_UTF8
1215	? dec.cur - SvPVX (string)	1286	? dec.cur - SvPVX (string)
1216	: utf8_distance (dec.cur, SvPVX (string));	1287	: utf8_distance (dec.cur, SvPVX (string));
1217		1288
1218	if (offset_return)	1289	if (offset_return)
1219	*offset_return = offset;	1290	*offset_return = offset;
…		…
1238	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1309	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1239	}	1310	}
1240		1311
1241	sv = sv_2mortal (sv);	1312	sv = sv_2mortal (sv);
1242		1313
1243	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1314	if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1244	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1315	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1245		1316
1246	return sv;	1317	return sv;
1247	}	1318	}
1248		1319
…		…
1269	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1340	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1270	}	1341	}
1271		1342
1272	PROTOTYPES: DISABLE	1343	PROTOTYPES: DISABLE
1273		1344
1274	SV new (char dummy)	1345	void new (char *klass)
1275	CODE:	1346	PPCODE:
1276	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1347	{
1277	OUTPUT:	1348	SV *pv = NEWSV (0, sizeof (JSON));
1278	RETVAL	1349	SvPOK_only (pv);
		1350	Zero (SvPVX (pv), 1, JSON);
		1351	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1352	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1353	}
1279		1354
1280	SV ascii (SV self, int enable = 1)	1355	void ascii (JSON *self, int enable = 1)
1281	ALIAS:	1356	ALIAS:
1282	ascii = F_ASCII	1357	ascii = F_ASCII
1283	latin1 = F_LATIN1	1358	latin1 = F_LATIN1
1284	utf8 = F_UTF8	1359	utf8 = F_UTF8
1285	indent = F_INDENT	1360	indent = F_INDENT
…		…
1289	pretty = F_PRETTY	1364	pretty = F_PRETTY
1290	allow_nonref = F_ALLOW_NONREF	1365	allow_nonref = F_ALLOW_NONREF
1291	shrink = F_SHRINK	1366	shrink = F_SHRINK
1292	allow_blessed = F_ALLOW_BLESSED	1367	allow_blessed = F_ALLOW_BLESSED
1293	convert_blessed = F_CONV_BLESSED	1368	convert_blessed = F_CONV_BLESSED
1294	CODE:	1369	PPCODE:
1295	{	1370	{
1296	UV *uv = SvJSON (self);
1297	if (enable)	1371	if (enable)
1298	*uv \|= ix;	1372	self->flags \|= ix;
1299	else	1373	else
1300	*uv &= ~ix;	1374	self->flags &= ~ix;
1301		1375
1302	RETVAL = newSVsv (self);	1376	XPUSHs (ST (0));
1303	}	1377	}
1304	OUTPUT:
1305	RETVAL
1306		1378
1307	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1379	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1308	CODE:	1380	PPCODE:
1309	{	1381	{
1310	UV *uv = SvJSON (self);
1311	UV log2 = 0;	1382	UV log2 = 0;
1312		1383
1313	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1384	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1314		1385
1315	while ((1UL << log2) < max_depth)	1386	while ((1UL << log2) < max_depth)
1316	++log2;	1387	++log2;
1317		1388
1318	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1389	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1319		1390
1320	RETVAL = newSVsv (self);	1391	XPUSHs (ST (0));
1321	}	1392	}
1322	OUTPUT:
1323	RETVAL
1324		1393
1325	SV max_size (SV self, UV max_size = 0)	1394	void max_size (JSON *self, UV max_size = 0)
1326	CODE:	1395	PPCODE:
1327	{	1396	{
1328	UV *uv = SvJSON (self);
1329	UV log2 = 0;	1397	UV log2 = 0;
1330		1398
1331	if (max_size > 0x80000000UL) max_size = 0x80000000UL;	1399	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1332	if (max_size == 1) max_size = 2;	1400	if (max_size == 1) max_size = 2;
1333		1401
1334	while ((1UL << log2) < max_size)	1402	while ((1UL << log2) < max_size)
1335	++log2;	1403	++log2;
1336		1404
1337	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1405	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1338		1406
1339	RETVAL = newSVsv (self);	1407	XPUSHs (ST (0));
1340	}	1408	}
1341	OUTPUT:
1342	RETVAL
1343		1409
1344	void encode (SV self, SV scalar)	1410	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1345	PPCODE:	1411	PPCODE:
1346	XPUSHs (encode_json (scalar, *SvJSON (self)));	1412	{
		1413	SvREFCNT_dec (self->cb_object);
		1414	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1347		1415
1348	void decode (SV self, SV jsonstr)	1416	XPUSHs (ST (0));
		1417	}
		1418
		1419	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1349	PPCODE:	1420	PPCODE:
		1421	{
		1422	if (!self->cb_sk_object)
		1423	self->cb_sk_object = newHV ();
		1424
		1425	if (SvOK (cb))
		1426	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1427	else
		1428	{
		1429	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1430
		1431	if (!HvKEYS (self->cb_sk_object))
		1432	{
		1433	SvREFCNT_dec (self->cb_sk_object);
		1434	self->cb_sk_object = 0;
		1435	}
		1436	}
		1437
		1438	XPUSHs (ST (0));
		1439	}
		1440
		1441	void encode (JSON self, SV scalar)
		1442	PPCODE:
		1443	XPUSHs (encode_json (scalar, self));
		1444
		1445	void decode (JSON self, SV jsonstr)
		1446	PPCODE:
1350	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1447	XPUSHs (decode_json (jsonstr, self, 0));
1351		1448
1352	void decode_prefix (SV self, SV jsonstr)	1449	void decode_prefix (JSON self, SV jsonstr)
1353	PPCODE:	1450	PPCODE:
1354	{	1451	{
1355	UV offset;	1452	UV offset;
1356	EXTEND (SP, 2);	1453	EXTEND (SP, 2);
1357	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1454	PUSHs (decode_json (jsonstr, self, &offset));
1358	PUSHs (sv_2mortal (newSVuv (offset)));	1455	PUSHs (sv_2mortal (newSVuv (offset)));
1359	}	1456	}
1360		1457
		1458	void DESTROY (JSON *self)
		1459	CODE:
		1460	SvREFCNT_dec (self->cb_sk_object);
		1461	SvREFCNT_dec (self->cb_object);
		1462
1361	PROTOTYPES: ENABLE	1463	PROTOTYPES: ENABLE
1362		1464
1363	void to_json (SV *scalar)	1465	void to_json (SV *scalar)
1364	ALIAS:
1365	objToJson = 0
1366	PPCODE:	1466	PPCODE:
		1467	{
		1468	JSON json = { F_DEFAULT \| F_UTF8 };
1367	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1469	XPUSHs (encode_json (scalar, &json));
		1470	}
1368		1471
1369	void from_json (SV *jsonstr)	1472	void from_json (SV *jsonstr)
1370	ALIAS:
1371	jsonToObj = 0
1372	PPCODE:	1473	PPCODE:
		1474	{
		1475	JSON json = { F_DEFAULT \| F_UTF8 };
1373	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1476	XPUSHs (decode_json (jsonstr, &json, 0));
		1477	}
1374		1478

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.46 by root, Mon Jun 25 22:11:39 2007 UTC vs. Revision 1.53 by root, Tue Jul 10 15:45:34 2007 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.46 by root, Mon Jun 25 22:11:39 2007 UTC vs.
Revision 1.53 by root, Tue Jul 10 15:45:34 2007 UTC