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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.100 by root, Sat Sep 5 23:00:56 2009 UTC

…		…
12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)	12	#if defined(__BORLANDC__) \|\| defined(_MSC_VER)
13	# define snprintf _snprintf // C compilers have this in stdio.h	13	# define snprintf _snprintf // C compilers have this in stdio.h
14	#endif	14	#endif
15		15
16	// some old perls do not have this, try to make it work, no	16	// some old perls do not have this, try to make it work, no
17	// guarentees, though. if it breaks, you get to keep the pieces.	17	// guarantees, though. if it breaks, you get to keep the pieces.
18	#ifndef UTF8_MAXBYTES	18	#ifndef UTF8_MAXBYTES
19	# define UTF8_MAXBYTES 13	19	# define UTF8_MAXBYTES 13
20	#endif	20	#endif
21		21
22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)	22	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
…		…
31	#define F_ALLOW_NONREF 0x00000100UL	31	#define F_ALLOW_NONREF 0x00000100UL
32	#define F_SHRINK 0x00000200UL	32	#define F_SHRINK 0x00000200UL
33	#define F_ALLOW_BLESSED 0x00000400UL	33	#define F_ALLOW_BLESSED 0x00000400UL
34	#define F_CONV_BLESSED 0x00000800UL	34	#define F_CONV_BLESSED 0x00000800UL
35	#define F_RELAXED 0x00001000UL	35	#define F_RELAXED 0x00001000UL
36		36	#define F_ALLOW_UNKNOWN 0x00002000UL
37	#define F_MAXDEPTH 0xf8000000UL
38	#define S_MAXDEPTH 27
39	#define F_MAXSIZE 0x01f00000UL
40	#define S_MAXSIZE 20
41	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing	37	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42		38
43	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44	#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER	39	#define F_PRETTY F_INDENT \| F_SPACE_BEFORE \| F_SPACE_AFTER
47	#define F_DEFAULT (9UL << S_MAXDEPTH)
48		40
49	#define INIT_SIZE 32 // initial scalar size to be allocated	41	#define INIT_SIZE 32 // initial scalar size to be allocated
50	#define INDENT_STEP 3 // spaces per indentation level	42	#define INDENT_STEP 3 // spaces per indentation level
51		43
52	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size	44	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
…		…
67		59
68	#define IN_RANGE_INC(type,val,beg,end) \	60	#define IN_RANGE_INC(type,val,beg,end) \
69	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \	61	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))	62	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71		63
		64	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		65
72	#ifdef USE_ITHREADS	66	#ifdef USE_ITHREADS
73	# define JSON_SLOW 1	67	# define JSON_SLOW 1
74	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))	68	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75	#else	69	#else
76	# define JSON_SLOW 0	70	# define JSON_SLOW 0
…		…
85	INCR_M_STR, // inside string	79	INCR_M_STR, // inside string
86	INCR_M_BS, // inside backslash	80	INCR_M_BS, // inside backslash
87	INCR_M_JSON // outside anything, count nesting	81	INCR_M_JSON // outside anything, count nesting
88	};	82	};
89		83
90	#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)	84	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
91		85
92	typedef struct {	86	typedef struct {
93	U32 flags;	87	U32 flags;
		88	U32 max_depth;
		89	STRLEN max_size;
		90
94	SV *cb_object;	91	SV *cb_object;
95	HV *cb_sk_object;	92	HV *cb_sk_object;
96		93
97	// for the incremental parser	94	// for the incremental parser
98	SV *incr_text; // the source text so far	95	SV *incr_text; // the source text so far
99	STRLEN incr_pos; // the current offset into the text	96	STRLEN incr_pos; // the current offset into the text
100	int incr_nest; // {[]}-nesting level	97	int incr_nest; // {[]}-nesting level
101	int incr_mode;	98	unsigned char incr_mode;
102	} JSON;	99	} JSON;
		100
		101	INLINE void
		102	json_init (JSON *json)
		103	{
		104	Zero (json, 1, JSON);
		105	json->max_depth = 512;
		106	}
103		107
104	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
105	// utility functions	109	// utility functions
106		110
		111	INLINE SV *
		112	get_bool (const char *name)
		113	{
		114	SV *sv = get_sv (name, 1);
		115
		116	SvREADONLY_on (sv);
		117	SvREADONLY_on (SvRV (sv));
		118
		119	return sv;
		120	}
		121
107	INLINE void	122	INLINE void
108	shrink (SV *sv)	123	shrink (SV *sv)
109	{	124	{
110	sv_utf8_downgrade (sv, 1);	125	sv_utf8_downgrade (sv, 1);
		126
111	if (SvLEN (sv) > SvCUR (sv) + 1)	127	if (SvLEN (sv) > SvCUR (sv) + 1)
112	{	128	{
113	#ifdef SvPV_shrink_to_cur	129	#ifdef SvPV_shrink_to_cur
114	SvPV_shrink_to_cur (sv);	130	SvPV_shrink_to_cur (sv);
115	#elif defined (SvPV_renew)	131	#elif defined (SvPV_renew)
…		…
159	*s++ = 0x80 \| ( ch & 0x3f);	175	*s++ = 0x80 \| ( ch & 0x3f);
160		176
161	return s;	177	return s;
162	}	178	}
163		179
		180	// convert offset pointer to character index, sv must be string
		181	static STRLEN
		182	ptr_to_index (SV sv, char offset)
		183	{
		184	return SvUTF8 (sv)
		185	? utf8_distance (offset, SvPVX (sv))
		186	: offset - SvPVX (sv);
		187	}
		188
164	/////////////////////////////////////////////////////////////////////////////	189	/////////////////////////////////////////////////////////////////////////////
165	// encoder	190	// encoder
166		191
167	// structure used for encoding JSON	192	// structure used for encoding JSON
168	typedef struct	193	typedef struct
…		…
170	char *cur; // SvPVX (sv) + current output position	195	char *cur; // SvPVX (sv) + current output position
171	char *end; // SvEND (sv)	196	char *end; // SvEND (sv)
172	SV *sv; // result scalar	197	SV *sv; // result scalar
173	JSON json;	198	JSON json;
174	U32 indent; // indentation level	199	U32 indent; // indentation level
175	U32 maxdepth; // max. indentation/recursion level
176	UV limit; // escape character values >= this value when encoding	200	UV limit; // escape character values >= this value when encoding
177	} enc_t;	201	} enc_t;
178		202
179	INLINE void	203	INLINE void
180	need (enc_t *enc, STRLEN len)	204	need (enc_t *enc, STRLEN len)
181	{	205	{
182	if (expect_false (enc->cur + len >= enc->end))	206	if (expect_false (enc->cur + len >= enc->end))
183	{	207	{
184	STRLEN cur = enc->cur - SvPVX (enc->sv);	208	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
185	SvGROW (enc->sv, cur + len + 1);	209	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
186	enc->cur = SvPVX (enc->sv) + cur;	210	enc->cur = SvPVX (enc->sv) + cur;
187	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	211	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
188	}	212	}
189	}	213	}
190		214
…		…
265	(int)((uch - 0x10000) % 0x400 + 0xDC00));	289	(int)((uch - 0x10000) % 0x400 + 0xDC00));
266	enc->cur += 12;	290	enc->cur += 12;
267	}	291	}
268	else	292	else
269	{	293	{
270	static char hexdigit [16] = "0123456789abcdef";
271	need (enc, len += 5);	294	need (enc, len += 5);
272	*enc->cur++ = '\\';	295	*enc->cur++ = '\\';
273	*enc->cur++ = 'u';	296	*enc->cur++ = 'u';
274	*enc->cur++ = hexdigit [ uch >> 12 ];	297	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
275	*enc->cur++ = hexdigit [(uch >> 8) & 15];	298	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
276	*enc->cur++ = hexdigit [(uch >> 4) & 15];	299	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
277	*enc->cur++ = hexdigit [(uch >> 0) & 15];	300	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
278	}	301	}
279		302
280	str += clen;	303	str += clen;
281	}	304	}
282	else if (enc->json.flags & F_LATIN1)	305	else if (enc->json.flags & F_LATIN1)
…		…
353	static void	376	static void
354	encode_av (enc_t enc, AV av)	377	encode_av (enc_t enc, AV av)
355	{	378	{
356	int i, len = av_len (av);	379	int i, len = av_len (av);
357		380
358	if (enc->indent >= enc->maxdepth)	381	if (enc->indent >= enc->json.max_depth)
359	croak ("data structure too deep (hit recursion limit)");	382	croak (ERR_NESTING_EXCEEDED);
360		383
361	encode_ch (enc, '[');	384	encode_ch (enc, '[');
362		385
363	if (len >= 0)	386	if (len >= 0)
364	{	387	{
…		…
438		461
439	static void	462	static void
440	encode_hv (enc_t enc, HV hv)	463	encode_hv (enc_t enc, HV hv)
441	{	464	{
442	HE *he;	465	HE *he;
443	int count;
444		466
445	if (enc->indent >= enc->maxdepth)	467	if (enc->indent >= enc->json.max_depth)
446	croak ("data structure too deep (hit recursion limit)");	468	croak (ERR_NESTING_EXCEEDED);
447		469
448	encode_ch (enc, '{');	470	encode_ch (enc, '{');
449		471
450	// for canonical output we have to sort by keys first	472	// for canonical output we have to sort by keys first
451	// actually, this is mostly due to the stupid so-called	473	// actually, this is mostly due to the stupid so-called
452	// security workaround added somewhere in 5.8.x.	474	// security workaround added somewhere in 5.8.x
453	// that randomises hash orderings	475	// that randomises hash orderings
454	if (enc->json.flags & F_CANONICAL)	476	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
455	{	477	{
456	int count = hv_iterinit (hv);	478	int count = hv_iterinit (hv);
457		479
458	if (SvMAGICAL (hv))	480	if (SvMAGICAL (hv))
459	{	481	{
…		…
632		654
633	if (len == 1 && *pv == '1')	655	if (len == 1 && *pv == '1')
634	encode_str (enc, "true", 4, 0);	656	encode_str (enc, "true", 4, 0);
635	else if (len == 1 && *pv == '0')	657	else if (len == 1 && *pv == '0')
636	encode_str (enc, "false", 5, 0);	658	encode_str (enc, "false", 5, 0);
		659	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		660	encode_str (enc, "null", 4, 0);
637	else	661	else
638	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	662	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
639	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	663	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
640	}	664	}
		665	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		666	encode_str (enc, "null", 4, 0);
641	else	667	else
642	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	668	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
643	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	669	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644	}	670	}
645		671
…		…
707	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));	733	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
708	}	734	}
709	}	735	}
710	else if (SvROK (sv))	736	else if (SvROK (sv))
711	encode_rv (enc, SvRV (sv));	737	encode_rv (enc, SvRV (sv));
712	else if (!SvOK (sv))	738	else if (!SvOK (sv) \|\| enc->json.flags & F_ALLOW_UNKNOWN)
713	encode_str (enc, "null", 4, 0);	739	encode_str (enc, "null", 4, 0);
714	else	740	else
715	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	741	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
716	SvPV_nolen (sv), SvFLAGS (sv));	742	SvPV_nolen (sv), SvFLAGS (sv));
717	}	743	}
…		…
727	enc.json = *json;	753	enc.json = *json;
728	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	754	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
729	enc.cur = SvPVX (enc.sv);	755	enc.cur = SvPVX (enc.sv);
730	enc.end = SvEND (enc.sv);	756	enc.end = SvEND (enc.sv);
731	enc.indent = 0;	757	enc.indent = 0;
732	enc.maxdepth = DEC_DEPTH (enc.json.flags);
733	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL	758	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
734	: enc.json.flags & F_LATIN1 ? 0x000100UL	759	: enc.json.flags & F_LATIN1 ? 0x000100UL
735	: 0x110000UL;	760	: 0x110000UL;
736		761
737	SvPOK_only (enc.sv);	762	SvPOK_only (enc.sv);
738	encode_sv (&enc, scalar);	763	encode_sv (&enc, scalar);
		764	encode_nl (&enc);
739		765
740	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	766	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
741	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	767	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
742		768
743	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))	769	if (!(enc.json.flags & (F_ASCII \| F_LATIN1 \| F_UTF8)))
…		…
804	if (*dec->cur != ch) \	830	if (*dec->cur != ch) \
805	ERR (# ch " expected"); \	831	ERR (# ch " expected"); \
806	++dec->cur; \	832	++dec->cur; \
807	SE	833	SE
808		834
809	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	835	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
810	#define DEC_DEC_DEPTH --dec->depth	836	#define DEC_DEC_DEPTH --dec->depth
811		837
812	static SV decode_sv (dec_t dec);	838	static SV decode_sv (dec_t dec);
813		839
814	static signed char decode_hexdigit[256];	840	static signed char decode_hexdigit[256];
…		…
954	{	980	{
955	STRLEN len = cur - buf;	981	STRLEN len = cur - buf;
956		982
957	if (sv)	983	if (sv)
958	{	984	{
959	SvGROW (sv, SvCUR (sv) + len + 1);	985	STRLEN cur = SvCUR (sv);
		986
		987	if (SvLEN (sv) <= cur + len)
		988	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		989
960	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	990	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
961	SvCUR_set (sv, SvCUR (sv) + len);	991	SvCUR_set (sv, SvCUR (sv) + len);
962	}	992	}
963	else	993	else
964	sv = newSVpvn (buf, len);	994	sv = newSVpvn (buf, len);
…		…
1055		1085
1056	// special case the rather common 1..5-digit-int case	1086	// special case the rather common 1..5-digit-int case
1057	if (*start == '-')	1087	if (*start == '-')
1058	switch (len)	1088	switch (len)
1059	{	1089	{
1060	case 2: return newSViv (-( start [1] - '0' * 1));	1090	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1061	case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));	1091	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1062	case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));	1092	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1063	case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));	1093	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1064	case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));	1094	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1065	}	1095	}
1066	else	1096	else
1067	switch (len)	1097	switch (len)
1068	{	1098	{
1069	case 1: return newSViv ( start [0] - '0' * 1);	1099	case 1: return newSViv ( start [0] - '0' * 1);
1070	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);	1100	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1071	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);	1101	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1072	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);	1102	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1073	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);	1103	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1074	}	1104	}
1075		1105
1076	{	1106	{
1077	UV uv;	1107	UV uv;
1078	int numtype = grok_number (start, len, &uv);	1108	int numtype = grok_number (start, len, &uv);
…		…
1344	case 't':	1374	case 't':
1345	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1375	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1346	{	1376	{
1347	dec->cur += 4;	1377	dec->cur += 4;
1348	#if JSON_SLOW	1378	#if JSON_SLOW
1349	json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);	1379	json_true = get_bool ("JSON::XS::true");
1350	#endif	1380	#endif
1351	return SvREFCNT_inc (json_true);	1381	return newSVsv (json_true);
1352	}	1382	}
1353	else	1383	else
1354	ERR ("'true' expected");	1384	ERR ("'true' expected");
1355		1385
1356	break;	1386	break;
…		…
1358	case 'f':	1388	case 'f':
1359	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1389	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1360	{	1390	{
1361	dec->cur += 5;	1391	dec->cur += 5;
1362	#if JSON_SLOW	1392	#if JSON_SLOW
1363	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1393	json_false = get_bool ("JSON::XS::false");
1364	#endif	1394	#endif
1365	return SvREFCNT_inc (json_false);	1395	return newSVsv (json_false);
1366	}	1396	}
1367	else	1397	else
1368	ERR ("'false' expected");	1398	ERR ("'false' expected");
1369		1399
1370	break;	1400	break;
…		…
1388	fail:	1418	fail:
1389	return 0;	1419	return 0;
1390	}	1420	}
1391		1421
1392	static SV *	1422	static SV *
1393	decode_json (SV string, JSON json, STRLEN *offset_return)	1423	decode_json (SV string, JSON json, char **offset_return)
1394	{	1424	{
1395	dec_t dec;	1425	dec_t dec;
1396	STRLEN offset;
1397	SV *sv;	1426	SV *sv;
1398		1427
		1428	/* work around bugs in 5.10 where manipulating magic values
		1429	* will perl ignore the magic in subsequent accesses
		1430	*/
1399	SvGETMAGIC (string);	1431	/SvGETMAGIC (string);/
		1432	if (SvMAGICAL (string))
		1433	string = sv_2mortal (newSVsv (string));
		1434
1400	SvUPGRADE (string, SVt_PV);	1435	SvUPGRADE (string, SVt_PV);
1401		1436
1402	if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))	1437	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1438	* assertion with -DDEBUGGING, although SvCUR is documented to
		1439	* return the xpv_cur field which certainly exists after upgrading.
		1440	* according to nicholas clark, calling SvPOK fixes this.
		1441	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1442	* and hope for the best.
		1443	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1444	* assertion business is seriously broken, try yet another workaround
		1445	* for the broken -DDEBUGGING.
		1446	*/
		1447	{
		1448	#ifdef DEBUGGING
		1449	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1450	#else
		1451	STRLEN offset = SvCUR (string);
		1452	#endif
		1453
		1454	if (offset > json->max_size && json->max_size)
1403	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",	1455	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1404	(unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));	1456	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1457	}
1405		1458
1406	if (json->flags & F_UTF8)	1459	if (json->flags & F_UTF8)
1407	sv_utf8_downgrade (string, 0);	1460	sv_utf8_downgrade (string, 0);
1408	else	1461	else
1409	sv_utf8_upgrade (string);	1462	sv_utf8_upgrade (string);
1410		1463
1411	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1464	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1412		1465
1413	dec.json = *json;	1466	dec.json = *json;
1414	dec.cur = SvPVX (string);	1467	dec.cur = SvPVX (string);
1415	dec.end = SvEND (string);	1468	dec.end = SvEND (string);
1416	dec.err = 0;	1469	dec.err = 0;
1417	dec.depth = 0;	1470	dec.depth = 0;
1418	dec.maxdepth = DEC_DEPTH (dec.json.flags);
1419		1471
1420	if (dec.json.cb_object \|\| dec.json.cb_sk_object)	1472	if (dec.json.cb_object \|\| dec.json.cb_sk_object)
1421	dec.json.flags \|= F_HOOK;	1473	dec.json.flags \|= F_HOOK;
1422		1474
1423	*dec.end = 0; // this should basically be a nop, too, but make sure it's there	1475	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
1424		1476
1425	decode_ws (&dec);	1477	decode_ws (&dec);
1426	sv = decode_sv (&dec);	1478	sv = decode_sv (&dec);
		1479
		1480	if (offset_return)
		1481	*offset_return = dec.cur;
1427		1482
1428	if (!(offset_return \|\| !sv))	1483	if (!(offset_return \|\| !sv))
1429	{	1484	{
1430	// check for trailing garbage	1485	// check for trailing garbage
1431	decode_ws (&dec);	1486	decode_ws (&dec);
…		…
1434	{	1489	{
1435	dec.err = "garbage after JSON object";	1490	dec.err = "garbage after JSON object";
1436	SvREFCNT_dec (sv);	1491	SvREFCNT_dec (sv);
1437	sv = 0;	1492	sv = 0;
1438	}	1493	}
1439	}
1440
1441	if (offset_return \|\| !sv)
1442	{
1443	offset = dec.json.flags & F_UTF8
1444	? dec.cur - SvPVX (string)
1445	: utf8_distance (dec.cur, SvPVX (string));
1446
1447	if (offset_return)
1448	*offset_return = offset;
1449	}	1494	}
1450		1495
1451	if (!sv)	1496	if (!sv)
1452	{	1497	{
1453	SV *uni = sv_newmortal ();	1498	SV *uni = sv_newmortal ();
…		…
1459	SAVEVPTR (PL_curcop);	1504	SAVEVPTR (PL_curcop);
1460	PL_curcop = &cop;	1505	PL_curcop = &cop;
1461	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1506	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1462	LEAVE;	1507	LEAVE;
1463		1508
1464	croak ("%s, at character offset %d [\"%s\"]",	1509	croak ("%s, at character offset %d (before \"%s\")",
1465	dec.err,	1510	dec.err,
1466	(int)offset,	1511	ptr_to_index (string, dec.cur),
1467	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1512	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1468	}	1513	}
1469		1514
1470	sv = sv_2mortal (sv);	1515	sv = sv_2mortal (sv);
1471		1516
…		…
1569	self->incr_mode = INCR_M_STR;	1614	self->incr_mode = INCR_M_STR;
1570	goto incr_m_str;	1615	goto incr_m_str;
1571		1616
1572	case '[':	1617	case '[':
1573	case '{':	1618	case '{':
1574	++self->incr_nest;	1619	if (++self->incr_nest > self->max_depth)
		1620	croak (ERR_NESTING_EXCEEDED);
1575	break;	1621	break;
1576		1622
1577	case ']':	1623	case ']':
1578	case '}':	1624	case '}':
1579	if (!--self->incr_nest)	1625	if (--self->incr_nest <= 0)
1580	goto interrupt;	1626	goto interrupt;
1581	}	1627	}
1582	}	1628	}
1583	}	1629	}
1584		1630
…		…
1608	: -1;	1654	: -1;
1609		1655
1610	json_stash = gv_stashpv ("JSON::XS" , 1);	1656	json_stash = gv_stashpv ("JSON::XS" , 1);
1611	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);	1657	json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1612		1658
1613	json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );	1659	json_true = get_bool ("JSON::XS::true");
1614	json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);	1660	json_false = get_bool ("JSON::XS::false");
		1661
		1662	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1615	}	1663	}
1616		1664
1617	PROTOTYPES: DISABLE	1665	PROTOTYPES: DISABLE
1618		1666
1619	void CLONE (...)	1667	void CLONE (...)
…		…
1624	void new (char *klass)	1672	void new (char *klass)
1625	PPCODE:	1673	PPCODE:
1626	{	1674	{
1627	SV *pv = NEWSV (0, sizeof (JSON));	1675	SV *pv = NEWSV (0, sizeof (JSON));
1628	SvPOK_only (pv);	1676	SvPOK_only (pv);
1629	Zero (SvPVX (pv), 1, JSON);	1677	json_init ((JSON *)SvPVX (pv));
1630	((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1631	XPUSHs (sv_2mortal (sv_bless (	1678	XPUSHs (sv_2mortal (sv_bless (
1632	newRV_noinc (pv),	1679	newRV_noinc (pv),
1633	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)	1680	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1634	)));	1681	)));
1635	}	1682	}
…		…
1647	allow_nonref = F_ALLOW_NONREF	1694	allow_nonref = F_ALLOW_NONREF
1648	shrink = F_SHRINK	1695	shrink = F_SHRINK
1649	allow_blessed = F_ALLOW_BLESSED	1696	allow_blessed = F_ALLOW_BLESSED
1650	convert_blessed = F_CONV_BLESSED	1697	convert_blessed = F_CONV_BLESSED
1651	relaxed = F_RELAXED	1698	relaxed = F_RELAXED
		1699	allow_unknown = F_ALLOW_UNKNOWN
1652	PPCODE:	1700	PPCODE:
1653	{	1701	{
1654	if (enable)	1702	if (enable)
1655	self->flags \|= ix;	1703	self->flags \|= ix;
1656	else	1704	else
…		…
1671	get_allow_nonref = F_ALLOW_NONREF	1719	get_allow_nonref = F_ALLOW_NONREF
1672	get_shrink = F_SHRINK	1720	get_shrink = F_SHRINK
1673	get_allow_blessed = F_ALLOW_BLESSED	1721	get_allow_blessed = F_ALLOW_BLESSED
1674	get_convert_blessed = F_CONV_BLESSED	1722	get_convert_blessed = F_CONV_BLESSED
1675	get_relaxed = F_RELAXED	1723	get_relaxed = F_RELAXED
		1724	get_allow_unknown = F_ALLOW_UNKNOWN
1676	PPCODE:	1725	PPCODE:
1677	XPUSHs (boolSV (self->flags & ix));	1726	XPUSHs (boolSV (self->flags & ix));
1678		1727
1679	void max_depth (JSON *self, UV max_depth = 0x80000000UL)	1728	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1680	PPCODE:	1729	PPCODE:
1681	{	1730	self->max_depth = max_depth;
1682	UV log2 = 0;
1683
1684	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1685
1686	while ((1UL << log2) < max_depth)
1687	++log2;
1688
1689	self->flags = self->flags & ~F_MAXDEPTH \| (log2 << S_MAXDEPTH);
1690
1691	XPUSHs (ST (0));	1731	XPUSHs (ST (0));
1692	}
1693		1732
1694	U32 get_max_depth (JSON *self)	1733	U32 get_max_depth (JSON *self)
1695	CODE:	1734	CODE:
1696	RETVAL = DEC_DEPTH (self->flags);	1735	RETVAL = self->max_depth;
1697	OUTPUT:	1736	OUTPUT:
1698	RETVAL	1737	RETVAL
1699		1738
1700	void max_size (JSON *self, UV max_size = 0)	1739	void max_size (JSON *self, U32 max_size = 0)
1701	PPCODE:	1740	PPCODE:
1702	{	1741	self->max_size = max_size;
1703	UV log2 = 0;
1704
1705	if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1706	if (max_size == 1) max_size = 2;
1707
1708	while ((1UL << log2) < max_size)
1709	++log2;
1710
1711	self->flags = self->flags & ~F_MAXSIZE \| (log2 << S_MAXSIZE);
1712
1713	XPUSHs (ST (0));	1742	XPUSHs (ST (0));
1714	}
1715		1743
1716	int get_max_size (JSON *self)	1744	int get_max_size (JSON *self)
1717	CODE:	1745	CODE:
1718	RETVAL = DEC_SIZE (self->flags);	1746	RETVAL = self->max_size;
1719	OUTPUT:	1747	OUTPUT:
1720	RETVAL	1748	RETVAL
1721		1749
1722	void filter_json_object (JSON self, SV cb = &PL_sv_undef)	1750	void filter_json_object (JSON self, SV cb = &PL_sv_undef)
1723	PPCODE:	1751	PPCODE:
…		…
1759	XPUSHs (decode_json (jsonstr, self, 0));	1787	XPUSHs (decode_json (jsonstr, self, 0));
1760		1788
1761	void decode_prefix (JSON self, SV jsonstr)	1789	void decode_prefix (JSON self, SV jsonstr)
1762	PPCODE:	1790	PPCODE:
1763	{	1791	{
1764	STRLEN offset;	1792	char *offset;
1765	EXTEND (SP, 2);	1793	EXTEND (SP, 2);
1766	PUSHs (decode_json (jsonstr, self, &offset));	1794	PUSHs (decode_json (jsonstr, self, &offset));
1767	PUSHs (sv_2mortal (newSVuv (offset)));	1795	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1768	}	1796	}
1769		1797
1770	void incr_parse (JSON self, SV jsonstr = 0)	1798	void incr_parse (JSON self, SV jsonstr = 0)
1771	PPCODE:	1799	PPCODE:
1772	{	1800	{
…		…
1774	self->incr_text = newSVpvn ("", 0);	1802	self->incr_text = newSVpvn ("", 0);
1775		1803
1776	// append data, if any	1804	// append data, if any
1777	if (jsonstr)	1805	if (jsonstr)
1778	{	1806	{
1779	if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))	1807	if (SvUTF8 (jsonstr))
1780	{	1808	{
		1809	if (!SvUTF8 (self->incr_text))
		1810	{
1781	/* utf-8-ness differs, need to upgrade */	1811	/* utf-8-ness differs, need to upgrade */
1782	sv_utf8_upgrade (self->incr_text);	1812	sv_utf8_upgrade (self->incr_text);
1783		1813
1784	if (self->incr_pos)	1814	if (self->incr_pos)
1785	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)	1815	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1786	- (U8 *)SvPVX (self->incr_text);	1816	- (U8 *)SvPVX (self->incr_text);
		1817	}
1787	}	1818	}
		1819	else if (SvUTF8 (self->incr_text))
		1820	sv_utf8_upgrade (jsonstr);
1788		1821
1789	{	1822	{
1790	STRLEN len;	1823	STRLEN len;
1791	const char *str = SvPV (jsonstr, len);	1824	const char *str = SvPV (jsonstr, len);
1792	SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);	1825	STRLEN cur = SvCUR (self->incr_text);
		1826
		1827	if (SvLEN (self->incr_text) <= cur + len)
		1828	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1829
1793	Move (str, SvEND (self->incr_text), len, char);	1830	Move (str, SvEND (self->incr_text), len, char);
1794	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);	1831	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1795	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there	1832	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1796	}	1833	}
1797	}	1834	}
1798		1835
1799	if (GIMME_V != G_VOID)	1836	if (GIMME_V != G_VOID)
1800	do	1837	do
1801	{	1838	{
1802	STRLEN offset;	1839	char *offset;
1803
1804	incr_parse (self);
1805		1840
1806	if (!INCR_DONE (self))	1841	if (!INCR_DONE (self))
		1842	{
		1843	incr_parse (self);
		1844
		1845	if (self->incr_pos > self->max_size && self->max_size)
		1846	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1847	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		1848
		1849	if (!INCR_DONE (self))
1807	break;	1850	break;
		1851	}
1808		1852
1809	XPUSHs (decode_json (self->incr_text, self, &offset));	1853	XPUSHs (decode_json (self->incr_text, self, &offset));
1810		1854
1811	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1812	self->incr_pos -= offset;	1855	self->incr_pos -= offset - SvPVX (self->incr_text);
1813	self->incr_nest = 0;	1856	self->incr_nest = 0;
1814	self->incr_mode = 0;	1857	self->incr_mode = 0;
		1858
		1859	sv_chop (self->incr_text, offset);
1815	}	1860	}
1816	while (GIMME_V == G_ARRAY);	1861	while (GIMME_V == G_ARRAY);
1817	}	1862	}
1818		1863
1819	SV incr_text (JSON self)	1864	SV incr_text (JSON self)
1820	ATTRS: lvalue	1865	ATTRS: lvalue
1821	CODE:	1866	CODE:
1822	{	1867	{
1823	if (self->incr_pos)	1868	if (self->incr_pos)
1824	croak ("incr_text can only be called after a successful incr_parse call in scalar context %d", self->incr_pos);//D	1869	croak ("incr_text can not be called when the incremental parser already started parsing");
1825		1870
1826	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;	1871	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1827	}	1872	}
1828	OUTPUT:	1873	OUTPUT:
1829	RETVAL	1874	RETVAL
		1875
		1876	void incr_skip (JSON *self)
		1877	CODE:
		1878	{
		1879	if (self->incr_pos)
		1880	{
		1881	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		1882	self->incr_pos = 0;
		1883	self->incr_nest = 0;
		1884	self->incr_mode = 0;
		1885	}
		1886	}
		1887
		1888	void incr_reset (JSON *self)
		1889	CODE:
		1890	{
		1891	SvREFCNT_dec (self->incr_text);
		1892	self->incr_text = 0;
		1893	self->incr_pos = 0;
		1894	self->incr_nest = 0;
		1895	self->incr_mode = 0;
		1896	}
1830		1897
1831	void DESTROY (JSON *self)	1898	void DESTROY (JSON *self)
1832	CODE:	1899	CODE:
1833	SvREFCNT_dec (self->cb_sk_object);	1900	SvREFCNT_dec (self->cb_sk_object);
1834	SvREFCNT_dec (self->cb_object);	1901	SvREFCNT_dec (self->cb_object);
…		…
1840	ALIAS:	1907	ALIAS:
1841	to_json_ = 0	1908	to_json_ = 0
1842	encode_json = F_UTF8	1909	encode_json = F_UTF8
1843	PPCODE:	1910	PPCODE:
1844	{	1911	{
1845	JSON json = { F_DEFAULT \| ix };	1912	JSON json;
		1913	json_init (&json);
		1914	json.flags \|= ix;
1846	XPUSHs (encode_json (scalar, &json));	1915	XPUSHs (encode_json (scalar, &json));
1847	}	1916	}
1848		1917
1849	void decode_json (SV *jsonstr)	1918	void decode_json (SV *jsonstr)
1850	ALIAS:	1919	ALIAS:
1851	from_json_ = 0	1920	from_json_ = 0
1852	decode_json = F_UTF8	1921	decode_json = F_UTF8
1853	PPCODE:	1922	PPCODE:
1854	{	1923	{
1855	JSON json = { F_DEFAULT \| ix };	1924	JSON json;
		1925	json_init (&json);
		1926	json.flags \|= ix;
1856	XPUSHs (decode_json (jsonstr, &json, 0));	1927	XPUSHs (decode_json (jsonstr, &json, 0));
1857	}	1928	}
1858		1929
1859		1930

Diff Legend

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

Comparing JSON-XS/XS.xs (file contents): Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs. Revision 1.100 by root, Sat Sep 5 23:00:56 2009 UTC

Diff Legend

Comparing JSON-XS/XS.xs (file contents):
Revision 1.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.100 by root, Sat Sep 5 23:00:56 2009 UTC