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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines