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.73 by root, Wed Mar 19 13:44:43 2008 UTC vs.
Revision 1.114 by root, Wed Aug 1 19:04:41 2012 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
46
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
50 48
51#define SB do { 49#define SB do {
52#define SE } while (0) 50#define SE } while (0)
53 51
54#if __GNUC__ >= 3 52#if __GNUC__ >= 3
64 62
65#define IN_RANGE_INC(type,val,beg,end) \ 63#define IN_RANGE_INC(type,val,beg,end) \
66 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 64 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
67 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 65 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
68 66
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68
69#ifdef USE_ITHREADS 69#ifdef USE_ITHREADS
70# define JSON_SLOW 1 70# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
72#else 72#else
73# define JSON_SLOW 0 73# define JSON_SLOW 0
75#endif 75#endif
76 76
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 77static HV *json_stash, *json_boolean_stash; // JSON::XS::
78static SV *json_true, *json_false; 78static SV *json_true, *json_false;
79 79
80enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash
84 INCR_M_C0, // inside comment in initial whitespace sequence
85 INCR_M_C1, // inside comment in other places
86 INCR_M_JSON // outside anything, count nesting
87};
88
89#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
90
80typedef struct { 91typedef struct {
81 U32 flags; 92 U32 flags;
93 U32 max_depth;
94 STRLEN max_size;
95
82 SV *cb_object; 96 SV *cb_object;
83 HV *cb_sk_object; 97 HV *cb_sk_object;
98
99 // for the incremental parser
100 SV *incr_text; // the source text so far
101 STRLEN incr_pos; // the current offset into the text
102 int incr_nest; // {[]}-nesting level
103 unsigned char incr_mode;
84} JSON; 104} JSON;
105
106INLINE void
107json_init (JSON *json)
108{
109 Zero (json, 1, JSON);
110 json->max_depth = 512;
111}
85 112
86///////////////////////////////////////////////////////////////////////////// 113/////////////////////////////////////////////////////////////////////////////
87// utility functions 114// utility functions
88 115
116INLINE SV *
117get_bool (const char *name)
118{
119 SV *sv = get_sv (name, 1);
120
121 SvREADONLY_on (sv);
122 SvREADONLY_on (SvRV (sv));
123
124 return sv;
125}
126
89INLINE void 127INLINE void
90shrink (SV *sv) 128shrink (SV *sv)
91{ 129{
92 sv_utf8_downgrade (sv, 1); 130 sv_utf8_downgrade (sv, 1);
131
93 if (SvLEN (sv) > SvCUR (sv) + 1) 132 if (SvLEN (sv) > SvCUR (sv) + 1)
94 { 133 {
95#ifdef SvPV_shrink_to_cur 134#ifdef SvPV_shrink_to_cur
96 SvPV_shrink_to_cur (sv); 135 SvPV_shrink_to_cur (sv);
97#elif defined (SvPV_renew) 136#elif defined (SvPV_renew)
123// this function takes advantage of this fact, although current gccs 162// this function takes advantage of this fact, although current gccs
124// seem to optimise the check for >= 0x80 away anyways 163// seem to optimise the check for >= 0x80 away anyways
125INLINE unsigned char * 164INLINE unsigned char *
126encode_utf8 (unsigned char *s, UV ch) 165encode_utf8 (unsigned char *s, UV ch)
127{ 166{
128 if (ch <= 0x7FF) 167 if (expect_false (ch < 0x000080))
129 { 168 *s++ = ch;
130 *s++ = (ch >> 6) | 0xc0; 169 else if (expect_true (ch < 0x000800))
131 *s++ = (ch & 0x3f) | 0x80; 170 *s++ = 0xc0 | ( ch >> 6),
132 } 171 *s++ = 0x80 | ( ch & 0x3f);
133 else 172 else if ( ch < 0x010000)
134 s = uvuni_to_utf8_flags (s, ch, 0); 173 *s++ = 0xe0 | ( ch >> 12),
174 *s++ = 0x80 | ((ch >> 6) & 0x3f),
175 *s++ = 0x80 | ( ch & 0x3f);
176 else if ( ch < 0x110000)
177 *s++ = 0xf0 | ( ch >> 18),
178 *s++ = 0x80 | ((ch >> 12) & 0x3f),
179 *s++ = 0x80 | ((ch >> 6) & 0x3f),
180 *s++ = 0x80 | ( ch & 0x3f);
135 181
136 return s; 182 return s;
137} 183}
138 184
185// convert offset pointer to character index, sv must be string
186static STRLEN
187ptr_to_index (SV *sv, char *offset)
188{
189 return SvUTF8 (sv)
190 ? utf8_distance (offset, SvPVX (sv))
191 : offset - SvPVX (sv);
192}
193
194/////////////////////////////////////////////////////////////////////////////
195// fp hell
196
197// scan a group of digits, and a trailing exponent
198static void
199json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
200{
201 UV uaccum = 0;
202 int eaccum = 0;
203
204 // if we recurse too deep, skip all remaining digits
205 // to avoid a stack overflow attack
206 if (expect_false (--maxdepth <= 0))
207 while (((U8)*s - '0') < 10)
208 ++s;
209
210 for (;;)
211 {
212 U8 dig = (U8)*s - '0';
213
214 if (expect_false (dig >= 10))
215 {
216 if (dig == (U8)((U8)'.' - (U8)'0'))
217 {
218 ++s;
219 json_atof_scan1 (s, accum, expo, 1, maxdepth);
220 }
221 else if ((dig | ' ') == 'e' - '0')
222 {
223 int exp2 = 0;
224 int neg = 0;
225
226 ++s;
227
228 if (*s == '-')
229 {
230 ++s;
231 neg = 1;
232 }
233 else if (*s == '+')
234 ++s;
235
236 while ((dig = (U8)*s - '0') < 10)
237 exp2 = exp2 * 10 + *s++ - '0';
238
239 *expo += neg ? -exp2 : exp2;
240 }
241
242 break;
243 }
244
245 ++s;
246
247 uaccum = uaccum * 10 + dig;
248 ++eaccum;
249
250 // if we have too many digits, then recurse for more
251 // we actually do this for rather few digits
252 if (uaccum >= (UV_MAX - 9) / 10)
253 {
254 if (postdp) *expo -= eaccum;
255 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
256 if (postdp) *expo += eaccum;
257
258 break;
259 }
260 }
261
262 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good
264 // implementation is hard to beat.
265 // (IEEE 754 conformant ones are required to be exact)
266 if (postdp) *expo -= eaccum;
267 *accum += uaccum * Perl_pow (10., *expo);
268 *expo += eaccum;
269}
270
271static NV
272json_atof (const char *s)
273{
274 NV accum = 0.;
275 int expo = 0;
276 int neg = 0;
277
278 if (*s == '-')
279 {
280 ++s;
281 neg = 1;
282 }
283
284 // a recursion depth of ten gives us >>500 bits
285 json_atof_scan1 (s, &accum, &expo, 0, 10);
286
287 return neg ? -accum : accum;
288}
139///////////////////////////////////////////////////////////////////////////// 289/////////////////////////////////////////////////////////////////////////////
140// encoder 290// encoder
141 291
142// structure used for encoding JSON 292// structure used for encoding JSON
143typedef struct 293typedef struct
145 char *cur; // SvPVX (sv) + current output position 295 char *cur; // SvPVX (sv) + current output position
146 char *end; // SvEND (sv) 296 char *end; // SvEND (sv)
147 SV *sv; // result scalar 297 SV *sv; // result scalar
148 JSON json; 298 JSON json;
149 U32 indent; // indentation level 299 U32 indent; // indentation level
150 U32 maxdepth; // max. indentation/recursion level
151 UV limit; // escape character values >= this value when encoding 300 UV limit; // escape character values >= this value when encoding
152} enc_t; 301} enc_t;
153 302
154INLINE void 303INLINE void
155need (enc_t *enc, STRLEN len) 304need (enc_t *enc, STRLEN len)
156{ 305{
157 if (expect_false (enc->cur + len >= enc->end)) 306 if (expect_false (enc->cur + len >= enc->end))
158 { 307 {
159 STRLEN cur = enc->cur - SvPVX (enc->sv); 308 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
160 SvGROW (enc->sv, cur + len + 1); 309 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
161 enc->cur = SvPVX (enc->sv) + cur; 310 enc->cur = SvPVX (enc->sv) + cur;
162 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 311 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
163 } 312 }
164} 313}
165 314
227 clen = 1; 376 clen = 1;
228 } 377 }
229 378
230 if (uch < 0x80/*0x20*/ || uch >= enc->limit) 379 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
231 { 380 {
232 if (uch > 0xFFFFUL) 381 if (uch >= 0x10000UL)
233 { 382 {
234 if (uch > 0x10FFFFUL) 383 if (uch >= 0x110000UL)
235 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 384 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
236 385
237 need (enc, len += 11); 386 need (enc, len += 11);
238 sprintf (enc->cur, "\\u%04x\\u%04x", 387 sprintf (enc->cur, "\\u%04x\\u%04x",
239 (int)((uch - 0x10000) / 0x400 + 0xD800), 388 (int)((uch - 0x10000) / 0x400 + 0xD800),
240 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 389 (int)((uch - 0x10000) % 0x400 + 0xDC00));
241 enc->cur += 12; 390 enc->cur += 12;
242 } 391 }
243 else 392 else
244 { 393 {
245 static char hexdigit [16] = "0123456789abcdef";
246 need (enc, len += 5); 394 need (enc, len += 5);
247 *enc->cur++ = '\\'; 395 *enc->cur++ = '\\';
248 *enc->cur++ = 'u'; 396 *enc->cur++ = 'u';
249 *enc->cur++ = hexdigit [ uch >> 12 ]; 397 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
250 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 398 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
251 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 399 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
252 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 400 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
253 } 401 }
254 402
255 str += clen; 403 str += clen;
256 } 404 }
257 else if (enc->json.flags & F_LATIN1) 405 else if (enc->json.flags & F_LATIN1)
328static void 476static void
329encode_av (enc_t *enc, AV *av) 477encode_av (enc_t *enc, AV *av)
330{ 478{
331 int i, len = av_len (av); 479 int i, len = av_len (av);
332 480
333 if (enc->indent >= enc->maxdepth) 481 if (enc->indent >= enc->json.max_depth)
334 croak ("data structure too deep (hit recursion limit)"); 482 croak (ERR_NESTING_EXCEEDED);
335 483
336 encode_ch (enc, '['); 484 encode_ch (enc, '[');
337 485
338 if (len >= 0) 486 if (len >= 0)
339 { 487 {
413 561
414static void 562static void
415encode_hv (enc_t *enc, HV *hv) 563encode_hv (enc_t *enc, HV *hv)
416{ 564{
417 HE *he; 565 HE *he;
418 int count;
419 566
420 if (enc->indent >= enc->maxdepth) 567 if (enc->indent >= enc->json.max_depth)
421 croak ("data structure too deep (hit recursion limit)"); 568 croak (ERR_NESTING_EXCEEDED);
422 569
423 encode_ch (enc, '{'); 570 encode_ch (enc, '{');
424 571
425 // for canonical output we have to sort by keys first 572 // for canonical output we have to sort by keys first
426 // actually, this is mostly due to the stupid so-called 573 // actually, this is mostly due to the stupid so-called
427 // security workaround added somewhere in 5.8.x. 574 // security workaround added somewhere in 5.8.x
428 // that randomises hash orderings 575 // that randomises hash orderings
429 if (enc->json.flags & F_CANONICAL) 576 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
430 { 577 {
431 int count = hv_iterinit (hv); 578 int count = hv_iterinit (hv);
432 579
433 if (SvMAGICAL (hv)) 580 if (SvMAGICAL (hv))
434 { 581 {
607 754
608 if (len == 1 && *pv == '1') 755 if (len == 1 && *pv == '1')
609 encode_str (enc, "true", 4, 0); 756 encode_str (enc, "true", 4, 0);
610 else if (len == 1 && *pv == '0') 757 else if (len == 1 && *pv == '0')
611 encode_str (enc, "false", 5, 0); 758 encode_str (enc, "false", 5, 0);
759 else if (enc->json.flags & F_ALLOW_UNKNOWN)
760 encode_str (enc, "null", 4, 0);
612 else 761 else
613 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 762 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
614 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 763 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
615 } 764 }
765 else if (enc->json.flags & F_ALLOW_UNKNOWN)
766 encode_str (enc, "null", 4, 0);
616 else 767 else
617 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 768 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
618 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 769 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
619} 770}
620 771
638 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 789 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
639 enc->cur += strlen (enc->cur); 790 enc->cur += strlen (enc->cur);
640 } 791 }
641 else if (SvIOKp (sv)) 792 else if (SvIOKp (sv))
642 { 793 {
643 // we assume we can always read an IV as a UV 794 // we assume we can always read an IV as a UV and vice versa
644 if (SvUV (sv) & ~(UV)0x7fff) 795 // we assume two's complement
645 { 796 // we assume no aliasing issues in the union
646 // large integer, use the (rather slow) snprintf way. 797 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
647 need (enc, sizeof (UV) * 3); 798 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
648 enc->cur +=
649 SvIsUV(sv)
650 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
651 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
652 }
653 else
654 { 799 {
655 // optimise the "small number case" 800 // optimise the "small number case"
656 // code will likely be branchless and use only a single multiplication 801 // code will likely be branchless and use only a single multiplication
802 // works for numbers up to 59074
657 I32 i = SvIV (sv); 803 I32 i = SvIVX (sv);
658 U32 u; 804 U32 u;
659 char digit, nz = 0; 805 char digit, nz = 0;
660 806
661 need (enc, 6); 807 need (enc, 6);
662 808
668 814
669 // now output digit by digit, each time masking out the integer part 815 // now output digit by digit, each time masking out the integer part
670 // and multiplying by 5 while moving the decimal point one to the right, 816 // and multiplying by 5 while moving the decimal point one to the right,
671 // resulting in a net multiplication by 10. 817 // resulting in a net multiplication by 10.
672 // we always write the digit to memory but conditionally increment 818 // we always write the digit to memory but conditionally increment
673 // the pointer, to ease the usage of conditional move instructions. 819 // the pointer, to enable the use of conditional move instructions.
674 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 820 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
675 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 821 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
676 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 822 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
677 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 823 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
678 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 824 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
679 } 825 }
826 else
827 {
828 // large integer, use the (rather slow) snprintf way.
829 need (enc, IVUV_MAXCHARS);
830 enc->cur +=
831 SvIsUV(sv)
832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834 }
680 } 835 }
681 else if (SvROK (sv)) 836 else if (SvROK (sv))
682 encode_rv (enc, SvRV (sv)); 837 encode_rv (enc, SvRV (sv));
683 else if (!SvOK (sv)) 838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
684 encode_str (enc, "null", 4, 0); 839 encode_str (enc, "null", 4, 0);
685 else 840 else
686 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
687 SvPV_nolen (sv), SvFLAGS (sv)); 842 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
688} 843}
689 844
690static SV * 845static SV *
691encode_json (SV *scalar, JSON *json) 846encode_json (SV *scalar, JSON *json)
692{ 847{
698 enc.json = *json; 853 enc.json = *json;
699 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
700 enc.cur = SvPVX (enc.sv); 855 enc.cur = SvPVX (enc.sv);
701 enc.end = SvEND (enc.sv); 856 enc.end = SvEND (enc.sv);
702 enc.indent = 0; 857 enc.indent = 0;
703 enc.maxdepth = DEC_DEPTH (enc.json.flags);
704 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 858 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
705 : enc.json.flags & F_LATIN1 ? 0x000100UL 859 : enc.json.flags & F_LATIN1 ? 0x000100UL
706 : 0x10FFFFUL; 860 : 0x110000UL;
707 861
708 SvPOK_only (enc.sv); 862 SvPOK_only (enc.sv);
709 encode_sv (&enc, scalar); 863 encode_sv (&enc, scalar);
864 encode_nl (&enc);
710 865
711 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 866 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
712 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 867 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
713 868
714 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 869 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
775 if (*dec->cur != ch) \ 930 if (*dec->cur != ch) \
776 ERR (# ch " expected"); \ 931 ERR (# ch " expected"); \
777 ++dec->cur; \ 932 ++dec->cur; \
778 SE 933 SE
779 934
780#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 935#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
781#define DEC_DEC_DEPTH --dec->depth 936#define DEC_DEC_DEPTH --dec->depth
782 937
783static SV *decode_sv (dec_t *dec); 938static SV *decode_sv (dec_t *dec);
784 939
785static signed char decode_hexdigit[256]; 940static signed char decode_hexdigit[256];
889 default: 1044 default:
890 --dec_cur; 1045 --dec_cur;
891 ERR ("illegal backslash escape sequence in string"); 1046 ERR ("illegal backslash escape sequence in string");
892 } 1047 }
893 } 1048 }
894 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1049 else if (expect_true (ch >= 0x20 && ch < 0x80))
895 *cur++ = ch; 1050 *cur++ = ch;
896 else if (ch >= 0x80) 1051 else if (ch >= 0x80)
897 { 1052 {
898 STRLEN clen; 1053 STRLEN clen;
899 UV uch;
900 1054
901 --dec_cur; 1055 --dec_cur;
902 1056
903 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1057 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
904 if (clen == (STRLEN)-1) 1058 if (clen == (STRLEN)-1)
905 ERR ("malformed UTF-8 character in JSON string"); 1059 ERR ("malformed UTF-8 character in JSON string");
906 1060
907 do 1061 do
908 *cur++ = *dec_cur++; 1062 *cur++ = *dec_cur++;
925 { 1079 {
926 STRLEN len = cur - buf; 1080 STRLEN len = cur - buf;
927 1081
928 if (sv) 1082 if (sv)
929 { 1083 {
930 SvGROW (sv, SvCUR (sv) + len + 1); 1084 STRLEN cur = SvCUR (sv);
1085
1086 if (SvLEN (sv) <= cur + len)
1087 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1088
931 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1089 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
932 SvCUR_set (sv, SvCUR (sv) + len); 1090 SvCUR_set (sv, SvCUR (sv) + len);
933 } 1091 }
934 else 1092 else
935 sv = newSVpvn (buf, len); 1093 sv = newSVpvn (buf, len);
1026 1184
1027 // special case the rather common 1..5-digit-int case 1185 // special case the rather common 1..5-digit-int case
1028 if (*start == '-') 1186 if (*start == '-')
1029 switch (len) 1187 switch (len)
1030 { 1188 {
1031 case 2: return newSViv (-( start [1] - '0' * 1)); 1189 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1032 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1190 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1033 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1191 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1034 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1192 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1035 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1193 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1036 } 1194 }
1037 else 1195 else
1038 switch (len) 1196 switch (len)
1039 { 1197 {
1040 case 1: return newSViv ( start [0] - '0' * 1); 1198 case 1: return newSViv ( start [0] - '0' * 1);
1041 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1199 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1042 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1200 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1043 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1201 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1044 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1202 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1045 } 1203 }
1046 1204
1047 { 1205 {
1048 UV uv; 1206 UV uv;
1049 int numtype = grok_number (start, len, &uv); 1207 int numtype = grok_number (start, len, &uv);
1058 } 1216 }
1059 1217
1060 len -= *start == '-' ? 1 : 0; 1218 len -= *start == '-' ? 1 : 0;
1061 1219
1062 // does not fit into IV or UV, try NV 1220 // does not fit into IV or UV, try NV
1063 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1221 if (len <= NV_DIG)
1064 #if defined (LDBL_DIG)
1065 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1066 #endif
1067 )
1068 // fits into NV without loss of precision 1222 // fits into NV without loss of precision
1069 return newSVnv (Atof (start)); 1223 return newSVnv (json_atof (start));
1070 1224
1071 // everything else fails, convert it to a string 1225 // everything else fails, convert it to a string
1072 return newSVpvn (start, dec->cur - start); 1226 return newSVpvn (start, dec->cur - start);
1073 } 1227 }
1074 1228
1075 // loss of precision here 1229 // loss of precision here
1076 return newSVnv (Atof (start)); 1230 return newSVnv (json_atof (start));
1077 1231
1078fail: 1232fail:
1079 return 0; 1233 return 0;
1080} 1234}
1081 1235
1157 char *p = dec->cur; 1311 char *p = dec->cur;
1158 char *e = p + 24; // only try up to 24 bytes 1312 char *e = p + 24; // only try up to 24 bytes
1159 1313
1160 for (;;) 1314 for (;;)
1161 { 1315 {
1162 // the >= 0x80 is true on most architectures 1316 // the >= 0x80 is false on most architectures
1163 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1317 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1164 { 1318 {
1165 // slow path, back up and use decode_str 1319 // slow path, back up and use decode_str
1166 SV *key = decode_str (dec); 1320 SV *key = decode_str (dec);
1167 if (!key) 1321 if (!key)
1250 dSP; 1404 dSP;
1251 int count; 1405 int count;
1252 1406
1253 ENTER; SAVETMPS; PUSHMARK (SP); 1407 ENTER; SAVETMPS; PUSHMARK (SP);
1254 XPUSHs (HeVAL (he)); 1408 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv);
1255 1410
1256 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1257 1412
1258 if (count == 1) 1413 if (count == 1)
1259 { 1414 {
1260 sv = newSVsv (POPs); 1415 sv = newSVsv (POPs);
1261 FREETMPS; LEAVE; 1416 FREETMPS; LEAVE;
1262 return sv; 1417 return sv;
1263 } 1418 }
1264 1419
1420 SvREFCNT_inc (sv);
1265 FREETMPS; LEAVE; 1421 FREETMPS; LEAVE;
1266 } 1422 }
1267 } 1423 }
1268 1424
1269 if (dec->json.cb_object) 1425 if (dec->json.cb_object)
1315 case 't': 1471 case 't':
1316 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1472 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1317 { 1473 {
1318 dec->cur += 4; 1474 dec->cur += 4;
1319#if JSON_SLOW 1475#if JSON_SLOW
1320 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1476 json_true = get_bool ("JSON::XS::true");
1321#endif 1477#endif
1322 return SvREFCNT_inc (json_true); 1478 return newSVsv (json_true);
1323 } 1479 }
1324 else 1480 else
1325 ERR ("'true' expected"); 1481 ERR ("'true' expected");
1326 1482
1327 break; 1483 break;
1329 case 'f': 1485 case 'f':
1330 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1486 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1331 { 1487 {
1332 dec->cur += 5; 1488 dec->cur += 5;
1333#if JSON_SLOW 1489#if JSON_SLOW
1334 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1490 json_false = get_bool ("JSON::XS::false");
1335#endif 1491#endif
1336 return SvREFCNT_inc (json_false); 1492 return newSVsv (json_false);
1337 } 1493 }
1338 else 1494 else
1339 ERR ("'false' expected"); 1495 ERR ("'false' expected");
1340 1496
1341 break; 1497 break;
1359fail: 1515fail:
1360 return 0; 1516 return 0;
1361} 1517}
1362 1518
1363static SV * 1519static SV *
1364decode_json (SV *string, JSON *json, UV *offset_return) 1520decode_json (SV *string, JSON *json, char **offset_return)
1365{ 1521{
1366 dec_t dec; 1522 dec_t dec;
1367 UV offset;
1368 SV *sv; 1523 SV *sv;
1369 1524
1525 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean
1528 * state (SvPV should do that, but it's buggy, see below).
1529 */
1370 SvGETMAGIC (string); 1530 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string))
1532 string = sv_2mortal (newSVsv (string));
1533
1371 SvUPGRADE (string, SVt_PV); 1534 SvUPGRADE (string, SVt_PV);
1372 1535
1373 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1536 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1537 * assertion with -DDEBUGGING, although SvCUR is documented to
1538 * return the xpv_cur field which certainly exists after upgrading.
1539 * according to nicholas clark, calling SvPOK fixes this.
1540 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1541 * and hope for the best.
1542 * Damnit, SvPV_nolen still trips over yet another assertion. This
1543 * assertion business is seriously broken, try yet another workaround
1544 * for the broken -DDEBUGGING.
1545 */
1546 {
1547#ifdef DEBUGGING
1548 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1549#else
1550 STRLEN offset = SvCUR (string);
1551#endif
1552
1553 if (offset > json->max_size && json->max_size)
1374 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1554 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1375 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1555 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1556 }
1376 1557
1377 if (json->flags & F_UTF8) 1558 if (DECODE_WANTS_OCTETS (json))
1378 sv_utf8_downgrade (string, 0); 1559 sv_utf8_downgrade (string, 0);
1379 else 1560 else
1380 sv_utf8_upgrade (string); 1561 sv_utf8_upgrade (string);
1381 1562
1382 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1563 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1383 1564
1384 dec.json = *json; 1565 dec.json = *json;
1385 dec.cur = SvPVX (string); 1566 dec.cur = SvPVX (string);
1386 dec.end = SvEND (string); 1567 dec.end = SvEND (string);
1387 dec.err = 0; 1568 dec.err = 0;
1388 dec.depth = 0; 1569 dec.depth = 0;
1389 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1390 1570
1391 if (dec.json.cb_object || dec.json.cb_sk_object) 1571 if (dec.json.cb_object || dec.json.cb_sk_object)
1392 dec.json.flags |= F_HOOK; 1572 dec.json.flags |= F_HOOK;
1393 1573
1394 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1574 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1395 1575
1396 decode_ws (&dec); 1576 decode_ws (&dec);
1397 sv = decode_sv (&dec); 1577 sv = decode_sv (&dec);
1578
1579 if (offset_return)
1580 *offset_return = dec.cur;
1398 1581
1399 if (!(offset_return || !sv)) 1582 if (!(offset_return || !sv))
1400 { 1583 {
1401 // check for trailing garbage 1584 // check for trailing garbage
1402 decode_ws (&dec); 1585 decode_ws (&dec);
1405 { 1588 {
1406 dec.err = "garbage after JSON object"; 1589 dec.err = "garbage after JSON object";
1407 SvREFCNT_dec (sv); 1590 SvREFCNT_dec (sv);
1408 sv = 0; 1591 sv = 0;
1409 } 1592 }
1410 }
1411
1412 if (offset_return || !sv)
1413 {
1414 offset = dec.json.flags & F_UTF8
1415 ? dec.cur - SvPVX (string)
1416 : utf8_distance (dec.cur, SvPVX (string));
1417
1418 if (offset_return)
1419 *offset_return = offset;
1420 } 1593 }
1421 1594
1422 if (!sv) 1595 if (!sv)
1423 { 1596 {
1424 SV *uni = sv_newmortal (); 1597 SV *uni = sv_newmortal ();
1430 SAVEVPTR (PL_curcop); 1603 SAVEVPTR (PL_curcop);
1431 PL_curcop = &cop; 1604 PL_curcop = &cop;
1432 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1605 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1433 LEAVE; 1606 LEAVE;
1434 1607
1435 croak ("%s, at character offset %d [\"%s\"]", 1608 croak ("%s, at character offset %d (before \"%s\")",
1436 dec.err, 1609 dec.err,
1437 (int)offset, 1610 (int)ptr_to_index (string, dec.cur),
1438 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1439 } 1612 }
1440 1613
1441 sv = sv_2mortal (sv); 1614 sv = sv_2mortal (sv);
1442 1615
1443 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1616 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1444 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1617 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1445 1618
1446 return sv; 1619 return sv;
1620}
1621
1622/////////////////////////////////////////////////////////////////////////////
1623// incremental parser
1624
1625static void
1626incr_parse (JSON *self)
1627{
1628 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1629
1630 // the state machine here is a bit convoluted and could be simplified a lot
1631 // but this would make it slower, so...
1632
1633 for (;;)
1634 {
1635 //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
1636 switch (self->incr_mode)
1637 {
1638 // only used for initial whitespace skipping
1639 case INCR_M_WS:
1640 for (;;)
1641 {
1642 if (*p > 0x20)
1643 {
1644 if (*p == '#')
1645 {
1646 self->incr_mode = INCR_M_C0;
1647 goto incr_m_c;
1648 }
1649 else
1650 {
1651 self->incr_mode = INCR_M_JSON;
1652 goto incr_m_json;
1653 }
1654 }
1655 else if (!*p)
1656 goto interrupt;
1657
1658 ++p;
1659 }
1660
1661 // skip a single char inside a string (for \\-processing)
1662 case INCR_M_BS:
1663 if (!*p)
1664 goto interrupt;
1665
1666 ++p;
1667 self->incr_mode = INCR_M_STR;
1668 goto incr_m_str;
1669
1670 // inside #-style comments
1671 case INCR_M_C0:
1672 case INCR_M_C1:
1673 incr_m_c:
1674 for (;;)
1675 {
1676 if (*p == '\n')
1677 {
1678 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1679 break;
1680 }
1681 else if (!*p)
1682 goto interrupt;
1683
1684 ++p;
1685 }
1686
1687 break;
1688
1689 // inside a string
1690 case INCR_M_STR:
1691 incr_m_str:
1692 for (;;)
1693 {
1694 if (*p == '"')
1695 {
1696 ++p;
1697 self->incr_mode = INCR_M_JSON;
1698
1699 if (!self->incr_nest)
1700 goto interrupt;
1701
1702 goto incr_m_json;
1703 }
1704 else if (*p == '\\')
1705 {
1706 ++p; // "virtually" consumes character after \
1707
1708 if (!*p) // if at end of string we have to switch modes
1709 {
1710 self->incr_mode = INCR_M_BS;
1711 goto interrupt;
1712 }
1713 }
1714 else if (!*p)
1715 goto interrupt;
1716
1717 ++p;
1718 }
1719
1720 // after initial ws, outside string
1721 case INCR_M_JSON:
1722 incr_m_json:
1723 for (;;)
1724 {
1725 switch (*p++)
1726 {
1727 case 0:
1728 --p;
1729 goto interrupt;
1730
1731 case 0x09:
1732 case 0x0a:
1733 case 0x0d:
1734 case 0x20:
1735 if (!self->incr_nest)
1736 {
1737 --p; // do not eat the whitespace, let the next round do it
1738 goto interrupt;
1739 }
1740 break;
1741
1742 case '"':
1743 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str;
1745
1746 case '[':
1747 case '{':
1748 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED);
1750 break;
1751
1752 case ']':
1753 case '}':
1754 if (--self->incr_nest <= 0)
1755 goto interrupt;
1756 break;
1757
1758 case '#':
1759 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c;
1761 }
1762 }
1763 }
1764
1765 modechange:
1766 ;
1767 }
1768
1769interrupt:
1770 self->incr_pos = p - SvPVX (self->incr_text);
1771 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1772 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1447} 1773}
1448 1774
1449///////////////////////////////////////////////////////////////////////////// 1775/////////////////////////////////////////////////////////////////////////////
1450// XS interface functions 1776// XS interface functions
1451 1777
1463 : -1; 1789 : -1;
1464 1790
1465 json_stash = gv_stashpv ("JSON::XS" , 1); 1791 json_stash = gv_stashpv ("JSON::XS" , 1);
1466 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1467 1793
1468 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1794 json_true = get_bool ("JSON::XS::true");
1469 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1795 json_false = get_bool ("JSON::XS::false");
1796
1797 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1470} 1798}
1471 1799
1472PROTOTYPES: DISABLE 1800PROTOTYPES: DISABLE
1473 1801
1474void CLONE (...) 1802void CLONE (...)
1479void new (char *klass) 1807void new (char *klass)
1480 PPCODE: 1808 PPCODE:
1481{ 1809{
1482 SV *pv = NEWSV (0, sizeof (JSON)); 1810 SV *pv = NEWSV (0, sizeof (JSON));
1483 SvPOK_only (pv); 1811 SvPOK_only (pv);
1484 Zero (SvPVX (pv), 1, JSON); 1812 json_init ((JSON *)SvPVX (pv));
1485 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1486 XPUSHs (sv_2mortal (sv_bless ( 1813 XPUSHs (sv_2mortal (sv_bless (
1487 newRV_noinc (pv), 1814 newRV_noinc (pv),
1488 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1489 ))); 1816 )));
1490} 1817}
1502 allow_nonref = F_ALLOW_NONREF 1829 allow_nonref = F_ALLOW_NONREF
1503 shrink = F_SHRINK 1830 shrink = F_SHRINK
1504 allow_blessed = F_ALLOW_BLESSED 1831 allow_blessed = F_ALLOW_BLESSED
1505 convert_blessed = F_CONV_BLESSED 1832 convert_blessed = F_CONV_BLESSED
1506 relaxed = F_RELAXED 1833 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN
1507 PPCODE: 1835 PPCODE:
1508{ 1836{
1509 if (enable) 1837 if (enable)
1510 self->flags |= ix; 1838 self->flags |= ix;
1511 else 1839 else
1526 get_allow_nonref = F_ALLOW_NONREF 1854 get_allow_nonref = F_ALLOW_NONREF
1527 get_shrink = F_SHRINK 1855 get_shrink = F_SHRINK
1528 get_allow_blessed = F_ALLOW_BLESSED 1856 get_allow_blessed = F_ALLOW_BLESSED
1529 get_convert_blessed = F_CONV_BLESSED 1857 get_convert_blessed = F_CONV_BLESSED
1530 get_relaxed = F_RELAXED 1858 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN
1531 PPCODE: 1860 PPCODE:
1532 XPUSHs (boolSV (self->flags & ix)); 1861 XPUSHs (boolSV (self->flags & ix));
1533 1862
1534void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1535 PPCODE: 1864 PPCODE:
1536{ 1865 self->max_depth = max_depth;
1537 UV log2 = 0;
1538
1539 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1540
1541 while ((1UL << log2) < max_depth)
1542 ++log2;
1543
1544 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1545
1546 XPUSHs (ST (0)); 1866 XPUSHs (ST (0));
1547}
1548 1867
1549U32 get_max_depth (JSON *self) 1868U32 get_max_depth (JSON *self)
1550 CODE: 1869 CODE:
1551 RETVAL = DEC_DEPTH (self->flags); 1870 RETVAL = self->max_depth;
1552 OUTPUT: 1871 OUTPUT:
1553 RETVAL 1872 RETVAL
1554 1873
1555void max_size (JSON *self, UV max_size = 0) 1874void max_size (JSON *self, U32 max_size = 0)
1556 PPCODE: 1875 PPCODE:
1557{ 1876 self->max_size = max_size;
1558 UV log2 = 0;
1559
1560 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1561 if (max_size == 1) max_size = 2;
1562
1563 while ((1UL << log2) < max_size)
1564 ++log2;
1565
1566 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1567
1568 XPUSHs (ST (0)); 1877 XPUSHs (ST (0));
1569}
1570 1878
1571int get_max_size (JSON *self) 1879int get_max_size (JSON *self)
1572 CODE: 1880 CODE:
1573 RETVAL = DEC_SIZE (self->flags); 1881 RETVAL = self->max_size;
1574 OUTPUT: 1882 OUTPUT:
1575 RETVAL 1883 RETVAL
1576 1884
1577void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1885void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1578 PPCODE: 1886 PPCODE:
1584} 1892}
1585 1893
1586void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 1894void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1587 PPCODE: 1895 PPCODE:
1588{ 1896{
1589 if (!self->cb_sk_object) 1897 if (!self->cb_sk_object)
1590 self->cb_sk_object = newHV (); 1898 self->cb_sk_object = newHV ();
1591 1899
1592 if (SvOK (cb)) 1900 if (SvOK (cb))
1593 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1594 else 1902 else
1605 XPUSHs (ST (0)); 1913 XPUSHs (ST (0));
1606} 1914}
1607 1915
1608void encode (JSON *self, SV *scalar) 1916void encode (JSON *self, SV *scalar)
1609 PPCODE: 1917 PPCODE:
1610 XPUSHs (encode_json (scalar, self)); 1918 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
1919 XPUSHs (scalar);
1611 1920
1612void decode (JSON *self, SV *jsonstr) 1921void decode (JSON *self, SV *jsonstr)
1613 PPCODE: 1922 PPCODE:
1614 XPUSHs (decode_json (jsonstr, self, 0)); 1923 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
1924 XPUSHs (jsonstr);
1615 1925
1616void decode_prefix (JSON *self, SV *jsonstr) 1926void decode_prefix (JSON *self, SV *jsonstr)
1617 PPCODE: 1927 PPCODE:
1618{ 1928{
1619 UV offset; 1929 SV *sv;
1930 char *offset;
1931 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1620 EXTEND (SP, 2); 1932 EXTEND (SP, 2);
1621 PUSHs (decode_json (jsonstr, self, &offset)); 1933 PUSHs (sv);
1622 PUSHs (sv_2mortal (newSVuv (offset))); 1934 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1935}
1936
1937void incr_parse (JSON *self, SV *jsonstr = 0)
1938 PPCODE:
1939{
1940 if (!self->incr_text)
1941 self->incr_text = newSVpvn ("", 0);
1942
1943 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1944 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1945 if (DECODE_WANTS_OCTETS (self))
1946 {
1947 if (self->incr_pos)
1948 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1949 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1950
1951 sv_utf8_downgrade (self->incr_text, 0);
1952 }
1953 else
1954 {
1955 sv_utf8_upgrade (self->incr_text);
1956
1957 if (self->incr_pos)
1958 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1959 - (U8 *)SvPVX (self->incr_text);
1960 }
1961
1962 // append data, if any
1963 if (jsonstr)
1964 {
1965 /* make sure both strings have same encoding */
1966 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1967 if (SvUTF8 (jsonstr))
1968 sv_utf8_downgrade (jsonstr, 0);
1969 else
1970 sv_utf8_upgrade (jsonstr);
1971
1972 /* and then just blindly append */
1973 {
1974 STRLEN len;
1975 const char *str = SvPV (jsonstr, len);
1976 STRLEN cur = SvCUR (self->incr_text);
1977
1978 if (SvLEN (self->incr_text) <= cur + len)
1979 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1980
1981 Move (str, SvEND (self->incr_text), len, char);
1982 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1983 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1984 }
1985 }
1986
1987 if (GIMME_V != G_VOID)
1988 do
1989 {
1990 SV *sv;
1991 char *offset;
1992
1993 if (!INCR_DONE (self))
1994 {
1995 incr_parse (self);
1996
1997 if (self->incr_pos > self->max_size && self->max_size)
1998 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1999 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2000
2001 if (!INCR_DONE (self))
2002 {
2003 // as an optimisation, do not accumulate white space in the incr buffer
2004 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2005 {
2006 self->incr_pos = 0;
2007 SvCUR_set (self->incr_text, 0);
2008 }
2009
2010 break;
2011 }
2012 }
2013
2014 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2015 XPUSHs (sv);
2016
2017 self->incr_pos -= offset - SvPVX (self->incr_text);
2018 self->incr_nest = 0;
2019 self->incr_mode = 0;
2020
2021 sv_chop (self->incr_text, offset);
2022 }
2023 while (GIMME_V == G_ARRAY);
2024}
2025
2026SV *incr_text (JSON *self)
2027 ATTRS: lvalue
2028 CODE:
2029{
2030 if (self->incr_pos)
2031 croak ("incr_text can not be called when the incremental parser already started parsing");
2032
2033 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2034}
2035 OUTPUT:
2036 RETVAL
2037
2038void incr_skip (JSON *self)
2039 CODE:
2040{
2041 if (self->incr_pos)
2042 {
2043 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2044 self->incr_pos = 0;
2045 self->incr_nest = 0;
2046 self->incr_mode = 0;
2047 }
2048}
2049
2050void incr_reset (JSON *self)
2051 CODE:
2052{
2053 SvREFCNT_dec (self->incr_text);
2054 self->incr_text = 0;
2055 self->incr_pos = 0;
2056 self->incr_nest = 0;
2057 self->incr_mode = 0;
1623} 2058}
1624 2059
1625void DESTROY (JSON *self) 2060void DESTROY (JSON *self)
1626 CODE: 2061 CODE:
1627 SvREFCNT_dec (self->cb_sk_object); 2062 SvREFCNT_dec (self->cb_sk_object);
1628 SvREFCNT_dec (self->cb_object); 2063 SvREFCNT_dec (self->cb_object);
2064 SvREFCNT_dec (self->incr_text);
1629 2065
1630PROTOTYPES: ENABLE 2066PROTOTYPES: ENABLE
1631 2067
1632void encode_json (SV *scalar) 2068void encode_json (SV *scalar)
2069 ALIAS:
2070 to_json_ = 0
2071 encode_json = F_UTF8
1633 PPCODE: 2072 PPCODE:
1634{ 2073{
1635 JSON json = { F_DEFAULT | F_UTF8 }; 2074 JSON json;
1636 XPUSHs (encode_json (scalar, &json)); 2075 json_init (&json);
2076 json.flags |= ix;
2077 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2078 XPUSHs (scalar);
1637} 2079}
1638 2080
1639void decode_json (SV *jsonstr) 2081void decode_json (SV *jsonstr)
2082 ALIAS:
2083 from_json_ = 0
2084 decode_json = F_UTF8
1640 PPCODE: 2085 PPCODE:
1641{ 2086{
1642 JSON json = { F_DEFAULT | F_UTF8 }; 2087 JSON json;
1643 XPUSHs (decode_json (jsonstr, &json, 0)); 2088 json_init (&json);
2089 json.flags |= ix;
2090 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2091 XPUSHs (jsonstr);
1644} 2092}
1645 2093

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines