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.74 by root, Wed Mar 19 15:17:53 2008 UTC vs.
Revision 1.107 by root, Wed Mar 17 01:45:43 2010 UTC

4 4
5#include <assert.h> 5#include <assert.h>
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h>
9#include <float.h> 10#include <float.h>
10 11
11#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
12# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
13#endif 14#endif
14 15
15// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
16// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
19#endif 20#endif
21
22// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
20 24
21#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
28#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
33 37#define F_ALLOW_UNKNOWN 0x00002000UL
34#define F_MAXDEPTH 0xf8000000UL
35#define S_MAXDEPTH 27
36#define F_MAXSIZE 0x01f00000UL
37#define S_MAXSIZE 20
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 39
40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
42
43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
44#define F_DEFAULT (9UL << S_MAXDEPTH)
45 41
46#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
47#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
48 44
49#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
64 60
65#define IN_RANGE_INC(type,val,beg,end) \ 61#define IN_RANGE_INC(type,val,beg,end) \
66 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 62 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
67 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 63 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
68 64
65#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
66
69#ifdef USE_ITHREADS 67#ifdef USE_ITHREADS
70# define JSON_SLOW 1 68# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 69# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
72#else 70#else
73# define JSON_SLOW 0 71# define JSON_SLOW 0
75#endif 73#endif
76 74
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 75static HV *json_stash, *json_boolean_stash; // JSON::XS::
78static SV *json_true, *json_false; 76static SV *json_true, *json_false;
79 77
78enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash
82 INCR_M_C0, // inside comment in initial whitespace sequence
83 INCR_M_C1, // inside comment in other places
84 INCR_M_JSON // outside anything, count nesting
85};
86
87#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
88
80typedef struct { 89typedef struct {
81 U32 flags; 90 U32 flags;
91 U32 max_depth;
92 STRLEN max_size;
93
82 SV *cb_object; 94 SV *cb_object;
83 HV *cb_sk_object; 95 HV *cb_sk_object;
96
97 // for the incremental parser
98 SV *incr_text; // the source text so far
99 STRLEN incr_pos; // the current offset into the text
100 int incr_nest; // {[]}-nesting level
101 unsigned char incr_mode;
84} JSON; 102} JSON;
103
104INLINE void
105json_init (JSON *json)
106{
107 Zero (json, 1, JSON);
108 json->max_depth = 512;
109}
85 110
86///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
87// utility functions 112// utility functions
88 113
114INLINE SV *
115get_bool (const char *name)
116{
117 SV *sv = get_sv (name, 1);
118
119 SvREADONLY_on (sv);
120 SvREADONLY_on (SvRV (sv));
121
122 return sv;
123}
124
89INLINE void 125INLINE void
90shrink (SV *sv) 126shrink (SV *sv)
91{ 127{
92 sv_utf8_downgrade (sv, 1); 128 sv_utf8_downgrade (sv, 1);
129
93 if (SvLEN (sv) > SvCUR (sv) + 1) 130 if (SvLEN (sv) > SvCUR (sv) + 1)
94 { 131 {
95#ifdef SvPV_shrink_to_cur 132#ifdef SvPV_shrink_to_cur
96 SvPV_shrink_to_cur (sv); 133 SvPV_shrink_to_cur (sv);
97#elif defined (SvPV_renew) 134#elif defined (SvPV_renew)
141 *s++ = 0x80 | ( ch & 0x3f); 178 *s++ = 0x80 | ( ch & 0x3f);
142 179
143 return s; 180 return s;
144} 181}
145 182
183// convert offset pointer to character index, sv must be string
184static STRLEN
185ptr_to_index (SV *sv, char *offset)
186{
187 return SvUTF8 (sv)
188 ? utf8_distance (offset, SvPVX (sv))
189 : offset - SvPVX (sv);
190}
191
192/////////////////////////////////////////////////////////////////////////////
193// fp hell
194
195// scan a group of digits, and a trailing exponent
196static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{
199 UV uaccum = 0;
200 int eaccum = 0;
201
202 // if we recurse too deep, skip all remaining digits
203 // to avoid a stack overflow attack
204 if (expect_false (--maxdepth <= 0))
205 while (((U8)*s - '0') < 10)
206 ++s;
207
208 for (;;)
209 {
210 U8 dig = (U8)*s - '0';
211
212 if (expect_false (dig >= 10))
213 {
214 if (dig == (U8)((U8)'.' - (U8)'0'))
215 {
216 ++s;
217 json_atof_scan1 (s, accum, expo, 1, maxdepth);
218 }
219 else if ((dig | ' ') == 'e' - '0')
220 {
221 int exp2 = 0;
222 int neg = 0;
223
224 ++s;
225
226 if (*s == '-')
227 {
228 ++s;
229 neg = 1;
230 }
231 else if (*s == '+')
232 ++s;
233
234 while ((dig = (U8)*s - '0') < 10)
235 exp2 = exp2 * 10 + *s++ - '0';
236
237 *expo += neg ? -exp2 : exp2;
238 }
239
240 break;
241 }
242
243 ++s;
244
245 uaccum = uaccum * 10 + dig;
246 ++eaccum;
247
248 // if we have too many digits, then recurse for more
249 // we actually do this for rather few digits
250 if (uaccum >= (UV_MAX - 9) / 10)
251 {
252 if (postdp) *expo -= eaccum;
253 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
254 if (postdp) *expo += eaccum;
255
256 break;
257 }
258 }
259
260 // this relies greatly on the quality of the pow ()
261 // implementation of the platform, but a good
262 // implementation is hard to beat.
263 if (postdp) *expo -= eaccum;
264 *accum += uaccum * Perl_pow (10., *expo);
265 *expo += eaccum;
266}
267
268static NV
269json_atof (const char *s)
270{
271 NV accum = 0.;
272 int expo = 0;
273 int neg = 0;
274
275 if (*s == '-')
276 {
277 ++s;
278 neg = 1;
279 }
280
281 // a recursion depth of ten gives us >>500 bits
282 json_atof_scan1 (s, &accum, &expo, 0, 10);
283
284 return neg ? -accum : accum;
285}
146///////////////////////////////////////////////////////////////////////////// 286/////////////////////////////////////////////////////////////////////////////
147// encoder 287// encoder
148 288
149// structure used for encoding JSON 289// structure used for encoding JSON
150typedef struct 290typedef struct
152 char *cur; // SvPVX (sv) + current output position 292 char *cur; // SvPVX (sv) + current output position
153 char *end; // SvEND (sv) 293 char *end; // SvEND (sv)
154 SV *sv; // result scalar 294 SV *sv; // result scalar
155 JSON json; 295 JSON json;
156 U32 indent; // indentation level 296 U32 indent; // indentation level
157 U32 maxdepth; // max. indentation/recursion level
158 UV limit; // escape character values >= this value when encoding 297 UV limit; // escape character values >= this value when encoding
159} enc_t; 298} enc_t;
160 299
161INLINE void 300INLINE void
162need (enc_t *enc, STRLEN len) 301need (enc_t *enc, STRLEN len)
163{ 302{
164 if (expect_false (enc->cur + len >= enc->end)) 303 if (expect_false (enc->cur + len >= enc->end))
165 { 304 {
166 STRLEN cur = enc->cur - SvPVX (enc->sv); 305 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
167 SvGROW (enc->sv, cur + len + 1); 306 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
168 enc->cur = SvPVX (enc->sv) + cur; 307 enc->cur = SvPVX (enc->sv) + cur;
169 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 308 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
170 } 309 }
171} 310}
172 311
247 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 386 (int)((uch - 0x10000) % 0x400 + 0xDC00));
248 enc->cur += 12; 387 enc->cur += 12;
249 } 388 }
250 else 389 else
251 { 390 {
252 static char hexdigit [16] = "0123456789abcdef";
253 need (enc, len += 5); 391 need (enc, len += 5);
254 *enc->cur++ = '\\'; 392 *enc->cur++ = '\\';
255 *enc->cur++ = 'u'; 393 *enc->cur++ = 'u';
256 *enc->cur++ = hexdigit [ uch >> 12 ]; 394 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
257 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 395 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
258 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 396 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
259 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 397 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
260 } 398 }
261 399
262 str += clen; 400 str += clen;
263 } 401 }
264 else if (enc->json.flags & F_LATIN1) 402 else if (enc->json.flags & F_LATIN1)
335static void 473static void
336encode_av (enc_t *enc, AV *av) 474encode_av (enc_t *enc, AV *av)
337{ 475{
338 int i, len = av_len (av); 476 int i, len = av_len (av);
339 477
340 if (enc->indent >= enc->maxdepth) 478 if (enc->indent >= enc->json.max_depth)
341 croak ("data structure too deep (hit recursion limit)"); 479 croak (ERR_NESTING_EXCEEDED);
342 480
343 encode_ch (enc, '['); 481 encode_ch (enc, '[');
344 482
345 if (len >= 0) 483 if (len >= 0)
346 { 484 {
420 558
421static void 559static void
422encode_hv (enc_t *enc, HV *hv) 560encode_hv (enc_t *enc, HV *hv)
423{ 561{
424 HE *he; 562 HE *he;
425 int count;
426 563
427 if (enc->indent >= enc->maxdepth) 564 if (enc->indent >= enc->json.max_depth)
428 croak ("data structure too deep (hit recursion limit)"); 565 croak (ERR_NESTING_EXCEEDED);
429 566
430 encode_ch (enc, '{'); 567 encode_ch (enc, '{');
431 568
432 // for canonical output we have to sort by keys first 569 // for canonical output we have to sort by keys first
433 // actually, this is mostly due to the stupid so-called 570 // actually, this is mostly due to the stupid so-called
434 // security workaround added somewhere in 5.8.x. 571 // security workaround added somewhere in 5.8.x
435 // that randomises hash orderings 572 // that randomises hash orderings
436 if (enc->json.flags & F_CANONICAL) 573 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
437 { 574 {
438 int count = hv_iterinit (hv); 575 int count = hv_iterinit (hv);
439 576
440 if (SvMAGICAL (hv)) 577 if (SvMAGICAL (hv))
441 { 578 {
614 751
615 if (len == 1 && *pv == '1') 752 if (len == 1 && *pv == '1')
616 encode_str (enc, "true", 4, 0); 753 encode_str (enc, "true", 4, 0);
617 else if (len == 1 && *pv == '0') 754 else if (len == 1 && *pv == '0')
618 encode_str (enc, "false", 5, 0); 755 encode_str (enc, "false", 5, 0);
756 else if (enc->json.flags & F_ALLOW_UNKNOWN)
757 encode_str (enc, "null", 4, 0);
619 else 758 else
620 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 759 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
621 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 760 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
622 } 761 }
762 else if (enc->json.flags & F_ALLOW_UNKNOWN)
763 encode_str (enc, "null", 4, 0);
623 else 764 else
624 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 765 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
625 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 766 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
626} 767}
627 768
648 else if (SvIOKp (sv)) 789 else if (SvIOKp (sv))
649 { 790 {
650 // we assume we can always read an IV as a UV and vice versa 791 // we assume we can always read an IV as a UV and vice versa
651 // we assume two's complement 792 // we assume two's complement
652 // we assume no aliasing issues in the union 793 // we assume no aliasing issues in the union
653 if (SvIsUV (sv) ? SvUVX (sv) > 59000 794 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
654 : SvIVX (sv) > 59000 || SvIVX (sv) < -59000) 795 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
655 {
656 // large integer, use the (rather slow) snprintf way.
657 need (enc, sizeof (UV) * 5 / 2 + 1); // CHAR_BIT is at least 8
658 enc->cur +=
659 SvIsUV(sv)
660 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
661 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
662 }
663 else
664 { 796 {
665 // optimise the "small number case" 797 // optimise the "small number case"
666 // code will likely be branchless and use only a single multiplication 798 // code will likely be branchless and use only a single multiplication
667 // works for numbers up to 59074 799 // works for numbers up to 59074
668 I32 i = SvIVX (sv); 800 I32 i = SvIVX (sv);
679 811
680 // now output digit by digit, each time masking out the integer part 812 // now output digit by digit, each time masking out the integer part
681 // and multiplying by 5 while moving the decimal point one to the right, 813 // and multiplying by 5 while moving the decimal point one to the right,
682 // resulting in a net multiplication by 10. 814 // resulting in a net multiplication by 10.
683 // we always write the digit to memory but conditionally increment 815 // we always write the digit to memory but conditionally increment
684 // the pointer, to ease the usage of conditional move instructions. 816 // the pointer, to enable the use of conditional move instructions.
685 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 817 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
686 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 818 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
687 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 819 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
688 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 820 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
689 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 821 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
690 } 822 }
823 else
824 {
825 // large integer, use the (rather slow) snprintf way.
826 need (enc, IVUV_MAXCHARS);
827 enc->cur +=
828 SvIsUV(sv)
829 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831 }
691 } 832 }
692 else if (SvROK (sv)) 833 else if (SvROK (sv))
693 encode_rv (enc, SvRV (sv)); 834 encode_rv (enc, SvRV (sv));
694 else if (!SvOK (sv)) 835 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
695 encode_str (enc, "null", 4, 0); 836 encode_str (enc, "null", 4, 0);
696 else 837 else
697 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 838 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
698 SvPV_nolen (sv), SvFLAGS (sv)); 839 SvPV_nolen (sv), SvFLAGS (sv));
699} 840}
709 enc.json = *json; 850 enc.json = *json;
710 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 851 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
711 enc.cur = SvPVX (enc.sv); 852 enc.cur = SvPVX (enc.sv);
712 enc.end = SvEND (enc.sv); 853 enc.end = SvEND (enc.sv);
713 enc.indent = 0; 854 enc.indent = 0;
714 enc.maxdepth = DEC_DEPTH (enc.json.flags);
715 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 855 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
716 : enc.json.flags & F_LATIN1 ? 0x000100UL 856 : enc.json.flags & F_LATIN1 ? 0x000100UL
717 : 0x110000UL; 857 : 0x110000UL;
718 858
719 SvPOK_only (enc.sv); 859 SvPOK_only (enc.sv);
720 encode_sv (&enc, scalar); 860 encode_sv (&enc, scalar);
861 encode_nl (&enc);
721 862
722 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 863 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
723 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 864 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
724 865
725 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 866 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
786 if (*dec->cur != ch) \ 927 if (*dec->cur != ch) \
787 ERR (# ch " expected"); \ 928 ERR (# ch " expected"); \
788 ++dec->cur; \ 929 ++dec->cur; \
789 SE 930 SE
790 931
791#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 932#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
792#define DEC_DEC_DEPTH --dec->depth 933#define DEC_DEC_DEPTH --dec->depth
793 934
794static SV *decode_sv (dec_t *dec); 935static SV *decode_sv (dec_t *dec);
795 936
796static signed char decode_hexdigit[256]; 937static signed char decode_hexdigit[256];
905 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1046 else if (expect_true (ch >= 0x20 && ch < 0x80))
906 *cur++ = ch; 1047 *cur++ = ch;
907 else if (ch >= 0x80) 1048 else if (ch >= 0x80)
908 { 1049 {
909 STRLEN clen; 1050 STRLEN clen;
910 UV uch;
911 1051
912 --dec_cur; 1052 --dec_cur;
913 1053
914 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1054 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
915 if (clen == (STRLEN)-1) 1055 if (clen == (STRLEN)-1)
916 ERR ("malformed UTF-8 character in JSON string"); 1056 ERR ("malformed UTF-8 character in JSON string");
917 1057
918 do 1058 do
919 *cur++ = *dec_cur++; 1059 *cur++ = *dec_cur++;
936 { 1076 {
937 STRLEN len = cur - buf; 1077 STRLEN len = cur - buf;
938 1078
939 if (sv) 1079 if (sv)
940 { 1080 {
941 SvGROW (sv, SvCUR (sv) + len + 1); 1081 STRLEN cur = SvCUR (sv);
1082
1083 if (SvLEN (sv) <= cur + len)
1084 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1085
942 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1086 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
943 SvCUR_set (sv, SvCUR (sv) + len); 1087 SvCUR_set (sv, SvCUR (sv) + len);
944 } 1088 }
945 else 1089 else
946 sv = newSVpvn (buf, len); 1090 sv = newSVpvn (buf, len);
1037 1181
1038 // special case the rather common 1..5-digit-int case 1182 // special case the rather common 1..5-digit-int case
1039 if (*start == '-') 1183 if (*start == '-')
1040 switch (len) 1184 switch (len)
1041 { 1185 {
1042 case 2: return newSViv (-( start [1] - '0' * 1)); 1186 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1043 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1187 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1044 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1188 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1045 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1189 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1046 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1190 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1047 } 1191 }
1048 else 1192 else
1049 switch (len) 1193 switch (len)
1050 { 1194 {
1051 case 1: return newSViv ( start [0] - '0' * 1); 1195 case 1: return newSViv ( start [0] - '0' * 1);
1052 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1196 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1053 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1197 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1054 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1198 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1055 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1199 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1056 } 1200 }
1057 1201
1058 { 1202 {
1059 UV uv; 1203 UV uv;
1060 int numtype = grok_number (start, len, &uv); 1204 int numtype = grok_number (start, len, &uv);
1069 } 1213 }
1070 1214
1071 len -= *start == '-' ? 1 : 0; 1215 len -= *start == '-' ? 1 : 0;
1072 1216
1073 // does not fit into IV or UV, try NV 1217 // does not fit into IV or UV, try NV
1074 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1218 if (len <= NV_DIG)
1075 #if defined (LDBL_DIG)
1076 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1077 #endif
1078 )
1079 // fits into NV without loss of precision 1219 // fits into NV without loss of precision
1080 return newSVnv (Atof (start)); 1220 return newSVnv (json_atof (start));
1081 1221
1082 // everything else fails, convert it to a string 1222 // everything else fails, convert it to a string
1083 return newSVpvn (start, dec->cur - start); 1223 return newSVpvn (start, dec->cur - start);
1084 } 1224 }
1085 1225
1086 // loss of precision here 1226 // loss of precision here
1087 return newSVnv (Atof (start)); 1227 return newSVnv (json_atof (start));
1088 1228
1089fail: 1229fail:
1090 return 0; 1230 return 0;
1091} 1231}
1092 1232
1168 char *p = dec->cur; 1308 char *p = dec->cur;
1169 char *e = p + 24; // only try up to 24 bytes 1309 char *e = p + 24; // only try up to 24 bytes
1170 1310
1171 for (;;) 1311 for (;;)
1172 { 1312 {
1173 // the >= 0x80 is true on most architectures 1313 // the >= 0x80 is false on most architectures
1174 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1314 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1175 { 1315 {
1176 // slow path, back up and use decode_str 1316 // slow path, back up and use decode_str
1177 SV *key = decode_str (dec); 1317 SV *key = decode_str (dec);
1178 if (!key) 1318 if (!key)
1261 dSP; 1401 dSP;
1262 int count; 1402 int count;
1263 1403
1264 ENTER; SAVETMPS; PUSHMARK (SP); 1404 ENTER; SAVETMPS; PUSHMARK (SP);
1265 XPUSHs (HeVAL (he)); 1405 XPUSHs (HeVAL (he));
1406 sv_2mortal (sv);
1266 1407
1267 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1408 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1268 1409
1269 if (count == 1) 1410 if (count == 1)
1270 { 1411 {
1271 sv = newSVsv (POPs); 1412 sv = newSVsv (POPs);
1272 FREETMPS; LEAVE; 1413 FREETMPS; LEAVE;
1273 return sv; 1414 return sv;
1274 } 1415 }
1275 1416
1417 SvREFCNT_inc (sv);
1276 FREETMPS; LEAVE; 1418 FREETMPS; LEAVE;
1277 } 1419 }
1278 } 1420 }
1279 1421
1280 if (dec->json.cb_object) 1422 if (dec->json.cb_object)
1326 case 't': 1468 case 't':
1327 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1469 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1328 { 1470 {
1329 dec->cur += 4; 1471 dec->cur += 4;
1330#if JSON_SLOW 1472#if JSON_SLOW
1331 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1473 json_true = get_bool ("JSON::XS::true");
1332#endif 1474#endif
1333 return SvREFCNT_inc (json_true); 1475 return newSVsv (json_true);
1334 } 1476 }
1335 else 1477 else
1336 ERR ("'true' expected"); 1478 ERR ("'true' expected");
1337 1479
1338 break; 1480 break;
1340 case 'f': 1482 case 'f':
1341 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1483 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1342 { 1484 {
1343 dec->cur += 5; 1485 dec->cur += 5;
1344#if JSON_SLOW 1486#if JSON_SLOW
1345 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1487 json_false = get_bool ("JSON::XS::false");
1346#endif 1488#endif
1347 return SvREFCNT_inc (json_false); 1489 return newSVsv (json_false);
1348 } 1490 }
1349 else 1491 else
1350 ERR ("'false' expected"); 1492 ERR ("'false' expected");
1351 1493
1352 break; 1494 break;
1370fail: 1512fail:
1371 return 0; 1513 return 0;
1372} 1514}
1373 1515
1374static SV * 1516static SV *
1375decode_json (SV *string, JSON *json, UV *offset_return) 1517decode_json (SV *string, JSON *json, char **offset_return)
1376{ 1518{
1377 dec_t dec; 1519 dec_t dec;
1378 UV offset;
1379 SV *sv; 1520 SV *sv;
1380 1521
1522 /* work around bugs in 5.10 where manipulating magic values
1523 * will perl ignore the magic in subsequent accesses
1524 */
1381 SvGETMAGIC (string); 1525 /*SvGETMAGIC (string);*/
1526 if (SvMAGICAL (string))
1527 string = sv_2mortal (newSVsv (string));
1528
1382 SvUPGRADE (string, SVt_PV); 1529 SvUPGRADE (string, SVt_PV);
1383 1530
1384 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1531 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1532 * assertion with -DDEBUGGING, although SvCUR is documented to
1533 * return the xpv_cur field which certainly exists after upgrading.
1534 * according to nicholas clark, calling SvPOK fixes this.
1535 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1536 * and hope for the best.
1537 * Damnit, SvPV_nolen still trips over yet another assertion. This
1538 * assertion business is seriously broken, try yet another workaround
1539 * for the broken -DDEBUGGING.
1540 */
1541 {
1542#ifdef DEBUGGING
1543 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1544#else
1545 STRLEN offset = SvCUR (string);
1546#endif
1547
1548 if (offset > json->max_size && json->max_size)
1385 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1549 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1386 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1550 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1551 }
1387 1552
1388 if (json->flags & F_UTF8) 1553 if (json->flags & F_UTF8)
1389 sv_utf8_downgrade (string, 0); 1554 sv_utf8_downgrade (string, 0);
1390 else 1555 else
1391 sv_utf8_upgrade (string); 1556 sv_utf8_upgrade (string);
1392 1557
1393 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1558 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1394 1559
1395 dec.json = *json; 1560 dec.json = *json;
1396 dec.cur = SvPVX (string); 1561 dec.cur = SvPVX (string);
1397 dec.end = SvEND (string); 1562 dec.end = SvEND (string);
1398 dec.err = 0; 1563 dec.err = 0;
1399 dec.depth = 0; 1564 dec.depth = 0;
1400 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1401 1565
1402 if (dec.json.cb_object || dec.json.cb_sk_object) 1566 if (dec.json.cb_object || dec.json.cb_sk_object)
1403 dec.json.flags |= F_HOOK; 1567 dec.json.flags |= F_HOOK;
1404 1568
1405 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1569 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1406 1570
1407 decode_ws (&dec); 1571 decode_ws (&dec);
1408 sv = decode_sv (&dec); 1572 sv = decode_sv (&dec);
1573
1574 if (offset_return)
1575 *offset_return = dec.cur;
1409 1576
1410 if (!(offset_return || !sv)) 1577 if (!(offset_return || !sv))
1411 { 1578 {
1412 // check for trailing garbage 1579 // check for trailing garbage
1413 decode_ws (&dec); 1580 decode_ws (&dec);
1416 { 1583 {
1417 dec.err = "garbage after JSON object"; 1584 dec.err = "garbage after JSON object";
1418 SvREFCNT_dec (sv); 1585 SvREFCNT_dec (sv);
1419 sv = 0; 1586 sv = 0;
1420 } 1587 }
1421 }
1422
1423 if (offset_return || !sv)
1424 {
1425 offset = dec.json.flags & F_UTF8
1426 ? dec.cur - SvPVX (string)
1427 : utf8_distance (dec.cur, SvPVX (string));
1428
1429 if (offset_return)
1430 *offset_return = offset;
1431 } 1588 }
1432 1589
1433 if (!sv) 1590 if (!sv)
1434 { 1591 {
1435 SV *uni = sv_newmortal (); 1592 SV *uni = sv_newmortal ();
1441 SAVEVPTR (PL_curcop); 1598 SAVEVPTR (PL_curcop);
1442 PL_curcop = &cop; 1599 PL_curcop = &cop;
1443 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1600 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1444 LEAVE; 1601 LEAVE;
1445 1602
1446 croak ("%s, at character offset %d [\"%s\"]", 1603 croak ("%s, at character offset %d (before \"%s\")",
1447 dec.err, 1604 dec.err,
1448 (int)offset, 1605 ptr_to_index (string, dec.cur),
1449 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1606 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1450 } 1607 }
1451 1608
1452 sv = sv_2mortal (sv); 1609 sv = sv_2mortal (sv);
1453 1610
1454 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1611 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1455 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1612 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1456 1613
1457 return sv; 1614 return sv;
1615}
1616
1617/////////////////////////////////////////////////////////////////////////////
1618// incremental parser
1619
1620static void
1621incr_parse (JSON *self)
1622{
1623 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1624
1625 // the state machine here is a bit convoluted and could be simplified a lot
1626 // but this would make it slower, so...
1627
1628 for (;;)
1629 {
1630 //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
1631 switch (self->incr_mode)
1632 {
1633 // only used for initial whitespace skipping
1634 case INCR_M_WS:
1635 for (;;)
1636 {
1637 if (*p > 0x20)
1638 {
1639 if (*p == '#')
1640 {
1641 self->incr_mode = INCR_M_C0;
1642 goto incr_m_c;
1643 }
1644 else
1645 {
1646 self->incr_mode = INCR_M_JSON;
1647 goto incr_m_json;
1648 }
1649 }
1650 else if (!*p)
1651 goto interrupt;
1652
1653 ++p;
1654 }
1655
1656 // skip a single char inside a string (for \\-processing)
1657 case INCR_M_BS:
1658 if (!*p)
1659 goto interrupt;
1660
1661 ++p;
1662 self->incr_mode = INCR_M_STR;
1663 goto incr_m_str;
1664
1665 // inside #-style comments
1666 case INCR_M_C0:
1667 case INCR_M_C1:
1668 incr_m_c:
1669 for (;;)
1670 {
1671 if (*p == '\n')
1672 {
1673 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1674 break;
1675 }
1676 else if (!*p)
1677 goto interrupt;
1678
1679 ++p;
1680 }
1681
1682 break;
1683
1684 // inside a string
1685 case INCR_M_STR:
1686 incr_m_str:
1687 for (;;)
1688 {
1689 if (*p == '"')
1690 {
1691 ++p;
1692 self->incr_mode = INCR_M_JSON;
1693
1694 if (!self->incr_nest)
1695 goto interrupt;
1696
1697 goto incr_m_json;
1698 }
1699 else if (*p == '\\')
1700 {
1701 ++p; // "virtually" consumes character after \
1702
1703 if (!*p) // if at end of string we have to switch modes
1704 {
1705 self->incr_mode = INCR_M_BS;
1706 goto interrupt;
1707 }
1708 }
1709 else if (!*p)
1710 goto interrupt;
1711
1712 ++p;
1713 }
1714
1715 // after initial ws, outside string
1716 case INCR_M_JSON:
1717 incr_m_json:
1718 for (;;)
1719 {
1720 switch (*p++)
1721 {
1722 case 0:
1723 --p;
1724 goto interrupt;
1725
1726 case 0x09:
1727 case 0x0a:
1728 case 0x0d:
1729 case 0x20:
1730 if (!self->incr_nest)
1731 {
1732 --p; // do not eat the whitespace, let the next round do it
1733 goto interrupt;
1734 }
1735 break;
1736
1737 case '"':
1738 self->incr_mode = INCR_M_STR;
1739 goto incr_m_str;
1740
1741 case '[':
1742 case '{':
1743 if (++self->incr_nest > self->max_depth)
1744 croak (ERR_NESTING_EXCEEDED);
1745 break;
1746
1747 case ']':
1748 case '}':
1749 if (--self->incr_nest <= 0)
1750 goto interrupt;
1751 break;
1752
1753 case '#':
1754 self->incr_mode = INCR_M_C1;
1755 goto incr_m_c;
1756 }
1757 }
1758 }
1759
1760 modechange:
1761 ;
1762 }
1763
1764interrupt:
1765 self->incr_pos = p - SvPVX (self->incr_text);
1766 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1767 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1458} 1768}
1459 1769
1460///////////////////////////////////////////////////////////////////////////// 1770/////////////////////////////////////////////////////////////////////////////
1461// XS interface functions 1771// XS interface functions
1462 1772
1474 : -1; 1784 : -1;
1475 1785
1476 json_stash = gv_stashpv ("JSON::XS" , 1); 1786 json_stash = gv_stashpv ("JSON::XS" , 1);
1477 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1787 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1478 1788
1479 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1789 json_true = get_bool ("JSON::XS::true");
1480 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1790 json_false = get_bool ("JSON::XS::false");
1791
1792 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1481} 1793}
1482 1794
1483PROTOTYPES: DISABLE 1795PROTOTYPES: DISABLE
1484 1796
1485void CLONE (...) 1797void CLONE (...)
1490void new (char *klass) 1802void new (char *klass)
1491 PPCODE: 1803 PPCODE:
1492{ 1804{
1493 SV *pv = NEWSV (0, sizeof (JSON)); 1805 SV *pv = NEWSV (0, sizeof (JSON));
1494 SvPOK_only (pv); 1806 SvPOK_only (pv);
1495 Zero (SvPVX (pv), 1, JSON); 1807 json_init ((JSON *)SvPVX (pv));
1496 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1497 XPUSHs (sv_2mortal (sv_bless ( 1808 XPUSHs (sv_2mortal (sv_bless (
1498 newRV_noinc (pv), 1809 newRV_noinc (pv),
1499 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1810 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1500 ))); 1811 )));
1501} 1812}
1513 allow_nonref = F_ALLOW_NONREF 1824 allow_nonref = F_ALLOW_NONREF
1514 shrink = F_SHRINK 1825 shrink = F_SHRINK
1515 allow_blessed = F_ALLOW_BLESSED 1826 allow_blessed = F_ALLOW_BLESSED
1516 convert_blessed = F_CONV_BLESSED 1827 convert_blessed = F_CONV_BLESSED
1517 relaxed = F_RELAXED 1828 relaxed = F_RELAXED
1829 allow_unknown = F_ALLOW_UNKNOWN
1518 PPCODE: 1830 PPCODE:
1519{ 1831{
1520 if (enable) 1832 if (enable)
1521 self->flags |= ix; 1833 self->flags |= ix;
1522 else 1834 else
1537 get_allow_nonref = F_ALLOW_NONREF 1849 get_allow_nonref = F_ALLOW_NONREF
1538 get_shrink = F_SHRINK 1850 get_shrink = F_SHRINK
1539 get_allow_blessed = F_ALLOW_BLESSED 1851 get_allow_blessed = F_ALLOW_BLESSED
1540 get_convert_blessed = F_CONV_BLESSED 1852 get_convert_blessed = F_CONV_BLESSED
1541 get_relaxed = F_RELAXED 1853 get_relaxed = F_RELAXED
1854 get_allow_unknown = F_ALLOW_UNKNOWN
1542 PPCODE: 1855 PPCODE:
1543 XPUSHs (boolSV (self->flags & ix)); 1856 XPUSHs (boolSV (self->flags & ix));
1544 1857
1545void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1858void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1546 PPCODE: 1859 PPCODE:
1547{ 1860 self->max_depth = max_depth;
1548 UV log2 = 0;
1549
1550 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1551
1552 while ((1UL << log2) < max_depth)
1553 ++log2;
1554
1555 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1556
1557 XPUSHs (ST (0)); 1861 XPUSHs (ST (0));
1558}
1559 1862
1560U32 get_max_depth (JSON *self) 1863U32 get_max_depth (JSON *self)
1561 CODE: 1864 CODE:
1562 RETVAL = DEC_DEPTH (self->flags); 1865 RETVAL = self->max_depth;
1563 OUTPUT: 1866 OUTPUT:
1564 RETVAL 1867 RETVAL
1565 1868
1566void max_size (JSON *self, UV max_size = 0) 1869void max_size (JSON *self, U32 max_size = 0)
1567 PPCODE: 1870 PPCODE:
1568{ 1871 self->max_size = max_size;
1569 UV log2 = 0;
1570
1571 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1572 if (max_size == 1) max_size = 2;
1573
1574 while ((1UL << log2) < max_size)
1575 ++log2;
1576
1577 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1578
1579 XPUSHs (ST (0)); 1872 XPUSHs (ST (0));
1580}
1581 1873
1582int get_max_size (JSON *self) 1874int get_max_size (JSON *self)
1583 CODE: 1875 CODE:
1584 RETVAL = DEC_SIZE (self->flags); 1876 RETVAL = self->max_size;
1585 OUTPUT: 1877 OUTPUT:
1586 RETVAL 1878 RETVAL
1587 1879
1588void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1880void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1589 PPCODE: 1881 PPCODE:
1625 XPUSHs (decode_json (jsonstr, self, 0)); 1917 XPUSHs (decode_json (jsonstr, self, 0));
1626 1918
1627void decode_prefix (JSON *self, SV *jsonstr) 1919void decode_prefix (JSON *self, SV *jsonstr)
1628 PPCODE: 1920 PPCODE:
1629{ 1921{
1630 UV offset; 1922 char *offset;
1631 EXTEND (SP, 2); 1923 EXTEND (SP, 2);
1632 PUSHs (decode_json (jsonstr, self, &offset)); 1924 PUSHs (decode_json (jsonstr, self, &offset));
1633 PUSHs (sv_2mortal (newSVuv (offset))); 1925 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1926}
1927
1928void incr_parse (JSON *self, SV *jsonstr = 0)
1929 PPCODE:
1930{
1931 if (!self->incr_text)
1932 self->incr_text = newSVpvn ("", 0);
1933
1934 // append data, if any
1935 if (jsonstr)
1936 {
1937 if (SvUTF8 (jsonstr))
1938 {
1939 if (!SvUTF8 (self->incr_text))
1940 {
1941 /* utf-8-ness differs, need to upgrade */
1942 sv_utf8_upgrade (self->incr_text);
1943
1944 if (self->incr_pos)
1945 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1946 - (U8 *)SvPVX (self->incr_text);
1947 }
1948 }
1949 else if (SvUTF8 (self->incr_text))
1950 sv_utf8_upgrade (jsonstr);
1951
1952 {
1953 STRLEN len;
1954 const char *str = SvPV (jsonstr, len);
1955 STRLEN cur = SvCUR (self->incr_text);
1956
1957 if (SvLEN (self->incr_text) <= cur + len)
1958 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1959
1960 Move (str, SvEND (self->incr_text), len, char);
1961 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1962 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1963 }
1964 }
1965
1966 if (GIMME_V != G_VOID)
1967 do
1968 {
1969 char *offset;
1970
1971 if (!INCR_DONE (self))
1972 {
1973 incr_parse (self);
1974
1975 if (self->incr_pos > self->max_size && self->max_size)
1976 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1977 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1978
1979 if (!INCR_DONE (self))
1980 break;
1981 }
1982
1983 XPUSHs (decode_json (self->incr_text, self, &offset));
1984
1985 self->incr_pos -= offset - SvPVX (self->incr_text);
1986 self->incr_nest = 0;
1987 self->incr_mode = 0;
1988
1989 sv_chop (self->incr_text, offset);
1990 }
1991 while (GIMME_V == G_ARRAY);
1992}
1993
1994SV *incr_text (JSON *self)
1995 ATTRS: lvalue
1996 CODE:
1997{
1998 if (self->incr_pos)
1999 croak ("incr_text can not be called when the incremental parser already started parsing");
2000
2001 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2002}
2003 OUTPUT:
2004 RETVAL
2005
2006void incr_skip (JSON *self)
2007 CODE:
2008{
2009 if (self->incr_pos)
2010 {
2011 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2012 self->incr_pos = 0;
2013 self->incr_nest = 0;
2014 self->incr_mode = 0;
2015 }
2016}
2017
2018void incr_reset (JSON *self)
2019 CODE:
2020{
2021 SvREFCNT_dec (self->incr_text);
2022 self->incr_text = 0;
2023 self->incr_pos = 0;
2024 self->incr_nest = 0;
2025 self->incr_mode = 0;
1634} 2026}
1635 2027
1636void DESTROY (JSON *self) 2028void DESTROY (JSON *self)
1637 CODE: 2029 CODE:
1638 SvREFCNT_dec (self->cb_sk_object); 2030 SvREFCNT_dec (self->cb_sk_object);
1639 SvREFCNT_dec (self->cb_object); 2031 SvREFCNT_dec (self->cb_object);
2032 SvREFCNT_dec (self->incr_text);
1640 2033
1641PROTOTYPES: ENABLE 2034PROTOTYPES: ENABLE
1642 2035
1643void encode_json (SV *scalar) 2036void encode_json (SV *scalar)
2037 ALIAS:
2038 to_json_ = 0
2039 encode_json = F_UTF8
1644 PPCODE: 2040 PPCODE:
1645{ 2041{
1646 JSON json = { F_DEFAULT | F_UTF8 }; 2042 JSON json;
2043 json_init (&json);
2044 json.flags |= ix;
1647 XPUSHs (encode_json (scalar, &json)); 2045 XPUSHs (encode_json (scalar, &json));
1648} 2046}
1649 2047
1650void decode_json (SV *jsonstr) 2048void decode_json (SV *jsonstr)
2049 ALIAS:
2050 from_json_ = 0
2051 decode_json = F_UTF8
1651 PPCODE: 2052 PPCODE:
1652{ 2053{
1653 JSON json = { F_DEFAULT | F_UTF8 }; 2054 JSON json;
2055 json_init (&json);
2056 json.flags |= ix;
1654 XPUSHs (decode_json (jsonstr, &json, 0)); 2057 XPUSHs (decode_json (jsonstr, &json, 0));
1655} 2058}
1656 2059

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines