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.70 by root, Wed Mar 19 00:44:54 2008 UTC vs.
Revision 1.100 by root, Sat Sep 5 23:00:56 2009 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#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
20 23
21#define F_ASCII 0x00000001UL 24#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 25#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 26#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 27#define F_INDENT 0x00000008UL
28#define F_ALLOW_NONREF 0x00000100UL 31#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 32#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 33#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 34#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL 35#define F_RELAXED 0x00001000UL
33 36#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 37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 38
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 39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
44#define F_DEFAULT (9UL << S_MAXDEPTH)
45 40
46#define INIT_SIZE 32 // initial scalar size to be allocated 41#define INIT_SIZE 32 // initial scalar size to be allocated
47#define INDENT_STEP 3 // spaces per indentation level 42#define INDENT_STEP 3 // spaces per indentation level
48 43
49#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 44#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
50 45
51#define SB do { 46#define SB do {
52#define SE } while (0) 47#define SE } while (0)
53 48
54#if __GNUC__ >= 3 49#if __GNUC__ >= 3
55# define expect(expr,value) __builtin_expect ((expr),(value)) 50# define expect(expr,value) __builtin_expect ((expr), (value))
56# define inline inline 51# define INLINE static inline
57#else 52#else
58# define expect(expr,value) (expr) 53# define expect(expr,value) (expr)
59# define inline static 54# define INLINE static
60#endif 55#endif
61 56
62#define expect_false(expr) expect ((expr) != 0, 0) 57#define expect_false(expr) expect ((expr) != 0, 0)
63#define expect_true(expr) expect ((expr) != 0, 1) 58#define expect_true(expr) expect ((expr) != 0, 1)
59
60#define IN_RANGE_INC(type,val,beg,end) \
61 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
62 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
63
64#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
64 65
65#ifdef USE_ITHREADS 66#ifdef USE_ITHREADS
66# define JSON_SLOW 1 67# define JSON_SLOW 1
67# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 68# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
68#else 69#else
71#endif 72#endif
72 73
73static HV *json_stash, *json_boolean_stash; // JSON::XS:: 74static HV *json_stash, *json_boolean_stash; // JSON::XS::
74static SV *json_true, *json_false; 75static SV *json_true, *json_false;
75 76
77enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash
81 INCR_M_JSON // outside anything, count nesting
82};
83
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85
76typedef struct { 86typedef struct {
77 U32 flags; 87 U32 flags;
88 U32 max_depth;
89 STRLEN max_size;
90
78 SV *cb_object; 91 SV *cb_object;
79 HV *cb_sk_object; 92 HV *cb_sk_object;
93
94 // for the incremental parser
95 SV *incr_text; // the source text so far
96 STRLEN incr_pos; // the current offset into the text
97 int incr_nest; // {[]}-nesting level
98 unsigned char incr_mode;
80} JSON; 99} JSON;
100
101INLINE void
102json_init (JSON *json)
103{
104 Zero (json, 1, JSON);
105 json->max_depth = 512;
106}
81 107
82///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
83// utility functions 109// utility functions
84 110
85inline void 111INLINE SV *
112get_bool (const char *name)
113{
114 SV *sv = get_sv (name, 1);
115
116 SvREADONLY_on (sv);
117 SvREADONLY_on (SvRV (sv));
118
119 return sv;
120}
121
122INLINE void
86shrink (SV *sv) 123shrink (SV *sv)
87{ 124{
88 sv_utf8_downgrade (sv, 1); 125 sv_utf8_downgrade (sv, 1);
126
89 if (SvLEN (sv) > SvCUR (sv) + 1) 127 if (SvLEN (sv) > SvCUR (sv) + 1)
90 { 128 {
91#ifdef SvPV_shrink_to_cur 129#ifdef SvPV_shrink_to_cur
92 SvPV_shrink_to_cur (sv); 130 SvPV_shrink_to_cur (sv);
93#elif defined (SvPV_renew) 131#elif defined (SvPV_renew)
99// decode an utf-8 character and return it, or (UV)-1 in 137// decode an utf-8 character and return it, or (UV)-1 in
100// case of an error. 138// case of an error.
101// we special-case "safe" characters from U+80 .. U+7FF, 139// we special-case "safe" characters from U+80 .. U+7FF,
102// but use the very good perl function to parse anything else. 140// but use the very good perl function to parse anything else.
103// note that we never call this function for a ascii codepoints 141// note that we never call this function for a ascii codepoints
104inline UV 142INLINE UV
105decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 143decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
106{ 144{
107 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 145 if (expect_true (len >= 2
108 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 146 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
109 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 147 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
110 { 148 {
111 *clen = 2; 149 *clen = 2;
112 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 150 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
113 } 151 }
114 else 152 else
115 { 153 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
116 *clen = (STRLEN)-1; 154}
117 return (UV)-1; 155
118 } 156// likewise for encoding, also never called for ascii codepoints
157// this function takes advantage of this fact, although current gccs
158// seem to optimise the check for >= 0x80 away anyways
159INLINE unsigned char *
160encode_utf8 (unsigned char *s, UV ch)
161{
162 if (expect_false (ch < 0x000080))
163 *s++ = ch;
164 else if (expect_true (ch < 0x000800))
165 *s++ = 0xc0 | ( ch >> 6),
166 *s++ = 0x80 | ( ch & 0x3f);
167 else if ( ch < 0x010000)
168 *s++ = 0xe0 | ( ch >> 12),
169 *s++ = 0x80 | ((ch >> 6) & 0x3f),
170 *s++ = 0x80 | ( ch & 0x3f);
171 else if ( ch < 0x110000)
172 *s++ = 0xf0 | ( ch >> 18),
173 *s++ = 0x80 | ((ch >> 12) & 0x3f),
174 *s++ = 0x80 | ((ch >> 6) & 0x3f),
175 *s++ = 0x80 | ( ch & 0x3f);
176
177 return s;
178}
179
180// convert offset pointer to character index, sv must be string
181static STRLEN
182ptr_to_index (SV *sv, char *offset)
183{
184 return SvUTF8 (sv)
185 ? utf8_distance (offset, SvPVX (sv))
186 : offset - SvPVX (sv);
119} 187}
120 188
121///////////////////////////////////////////////////////////////////////////// 189/////////////////////////////////////////////////////////////////////////////
122// encoder 190// encoder
123 191
127 char *cur; // SvPVX (sv) + current output position 195 char *cur; // SvPVX (sv) + current output position
128 char *end; // SvEND (sv) 196 char *end; // SvEND (sv)
129 SV *sv; // result scalar 197 SV *sv; // result scalar
130 JSON json; 198 JSON json;
131 U32 indent; // indentation level 199 U32 indent; // indentation level
132 U32 maxdepth; // max. indentation/recursion level 200 UV limit; // escape character values >= this value when encoding
133} enc_t; 201} enc_t;
134 202
135inline void 203INLINE void
136need (enc_t *enc, STRLEN len) 204need (enc_t *enc, STRLEN len)
137{ 205{
138 if (expect_false (enc->cur + len >= enc->end)) 206 if (expect_false (enc->cur + len >= enc->end))
139 { 207 {
140 STRLEN cur = enc->cur - SvPVX (enc->sv); 208 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
141 SvGROW (enc->sv, cur + len + 1); 209 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
142 enc->cur = SvPVX (enc->sv) + cur; 210 enc->cur = SvPVX (enc->sv) + cur;
143 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 211 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
144 } 212 }
145} 213}
146 214
147inline void 215INLINE void
148encode_ch (enc_t *enc, char ch) 216encode_ch (enc_t *enc, char ch)
149{ 217{
150 need (enc, 1); 218 need (enc, 1);
151 *enc->cur++ = ch; 219 *enc->cur++ = ch;
152} 220}
206 { 274 {
207 uch = ch; 275 uch = ch;
208 clen = 1; 276 clen = 1;
209 } 277 }
210 278
211 if (uch > 0x10FFFFUL) 279 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 { 280 {
216 if (uch > 0xFFFFUL) 281 if (uch >= 0x10000UL)
217 { 282 {
283 if (uch >= 0x110000UL)
284 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
285
218 need (enc, len += 11); 286 need (enc, len += 11);
219 sprintf (enc->cur, "\\u%04x\\u%04x", 287 sprintf (enc->cur, "\\u%04x\\u%04x",
220 (int)((uch - 0x10000) / 0x400 + 0xD800), 288 (int)((uch - 0x10000) / 0x400 + 0xD800),
221 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 289 (int)((uch - 0x10000) % 0x400 + 0xDC00));
222 enc->cur += 12; 290 enc->cur += 12;
223 } 291 }
224 else 292 else
225 { 293 {
226 static char hexdigit [16] = "0123456789abcdef";
227 need (enc, len += 5); 294 need (enc, len += 5);
228 *enc->cur++ = '\\'; 295 *enc->cur++ = '\\';
229 *enc->cur++ = 'u'; 296 *enc->cur++ = 'u';
230 *enc->cur++ = hexdigit [ uch >> 12 ]; 297 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
231 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 298 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
232 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 299 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
233 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 300 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
234 } 301 }
235 302
236 str += clen; 303 str += clen;
237 } 304 }
238 else if (enc->json.flags & F_LATIN1) 305 else if (enc->json.flags & F_LATIN1)
250 while (--clen); 317 while (--clen);
251 } 318 }
252 else 319 else
253 { 320 {
254 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 321 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
255 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 322 enc->cur = encode_utf8 (enc->cur, uch);
256 ++str; 323 ++str;
257 } 324 }
258 } 325 }
259 } 326 }
260 } 327 }
261 328
262 --len; 329 --len;
263 } 330 }
264} 331}
265 332
266inline void 333INLINE void
267encode_indent (enc_t *enc) 334encode_indent (enc_t *enc)
268{ 335{
269 if (enc->json.flags & F_INDENT) 336 if (enc->json.flags & F_INDENT)
270 { 337 {
271 int spaces = enc->indent * INDENT_STEP; 338 int spaces = enc->indent * INDENT_STEP;
274 memset (enc->cur, ' ', spaces); 341 memset (enc->cur, ' ', spaces);
275 enc->cur += spaces; 342 enc->cur += spaces;
276 } 343 }
277} 344}
278 345
279inline void 346INLINE void
280encode_space (enc_t *enc) 347encode_space (enc_t *enc)
281{ 348{
282 need (enc, 1); 349 need (enc, 1);
283 encode_ch (enc, ' '); 350 encode_ch (enc, ' ');
284} 351}
285 352
286inline void 353INLINE void
287encode_nl (enc_t *enc) 354encode_nl (enc_t *enc)
288{ 355{
289 if (enc->json.flags & F_INDENT) 356 if (enc->json.flags & F_INDENT)
290 { 357 {
291 need (enc, 1); 358 need (enc, 1);
292 encode_ch (enc, '\n'); 359 encode_ch (enc, '\n');
293 } 360 }
294} 361}
295 362
296inline void 363INLINE void
297encode_comma (enc_t *enc) 364encode_comma (enc_t *enc)
298{ 365{
299 encode_ch (enc, ','); 366 encode_ch (enc, ',');
300 367
301 if (enc->json.flags & F_INDENT) 368 if (enc->json.flags & F_INDENT)
309static void 376static void
310encode_av (enc_t *enc, AV *av) 377encode_av (enc_t *enc, AV *av)
311{ 378{
312 int i, len = av_len (av); 379 int i, len = av_len (av);
313 380
314 if (enc->indent >= enc->maxdepth) 381 if (enc->indent >= enc->json.max_depth)
315 croak ("data structure too deep (hit recursion limit)"); 382 croak (ERR_NESTING_EXCEEDED);
316 383
317 encode_ch (enc, '['); 384 encode_ch (enc, '[');
318 385
319 if (len >= 0) 386 if (len >= 0)
320 { 387 {
394 461
395static void 462static void
396encode_hv (enc_t *enc, HV *hv) 463encode_hv (enc_t *enc, HV *hv)
397{ 464{
398 HE *he; 465 HE *he;
399 int count;
400 466
401 if (enc->indent >= enc->maxdepth) 467 if (enc->indent >= enc->json.max_depth)
402 croak ("data structure too deep (hit recursion limit)"); 468 croak (ERR_NESTING_EXCEEDED);
403 469
404 encode_ch (enc, '{'); 470 encode_ch (enc, '{');
405 471
406 // for canonical output we have to sort by keys first 472 // for canonical output we have to sort by keys first
407 // actually, this is mostly due to the stupid so-called 473 // actually, this is mostly due to the stupid so-called
408 // security workaround added somewhere in 5.8.x. 474 // security workaround added somewhere in 5.8.x
409 // that randomises hash orderings 475 // that randomises hash orderings
410 if (enc->json.flags & F_CANONICAL) 476 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
411 { 477 {
412 int count = hv_iterinit (hv); 478 int count = hv_iterinit (hv);
413 479
414 if (SvMAGICAL (hv)) 480 if (SvMAGICAL (hv))
415 { 481 {
588 654
589 if (len == 1 && *pv == '1') 655 if (len == 1 && *pv == '1')
590 encode_str (enc, "true", 4, 0); 656 encode_str (enc, "true", 4, 0);
591 else if (len == 1 && *pv == '0') 657 else if (len == 1 && *pv == '0')
592 encode_str (enc, "false", 5, 0); 658 encode_str (enc, "false", 5, 0);
659 else if (enc->json.flags & F_ALLOW_UNKNOWN)
660 encode_str (enc, "null", 4, 0);
593 else 661 else
594 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 662 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
595 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 663 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
596 } 664 }
665 else if (enc->json.flags & F_ALLOW_UNKNOWN)
666 encode_str (enc, "null", 4, 0);
597 else 667 else
598 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 668 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
599 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 669 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
600} 670}
601 671
619 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 689 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
620 enc->cur += strlen (enc->cur); 690 enc->cur += strlen (enc->cur);
621 } 691 }
622 else if (SvIOKp (sv)) 692 else if (SvIOKp (sv))
623 { 693 {
624 // we assume we can always read an IV as a UV 694 // we assume we can always read an IV as a UV and vice versa
625 if (SvUV (sv) & ~(UV)0x7fff) 695 // we assume two's complement
626 { 696 // we assume no aliasing issues in the union
627 // large integer, use the (rather slow) snprintf way. 697 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
628 need (enc, sizeof (UV) * 3); 698 : 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 { 699 {
636 // optimise the "small number case" 700 // optimise the "small number case"
637 // code will likely be branchless and use only a single multiplication 701 // code will likely be branchless and use only a single multiplication
702 // works for numbers up to 59074
638 I32 i = SvIV (sv); 703 I32 i = SvIVX (sv);
639 U32 u; 704 U32 u;
640 char digit, nz = 0; 705 char digit, nz = 0;
641 706
642 need (enc, 6); 707 need (enc, 6);
643 708
649 714
650 // now output digit by digit, each time masking out the integer part 715 // 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, 716 // and multiplying by 5 while moving the decimal point one to the right,
652 // resulting in a net multiplication by 10. 717 // resulting in a net multiplication by 10.
653 // we always write the digit to memory but conditionally increment 718 // we always write the digit to memory but conditionally increment
654 // the pointer, to ease the usage of conditional move instructions. 719 // 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; 720 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; 721 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; 722 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; 723 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' 724 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
660 } 725 }
726 else
727 {
728 // large integer, use the (rather slow) snprintf way.
729 need (enc, IVUV_MAXCHARS);
730 enc->cur +=
731 SvIsUV(sv)
732 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
733 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
734 }
661 } 735 }
662 else if (SvROK (sv)) 736 else if (SvROK (sv))
663 encode_rv (enc, SvRV (sv)); 737 encode_rv (enc, SvRV (sv));
664 else if (!SvOK (sv)) 738 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
665 encode_str (enc, "null", 4, 0); 739 encode_str (enc, "null", 4, 0);
666 else 740 else
667 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 741 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
668 SvPV_nolen (sv), SvFLAGS (sv)); 742 SvPV_nolen (sv), SvFLAGS (sv));
669} 743}
679 enc.json = *json; 753 enc.json = *json;
680 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 754 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
681 enc.cur = SvPVX (enc.sv); 755 enc.cur = SvPVX (enc.sv);
682 enc.end = SvEND (enc.sv); 756 enc.end = SvEND (enc.sv);
683 enc.indent = 0; 757 enc.indent = 0;
684 enc.maxdepth = DEC_DEPTH (enc.json.flags); 758 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
759 : enc.json.flags & F_LATIN1 ? 0x000100UL
760 : 0x110000UL;
685 761
686 SvPOK_only (enc.sv); 762 SvPOK_only (enc.sv);
687 encode_sv (&enc, scalar); 763 encode_sv (&enc, scalar);
764 encode_nl (&enc);
688 765
689 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 766 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
690 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 767 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
691 768
692 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 769 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
710 JSON json; 787 JSON json;
711 U32 depth; // recursion depth 788 U32 depth; // recursion depth
712 U32 maxdepth; // recursion depth limit 789 U32 maxdepth; // recursion depth limit
713} dec_t; 790} dec_t;
714 791
715inline void 792INLINE void
716decode_comment (dec_t *dec) 793decode_comment (dec_t *dec)
717{ 794{
718 // only '#'-style comments allowed a.t.m. 795 // only '#'-style comments allowed a.t.m.
719 796
720 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d) 797 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
721 ++dec->cur; 798 ++dec->cur;
722} 799}
723 800
724inline void 801INLINE void
725decode_ws (dec_t *dec) 802decode_ws (dec_t *dec)
726{ 803{
727 for (;;) 804 for (;;)
728 { 805 {
729 char ch = *dec->cur; 806 char ch = *dec->cur;
753 if (*dec->cur != ch) \ 830 if (*dec->cur != ch) \
754 ERR (# ch " expected"); \ 831 ERR (# ch " expected"); \
755 ++dec->cur; \ 832 ++dec->cur; \
756 SE 833 SE
757 834
758#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 835#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
759#define DEC_DEC_DEPTH --dec->depth 836#define DEC_DEC_DEPTH --dec->depth
760 837
761static SV *decode_sv (dec_t *dec); 838static SV *decode_sv (dec_t *dec);
762 839
763static signed char decode_hexdigit[256]; 840static signed char decode_hexdigit[256];
855 932
856 if (hi >= 0x80) 933 if (hi >= 0x80)
857 { 934 {
858 utf8 = 1; 935 utf8 = 1;
859 936
860 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 937 cur = encode_utf8 (cur, hi);
861 } 938 }
862 else 939 else
863 *cur++ = hi; 940 *cur++ = hi;
864 } 941 }
865 break; 942 break;
867 default: 944 default:
868 --dec_cur; 945 --dec_cur;
869 ERR ("illegal backslash escape sequence in string"); 946 ERR ("illegal backslash escape sequence in string");
870 } 947 }
871 } 948 }
872 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 949 else if (expect_true (ch >= 0x20 && ch < 0x80))
873 *cur++ = ch; 950 *cur++ = ch;
874 else if (ch >= 0x80) 951 else if (ch >= 0x80)
875 { 952 {
876 STRLEN clen; 953 STRLEN clen;
877 UV uch; 954 UV uch;
903 { 980 {
904 STRLEN len = cur - buf; 981 STRLEN len = cur - buf;
905 982
906 if (sv) 983 if (sv)
907 { 984 {
908 SvGROW (sv, SvCUR (sv) + len + 1); 985 STRLEN cur = SvCUR (sv);
986
987 if (SvLEN (sv) <= cur + len)
988 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
989
909 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 990 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
910 SvCUR_set (sv, SvCUR (sv) + len); 991 SvCUR_set (sv, SvCUR (sv) + len);
911 } 992 }
912 else 993 else
913 sv = newSVpvn (buf, len); 994 sv = newSVpvn (buf, len);
1004 1085
1005 // special case the rather common 1..5-digit-int case 1086 // special case the rather common 1..5-digit-int case
1006 if (*start == '-') 1087 if (*start == '-')
1007 switch (len) 1088 switch (len)
1008 { 1089 {
1009 case 2: return newSViv (-( start [1] - '0' * 1)); 1090 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1010 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1091 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)); 1092 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)); 1093 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1013 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1094 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1014 } 1095 }
1015 else 1096 else
1016 switch (len) 1097 switch (len)
1017 { 1098 {
1018 case 1: return newSViv ( start [0] - '0' * 1); 1099 case 1: return newSViv ( start [0] - '0' * 1);
1019 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1100 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1020 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1101 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1021 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1102 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1022 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1103 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1023 } 1104 }
1024 1105
1025 { 1106 {
1026 UV uv; 1107 UV uv;
1027 int numtype = grok_number (start, len, &uv); 1108 int numtype = grok_number (start, len, &uv);
1135 char *p = dec->cur; 1216 char *p = dec->cur;
1136 char *e = p + 24; // only try up to 24 bytes 1217 char *e = p + 24; // only try up to 24 bytes
1137 1218
1138 for (;;) 1219 for (;;)
1139 { 1220 {
1140 // the >= 0x80 is true on most architectures 1221 // the >= 0x80 is false on most architectures
1141 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1222 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1142 { 1223 {
1143 // slow path, back up and use decode_str 1224 // slow path, back up and use decode_str
1144 SV *key = decode_str (dec); 1225 SV *key = decode_str (dec);
1145 if (!key) 1226 if (!key)
1276 1357
1277static SV * 1358static SV *
1278decode_sv (dec_t *dec) 1359decode_sv (dec_t *dec)
1279{ 1360{
1280 // the beauty of JSON: you need exactly one character lookahead 1361 // the beauty of JSON: you need exactly one character lookahead
1281 // to parse anything. 1362 // to parse everything.
1282 switch (*dec->cur) 1363 switch (*dec->cur)
1283 { 1364 {
1284 case '"': ++dec->cur; return decode_str (dec); 1365 case '"': ++dec->cur; return decode_str (dec);
1285 case '[': ++dec->cur; return decode_av (dec); 1366 case '[': ++dec->cur; return decode_av (dec);
1286 case '{': ++dec->cur; return decode_hv (dec); 1367 case '{': ++dec->cur; return decode_hv (dec);
1287 1368
1288 case '-': 1369 case '-':
1289 case '0': case '1': case '2': case '3': case '4': 1370 case '0': case '1': case '2': case '3': case '4':
1290 case '5': case '6': case '7': case '8': case '9': 1371 case '5': case '6': case '7': case '8': case '9':
1291 return decode_num (dec); 1372 return decode_num (dec);
1293 case 't': 1374 case 't':
1294 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1375 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1295 { 1376 {
1296 dec->cur += 4; 1377 dec->cur += 4;
1297#if JSON_SLOW 1378#if JSON_SLOW
1298 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1379 json_true = get_bool ("JSON::XS::true");
1299#endif 1380#endif
1300 return SvREFCNT_inc (json_true); 1381 return newSVsv (json_true);
1301 } 1382 }
1302 else 1383 else
1303 ERR ("'true' expected"); 1384 ERR ("'true' expected");
1304 1385
1305 break; 1386 break;
1307 case 'f': 1388 case 'f':
1308 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1389 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1309 { 1390 {
1310 dec->cur += 5; 1391 dec->cur += 5;
1311#if JSON_SLOW 1392#if JSON_SLOW
1312 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1393 json_false = get_bool ("JSON::XS::false");
1313#endif 1394#endif
1314 return SvREFCNT_inc (json_false); 1395 return newSVsv (json_false);
1315 } 1396 }
1316 else 1397 else
1317 ERR ("'false' expected"); 1398 ERR ("'false' expected");
1318 1399
1319 break; 1400 break;
1337fail: 1418fail:
1338 return 0; 1419 return 0;
1339} 1420}
1340 1421
1341static SV * 1422static SV *
1342decode_json (SV *string, JSON *json, UV *offset_return) 1423decode_json (SV *string, JSON *json, char **offset_return)
1343{ 1424{
1344 dec_t dec; 1425 dec_t dec;
1345 UV offset;
1346 SV *sv; 1426 SV *sv;
1347 1427
1428 /* work around bugs in 5.10 where manipulating magic values
1429 * will perl ignore the magic in subsequent accesses
1430 */
1348 SvGETMAGIC (string); 1431 /*SvGETMAGIC (string);*/
1432 if (SvMAGICAL (string))
1433 string = sv_2mortal (newSVsv (string));
1434
1349 SvUPGRADE (string, SVt_PV); 1435 SvUPGRADE (string, SVt_PV);
1350 1436
1351 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1437 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1438 * assertion with -DDEBUGGING, although SvCUR is documented to
1439 * return the xpv_cur field which certainly exists after upgrading.
1440 * according to nicholas clark, calling SvPOK fixes this.
1441 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1442 * and hope for the best.
1443 * Damnit, SvPV_nolen still trips over yet another assertion. This
1444 * assertion business is seriously broken, try yet another workaround
1445 * for the broken -DDEBUGGING.
1446 */
1447 {
1448#ifdef DEBUGGING
1449 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1450#else
1451 STRLEN offset = SvCUR (string);
1452#endif
1453
1454 if (offset > json->max_size && json->max_size)
1352 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1455 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1353 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1456 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1457 }
1354 1458
1355 if (json->flags & F_UTF8) 1459 if (json->flags & F_UTF8)
1356 sv_utf8_downgrade (string, 0); 1460 sv_utf8_downgrade (string, 0);
1357 else 1461 else
1358 sv_utf8_upgrade (string); 1462 sv_utf8_upgrade (string);
1359 1463
1360 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1464 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1361 1465
1362 dec.json = *json; 1466 dec.json = *json;
1363 dec.cur = SvPVX (string); 1467 dec.cur = SvPVX (string);
1364 dec.end = SvEND (string); 1468 dec.end = SvEND (string);
1365 dec.err = 0; 1469 dec.err = 0;
1366 dec.depth = 0; 1470 dec.depth = 0;
1367 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1368 1471
1369 if (dec.json.cb_object || dec.json.cb_sk_object) 1472 if (dec.json.cb_object || dec.json.cb_sk_object)
1370 dec.json.flags |= F_HOOK; 1473 dec.json.flags |= F_HOOK;
1371 1474
1372 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1475 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1373 1476
1374 decode_ws (&dec); 1477 decode_ws (&dec);
1375 sv = decode_sv (&dec); 1478 sv = decode_sv (&dec);
1479
1480 if (offset_return)
1481 *offset_return = dec.cur;
1376 1482
1377 if (!(offset_return || !sv)) 1483 if (!(offset_return || !sv))
1378 { 1484 {
1379 // check for trailing garbage 1485 // check for trailing garbage
1380 decode_ws (&dec); 1486 decode_ws (&dec);
1383 { 1489 {
1384 dec.err = "garbage after JSON object"; 1490 dec.err = "garbage after JSON object";
1385 SvREFCNT_dec (sv); 1491 SvREFCNT_dec (sv);
1386 sv = 0; 1492 sv = 0;
1387 } 1493 }
1388 }
1389
1390 if (offset_return || !sv)
1391 {
1392 offset = dec.json.flags & F_UTF8
1393 ? dec.cur - SvPVX (string)
1394 : utf8_distance (dec.cur, SvPVX (string));
1395
1396 if (offset_return)
1397 *offset_return = offset;
1398 } 1494 }
1399 1495
1400 if (!sv) 1496 if (!sv)
1401 { 1497 {
1402 SV *uni = sv_newmortal (); 1498 SV *uni = sv_newmortal ();
1408 SAVEVPTR (PL_curcop); 1504 SAVEVPTR (PL_curcop);
1409 PL_curcop = &cop; 1505 PL_curcop = &cop;
1410 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1506 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1411 LEAVE; 1507 LEAVE;
1412 1508
1413 croak ("%s, at character offset %d [\"%s\"]", 1509 croak ("%s, at character offset %d (before \"%s\")",
1414 dec.err, 1510 dec.err,
1415 (int)offset, 1511 ptr_to_index (string, dec.cur),
1416 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1512 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1417 } 1513 }
1418 1514
1419 sv = sv_2mortal (sv); 1515 sv = sv_2mortal (sv);
1420 1516
1421 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1517 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1422 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1518 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1423 1519
1424 return sv; 1520 return sv;
1521}
1522
1523/////////////////////////////////////////////////////////////////////////////
1524// incremental parser
1525
1526static void
1527incr_parse (JSON *self)
1528{
1529 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1530
1531 for (;;)
1532 {
1533 //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
1534 switch (self->incr_mode)
1535 {
1536 // only used for intiial whitespace skipping
1537 case INCR_M_WS:
1538 for (;;)
1539 {
1540 if (*p > 0x20)
1541 {
1542 self->incr_mode = INCR_M_JSON;
1543 goto incr_m_json;
1544 }
1545 else if (!*p)
1546 goto interrupt;
1547
1548 ++p;
1549 }
1550
1551 // skip a single char inside a string (for \\-processing)
1552 case INCR_M_BS:
1553 if (!*p)
1554 goto interrupt;
1555
1556 ++p;
1557 self->incr_mode = INCR_M_STR;
1558 goto incr_m_str;
1559
1560 // inside a string
1561 case INCR_M_STR:
1562 incr_m_str:
1563 for (;;)
1564 {
1565 if (*p == '"')
1566 {
1567 ++p;
1568 self->incr_mode = INCR_M_JSON;
1569
1570 if (!self->incr_nest)
1571 goto interrupt;
1572
1573 goto incr_m_json;
1574 }
1575 else if (*p == '\\')
1576 {
1577 ++p; // "virtually" consumes character after \
1578
1579 if (!*p) // if at end of string we have to switch modes
1580 {
1581 self->incr_mode = INCR_M_BS;
1582 goto interrupt;
1583 }
1584 }
1585 else if (!*p)
1586 goto interrupt;
1587
1588 ++p;
1589 }
1590
1591 // after initial ws, outside string
1592 case INCR_M_JSON:
1593 incr_m_json:
1594 for (;;)
1595 {
1596 switch (*p++)
1597 {
1598 case 0:
1599 --p;
1600 goto interrupt;
1601
1602 case 0x09:
1603 case 0x0a:
1604 case 0x0d:
1605 case 0x20:
1606 if (!self->incr_nest)
1607 {
1608 --p; // do not eat the whitespace, let the next round do it
1609 goto interrupt;
1610 }
1611 break;
1612
1613 case '"':
1614 self->incr_mode = INCR_M_STR;
1615 goto incr_m_str;
1616
1617 case '[':
1618 case '{':
1619 if (++self->incr_nest > self->max_depth)
1620 croak (ERR_NESTING_EXCEEDED);
1621 break;
1622
1623 case ']':
1624 case '}':
1625 if (--self->incr_nest <= 0)
1626 goto interrupt;
1627 }
1628 }
1629 }
1630
1631 modechange:
1632 ;
1633 }
1634
1635interrupt:
1636 self->incr_pos = p - SvPVX (self->incr_text);
1637 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1425} 1638}
1426 1639
1427///////////////////////////////////////////////////////////////////////////// 1640/////////////////////////////////////////////////////////////////////////////
1428// XS interface functions 1641// XS interface functions
1429 1642
1441 : -1; 1654 : -1;
1442 1655
1443 json_stash = gv_stashpv ("JSON::XS" , 1); 1656 json_stash = gv_stashpv ("JSON::XS" , 1);
1444 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1657 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1445 1658
1446 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1659 json_true = get_bool ("JSON::XS::true");
1447 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1660 json_false = get_bool ("JSON::XS::false");
1661
1662 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1448} 1663}
1449 1664
1450PROTOTYPES: DISABLE 1665PROTOTYPES: DISABLE
1451 1666
1452void CLONE (...) 1667void CLONE (...)
1457void new (char *klass) 1672void new (char *klass)
1458 PPCODE: 1673 PPCODE:
1459{ 1674{
1460 SV *pv = NEWSV (0, sizeof (JSON)); 1675 SV *pv = NEWSV (0, sizeof (JSON));
1461 SvPOK_only (pv); 1676 SvPOK_only (pv);
1462 Zero (SvPVX (pv), 1, JSON); 1677 json_init ((JSON *)SvPVX (pv));
1463 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1464 XPUSHs (sv_2mortal (sv_bless ( 1678 XPUSHs (sv_2mortal (sv_bless (
1465 newRV_noinc (pv), 1679 newRV_noinc (pv),
1466 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1680 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1467 ))); 1681 )));
1468} 1682}
1480 allow_nonref = F_ALLOW_NONREF 1694 allow_nonref = F_ALLOW_NONREF
1481 shrink = F_SHRINK 1695 shrink = F_SHRINK
1482 allow_blessed = F_ALLOW_BLESSED 1696 allow_blessed = F_ALLOW_BLESSED
1483 convert_blessed = F_CONV_BLESSED 1697 convert_blessed = F_CONV_BLESSED
1484 relaxed = F_RELAXED 1698 relaxed = F_RELAXED
1699 allow_unknown = F_ALLOW_UNKNOWN
1485 PPCODE: 1700 PPCODE:
1486{ 1701{
1487 if (enable) 1702 if (enable)
1488 self->flags |= ix; 1703 self->flags |= ix;
1489 else 1704 else
1504 get_allow_nonref = F_ALLOW_NONREF 1719 get_allow_nonref = F_ALLOW_NONREF
1505 get_shrink = F_SHRINK 1720 get_shrink = F_SHRINK
1506 get_allow_blessed = F_ALLOW_BLESSED 1721 get_allow_blessed = F_ALLOW_BLESSED
1507 get_convert_blessed = F_CONV_BLESSED 1722 get_convert_blessed = F_CONV_BLESSED
1508 get_relaxed = F_RELAXED 1723 get_relaxed = F_RELAXED
1724 get_allow_unknown = F_ALLOW_UNKNOWN
1509 PPCODE: 1725 PPCODE:
1510 XPUSHs (boolSV (self->flags & ix)); 1726 XPUSHs (boolSV (self->flags & ix));
1511 1727
1512void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1728void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1513 PPCODE: 1729 PPCODE:
1514{ 1730 self->max_depth = max_depth;
1515 UV log2 = 0;
1516
1517 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1518
1519 while ((1UL << log2) < max_depth)
1520 ++log2;
1521
1522 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1523
1524 XPUSHs (ST (0)); 1731 XPUSHs (ST (0));
1525}
1526 1732
1527U32 get_max_depth (JSON *self) 1733U32 get_max_depth (JSON *self)
1528 CODE: 1734 CODE:
1529 RETVAL = DEC_DEPTH (self->flags); 1735 RETVAL = self->max_depth;
1530 OUTPUT: 1736 OUTPUT:
1531 RETVAL 1737 RETVAL
1532 1738
1533void max_size (JSON *self, UV max_size = 0) 1739void max_size (JSON *self, U32 max_size = 0)
1534 PPCODE: 1740 PPCODE:
1535{ 1741 self->max_size = max_size;
1536 UV log2 = 0;
1537
1538 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1539 if (max_size == 1) max_size = 2;
1540
1541 while ((1UL << log2) < max_size)
1542 ++log2;
1543
1544 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1545
1546 XPUSHs (ST (0)); 1742 XPUSHs (ST (0));
1547}
1548 1743
1549int get_max_size (JSON *self) 1744int get_max_size (JSON *self)
1550 CODE: 1745 CODE:
1551 RETVAL = DEC_SIZE (self->flags); 1746 RETVAL = self->max_size;
1552 OUTPUT: 1747 OUTPUT:
1553 RETVAL 1748 RETVAL
1554 1749
1555void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1750void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1556 PPCODE: 1751 PPCODE:
1592 XPUSHs (decode_json (jsonstr, self, 0)); 1787 XPUSHs (decode_json (jsonstr, self, 0));
1593 1788
1594void decode_prefix (JSON *self, SV *jsonstr) 1789void decode_prefix (JSON *self, SV *jsonstr)
1595 PPCODE: 1790 PPCODE:
1596{ 1791{
1597 UV offset; 1792 char *offset;
1598 EXTEND (SP, 2); 1793 EXTEND (SP, 2);
1599 PUSHs (decode_json (jsonstr, self, &offset)); 1794 PUSHs (decode_json (jsonstr, self, &offset));
1600 PUSHs (sv_2mortal (newSVuv (offset))); 1795 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1796}
1797
1798void incr_parse (JSON *self, SV *jsonstr = 0)
1799 PPCODE:
1800{
1801 if (!self->incr_text)
1802 self->incr_text = newSVpvn ("", 0);
1803
1804 // append data, if any
1805 if (jsonstr)
1806 {
1807 if (SvUTF8 (jsonstr))
1808 {
1809 if (!SvUTF8 (self->incr_text))
1810 {
1811 /* utf-8-ness differs, need to upgrade */
1812 sv_utf8_upgrade (self->incr_text);
1813
1814 if (self->incr_pos)
1815 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1816 - (U8 *)SvPVX (self->incr_text);
1817 }
1818 }
1819 else if (SvUTF8 (self->incr_text))
1820 sv_utf8_upgrade (jsonstr);
1821
1822 {
1823 STRLEN len;
1824 const char *str = SvPV (jsonstr, len);
1825 STRLEN cur = SvCUR (self->incr_text);
1826
1827 if (SvLEN (self->incr_text) <= cur + len)
1828 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1829
1830 Move (str, SvEND (self->incr_text), len, char);
1831 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1832 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1833 }
1834 }
1835
1836 if (GIMME_V != G_VOID)
1837 do
1838 {
1839 char *offset;
1840
1841 if (!INCR_DONE (self))
1842 {
1843 incr_parse (self);
1844
1845 if (self->incr_pos > self->max_size && self->max_size)
1846 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1847 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1848
1849 if (!INCR_DONE (self))
1850 break;
1851 }
1852
1853 XPUSHs (decode_json (self->incr_text, self, &offset));
1854
1855 self->incr_pos -= offset - SvPVX (self->incr_text);
1856 self->incr_nest = 0;
1857 self->incr_mode = 0;
1858
1859 sv_chop (self->incr_text, offset);
1860 }
1861 while (GIMME_V == G_ARRAY);
1862}
1863
1864SV *incr_text (JSON *self)
1865 ATTRS: lvalue
1866 CODE:
1867{
1868 if (self->incr_pos)
1869 croak ("incr_text can not be called when the incremental parser already started parsing");
1870
1871 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1872}
1873 OUTPUT:
1874 RETVAL
1875
1876void incr_skip (JSON *self)
1877 CODE:
1878{
1879 if (self->incr_pos)
1880 {
1881 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
1882 self->incr_pos = 0;
1883 self->incr_nest = 0;
1884 self->incr_mode = 0;
1885 }
1886}
1887
1888void incr_reset (JSON *self)
1889 CODE:
1890{
1891 SvREFCNT_dec (self->incr_text);
1892 self->incr_text = 0;
1893 self->incr_pos = 0;
1894 self->incr_nest = 0;
1895 self->incr_mode = 0;
1601} 1896}
1602 1897
1603void DESTROY (JSON *self) 1898void DESTROY (JSON *self)
1604 CODE: 1899 CODE:
1605 SvREFCNT_dec (self->cb_sk_object); 1900 SvREFCNT_dec (self->cb_sk_object);
1606 SvREFCNT_dec (self->cb_object); 1901 SvREFCNT_dec (self->cb_object);
1902 SvREFCNT_dec (self->incr_text);
1607 1903
1608PROTOTYPES: ENABLE 1904PROTOTYPES: ENABLE
1609 1905
1610void encode_json (SV *scalar) 1906void encode_json (SV *scalar)
1907 ALIAS:
1908 to_json_ = 0
1909 encode_json = F_UTF8
1611 PPCODE: 1910 PPCODE:
1612{ 1911{
1613 JSON json = { F_DEFAULT | F_UTF8 }; 1912 JSON json;
1913 json_init (&json);
1914 json.flags |= ix;
1614 XPUSHs (encode_json (scalar, &json)); 1915 XPUSHs (encode_json (scalar, &json));
1615} 1916}
1616 1917
1617void decode_json (SV *jsonstr) 1918void decode_json (SV *jsonstr)
1919 ALIAS:
1920 from_json_ = 0
1921 decode_json = F_UTF8
1618 PPCODE: 1922 PPCODE:
1619{ 1923{
1620 JSON json = { F_DEFAULT | F_UTF8 }; 1924 JSON json;
1925 json_init (&json);
1926 json.flags |= ix;
1621 XPUSHs (decode_json (jsonstr, &json, 0)); 1927 XPUSHs (decode_json (jsonstr, &json, 0));
1622} 1928}
1623 1929
1930

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines