[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.54 by root, Tue Jul 10 16:22:31 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;
		68	HV *cb_sk_object;
		69	} JSON;
		70
61	/////////////////////////////////////////////////////////////////////////////	71	/////////////////////////////////////////////////////////////////////////////
62	// utility functions	72	// utility functions
63		73
64	static UV *	74	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)	75	shrink (SV *sv)
75	{	76	{
76	sv_utf8_downgrade (sv, 1);	77	sv_utf8_downgrade (sv, 1);
77	if (SvLEN (sv) > SvCUR (sv) + 1)	78	if (SvLEN (sv) > SvCUR (sv) + 1)
78	{	79	{
…		…
113	typedef struct	114	typedef struct
114	{	115	{
115	char *cur; // SvPVX (sv) + current output position	116	char *cur; // SvPVX (sv) + current output position
116	char *end; // SvEND (sv)	117	char *end; // SvEND (sv)
117	SV *sv; // result scalar	118	SV *sv; // result scalar
118	U32 flags; // F_*	119	JSON json;
119	U32 indent; // indentation level	120	U32 indent; // indentation level
120	U32 maxdepth; // max. indentation/recursion level	121	U32 maxdepth; // max. indentation/recursion level
121	} enc_t;	122	} enc_t;
122		123
123	inline void	124	inline void
…		…
197	}	198	}
198		199
199	if (uch > 0x10FFFFUL)	200	if (uch > 0x10FFFFUL)
200	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);
201		202
202	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))
203	{	204	{
204	if (uch > 0xFFFFUL)	205	if (uch > 0xFFFFUL)
205	{	206	{
206	need (enc, len += 11);	207	need (enc, len += 11);
207	sprintf (enc->cur, "\\u%04x\\u%04x",	208	sprintf (enc->cur, "\\u%04x\\u%04x",
…		…
221	*enc->cur++ = hexdigit [(uch >> 0) & 15];	222	*enc->cur++ = hexdigit [(uch >> 0) & 15];
222	}	223	}
223		224
224	str += clen;	225	str += clen;
225	}	226	}
226	else if (enc->flags & F_LATIN1)	227	else if (enc->json.flags & F_LATIN1)
227	{	228	{
228	*enc->cur++ = uch;	229	*enc->cur++ = uch;
229	str += clen;	230	str += clen;
230	}	231	}
231	else if (is_utf8)	232	else if (is_utf8)
…		…
252	}	253	}
253		254
254	inline void	255	inline void
255	encode_indent (enc_t *enc)	256	encode_indent (enc_t *enc)
256	{	257	{
257	if (enc->flags & F_INDENT)	258	if (enc->json.flags & F_INDENT)
258	{	259	{
259	int spaces = enc->indent * INDENT_STEP;	260	int spaces = enc->indent * INDENT_STEP;
260		261
261	need (enc, spaces);	262	need (enc, spaces);
262	memset (enc->cur, ' ', spaces);	263	memset (enc->cur, ' ', spaces);
…		…
272	}	273	}
273		274
274	inline void	275	inline void
275	encode_nl (enc_t *enc)	276	encode_nl (enc_t *enc)
276	{	277	{
277	if (enc->flags & F_INDENT)	278	if (enc->json.flags & F_INDENT)
278	{	279	{
279	need (enc, 1);	280	need (enc, 1);
280	encode_ch (enc, '\n');	281	encode_ch (enc, '\n');
281	}	282	}
282	}	283	}
…		…
284	inline void	285	inline void
285	encode_comma (enc_t *enc)	286	encode_comma (enc_t *enc)
286	{	287	{
287	encode_ch (enc, ',');	288	encode_ch (enc, ',');
288		289
289	if (enc->flags & F_INDENT)	290	if (enc->json.flags & F_INDENT)
290	encode_nl (enc);	291	encode_nl (enc);
291	else if (enc->flags & F_SPACE_AFTER)	292	else if (enc->json.flags & F_SPACE_AFTER)
292	encode_space (enc);	293	encode_space (enc);
293	}	294	}
294		295
295	static void encode_sv (enc_t enc, SV sv);	296	static void encode_sv (enc_t enc, SV sv);
296		297
…		…
339	else	340	else
340	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	341	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
341		342
342	encode_ch (enc, '"');	343	encode_ch (enc, '"');
343		344
344	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	345	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345	encode_ch (enc, ':');	346	encode_ch (enc, ':');
346	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	347	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347	encode_sv (enc, HeVAL (he));	348	encode_sv (enc, HeVAL (he));
348	}	349	}
349		350
350	// compare hash entries, used when all keys are bytestrings	351	// compare hash entries, used when all keys are bytestrings
351	static int	352	static int
…		…
386	{	387	{
387	// for canonical output we have to sort by keys first	388	// for canonical output we have to sort by keys first
388	// actually, this is mostly due to the stupid so-called	389	// actually, this is mostly due to the stupid so-called
389	// security workaround added somewhere in 5.8.x.	390	// security workaround added somewhere in 5.8.x.
390	// that randomises hash orderings	391	// that randomises hash orderings
391	if (enc->flags & F_CANONICAL)	392	if (enc->json.flags & F_CANONICAL)
392	{	393	{
393	int fast = 1;	394	int fast = 1;
394	HE *he;	395	HE *he;
395	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	396	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
396	HE *hes = _alloca (count sizeof (HE));	397	HE *hes = _alloca (count sizeof (HE));
…		…
472		473
473	if (expect_false (SvOBJECT (sv)))	474	if (expect_false (SvOBJECT (sv)))
474	{	475	{
475	if (SvSTASH (sv) == json_boolean_stash)	476	if (SvSTASH (sv) == json_boolean_stash)
476	{	477	{
477	if (SvIV (sv) == 0)	478	if (SvIV (sv))
		479	encode_str (enc, "true", 4, 0);
		480	else
478	encode_str (enc, "false", 5, 0);	481	encode_str (enc, "false", 5, 0);
479	else
480	encode_str (enc, "true", 4, 0);
481	}	482	}
482	else	483	else
483	{	484	{
484	#if 0	485	#if 0
485	if (0 && sv_derived_from (rv, "JSON::Literal"))	486	if (0 && sv_derived_from (rv, "JSON::Literal"))
486	{	487	{
487	// not yet	488	// not yet
488	}	489	}
489	#endif	490	#endif
490	if (enc->flags & F_CONV_BLESSED)	491	if (enc->json.flags & F_CONV_BLESSED)
491	{	492	{
492	// 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
493	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);	494	GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494		495
495	if (to_json)	496	if (to_json)
496	{	497	{
		498	int count;
497	dSP;	499	dSP;
498	ENTER;	500
499	SAVETMPS;
500	PUSHMARK (SP);	501	ENTER; SAVETMPS; PUSHMARK (SP);
501	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));	502	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
502		503
503	// calling with G_SCALAR ensures that we always get a 1 reutrn value	504	// calling with G_SCALAR ensures that we always get a 1 return value
504	// check anyways.
505	PUTBACK;	505	PUTBACK;
506	assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));	506	call_sv ((SV *)GvCV (to_json), G_SCALAR);
507	SPAGAIN;	507	SPAGAIN;
508		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
509	encode_sv (enc, POPs);	516	encode_sv (enc, sv);
510		517
511	FREETMPS;	518	FREETMPS; LEAVE;
512	LEAVE;
513	}	519	}
514	else if (enc->flags & F_ALLOW_BLESSED)	520	else if (enc->json.flags & F_ALLOW_BLESSED)
515	encode_str (enc, "null", 4, 0);	521	encode_str (enc, "null", 4, 0);
516	else	522	else
517	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",
518	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	524	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
519	}	525	}
520	else if (enc->flags & F_ALLOW_BLESSED)	526	else if (enc->json.flags & F_ALLOW_BLESSED)
521	encode_str (enc, "null", 4, 0);	527	encode_str (enc, "null", 4, 0);
522	else	528	else
523	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",
524	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	530	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
525	}	531	}
…		…
528	encode_hv (enc, (HV *)sv);	534	encode_hv (enc, (HV *)sv);
529	else if (svt == SVt_PVAV)	535	else if (svt == SVt_PVAV)
530	encode_av (enc, (AV *)sv);	536	encode_av (enc, (AV *)sv);
531	else if (svt < SVt_PVAV)	537	else if (svt < SVt_PVAV)
532	{	538	{
533	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')
534	encode_str (enc, "false", 5, 0);	545	encode_str (enc, "false", 5, 0);
535	else if (SvNIOK (sv) && SvIV (sv) == 1)
536	encode_str (enc, "true", 4, 0);
537	else	546	else
538	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",
539	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	548	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
540	}	549	}
541	else	550	else
…		…
611	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",
612	SvPV_nolen (sv), SvFLAGS (sv));	621	SvPV_nolen (sv), SvFLAGS (sv));
613	}	622	}
614		623
615	static SV *	624	static SV *
616	encode_json (SV *scalar, U32 flags)	625	encode_json (SV scalar, JSON json)
617	{	626	{
618	enc_t enc;	627	enc_t enc;
619		628
620	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	629	if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
621	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)");
622		631
623	enc.flags = flags;	632	enc.json = *json;
624	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	633	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
625	enc.cur = SvPVX (enc.sv);	634	enc.cur = SvPVX (enc.sv);
626	enc.end = SvEND (enc.sv);	635	enc.end = SvEND (enc.sv);
627	enc.indent = 0;	636	enc.indent = 0;
628	enc.maxdepth = DEC_DEPTH (flags);	637	enc.maxdepth = DEC_DEPTH (enc.json.flags);
629		638
630	SvPOK_only (enc.sv);	639	SvPOK_only (enc.sv);
631	encode_sv (&enc, scalar);	640	encode_sv (&enc, scalar);
632		641
633	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	642	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
634	*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
635		644
636	if (!(flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	645	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
637	SvUTF8_on (enc.sv);	646	SvUTF8_on (enc.sv);
638		647
639	if (enc.flags & F_SHRINK)	648	if (enc.json.flags & F_SHRINK)
640	shrink (enc.sv);	649	shrink (enc.sv);
641		650
642	return enc.sv;	651	return enc.sv;
643	}	652	}
644		653
…		…
649	typedef struct	658	typedef struct
650	{	659	{
651	char *cur; // current parser pointer	660	char *cur; // current parser pointer
652	char *end; // end of input string	661	char *end; // end of input string
653	const char *err; // parse error, if != 0	662	const char *err; // parse error, if != 0
654	U32 flags; // F_*	663	JSON json;
655	U32 depth; // recursion depth	664	U32 depth; // recursion depth
656	U32 maxdepth; // recursion depth limit	665	U32 maxdepth; // recursion depth limit
657	} dec_t;	666	} dec_t;
658		667
659	inline void	668	inline void
…		…
1010	}	1019	}
1011		1020
1012	static SV *	1021	static SV *
1013	decode_hv (dec_t *dec)	1022	decode_hv (dec_t *dec)
1014	{	1023	{
		1024	SV *sv;
1015	HV *hv = newHV ();	1025	HV *hv = newHV ();
1016		1026
1017	DEC_INC_DEPTH;	1027	DEC_INC_DEPTH;
1018	decode_ws (dec);	1028	decode_ws (dec);
1019		1029
1020	if (*dec->cur == '}')	1030	if (*dec->cur == '}')
1021	++dec->cur;	1031	++dec->cur;
1022	else	1032	else
1023	for (;;)	1033	for (;;)
1024	{	1034	{
1025	SV key, value;
1026
1027	decode_ws (dec); EXPECT_CH ('"');	1035	decode_ws (dec); EXPECT_CH ('"');
1028		1036
1029	key = decode_str (dec);	1037	// heuristic: assume that
1030	if (!key)	1038	// a) decode_str + hv_store_ent are abysmally slow.
1031	goto fail;	1039	// b) most hash keys are short, simple ascii text.
		1040	// => try to "fast-match" such strings to avoid
		1041	// the overhead of decode_str + hv_store_ent.
		1042	{
		1043	SV *value;
		1044	char *p = dec->cur;
		1045	char *e = p + 24; // only try up to 24 bytes
1032		1046
1033	decode_ws (dec); EXPECT_CH (':');	1047	for (;;)
1034
1035	value = decode_sv (dec);
1036	if (!value)
1037	{	1048	{
		1049	// the >= 0x80 is true on most architectures
		1050	if (p == e \|\| p < 0x20 \|\| p >= 0x80 \|\| *p == '\\')
		1051	{
		1052	// slow path, back up and use decode_str
		1053	SV *key = decode_str (dec);
		1054	if (!key)
		1055	goto fail;
		1056
		1057	decode_ws (dec); EXPECT_CH (':');
		1058
		1059	value = decode_sv (dec);
		1060	if (!value)
		1061	{
		1062	SvREFCNT_dec (key);
		1063	goto fail;
		1064	}
		1065
		1066	hv_store_ent (hv, key, value, 0);
1038	SvREFCNT_dec (key);	1067	SvREFCNT_dec (key);
		1068
		1069	break;
		1070	}
		1071	else if (*p == '"')
		1072	{
		1073	// fast path, got a simple key
		1074	char *key = dec->cur;
		1075	int len = p - key;
		1076	dec->cur = p + 1;
		1077
		1078	decode_ws (dec); EXPECT_CH (':');
		1079
		1080	value = decode_sv (dec);
		1081	if (!value)
1039	goto fail;	1082	goto fail;
		1083
		1084	hv_store (hv, key, len, value, 0);
		1085
		1086	break;
		1087	}
		1088
		1089	++p;
1040	}	1090	}
1041		1091	}
1042	hv_store_ent (hv, key, value, 0);
1043	SvREFCNT_dec (key);
1044		1092
1045	decode_ws (dec);	1093	decode_ws (dec);
1046		1094
1047	if (*dec->cur == '}')	1095	if (*dec->cur == '}')
1048	{	1096	{
…		…
1055		1103
1056	++dec->cur;	1104	++dec->cur;
1057	}	1105	}
1058		1106
1059	DEC_DEC_DEPTH;	1107	DEC_DEC_DEPTH;
1060	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;
1061		1169
1062	fail:	1170	fail:
1063	SvREFCNT_dec (hv);	1171	SvREFCNT_dec (hv);
1064	DEC_DEC_DEPTH;	1172	DEC_DEC_DEPTH;
1065	return 0;	1173	return 0;
…		…
1124	fail:	1232	fail:
1125	return 0;	1233	return 0;
1126	}	1234	}
1127		1235
1128	static SV *	1236	static SV *
1129	decode_json (SV string, U32 flags, UV offset_return)	1237	decode_json (SV string, JSON json, UV *offset_return)
1130	{	1238	{
1131	dec_t dec;	1239	dec_t dec;
1132	UV offset;	1240	UV offset;
1133	SV *sv;	1241	SV *sv;
1134		1242
1135	SvGETMAGIC (string);	1243	SvGETMAGIC (string);
1136	SvUPGRADE (string, SVt_PV);	1244	SvUPGRADE (string, SVt_PV);
1137		1245
		1246	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
		1247	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1248	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
		1249
1138	if (flags & F_UTF8)	1250	if (json->flags & F_UTF8)
1139	sv_utf8_downgrade (string, 0);	1251	sv_utf8_downgrade (string, 0);
1140	else	1252	else
1141	sv_utf8_upgrade (string);	1253	sv_utf8_upgrade (string);
1142		1254
1143	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1255	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1144		1256
1145	dec.flags = flags;	1257	dec.json = *json;
1146	dec.cur = SvPVX (string);	1258	dec.cur = SvPVX (string);
1147	dec.end = SvEND (string);	1259	dec.end = SvEND (string);
1148	dec.err = 0;	1260	dec.err = 0;
1149	dec.depth = 0;	1261	dec.depth = 0;
1150	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;
1151		1266
1152	*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
1153	sv = decode_sv (&dec);	1268	sv = decode_sv (&dec);
1154		1269
1155	if (!(offset_return \|\| !sv))	1270	if (!(offset_return \|\| !sv))
…		…
1165	}	1280	}
1166	}	1281	}
1167		1282
1168	if (offset_return \|\| !sv)	1283	if (offset_return \|\| !sv)
1169	{	1284	{
1170	offset = dec.flags & F_UTF8	1285	offset = dec.json.flags & F_UTF8
1171	? dec.cur - SvPVX (string)	1286	? dec.cur - SvPVX (string)
1172	: utf8_distance (dec.cur, SvPVX (string));	1287	: utf8_distance (dec.cur, SvPVX (string));
1173		1288
1174	if (offset_return)	1289	if (offset_return)
1175	*offset_return = offset;	1290	*offset_return = offset;
…		…
1194	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1309	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1195	}	1310	}
1196		1311
1197	sv = sv_2mortal (sv);	1312	sv = sv_2mortal (sv);
1198		1313
1199	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1314	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)");	1315	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1201		1316
1202	return sv;	1317	return sv;
1203	}	1318	}
1204		1319
…		…
1225	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);
1226	}	1341	}
1227		1342
1228	PROTOTYPES: DISABLE	1343	PROTOTYPES: DISABLE
1229		1344
1230	SV new (char dummy)	1345	void new (char *klass)
1231	CODE:	1346	PPCODE:
1232	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1347	{
1233	OUTPUT:	1348	SV *pv = NEWSV (0, sizeof (JSON));
1234	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	}
1235		1354
1236	SV ascii (SV self, int enable = 1)	1355	void ascii (JSON *self, int enable = 1)
1237	ALIAS:	1356	ALIAS:
1238	ascii = F_ASCII	1357	ascii = F_ASCII
1239	latin1 = F_LATIN1	1358	latin1 = F_LATIN1
1240	utf8 = F_UTF8	1359	utf8 = F_UTF8
1241	indent = F_INDENT	1360	indent = F_INDENT
…		…
1245	pretty = F_PRETTY	1364	pretty = F_PRETTY
1246	allow_nonref = F_ALLOW_NONREF	1365	allow_nonref = F_ALLOW_NONREF
1247	shrink = F_SHRINK	1366	shrink = F_SHRINK
1248	allow_blessed = F_ALLOW_BLESSED	1367	allow_blessed = F_ALLOW_BLESSED
1249	convert_blessed = F_CONV_BLESSED	1368	convert_blessed = F_CONV_BLESSED
1250	CODE:	1369	PPCODE:
1251	{	1370	{
1252	UV *uv = SvJSON (self);
1253	if (enable)	1371	if (enable)
1254	*uv \|= ix;	1372	self->flags \|= ix;
1255	else	1373	else
1256	*uv &= ~ix;	1374	self->flags &= ~ix;
1257		1375
1258	RETVAL = newSVsv (self);	1376	XPUSHs (ST (0));
1259	}	1377	}
1260	OUTPUT:
1261	RETVAL
1262		1378
1263	SV max_depth (SV self, UV max_depth = 0x80000000UL)	1379	void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1264	CODE:	1380	PPCODE:
1265	{	1381	{
1266	UV *uv = SvJSON (self);
1267	UV log2 = 0;	1382	UV log2 = 0;
1268		1383
1269	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	1384	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1270		1385
1271	while ((1UL << log2) < max_depth)	1386	while ((1UL << log2) < max_depth)
1272	++log2;	1387	++log2;
1273		1388
1274	uv = uv & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);	1389	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1275		1390
1276	RETVAL = newSVsv (self);	1391	XPUSHs (ST (0));
1277	}	1392	}
1278	OUTPUT:
1279	RETVAL
1280		1393
1281	void encode (SV self, SV scalar)	1394	void max_size (JSON *self, UV max_size = 0)
1282	PPCODE:	1395	PPCODE:
1283	XPUSHs (encode_json (scalar, *SvJSON (self)));	1396	{
		1397	UV log2 = 0;
1284		1398
1285	void decode (SV self, SV jsonstr)	1399	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
		1400	if (max_size == 1) max_size = 2;
		1401
		1402	while ((1UL << log2) < max_size)
		1403	++log2;
		1404
		1405	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
		1406
		1407	XPUSHs (ST (0));
		1408	}
		1409
		1410	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1286	PPCODE:	1411	PPCODE:
		1412	{
		1413	SvREFCNT_dec (self->cb_object);
		1414	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		1415
		1416	XPUSHs (ST (0));
		1417	}
		1418
		1419	void filter_json_single_key_object (JSON self, SV key, SV *cb = &PL_sv_undef)
		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:
1287	XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));	1447	XPUSHs (decode_json (jsonstr, self, 0));
1288		1448
1289	void decode_prefix (SV self, SV jsonstr)	1449	void decode_prefix (JSON self, SV jsonstr)
1290	PPCODE:	1450	PPCODE:
1291	{	1451	{
1292	UV offset;	1452	UV offset;
1293	EXTEND (SP, 2);	1453	EXTEND (SP, 2);
1294	PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));	1454	PUSHs (decode_json (jsonstr, self, &offset));
1295	PUSHs (sv_2mortal (newSVuv (offset)));	1455	PUSHs (sv_2mortal (newSVuv (offset)));
1296	}	1456	}
1297		1457
		1458	void DESTROY (JSON *self)
		1459	CODE:
		1460	SvREFCNT_dec (self->cb_sk_object);
		1461	SvREFCNT_dec (self->cb_object);
		1462
1298	PROTOTYPES: ENABLE	1463	PROTOTYPES: ENABLE
1299		1464
1300	void to_json (SV *scalar)	1465	void to_json (SV *scalar)
1301	ALIAS:
1302	objToJson = 0
1303	PPCODE:	1466	PPCODE:
		1467	{
		1468	JSON json = { F_DEFAULT \| F_UTF8 };
1304	XPUSHs (encode_json (scalar, F_DEFAULT \| F_UTF8));	1469	XPUSHs (encode_json (scalar, &json));
		1470	}
1305		1471
1306	void from_json (SV *jsonstr)	1472	void from_json (SV *jsonstr)
1307	ALIAS:
1308	jsonToObj = 0
1309	PPCODE:	1473	PPCODE:
		1474	{
		1475	JSON json = { F_DEFAULT \| F_UTF8 };
1310	XPUSHs (decode_json (jsonstr, F_DEFAULT \| F_UTF8, 0));	1476	XPUSHs (decode_json (jsonstr, &json, 0));
		1477	}
1311		1478

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.54 by root, Tue Jul 10 16:22:31 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.54 by root, Tue Jul 10 16:22:31 2007 UTC