ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/JSON-XS/XS.xs
(Generate patch)

Comparing JSON-XS/XS.xs (file contents):
Revision 1.5 by root, Thu Mar 22 23:24:18 2007 UTC vs.
Revision 1.76 by root, Thu Mar 20 00:56:37 2008 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>
9#include <limits.h>
10#include <float.h>
8 11
12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif
15
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.
18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13
20#endif
21
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
23
9#define F_ASCII 0x00000001 24#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002 26#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004 27#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008 28#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010 29#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020 30#define F_SPACE_AFTER 0x00000040UL
15#define F_JSON_RPC 0x00000040
16#define F_ALLOW_NONREF 0x00000080 31#define F_ALLOW_NONREF 0x00000100UL
32#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL
36
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
42
43#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
17 45
18#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 46#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
19#define F_DEFAULT 0 47#define F_DEFAULT (9UL << S_MAXDEPTH)
20 48
21#define INIT_SIZE 32 // initial scalar size to be allocated 49#define INIT_SIZE 32 // initial scalar size to be allocated
50#define INDENT_STEP 3 // spaces per indentation level
51
52#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
22 53
23#define SB do { 54#define SB do {
24#define SE } while (0) 55#define SE } while (0)
25 56
26static HV *json_stash; 57#if __GNUC__ >= 3
58# define expect(expr,value) __builtin_expect ((expr), (value))
59# define INLINE static inline
60#else
61# define expect(expr,value) (expr)
62# define INLINE static
63#endif
64
65#define expect_false(expr) expect ((expr) != 0, 0)
66#define expect_true(expr) expect ((expr) != 0, 1)
67
68#define IN_RANGE_INC(type,val,beg,end) \
69 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71
72#ifdef USE_ITHREADS
73# define JSON_SLOW 1
74# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75#else
76# define JSON_SLOW 0
77# define JSON_STASH json_stash
78#endif
79
80static HV *json_stash, *json_boolean_stash; // JSON::XS::
81static SV *json_true, *json_false;
82
83typedef struct {
84 U32 flags;
85 SV *cb_object;
86 HV *cb_sk_object;
87} JSON;
88
89/////////////////////////////////////////////////////////////////////////////
90// utility functions
91
92INLINE void
93shrink (SV *sv)
94{
95 sv_utf8_downgrade (sv, 1);
96 if (SvLEN (sv) > SvCUR (sv) + 1)
97 {
98#ifdef SvPV_shrink_to_cur
99 SvPV_shrink_to_cur (sv);
100#elif defined (SvPV_renew)
101 SvPV_renew (sv, SvCUR (sv) + 1);
102#endif
103 }
104}
105
106// decode an utf-8 character and return it, or (UV)-1 in
107// case of an error.
108// we special-case "safe" characters from U+80 .. U+7FF,
109// but use the very good perl function to parse anything else.
110// note that we never call this function for a ascii codepoints
111INLINE UV
112decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
113{
114 if (expect_true (len >= 2
115 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
116 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
117 {
118 *clen = 2;
119 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
120 }
121 else
122 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
123}
124
125// likewise for encoding, also never called for ascii codepoints
126// this function takes advantage of this fact, although current gccs
127// seem to optimise the check for >= 0x80 away anyways
128INLINE unsigned char *
129encode_utf8 (unsigned char *s, UV ch)
130{
131 if (expect_false (ch < 0x000080))
132 *s++ = ch;
133 else if (expect_true (ch < 0x000800))
134 *s++ = 0xc0 | ( ch >> 6),
135 *s++ = 0x80 | ( ch & 0x3f);
136 else if ( ch < 0x010000)
137 *s++ = 0xe0 | ( ch >> 12),
138 *s++ = 0x80 | ((ch >> 6) & 0x3f),
139 *s++ = 0x80 | ( ch & 0x3f);
140 else if ( ch < 0x110000)
141 *s++ = 0xf0 | ( ch >> 18),
142 *s++ = 0x80 | ((ch >> 12) & 0x3f),
143 *s++ = 0x80 | ((ch >> 6) & 0x3f),
144 *s++ = 0x80 | ( ch & 0x3f);
145
146 return s;
147}
148
149/////////////////////////////////////////////////////////////////////////////
150// encoder
27 151
28// structure used for encoding JSON 152// structure used for encoding JSON
29typedef struct 153typedef struct
30{ 154{
31 char *cur; 155 char *cur; // SvPVX (sv) + current output position
32 STRLEN len; // SvLEN (sv)
33 char *end; // SvEND (sv) 156 char *end; // SvEND (sv)
34 SV *sv; 157 SV *sv; // result scalar
35 UV flags; 158 JSON json;
36 int max_recurse; 159 U32 indent; // indentation level
37 int indent; 160 U32 maxdepth; // max. indentation/recursion level
161 UV limit; // escape character values >= this value when encoding
38} enc_t; 162} enc_t;
39 163
40// structure used for decoding JSON 164INLINE void
41typedef struct
42{
43 char *cur;
44 char *end;
45 const char *err;
46 UV flags;
47} dec_t;
48
49static UV *
50SvJSON (SV *sv)
51{
52 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
53 croak ("object is not of type JSON::XS");
54
55 return &SvUVX (SvRV (sv));
56}
57
58/////////////////////////////////////////////////////////////////////////////
59
60static void
61need (enc_t *enc, STRLEN len) 165need (enc_t *enc, STRLEN len)
62{ 166{
63 if (enc->cur + len >= enc->end) 167 if (expect_false (enc->cur + len >= enc->end))
64 { 168 {
65 STRLEN cur = enc->cur - SvPVX (enc->sv); 169 STRLEN cur = enc->cur - SvPVX (enc->sv);
66 SvGROW (enc->sv, cur + len + 1); 170 SvGROW (enc->sv, cur + len + 1);
67 enc->cur = SvPVX (enc->sv) + cur; 171 enc->cur = SvPVX (enc->sv) + cur;
68 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 172 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
69 } 173 }
70} 174}
71 175
72static void 176INLINE void
73encode_ch (enc_t *enc, char ch) 177encode_ch (enc_t *enc, char ch)
74{ 178{
75 need (enc, 1); 179 need (enc, 1);
76 *enc->cur++ = ch; 180 *enc->cur++ = ch;
77} 181}
85 189
86 while (str < end) 190 while (str < end)
87 { 191 {
88 unsigned char ch = *(unsigned char *)str; 192 unsigned char ch = *(unsigned char *)str;
89 193
90 if (ch == '"') 194 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
91 { 195 {
196 if (expect_false (ch == '"')) // but with slow exceptions
197 {
92 need (enc, len += 1); 198 need (enc, len += 1);
93 *enc->cur++ = '\\'; 199 *enc->cur++ = '\\';
94 *enc->cur++ = '"'; 200 *enc->cur++ = '"';
95 ++str;
96 } 201 }
97 else if (ch == '\\') 202 else if (expect_false (ch == '\\'))
98 { 203 {
99 need (enc, len += 1); 204 need (enc, len += 1);
100 *enc->cur++ = '\\'; 205 *enc->cur++ = '\\';
101 *enc->cur++ = '\\'; 206 *enc->cur++ = '\\';
102 ++str;
103 } 207 }
104 else if (ch >= 0x20 && ch < 0x80) // most common case 208 else
105 {
106 *enc->cur++ = ch; 209 *enc->cur++ = ch;
107 ++str; 210
108 }
109 else if (ch == '\015')
110 {
111 need (enc, len += 1);
112 *enc->cur++ = '\\';
113 *enc->cur++ = 'r';
114 ++str;
115 }
116 else if (ch == '\012')
117 {
118 need (enc, len += 1);
119 *enc->cur++ = '\\';
120 *enc->cur++ = 'n';
121 ++str; 211 ++str;
122 } 212 }
123 else 213 else
124 { 214 {
125 STRLEN clen; 215 switch (ch)
126 UV uch;
127
128 if (is_utf8)
129 { 216 {
130 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); 217 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
131 if (clen == (STRLEN)-1) 218 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
132 croak ("malformed UTF-8 character in string, cannot convert to JSON"); 219 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
133 } 220 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
134 else 221 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
135 {
136 uch = ch;
137 clen = 1;
138 }
139 222
140 if (uch < 0x80 || enc->flags & F_ASCII) 223 default:
141 {
142 if (uch > 0xFFFFUL)
143 { 224 {
225 STRLEN clen;
226 UV uch;
227
228 if (is_utf8)
229 {
230 uch = decode_utf8 (str, end - str, &clen);
231 if (clen == (STRLEN)-1)
232 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
233 }
234 else
235 {
236 uch = ch;
237 clen = 1;
238 }
239
240 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
241 {
242 if (uch >= 0x10000UL)
243 {
244 if (uch >= 0x110000UL)
245 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
246
144 need (enc, len += 11); 247 need (enc, len += 11);
145 sprintf (enc->cur, "\\u%04x\\u%04x", 248 sprintf (enc->cur, "\\u%04x\\u%04x",
146 (uch - 0x10000) / 0x400 + 0xD800, 249 (int)((uch - 0x10000) / 0x400 + 0xD800),
147 (uch - 0x10000) % 0x400 + 0xDC00); 250 (int)((uch - 0x10000) % 0x400 + 0xDC00));
148 enc->cur += 12; 251 enc->cur += 12;
252 }
253 else
254 {
255 static char hexdigit [16] = "0123456789abcdef";
256 need (enc, len += 5);
257 *enc->cur++ = '\\';
258 *enc->cur++ = 'u';
259 *enc->cur++ = hexdigit [ uch >> 12 ];
260 *enc->cur++ = hexdigit [(uch >> 8) & 15];
261 *enc->cur++ = hexdigit [(uch >> 4) & 15];
262 *enc->cur++ = hexdigit [(uch >> 0) & 15];
263 }
264
265 str += clen;
266 }
267 else if (enc->json.flags & F_LATIN1)
268 {
269 *enc->cur++ = uch;
270 str += clen;
271 }
272 else if (is_utf8)
273 {
274 need (enc, len += clen);
275 do
276 {
277 *enc->cur++ = *str++;
278 }
279 while (--clen);
280 }
281 else
282 {
283 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
284 enc->cur = encode_utf8 (enc->cur, uch);
285 ++str;
286 }
149 } 287 }
150 else
151 {
152 static char hexdigit [16] = "0123456789abcdef";
153 need (enc, len += 5);
154 *enc->cur++ = '\\';
155 *enc->cur++ = 'u';
156 *enc->cur++ = hexdigit [ uch >> 12 ];
157 *enc->cur++ = hexdigit [(uch >> 8) & 15];
158 *enc->cur++ = hexdigit [(uch >> 4) & 15];
159 *enc->cur++ = hexdigit [(uch >> 0) & 15];
160 }
161
162 str += clen;
163 }
164 else if (is_utf8)
165 {
166 need (enc, len += clen);
167 do
168 {
169 *enc->cur++ = *str++;
170 }
171 while (--clen);
172 }
173 else
174 {
175 need (enc, 10); // never more than 11 bytes needed
176 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
177 ++str;
178 } 288 }
179 } 289 }
180 290
181 --len; 291 --len;
182 } 292 }
183} 293}
184 294
185#define INDENT SB \ 295INLINE void
296encode_indent (enc_t *enc)
297{
186 if (enc->flags & F_INDENT) \ 298 if (enc->json.flags & F_INDENT)
187 { \ 299 {
188 int i_; \ 300 int spaces = enc->indent * INDENT_STEP;
189 need (enc, enc->indent); \ 301
190 for (i_ = enc->indent * 3; i_--; )\ 302 need (enc, spaces);
303 memset (enc->cur, ' ', spaces);
304 enc->cur += spaces;
305 }
306}
307
308INLINE void
309encode_space (enc_t *enc)
310{
311 need (enc, 1);
312 encode_ch (enc, ' ');
313}
314
315INLINE void
316encode_nl (enc_t *enc)
317{
318 if (enc->json.flags & F_INDENT)
319 {
320 need (enc, 1);
191 encode_ch (enc, ' '); \ 321 encode_ch (enc, '\n');
192 } \ 322 }
193 SE 323}
194 324
195#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE 325INLINE void
196#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 326encode_comma (enc_t *enc)
197#define COMMA SB \ 327{
198 encode_ch (enc, ','); \ 328 encode_ch (enc, ',');
329
199 if (enc->flags & F_INDENT) \ 330 if (enc->json.flags & F_INDENT)
200 NL; \ 331 encode_nl (enc);
201 else if (enc->flags & F_SPACE_AFTER) \ 332 else if (enc->json.flags & F_SPACE_AFTER)
202 SPACE; \ 333 encode_space (enc);
203 SE 334}
204 335
205static void encode_sv (enc_t *enc, SV *sv); 336static void encode_sv (enc_t *enc, SV *sv);
206 337
207static void 338static void
208encode_av (enc_t *enc, AV *av) 339encode_av (enc_t *enc, AV *av)
209{ 340{
210 int i, len = av_len (av); 341 int i, len = av_len (av);
211 342
343 if (enc->indent >= enc->maxdepth)
344 croak ("data structure too deep (hit recursion limit)");
345
212 encode_ch (enc, '['); NL; 346 encode_ch (enc, '[');
213 ++enc->indent; 347
348 if (len >= 0)
349 {
350 encode_nl (enc); ++enc->indent;
214 351
215 for (i = 0; i <= len; ++i) 352 for (i = 0; i <= len; ++i)
216 { 353 {
217 INDENT; 354 SV **svp = av_fetch (av, i, 0);
218 encode_sv (enc, *av_fetch (av, i, 0));
219 355
356 encode_indent (enc);
357
358 if (svp)
359 encode_sv (enc, *svp);
360 else
361 encode_str (enc, "null", 4, 0);
362
220 if (i < len) 363 if (i < len)
221 COMMA; 364 encode_comma (enc);
222 } 365 }
223 366
224 NL; 367 encode_nl (enc); --enc->indent; encode_indent (enc);
225 368 }
226 --enc->indent; 369
227 INDENT; encode_ch (enc, ']'); 370 encode_ch (enc, ']');
228} 371}
229 372
230static void 373static void
231encode_he (enc_t *enc, HE *he) 374encode_hk (enc_t *enc, HE *he)
232{ 375{
233 encode_ch (enc, '"'); 376 encode_ch (enc, '"');
234 377
235 if (HeKLEN (he) == HEf_SVKEY) 378 if (HeKLEN (he) == HEf_SVKEY)
236 { 379 {
246 else 389 else
247 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 390 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
248 391
249 encode_ch (enc, '"'); 392 encode_ch (enc, '"');
250 393
251 if (enc->flags & F_SPACE_BEFORE) SPACE; 394 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
252 encode_ch (enc, ':'); 395 encode_ch (enc, ':');
253 if (enc->flags & F_SPACE_AFTER ) SPACE; 396 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
254 encode_sv (enc, HeVAL (he));
255} 397}
256 398
257// compare hash entries, used when all keys are bytestrings 399// compare hash entries, used when all keys are bytestrings
258static int 400static int
259he_cmp_fast (const void *a_, const void *b_) 401he_cmp_fast (const void *a_, const void *b_)
264 HE *b = *(HE **)b_; 406 HE *b = *(HE **)b_;
265 407
266 STRLEN la = HeKLEN (a); 408 STRLEN la = HeKLEN (a);
267 STRLEN lb = HeKLEN (b); 409 STRLEN lb = HeKLEN (b);
268 410
269 if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 411 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
270 cmp = la < lb ? -1 : la == lb ? 0 : 1; 412 cmp = lb - la;
271 413
272 return cmp; 414 return cmp;
273} 415}
274 416
275// compare hash entries, used when some keys are sv's or utf-x 417// compare hash entries, used when some keys are sv's or utf-x
276static int 418static int
277he_cmp_slow (const void *a, const void *b) 419he_cmp_slow (const void *a, const void *b)
278{ 420{
279 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 421 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
280} 422}
281 423
282static void 424static void
283encode_hv (enc_t *enc, HV *hv) 425encode_hv (enc_t *enc, HV *hv)
284{ 426{
427 HE *he;
285 int count, i; 428 int count;
286 429
287 encode_ch (enc, '{'); NL; ++enc->indent; 430 if (enc->indent >= enc->maxdepth)
431 croak ("data structure too deep (hit recursion limit)");
288 432
289 if ((count = hv_iterinit (hv))) 433 encode_ch (enc, '{');
290 { 434
291 // for canonical output we have to sort by keys first 435 // for canonical output we have to sort by keys first
292 // actually, this is mostly due to the stupid so-called 436 // actually, this is mostly due to the stupid so-called
293 // security workaround added somewhere in 5.8.x. 437 // security workaround added somewhere in 5.8.x.
294 // that randomises hash orderings 438 // that randomises hash orderings
295 if (enc->flags & F_CANONICAL) 439 if (enc->json.flags & F_CANONICAL)
440 {
441 int count = hv_iterinit (hv);
442
443 if (SvMAGICAL (hv))
296 { 444 {
297 HE *he, *hes [count]; 445 // need to count by iterating. could improve by dynamically building the vector below
446 // but I don't care for the speed of this special case.
447 // note also that we will run into undefined behaviour when the two iterations
448 // do not result in the same count, something I might care for in some later release.
449
450 count = 0;
451 while (hv_iternext (hv))
452 ++count;
453
454 hv_iterinit (hv);
455 }
456
457 if (count)
458 {
298 int fast = 1; 459 int i, fast = 1;
460#if defined(__BORLANDC__) || defined(_MSC_VER)
461 HE **hes = _alloca (count * sizeof (HE));
462#else
463 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
464#endif
299 465
300 i = 0; 466 i = 0;
301 while ((he = hv_iternext (hv))) 467 while ((he = hv_iternext (hv)))
302 { 468 {
303 hes [i++] = he; 469 hes [i++] = he;
309 475
310 if (fast) 476 if (fast)
311 qsort (hes, count, sizeof (HE *), he_cmp_fast); 477 qsort (hes, count, sizeof (HE *), he_cmp_fast);
312 else 478 else
313 { 479 {
314 // hack to disable "use bytes" 480 // hack to forcefully disable "use bytes"
315 COP *oldcop = PL_curcop, cop; 481 COP cop = *PL_curcop;
316 cop.op_private = 0; 482 cop.op_private = 0;
483
484 ENTER;
485 SAVETMPS;
486
487 SAVEVPTR (PL_curcop);
317 PL_curcop = &cop; 488 PL_curcop = &cop;
318 489
319 SAVETMPS;
320 qsort (hes, count, sizeof (HE *), he_cmp_slow); 490 qsort (hes, count, sizeof (HE *), he_cmp_slow);
491
321 FREETMPS; 492 FREETMPS;
322 493 LEAVE;
323 PL_curcop = oldcop;
324 } 494 }
325 495
326 for (i = 0; i < count; ++i) 496 encode_nl (enc); ++enc->indent;
497
498 while (count--)
327 { 499 {
328 INDENT; 500 encode_indent (enc);
501 he = hes [count];
329 encode_he (enc, hes [i]); 502 encode_hk (enc, he);
503 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
330 504
331 if (i < count - 1) 505 if (count)
332 COMMA; 506 encode_comma (enc);
333 } 507 }
334 508
509 encode_nl (enc); --enc->indent; encode_indent (enc);
510 }
511 }
512 else
513 {
514 if (hv_iterinit (hv) || SvMAGICAL (hv))
515 if ((he = hv_iternext (hv)))
335 NL; 516 {
517 encode_nl (enc); ++enc->indent;
518
519 for (;;)
520 {
521 encode_indent (enc);
522 encode_hk (enc, he);
523 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
524
525 if (!(he = hv_iternext (hv)))
526 break;
527
528 encode_comma (enc);
529 }
530
531 encode_nl (enc); --enc->indent; encode_indent (enc);
532 }
533 }
534
535 encode_ch (enc, '}');
536}
537
538// encode objects, arrays and special \0=false and \1=true values.
539static void
540encode_rv (enc_t *enc, SV *sv)
541{
542 svtype svt;
543
544 SvGETMAGIC (sv);
545 svt = SvTYPE (sv);
546
547 if (expect_false (SvOBJECT (sv)))
548 {
549 HV *stash = !JSON_SLOW || json_boolean_stash
550 ? json_boolean_stash
551 : gv_stashpv ("JSON::XS::Boolean", 1);
552
553 if (SvSTASH (sv) == stash)
554 {
555 if (SvIV (sv))
556 encode_str (enc, "true", 4, 0);
557 else
558 encode_str (enc, "false", 5, 0);
336 } 559 }
337 else 560 else
338 { 561 {
339 SV *sv; 562#if 0
340 HE *he = hv_iternext (hv); 563 if (0 && sv_derived_from (rv, "JSON::Literal"))
341
342 for (;;)
343 { 564 {
344 INDENT; 565 // not yet
345 encode_he (enc, he);
346
347 if (!(he = hv_iternext (hv)))
348 break;
349
350 COMMA;
351 } 566 }
352 567#endif
568 if (enc->json.flags & F_CONV_BLESSED)
353 NL; 569 {
570 // we re-bless the reference to get overload and other niceties right
571 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
572
573 if (to_json)
574 {
575 dSP;
576
577 ENTER; SAVETMPS; PUSHMARK (SP);
578 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
579
580 // calling with G_SCALAR ensures that we always get a 1 return value
581 PUTBACK;
582 call_sv ((SV *)GvCV (to_json), G_SCALAR);
583 SPAGAIN;
584
585 // catch this surprisingly common error
586 if (SvROK (TOPs) && SvRV (TOPs) == sv)
587 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
588
589 sv = POPs;
590 PUTBACK;
591
592 encode_sv (enc, sv);
593
594 FREETMPS; LEAVE;
595 }
596 else if (enc->json.flags & F_ALLOW_BLESSED)
597 encode_str (enc, "null", 4, 0);
598 else
599 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
600 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
601 }
602 else if (enc->json.flags & F_ALLOW_BLESSED)
603 encode_str (enc, "null", 4, 0);
604 else
605 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
606 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
354 } 607 }
355 } 608 }
609 else if (svt == SVt_PVHV)
610 encode_hv (enc, (HV *)sv);
611 else if (svt == SVt_PVAV)
612 encode_av (enc, (AV *)sv);
613 else if (svt < SVt_PVAV)
614 {
615 STRLEN len = 0;
616 char *pv = svt ? SvPV (sv, len) : 0;
356 617
357 --enc->indent; INDENT; encode_ch (enc, '}'); 618 if (len == 1 && *pv == '1')
619 encode_str (enc, "true", 4, 0);
620 else if (len == 1 && *pv == '0')
621 encode_str (enc, "false", 5, 0);
622 else
623 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
624 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625 }
626 else
627 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
628 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
358} 629}
359 630
360static void 631static void
361encode_sv (enc_t *enc, SV *sv) 632encode_sv (enc_t *enc, SV *sv)
362{ 633{
370 encode_str (enc, str, len, SvUTF8 (sv)); 641 encode_str (enc, str, len, SvUTF8 (sv));
371 encode_ch (enc, '"'); 642 encode_ch (enc, '"');
372 } 643 }
373 else if (SvNOKp (sv)) 644 else if (SvNOKp (sv))
374 { 645 {
646 // trust that perl will do the right thing w.r.t. JSON syntax.
375 need (enc, NV_DIG + 32); 647 need (enc, NV_DIG + 32);
376 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 648 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
377 enc->cur += strlen (enc->cur); 649 enc->cur += strlen (enc->cur);
378 } 650 }
379 else if (SvIOKp (sv)) 651 else if (SvIOKp (sv))
380 { 652 {
653 // we assume we can always read an IV as a UV and vice versa
654 // we assume two's complement
655 // we assume no aliasing issues in the union
656 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
657 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
658 {
659 // optimise the "small number case"
660 // code will likely be branchless and use only a single multiplication
661 // works for numbers up to 59074
662 I32 i = SvIVX (sv);
663 U32 u;
664 char digit, nz = 0;
665
381 need (enc, 64); 666 need (enc, 6);
667
668 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
669 u = i < 0 ? -i : i;
670
671 // convert to 4.28 fixed-point representation
672 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
673
674 // now output digit by digit, each time masking out the integer part
675 // and multiplying by 5 while moving the decimal point one to the right,
676 // resulting in a net multiplication by 10.
677 // we always write the digit to memory but conditionally increment
678 // the pointer, to enable the use of conditional move instructions.
679 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
680 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
681 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
682 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
683 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
684 }
685 else
686 {
687 // large integer, use the (rather slow) snprintf way.
688 need (enc, IVUV_MAXCHARS);
382 enc->cur += 689 enc->cur +=
383 SvIsUV(sv) 690 SvIsUV(sv)
384 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 691 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
385 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 692 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693 }
386 } 694 }
387 else if (SvROK (sv)) 695 else if (SvROK (sv))
388 { 696 encode_rv (enc, SvRV (sv));
389 if (!--enc->max_recurse)
390 croak ("data structure too deep (hit recursion limit)");
391
392 sv = SvRV (sv);
393
394 switch (SvTYPE (sv))
395 {
396 case SVt_PVAV: encode_av (enc, (AV *)sv); break;
397 case SVt_PVHV: encode_hv (enc, (HV *)sv); break;
398
399 default:
400 croak ("JSON can only represent references to arrays or hashes");
401 }
402 }
403 else if (!SvOK (sv)) 697 else if (!SvOK (sv))
404 encode_str (enc, "null", 4, 0); 698 encode_str (enc, "null", 4, 0);
405 else 699 else
406 croak ("encountered perl type that JSON cannot handle"); 700 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
701 SvPV_nolen (sv), SvFLAGS (sv));
407} 702}
408 703
409static SV * 704static SV *
410encode_json (SV *scalar, UV flags) 705encode_json (SV *scalar, JSON *json)
411{ 706{
412 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
413 croak ("hash- or arraref required (not a simple scalar, use allow_nonref to allow this)");
414
415 enc_t enc; 707 enc_t enc;
416 enc.flags = flags; 708
709 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
710 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
711
712 enc.json = *json;
417 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 713 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
418 enc.cur = SvPVX (enc.sv); 714 enc.cur = SvPVX (enc.sv);
419 enc.end = SvEND (enc.sv); 715 enc.end = SvEND (enc.sv);
420 enc.max_recurse = 0;
421 enc.indent = 0; 716 enc.indent = 0;
717 enc.maxdepth = DEC_DEPTH (enc.json.flags);
718 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719 : enc.json.flags & F_LATIN1 ? 0x000100UL
720 : 0x110000UL;
422 721
423 SvPOK_only (enc.sv); 722 SvPOK_only (enc.sv);
424 encode_sv (&enc, scalar); 723 encode_sv (&enc, scalar);
425 724
725 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
726 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
727
426 if (!(flags & (F_ASCII | F_UTF8))) 728 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
427 SvUTF8_on (enc.sv); 729 SvUTF8_on (enc.sv);
428 730
429 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 731 if (enc.json.flags & F_SHRINK)
732 shrink (enc.sv);
733
430 return enc.sv; 734 return enc.sv;
431} 735}
432 736
433///////////////////////////////////////////////////////////////////////////// 737/////////////////////////////////////////////////////////////////////////////
738// decoder
434 739
435#define WS \ 740// structure used for decoding JSON
741typedef struct
742{
743 char *cur; // current parser pointer
744 char *end; // end of input string
745 const char *err; // parse error, if != 0
746 JSON json;
747 U32 depth; // recursion depth
748 U32 maxdepth; // recursion depth limit
749} dec_t;
750
751INLINE void
752decode_comment (dec_t *dec)
753{
754 // only '#'-style comments allowed a.t.m.
755
756 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
757 ++dec->cur;
758}
759
760INLINE void
761decode_ws (dec_t *dec)
762{
436 for (;;) \ 763 for (;;)
437 { \ 764 {
438 char ch = *dec->cur; \ 765 char ch = *dec->cur;
766
439 if (ch > 0x20 \ 767 if (ch > 0x20)
768 {
769 if (expect_false (ch == '#'))
770 {
771 if (dec->json.flags & F_RELAXED)
772 decode_comment (dec);
773 else
774 break;
775 }
776 else
777 break;
778 }
440 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ 779 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
441 break; \ 780 break; // parse error, but let higher level handle it, gives better error messages
781
442 ++dec->cur; \ 782 ++dec->cur;
443 } 783 }
784}
444 785
445#define ERR(reason) SB dec->err = reason; goto fail; SE 786#define ERR(reason) SB dec->err = reason; goto fail; SE
787
446#define EXPECT_CH(ch) SB \ 788#define EXPECT_CH(ch) SB \
447 if (*dec->cur != ch) \ 789 if (*dec->cur != ch) \
448 ERR (# ch " expected"); \ 790 ERR (# ch " expected"); \
449 ++dec->cur; \ 791 ++dec->cur; \
450 SE 792 SE
451 793
794#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
795#define DEC_DEC_DEPTH --dec->depth
796
452static SV *decode_sv (dec_t *dec); 797static SV *decode_sv (dec_t *dec);
453 798
454static signed char decode_hexdigit[256]; 799static signed char decode_hexdigit[256];
455 800
456static UV 801static UV
457decode_4hex (dec_t *dec) 802decode_4hex (dec_t *dec)
458{ 803{
459 signed char d1, d2, d3, d4; 804 signed char d1, d2, d3, d4;
805 unsigned char *cur = (unsigned char *)dec->cur;
460 806
461 d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]]; 807 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
462 if (d1 < 0) ERR ("four hexadecimal digits expected"); 808 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
463 d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]]; 809 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
464 if (d2 < 0) ERR ("four hexadecimal digits expected"); 810 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
465 d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
466 if (d3 < 0) ERR ("four hexadecimal digits expected");
467 d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
468 if (d4 < 0) ERR ("four hexadecimal digits expected");
469 811
470 dec->cur += 4; 812 dec->cur += 4;
471 813
472 return ((UV)d1) << 12 814 return ((UV)d1) << 12
473 | ((UV)d2) << 8 815 | ((UV)d2) << 8
476 818
477fail: 819fail:
478 return (UV)-1; 820 return (UV)-1;
479} 821}
480 822
481#define APPEND_GROW(n) SB \
482 if (cur + (n) >= end) \
483 { \
484 STRLEN ofs = cur - SvPVX (sv); \
485 SvGROW (sv, ofs + (n) + 1); \
486 cur = SvPVX (sv) + ofs; \
487 end = SvEND (sv); \
488 } \
489 SE
490
491#define APPEND_CH(ch) SB \
492 APPEND_GROW (1); \
493 *cur++ = (ch); \
494 SE
495
496static SV * 823static SV *
497decode_str (dec_t *dec) 824decode_str (dec_t *dec)
498{ 825{
499 SV *sv = NEWSV (0,2); 826 SV *sv = 0;
500 int utf8 = 0; 827 int utf8 = 0;
501 char *cur = SvPVX (sv); 828 char *dec_cur = dec->cur;
502 char *end = SvEND (sv);
503 829
504 for (;;) 830 do
505 { 831 {
506 unsigned char ch = *(unsigned char *)dec->cur; 832 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
833 char *cur = buf;
507 834
508 if (ch == '"') 835 do
509 break;
510 else if (ch == '\\')
511 { 836 {
512 switch (*++dec->cur) 837 unsigned char ch = *(unsigned char *)dec_cur++;
838
839 if (expect_false (ch == '"'))
513 { 840 {
514 case '\\': 841 --dec_cur;
515 case '/': 842 break;
516 case '"': APPEND_CH (*dec->cur++); break; 843 }
517 844 else if (expect_false (ch == '\\'))
518 case 'b': APPEND_CH ('\010'); ++dec->cur; break; 845 {
519 case 't': APPEND_CH ('\011'); ++dec->cur; break; 846 switch (*dec_cur)
520 case 'n': APPEND_CH ('\012'); ++dec->cur; break;
521 case 'f': APPEND_CH ('\014'); ++dec->cur; break;
522 case 'r': APPEND_CH ('\015'); ++dec->cur; break;
523
524 case 'u':
525 { 847 {
526 UV lo, hi; 848 case '\\':
527 ++dec->cur; 849 case '/':
850 case '"': *cur++ = *dec_cur++; break;
528 851
529 hi = decode_4hex (dec); 852 case 'b': ++dec_cur; *cur++ = '\010'; break;
530 if (hi == (UV)-1) 853 case 't': ++dec_cur; *cur++ = '\011'; break;
531 goto fail; 854 case 'n': ++dec_cur; *cur++ = '\012'; break;
855 case 'f': ++dec_cur; *cur++ = '\014'; break;
856 case 'r': ++dec_cur; *cur++ = '\015'; break;
532 857
533 // possibly a surrogate pair 858 case 'u':
534 if (hi >= 0xd800 && hi < 0xdc00)
535 { 859 {
536 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 860 UV lo, hi;
537 ERR ("missing low surrogate character in surrogate pair"); 861 ++dec_cur;
538 862
539 dec->cur += 2; 863 dec->cur = dec_cur;
540
541 lo = decode_4hex (dec); 864 hi = decode_4hex (dec);
865 dec_cur = dec->cur;
542 if (lo == (UV)-1) 866 if (hi == (UV)-1)
543 goto fail; 867 goto fail;
544 868
869 // possibly a surrogate pair
870 if (hi >= 0xd800)
871 if (hi < 0xdc00)
872 {
873 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
874 ERR ("missing low surrogate character in surrogate pair");
875
876 dec_cur += 2;
877
878 dec->cur = dec_cur;
879 lo = decode_4hex (dec);
880 dec_cur = dec->cur;
881 if (lo == (UV)-1)
882 goto fail;
883
545 if (lo < 0xdc00 || lo >= 0xe000) 884 if (lo < 0xdc00 || lo >= 0xe000)
546 ERR ("surrogate pair expected"); 885 ERR ("surrogate pair expected");
547 886
548 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; 887 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
888 }
889 else if (hi < 0xe000)
890 ERR ("missing high surrogate character in surrogate pair");
891
892 if (hi >= 0x80)
893 {
894 utf8 = 1;
895
896 cur = encode_utf8 (cur, hi);
897 }
898 else
899 *cur++ = hi;
549 } 900 }
550 else if (hi >= 0xdc00 && hi < 0xe000)
551 ERR ("missing high surrogate character in surrogate pair");
552
553 if (hi >= 0x80)
554 { 901 break;
555 utf8 = 1;
556 902
557 APPEND_GROW (4); // at most 4 bytes for 21 bits
558 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
559 }
560 else 903 default:
561 APPEND_CH (hi); 904 --dec_cur;
905 ERR ("illegal backslash escape sequence in string");
562 } 906 }
563 break; 907 }
908 else if (expect_true (ch >= 0x20 && ch < 0x80))
909 *cur++ = ch;
910 else if (ch >= 0x80)
911 {
912 STRLEN clen;
913 UV uch;
564 914
565 default:
566 --dec->cur; 915 --dec_cur;
567 ERR ("illegal backslash escape sequence in string"); 916
917 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
918 if (clen == (STRLEN)-1)
919 ERR ("malformed UTF-8 character in JSON string");
920
921 do
922 *cur++ = *dec_cur++;
923 while (--clen);
924
925 utf8 = 1;
926 }
927 else
928 {
929 --dec_cur;
930
931 if (!ch)
932 ERR ("unexpected end of string while parsing JSON string");
933 else
934 ERR ("invalid character encountered while parsing JSON string");
568 } 935 }
569 } 936 }
570 else if (ch >= 0x20 && ch <= 0x7f) 937 while (cur < buf + SHORT_STRING_LEN);
571 APPEND_CH (*dec->cur++); 938
572 else if (ch >= 0x80)
573 { 939 {
574 STRLEN clen; 940 STRLEN len = cur - buf;
575 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
576 if (clen == (STRLEN)-1)
577 ERR ("malformed UTF-8 character in string, cannot convert to JSON");
578 941
579 APPEND_GROW (clen); 942 if (sv)
580 do
581 { 943 {
582 *cur++ = *dec->cur++; 944 SvGROW (sv, SvCUR (sv) + len + 1);
945 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
946 SvCUR_set (sv, SvCUR (sv) + len);
583 } 947 }
584 while (--clen);
585
586 utf8 = 1;
587 }
588 else if (dec->cur == dec->end)
589 ERR ("unexpected end of string while parsing json string");
590 else 948 else
591 ERR ("invalid character encountered"); 949 sv = newSVpvn (buf, len);
592 } 950 }
951 }
952 while (*dec_cur != '"');
593 953
594 ++dec->cur; 954 ++dec_cur;
595 955
596 SvCUR_set (sv, cur - SvPVX (sv)); 956 if (sv)
597 957 {
598 SvPOK_only (sv); 958 SvPOK_only (sv);
599 *SvEND (sv) = 0; 959 *SvEND (sv) = 0;
600 960
601 if (utf8) 961 if (utf8)
602 SvUTF8_on (sv); 962 SvUTF8_on (sv);
963 }
964 else
965 sv = newSVpvn ("", 0);
603 966
967 dec->cur = dec_cur;
604 return sv; 968 return sv;
605 969
606fail: 970fail:
607 SvREFCNT_dec (sv); 971 dec->cur = dec_cur;
608 return 0; 972 return 0;
609} 973}
610 974
611static SV * 975static SV *
612decode_num (dec_t *dec) 976decode_num (dec_t *dec)
670 is_nv = 1; 1034 is_nv = 1;
671 } 1035 }
672 1036
673 if (!is_nv) 1037 if (!is_nv)
674 { 1038 {
675 UV uv; 1039 int len = dec->cur - start;
676 int numtype = grok_number (start, dec->cur - start, &uv); 1040
677 if (numtype & IS_NUMBER_IN_UV) 1041 // special case the rather common 1..5-digit-int case
678 if (numtype & IS_NUMBER_NEG) 1042 if (*start == '-')
1043 switch (len)
679 { 1044 {
680 if (uv < (UV)IV_MIN) 1045 case 2: return newSViv (-( start [1] - '0' * 1));
681 return newSViv (-(IV)uv); 1046 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
1047 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1048 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1049 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
682 } 1050 }
1051 else
1052 switch (len)
1053 {
1054 case 1: return newSViv ( start [0] - '0' * 1);
1055 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1056 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1057 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1058 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1059 }
1060
1061 {
1062 UV uv;
1063 int numtype = grok_number (start, len, &uv);
1064 if (numtype & IS_NUMBER_IN_UV)
1065 if (numtype & IS_NUMBER_NEG)
1066 {
1067 if (uv < (UV)IV_MIN)
1068 return newSViv (-(IV)uv);
1069 }
683 else 1070 else
684 return newSVuv (uv); 1071 return newSVuv (uv);
685 } 1072 }
686 1073
1074 len -= *start == '-' ? 1 : 0;
1075
1076 // does not fit into IV or UV, try NV
1077 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1078 #if defined (LDBL_DIG)
1079 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1080 #endif
1081 )
1082 // fits into NV without loss of precision
1083 return newSVnv (Atof (start));
1084
1085 // everything else fails, convert it to a string
1086 return newSVpvn (start, dec->cur - start);
1087 }
1088
1089 // loss of precision here
687 return newSVnv (Atof (start)); 1090 return newSVnv (Atof (start));
688 1091
689fail: 1092fail:
690 return 0; 1093 return 0;
691} 1094}
693static SV * 1096static SV *
694decode_av (dec_t *dec) 1097decode_av (dec_t *dec)
695{ 1098{
696 AV *av = newAV (); 1099 AV *av = newAV ();
697 1100
698 WS; 1101 DEC_INC_DEPTH;
1102 decode_ws (dec);
1103
699 if (*dec->cur == ']') 1104 if (*dec->cur == ']')
700 ++dec->cur; 1105 ++dec->cur;
701 else 1106 else
702 for (;;) 1107 for (;;)
703 { 1108 {
707 if (!value) 1112 if (!value)
708 goto fail; 1113 goto fail;
709 1114
710 av_push (av, value); 1115 av_push (av, value);
711 1116
712 WS; 1117 decode_ws (dec);
713 1118
714 if (*dec->cur == ']') 1119 if (*dec->cur == ']')
715 { 1120 {
716 ++dec->cur; 1121 ++dec->cur;
717 break; 1122 break;
719 1124
720 if (*dec->cur != ',') 1125 if (*dec->cur != ',')
721 ERR (", or ] expected while parsing array"); 1126 ERR (", or ] expected while parsing array");
722 1127
723 ++dec->cur; 1128 ++dec->cur;
1129
1130 decode_ws (dec);
1131
1132 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1133 {
1134 ++dec->cur;
1135 break;
1136 }
724 } 1137 }
725 1138
1139 DEC_DEC_DEPTH;
726 return newRV_noinc ((SV *)av); 1140 return newRV_noinc ((SV *)av);
727 1141
728fail: 1142fail:
729 SvREFCNT_dec (av); 1143 SvREFCNT_dec (av);
1144 DEC_DEC_DEPTH;
730 return 0; 1145 return 0;
731} 1146}
732 1147
733static SV * 1148static SV *
734decode_hv (dec_t *dec) 1149decode_hv (dec_t *dec)
735{ 1150{
1151 SV *sv;
736 HV *hv = newHV (); 1152 HV *hv = newHV ();
737 1153
738 WS; 1154 DEC_INC_DEPTH;
1155 decode_ws (dec);
1156
739 if (*dec->cur == '}') 1157 if (*dec->cur == '}')
740 ++dec->cur; 1158 ++dec->cur;
741 else 1159 else
742 for (;;) 1160 for (;;)
743 { 1161 {
744 SV *key, *value;
745
746 WS; EXPECT_CH ('"'); 1162 EXPECT_CH ('"');
747 1163
748 key = decode_str (dec); 1164 // heuristic: assume that
749 if (!key) 1165 // a) decode_str + hv_store_ent are abysmally slow.
750 goto fail; 1166 // b) most hash keys are short, simple ascii text.
1167 // => try to "fast-match" such strings to avoid
1168 // the overhead of decode_str + hv_store_ent.
1169 {
1170 SV *value;
1171 char *p = dec->cur;
1172 char *e = p + 24; // only try up to 24 bytes
751 1173
752 WS; EXPECT_CH (':'); 1174 for (;;)
753
754 value = decode_sv (dec);
755 if (!value)
756 { 1175 {
1176 // the >= 0x80 is true on most architectures
1177 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1178 {
1179 // slow path, back up and use decode_str
1180 SV *key = decode_str (dec);
1181 if (!key)
1182 goto fail;
1183
1184 decode_ws (dec); EXPECT_CH (':');
1185
1186 decode_ws (dec);
1187 value = decode_sv (dec);
1188 if (!value)
1189 {
1190 SvREFCNT_dec (key);
1191 goto fail;
1192 }
1193
1194 hv_store_ent (hv, key, value, 0);
757 SvREFCNT_dec (key); 1195 SvREFCNT_dec (key);
1196
1197 break;
1198 }
1199 else if (*p == '"')
1200 {
1201 // fast path, got a simple key
1202 char *key = dec->cur;
1203 int len = p - key;
1204 dec->cur = p + 1;
1205
1206 decode_ws (dec); EXPECT_CH (':');
1207
1208 decode_ws (dec);
1209 value = decode_sv (dec);
1210 if (!value)
758 goto fail; 1211 goto fail;
1212
1213 hv_store (hv, key, len, value, 0);
1214
1215 break;
1216 }
1217
1218 ++p;
759 } 1219 }
760
761 //TODO: optimise
762 hv_store_ent (hv, key, value, 0);
763
764 WS; 1220 }
1221
1222 decode_ws (dec);
765 1223
766 if (*dec->cur == '}') 1224 if (*dec->cur == '}')
767 { 1225 {
768 ++dec->cur; 1226 ++dec->cur;
769 break; 1227 break;
771 1229
772 if (*dec->cur != ',') 1230 if (*dec->cur != ',')
773 ERR (", or } expected while parsing object/hash"); 1231 ERR (", or } expected while parsing object/hash");
774 1232
775 ++dec->cur; 1233 ++dec->cur;
1234
1235 decode_ws (dec);
1236
1237 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1238 {
1239 ++dec->cur;
1240 break;
1241 }
776 } 1242 }
777 1243
1244 DEC_DEC_DEPTH;
778 return newRV_noinc ((SV *)hv); 1245 sv = newRV_noinc ((SV *)hv);
1246
1247 // check filter callbacks
1248 if (dec->json.flags & F_HOOK)
1249 {
1250 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1251 {
1252 HE *cb, *he;
1253
1254 hv_iterinit (hv);
1255 he = hv_iternext (hv);
1256 hv_iterinit (hv);
1257
1258 // the next line creates a mortal sv each time its called.
1259 // might want to optimise this for common cases.
1260 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1261
1262 if (cb)
1263 {
1264 dSP;
1265 int count;
1266
1267 ENTER; SAVETMPS; PUSHMARK (SP);
1268 XPUSHs (HeVAL (he));
1269
1270 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1271
1272 if (count == 1)
1273 {
1274 sv = newSVsv (POPs);
1275 FREETMPS; LEAVE;
1276 return sv;
1277 }
1278
1279 FREETMPS; LEAVE;
1280 }
1281 }
1282
1283 if (dec->json.cb_object)
1284 {
1285 dSP;
1286 int count;
1287
1288 ENTER; SAVETMPS; PUSHMARK (SP);
1289 XPUSHs (sv_2mortal (sv));
1290
1291 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1292
1293 if (count == 1)
1294 {
1295 sv = newSVsv (POPs);
1296 FREETMPS; LEAVE;
1297 return sv;
1298 }
1299
1300 SvREFCNT_inc (sv);
1301 FREETMPS; LEAVE;
1302 }
1303 }
1304
1305 return sv;
779 1306
780fail: 1307fail:
781 SvREFCNT_dec (hv); 1308 SvREFCNT_dec (hv);
1309 DEC_DEC_DEPTH;
782 return 0; 1310 return 0;
783} 1311}
784 1312
785static SV * 1313static SV *
786decode_sv (dec_t *dec) 1314decode_sv (dec_t *dec)
787{ 1315{
788 WS; 1316 // the beauty of JSON: you need exactly one character lookahead
1317 // to parse everything.
789 switch (*dec->cur) 1318 switch (*dec->cur)
790 { 1319 {
791 case '"': ++dec->cur; return decode_str (dec); 1320 case '"': ++dec->cur; return decode_str (dec);
792 case '[': ++dec->cur; return decode_av (dec); 1321 case '[': ++dec->cur; return decode_av (dec);
793 case '{': ++dec->cur; return decode_hv (dec); 1322 case '{': ++dec->cur; return decode_hv (dec);
794 1323
795 case '-': 1324 case '-':
796 case '0': case '1': case '2': case '3': case '4': 1325 case '0': case '1': case '2': case '3': case '4':
797 case '5': case '6': case '7': case '8': case '9': 1326 case '5': case '6': case '7': case '8': case '9':
798 return decode_num (dec); 1327 return decode_num (dec);
799 1328
800 case 't': 1329 case 't':
801 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1330 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
802 { 1331 {
803 dec->cur += 4; 1332 dec->cur += 4;
804 return newSViv (1); 1333#if JSON_SLOW
1334 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true);
1335#endif
1336 return SvREFCNT_inc (json_true);
805 } 1337 }
806 else 1338 else
807 ERR ("'true' expected"); 1339 ERR ("'true' expected");
808 1340
809 break; 1341 break;
810 1342
811 case 'f': 1343 case 'f':
812 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1344 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
813 { 1345 {
814 dec->cur += 5; 1346 dec->cur += 5;
815 return newSViv (0); 1347#if JSON_SLOW
1348 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1349#endif
1350 return SvREFCNT_inc (json_false);
816 } 1351 }
817 else 1352 else
818 ERR ("'false' expected"); 1353 ERR ("'false' expected");
819 1354
820 break; 1355 break;
829 ERR ("'null' expected"); 1364 ERR ("'null' expected");
830 1365
831 break; 1366 break;
832 1367
833 default: 1368 default:
834 ERR ("malformed json string"); 1369 ERR ("malformed JSON string, neither array, object, number, string or atom");
835 break; 1370 break;
836 } 1371 }
837 1372
838fail: 1373fail:
839 return 0; 1374 return 0;
840} 1375}
841 1376
842static SV * 1377static SV *
843decode_json (SV *string, UV flags) 1378decode_json (SV *string, JSON *json, UV *offset_return)
844{ 1379{
1380 dec_t dec;
1381 UV offset;
845 SV *sv; 1382 SV *sv;
846 1383
1384 SvGETMAGIC (string);
1385 SvUPGRADE (string, SVt_PV);
1386
1387 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1388 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1389 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1390
847 if (flags & F_UTF8) 1391 if (json->flags & F_UTF8)
848 sv_utf8_downgrade (string, 0); 1392 sv_utf8_downgrade (string, 0);
849 else 1393 else
850 sv_utf8_upgrade (string); 1394 sv_utf8_upgrade (string);
851 1395
852 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1396 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
853 1397
854 dec_t dec; 1398 dec.json = *json;
855 dec.flags = flags;
856 dec.cur = SvPVX (string); 1399 dec.cur = SvPVX (string);
857 dec.end = SvEND (string); 1400 dec.end = SvEND (string);
858 dec.err = 0; 1401 dec.err = 0;
1402 dec.depth = 0;
1403 dec.maxdepth = DEC_DEPTH (dec.json.flags);
859 1404
1405 if (dec.json.cb_object || dec.json.cb_sk_object)
1406 dec.json.flags |= F_HOOK;
1407
1408 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1409
1410 decode_ws (&dec);
860 sv = decode_sv (&dec); 1411 sv = decode_sv (&dec);
861 1412
1413 if (!(offset_return || !sv))
1414 {
1415 // check for trailing garbage
1416 decode_ws (&dec);
1417
1418 if (*dec.cur)
1419 {
1420 dec.err = "garbage after JSON object";
1421 SvREFCNT_dec (sv);
1422 sv = 0;
1423 }
1424 }
1425
1426 if (offset_return || !sv)
1427 {
1428 offset = dec.json.flags & F_UTF8
1429 ? dec.cur - SvPVX (string)
1430 : utf8_distance (dec.cur, SvPVX (string));
1431
1432 if (offset_return)
1433 *offset_return = offset;
1434 }
1435
862 if (!sv) 1436 if (!sv)
863 { 1437 {
864 IV offset = utf8_distance (dec.cur, SvPVX (string));
865 SV *uni = sv_newmortal (); 1438 SV *uni = sv_newmortal ();
1439
866 // horrible hack to silence warning inside pv_uni_display 1440 // horrible hack to silence warning inside pv_uni_display
867 COP cop; 1441 COP cop = *PL_curcop;
868 memset (&cop, 0, sizeof (cop));
869 cop.cop_warnings = pWARN_NONE; 1442 cop.cop_warnings = pWARN_NONE;
1443 ENTER;
870 SAVEVPTR (PL_curcop); 1444 SAVEVPTR (PL_curcop);
871 PL_curcop = &cop; 1445 PL_curcop = &cop;
872
873 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1446 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1447 LEAVE;
1448
874 croak ("%s, at character offset %d (%s)", 1449 croak ("%s, at character offset %d [\"%s\"]",
875 dec.err, 1450 dec.err,
876 (int)offset, 1451 (int)offset,
877 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1452 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
878 } 1453 }
879 1454
880 sv = sv_2mortal (sv); 1455 sv = sv_2mortal (sv);
881 1456
882 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1457 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
883 croak ("JSON object or array expected (but number, string, true, false or null found, use allow_nonref to allow this)"); 1458 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
884 1459
885 return sv; 1460 return sv;
886} 1461}
887 1462
1463/////////////////////////////////////////////////////////////////////////////
1464// XS interface functions
1465
888MODULE = JSON::XS PACKAGE = JSON::XS 1466MODULE = JSON::XS PACKAGE = JSON::XS
889 1467
890BOOT: 1468BOOT:
891{ 1469{
892 int i; 1470 int i;
893 1471
894 memset (decode_hexdigit, 0xff, 256);
895 for (i = 10; i--; ) 1472 for (i = 0; i < 256; ++i)
896 decode_hexdigit ['0' + i] = i; 1473 decode_hexdigit [i] =
1474 i >= '0' && i <= '9' ? i - '0'
1475 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1476 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1477 : -1;
897 1478
898 for (i = 7; i--; )
899 {
900 decode_hexdigit ['a' + i] = 10 + i;
901 decode_hexdigit ['A' + i] = 10 + i;
902 }
903
904 json_stash = gv_stashpv ("JSON::XS", 1); 1479 json_stash = gv_stashpv ("JSON::XS" , 1);
1480 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481
1482 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1483 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
905} 1484}
906 1485
907PROTOTYPES: DISABLE 1486PROTOTYPES: DISABLE
908 1487
909SV *new (char *dummy) 1488void CLONE (...)
910 CODE: 1489 CODE:
911 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1490 json_stash = 0;
1491 json_boolean_stash = 0;
1492
1493void new (char *klass)
1494 PPCODE:
1495{
1496 SV *pv = NEWSV (0, sizeof (JSON));
1497 SvPOK_only (pv);
1498 Zero (SvPVX (pv), 1, JSON);
1499 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500 XPUSHs (sv_2mortal (sv_bless (
1501 newRV_noinc (pv),
1502 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503 )));
1504}
1505
1506void ascii (JSON *self, int enable = 1)
1507 ALIAS:
1508 ascii = F_ASCII
1509 latin1 = F_LATIN1
1510 utf8 = F_UTF8
1511 indent = F_INDENT
1512 canonical = F_CANONICAL
1513 space_before = F_SPACE_BEFORE
1514 space_after = F_SPACE_AFTER
1515 pretty = F_PRETTY
1516 allow_nonref = F_ALLOW_NONREF
1517 shrink = F_SHRINK
1518 allow_blessed = F_ALLOW_BLESSED
1519 convert_blessed = F_CONV_BLESSED
1520 relaxed = F_RELAXED
1521 PPCODE:
1522{
1523 if (enable)
1524 self->flags |= ix;
1525 else
1526 self->flags &= ~ix;
1527
1528 XPUSHs (ST (0));
1529}
1530
1531void get_ascii (JSON *self)
1532 ALIAS:
1533 get_ascii = F_ASCII
1534 get_latin1 = F_LATIN1
1535 get_utf8 = F_UTF8
1536 get_indent = F_INDENT
1537 get_canonical = F_CANONICAL
1538 get_space_before = F_SPACE_BEFORE
1539 get_space_after = F_SPACE_AFTER
1540 get_allow_nonref = F_ALLOW_NONREF
1541 get_shrink = F_SHRINK
1542 get_allow_blessed = F_ALLOW_BLESSED
1543 get_convert_blessed = F_CONV_BLESSED
1544 get_relaxed = F_RELAXED
1545 PPCODE:
1546 XPUSHs (boolSV (self->flags & ix));
1547
1548void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1549 PPCODE:
1550{
1551 UV log2 = 0;
1552
1553 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1554
1555 while ((1UL << log2) < max_depth)
1556 ++log2;
1557
1558 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1559
1560 XPUSHs (ST (0));
1561}
1562
1563U32 get_max_depth (JSON *self)
1564 CODE:
1565 RETVAL = DEC_DEPTH (self->flags);
912 OUTPUT: 1566 OUTPUT:
913 RETVAL 1567 RETVAL
914 1568
915SV *ascii (SV *self, int enable) 1569void max_size (JSON *self, UV max_size = 0)
916 ALIAS: 1570 PPCODE:
917 ascii = F_ASCII 1571{
918 utf8 = F_UTF8 1572 UV log2 = 0;
919 indent = F_INDENT 1573
920 canonical = F_CANONICAL 1574 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
921 space_before = F_SPACE_BEFORE 1575 if (max_size == 1) max_size = 2;
922 space_after = F_SPACE_AFTER 1576
923 json_rpc = F_JSON_RPC 1577 while ((1UL << log2) < max_size)
924 pretty = F_PRETTY 1578 ++log2;
925 allow_nonref = F_ALLOW_NONREF 1579
1580 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1581
1582 XPUSHs (ST (0));
1583}
1584
1585int get_max_size (JSON *self)
926 CODE: 1586 CODE:
927{ 1587 RETVAL = DEC_SIZE (self->flags);
928 UV *uv = SvJSON (self);
929 if (enable)
930 *uv |= ix;
931 else
932 *uv &= ~ix;
933
934 RETVAL = newSVsv (self);
935}
936 OUTPUT: 1588 OUTPUT:
937 RETVAL 1589 RETVAL
938 1590
939void encode (SV *self, SV *scalar) 1591void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
940 PPCODE: 1592 PPCODE:
941 XPUSHs (encode_json (scalar, *SvJSON (self))); 1593{
1594 SvREFCNT_dec (self->cb_object);
1595 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
942 1596
943void decode (SV *self, SV *jsonstr) 1597 XPUSHs (ST (0));
1598}
1599
1600void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
944 PPCODE: 1601 PPCODE:
1602{
1603 if (!self->cb_sk_object)
1604 self->cb_sk_object = newHV ();
1605
1606 if (SvOK (cb))
1607 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1608 else
1609 {
1610 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1611
1612 if (!HvKEYS (self->cb_sk_object))
1613 {
1614 SvREFCNT_dec (self->cb_sk_object);
1615 self->cb_sk_object = 0;
1616 }
1617 }
1618
1619 XPUSHs (ST (0));
1620}
1621
1622void encode (JSON *self, SV *scalar)
1623 PPCODE:
1624 XPUSHs (encode_json (scalar, self));
1625
1626void decode (JSON *self, SV *jsonstr)
1627 PPCODE:
945 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1628 XPUSHs (decode_json (jsonstr, self, 0));
1629
1630void decode_prefix (JSON *self, SV *jsonstr)
1631 PPCODE:
1632{
1633 UV offset;
1634 EXTEND (SP, 2);
1635 PUSHs (decode_json (jsonstr, self, &offset));
1636 PUSHs (sv_2mortal (newSVuv (offset)));
1637}
1638
1639void DESTROY (JSON *self)
1640 CODE:
1641 SvREFCNT_dec (self->cb_sk_object);
1642 SvREFCNT_dec (self->cb_object);
946 1643
947PROTOTYPES: ENABLE 1644PROTOTYPES: ENABLE
948 1645
949void to_json (SV *scalar) 1646void encode_json (SV *scalar)
1647 ALIAS:
1648 to_json_ = 0
1649 encode_json = F_UTF8
950 PPCODE: 1650 PPCODE:
1651{
1652 JSON json = { F_DEFAULT | ix };
951 XPUSHs (encode_json (scalar, F_UTF8)); 1653 XPUSHs (encode_json (scalar, &json));
1654}
952 1655
953void from_json (SV *jsonstr) 1656void decode_json (SV *jsonstr)
1657 ALIAS:
1658 from_json_ = 0
1659 decode_json = F_UTF8
954 PPCODE: 1660 PPCODE:
1661{
1662 JSON json = { F_DEFAULT | ix };
955 XPUSHs (decode_json (jsonstr, F_UTF8)); 1663 XPUSHs (decode_json (jsonstr, &json, 0));
1664}
956 1665

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines