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.68 by root, Thu Nov 29 08:37:11 2007 UTC vs.
Revision 1.105 by root, Tue Jan 19 01:07:27 2010 UTC

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>
9#include <float.h> 10#include <float.h>
10 11
11#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
12# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
13#endif 14#endif
14 15
15// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
16// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
19#endif 20#endif
21
22// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
20 24
21#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
28#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
33 37#define F_ALLOW_UNKNOWN 0x00002000UL
34#define F_MAXDEPTH 0xf8000000UL
35#define S_MAXDEPTH 27
36#define F_MAXSIZE 0x01f00000UL
37#define S_MAXSIZE 20
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 39
40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
42
43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
44#define F_DEFAULT (9UL << S_MAXDEPTH)
45 41
46#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
47#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
48 44
49#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
50 46
51#define SB do { 47#define SB do {
52#define SE } while (0) 48#define SE } while (0)
53 49
54#if __GNUC__ >= 3 50#if __GNUC__ >= 3
55# define expect(expr,value) __builtin_expect ((expr),(value)) 51# define expect(expr,value) __builtin_expect ((expr), (value))
56# define inline inline 52# define INLINE static inline
57#else 53#else
58# define expect(expr,value) (expr) 54# define expect(expr,value) (expr)
59# define inline static 55# define INLINE static
60#endif 56#endif
61 57
62#define expect_false(expr) expect ((expr) != 0, 0) 58#define expect_false(expr) expect ((expr) != 0, 0)
63#define expect_true(expr) expect ((expr) != 0, 1) 59#define expect_true(expr) expect ((expr) != 0, 1)
60
61#define IN_RANGE_INC(type,val,beg,end) \
62 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
63 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
64
65#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
64 66
65#ifdef USE_ITHREADS 67#ifdef USE_ITHREADS
66# define JSON_SLOW 1 68# define JSON_SLOW 1
67# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 69# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
68#else 70#else
71#endif 73#endif
72 74
73static HV *json_stash, *json_boolean_stash; // JSON::XS:: 75static HV *json_stash, *json_boolean_stash; // JSON::XS::
74static SV *json_true, *json_false; 76static SV *json_true, *json_false;
75 77
78enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash
82 INCR_M_C0, // inside comment in initial whitespace sequence
83 INCR_M_C1, // inside comment in other places
84 INCR_M_JSON // outside anything, count nesting
85};
86
87#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
88
76typedef struct { 89typedef struct {
77 U32 flags; 90 U32 flags;
91 U32 max_depth;
92 STRLEN max_size;
93
78 SV *cb_object; 94 SV *cb_object;
79 HV *cb_sk_object; 95 HV *cb_sk_object;
96
97 // for the incremental parser
98 SV *incr_text; // the source text so far
99 STRLEN incr_pos; // the current offset into the text
100 int incr_nest; // {[]}-nesting level
101 unsigned char incr_mode;
80} JSON; 102} JSON;
103
104INLINE void
105json_init (JSON *json)
106{
107 Zero (json, 1, JSON);
108 json->max_depth = 512;
109}
81 110
82///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
83// utility functions 112// utility functions
84 113
85inline void 114INLINE SV *
115get_bool (const char *name)
116{
117 SV *sv = get_sv (name, 1);
118
119 SvREADONLY_on (sv);
120 SvREADONLY_on (SvRV (sv));
121
122 return sv;
123}
124
125INLINE void
86shrink (SV *sv) 126shrink (SV *sv)
87{ 127{
88 sv_utf8_downgrade (sv, 1); 128 sv_utf8_downgrade (sv, 1);
129
89 if (SvLEN (sv) > SvCUR (sv) + 1) 130 if (SvLEN (sv) > SvCUR (sv) + 1)
90 { 131 {
91#ifdef SvPV_shrink_to_cur 132#ifdef SvPV_shrink_to_cur
92 SvPV_shrink_to_cur (sv); 133 SvPV_shrink_to_cur (sv);
93#elif defined (SvPV_renew) 134#elif defined (SvPV_renew)
99// decode an utf-8 character and return it, or (UV)-1 in 140// decode an utf-8 character and return it, or (UV)-1 in
100// case of an error. 141// case of an error.
101// we special-case "safe" characters from U+80 .. U+7FF, 142// we special-case "safe" characters from U+80 .. U+7FF,
102// but use the very good perl function to parse anything else. 143// but use the very good perl function to parse anything else.
103// note that we never call this function for a ascii codepoints 144// note that we never call this function for a ascii codepoints
104inline UV 145INLINE UV
105decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 146decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
106{ 147{
107 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 148 if (expect_true (len >= 2
108 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 149 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
109 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 150 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
110 { 151 {
111 *clen = 2; 152 *clen = 2;
112 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 153 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
113 } 154 }
114 else 155 else
115 { 156 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
116 *clen = (STRLEN)-1; 157}
117 return (UV)-1; 158
159// likewise for encoding, also never called for ascii codepoints
160// this function takes advantage of this fact, although current gccs
161// seem to optimise the check for >= 0x80 away anyways
162INLINE unsigned char *
163encode_utf8 (unsigned char *s, UV ch)
164{
165 if (expect_false (ch < 0x000080))
166 *s++ = ch;
167 else if (expect_true (ch < 0x000800))
168 *s++ = 0xc0 | ( ch >> 6),
169 *s++ = 0x80 | ( ch & 0x3f);
170 else if ( ch < 0x010000)
171 *s++ = 0xe0 | ( ch >> 12),
172 *s++ = 0x80 | ((ch >> 6) & 0x3f),
173 *s++ = 0x80 | ( ch & 0x3f);
174 else if ( ch < 0x110000)
175 *s++ = 0xf0 | ( ch >> 18),
176 *s++ = 0x80 | ((ch >> 12) & 0x3f),
177 *s++ = 0x80 | ((ch >> 6) & 0x3f),
178 *s++ = 0x80 | ( ch & 0x3f);
179
180 return s;
181}
182
183// convert offset pointer to character index, sv must be string
184static STRLEN
185ptr_to_index (SV *sv, char *offset)
186{
187 return SvUTF8 (sv)
188 ? utf8_distance (offset, SvPVX (sv))
189 : offset - SvPVX (sv);
190}
191
192/////////////////////////////////////////////////////////////////////////////
193// fp hell
194
195// scan a group of digits, and a trailing exponent
196static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp)
198{
199 UV uaccum = 0;
200 int eaccum = 0;
201
202 for (;;)
118 } 203 {
119} 204 U8 dig = (U8)*s - '0';
120 205
206 if (expect_false (dig >= 10))
207 {
208 if (dig == (U8)((U8)'.' - (U8)'0'))
209 {
210 ++s;
211 json_atof_scan1 (s, accum, expo, 1);
212 }
213 else if ((dig | ' ') == 'e' - '0')
214 {
215 int exp2 = 0;
216 int neg = 0;
217
218 ++s;
219
220 if (*s == '-')
221 {
222 ++s;
223 neg = 1;
224 }
225 else if (*s == '+')
226 ++s;
227
228 while ((dig = (U8)*s - '0') < 10)
229 exp2 = exp2 * 10 + *s++ - '0';
230
231 *expo += neg ? -exp2 : exp2;
232 }
233
234 break;
235 }
236
237 ++s;
238
239 uaccum = uaccum * 10 + dig;
240 ++eaccum;
241
242 // if we have too many digits, then recurse for more
243 // we actually do this for rather few digits
244 if (uaccum >= (UV_MAX - 9) / 10)
245 {
246 if (postdp) *expo -= eaccum;
247 json_atof_scan1 (s, accum, expo, postdp);
248 if (postdp) *expo += eaccum;
249
250 break;
251 }
252 }
253
254 // this relies greatly on the quality of the pow ()
255 // implementation of the platform, but a good
256 // implementation is hard to beat.
257 if (postdp) *expo -= eaccum;
258 *accum += uaccum * Perl_pow (10., *expo);
259 *expo += eaccum;
260}
261
262static NV
263json_atof (const char *s)
264{
265 NV accum = 0.;
266 int expo = 0;
267 int neg = 0;
268
269 if (*s == '-')
270 {
271 ++s;
272 neg = 1;
273 }
274
275 json_atof_scan1 (s, &accum, &expo, 0);
276
277 return neg ? -accum : accum;
278}
121///////////////////////////////////////////////////////////////////////////// 279/////////////////////////////////////////////////////////////////////////////
122// encoder 280// encoder
123 281
124// structure used for encoding JSON 282// structure used for encoding JSON
125typedef struct 283typedef struct
127 char *cur; // SvPVX (sv) + current output position 285 char *cur; // SvPVX (sv) + current output position
128 char *end; // SvEND (sv) 286 char *end; // SvEND (sv)
129 SV *sv; // result scalar 287 SV *sv; // result scalar
130 JSON json; 288 JSON json;
131 U32 indent; // indentation level 289 U32 indent; // indentation level
132 U32 maxdepth; // max. indentation/recursion level 290 UV limit; // escape character values >= this value when encoding
133} enc_t; 291} enc_t;
134 292
135inline void 293INLINE void
136need (enc_t *enc, STRLEN len) 294need (enc_t *enc, STRLEN len)
137{ 295{
138 if (expect_false (enc->cur + len >= enc->end)) 296 if (expect_false (enc->cur + len >= enc->end))
139 { 297 {
140 STRLEN cur = enc->cur - SvPVX (enc->sv); 298 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
141 SvGROW (enc->sv, cur + len + 1); 299 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
142 enc->cur = SvPVX (enc->sv) + cur; 300 enc->cur = SvPVX (enc->sv) + cur;
143 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 301 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
144 } 302 }
145} 303}
146 304
147inline void 305INLINE void
148encode_ch (enc_t *enc, char ch) 306encode_ch (enc_t *enc, char ch)
149{ 307{
150 need (enc, 1); 308 need (enc, 1);
151 *enc->cur++ = ch; 309 *enc->cur++ = ch;
152} 310}
206 { 364 {
207 uch = ch; 365 uch = ch;
208 clen = 1; 366 clen = 1;
209 } 367 }
210 368
211 if (uch > 0x10FFFFUL) 369 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
212 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
213
214 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
215 { 370 {
216 if (uch > 0xFFFFUL) 371 if (uch >= 0x10000UL)
217 { 372 {
373 if (uch >= 0x110000UL)
374 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
375
218 need (enc, len += 11); 376 need (enc, len += 11);
219 sprintf (enc->cur, "\\u%04x\\u%04x", 377 sprintf (enc->cur, "\\u%04x\\u%04x",
220 (int)((uch - 0x10000) / 0x400 + 0xD800), 378 (int)((uch - 0x10000) / 0x400 + 0xD800),
221 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 379 (int)((uch - 0x10000) % 0x400 + 0xDC00));
222 enc->cur += 12; 380 enc->cur += 12;
223 } 381 }
224 else 382 else
225 { 383 {
226 static char hexdigit [16] = "0123456789abcdef";
227 need (enc, len += 5); 384 need (enc, len += 5);
228 *enc->cur++ = '\\'; 385 *enc->cur++ = '\\';
229 *enc->cur++ = 'u'; 386 *enc->cur++ = 'u';
230 *enc->cur++ = hexdigit [ uch >> 12 ]; 387 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
231 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 388 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
232 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 389 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
233 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 390 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
234 } 391 }
235 392
236 str += clen; 393 str += clen;
237 } 394 }
238 else if (enc->json.flags & F_LATIN1) 395 else if (enc->json.flags & F_LATIN1)
250 while (--clen); 407 while (--clen);
251 } 408 }
252 else 409 else
253 { 410 {
254 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 411 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
255 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 412 enc->cur = encode_utf8 (enc->cur, uch);
256 ++str; 413 ++str;
257 } 414 }
258 } 415 }
259 } 416 }
260 } 417 }
261 418
262 --len; 419 --len;
263 } 420 }
264} 421}
265 422
266inline void 423INLINE void
267encode_indent (enc_t *enc) 424encode_indent (enc_t *enc)
268{ 425{
269 if (enc->json.flags & F_INDENT) 426 if (enc->json.flags & F_INDENT)
270 { 427 {
271 int spaces = enc->indent * INDENT_STEP; 428 int spaces = enc->indent * INDENT_STEP;
274 memset (enc->cur, ' ', spaces); 431 memset (enc->cur, ' ', spaces);
275 enc->cur += spaces; 432 enc->cur += spaces;
276 } 433 }
277} 434}
278 435
279inline void 436INLINE void
280encode_space (enc_t *enc) 437encode_space (enc_t *enc)
281{ 438{
282 need (enc, 1); 439 need (enc, 1);
283 encode_ch (enc, ' '); 440 encode_ch (enc, ' ');
284} 441}
285 442
286inline void 443INLINE void
287encode_nl (enc_t *enc) 444encode_nl (enc_t *enc)
288{ 445{
289 if (enc->json.flags & F_INDENT) 446 if (enc->json.flags & F_INDENT)
290 { 447 {
291 need (enc, 1); 448 need (enc, 1);
292 encode_ch (enc, '\n'); 449 encode_ch (enc, '\n');
293 } 450 }
294} 451}
295 452
296inline void 453INLINE void
297encode_comma (enc_t *enc) 454encode_comma (enc_t *enc)
298{ 455{
299 encode_ch (enc, ','); 456 encode_ch (enc, ',');
300 457
301 if (enc->json.flags & F_INDENT) 458 if (enc->json.flags & F_INDENT)
309static void 466static void
310encode_av (enc_t *enc, AV *av) 467encode_av (enc_t *enc, AV *av)
311{ 468{
312 int i, len = av_len (av); 469 int i, len = av_len (av);
313 470
314 if (enc->indent >= enc->maxdepth) 471 if (enc->indent >= enc->json.max_depth)
315 croak ("data structure too deep (hit recursion limit)"); 472 croak (ERR_NESTING_EXCEEDED);
316 473
317 encode_ch (enc, '['); 474 encode_ch (enc, '[');
318 475
319 if (len >= 0) 476 if (len >= 0)
320 { 477 {
394 551
395static void 552static void
396encode_hv (enc_t *enc, HV *hv) 553encode_hv (enc_t *enc, HV *hv)
397{ 554{
398 HE *he; 555 HE *he;
399 int count;
400 556
401 if (enc->indent >= enc->maxdepth) 557 if (enc->indent >= enc->json.max_depth)
402 croak ("data structure too deep (hit recursion limit)"); 558 croak (ERR_NESTING_EXCEEDED);
403 559
404 encode_ch (enc, '{'); 560 encode_ch (enc, '{');
405 561
406 // for canonical output we have to sort by keys first 562 // for canonical output we have to sort by keys first
407 // actually, this is mostly due to the stupid so-called 563 // actually, this is mostly due to the stupid so-called
408 // security workaround added somewhere in 5.8.x. 564 // security workaround added somewhere in 5.8.x
409 // that randomises hash orderings 565 // that randomises hash orderings
410 if (enc->json.flags & F_CANONICAL) 566 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
411 { 567 {
412 int count = hv_iterinit (hv); 568 int count = hv_iterinit (hv);
413 569
414 if (SvMAGICAL (hv)) 570 if (SvMAGICAL (hv))
415 { 571 {
588 744
589 if (len == 1 && *pv == '1') 745 if (len == 1 && *pv == '1')
590 encode_str (enc, "true", 4, 0); 746 encode_str (enc, "true", 4, 0);
591 else if (len == 1 && *pv == '0') 747 else if (len == 1 && *pv == '0')
592 encode_str (enc, "false", 5, 0); 748 encode_str (enc, "false", 5, 0);
749 else if (enc->json.flags & F_ALLOW_UNKNOWN)
750 encode_str (enc, "null", 4, 0);
593 else 751 else
594 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 752 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
595 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 753 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
596 } 754 }
755 else if (enc->json.flags & F_ALLOW_UNKNOWN)
756 encode_str (enc, "null", 4, 0);
597 else 757 else
598 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 758 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
599 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 759 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
600} 760}
601 761
619 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 779 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
620 enc->cur += strlen (enc->cur); 780 enc->cur += strlen (enc->cur);
621 } 781 }
622 else if (SvIOKp (sv)) 782 else if (SvIOKp (sv))
623 { 783 {
624 // we assume we can always read an IV as a UV 784 // we assume we can always read an IV as a UV and vice versa
625 if (SvUV (sv) & ~(UV)0x7fff) 785 // we assume two's complement
626 { 786 // we assume no aliasing issues in the union
627 // large integer, use the (rather slow) snprintf way. 787 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
628 need (enc, sizeof (UV) * 3); 788 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
629 enc->cur +=
630 SvIsUV(sv)
631 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
632 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
633 }
634 else
635 { 789 {
636 // optimise the "small number case" 790 // optimise the "small number case"
637 // code will likely be branchless and use only a single multiplication 791 // code will likely be branchless and use only a single multiplication
792 // works for numbers up to 59074
638 I32 i = SvIV (sv); 793 I32 i = SvIVX (sv);
639 U32 u; 794 U32 u;
640 char digit, nz = 0; 795 char digit, nz = 0;
641 796
642 need (enc, 6); 797 need (enc, 6);
643 798
649 804
650 // now output digit by digit, each time masking out the integer part 805 // now output digit by digit, each time masking out the integer part
651 // and multiplying by 5 while moving the decimal point one to the right, 806 // and multiplying by 5 while moving the decimal point one to the right,
652 // resulting in a net multiplication by 10. 807 // resulting in a net multiplication by 10.
653 // we always write the digit to memory but conditionally increment 808 // we always write the digit to memory but conditionally increment
654 // the pointer, to ease the usage of conditional move instructions. 809 // the pointer, to enable the use of conditional move instructions.
655 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 810 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
656 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 811 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
657 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 812 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
658 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 813 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
659 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 814 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
660 } 815 }
816 else
817 {
818 // large integer, use the (rather slow) snprintf way.
819 need (enc, IVUV_MAXCHARS);
820 enc->cur +=
821 SvIsUV(sv)
822 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
823 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
824 }
661 } 825 }
662 else if (SvROK (sv)) 826 else if (SvROK (sv))
663 encode_rv (enc, SvRV (sv)); 827 encode_rv (enc, SvRV (sv));
664 else if (!SvOK (sv)) 828 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
665 encode_str (enc, "null", 4, 0); 829 encode_str (enc, "null", 4, 0);
666 else 830 else
667 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 831 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
668 SvPV_nolen (sv), SvFLAGS (sv)); 832 SvPV_nolen (sv), SvFLAGS (sv));
669} 833}
679 enc.json = *json; 843 enc.json = *json;
680 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 844 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
681 enc.cur = SvPVX (enc.sv); 845 enc.cur = SvPVX (enc.sv);
682 enc.end = SvEND (enc.sv); 846 enc.end = SvEND (enc.sv);
683 enc.indent = 0; 847 enc.indent = 0;
684 enc.maxdepth = DEC_DEPTH (enc.json.flags); 848 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
849 : enc.json.flags & F_LATIN1 ? 0x000100UL
850 : 0x110000UL;
685 851
686 SvPOK_only (enc.sv); 852 SvPOK_only (enc.sv);
687 encode_sv (&enc, scalar); 853 encode_sv (&enc, scalar);
854 encode_nl (&enc);
688 855
689 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 856 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
690 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 857 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
691 858
692 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 859 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
710 JSON json; 877 JSON json;
711 U32 depth; // recursion depth 878 U32 depth; // recursion depth
712 U32 maxdepth; // recursion depth limit 879 U32 maxdepth; // recursion depth limit
713} dec_t; 880} dec_t;
714 881
715inline void 882INLINE void
716decode_comment (dec_t *dec) 883decode_comment (dec_t *dec)
717{ 884{
718 // only '#'-style comments allowed a.t.m. 885 // only '#'-style comments allowed a.t.m.
719 886
720 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d) 887 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
721 ++dec->cur; 888 ++dec->cur;
722} 889}
723 890
724inline void 891INLINE void
725decode_ws (dec_t *dec) 892decode_ws (dec_t *dec)
726{ 893{
727 for (;;) 894 for (;;)
728 { 895 {
729 char ch = *dec->cur; 896 char ch = *dec->cur;
753 if (*dec->cur != ch) \ 920 if (*dec->cur != ch) \
754 ERR (# ch " expected"); \ 921 ERR (# ch " expected"); \
755 ++dec->cur; \ 922 ++dec->cur; \
756 SE 923 SE
757 924
758#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 925#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
759#define DEC_DEC_DEPTH --dec->depth 926#define DEC_DEC_DEPTH --dec->depth
760 927
761static SV *decode_sv (dec_t *dec); 928static SV *decode_sv (dec_t *dec);
762 929
763static signed char decode_hexdigit[256]; 930static signed char decode_hexdigit[256];
855 1022
856 if (hi >= 0x80) 1023 if (hi >= 0x80)
857 { 1024 {
858 utf8 = 1; 1025 utf8 = 1;
859 1026
860 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 1027 cur = encode_utf8 (cur, hi);
861 } 1028 }
862 else 1029 else
863 *cur++ = hi; 1030 *cur++ = hi;
864 } 1031 }
865 break; 1032 break;
867 default: 1034 default:
868 --dec_cur; 1035 --dec_cur;
869 ERR ("illegal backslash escape sequence in string"); 1036 ERR ("illegal backslash escape sequence in string");
870 } 1037 }
871 } 1038 }
872 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1039 else if (expect_true (ch >= 0x20 && ch < 0x80))
873 *cur++ = ch; 1040 *cur++ = ch;
874 else if (ch >= 0x80) 1041 else if (ch >= 0x80)
875 { 1042 {
876 STRLEN clen; 1043 STRLEN clen;
877 UV uch;
878 1044
879 --dec_cur; 1045 --dec_cur;
880 1046
881 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1047 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
882 if (clen == (STRLEN)-1) 1048 if (clen == (STRLEN)-1)
883 ERR ("malformed UTF-8 character in JSON string"); 1049 ERR ("malformed UTF-8 character in JSON string");
884 1050
885 do 1051 do
886 *cur++ = *dec_cur++; 1052 *cur++ = *dec_cur++;
903 { 1069 {
904 STRLEN len = cur - buf; 1070 STRLEN len = cur - buf;
905 1071
906 if (sv) 1072 if (sv)
907 { 1073 {
908 SvGROW (sv, SvCUR (sv) + len + 1); 1074 STRLEN cur = SvCUR (sv);
1075
1076 if (SvLEN (sv) <= cur + len)
1077 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1078
909 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1079 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
910 SvCUR_set (sv, SvCUR (sv) + len); 1080 SvCUR_set (sv, SvCUR (sv) + len);
911 } 1081 }
912 else 1082 else
913 sv = newSVpvn (buf, len); 1083 sv = newSVpvn (buf, len);
1000 1170
1001 if (!is_nv) 1171 if (!is_nv)
1002 { 1172 {
1003 int len = dec->cur - start; 1173 int len = dec->cur - start;
1004 1174
1005 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1175 // special case the rather common 1..5-digit-int case
1006 if (*start == '-') 1176 if (*start == '-')
1007 switch (len) 1177 switch (len)
1008 { 1178 {
1009 case 2: return newSViv (-( start [1] - '0' * 1)); 1179 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1010 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1180 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1011 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1181 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1012 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1182 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1183 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1013 } 1184 }
1014 else 1185 else
1015 switch (len) 1186 switch (len)
1016 { 1187 {
1017 case 1: return newSViv ( start [0] - '0' * 1); 1188 case 1: return newSViv ( start [0] - '0' * 1);
1018 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1189 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1019 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1190 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1020 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1191 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1192 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1021 } 1193 }
1022 1194
1023 { 1195 {
1024 UV uv; 1196 UV uv;
1025 int numtype = grok_number (start, len, &uv); 1197 int numtype = grok_number (start, len, &uv);
1034 } 1206 }
1035 1207
1036 len -= *start == '-' ? 1 : 0; 1208 len -= *start == '-' ? 1 : 0;
1037 1209
1038 // does not fit into IV or UV, try NV 1210 // does not fit into IV or UV, try NV
1039 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1211 if (len <= NV_DIG)
1040 #if defined (LDBL_DIG)
1041 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1042 #endif
1043 )
1044 // fits into NV without loss of precision 1212 // fits into NV without loss of precision
1045 return newSVnv (Atof (start)); 1213 return newSVnv (json_atof (start));
1046 1214
1047 // everything else fails, convert it to a string 1215 // everything else fails, convert it to a string
1048 return newSVpvn (start, dec->cur - start); 1216 return newSVpvn (start, dec->cur - start);
1049 } 1217 }
1050 1218
1051 // loss of precision here 1219 // loss of precision here
1052 return newSVnv (Atof (start)); 1220 return newSVnv (json_atof (start));
1053 1221
1054fail: 1222fail:
1055 return 0; 1223 return 0;
1056} 1224}
1057 1225
1133 char *p = dec->cur; 1301 char *p = dec->cur;
1134 char *e = p + 24; // only try up to 24 bytes 1302 char *e = p + 24; // only try up to 24 bytes
1135 1303
1136 for (;;) 1304 for (;;)
1137 { 1305 {
1138 // the >= 0x80 is true on most architectures 1306 // the >= 0x80 is false on most architectures
1139 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1307 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1140 { 1308 {
1141 // slow path, back up and use decode_str 1309 // slow path, back up and use decode_str
1142 SV *key = decode_str (dec); 1310 SV *key = decode_str (dec);
1143 if (!key) 1311 if (!key)
1274 1442
1275static SV * 1443static SV *
1276decode_sv (dec_t *dec) 1444decode_sv (dec_t *dec)
1277{ 1445{
1278 // the beauty of JSON: you need exactly one character lookahead 1446 // the beauty of JSON: you need exactly one character lookahead
1279 // to parse anything. 1447 // to parse everything.
1280 switch (*dec->cur) 1448 switch (*dec->cur)
1281 { 1449 {
1282 case '"': ++dec->cur; return decode_str (dec); 1450 case '"': ++dec->cur; return decode_str (dec);
1283 case '[': ++dec->cur; return decode_av (dec); 1451 case '[': ++dec->cur; return decode_av (dec);
1284 case '{': ++dec->cur; return decode_hv (dec); 1452 case '{': ++dec->cur; return decode_hv (dec);
1285 1453
1286 case '-': 1454 case '-':
1287 case '0': case '1': case '2': case '3': case '4': 1455 case '0': case '1': case '2': case '3': case '4':
1288 case '5': case '6': case '7': case '8': case '9': 1456 case '5': case '6': case '7': case '8': case '9':
1289 return decode_num (dec); 1457 return decode_num (dec);
1291 case 't': 1459 case 't':
1292 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1460 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1293 { 1461 {
1294 dec->cur += 4; 1462 dec->cur += 4;
1295#if JSON_SLOW 1463#if JSON_SLOW
1296 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1464 json_true = get_bool ("JSON::XS::true");
1297#endif 1465#endif
1298 return SvREFCNT_inc (json_true); 1466 return newSVsv (json_true);
1299 } 1467 }
1300 else 1468 else
1301 ERR ("'true' expected"); 1469 ERR ("'true' expected");
1302 1470
1303 break; 1471 break;
1305 case 'f': 1473 case 'f':
1306 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1474 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1307 { 1475 {
1308 dec->cur += 5; 1476 dec->cur += 5;
1309#if JSON_SLOW 1477#if JSON_SLOW
1310 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1478 json_false = get_bool ("JSON::XS::false");
1311#endif 1479#endif
1312 return SvREFCNT_inc (json_false); 1480 return newSVsv (json_false);
1313 } 1481 }
1314 else 1482 else
1315 ERR ("'false' expected"); 1483 ERR ("'false' expected");
1316 1484
1317 break; 1485 break;
1335fail: 1503fail:
1336 return 0; 1504 return 0;
1337} 1505}
1338 1506
1339static SV * 1507static SV *
1340decode_json (SV *string, JSON *json, UV *offset_return) 1508decode_json (SV *string, JSON *json, char **offset_return)
1341{ 1509{
1342 dec_t dec; 1510 dec_t dec;
1343 UV offset;
1344 SV *sv; 1511 SV *sv;
1345 1512
1513 /* work around bugs in 5.10 where manipulating magic values
1514 * will perl ignore the magic in subsequent accesses
1515 */
1346 SvGETMAGIC (string); 1516 /*SvGETMAGIC (string);*/
1517 if (SvMAGICAL (string))
1518 string = sv_2mortal (newSVsv (string));
1519
1347 SvUPGRADE (string, SVt_PV); 1520 SvUPGRADE (string, SVt_PV);
1348 1521
1349 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1522 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1523 * assertion with -DDEBUGGING, although SvCUR is documented to
1524 * return the xpv_cur field which certainly exists after upgrading.
1525 * according to nicholas clark, calling SvPOK fixes this.
1526 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1527 * and hope for the best.
1528 * Damnit, SvPV_nolen still trips over yet another assertion. This
1529 * assertion business is seriously broken, try yet another workaround
1530 * for the broken -DDEBUGGING.
1531 */
1532 {
1533#ifdef DEBUGGING
1534 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1535#else
1536 STRLEN offset = SvCUR (string);
1537#endif
1538
1539 if (offset > json->max_size && json->max_size)
1350 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1540 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1351 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1541 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1542 }
1352 1543
1353 if (json->flags & F_UTF8) 1544 if (json->flags & F_UTF8)
1354 sv_utf8_downgrade (string, 0); 1545 sv_utf8_downgrade (string, 0);
1355 else 1546 else
1356 sv_utf8_upgrade (string); 1547 sv_utf8_upgrade (string);
1357 1548
1358 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1549 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1359 1550
1360 dec.json = *json; 1551 dec.json = *json;
1361 dec.cur = SvPVX (string); 1552 dec.cur = SvPVX (string);
1362 dec.end = SvEND (string); 1553 dec.end = SvEND (string);
1363 dec.err = 0; 1554 dec.err = 0;
1364 dec.depth = 0; 1555 dec.depth = 0;
1365 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1366 1556
1367 if (dec.json.cb_object || dec.json.cb_sk_object) 1557 if (dec.json.cb_object || dec.json.cb_sk_object)
1368 dec.json.flags |= F_HOOK; 1558 dec.json.flags |= F_HOOK;
1369 1559
1370 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1560 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1371 1561
1372 decode_ws (&dec); 1562 decode_ws (&dec);
1373 sv = decode_sv (&dec); 1563 sv = decode_sv (&dec);
1564
1565 if (offset_return)
1566 *offset_return = dec.cur;
1374 1567
1375 if (!(offset_return || !sv)) 1568 if (!(offset_return || !sv))
1376 { 1569 {
1377 // check for trailing garbage 1570 // check for trailing garbage
1378 decode_ws (&dec); 1571 decode_ws (&dec);
1381 { 1574 {
1382 dec.err = "garbage after JSON object"; 1575 dec.err = "garbage after JSON object";
1383 SvREFCNT_dec (sv); 1576 SvREFCNT_dec (sv);
1384 sv = 0; 1577 sv = 0;
1385 } 1578 }
1386 }
1387
1388 if (offset_return || !sv)
1389 {
1390 offset = dec.json.flags & F_UTF8
1391 ? dec.cur - SvPVX (string)
1392 : utf8_distance (dec.cur, SvPVX (string));
1393
1394 if (offset_return)
1395 *offset_return = offset;
1396 } 1579 }
1397 1580
1398 if (!sv) 1581 if (!sv)
1399 { 1582 {
1400 SV *uni = sv_newmortal (); 1583 SV *uni = sv_newmortal ();
1406 SAVEVPTR (PL_curcop); 1589 SAVEVPTR (PL_curcop);
1407 PL_curcop = &cop; 1590 PL_curcop = &cop;
1408 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1591 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1409 LEAVE; 1592 LEAVE;
1410 1593
1411 croak ("%s, at character offset %d [\"%s\"]", 1594 croak ("%s, at character offset %d (before \"%s\")",
1412 dec.err, 1595 dec.err,
1413 (int)offset, 1596 ptr_to_index (string, dec.cur),
1414 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1597 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1415 } 1598 }
1416 1599
1417 sv = sv_2mortal (sv); 1600 sv = sv_2mortal (sv);
1418 1601
1419 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1602 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1420 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1603 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1421 1604
1422 return sv; 1605 return sv;
1606}
1607
1608/////////////////////////////////////////////////////////////////////////////
1609// incremental parser
1610
1611static void
1612incr_parse (JSON *self)
1613{
1614 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1615
1616 // the state machine here is a bit convoluted and could be simplified a lot
1617 // but this would make it slower, so...
1618
1619 for (;;)
1620 {
1621 //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
1622 switch (self->incr_mode)
1623 {
1624 // only used for initial whitespace skipping
1625 case INCR_M_WS:
1626 for (;;)
1627 {
1628 if (*p > 0x20)
1629 {
1630 if (*p == '#')
1631 {
1632 self->incr_mode = INCR_M_C0;
1633 goto incr_m_c;
1634 }
1635 else
1636 {
1637 self->incr_mode = INCR_M_JSON;
1638 goto incr_m_json;
1639 }
1640 }
1641 else if (!*p)
1642 goto interrupt;
1643
1644 ++p;
1645 }
1646
1647 // skip a single char inside a string (for \\-processing)
1648 case INCR_M_BS:
1649 if (!*p)
1650 goto interrupt;
1651
1652 ++p;
1653 self->incr_mode = INCR_M_STR;
1654 goto incr_m_str;
1655
1656 // inside #-style comments
1657 case INCR_M_C0:
1658 case INCR_M_C1:
1659 incr_m_c:
1660 for (;;)
1661 {
1662 if (*p == '\n')
1663 {
1664 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1665 break;
1666 }
1667 else if (!*p)
1668 goto interrupt;
1669
1670 ++p;
1671 }
1672
1673 break;
1674
1675 // inside a string
1676 case INCR_M_STR:
1677 incr_m_str:
1678 for (;;)
1679 {
1680 if (*p == '"')
1681 {
1682 ++p;
1683 self->incr_mode = INCR_M_JSON;
1684
1685 if (!self->incr_nest)
1686 goto interrupt;
1687
1688 goto incr_m_json;
1689 }
1690 else if (*p == '\\')
1691 {
1692 ++p; // "virtually" consumes character after \
1693
1694 if (!*p) // if at end of string we have to switch modes
1695 {
1696 self->incr_mode = INCR_M_BS;
1697 goto interrupt;
1698 }
1699 }
1700 else if (!*p)
1701 goto interrupt;
1702
1703 ++p;
1704 }
1705
1706 // after initial ws, outside string
1707 case INCR_M_JSON:
1708 incr_m_json:
1709 for (;;)
1710 {
1711 switch (*p++)
1712 {
1713 case 0:
1714 --p;
1715 goto interrupt;
1716
1717 case 0x09:
1718 case 0x0a:
1719 case 0x0d:
1720 case 0x20:
1721 if (!self->incr_nest)
1722 {
1723 --p; // do not eat the whitespace, let the next round do it
1724 goto interrupt;
1725 }
1726 break;
1727
1728 case '"':
1729 self->incr_mode = INCR_M_STR;
1730 goto incr_m_str;
1731
1732 case '[':
1733 case '{':
1734 if (++self->incr_nest > self->max_depth)
1735 croak (ERR_NESTING_EXCEEDED);
1736 break;
1737
1738 case ']':
1739 case '}':
1740 if (--self->incr_nest <= 0)
1741 goto interrupt;
1742 break;
1743
1744 case '#':
1745 self->incr_mode = INCR_M_C1;
1746 goto incr_m_c;
1747 }
1748 }
1749 }
1750
1751 modechange:
1752 ;
1753 }
1754
1755interrupt:
1756 self->incr_pos = p - SvPVX (self->incr_text);
1757 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1758 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1423} 1759}
1424 1760
1425///////////////////////////////////////////////////////////////////////////// 1761/////////////////////////////////////////////////////////////////////////////
1426// XS interface functions 1762// XS interface functions
1427 1763
1439 : -1; 1775 : -1;
1440 1776
1441 json_stash = gv_stashpv ("JSON::XS" , 1); 1777 json_stash = gv_stashpv ("JSON::XS" , 1);
1442 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1778 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1443 1779
1444 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1780 json_true = get_bool ("JSON::XS::true");
1445 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1781 json_false = get_bool ("JSON::XS::false");
1782
1783 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1446} 1784}
1447 1785
1448PROTOTYPES: DISABLE 1786PROTOTYPES: DISABLE
1449 1787
1450void CLONE (...) 1788void CLONE (...)
1455void new (char *klass) 1793void new (char *klass)
1456 PPCODE: 1794 PPCODE:
1457{ 1795{
1458 SV *pv = NEWSV (0, sizeof (JSON)); 1796 SV *pv = NEWSV (0, sizeof (JSON));
1459 SvPOK_only (pv); 1797 SvPOK_only (pv);
1460 Zero (SvPVX (pv), 1, JSON); 1798 json_init ((JSON *)SvPVX (pv));
1461 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1462 XPUSHs (sv_2mortal (sv_bless ( 1799 XPUSHs (sv_2mortal (sv_bless (
1463 newRV_noinc (pv), 1800 newRV_noinc (pv),
1464 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1801 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1465 ))); 1802 )));
1466} 1803}
1478 allow_nonref = F_ALLOW_NONREF 1815 allow_nonref = F_ALLOW_NONREF
1479 shrink = F_SHRINK 1816 shrink = F_SHRINK
1480 allow_blessed = F_ALLOW_BLESSED 1817 allow_blessed = F_ALLOW_BLESSED
1481 convert_blessed = F_CONV_BLESSED 1818 convert_blessed = F_CONV_BLESSED
1482 relaxed = F_RELAXED 1819 relaxed = F_RELAXED
1820 allow_unknown = F_ALLOW_UNKNOWN
1483 PPCODE: 1821 PPCODE:
1484{ 1822{
1485 if (enable) 1823 if (enable)
1486 self->flags |= ix; 1824 self->flags |= ix;
1487 else 1825 else
1502 get_allow_nonref = F_ALLOW_NONREF 1840 get_allow_nonref = F_ALLOW_NONREF
1503 get_shrink = F_SHRINK 1841 get_shrink = F_SHRINK
1504 get_allow_blessed = F_ALLOW_BLESSED 1842 get_allow_blessed = F_ALLOW_BLESSED
1505 get_convert_blessed = F_CONV_BLESSED 1843 get_convert_blessed = F_CONV_BLESSED
1506 get_relaxed = F_RELAXED 1844 get_relaxed = F_RELAXED
1845 get_allow_unknown = F_ALLOW_UNKNOWN
1507 PPCODE: 1846 PPCODE:
1508 XPUSHs (boolSV (self->flags & ix)); 1847 XPUSHs (boolSV (self->flags & ix));
1509 1848
1510void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1849void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1511 PPCODE: 1850 PPCODE:
1512{ 1851 self->max_depth = max_depth;
1513 UV log2 = 0;
1514
1515 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1516
1517 while ((1UL << log2) < max_depth)
1518 ++log2;
1519
1520 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1521
1522 XPUSHs (ST (0)); 1852 XPUSHs (ST (0));
1523}
1524 1853
1525U32 get_max_depth (JSON *self) 1854U32 get_max_depth (JSON *self)
1526 CODE: 1855 CODE:
1527 RETVAL = DEC_DEPTH (self->flags); 1856 RETVAL = self->max_depth;
1528 OUTPUT: 1857 OUTPUT:
1529 RETVAL 1858 RETVAL
1530 1859
1531void max_size (JSON *self, UV max_size = 0) 1860void max_size (JSON *self, U32 max_size = 0)
1532 PPCODE: 1861 PPCODE:
1533{ 1862 self->max_size = max_size;
1534 UV log2 = 0;
1535
1536 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1537 if (max_size == 1) max_size = 2;
1538
1539 while ((1UL << log2) < max_size)
1540 ++log2;
1541
1542 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1543
1544 XPUSHs (ST (0)); 1863 XPUSHs (ST (0));
1545}
1546 1864
1547int get_max_size (JSON *self) 1865int get_max_size (JSON *self)
1548 CODE: 1866 CODE:
1549 RETVAL = DEC_SIZE (self->flags); 1867 RETVAL = self->max_size;
1550 OUTPUT: 1868 OUTPUT:
1551 RETVAL 1869 RETVAL
1552 1870
1553void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1871void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1554 PPCODE: 1872 PPCODE:
1590 XPUSHs (decode_json (jsonstr, self, 0)); 1908 XPUSHs (decode_json (jsonstr, self, 0));
1591 1909
1592void decode_prefix (JSON *self, SV *jsonstr) 1910void decode_prefix (JSON *self, SV *jsonstr)
1593 PPCODE: 1911 PPCODE:
1594{ 1912{
1595 UV offset; 1913 char *offset;
1596 EXTEND (SP, 2); 1914 EXTEND (SP, 2);
1597 PUSHs (decode_json (jsonstr, self, &offset)); 1915 PUSHs (decode_json (jsonstr, self, &offset));
1598 PUSHs (sv_2mortal (newSVuv (offset))); 1916 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1917}
1918
1919void incr_parse (JSON *self, SV *jsonstr = 0)
1920 PPCODE:
1921{
1922 if (!self->incr_text)
1923 self->incr_text = newSVpvn ("", 0);
1924
1925 // append data, if any
1926 if (jsonstr)
1927 {
1928 if (SvUTF8 (jsonstr))
1929 {
1930 if (!SvUTF8 (self->incr_text))
1931 {
1932 /* utf-8-ness differs, need to upgrade */
1933 sv_utf8_upgrade (self->incr_text);
1934
1935 if (self->incr_pos)
1936 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1937 - (U8 *)SvPVX (self->incr_text);
1938 }
1939 }
1940 else if (SvUTF8 (self->incr_text))
1941 sv_utf8_upgrade (jsonstr);
1942
1943 {
1944 STRLEN len;
1945 const char *str = SvPV (jsonstr, len);
1946 STRLEN cur = SvCUR (self->incr_text);
1947
1948 if (SvLEN (self->incr_text) <= cur + len)
1949 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1950
1951 Move (str, SvEND (self->incr_text), len, char);
1952 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1953 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1954 }
1955 }
1956
1957 if (GIMME_V != G_VOID)
1958 do
1959 {
1960 char *offset;
1961
1962 if (!INCR_DONE (self))
1963 {
1964 incr_parse (self);
1965
1966 if (self->incr_pos > self->max_size && self->max_size)
1967 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1968 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1969
1970 if (!INCR_DONE (self))
1971 break;
1972 }
1973
1974 XPUSHs (decode_json (self->incr_text, self, &offset));
1975
1976 self->incr_pos -= offset - SvPVX (self->incr_text);
1977 self->incr_nest = 0;
1978 self->incr_mode = 0;
1979
1980 sv_chop (self->incr_text, offset);
1981 }
1982 while (GIMME_V == G_ARRAY);
1983}
1984
1985SV *incr_text (JSON *self)
1986 ATTRS: lvalue
1987 CODE:
1988{
1989 if (self->incr_pos)
1990 croak ("incr_text can not be called when the incremental parser already started parsing");
1991
1992 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1993}
1994 OUTPUT:
1995 RETVAL
1996
1997void incr_skip (JSON *self)
1998 CODE:
1999{
2000 if (self->incr_pos)
2001 {
2002 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2003 self->incr_pos = 0;
2004 self->incr_nest = 0;
2005 self->incr_mode = 0;
2006 }
2007}
2008
2009void incr_reset (JSON *self)
2010 CODE:
2011{
2012 SvREFCNT_dec (self->incr_text);
2013 self->incr_text = 0;
2014 self->incr_pos = 0;
2015 self->incr_nest = 0;
2016 self->incr_mode = 0;
1599} 2017}
1600 2018
1601void DESTROY (JSON *self) 2019void DESTROY (JSON *self)
1602 CODE: 2020 CODE:
1603 SvREFCNT_dec (self->cb_sk_object); 2021 SvREFCNT_dec (self->cb_sk_object);
1604 SvREFCNT_dec (self->cb_object); 2022 SvREFCNT_dec (self->cb_object);
2023 SvREFCNT_dec (self->incr_text);
1605 2024
1606PROTOTYPES: ENABLE 2025PROTOTYPES: ENABLE
1607 2026
1608void to_json (SV *scalar) 2027void encode_json (SV *scalar)
2028 ALIAS:
2029 to_json_ = 0
2030 encode_json = F_UTF8
1609 PPCODE: 2031 PPCODE:
1610{ 2032{
1611 JSON json = { F_DEFAULT | F_UTF8 }; 2033 JSON json;
2034 json_init (&json);
2035 json.flags |= ix;
1612 XPUSHs (encode_json (scalar, &json)); 2036 XPUSHs (encode_json (scalar, &json));
1613} 2037}
1614 2038
1615void from_json (SV *jsonstr) 2039void decode_json (SV *jsonstr)
2040 ALIAS:
2041 from_json_ = 0
2042 decode_json = F_UTF8
1616 PPCODE: 2043 PPCODE:
1617{ 2044{
1618 JSON json = { F_DEFAULT | F_UTF8 }; 2045 JSON json;
2046 json_init (&json);
2047 json.flags |= ix;
1619 XPUSHs (decode_json (jsonstr, &json, 0)); 2048 XPUSHs (decode_json (jsonstr, &json, 0));
1620} 2049}
1621 2050

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines