[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.55 by root, Mon Jul 23 22:57:40 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
…		…
308	encode_ch (enc, '['); encode_nl (enc);	306	encode_ch (enc, '['); encode_nl (enc);
309	++enc->indent;	307	++enc->indent;
310		308
311	for (i = 0; i <= len; ++i)	309	for (i = 0; i <= len; ++i)
312	{	310	{
		311	SV **svp = av_fetch (av, i, 0);
		312
313	encode_indent (enc);	313	encode_indent (enc);
314	encode_sv (enc, *av_fetch (av, i, 0));	314
		315	if (svp)
		316	encode_sv (enc, *svp);
		317	else
		318	encode_str (enc, "null", 4, 0);
315		319
316	if (i < len)	320	if (i < len)
317	encode_comma (enc);	321	encode_comma (enc);
318	}	322	}
319		323
…		…
342	else	346	else
343	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	347	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
344		348
345	encode_ch (enc, '"');	349	encode_ch (enc, '"');
346		350
347	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	351	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
348	encode_ch (enc, ':');	352	encode_ch (enc, ':');
349	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	353	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
350	encode_sv (enc, HeVAL (he));	354	encode_sv (enc, HeVAL (he));
351	}	355	}
352		356
353	// compare hash entries, used when all keys are bytestrings	357	// compare hash entries, used when all keys are bytestrings
354	static int	358	static int
…		…
389	{	393	{
390	// for canonical output we have to sort by keys first	394	// for canonical output we have to sort by keys first
391	// actually, this is mostly due to the stupid so-called	395	// actually, this is mostly due to the stupid so-called
392	// security workaround added somewhere in 5.8.x.	396	// security workaround added somewhere in 5.8.x.
393	// that randomises hash orderings	397	// that randomises hash orderings
394	if (enc->flags & F_CANONICAL)	398	if (enc->json.flags & F_CANONICAL)
395	{	399	{
396	int fast = 1;	400	int fast = 1;
397	HE *he;	401	HE *he;
398	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	402	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
399	HE *hes = _alloca (count sizeof (HE));	403	HE *hes = _alloca (count sizeof (HE));
…		…
475		479
476	if (expect_false (SvOBJECT (sv)))	480	if (expect_false (SvOBJECT (sv)))
477	{	481	{
478	if (SvSTASH (sv) == json_boolean_stash)	482	if (SvSTASH (sv) == json_boolean_stash)
479	{	483	{
480	if (SvIV (sv) == 0)	484	if (SvIV (sv))
		485	encode_str (enc, "true", 4, 0);
		486	else
481	encode_str (enc, "false", 5, 0);	487	encode_str (enc, "false", 5, 0);
482	else
483	encode_str (enc, "true", 4, 0);
484	}	488	}
485	else	489	else
486	{	490	{
487	#if 0	491	#if 0
488	if (0 && sv_derived_from (rv, "JSON::Literal"))	492	if (0 && sv_derived_from (rv, "JSON::Literal"))
489	{	493	{
490	// not yet	494	// not yet
491	}	495	}
492	#endif	496	#endif
493	if (enc->flags & F_CONV_BLESSED)	497	if (enc->json.flags & F_CONV_BLESSED)
494	{	498	{
495	// we re-bless the reference to get overload and other niceties right	499	// we re-bless the reference to get overload and other niceties right
496	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	500	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
497		501
498	if (to_json)	502	if (to_json)
499	{	503	{
		504	int count;
500	dSP;	505	dSP;
501	ENTER;	506
502	SAVETMPS;
503	PUSHMARK (SP);	507	ENTER; SAVETMPS; PUSHMARK (SP);
504	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	508	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505		509
506	// calling with G_SCALAR ensures that we always get a 1 reutrn value	510	// calling with G_SCALAR ensures that we always get a 1 return value
507	// check anyways.
508	PUTBACK;	511	PUTBACK;
509	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	512	call_sv ((SV *)GvCV (to_json), G_SCALAR);
510	SPAGAIN;	513	SPAGAIN;
511		514
		515	// catch this surprisingly common error
		516	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		517	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		518
		519	sv = POPs;
		520	PUTBACK;
		521
512	encode_sv (enc, POPs);	522	encode_sv (enc, sv);
513		523
514	FREETMPS;	524	FREETMPS; LEAVE;
515	LEAVE;
516	}	525	}
517	else if (enc->flags & F_ALLOW_BLESSED)	526	else if (enc->json.flags & F_ALLOW_BLESSED)
518	encode_str (enc, "null", 4, 0);	527	encode_str (enc, "null", 4, 0);
519	else	528	else
520	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",	529	croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	530	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522	}	531	}
523	else if (enc->flags & F_ALLOW_BLESSED)	532	else if (enc->json.flags & F_ALLOW_BLESSED)
524	encode_str (enc, "null", 4, 0);	533	encode_str (enc, "null", 4, 0);
525	else	534	else
526	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",	535	croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	536	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528	}	537	}
…		…
531	encode_hv (enc, (HV *)sv);	540	encode_hv (enc, (HV *)sv);
532	else if (svt == SVt_PVAV)	541	else if (svt == SVt_PVAV)
533	encode_av (enc, (AV *)sv);	542	encode_av (enc, (AV *)sv);
534	else if (svt < SVt_PVAV)	543	else if (svt < SVt_PVAV)
535	{	544	{
536	if (SvNIOK (sv) && SvIV (sv) == 0)	545	STRLEN len = 0;
		546	char *pv = svt ? SvPV (sv, len) : 0;
		547
		548	if (len == 1 && *pv == '1')
		549	encode_str (enc, "true", 4, 0);
		550	else if (len == 1 && *pv == '0')
537	encode_str (enc, "false", 5, 0);	551	encode_str (enc, "false", 5, 0);
538	else if (SvNIOK (sv) && SvIV (sv) == 1)
539	encode_str (enc, "true", 4, 0);
540	else	552	else
541	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	553	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
542	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	554	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543	}	555	}
544	else	556	else
…		…
614	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	626	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
615	SvPV_nolen (sv), SvFLAGS (sv));	627	SvPV_nolen (sv), SvFLAGS (sv));
616	}	628	}
617		629
618	static SV *	630	static SV *
619	encode_json (SV *scalar, U32 flags)	631	encode_json (SV scalar, JSON json)
620	{	632	{
621	enc_t enc;	633	enc_t enc;
622		634
623	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	635	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
624	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	636	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
625		637
626	enc.flags = flags;	638	enc.json = *json;
627	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	639	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628	enc.cur = SvPVX (enc.sv);	640	enc.cur = SvPVX (enc.sv);
629	enc.end = SvEND (enc.sv);	641	enc.end = SvEND (enc.sv);
630	enc.indent = 0;	642	enc.indent = 0;
631	enc.maxdepth = DEC_DEPTH (flags);	643	enc.maxdepth = DEC_DEPTH (enc.json.flags);
632		644
633	SvPOK_only (enc.sv);	645	SvPOK_only (enc.sv);
634	encode_sv (&enc, scalar);	646	encode_sv (&enc, scalar);
635		647
636	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	648	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
637	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	649	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
638		650
639	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	651	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
640	SvUTF8_on (enc.sv);	652	SvUTF8_on (enc.sv);
641		653
642	if (enc.flags & F_SHRINK)	654	if (enc.json.flags & F_SHRINK)
643	shrink (enc.sv);	655	shrink (enc.sv);
644		656
645	return enc.sv;	657	return enc.sv;
646	}	658	}
647		659
…		…
652	typedef struct	664	typedef struct
653	{	665	{
654	char *cur; // current parser pointer	666	char *cur; // current parser pointer
655	char *end; // end of input string	667	char *end; // end of input string
656	const char *err; // parse error, if != 0	668	const char *err; // parse error, if != 0
657	U32 flags; // F_*	669	JSON json;
658	U32 depth; // recursion depth	670	U32 depth; // recursion depth
659	U32 maxdepth; // recursion depth limit	671	U32 maxdepth; // recursion depth limit
660	} dec_t;	672	} dec_t;
661		673
662	inline void	674	inline void
…		…
1013	}	1025	}
1014		1026
1015	static SV *	1027	static SV *
1016	decode_hv (dec_t *dec)	1028	decode_hv (dec_t *dec)
1017	{	1029	{
		1030	SV *sv;
1018	HV *hv = newHV ();	1031	HV *hv = newHV ();
1019		1032
1020	DEC_INC_DEPTH;	1033	DEC_INC_DEPTH;
1021	decode_ws (dec);	1034	decode_ws (dec);
1022		1035
1023	if (*dec->cur == '}')	1036	if (*dec->cur == '}')
1024	++dec->cur;	1037	++dec->cur;
1025	else	1038	else
1026	for (;;)	1039	for (;;)
1027	{	1040	{
1028	SV key, value;
1029
1030	decode_ws (dec); EXPECT_CH ('"');	1041	decode_ws (dec); EXPECT_CH ('"');
1031		1042
1032	key = decode_str (dec);	1043	// heuristic: assume that
1033	if (!key)	1044	// a) decode_str + hv_store_ent are abysmally slow.
1034	goto fail;	1045	// b) most hash keys are short, simple ascii text.
		1046	// => try to "fast-match" such strings to avoid
		1047	// the overhead of decode_str + hv_store_ent.
		1048	{
		1049	SV *value;
		1050	char *p = dec->cur;
		1051	char *e = p + 24; // only try up to 24 bytes
1035		1052
1036	decode_ws (dec); EXPECT_CH (':');	1053	for (;;)
1037
1038	value = decode_sv (dec);
1039	if (!value)
1040	{	1054	{
		1055	// the >= 0x80 is true on most architectures
		1056	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1057	{
		1058	// slow path, back up and use decode_str
		1059	SV *key = decode_str (dec);
		1060	if (!key)
		1061	goto fail;
		1062
		1063	decode_ws (dec); EXPECT_CH (':');
		1064
		1065	value = decode_sv (dec);
		1066	if (!value)
		1067	{
		1068	SvREFCNT_dec (key);
		1069	goto fail;
		1070	}
		1071
		1072	hv_store_ent (hv, key, value, 0);
1041	SvREFCNT_dec (key);	1073	SvREFCNT_dec (key);
		1074
		1075	break;
		1076	}
		1077	else if (*p == '"')
		1078	{
		1079	// fast path, got a simple key
		1080	char *key = dec->cur;
		1081	int len = p - key;
		1082	dec->cur = p + 1;
		1083
		1084	decode_ws (dec); EXPECT_CH (':');
		1085
		1086	value = decode_sv (dec);
		1087	if (!value)
1042	goto fail;	1088	goto fail;
		1089
		1090	hv_store (hv, key, len, value, 0);
		1091
		1092	break;
		1093	}
		1094
		1095	++p;
1043	}	1096	}
1044		1097	}
1045	hv_store_ent (hv, key, value, 0);
1046	SvREFCNT_dec (key);
1047		1098
1048	decode_ws (dec);	1099	decode_ws (dec);
1049		1100
1050	if (*dec->cur == '}')	1101	if (*dec->cur == '}')
1051	{	1102	{
…		…
1058		1109
1059	++dec->cur;	1110	++dec->cur;
1060	}	1111	}
1061		1112
1062	DEC_DEC_DEPTH;	1113	DEC_DEC_DEPTH;
1063	return newRV_noinc ((SV *)hv);	1114	sv = newRV_noinc ((SV *)hv);
		1115
		1116	// check filter callbacks
		1117	if (dec->json.flags & F_HOOK)
		1118	{
		1119	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1120	{
		1121	HE cb, he;
		1122
		1123	hv_iterinit (hv);
		1124	he = hv_iternext (hv);
		1125	hv_iterinit (hv);
		1126
		1127	// the next line creates a mortal sv each time its called.
		1128	// might want to optimise this for common cases.
		1129	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1130
		1131	if (cb)
		1132	{
		1133	dSP;
		1134	int count;
		1135
		1136	ENTER; SAVETMPS; PUSHMARK (SP);
		1137	XPUSHs (HeVAL (he));
		1138
		1139	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1140
		1141	if (count == 1)
		1142	{
		1143	sv = newSVsv (POPs);
		1144	FREETMPS; LEAVE;
		1145	return sv;
		1146	}
		1147
		1148	FREETMPS; LEAVE;
		1149	}
		1150	}
		1151
		1152	if (dec->json.cb_object)
		1153	{
		1154	dSP;
		1155	int count;
		1156
		1157	ENTER; SAVETMPS; PUSHMARK (SP);
		1158	XPUSHs (sv_2mortal (sv));
		1159
		1160	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1161
		1162	if (count == 1)
		1163	{
		1164	sv = newSVsv (POPs);
		1165	FREETMPS; LEAVE;
		1166	return sv;
		1167	}
		1168
		1169	SvREFCNT_inc (sv);
		1170	FREETMPS; LEAVE;
		1171	}
		1172	}
		1173
		1174	return sv;
1064		1175
1065	fail:	1176	fail:
1066	SvREFCNT_dec (hv);	1177	SvREFCNT_dec (hv);
1067	DEC_DEC_DEPTH;	1178	DEC_DEC_DEPTH;
1068	return 0;	1179	return 0;
…		…
1127	fail:	1238	fail:
1128	return 0;	1239	return 0;
1129	}	1240	}
1130		1241
1131	static SV *	1242	static SV *
1132	decode_json (SV string, U32 flags, UV offset_return)	1243	decode_json (SV string, JSON json, UV *offset_return)
1133	{	1244	{
1134	dec_t dec;	1245	dec_t dec;
1135	UV offset;	1246	UV offset;
1136	SV *sv;	1247	SV *sv;
1137		1248
1138	SvGETMAGIC (string);	1249	SvGETMAGIC (string);
1139	SvUPGRADE (string, SVt_PV);	1250	SvUPGRADE (string, SVt_PV);
1140		1251
1141	if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags))	1252	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",	1253	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));	1254	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1144		1255
1145	if (flags & F_UTF8)	1256	if (json->flags & F_UTF8)
1146	sv_utf8_downgrade (string, 0);	1257	sv_utf8_downgrade (string, 0);
1147	else	1258	else
1148	sv_utf8_upgrade (string);	1259	sv_utf8_upgrade (string);
1149		1260
1150	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1261	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1151		1262
1152	dec.flags = flags;	1263	dec.json = *json;
1153	dec.cur = SvPVX (string);	1264	dec.cur = SvPVX (string);
1154	dec.end = SvEND (string);	1265	dec.end = SvEND (string);
1155	dec.err = 0;	1266	dec.err = 0;
1156	dec.depth = 0;	1267	dec.depth = 0;
1157	dec.maxdepth = DEC_DEPTH (dec.flags);	1268	dec.maxdepth = DEC_DEPTH (dec.json.flags);
		1269
		1270	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
		1271	dec.json.flags \|= F_HOOK;
1158		1272
1159	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1273	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1160	sv = decode_sv (&dec);	1274	sv = decode_sv (&dec);
1161		1275
1162	if (!(offset_return \|\| !sv))	1276	if (!(offset_return \|\| !sv))
…		…
1172	}	1286	}
1173	}	1287	}
1174		1288
1175	if (offset_return \|\| !sv)	1289	if (offset_return \|\| !sv)
1176	{	1290	{
1177	offset = dec.flags & F_UTF8	1291	offset = dec.json.flags & F_UTF8
1178	? dec.cur - SvPVX (string)	1292	? dec.cur - SvPVX (string)
1179	: utf8_distance (dec.cur, SvPVX (string));	1293	: utf8_distance (dec.cur, SvPVX (string));
1180		1294
1181	if (offset_return)	1295	if (offset_return)
1182	*offset_return = offset;	1296	*offset_return = offset;
…		…
1201	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1315	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1202	}	1316	}
1203		1317
1204	sv = sv_2mortal (sv);	1318	sv = sv_2mortal (sv);
1205		1319
1206	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1320	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)");	1321	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1208		1322
1209	return sv;	1323	return sv;
1210	}	1324	}
1211		1325
…		…
1232	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1346	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1233	}	1347	}
1234		1348
1235	PROTOTYPES: DISABLE	1349	PROTOTYPES: DISABLE
1236		1350
1237	SV new (char dummy)	1351	void new (char *klass)
1238	CODE:	1352	PPCODE:
1239	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1353	{
1240	OUTPUT:	1354	SV *pv = NEWSV (0, sizeof (JSON));
1241	RETVAL	1355	SvPOK_only (pv);
		1356	Zero (SvPVX (pv), 1, JSON);
		1357	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
		1358	XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
		1359	}
1242		1360
1243	SV ascii (SV self, int enable = 1)	1361	void ascii (JSON *self, int enable = 1)
1244	ALIAS:	1362	ALIAS:
1245	ascii = F_ASCII	1363	ascii = F_ASCII
1246	latin1 = F_LATIN1	1364	latin1 = F_LATIN1
1247	utf8 = F_UTF8	1365	utf8 = F_UTF8
1248	indent = F_INDENT	1366	indent = F_INDENT
…		…
1252	pretty = F_PRETTY	1370	pretty = F_PRETTY
1253	allow_nonref = F_ALLOW_NONREF	1371	allow_nonref = F_ALLOW_NONREF
1254	shrink = F_SHRINK	1372	shrink = F_SHRINK
1255	allow_blessed = F_ALLOW_BLESSED	1373	allow_blessed = F_ALLOW_BLESSED
1256	convert_blessed = F_CONV_BLESSED	1374	convert_blessed = F_CONV_BLESSED
1257	CODE:	1375	PPCODE:
1258	{	1376	{
1259	UV *uv = SvJSON (self);
1260	if (enable)	1377	if (enable)
1261	*uv \|= ix;	1378	self->flags \|= ix;
1262	else	1379	else
1263	*uv &= ~ix;	1380	self->flags &= ~ix;
1264		1381
1265	RETVAL = newSVsv (self);	1382	XPUSHs (ST (0));
1266	}	1383	}
1267	OUTPUT:
1268	RETVAL
1269		1384
1270	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1385	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1271	CODE:	1386	PPCODE:
1272	{	1387	{
1273	UV *uv = SvJSON (self);
1274	UV log2 = 0;	1388	UV log2 = 0;
1275		1389
1276	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1390	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1277		1391
1278	while ((1UL << log2) < max_depth)	1392	while ((1UL << log2) < max_depth)
1279	++log2;	1393	++log2;
1280		1394
1281	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1395	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1282		1396
1283	RETVAL = newSVsv (self);	1397	XPUSHs (ST (0));
1284	}	1398	}
1285	OUTPUT:
1286	RETVAL
1287		1399
1288	SV max_size (SV self, UV max_size = 0)	1400	void max_size (JSON *self, UV max_size = 0)
1289	CODE:	1401	PPCODE:
1290	{	1402	{
1291	UV *uv = SvJSON (self);
1292	UV log2 = 0;	1403	UV log2 = 0;
1293		1404
1294	if (max_size > 0x80000000UL) max_size = 0x80000000UL;	1405	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1295	if (max_size == 1) max_size = 2;	1406	if (max_size == 1) max_size = 2;
1296		1407
1297	while ((1UL << log2) < max_size)	1408	while ((1UL << log2) < max_size)
1298	++log2;	1409	++log2;
1299		1410
1300	uv = uv & ~F_MAXSIZE \| (log2 << S_MAXSIZE);	1411	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1301		1412
1302	RETVAL = newSVsv (self);	1413	XPUSHs (ST (0));
1303	}	1414	}
1304	OUTPUT:
1305	RETVAL
1306		1415
1307	void encode (SV self, SV scalar)	1416	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1308	PPCODE:	1417	PPCODE:
1309	XPUSHs (encode_json (scalar, *SvJSON (self)));	1418	{
		1419	SvREFCNT_dec (self->cb_object);
		1420	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1310		1421
1311	void decode (SV self, SV jsonstr)	1422	XPUSHs (ST (0));
		1423	}
		1424
		1425	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
1312	PPCODE:	1426	PPCODE:
		1427	{
		1428	if (!self->cb_sk_object)
		1429	self->cb_sk_object = newHV ();
		1430
		1431	if (SvOK (cb))
		1432	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		1433	else
		1434	{
		1435	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		1436
		1437	if (!HvKEYS (self->cb_sk_object))
		1438	{
		1439	SvREFCNT_dec (self->cb_sk_object);
		1440	self->cb_sk_object = 0;
		1441	}
		1442	}
		1443
		1444	XPUSHs (ST (0));
		1445	}
		1446
		1447	void encode (JSON self, SV scalar)
		1448	PPCODE:
		1449	XPUSHs (encode_json (scalar, self));
		1450
		1451	void decode (JSON self, SV jsonstr)
		1452	PPCODE:
1313	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1453	XPUSHs (decode_json (jsonstr, self, 0));
1314		1454
1315	void decode_prefix (SV self, SV jsonstr)	1455	void decode_prefix (JSON self, SV jsonstr)
1316	PPCODE:	1456	PPCODE:
1317	{	1457	{
1318	UV offset;	1458	UV offset;
1319	EXTEND (SP, 2);	1459	EXTEND (SP, 2);
1320	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1460	PUSHs (decode_json (jsonstr, self, &offset));
1321	PUSHs (sv_2mortal (newSVuv (offset)));	1461	PUSHs (sv_2mortal (newSVuv (offset)));
1322	}	1462	}
1323		1463
		1464	void DESTROY (JSON *self)
		1465	CODE:
		1466	SvREFCNT_dec (self->cb_sk_object);
		1467	SvREFCNT_dec (self->cb_object);
		1468
1324	PROTOTYPES: ENABLE	1469	PROTOTYPES: ENABLE
1325		1470
1326	void to_json (SV *scalar)	1471	void to_json (SV *scalar)
1327	ALIAS:
1328	objToJson = 0
1329	PPCODE:	1472	PPCODE:
		1473	{
		1474	JSON json = { F_DEFAULT \| F_UTF8 };
1330	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1475	XPUSHs (encode_json (scalar, &json));
		1476	}
1331		1477
1332	void from_json (SV *jsonstr)	1478	void from_json (SV *jsonstr)
1333	ALIAS:
1334	jsonToObj = 0
1335	PPCODE:	1479	PPCODE:
		1480	{
		1481	JSON json = { F_DEFAULT \| F_UTF8 };
1336	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1482	XPUSHs (decode_json (jsonstr, &json, 0));
		1483	}
1337		1484

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.55 by root, Mon Jul 23 22:57:40 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.55 by root, Mon Jul 23 22:57:40 2007 UTC