ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/JSON-XS/XS.xs

Comparing JSON-XS/XS.xs (file contents):
Revision 1.28 by root, Wed Apr 11 12:23:02 2007 UTC vs.
Revision 1.130 by root, Sat Nov 26 06:09:29 2016 UTC

1	#include "EXTERN.h"	1	#include "EXTERN.h"
2	#include "perl.h"	2	#include "perl.h"
3	#include "XSUB.h"	3	#include "XSUB.h"
4		4
5	#include "assert.h"	5	#include <assert.h>
6	#include "string.h"	6	#include <string.h>
7	#include "stdlib.h"	7	#include <stdlib.h>
8	#include "stdio.h"	8	#include <stdio.h>
		9	#include <limits.h>
		10	#include <float.h>
		11	#include <inttypes.h>
9		12
10	#if defined(__BORLANDC__) || defined(_MSC_VER)	13	#if defined(__BORLANDC__) || defined(_MSC_VER)
11	# define snprintf _snprintf // C compilers have this in stdio.h	14	# define snprintf _snprintf // C compilers have this in stdio.h
12	#endif	15	#endif
13		16
		17	// some old perls do not have this, try to make it work, no
		18	// guarantees, though. if it breaks, you get to keep the pieces.
		19	#ifndef UTF8_MAXBYTES
		20	# define UTF8_MAXBYTES 13
		21	#endif
		22
		23	// compatibility with perl <5.18
		24	#ifndef HvNAMELEN_get
		25	# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
		26	#endif
		27	#ifndef HvNAMELEN
		28	# define HvNAMELEN(hv) HvNAMELEN_get (hv)
		29	#endif
		30	#ifndef HvNAMEUTF8
		31	# define HvNAMEUTF8(hv) 0
		32	#endif
		33
		34	// three extra for rounding, sign, and end of string
		35	#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
		36
14	#define F_ASCII 0x00000001UL	37	#define F_ASCII 0x00000001UL
		38	#define F_LATIN1 0x00000002UL
15	#define F_UTF8 0x00000002UL	39	#define F_UTF8 0x00000004UL
16	#define F_INDENT 0x00000004UL	40	#define F_INDENT 0x00000008UL
17	#define F_CANONICAL 0x00000008UL	41	#define F_CANONICAL 0x00000010UL
18	#define F_SPACE_BEFORE 0x00000010UL	42	#define F_SPACE_BEFORE 0x00000020UL
19	#define F_SPACE_AFTER 0x00000020UL	43	#define F_SPACE_AFTER 0x00000040UL
20	#define F_ALLOW_NONREF 0x00000080UL	44	#define F_ALLOW_NONREF 0x00000100UL
21	#define F_SHRINK 0x00000100UL	45	#define F_SHRINK 0x00000200UL
		46	#define F_ALLOW_BLESSED 0x00000400UL
		47	#define F_CONV_BLESSED 0x00000800UL
22	#define F_MAXDEPTH 0xf8000000UL	48	#define F_RELAXED 0x00001000UL
23	#define S_MAXDEPTH 27	49	#define F_ALLOW_UNKNOWN 0x00002000UL
24		50	#define F_ALLOW_TAGS 0x00004000UL
25	#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))	51	#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
26
27	// F_SELFCONVERT? <=> to_json/toJson
28	// F_BLESSED? <=> { $__class__$ => }
29		52
30	#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER	53	#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
31	#define F_DEFAULT (9UL << S_MAXDEPTH)
32		54
33	#define INIT_SIZE 32 // initial scalar size to be allocated	55	#define INIT_SIZE 32 // initial scalar size to be allocated
34	#define INDENT_STEP 3 // spaces per indentation level	56	#define INDENT_STEP 3 // spaces per indentation level
35		57
36	#define SHORT_STRING_LEN 512 // special-case strings of up to this size	58	#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
		59
		60	#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
37		61
38	#define SB do {	62	#define SB do {
39	#define SE } while (0)	63	#define SE } while (0)
40		64
41	static HV *json_stash; // JSON::XS::	65	#if __GNUC__ >= 3
		66	# define expect(expr,value) __builtin_expect ((expr), (value))
		67	# define INLINE static inline
		68	#else
		69	# define expect(expr,value) (expr)
		70	# define INLINE static
		71	#endif
		72
		73	#define expect_false(expr) expect ((expr) != 0, 0)
		74	#define expect_true(expr) expect ((expr) != 0, 1)
		75
		76	#define IN_RANGE_INC(type,val,beg,end) \
		77	((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
		78	<= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
		79
		80	#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
		81
		82	#ifdef USE_ITHREADS
		83	# define JSON_SLOW 1
		84	# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
		85	# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
		86	#else
		87	# define JSON_SLOW 0
		88	# define JSON_STASH json_stash
		89	# define BOOL_STASH bool_stash
		90	#endif
		91
		92	// the amount of HEs to allocate on the stack, when sorting keys
		93	#define STACK_HES 64
		94
		95	static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
		96	static SV *bool_true, *bool_false, *sv_json;
		97
		98	enum {
		99	INCR_M_WS = 0, // initial whitespace skipping, must be 0
		100	INCR_M_STR, // inside string
		101	INCR_M_BS, // inside backslash
		102	INCR_M_C0, // inside comment in initial whitespace sequence
		103	INCR_M_C1, // inside comment in other places
		104	INCR_M_JSON // outside anything, count nesting
		105	};
		106
		107	#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
		108
		109	typedef struct {
		110	U32 flags;
		111	U32 max_depth;
		112	STRLEN max_size;
		113
		114	SV *cb_object;
		115	HV *cb_sk_object;
		116
		117	// for the incremental parser
		118	SV *incr_text; // the source text so far
		119	STRLEN incr_pos; // the current offset into the text
		120	int incr_nest; // {[]}-nesting level
		121	unsigned char incr_mode;
		122	} JSON;
		123
		124	INLINE void
		125	json_init (JSON *json)
		126	{
		127	Zero (json, 1, JSON);
		128	json->max_depth = 512;
		129	}
42		130
43	/////////////////////////////////////////////////////////////////////////////	131	/////////////////////////////////////////////////////////////////////////////
44	// utility functions	132	// utility functions
45		133
46	static UV *	134	INLINE SV *
47	SvJSON (SV *sv)	135	get_bool (const char *name)
48	{	136	{
49	if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))	137	SV *sv = get_sv (name, 1);
50	croak ("object is not of type JSON::XS");
51		138
52	return &SvUVX (SvRV (sv));	139	SvREADONLY_on (sv);
53	}	140	SvREADONLY_on (SvRV (sv));
54		141
55	static void	142	return sv;
		143	}
		144
		145	INLINE void
56	shrink (SV *sv)	146	shrink (SV *sv)
57	{	147	{
58	sv_utf8_downgrade (sv, 1);	148	sv_utf8_downgrade (sv, 1);
		149
59	if (SvLEN (sv) > SvCUR (sv) + 1)	150	if (SvLEN (sv) > SvCUR (sv) + 1)
60	{	151	{
61	#ifdef SvPV_shrink_to_cur	152	#ifdef SvPV_shrink_to_cur
62	SvPV_shrink_to_cur (sv);	153	SvPV_shrink_to_cur (sv);
63	#elif defined (SvPV_renew)	154	#elif defined (SvPV_renew)
…		…
69	// decode an utf-8 character and return it, or (UV)-1 in	160	// decode an utf-8 character and return it, or (UV)-1 in
70	// case of an error.	161	// case of an error.
71	// we special-case "safe" characters from U+80 .. U+7FF,	162	// we special-case "safe" characters from U+80 .. U+7FF,
72	// but use the very good perl function to parse anything else.	163	// but use the very good perl function to parse anything else.
73	// note that we never call this function for a ascii codepoints	164	// note that we never call this function for a ascii codepoints
74	static UV	165	INLINE UV
75	decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)	166	decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
76	{	167	{
77	if (s[0] > 0xdf || s[0] < 0xc2)	168	if (expect_true (len >= 2
78	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);	169	&& IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
79	else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)	170	&& IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
80	{	171	{
81	*clen = 2;	172	*clen = 2;
82	return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);	173	return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
83	}	174	}
84	else	175	else
		176	return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
		177	}
		178
		179	// likewise for encoding, also never called for ascii codepoints
		180	// this function takes advantage of this fact, although current gccs
		181	// seem to optimise the check for >= 0x80 away anyways
		182	INLINE unsigned char *
		183	encode_utf8 (unsigned char *s, UV ch)
		184	{
		185	if (expect_false (ch < 0x000080))
		186	*s++ = ch;
		187	else if (expect_true (ch < 0x000800))
		188	*s++ = 0xc0 | ( ch >> 6),
		189	*s++ = 0x80 | ( ch & 0x3f);
		190	else if ( ch < 0x010000)
		191	*s++ = 0xe0 | ( ch >> 12),
		192	*s++ = 0x80 | ((ch >> 6) & 0x3f),
		193	*s++ = 0x80 | ( ch & 0x3f);
		194	else if ( ch < 0x110000)
		195	*s++ = 0xf0 | ( ch >> 18),
		196	*s++ = 0x80 | ((ch >> 12) & 0x3f),
		197	*s++ = 0x80 | ((ch >> 6) & 0x3f),
		198	*s++ = 0x80 | ( ch & 0x3f);
		199
		200	return s;
		201	}
		202
		203	// convert offset pointer to character index, sv must be string
		204	static STRLEN
		205	ptr_to_index (SV *sv, char *offset)
		206	{
		207	return SvUTF8 (sv)
		208	? utf8_distance (offset, SvPVX (sv))
		209	: offset - SvPVX (sv);
		210	}
		211
		212	/////////////////////////////////////////////////////////////////////////////
		213	// fp hell
		214
		215	// scan a group of digits, and a trailing exponent
		216	static void
		217	json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
		218	{
		219	UV uaccum = 0;
		220	int eaccum = 0;
		221
		222	// if we recurse too deep, skip all remaining digits
		223	// to avoid a stack overflow attack
		224	if (expect_false (--maxdepth <= 0))
		225	while (((U8)*s - '0') < 10)
		226	++s;
		227
		228	for (;;)
		229	{
		230	U8 dig = (U8)*s - '0';
		231
		232	if (expect_false (dig >= 10))
		233	{
		234	if (dig == (U8)((U8)'.' - (U8)'0'))
		235	{
		236	++s;
		237	json_atof_scan1 (s, accum, expo, 1, maxdepth);
		238	}
		239	else if ((dig | ' ') == 'e' - '0')
		240	{
		241	int exp2 = 0;
		242	int neg = 0;
		243
		244	++s;
		245
		246	if (*s == '-')
		247	{
		248	++s;
		249	neg = 1;
		250	}
		251	else if (*s == '+')
		252	++s;
		253
		254	while ((dig = (U8)*s - '0') < 10)
		255	exp2 = exp2 * 10 + *s++ - '0';
		256
		257	*expo += neg ? -exp2 : exp2;
		258	}
		259
		260	break;
		261	}
		262
		263	++s;
		264
		265	uaccum = uaccum * 10 + dig;
		266	++eaccum;
		267
		268	// if we have too many digits, then recurse for more
		269	// we actually do this for rather few digits
		270	if (uaccum >= (UV_MAX - 9) / 10)
		271	{
		272	if (postdp) *expo -= eaccum;
		273	json_atof_scan1 (s, accum, expo, postdp, maxdepth);
		274	if (postdp) *expo += eaccum;
		275
		276	break;
		277	}
85	{	278	}
86	*clen = (STRLEN)-1;	279
		280	// this relies greatly on the quality of the pow ()
		281	// implementation of the platform, but a good
		282	// implementation is hard to beat.
		283	// (IEEE 754 conformant ones are required to be exact)
		284	if (postdp) *expo -= eaccum;
		285	*accum += uaccum * Perl_pow (10., *expo);
		286	*expo += eaccum;
		287	}
		288
		289	static NV
		290	json_atof (const char *s)
		291	{
		292	NV accum = 0.;
		293	int expo = 0;
		294	int neg = 0;
		295
		296	if (*s == '-')
		297	{
		298	++s;
		299	neg = 1;
		300	}
		301
		302	// a recursion depth of ten gives us >>500 bits
		303	json_atof_scan1 (s, &accum, &expo, 0, 10);
		304
		305	return neg ? -accum : accum;
		306	}
		307
		308	// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
		309	static int
		310	ref_bool_type (SV *sv)
		311	{
		312	svtype svt = SvTYPE (sv);
		313
		314	if (svt < SVt_PVAV)
		315	{
		316	STRLEN len = 0;
		317	char *pv = svt ? SvPV (sv, len) : 0;
		318
		319	if (len == 1)
		320	if (*pv == '1')
		321	return 1;
		322	else if (*pv == '0')
		323	return 0;
		324	}
		325
		326	return -1;
		327	}
		328
		329	// returns whether scalar is not a reference in the sense of allow_nonref
		330	static int
		331	json_nonref (SV *scalar)
		332	{
		333	if (!SvROK (scalar))
		334	return 1;
		335
		336	scalar = SvRV (scalar);
		337
		338	if (SvTYPE (scalar) >= SVt_PVMG)
		339	{
		340	if (SvSTASH (scalar) == bool_stash)
87	return (UV)-1;	341	return 1;
		342
		343	if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
		344	return 1;
88	}	345	}
		346
		347	return 0;
89	}	348	}
90		349
91	/////////////////////////////////////////////////////////////////////////////	350	/////////////////////////////////////////////////////////////////////////////
92	// encoder	351	// encoder
93		352
…		…
95	typedef struct	354	typedef struct
96	{	355	{
97	char *cur; // SvPVX (sv) + current output position	356	char *cur; // SvPVX (sv) + current output position
98	char *end; // SvEND (sv)	357	char *end; // SvEND (sv)
99	SV *sv; // result scalar	358	SV *sv; // result scalar
100	U32 flags; // F_*	359	JSON json;
101	U32 indent; // indentation level	360	U32 indent; // indentation level
102	U32 maxdepth; // max. indentation/recursion level	361	UV limit; // escape character values >= this value when encoding
103	} enc_t;	362	} enc_t;
104		363
105	static void	364	INLINE void
106	need (enc_t *enc, STRLEN len)	365	need (enc_t *enc, STRLEN len)
107	{	366	{
108	if (enc->cur + len >= enc->end)	367	if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
109	{	368	{
110	STRLEN cur = enc->cur - SvPVX (enc->sv);	369	STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
111	SvGROW (enc->sv, cur + len + 1);	370	SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
112	enc->cur = SvPVX (enc->sv) + cur;	371	enc->cur = SvPVX (enc->sv) + cur;
113	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;	372	enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
114	}	373	}
115	}	374	}
116		375
117	static void	376	INLINE void
118	encode_ch (enc_t *enc, char ch)	377	encode_ch (enc_t *enc, char ch)
119	{	378	{
120	need (enc, 1);	379	need (enc, 1);
121	*enc->cur++ = ch;	380	*enc->cur++ = ch;
122	}	381	}
…		…
130		389
131	while (str < end)	390	while (str < end)
132	{	391	{
133	unsigned char ch = *(unsigned char *)str;	392	unsigned char ch = *(unsigned char *)str;
134		393
135	if (ch >= 0x20 && ch < 0x80) // most common case	394	if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
136	{	395	{
137	if (ch == '"') // but with slow exceptions	396	if (expect_false (ch == '"')) // but with slow exceptions
138	{	397	{
139	need (enc, len += 1);	398	need (enc, len += 1);
140	*enc->cur++ = '\\';	399	*enc->cur++ = '\\';
141	*enc->cur++ = '"';	400	*enc->cur++ = '"';
142	}	401	}
143	else if (ch == '\\')	402	else if (expect_false (ch == '\\'))
144	{	403	{
145	need (enc, len += 1);	404	need (enc, len += 1);
146	*enc->cur++ = '\\';	405	*enc->cur++ = '\\';
147	*enc->cur++ = '\\';	406	*enc->cur++ = '\\';
148	}	407	}
…		…
166	STRLEN clen;	425	STRLEN clen;
167	UV uch;	426	UV uch;
168		427
169	if (is_utf8)	428	if (is_utf8)
170	{	429	{
171	//uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
172	uch = decode_utf8 (str, end - str, &clen);	430	uch = decode_utf8 (str, end - str, &clen);
173	if (clen == (STRLEN)-1)	431	if (clen == (STRLEN)-1)
174	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);	432	croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
175	}	433	}
176	else	434	else
177	{	435	{
178	uch = ch;	436	uch = ch;
179	clen = 1;	437	clen = 1;
180	}	438	}
181		439
182	if (uch > 0x10FFFFUL)	440	if (uch < 0x80/*0x20*/ || uch >= enc->limit)
183	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
184
185	if (uch < 0x80 || enc->flags & F_ASCII)
186	{	441	{
187	if (uch > 0xFFFFUL)	442	if (uch >= 0x10000UL)
188	{	443	{
		444	if (uch >= 0x110000UL)
		445	croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
		446
189	need (enc, len += 11);	447	need (enc, len += 11);
190	sprintf (enc->cur, "\\u%04x\\u%04x",	448	sprintf (enc->cur, "\\u%04x\\u%04x",
191	(int)((uch - 0x10000) / 0x400 + 0xD800),	449	(int)((uch - 0x10000) / 0x400 + 0xD800),
192	(int)((uch - 0x10000) % 0x400 + 0xDC00));	450	(int)((uch - 0x10000) % 0x400 + 0xDC00));
193	enc->cur += 12;	451	enc->cur += 12;
194	}	452	}
195	else	453	else
196	{	454	{
197	static char hexdigit [16] = "0123456789abcdef";
198	need (enc, len += 5);	455	need (enc, len += 5);
199	*enc->cur++ = '\\';	456	*enc->cur++ = '\\';
200	*enc->cur++ = 'u';	457	*enc->cur++ = 'u';
201	*enc->cur++ = hexdigit [ uch >> 12 ];	458	*enc->cur++ = PL_hexdigit [ uch >> 12 ];
202	*enc->cur++ = hexdigit [(uch >> 8) & 15];	459	*enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
203	*enc->cur++ = hexdigit [(uch >> 4) & 15];	460	*enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
204	*enc->cur++ = hexdigit [(uch >> 0) & 15];	461	*enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
205	}	462	}
206		463
		464	str += clen;
		465	}
		466	else if (enc->json.flags & F_LATIN1)
		467	{
		468	*enc->cur++ = uch;
207	str += clen;	469	str += clen;
208	}	470	}
209	else if (is_utf8)	471	else if (is_utf8)
210	{	472	{
211	need (enc, len += clen);	473	need (enc, len += clen);
…		…
216	while (--clen);	478	while (--clen);
217	}	479	}
218	else	480	else
219	{	481	{
220	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed	482	need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
221	enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);	483	enc->cur = encode_utf8 (enc->cur, uch);
222	++str;	484	++str;
223	}	485	}
224	}	486	}
225	}	487	}
226	}	488	}
227		489
228	--len;	490	--len;
229	}	491	}
230	}	492	}
231		493
232	static void	494	INLINE void
233	encode_indent (enc_t *enc)	495	encode_indent (enc_t *enc)
234	{	496	{
235	if (enc->flags & F_INDENT)	497	if (enc->json.flags & F_INDENT)
236	{	498	{
237	int spaces = enc->indent * INDENT_STEP;	499	int spaces = enc->indent * INDENT_STEP;
238		500
239	need (enc, spaces);	501	need (enc, spaces);
240	memset (enc->cur, ' ', spaces);	502	memset (enc->cur, ' ', spaces);
241	enc->cur += spaces;	503	enc->cur += spaces;
242	}	504	}
243	}	505	}
244		506
245	static void	507	INLINE void
246	encode_space (enc_t *enc)	508	encode_space (enc_t *enc)
247	{	509	{
248	need (enc, 1);	510	need (enc, 1);
249	encode_ch (enc, ' ');	511	encode_ch (enc, ' ');
250	}	512	}
251		513
252	static void	514	INLINE void
253	encode_nl (enc_t *enc)	515	encode_nl (enc_t *enc)
254	{	516	{
255	if (enc->flags & F_INDENT)	517	if (enc->json.flags & F_INDENT)
256	{	518	{
257	need (enc, 1);	519	need (enc, 1);
258	encode_ch (enc, '\n');	520	encode_ch (enc, '\n');
259	}	521	}
260	}	522	}
261		523
262	static void	524	INLINE void
263	encode_comma (enc_t *enc)	525	encode_comma (enc_t *enc)
264	{	526	{
265	encode_ch (enc, ',');	527	encode_ch (enc, ',');
266		528
267	if (enc->flags & F_INDENT)	529	if (enc->json.flags & F_INDENT)
268	encode_nl (enc);	530	encode_nl (enc);
269	else if (enc->flags & F_SPACE_AFTER)	531	else if (enc->json.flags & F_SPACE_AFTER)
270	encode_space (enc);	532	encode_space (enc);
271	}	533	}
272		534
273	static void encode_sv (enc_t *enc, SV *sv);	535	static void encode_sv (enc_t *enc, SV *sv);
274		536
275	static void	537	static void
276	encode_av (enc_t *enc, AV *av)	538	encode_av (enc_t *enc, AV *av)
277	{	539	{
278	int i, len = av_len (av);	540	int i, len = av_len (av);
279		541
280	if (enc->indent >= enc->maxdepth)	542	if (enc->indent >= enc->json.max_depth)
281	croak ("data structure too deep (hit recursion limit)");	543	croak (ERR_NESTING_EXCEEDED);
282		544
283	encode_ch (enc, '['); encode_nl (enc);	545	encode_ch (enc, '[');
284	++enc->indent;
285		546
		547	if (len >= 0)
		548	{
		549	encode_nl (enc); ++enc->indent;
		550
286	for (i = 0; i <= len; ++i)	551	for (i = 0; i <= len; ++i)
287	{	552	{
		553	SV **svp = av_fetch (av, i, 0);
		554
288	encode_indent (enc);	555	encode_indent (enc);
289	encode_sv (enc, *av_fetch (av, i, 0));
290		556
		557	if (svp)
		558	encode_sv (enc, *svp);
		559	else
		560	encode_str (enc, "null", 4, 0);
		561
291	if (i < len)	562	if (i < len)
292	encode_comma (enc);	563	encode_comma (enc);
293	}	564	}
294		565
		566	encode_nl (enc); --enc->indent; encode_indent (enc);
		567	}
		568
295	encode_nl (enc);	569	encode_ch (enc, ']');
296
297	--enc->indent;
298	encode_indent (enc); encode_ch (enc, ']');
299	}	570	}
300		571
301	static void	572	static void
302	encode_he (enc_t *enc, HE *he)	573	encode_hk (enc_t *enc, HE *he)
303	{	574	{
304	encode_ch (enc, '"');	575	encode_ch (enc, '"');
305		576
306	if (HeKLEN (he) == HEf_SVKEY)	577	if (HeKLEN (he) == HEf_SVKEY)
307	{	578	{
308	SV *sv = HeSVKEY (he);	579	SV *sv = HeSVKEY (he);
309	STRLEN len;	580	STRLEN len;
310	char *str;	581	char *str;
311		582
312	SvGETMAGIC (sv);	583	SvGETMAGIC (sv);
313	str = SvPV (sv, len);	584	str = SvPV (sv, len);
314		585
315	encode_str (enc, str, len, SvUTF8 (sv));	586	encode_str (enc, str, len, SvUTF8 (sv));
316	}	587	}
317	else	588	else
318	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));	589	encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
319		590
320	encode_ch (enc, '"');	591	encode_ch (enc, '"');
321		592
322	if (enc->flags & F_SPACE_BEFORE) encode_space (enc);	593	if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
323	encode_ch (enc, ':');	594	encode_ch (enc, ':');
324	if (enc->flags & F_SPACE_AFTER ) encode_space (enc);	595	if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
325	encode_sv (enc, HeVAL (he));
326	}	596	}
327		597
328	// compare hash entries, used when all keys are bytestrings	598	// compare hash entries, used when all keys are bytestrings
329	static int	599	static int
330	he_cmp_fast (const void *a_, const void *b_)	600	he_cmp_fast (const void *a_, const void *b_)
…		…
335	HE *b = *(HE **)b_;	605	HE *b = *(HE **)b_;
336		606
337	STRLEN la = HeKLEN (a);	607	STRLEN la = HeKLEN (a);
338	STRLEN lb = HeKLEN (b);	608	STRLEN lb = HeKLEN (b);
339		609
340	if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))	610	if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
341	cmp = la - lb;	611	cmp = lb - la;
342		612
343	return cmp;	613	return cmp;
344	}	614	}
345		615
346	// compare hash entries, used when some keys are sv's or utf-x	616	// compare hash entries, used when some keys are sv's or utf-x
347	static int	617	static int
348	he_cmp_slow (const void *a, const void *b)	618	he_cmp_slow (const void *a, const void *b)
349	{	619	{
350	return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b));	620	return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
351	}	621	}
352		622
353	static void	623	static void
354	encode_hv (enc_t *enc, HV *hv)	624	encode_hv (enc_t *enc, HV *hv)
355	{	625	{
356	int count, i;	626	HE *he;
357		627
358	if (enc->indent >= enc->maxdepth)	628	if (enc->indent >= enc->json.max_depth)
359	croak ("data structure too deep (hit recursion limit)");	629	croak (ERR_NESTING_EXCEEDED);
360		630
361	encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;	631	encode_ch (enc, '{');
362		632
363	if ((count = hv_iterinit (hv)))
364	{
365	// for canonical output we have to sort by keys first	633	// for canonical output we have to sort by keys first
366	// actually, this is mostly due to the stupid so-called	634	// actually, this is mostly due to the stupid so-called
367	// security workaround added somewhere in 5.8.x.	635	// security workaround added somewhere in 5.8.x
368	// that randomises hash orderings	636	// that randomises hash orderings
369	if (enc->flags & F_CANONICAL)	637	if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
		638	{
		639	int count = hv_iterinit (hv);
		640
		641	if (SvMAGICAL (hv))
370	{	642	{
371	HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode	643	// need to count by iterating. could improve by dynamically building the vector below
		644	// but I don't care for the speed of this special case.
		645	// note also that we will run into undefined behaviour when the two iterations
		646	// do not result in the same count, something I might care for in some later release.
		647
		648	count = 0;
		649	while (hv_iternext (hv))
		650	++count;
		651
		652	hv_iterinit (hv);
		653	}
		654
		655	if (count)
		656	{
372	int fast = 1;	657	int i, fast = 1;
		658	HE *hes_stack [STACK_HES];
		659	HE **hes = hes_stack;
		660
		661	// allocate larger arrays on the heap
		662	if (count > STACK_HES)
		663	{
		664	SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
		665	hes = (HE **)SvPVX (sv);
		666	}
373		667
374	i = 0;	668	i = 0;
375	while ((he = hv_iternext (hv)))	669	while ((he = hv_iternext (hv)))
376	{	670	{
377	hes [i++] = he;	671	hes [i++] = he;
…		…
399		693
400	FREETMPS;	694	FREETMPS;
401	LEAVE;	695	LEAVE;
402	}	696	}
403		697
404	for (i = 0; i < count; ++i)	698	encode_nl (enc); ++enc->indent;
		699
		700	while (count--)
405	{	701	{
406	encode_indent (enc);	702	encode_indent (enc);
		703	he = hes [count];
407	encode_he (enc, hes [i]);	704	encode_hk (enc, he);
		705	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
408		706
409	if (i < count - 1)	707	if (count)
410	encode_comma (enc);	708	encode_comma (enc);
411	}	709	}
412		710
413	encode_nl (enc);	711	encode_nl (enc); --enc->indent; encode_indent (enc);
414	}	712	}
		713	}
415	else	714	else
		715	{
		716	if (hv_iterinit (hv) || SvMAGICAL (hv))
		717	if ((he = hv_iternext (hv)))
416	{	718	{
417	HE *he = hv_iternext (hv);	719	encode_nl (enc); ++enc->indent;
418		720
419	for (;;)	721	for (;;)
420	{	722	{
421	encode_indent (enc);	723	encode_indent (enc);
422	encode_he (enc, he);	724	encode_hk (enc, he);
		725	encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
423		726
424	if (!(he = hv_iternext (hv)))	727	if (!(he = hv_iternext (hv)))
425	break;	728	break;
426		729
427	encode_comma (enc);	730	encode_comma (enc);
428	}	731	}
429		732
430	encode_nl (enc);	733	encode_nl (enc); --enc->indent; encode_indent (enc);
431	}	734	}
432	}	735	}
433		736
434	--enc->indent; encode_indent (enc); encode_ch (enc, '}');	737	encode_ch (enc, '}');
435	}	738	}
436		739
437	// encode objects, arrays and special \0=false and \1=true values.	740	// encode objects, arrays and special \0=false and \1=true values.
438	static void	741	static void
439	encode_rv (enc_t *enc, SV *sv)	742	encode_rv (enc_t *enc, SV *sv)
440	{	743	{
441	svtype svt;	744	svtype svt;
		745	GV *method;
442		746
443	SvGETMAGIC (sv);	747	SvGETMAGIC (sv);
444	svt = SvTYPE (sv);	748	svt = SvTYPE (sv);
445		749
		750	if (expect_false (SvOBJECT (sv)))
		751	{
		752	HV *stash = SvSTASH (sv);
		753
		754	if (stash == bool_stash)
		755	{
		756	if (SvIV (sv))
		757	encode_str (enc, "true", 4, 0);
		758	else
		759	encode_str (enc, "false", 5, 0);
		760	}
		761	else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
		762	{
		763	int count;
		764	dSP;
		765
		766	ENTER; SAVETMPS;
		767	SAVESTACK_POS ();
		768	PUSHMARK (SP);
		769	EXTEND (SP, 2);
		770	// we re-bless the reference to get overload and other niceties right
		771	PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		772	PUSHs (sv_json);
		773
		774	PUTBACK;
		775	count = call_sv ((SV *)GvCV (method), G_ARRAY);
		776	SPAGAIN;
		777
		778	// catch this surprisingly common error
		779	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		780	croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		781
		782	encode_ch (enc, '(');
		783	encode_ch (enc, '"');
		784	encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
		785	encode_ch (enc, '"');
		786	encode_ch (enc, ')');
		787	encode_ch (enc, '[');
		788
		789	while (count)
		790	{
		791	encode_sv (enc, SP[1 - count--]);
		792
		793	if (count)
		794	encode_ch (enc, ',');
		795	}
		796
		797	encode_ch (enc, ']');
		798
		799	FREETMPS; LEAVE;
		800	}
		801	else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
		802	{
		803	dSP;
		804
		805	ENTER; SAVETMPS;
		806	PUSHMARK (SP);
		807	// we re-bless the reference to get overload and other niceties right
		808	XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
		809
		810	// calling with G_SCALAR ensures that we always get a 1 return value
		811	PUTBACK;
		812	call_sv ((SV *)GvCV (method), G_SCALAR);
		813	SPAGAIN;
		814
		815	// catch this surprisingly common error
		816	if (SvROK (TOPs) && SvRV (TOPs) == sv)
		817	croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
		818
		819	sv = POPs;
		820	PUTBACK;
		821
		822	encode_sv (enc, sv);
		823
		824	FREETMPS; LEAVE;
		825	}
		826	else if (enc->json.flags & F_ALLOW_BLESSED)
		827	encode_str (enc, "null", 4, 0);
		828	else
		829	croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
		830	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
		831	}
446	if (svt == SVt_PVHV)	832	else if (svt == SVt_PVHV)
447	encode_hv (enc, (HV *)sv);	833	encode_hv (enc, (HV *)sv);
448	else if (svt == SVt_PVAV)	834	else if (svt == SVt_PVAV)
449	encode_av (enc, (AV *)sv);	835	encode_av (enc, (AV *)sv);
450	else if (svt < SVt_PVAV)	836	else if (svt < SVt_PVAV)
451	{	837	{
452	if (SvNIOK (sv) && SvIV (sv) == 0)	838	int bool_type = ref_bool_type (sv);
		839
		840	if (bool_type == 1)
		841	encode_str (enc, "true", 4, 0);
		842	else if (bool_type == 0)
453	encode_str (enc, "false", 5, 0);	843	encode_str (enc, "false", 5, 0);
454	else if (SvNIOK (sv) && SvIV (sv) == 1)	844	else if (enc->json.flags & F_ALLOW_UNKNOWN)
455	encode_str (enc, "true", 4, 0);	845	encode_str (enc, "null", 4, 0);
456	else	846	else
457	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",	847	croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
458	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	848	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
459	}	849	}
		850	else if (enc->json.flags & F_ALLOW_UNKNOWN)
		851	encode_str (enc, "null", 4, 0);
460	else	852	else
461	croak ("encountered %s, but JSON can only represent references to arrays or hashes",	853	croak ("encountered %s, but JSON can only represent references to arrays or hashes",
462	SvPV_nolen (sv_2mortal (newRV_inc (sv))));	854	SvPV_nolen (sv_2mortal (newRV_inc (sv))));
463	}	855	}
464		856
…		…
475	encode_str (enc, str, len, SvUTF8 (sv));	867	encode_str (enc, str, len, SvUTF8 (sv));
476	encode_ch (enc, '"');	868	encode_ch (enc, '"');
477	}	869	}
478	else if (SvNOKp (sv))	870	else if (SvNOKp (sv))
479	{	871	{
		872	// trust that perl will do the right thing w.r.t. JSON syntax.
480	need (enc, NV_DIG + 32);	873	need (enc, NV_DIG + 32);
481	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);	874	Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
482	enc->cur += strlen (enc->cur);	875	enc->cur += strlen (enc->cur);
483	}	876	}
484	else if (SvIOKp (sv))	877	else if (SvIOKp (sv))
485	{	878	{
		879	// we assume we can always read an IV as a UV and vice versa
		880	// we assume two's complement
		881	// we assume no aliasing issues in the union
		882	if (SvIsUV (sv) ? SvUVX (sv) <= 59000
		883	: SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
		884	{
		885	// optimise the "small number case"
		886	// code will likely be branchless and use only a single multiplication
		887	// works for numbers up to 59074
		888	I32 i = SvIVX (sv);
		889	U32 u;
		890	char digit, nz = 0;
		891
486	need (enc, 64);	892	need (enc, 6);
		893
		894	*enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
		895	u = i < 0 ? -i : i;
		896
		897	// convert to 4.28 fixed-point representation
		898	u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
		899
		900	// now output digit by digit, each time masking out the integer part
		901	// and multiplying by 5 while moving the decimal point one to the right,
		902	// resulting in a net multiplication by 10.
		903	// we always write the digit to memory but conditionally increment
		904	// the pointer, to enable the use of conditional move instructions.
		905	digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
		906	digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
		907	digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
		908	digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
		909	digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
		910	}
		911	else
		912	{
		913	// large integer, use the (rather slow) snprintf way.
		914	need (enc, IVUV_MAXCHARS);
487	enc->cur +=	915	enc->cur +=
488	SvIsUV(sv)	916	SvIsUV(sv)
489	? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))	917	? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
490	: snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));	918	: snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
		919	}
491	}	920	}
492	else if (SvROK (sv))	921	else if (SvROK (sv))
493	encode_rv (enc, SvRV (sv));	922	encode_rv (enc, SvRV (sv));
494	else if (!SvOK (sv))	923	else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
495	encode_str (enc, "null", 4, 0);	924	encode_str (enc, "null", 4, 0);
496	else	925	else
497	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",	926	croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
498	SvPV_nolen (sv), SvFLAGS (sv));	927	SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
499	}	928	}
500		929
501	static SV *	930	static SV *
502	encode_json (SV *scalar, U32 flags)	931	encode_json (SV *scalar, JSON *json)
503	{	932	{
504	enc_t enc;	933	enc_t enc;
505		934
506	if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))	935	if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
507	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");	936	croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
508		937
509	enc.flags = flags;	938	enc.json = *json;
510	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));	939	enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
511	enc.cur = SvPVX (enc.sv);	940	enc.cur = SvPVX (enc.sv);
512	enc.end = SvEND (enc.sv);	941	enc.end = SvEND (enc.sv);
513	enc.indent = 0;	942	enc.indent = 0;
514	enc.maxdepth = DEC_DEPTH (flags);	943	enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
		944	: enc.json.flags & F_LATIN1 ? 0x000100UL
		945	: 0x110000UL;
515		946
516	SvPOK_only (enc.sv);	947	SvPOK_only (enc.sv);
517	encode_sv (&enc, scalar);	948	encode_sv (&enc, scalar);
518		949	encode_nl (&enc);
519	if (!(flags & (F_ASCII | F_UTF8)))
520	SvUTF8_on (enc.sv);
521		950
522	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));	951	SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
523	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings	952	*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
524		953
		954	if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
		955	SvUTF8_on (enc.sv);
		956
525	if (enc.flags & F_SHRINK)	957	if (enc.json.flags & F_SHRINK)
526	shrink (enc.sv);	958	shrink (enc.sv);
527		959
528	return enc.sv;	960	return enc.sv;
529	}	961	}
530		962
…		…
535	typedef struct	967	typedef struct
536	{	968	{
537	char *cur; // current parser pointer	969	char *cur; // current parser pointer
538	char *end; // end of input string	970	char *end; // end of input string
539	const char *err; // parse error, if != 0	971	const char *err; // parse error, if != 0
540	U32 flags; // F_*	972	JSON json;
541	U32 depth; // recursion depth	973	U32 depth; // recursion depth
542	U32 maxdepth; // recursion depth limit	974	U32 maxdepth; // recursion depth limit
543	} dec_t;	975	} dec_t;
544		976
545	static void	977	INLINE void
		978	decode_comment (dec_t *dec)
		979	{
		980	// only '#'-style comments allowed a.t.m.
		981
		982	while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
		983	++dec->cur;
		984	}
		985
		986	INLINE void
546	decode_ws (dec_t *dec)	987	decode_ws (dec_t *dec)
547	{	988	{
548	for (;;)	989	for (;;)
549	{	990	{
550	char ch = *dec->cur;	991	char ch = *dec->cur;
551		992
552	if (ch > 0x20	993	if (ch > 0x20)
		994	{
		995	if (expect_false (ch == '#'))
		996	{
		997	if (dec->json.flags & F_RELAXED)
		998	decode_comment (dec);
		999	else
		1000	break;
		1001	}
		1002	else
		1003	break;
		1004	}
553	|| (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))	1005	else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
554	break;	1006	break; // parse error, but let higher level handle it, gives better error messages
555		1007
556	++dec->cur;	1008	++dec->cur;
557	}	1009	}
558	}	1010	}
559		1011
…		…
563	if (*dec->cur != ch) \	1015	if (*dec->cur != ch) \
564	ERR (# ch " expected"); \	1016	ERR (# ch " expected"); \
565	++dec->cur; \	1017	++dec->cur; \
566	SE	1018	SE
567		1019
568	#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")	1020	#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
569	#define DEC_DEC_DEPTH --dec->depth	1021	#define DEC_DEC_DEPTH --dec->depth
570		1022
571	static SV *decode_sv (dec_t *dec);	1023	static SV *decode_sv (dec_t *dec);
572		1024
573	static signed char decode_hexdigit[256];	1025	static signed char decode_hexdigit[256];
…		…
576	decode_4hex (dec_t *dec)	1028	decode_4hex (dec_t *dec)
577	{	1029	{
578	signed char d1, d2, d3, d4;	1030	signed char d1, d2, d3, d4;
579	unsigned char *cur = (unsigned char *)dec->cur;	1031	unsigned char *cur = (unsigned char *)dec->cur;
580		1032
581	d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");	1033	d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
582	d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");	1034	d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
583	d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");	1035	d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
584	d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");	1036	d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
585		1037
586	dec->cur += 4;	1038	dec->cur += 4;
587		1039
588	return ((UV)d1) << 12	1040	return ((UV)d1) << 12
589	| ((UV)d2) << 8	1041	| ((UV)d2) << 8
…		…
597	static SV *	1049	static SV *
598	decode_str (dec_t *dec)	1050	decode_str (dec_t *dec)
599	{	1051	{
600	SV *sv = 0;	1052	SV *sv = 0;
601	int utf8 = 0;	1053	int utf8 = 0;
		1054	char *dec_cur = dec->cur;
602		1055
603	do	1056	do
604	{	1057	{
605	char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];	1058	char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
606	char *cur = buf;	1059	char *cur = buf;
607		1060
608	do	1061	do
609	{	1062	{
610	unsigned char ch = *(unsigned char *)dec->cur++;	1063	unsigned char ch = *(unsigned char *)dec_cur++;
611		1064
612	if (ch == '"')	1065	if (expect_false (ch == '"'))
613	{	1066	{
614	--dec->cur;	1067	--dec_cur;
615	break;	1068	break;
616	}	1069	}
617	else if (ch == '\\')	1070	else if (expect_false (ch == '\\'))
618	{	1071	{
619	switch (*dec->cur)	1072	switch (*dec_cur)
620	{	1073	{
621	case '\\':	1074	case '\\':
622	case '/':	1075	case '/':
623	case '"': *cur++ = *dec->cur++; break;	1076	case '"': *cur++ = *dec_cur++; break;
624		1077
625	case 'b': ++dec->cur; *cur++ = '\010'; break;	1078	case 'b': ++dec_cur; *cur++ = '\010'; break;
626	case 't': ++dec->cur; *cur++ = '\011'; break;	1079	case 't': ++dec_cur; *cur++ = '\011'; break;
627	case 'n': ++dec->cur; *cur++ = '\012'; break;	1080	case 'n': ++dec_cur; *cur++ = '\012'; break;
628	case 'f': ++dec->cur; *cur++ = '\014'; break;	1081	case 'f': ++dec_cur; *cur++ = '\014'; break;
629	case 'r': ++dec->cur; *cur++ = '\015'; break;	1082	case 'r': ++dec_cur; *cur++ = '\015'; break;
630		1083
631	case 'u':	1084	case 'u':
632	{	1085	{
633	UV lo, hi;	1086	UV lo, hi;
634	++dec->cur;	1087	++dec_cur;
635		1088
		1089	dec->cur = dec_cur;
636	hi = decode_4hex (dec);	1090	hi = decode_4hex (dec);
		1091	dec_cur = dec->cur;
637	if (hi == (UV)-1)	1092	if (hi == (UV)-1)
638	goto fail;	1093	goto fail;
639		1094
640	// possibly a surrogate pair	1095	// possibly a surrogate pair
641	if (hi >= 0xd800)	1096	if (hi >= 0xd800)
642	if (hi < 0xdc00)	1097	if (hi < 0xdc00)
643	{	1098	{
644	if (dec->cur [0] != '\\' || dec->cur [1] != 'u')	1099	if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
645	ERR ("missing low surrogate character in surrogate pair");	1100	ERR ("missing low surrogate character in surrogate pair");
646		1101
647	dec->cur += 2;	1102	dec_cur += 2;
648		1103
		1104	dec->cur = dec_cur;
649	lo = decode_4hex (dec);	1105	lo = decode_4hex (dec);
		1106	dec_cur = dec->cur;
650	if (lo == (UV)-1)	1107	if (lo == (UV)-1)
651	goto fail;	1108	goto fail;
652		1109
653	if (lo < 0xdc00 || lo >= 0xe000)	1110	if (lo < 0xdc00 || lo >= 0xe000)
654	ERR ("surrogate pair expected");	1111	ERR ("surrogate pair expected");
…		…
660		1117
661	if (hi >= 0x80)	1118	if (hi >= 0x80)
662	{	1119	{
663	utf8 = 1;	1120	utf8 = 1;
664		1121
665	cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);	1122	cur = encode_utf8 (cur, hi);
666	}	1123	}
667	else	1124	else
668	*cur++ = hi;	1125	*cur++ = hi;
669	}	1126	}
670	break;	1127	break;
671		1128
672	default:	1129	default:
673	--dec->cur;	1130	--dec_cur;
674	ERR ("illegal backslash escape sequence in string");	1131	ERR ("illegal backslash escape sequence in string");
675	}	1132	}
676	}	1133	}
677	else if (ch >= 0x20 && ch <= 0x7f)	1134	else if (expect_true (ch >= 0x20 && ch < 0x80))
678	*cur++ = ch;	1135	*cur++ = ch;
679	else if (ch >= 0x80)	1136	else if (ch >= 0x80)
680	{	1137	{
681	STRLEN clen;	1138	STRLEN clen;
682	UV uch;
683		1139
684	--dec->cur;	1140	--dec_cur;
685		1141
686	uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);	1142	decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
687	if (clen == (STRLEN)-1)	1143	if (clen == (STRLEN)-1)
688	ERR ("malformed UTF-8 character in JSON string");	1144	ERR ("malformed UTF-8 character in JSON string");
689		1145
690	do	1146	do
691	*cur++ = *dec->cur++;	1147	*cur++ = *dec_cur++;
692	while (--clen);	1148	while (--clen);
693		1149
694	utf8 = 1;	1150	utf8 = 1;
695	}	1151	}
		1152	else if (ch == '\t' && dec->json.flags & F_RELAXED)
		1153	*cur++ = ch;
696	else	1154	else
697	{	1155	{
698	--dec->cur;	1156	--dec_cur;
699		1157
700	if (!ch)	1158	if (!ch)
701	ERR ("unexpected end of string while parsing JSON string");	1159	ERR ("unexpected end of string while parsing JSON string");
702	else	1160	else
703	ERR ("invalid character encountered while parsing JSON string");	1161	ERR ("invalid character encountered while parsing JSON string");
…		…
708	{	1166	{
709	STRLEN len = cur - buf;	1167	STRLEN len = cur - buf;
710		1168
711	if (sv)	1169	if (sv)
712	{	1170	{
713	SvGROW (sv, SvCUR (sv) + len + 1);	1171	STRLEN cur = SvCUR (sv);
		1172
		1173	if (SvLEN (sv) <= cur + len)
		1174	SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		1175
714	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);	1176	memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
715	SvCUR_set (sv, SvCUR (sv) + len);	1177	SvCUR_set (sv, SvCUR (sv) + len);
716	}	1178	}
717	else	1179	else
718	sv = newSVpvn (buf, len);	1180	sv = newSVpvn (buf, len);
719	}	1181	}
720	}	1182	}
721	while (*dec->cur != '"');	1183	while (*dec_cur != '"');
722		1184
723	++dec->cur;	1185	++dec_cur;
724		1186
725	if (sv)	1187	if (sv)
726	{	1188	{
727	SvPOK_only (sv);	1189	SvPOK_only (sv);
728	*SvEND (sv) = 0;	1190	*SvEND (sv) = 0;
…		…
731	SvUTF8_on (sv);	1193	SvUTF8_on (sv);
732	}	1194	}
733	else	1195	else
734	sv = newSVpvn ("", 0);	1196	sv = newSVpvn ("", 0);
735		1197
		1198	dec->cur = dec_cur;
736	return sv;	1199	return sv;
737		1200
738	fail:	1201	fail:
		1202	dec->cur = dec_cur;
739	return 0;	1203	return 0;
740	}	1204	}
741		1205
742	static SV *	1206	static SV *
743	decode_num (dec_t *dec)	1207	decode_num (dec_t *dec)
…		…
801	is_nv = 1;	1265	is_nv = 1;
802	}	1266	}
803		1267
804	if (!is_nv)	1268	if (!is_nv)
805	{	1269	{
806	UV uv;	1270	int len = dec->cur - start;
807	int numtype = grok_number (start, dec->cur - start, &uv);	1271
808	if (numtype & IS_NUMBER_IN_UV)	1272	// special case the rather common 1..5-digit-int case
809	if (numtype & IS_NUMBER_NEG)	1273	if (*start == '-')
		1274	switch (len)
810	{	1275	{
811	if (uv < (UV)IV_MIN)	1276	case 2: return newSViv (-(IV)( start [1] - '0' * 1));
812	return newSViv (-(IV)uv);	1277	case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
		1278	case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
		1279	case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
		1280	case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
813	}	1281	}
		1282	else
		1283	switch (len)
		1284	{
		1285	case 1: return newSViv ( start [0] - '0' * 1);
		1286	case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
		1287	case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
		1288	case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
		1289	case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
		1290	}
		1291
		1292	{
		1293	UV uv;
		1294	int numtype = grok_number (start, len, &uv);
		1295	if (numtype & IS_NUMBER_IN_UV)
		1296	if (numtype & IS_NUMBER_NEG)
		1297	{
		1298	if (uv < (UV)IV_MIN)
		1299	return newSViv (-(IV)uv);
		1300	}
814	else	1301	else
815	return newSVuv (uv);	1302	return newSVuv (uv);
816	}	1303	}
817		1304
		1305	len -= *start == '-' ? 1 : 0;
		1306
		1307	// does not fit into IV or UV, try NV
		1308	if (len <= NV_DIG)
		1309	// fits into NV without loss of precision
		1310	return newSVnv (json_atof (start));
		1311
		1312	// everything else fails, convert it to a string
		1313	return newSVpvn (start, dec->cur - start);
		1314	}
		1315
		1316	// loss of precision here
818	return newSVnv (Atof (start));	1317	return newSVnv (json_atof (start));
819		1318
820	fail:	1319	fail:
821	return 0;	1320	return 0;
822	}	1321	}
823		1322
…		…
847	if (*dec->cur == ']')	1346	if (*dec->cur == ']')
848	{	1347	{
849	++dec->cur;	1348	++dec->cur;
850	break;	1349	break;
851	}	1350	}
852		1351
853	if (*dec->cur != ',')	1352	if (*dec->cur != ',')
854	ERR (", or ] expected while parsing array");	1353	ERR (", or ] expected while parsing array");
855		1354
856	++dec->cur;	1355	++dec->cur;
		1356
		1357	decode_ws (dec);
		1358
		1359	if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
		1360	{
		1361	++dec->cur;
		1362	break;
		1363	}
857	}	1364	}
858		1365
859	DEC_DEC_DEPTH;	1366	DEC_DEC_DEPTH;
860	return newRV_noinc ((SV *)av);	1367	return newRV_noinc ((SV *)av);
861		1368
…		…
866	}	1373	}
867		1374
868	static SV *	1375	static SV *
869	decode_hv (dec_t *dec)	1376	decode_hv (dec_t *dec)
870	{	1377	{
		1378	SV *sv;
871	HV *hv = newHV ();	1379	HV *hv = newHV ();
872		1380
873	DEC_INC_DEPTH;	1381	DEC_INC_DEPTH;
874	decode_ws (dec);	1382	decode_ws (dec);
875		1383
876	if (*dec->cur == '}')	1384	if (*dec->cur == '}')
877	++dec->cur;	1385	++dec->cur;
878	else	1386	else
879	for (;;)	1387	for (;;)
880	{	1388	{
		1389	EXPECT_CH ('"');
		1390
		1391	// heuristic: assume that
		1392	// a) decode_str + hv_store_ent are abysmally slow.
		1393	// b) most hash keys are short, simple ascii text.
		1394	// => try to "fast-match" such strings to avoid
		1395	// the overhead of decode_str + hv_store_ent.
		1396	{
881	SV *key, *value;	1397	SV *value;
		1398	char *p = dec->cur;
		1399	char *e = p + 24; // only try up to 24 bytes
882		1400
883	decode_ws (dec); EXPECT_CH ('"');	1401	for (;;)
884
885	key = decode_str (dec);
886	if (!key)
887	goto fail;
888
889	decode_ws (dec); EXPECT_CH (':');
890
891	value = decode_sv (dec);
892	if (!value)
893	{	1402	{
		1403	// the >= 0x80 is false on most architectures
		1404	if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
		1405	{
		1406	// slow path, back up and use decode_str
		1407	SV *key = decode_str (dec);
		1408	if (!key)
		1409	goto fail;
		1410
		1411	decode_ws (dec); EXPECT_CH (':');
		1412
		1413	decode_ws (dec);
		1414	value = decode_sv (dec);
		1415	if (!value)
		1416	{
		1417	SvREFCNT_dec (key);
		1418	goto fail;
		1419	}
		1420
		1421	hv_store_ent (hv, key, value, 0);
894	SvREFCNT_dec (key);	1422	SvREFCNT_dec (key);
		1423
		1424	break;
		1425	}
		1426	else if (*p == '"')
		1427	{
		1428	// fast path, got a simple key
		1429	char *key = dec->cur;
		1430	int len = p - key;
		1431	dec->cur = p + 1;
		1432
		1433	decode_ws (dec); EXPECT_CH (':');
		1434
		1435	decode_ws (dec);
		1436	value = decode_sv (dec);
		1437	if (!value)
895	goto fail;	1438	goto fail;
		1439
		1440	hv_store (hv, key, len, value, 0);
		1441
		1442	break;
		1443	}
		1444
		1445	++p;
896	}	1446	}
897		1447	}
898	hv_store_ent (hv, key, value, 0);
899	SvREFCNT_dec (key);
900		1448
901	decode_ws (dec);	1449	decode_ws (dec);
902		1450
903	if (*dec->cur == '}')	1451	if (*dec->cur == '}')
904	{	1452	{
…		…
908		1456
909	if (*dec->cur != ',')	1457	if (*dec->cur != ',')
910	ERR (", or } expected while parsing object/hash");	1458	ERR (", or } expected while parsing object/hash");
911		1459
912	++dec->cur;	1460	++dec->cur;
		1461
		1462	decode_ws (dec);
		1463
		1464	if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
		1465	{
		1466	++dec->cur;
		1467	break;
		1468	}
913	}	1469	}
914		1470
915	DEC_DEC_DEPTH;	1471	DEC_DEC_DEPTH;
916	return newRV_noinc ((SV *)hv);	1472	sv = newRV_noinc ((SV *)hv);
		1473
		1474	// check filter callbacks
		1475	if (dec->json.flags & F_HOOK)
		1476	{
		1477	if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
		1478	{
		1479	HE *cb, *he;
		1480
		1481	hv_iterinit (hv);
		1482	he = hv_iternext (hv);
		1483	hv_iterinit (hv);
		1484
		1485	// the next line creates a mortal sv each time it's called.
		1486	// might want to optimise this for common cases.
		1487	cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
		1488
		1489	if (cb)
		1490	{
		1491	dSP;
		1492	int count;
		1493
		1494	ENTER; SAVETMPS;
		1495	SAVESTACK_POS ();
		1496	PUSHMARK (SP);
		1497	XPUSHs (HeVAL (he));
		1498	sv_2mortal (sv);
		1499
		1500	PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
		1501
		1502	if (count == 1)
		1503	{
		1504	sv = newSVsv (POPs);
		1505	FREETMPS; LEAVE;
		1506	return sv;
		1507	}
		1508
		1509	SvREFCNT_inc (sv);
		1510	FREETMPS; LEAVE;
		1511	}
		1512	}
		1513
		1514	if (dec->json.cb_object)
		1515	{
		1516	dSP;
		1517	int count;
		1518
		1519	ENTER; SAVETMPS;
		1520	SAVESTACK_POS ();
		1521	PUSHMARK (SP);
		1522	XPUSHs (sv_2mortal (sv));
		1523
		1524	PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
		1525
		1526	if (count == 1)
		1527	{
		1528	sv = newSVsv (POPs);
		1529	FREETMPS; LEAVE;
		1530	return sv;
		1531	}
		1532
		1533	SvREFCNT_inc (sv);
		1534	FREETMPS; LEAVE;
		1535	}
		1536	}
		1537
		1538	return sv;
917		1539
918	fail:	1540	fail:
919	SvREFCNT_dec (hv);	1541	SvREFCNT_dec (hv);
920	DEC_DEC_DEPTH;	1542	DEC_DEC_DEPTH;
921	return 0;	1543	return 0;
922	}	1544	}
923		1545
924	static SV *	1546	static SV *
		1547	decode_tag (dec_t *dec)
		1548	{
		1549	SV *tag = 0;
		1550	SV *val = 0;
		1551
		1552	if (!(dec->json.flags & F_ALLOW_TAGS))
		1553	ERR ("malformed JSON string, neither array, object, number, string or atom");
		1554
		1555	++dec->cur;
		1556
		1557	decode_ws (dec);
		1558
		1559	tag = decode_sv (dec);
		1560	if (!tag)
		1561	goto fail;
		1562
		1563	if (!SvPOK (tag))
		1564	ERR ("malformed JSON string, (tag) must be a string");
		1565
		1566	decode_ws (dec);
		1567
		1568	if (*dec->cur != ')')
		1569	ERR (") expected after tag");
		1570
		1571	++dec->cur;
		1572
		1573	decode_ws (dec);
		1574
		1575	val = decode_sv (dec);
		1576	if (!val)
		1577	goto fail;
		1578
		1579	if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
		1580	ERR ("malformed JSON string, tag value must be an array");
		1581
		1582	{
		1583	AV *av = (AV *)SvRV (val);
		1584	int i, len = av_len (av) + 1;
		1585	HV *stash = gv_stashsv (tag, 0);
		1586	SV *sv;
		1587
		1588	if (!stash)
		1589	ERR ("cannot decode perl-object (package does not exist)");
		1590
		1591	GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
		1592
		1593	if (!method)
		1594	ERR ("cannot decode perl-object (package does not have a THAW method)");
		1595
		1596	dSP;
		1597
		1598	ENTER; SAVETMPS;
		1599	PUSHMARK (SP);
		1600	EXTEND (SP, len + 2);
		1601	// we re-bless the reference to get overload and other niceties right
		1602	PUSHs (tag);
		1603	PUSHs (sv_json);
		1604
		1605	for (i = 0; i < len; ++i)
		1606	PUSHs (*av_fetch (av, i, 1));
		1607
		1608	PUTBACK;
		1609	call_sv ((SV *)GvCV (method), G_SCALAR);
		1610	SPAGAIN;
		1611
		1612	SvREFCNT_dec (tag);
		1613	SvREFCNT_dec (val);
		1614	sv = SvREFCNT_inc (POPs);
		1615
		1616	PUTBACK;
		1617
		1618	FREETMPS; LEAVE;
		1619
		1620	return sv;
		1621	}
		1622
		1623	fail:
		1624	SvREFCNT_dec (tag);
		1625	SvREFCNT_dec (val);
		1626	return 0;
		1627	}
		1628
		1629	static SV *
925	decode_sv (dec_t *dec)	1630	decode_sv (dec_t *dec)
926	{	1631	{
927	decode_ws (dec);	1632	// the beauty of JSON: you need exactly one character lookahead
		1633	// to parse everything.
928	switch (*dec->cur)	1634	switch (*dec->cur)
929	{	1635	{
930	case '"': ++dec->cur; return decode_str (dec);	1636	case '"': ++dec->cur; return decode_str (dec);
931	case '[': ++dec->cur; return decode_av (dec);	1637	case '[': ++dec->cur; return decode_av (dec);
932	case '{': ++dec->cur; return decode_hv (dec);	1638	case '{': ++dec->cur; return decode_hv (dec);
		1639	case '(': return decode_tag (dec);
933		1640
934	case '-':	1641	case '-':
935	case '0': case '1': case '2': case '3': case '4':	1642	case '0': case '1': case '2': case '3': case '4':
936	case '5': case '6': case '7': case '8': case '9':	1643	case '5': case '6': case '7': case '8': case '9':
937	return decode_num (dec);	1644	return decode_num (dec);
938		1645
939	case 't':	1646	case 't':
940	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))	1647	if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
941	{	1648	{
942	dec->cur += 4;	1649	dec->cur += 4;
		1650	#if JSON_SLOW
		1651	bool_true = get_bool ("Types::Serialiser::true");
		1652	#endif
943	return newSViv (1);	1653	return newSVsv (bool_true);
944	}	1654	}
945	else	1655	else
946	ERR ("'true' expected");	1656	ERR ("'true' expected");
947		1657
948	break;	1658	break;
949		1659
950	case 'f':	1660	case 'f':
951	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))	1661	if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
952	{	1662	{
953	dec->cur += 5;	1663	dec->cur += 5;
		1664	#if JSON_SLOW
		1665	bool_false = get_bool ("Types::Serialiser::false");
		1666	#endif
954	return newSViv (0);	1667	return newSVsv (bool_false);
955	}	1668	}
956	else	1669	else
957	ERR ("'false' expected");	1670	ERR ("'false' expected");
958		1671
959	break;	1672	break;
…		…
968	ERR ("'null' expected");	1681	ERR ("'null' expected");
969		1682
970	break;	1683	break;
971		1684
972	default:	1685	default:
973	ERR ("malformed JSON string, neither array, object, number, string or atom");	1686	ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
974	break;	1687	break;
975	}	1688	}
976		1689
977	fail:	1690	fail:
978	return 0;	1691	return 0;
979	}	1692	}
980		1693
981	static SV *	1694	static SV *
982	decode_json (SV *string, U32 flags)	1695	decode_json (SV *string, JSON *json, STRLEN *offset_return)
983	{	1696	{
984	dec_t dec;	1697	dec_t dec;
985	SV *sv;	1698	SV *sv;
986		1699
		1700	/* work around bugs in 5.10 where manipulating magic values
		1701	* makes perl ignore the magic in subsequent accesses.
		1702	* also make a copy of non-PV values, to get them into a clean
		1703	* state (SvPV should do that, but it's buggy, see below).
		1704	*
		1705	* SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
		1706	* as reported by Reini Urban.
		1707	*/
		1708	/*SvGETMAGIC (string);*/
		1709	if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
		1710	string = sv_2mortal (newSVsv (string));
		1711
987	SvUPGRADE (string, SVt_PV);	1712	SvUPGRADE (string, SVt_PV);
988		1713
989	if (flags & F_UTF8)	1714	/* work around a bug in perl 5.10, which causes SvCUR to fail an
		1715	* assertion with -DDEBUGGING, although SvCUR is documented to
		1716	* return the xpv_cur field which certainly exists after upgrading.
		1717	* according to nicholas clark, calling SvPOK fixes this.
		1718	* But it doesn't fix it, so try another workaround, call SvPV_nolen
		1719	* and hope for the best.
		1720	* Damnit, SvPV_nolen still trips over yet another assertion. This
		1721	* assertion business is seriously broken, try yet another workaround
		1722	* for the broken -DDEBUGGING.
		1723	*/
		1724	{
		1725	#ifdef DEBUGGING
		1726	STRLEN offset = SvOK (string) ? sv_len (string) : 0;
		1727	#else
		1728	STRLEN offset = SvCUR (string);
		1729	#endif
		1730
		1731	if (offset > json->max_size && json->max_size)
		1732	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		1733	(unsigned long)SvCUR (string), (unsigned long)json->max_size);
		1734	}
		1735
		1736	if (DECODE_WANTS_OCTETS (json))
990	sv_utf8_downgrade (string, 0);	1737	sv_utf8_downgrade (string, 0);
991	else	1738	else
992	sv_utf8_upgrade (string);	1739	sv_utf8_upgrade (string);
993		1740
994	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP	1741	SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
995		1742
996	dec.flags = flags;	1743	dec.json = *json;
997	dec.cur = SvPVX (string);	1744	dec.cur = SvPVX (string);
998	dec.end = SvEND (string);	1745	dec.end = SvEND (string);
999	dec.err = 0;	1746	dec.err = 0;
1000	dec.depth = 0;	1747	dec.depth = 0;
1001	dec.maxdepth = DEC_DEPTH (dec.flags);
1002		1748
		1749	if (dec.json.cb_object || dec.json.cb_sk_object)
		1750	dec.json.flags |= F_HOOK;
		1751
1003	*dec.end = 0; // this should basically be a nop, too, but make sure its there	1752	*dec.end = 0; // this should basically be a nop, too, but make sure it's there
		1753
		1754	decode_ws (&dec);
1004	sv = decode_sv (&dec);	1755	sv = decode_sv (&dec);
1005		1756
		1757	if (offset_return)
		1758	*offset_return = dec.cur - SvPVX (string);
		1759	else if (sv)
		1760	{
		1761	// check for trailing garbage
		1762	decode_ws (&dec);
		1763
		1764	if (*dec.cur)
		1765	{
		1766	dec.err = "garbage after JSON object";
		1767	SvREFCNT_dec (sv);
		1768	sv = 0;
		1769	}
		1770	}
		1771
1006	if (!sv)	1772	if (!sv)
1007	{	1773	{
1008	IV offset = dec.flags & F_UTF8
1009	? dec.cur - SvPVX (string)
1010	: utf8_distance (dec.cur, SvPVX (string));
1011	SV *uni = sv_newmortal ();	1774	SV *uni = sv_newmortal ();
1012		1775
1013	// horrible hack to silence warning inside pv_uni_display	1776	// horrible hack to silence warning inside pv_uni_display
1014	COP cop = *PL_curcop;	1777	COP cop = *PL_curcop;
1015	cop.cop_warnings = pWARN_NONE;	1778	cop.cop_warnings = pWARN_NONE;
…		…
1017	SAVEVPTR (PL_curcop);	1780	SAVEVPTR (PL_curcop);
1018	PL_curcop = &cop;	1781	PL_curcop = &cop;
1019	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);	1782	pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1020	LEAVE;	1783	LEAVE;
1021		1784
1022	croak ("%s, at character offset %d [\"%s\"]",	1785	croak ("%s, at character offset %d (before \"%s\")",
1023	dec.err,	1786	dec.err,
1024	(int)offset,	1787	(int)ptr_to_index (string, dec.cur),
1025	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");	1788	dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1026	}	1789	}
1027		1790
1028	sv = sv_2mortal (sv);	1791	sv = sv_2mortal (sv);
1029		1792
1030	if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))	1793	if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1031	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");	1794	croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1032		1795
1033	return sv;	1796	return sv;
		1797	}
		1798
		1799	/////////////////////////////////////////////////////////////////////////////
		1800	// incremental parser
		1801
		1802	static void
		1803	incr_parse (JSON *self)
		1804	{
		1805	const char *p = SvPVX (self->incr_text) + self->incr_pos;
		1806
		1807	// the state machine here is a bit convoluted and could be simplified a lot
		1808	// but this would make it slower, so...
		1809
		1810	for (;;)
		1811	{
		1812	//printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
		1813	switch (self->incr_mode)
		1814	{
		1815	// only used for initial whitespace skipping
		1816	case INCR_M_WS:
		1817	for (;;)
		1818	{
		1819	if (*p > 0x20)
		1820	{
		1821	if (*p == '#')
		1822	{
		1823	self->incr_mode = INCR_M_C0;
		1824	goto incr_m_c;
		1825	}
		1826	else
		1827	{
		1828	self->incr_mode = INCR_M_JSON;
		1829	goto incr_m_json;
		1830	}
		1831	}
		1832	else if (!*p)
		1833	goto interrupt;
		1834
		1835	++p;
		1836	}
		1837
		1838	// skip a single char inside a string (for \\-processing)
		1839	case INCR_M_BS:
		1840	if (!*p)
		1841	goto interrupt;
		1842
		1843	++p;
		1844	self->incr_mode = INCR_M_STR;
		1845	goto incr_m_str;
		1846
		1847	// inside #-style comments
		1848	case INCR_M_C0:
		1849	case INCR_M_C1:
		1850	incr_m_c:
		1851	for (;;)
		1852	{
		1853	if (*p == '\n')
		1854	{
		1855	self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
		1856	break;
		1857	}
		1858	else if (!*p)
		1859	goto interrupt;
		1860
		1861	++p;
		1862	}
		1863
		1864	break;
		1865
		1866	// inside a string
		1867	case INCR_M_STR:
		1868	incr_m_str:
		1869	for (;;)
		1870	{
		1871	if (*p == '"')
		1872	{
		1873	++p;
		1874	self->incr_mode = INCR_M_JSON;
		1875
		1876	if (!self->incr_nest)
		1877	goto interrupt;
		1878
		1879	goto incr_m_json;
		1880	}
		1881	else if (*p == '\\')
		1882	{
		1883	++p; // "virtually" consumes character after \
		1884
		1885	if (!*p) // if at end of string we have to switch modes
		1886	{
		1887	self->incr_mode = INCR_M_BS;
		1888	goto interrupt;
		1889	}
		1890	}
		1891	else if (!*p)
		1892	goto interrupt;
		1893
		1894	++p;
		1895	}
		1896
		1897	// after initial ws, outside string
		1898	case INCR_M_JSON:
		1899	incr_m_json:
		1900	for (;;)
		1901	{
		1902	switch (*p++)
		1903	{
		1904	case 0:
		1905	--p;
		1906	goto interrupt;
		1907
		1908	case 0x09:
		1909	case 0x0a:
		1910	case 0x0d:
		1911	case 0x20:
		1912	if (!self->incr_nest)
		1913	{
		1914	--p; // do not eat the whitespace, let the next round do it
		1915	goto interrupt;
		1916	}
		1917	break;
		1918
		1919	case '"':
		1920	self->incr_mode = INCR_M_STR;
		1921	goto incr_m_str;
		1922
		1923	case '[':
		1924	case '{':
		1925	case '(':
		1926	if (++self->incr_nest > self->max_depth)
		1927	croak (ERR_NESTING_EXCEEDED);
		1928	break;
		1929
		1930	case ']':
		1931	case '}':
		1932	if (--self->incr_nest <= 0)
		1933	goto interrupt;
		1934	break;
		1935
		1936	case ')':
		1937	--self->incr_nest;
		1938	break;
		1939
		1940	case '#':
		1941	self->incr_mode = INCR_M_C1;
		1942	goto incr_m_c;
		1943	}
		1944	}
		1945	}
		1946
		1947	modechange:
		1948	;
		1949	}
		1950
		1951	interrupt:
		1952	self->incr_pos = p - SvPVX (self->incr_text);
		1953	//printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
		1954	//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1034	}	1955	}
1035		1956
1036	/////////////////////////////////////////////////////////////////////////////	1957	/////////////////////////////////////////////////////////////////////////////
1037	// XS interface functions	1958	// XS interface functions
1038		1959
1039	MODULE = JSON::XS PACKAGE = JSON::XS	1960	MODULE = JSON::XS PACKAGE = JSON::XS
1040		1961
1041	BOOT:	1962	BOOT:
1042	{	1963	{
1043	int i;	1964	int i;
1044
1045	memset (decode_hexdigit, 0xff, 256);
1046		1965
1047	for (i = 0; i < 256; ++i)	1966	for (i = 0; i < 256; ++i)
1048	decode_hexdigit [i] =	1967	decode_hexdigit [i] =
1049	i >= '0' && i <= '9' ? i - '0'	1968	i >= '0' && i <= '9' ? i - '0'
1050	: i >= 'a' && i <= 'f' ? i - 'a' + 10	1969	: i >= 'a' && i <= 'f' ? i - 'a' + 10
1051	: i >= 'A' && i <= 'F' ? i - 'A' + 10	1970	: i >= 'A' && i <= 'F' ? i - 'A' + 10
1052	: -1;	1971	: -1;
1053		1972
1054	json_stash = gv_stashpv ("JSON::XS", 1);	1973	json_stash = gv_stashpv ("JSON::XS" , 1);
		1974	bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
		1975	bool_true = get_bool ("Types::Serialiser::true");
		1976	bool_false = get_bool ("Types::Serialiser::false");
		1977
		1978	sv_json = newSVpv ("JSON", 0);
		1979	SvREADONLY_on (sv_json);
		1980
		1981	CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1055	}	1982	}
1056		1983
1057	PROTOTYPES: DISABLE	1984	PROTOTYPES: DISABLE
1058		1985
1059	SV *new (char *dummy)	1986	void CLONE (...)
1060	CODE:	1987	CODE:
1061	RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);	1988	json_stash = 0;
		1989	bool_stash = 0;
		1990
		1991	void new (char *klass)
		1992	PPCODE:
		1993	{
		1994	SV *pv = NEWSV (0, sizeof (JSON));
		1995	SvPOK_only (pv);
		1996	json_init ((JSON *)SvPVX (pv));
		1997	XPUSHs (sv_2mortal (sv_bless (
		1998	newRV_noinc (pv),
		1999	strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
		2000	)));
		2001	}
		2002
		2003	void ascii (JSON *self, int enable = 1)
		2004	ALIAS:
		2005	ascii = F_ASCII
		2006	latin1 = F_LATIN1
		2007	utf8 = F_UTF8
		2008	indent = F_INDENT
		2009	canonical = F_CANONICAL
		2010	space_before = F_SPACE_BEFORE
		2011	space_after = F_SPACE_AFTER
		2012	pretty = F_PRETTY
		2013	allow_nonref = F_ALLOW_NONREF
		2014	shrink = F_SHRINK
		2015	allow_blessed = F_ALLOW_BLESSED
		2016	convert_blessed = F_CONV_BLESSED
		2017	relaxed = F_RELAXED
		2018	allow_unknown = F_ALLOW_UNKNOWN
		2019	allow_tags = F_ALLOW_TAGS
		2020	PPCODE:
		2021	{
		2022	if (enable)
		2023	self->flags |= ix;
		2024	else
		2025	self->flags &= ~ix;
		2026
		2027	XPUSHs (ST (0));
		2028	}
		2029
		2030	void get_ascii (JSON *self)
		2031	ALIAS:
		2032	get_ascii = F_ASCII
		2033	get_latin1 = F_LATIN1
		2034	get_utf8 = F_UTF8
		2035	get_indent = F_INDENT
		2036	get_canonical = F_CANONICAL
		2037	get_space_before = F_SPACE_BEFORE
		2038	get_space_after = F_SPACE_AFTER
		2039	get_allow_nonref = F_ALLOW_NONREF
		2040	get_shrink = F_SHRINK
		2041	get_allow_blessed = F_ALLOW_BLESSED
		2042	get_convert_blessed = F_CONV_BLESSED
		2043	get_relaxed = F_RELAXED
		2044	get_allow_unknown = F_ALLOW_UNKNOWN
		2045	get_allow_tags = F_ALLOW_TAGS
		2046	PPCODE:
		2047	XPUSHs (boolSV (self->flags & ix));
		2048
		2049	void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
		2050	PPCODE:
		2051	self->max_depth = max_depth;
		2052	XPUSHs (ST (0));
		2053
		2054	U32 get_max_depth (JSON *self)
		2055	CODE:
		2056	RETVAL = self->max_depth;
1062	OUTPUT:	2057	OUTPUT:
1063	RETVAL	2058	RETVAL
1064		2059
1065	SV *ascii (SV *self, int enable = 1)	2060	void max_size (JSON *self, U32 max_size = 0)
1066	ALIAS:	2061	PPCODE:
1067	ascii = F_ASCII	2062	self->max_size = max_size;
1068	utf8 = F_UTF8	2063	XPUSHs (ST (0));
1069	indent = F_INDENT	2064
1070	canonical = F_CANONICAL	2065	int get_max_size (JSON *self)
1071	space_before = F_SPACE_BEFORE
1072	space_after = F_SPACE_AFTER
1073	pretty = F_PRETTY
1074	allow_nonref = F_ALLOW_NONREF
1075	shrink = F_SHRINK
1076	CODE:	2066	CODE:
1077	{	2067	RETVAL = self->max_size;
1078	UV *uv = SvJSON (self);
1079	if (enable)
1080	*uv |= ix;
1081	else
1082	*uv &= ~ix;
1083
1084	RETVAL = newSVsv (self);
1085	}
1086	OUTPUT:	2068	OUTPUT:
1087	RETVAL	2069	RETVAL
1088		2070
1089	SV *max_depth (SV *self, UV max_depth = 0x80000000UL)	2071	void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
		2072	PPCODE:
		2073	{
		2074	SvREFCNT_dec (self->cb_object);
		2075	self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
		2076
		2077	XPUSHs (ST (0));
		2078	}
		2079
		2080	void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
		2081	PPCODE:
		2082	{
		2083	if (!self->cb_sk_object)
		2084	self->cb_sk_object = newHV ();
		2085
		2086	if (SvOK (cb))
		2087	hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
		2088	else
		2089	{
		2090	hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
		2091
		2092	if (!HvKEYS (self->cb_sk_object))
		2093	{
		2094	SvREFCNT_dec (self->cb_sk_object);
		2095	self->cb_sk_object = 0;
		2096	}
		2097	}
		2098
		2099	XPUSHs (ST (0));
		2100	}
		2101
		2102	void encode (JSON *self, SV *scalar)
		2103	PPCODE:
		2104	PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
		2105	XPUSHs (scalar);
		2106
		2107	void decode (JSON *self, SV *jsonstr)
		2108	PPCODE:
		2109	PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
		2110	XPUSHs (jsonstr);
		2111
		2112	void decode_prefix (JSON *self, SV *jsonstr)
		2113	PPCODE:
		2114	{
		2115	SV *sv;
		2116	STRLEN offset;
		2117	PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
		2118	EXTEND (SP, 2);
		2119	PUSHs (sv);
		2120	PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
		2121	}
		2122
		2123	void incr_parse (JSON *self, SV *jsonstr = 0)
		2124	PPCODE:
		2125	{
		2126	if (!self->incr_text)
		2127	self->incr_text = newSVpvn ("", 0);
		2128
		2129	/* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
		2130	if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
		2131	if (DECODE_WANTS_OCTETS (self))
		2132	{
		2133	if (self->incr_pos)
		2134	self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
		2135	(U8 *)SvPVX (self->incr_text) + self->incr_pos);
		2136
		2137	sv_utf8_downgrade (self->incr_text, 0);
		2138	}
		2139	else
		2140	{
		2141	sv_utf8_upgrade (self->incr_text);
		2142
		2143	if (self->incr_pos)
		2144	self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
		2145	- (U8 *)SvPVX (self->incr_text);
		2146	}
		2147
		2148	// append data, if any
		2149	if (jsonstr)
		2150	{
		2151	/* make sure both strings have same encoding */
		2152	if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
		2153	if (SvUTF8 (jsonstr))
		2154	sv_utf8_downgrade (jsonstr, 0);
		2155	else
		2156	sv_utf8_upgrade (jsonstr);
		2157
		2158	/* and then just blindly append */
		2159	{
		2160	STRLEN len;
		2161	const char *str = SvPV (jsonstr, len);
		2162	STRLEN cur = SvCUR (self->incr_text);
		2163
		2164	if (SvLEN (self->incr_text) <= cur + len)
		2165	SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
		2166
		2167	Move (str, SvEND (self->incr_text), len, char);
		2168	SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
		2169	*SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
		2170	}
		2171	}
		2172
		2173	if (GIMME_V != G_VOID)
		2174	do
		2175	{
		2176	SV *sv;
		2177	STRLEN offset;
		2178
		2179	if (!INCR_DONE (self))
		2180	{
		2181	incr_parse (self);
		2182
		2183	if (self->incr_pos > self->max_size && self->max_size)
		2184	croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
		2185	(unsigned long)self->incr_pos, (unsigned long)self->max_size);
		2186
		2187	if (!INCR_DONE (self))
		2188	{
		2189	// as an optimisation, do not accumulate white space in the incr buffer
		2190	if (self->incr_mode == INCR_M_WS && self->incr_pos)
		2191	{
		2192	self->incr_pos = 0;
		2193	SvCUR_set (self->incr_text, 0);
		2194	}
		2195
		2196	break;
		2197	}
		2198	}
		2199
		2200	PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
		2201	XPUSHs (sv);
		2202
		2203	self->incr_pos -= offset;
		2204	self->incr_nest = 0;
		2205	self->incr_mode = 0;
		2206
		2207	sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
		2208	}
		2209	while (GIMME_V == G_ARRAY);
		2210	}
		2211
		2212	SV *incr_text (JSON *self)
		2213	ATTRS: lvalue
1090	CODE:	2214	CODE:
1091	{	2215	{
1092	UV *uv = SvJSON (self);	2216	if (self->incr_pos)
1093	UV log2 = 0;	2217	croak ("incr_text can not be called when the incremental parser already started parsing");
1094		2218
1095	if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;	2219	RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1096
1097	while ((1UL << log2) < max_depth)
1098	++log2;
1099
1100	*uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1101
1102	RETVAL = newSVsv (self);
1103	}	2220	}
1104	OUTPUT:	2221	OUTPUT:
1105	RETVAL	2222	RETVAL
1106		2223
		2224	void incr_skip (JSON *self)
		2225	CODE:
		2226	{
		2227	if (self->incr_pos)
		2228	{
		2229	sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
		2230	self->incr_pos = 0;
		2231	self->incr_nest = 0;
		2232	self->incr_mode = 0;
		2233	}
		2234	}
		2235
		2236	void incr_reset (JSON *self)
		2237	CODE:
		2238	{
		2239	SvREFCNT_dec (self->incr_text);
		2240	self->incr_text = 0;
		2241	self->incr_pos = 0;
		2242	self->incr_nest = 0;
		2243	self->incr_mode = 0;
		2244	}
		2245
		2246	void DESTROY (JSON *self)
		2247	CODE:
		2248	SvREFCNT_dec (self->cb_sk_object);
		2249	SvREFCNT_dec (self->cb_object);
		2250	SvREFCNT_dec (self->incr_text);
		2251
		2252	PROTOTYPES: ENABLE
		2253
1107	void encode (SV *self, SV *scalar)	2254	void encode_json (SV *scalar)
1108	PPCODE:	2255	PPCODE:
1109	XPUSHs (encode_json (scalar, *SvJSON (self)));	2256	{
		2257	JSON json;
		2258	json_init (&json);
		2259	json.flags |= F_UTF8;
		2260	PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
		2261	XPUSHs (scalar);
		2262	}
1110		2263
1111	void decode (SV *self, SV *jsonstr)	2264	void decode_json (SV *jsonstr)
1112	PPCODE:	2265	PPCODE:
1113	XPUSHs (decode_json (jsonstr, *SvJSON (self)));	2266	{
		2267	JSON json;
		2268	json_init (&json);
		2269	json.flags |= F_UTF8;
		2270	PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
		2271	XPUSHs (jsonstr);
		2272	}
1114		2273
1115	PROTOTYPES: ENABLE
1116
1117	void to_json (SV *scalar)
1118	ALIAS:
1119	objToJson = 0
1120	PPCODE:
1121	XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
1122
1123	void from_json (SV *jsonstr)
1124	ALIAS:
1125	jsonToObj = 0
1126	PPCODE:
1127	XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8));
1128

Diff Legend

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