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.84 by root, Thu Mar 27 06:37:35 2008 UTC vs.
Revision 1.122 by root, Tue Oct 29 15:55:49 2013 UTC

12#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 14#endif
15 15
16// 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
17// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif 20#endif
21 21
22// compatibility with perl <5.18
23#ifndef HvNAMELEN_get
24# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
25#endif
26#ifndef HvNAMELEN
27# define HvNAMELEN(hv) HvNAMELEN_get (hv)
28#endif
29#ifndef HvNAMEUTF8
30# define HvNAMEUTF8(hv) 0
31#endif
32
33// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 34#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 35
24#define F_ASCII 0x00000001UL 36#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 37#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 38#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 39#define F_INDENT 0x00000008UL
32#define F_SHRINK 0x00000200UL 44#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 45#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 46#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 47#define F_RELAXED 0x00001000UL
36#define F_ALLOW_UNKNOWN 0x00002000UL 48#define F_ALLOW_UNKNOWN 0x00002000UL
37 49#define F_ALLOW_TAGS 0x00004000UL
38#define F_MAXDEPTH 0xf8000000UL
39#define S_MAXDEPTH 27
40#define F_MAXSIZE 0x01f00000UL
41#define S_MAXSIZE 20
42#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
43 51
44#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
45#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
46
47#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
48#define F_DEFAULT (9UL << S_MAXDEPTH)
49 53
50#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
51#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
52 56
53#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 57#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
58
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
54 60
55#define SB do { 61#define SB do {
56#define SE } while (0) 62#define SE } while (0)
57 63
58#if __GNUC__ >= 3 64#if __GNUC__ >= 3
68 74
69#define IN_RANGE_INC(type,val,beg,end) \ 75#define IN_RANGE_INC(type,val,beg,end) \
70 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 76 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
71 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 77 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
72 78
79#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
80
73#ifdef USE_ITHREADS 81#ifdef USE_ITHREADS
74# define JSON_SLOW 1 82# define JSON_SLOW 1
75# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
76#else 84#else
77# define JSON_SLOW 0 85# define JSON_SLOW 0
78# define JSON_STASH json_stash 86# define JSON_STASH json_stash
79#endif 87#endif
80 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
81static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
82static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
83 94
84enum { 95enum {
85 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
86 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
87 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
99 INCR_M_C0, // inside comment in initial whitespace sequence
100 INCR_M_C1, // inside comment in other places
88 INCR_M_JSON // outside anything, count nesting 101 INCR_M_JSON // outside anything, count nesting
89}; 102};
90 103
91#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON) 104#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
92 105
93typedef struct { 106typedef struct {
94 U32 flags; 107 U32 flags;
108 U32 max_depth;
109 STRLEN max_size;
110
95 SV *cb_object; 111 SV *cb_object;
96 HV *cb_sk_object; 112 HV *cb_sk_object;
97 113
98 // for the incremental parser 114 // for the incremental parser
99 SV *incr_text; // the source text so far 115 SV *incr_text; // the source text so far
100 STRLEN incr_pos; // the current offset into the text 116 STRLEN incr_pos; // the current offset into the text
101 int incr_nest; // {[]}-nesting level 117 int incr_nest; // {[]}-nesting level
102 int incr_mode; 118 unsigned char incr_mode;
103} JSON; 119} JSON;
120
121INLINE void
122json_init (JSON *json)
123{
124 Zero (json, 1, JSON);
125 json->max_depth = 512;
126}
104 127
105///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
106// utility functions 129// utility functions
107 130
108INLINE SV * 131INLINE SV *
118 141
119INLINE void 142INLINE void
120shrink (SV *sv) 143shrink (SV *sv)
121{ 144{
122 sv_utf8_downgrade (sv, 1); 145 sv_utf8_downgrade (sv, 1);
146
123 if (SvLEN (sv) > SvCUR (sv) + 1) 147 if (SvLEN (sv) > SvCUR (sv) + 1)
124 { 148 {
125#ifdef SvPV_shrink_to_cur 149#ifdef SvPV_shrink_to_cur
126 SvPV_shrink_to_cur (sv); 150 SvPV_shrink_to_cur (sv);
127#elif defined (SvPV_renew) 151#elif defined (SvPV_renew)
171 *s++ = 0x80 | ( ch & 0x3f); 195 *s++ = 0x80 | ( ch & 0x3f);
172 196
173 return s; 197 return s;
174} 198}
175 199
200// convert offset pointer to character index, sv must be string
201static STRLEN
202ptr_to_index (SV *sv, char *offset)
203{
204 return SvUTF8 (sv)
205 ? utf8_distance (offset, SvPVX (sv))
206 : offset - SvPVX (sv);
207}
208
209/////////////////////////////////////////////////////////////////////////////
210// fp hell
211
212// scan a group of digits, and a trailing exponent
213static void
214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
215{
216 UV uaccum = 0;
217 int eaccum = 0;
218
219 // if we recurse too deep, skip all remaining digits
220 // to avoid a stack overflow attack
221 if (expect_false (--maxdepth <= 0))
222 while (((U8)*s - '0') < 10)
223 ++s;
224
225 for (;;)
226 {
227 U8 dig = (U8)*s - '0';
228
229 if (expect_false (dig >= 10))
230 {
231 if (dig == (U8)((U8)'.' - (U8)'0'))
232 {
233 ++s;
234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
235 }
236 else if ((dig | ' ') == 'e' - '0')
237 {
238 int exp2 = 0;
239 int neg = 0;
240
241 ++s;
242
243 if (*s == '-')
244 {
245 ++s;
246 neg = 1;
247 }
248 else if (*s == '+')
249 ++s;
250
251 while ((dig = (U8)*s - '0') < 10)
252 exp2 = exp2 * 10 + *s++ - '0';
253
254 *expo += neg ? -exp2 : exp2;
255 }
256
257 break;
258 }
259
260 ++s;
261
262 uaccum = uaccum * 10 + dig;
263 ++eaccum;
264
265 // if we have too many digits, then recurse for more
266 // we actually do this for rather few digits
267 if (uaccum >= (UV_MAX - 9) / 10)
268 {
269 if (postdp) *expo -= eaccum;
270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
271 if (postdp) *expo += eaccum;
272
273 break;
274 }
275 }
276
277 // this relies greatly on the quality of the pow ()
278 // implementation of the platform, but a good
279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
281 if (postdp) *expo -= eaccum;
282 *accum += uaccum * Perl_pow (10., *expo);
283 *expo += eaccum;
284}
285
286static NV
287json_atof (const char *s)
288{
289 NV accum = 0.;
290 int expo = 0;
291 int neg = 0;
292
293 if (*s == '-')
294 {
295 ++s;
296 neg = 1;
297 }
298
299 // a recursion depth of ten gives us >>500 bits
300 json_atof_scan1 (s, &accum, &expo, 0, 10);
301
302 return neg ? -accum : accum;
303}
176///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
177// encoder 305// encoder
178 306
179// structure used for encoding JSON 307// structure used for encoding JSON
180typedef struct 308typedef struct
182 char *cur; // SvPVX (sv) + current output position 310 char *cur; // SvPVX (sv) + current output position
183 char *end; // SvEND (sv) 311 char *end; // SvEND (sv)
184 SV *sv; // result scalar 312 SV *sv; // result scalar
185 JSON json; 313 JSON json;
186 U32 indent; // indentation level 314 U32 indent; // indentation level
187 U32 maxdepth; // max. indentation/recursion level
188 UV limit; // escape character values >= this value when encoding 315 UV limit; // escape character values >= this value when encoding
189} enc_t; 316} enc_t;
190 317
191INLINE void 318INLINE void
192need (enc_t *enc, STRLEN len) 319need (enc_t *enc, STRLEN len)
193{ 320{
194 if (expect_false (enc->cur + len >= enc->end)) 321 if (expect_false (enc->cur + len >= enc->end))
195 { 322 {
196 STRLEN cur = enc->cur - SvPVX (enc->sv); 323 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
197 SvGROW (enc->sv, cur + len + 1); 324 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
198 enc->cur = SvPVX (enc->sv) + cur; 325 enc->cur = SvPVX (enc->sv) + cur;
199 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 326 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
200 } 327 }
201} 328}
202 329
277 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 404 (int)((uch - 0x10000) % 0x400 + 0xDC00));
278 enc->cur += 12; 405 enc->cur += 12;
279 } 406 }
280 else 407 else
281 { 408 {
282 static char hexdigit [16] = "0123456789abcdef";
283 need (enc, len += 5); 409 need (enc, len += 5);
284 *enc->cur++ = '\\'; 410 *enc->cur++ = '\\';
285 *enc->cur++ = 'u'; 411 *enc->cur++ = 'u';
286 *enc->cur++ = hexdigit [ uch >> 12 ]; 412 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
287 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 413 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
288 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 414 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
289 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 415 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
290 } 416 }
291 417
292 str += clen; 418 str += clen;
293 } 419 }
294 else if (enc->json.flags & F_LATIN1) 420 else if (enc->json.flags & F_LATIN1)
365static void 491static void
366encode_av (enc_t *enc, AV *av) 492encode_av (enc_t *enc, AV *av)
367{ 493{
368 int i, len = av_len (av); 494 int i, len = av_len (av);
369 495
370 if (enc->indent >= enc->maxdepth) 496 if (enc->indent >= enc->json.max_depth)
371 croak ("data structure too deep (hit recursion limit)"); 497 croak (ERR_NESTING_EXCEEDED);
372 498
373 encode_ch (enc, '['); 499 encode_ch (enc, '[');
374 500
375 if (len >= 0) 501 if (len >= 0)
376 { 502 {
377 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
378 504
379 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
391 encode_comma (enc); 517 encode_comma (enc);
392 } 518 }
393 519
394 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
395 } 521 }
396 522
397 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
398} 524}
399 525
400static void 526static void
401encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
405 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
406 { 532 {
407 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
408 STRLEN len; 534 STRLEN len;
409 char *str; 535 char *str;
410 536
411 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
412 str = SvPV (sv, len); 538 str = SvPV (sv, len);
413 539
414 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
415 } 541 }
451static void 577static void
452encode_hv (enc_t *enc, HV *hv) 578encode_hv (enc_t *enc, HV *hv)
453{ 579{
454 HE *he; 580 HE *he;
455 581
456 if (enc->indent >= enc->maxdepth) 582 if (enc->indent >= enc->json.max_depth)
457 croak ("data structure too deep (hit recursion limit)"); 583 croak (ERR_NESTING_EXCEEDED);
458 584
459 encode_ch (enc, '{'); 585 encode_ch (enc, '{');
460 586
461 // for canonical output we have to sort by keys first 587 // for canonical output we have to sort by keys first
462 // actually, this is mostly due to the stupid so-called 588 // actually, this is mostly due to the stupid so-called
463 // security workaround added somewhere in 5.8.x. 589 // security workaround added somewhere in 5.8.x
464 // that randomises hash orderings 590 // that randomises hash orderings
465 if (enc->json.flags & F_CANONICAL) 591 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
466 { 592 {
467 int count = hv_iterinit (hv); 593 int count = hv_iterinit (hv);
468 594
469 if (SvMAGICAL (hv)) 595 if (SvMAGICAL (hv))
470 { 596 {
481 } 607 }
482 608
483 if (count) 609 if (count)
484 { 610 {
485 int i, fast = 1; 611 int i, fast = 1;
486#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
487 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
488#else 614
489 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
490#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
491 621
492 i = 0; 622 i = 0;
493 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
494 { 624 {
495 hes [i++] = he; 625 hes [i++] = he;
564// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
565static void 695static void
566encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
567{ 697{
568 svtype svt; 698 svtype svt;
699 GV *method;
569 700
570 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
571 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
572 703
573 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
574 { 705 {
575 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
576 ? json_boolean_stash 707 ? types_boolean_stash
577 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
578 710
579 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
580 { 712 {
581 if (SvIV (sv)) 713 if (SvIV (sv))
582 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
583 else 715 else
584 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
585 } 717 }
718 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
719 {
720 int count;
721 dSP;
722
723 ENTER; SAVETMPS; PUSHMARK (SP);
724 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json);
728
729 PUTBACK;
730 count = call_sv ((SV *)GvCV (method), G_ARRAY);
731 SPAGAIN;
732
733 // catch this surprisingly common error
734 if (SvROK (TOPs) && SvRV (TOPs) == sv)
735 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
736
737 encode_ch (enc, '(');
738 encode_ch (enc, '"');
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"');
741 encode_ch (enc, ')');
742 encode_ch (enc, '[');
743
744 while (count)
745 {
746 encode_sv (enc, SP[1 - count--]);
747
748 if (count)
749 encode_ch (enc, ',');
750 }
751
752 encode_ch (enc, ']');
753
754 PUTBACK;
755
756 FREETMPS; LEAVE;
757 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 {
760 dSP;
761
762 ENTER; SAVETMPS; PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765
766 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK;
768 call_sv ((SV *)GvCV (method), G_SCALAR);
769 SPAGAIN;
770
771 // catch this surprisingly common error
772 if (SvROK (TOPs) && SvRV (TOPs) == sv)
773 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
774
775 sv = POPs;
776 PUTBACK;
777
778 encode_sv (enc, sv);
779
780 FREETMPS; LEAVE;
781 }
782 else if (enc->json.flags & F_ALLOW_BLESSED)
783 encode_str (enc, "null", 4, 0);
586 else 784 else
587 {
588#if 0
589 if (0 && sv_derived_from (rv, "JSON::Literal"))
590 {
591 // not yet
592 }
593#endif
594 if (enc->json.flags & F_CONV_BLESSED)
595 {
596 // we re-bless the reference to get overload and other niceties right
597 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
598
599 if (to_json)
600 {
601 dSP;
602
603 ENTER; SAVETMPS; PUSHMARK (SP);
604 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
605
606 // calling with G_SCALAR ensures that we always get a 1 return value
607 PUTBACK;
608 call_sv ((SV *)GvCV (to_json), G_SCALAR);
609 SPAGAIN;
610
611 // catch this surprisingly common error
612 if (SvROK (TOPs) && SvRV (TOPs) == sv)
613 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
614
615 sv = POPs;
616 PUTBACK;
617
618 encode_sv (enc, sv);
619
620 FREETMPS; LEAVE;
621 }
622 else if (enc->json.flags & F_ALLOW_BLESSED)
623 encode_str (enc, "null", 4, 0);
624 else
625 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
626 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
627 }
628 else if (enc->json.flags & F_ALLOW_BLESSED)
629 encode_str (enc, "null", 4, 0);
630 else
631 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 785 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
632 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
633 }
634 } 787 }
635 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
636 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
637 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
638 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
714 } 867 }
715 else 868 else
716 { 869 {
717 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
718 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
719 enc->cur += 872 enc->cur +=
720 SvIsUV(sv) 873 SvIsUV(sv)
721 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
722 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
723 } 876 }
724 } 877 }
725 else if (SvROK (sv)) 878 else if (SvROK (sv))
726 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
727 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
728 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
729 else 882 else
730 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 883 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
731 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
732} 885}
733 886
734static SV * 887static SV *
735encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
736{ 889{
742 enc.json = *json; 895 enc.json = *json;
743 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 896 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
744 enc.cur = SvPVX (enc.sv); 897 enc.cur = SvPVX (enc.sv);
745 enc.end = SvEND (enc.sv); 898 enc.end = SvEND (enc.sv);
746 enc.indent = 0; 899 enc.indent = 0;
747 enc.maxdepth = DEC_DEPTH (enc.json.flags);
748 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 900 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
749 : enc.json.flags & F_LATIN1 ? 0x000100UL 901 : enc.json.flags & F_LATIN1 ? 0x000100UL
750 : 0x110000UL; 902 : 0x110000UL;
751 903
752 SvPOK_only (enc.sv); 904 SvPOK_only (enc.sv);
753 encode_sv (&enc, scalar); 905 encode_sv (&enc, scalar);
906 encode_nl (&enc);
754 907
755 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 908 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
756 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 909 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
757 910
758 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 911 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
819 if (*dec->cur != ch) \ 972 if (*dec->cur != ch) \
820 ERR (# ch " expected"); \ 973 ERR (# ch " expected"); \
821 ++dec->cur; \ 974 ++dec->cur; \
822 SE 975 SE
823 976
824#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 977#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
825#define DEC_DEC_DEPTH --dec->depth 978#define DEC_DEC_DEPTH --dec->depth
826 979
827static SV *decode_sv (dec_t *dec); 980static SV *decode_sv (dec_t *dec);
828 981
829static signed char decode_hexdigit[256]; 982static signed char decode_hexdigit[256];
938 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1091 else if (expect_true (ch >= 0x20 && ch < 0x80))
939 *cur++ = ch; 1092 *cur++ = ch;
940 else if (ch >= 0x80) 1093 else if (ch >= 0x80)
941 { 1094 {
942 STRLEN clen; 1095 STRLEN clen;
943 UV uch;
944 1096
945 --dec_cur; 1097 --dec_cur;
946 1098
947 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1099 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
948 if (clen == (STRLEN)-1) 1100 if (clen == (STRLEN)-1)
949 ERR ("malformed UTF-8 character in JSON string"); 1101 ERR ("malformed UTF-8 character in JSON string");
950 1102
951 do 1103 do
952 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
969 { 1121 {
970 STRLEN len = cur - buf; 1122 STRLEN len = cur - buf;
971 1123
972 if (sv) 1124 if (sv)
973 { 1125 {
974 SvGROW (sv, SvCUR (sv) + len + 1); 1126 STRLEN cur = SvCUR (sv);
1127
1128 if (SvLEN (sv) <= cur + len)
1129 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1130
975 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1131 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
976 SvCUR_set (sv, SvCUR (sv) + len); 1132 SvCUR_set (sv, SvCUR (sv) + len);
977 } 1133 }
978 else 1134 else
979 sv = newSVpvn (buf, len); 1135 sv = newSVpvn (buf, len);
1070 1226
1071 // special case the rather common 1..5-digit-int case 1227 // special case the rather common 1..5-digit-int case
1072 if (*start == '-') 1228 if (*start == '-')
1073 switch (len) 1229 switch (len)
1074 { 1230 {
1075 case 2: return newSViv (-( start [1] - '0' * 1)); 1231 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1076 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1232 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1077 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1233 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1078 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1234 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1079 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1235 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1080 } 1236 }
1081 else 1237 else
1082 switch (len) 1238 switch (len)
1083 { 1239 {
1084 case 1: return newSViv ( start [0] - '0' * 1); 1240 case 1: return newSViv ( start [0] - '0' * 1);
1085 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1241 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1086 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1242 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1087 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1243 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1088 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1244 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1089 } 1245 }
1090 1246
1091 { 1247 {
1092 UV uv; 1248 UV uv;
1093 int numtype = grok_number (start, len, &uv); 1249 int numtype = grok_number (start, len, &uv);
1102 } 1258 }
1103 1259
1104 len -= *start == '-' ? 1 : 0; 1260 len -= *start == '-' ? 1 : 0;
1105 1261
1106 // does not fit into IV or UV, try NV 1262 // does not fit into IV or UV, try NV
1107 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1263 if (len <= NV_DIG)
1108 #if defined (LDBL_DIG)
1109 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1110 #endif
1111 )
1112 // fits into NV without loss of precision 1264 // fits into NV without loss of precision
1113 return newSVnv (Atof (start)); 1265 return newSVnv (json_atof (start));
1114 1266
1115 // everything else fails, convert it to a string 1267 // everything else fails, convert it to a string
1116 return newSVpvn (start, dec->cur - start); 1268 return newSVpvn (start, dec->cur - start);
1117 } 1269 }
1118 1270
1119 // loss of precision here 1271 // loss of precision here
1120 return newSVnv (Atof (start)); 1272 return newSVnv (json_atof (start));
1121 1273
1122fail: 1274fail:
1123 return 0; 1275 return 0;
1124} 1276}
1125 1277
1149 if (*dec->cur == ']') 1301 if (*dec->cur == ']')
1150 { 1302 {
1151 ++dec->cur; 1303 ++dec->cur;
1152 break; 1304 break;
1153 } 1305 }
1154 1306
1155 if (*dec->cur != ',') 1307 if (*dec->cur != ',')
1156 ERR (", or ] expected while parsing array"); 1308 ERR (", or ] expected while parsing array");
1157 1309
1158 ++dec->cur; 1310 ++dec->cur;
1159 1311
1294 dSP; 1446 dSP;
1295 int count; 1447 int count;
1296 1448
1297 ENTER; SAVETMPS; PUSHMARK (SP); 1449 ENTER; SAVETMPS; PUSHMARK (SP);
1298 XPUSHs (HeVAL (he)); 1450 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv);
1299 1452
1300 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1301 1454
1302 if (count == 1) 1455 if (count == 1)
1303 { 1456 {
1304 sv = newSVsv (POPs); 1457 sv = newSVsv (POPs);
1305 FREETMPS; LEAVE; 1458 FREETMPS; LEAVE;
1306 return sv; 1459 return sv;
1307 } 1460 }
1308 1461
1462 SvREFCNT_inc (sv);
1309 FREETMPS; LEAVE; 1463 FREETMPS; LEAVE;
1310 } 1464 }
1311 } 1465 }
1312 1466
1313 if (dec->json.cb_object) 1467 if (dec->json.cb_object)
1339 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1340 return 0; 1494 return 0;
1341} 1495}
1342 1496
1343static SV * 1497static SV *
1498decode_tag (dec_t *dec)
1499{
1500 SV *tag = 0;
1501 SV *val = 0;
1502
1503 if (!(dec->json.flags & F_ALLOW_TAGS))
1504 ERR ("malformed JSON string, neither array, object, number, string or atom");
1505
1506 ++dec->cur;
1507
1508 decode_ws (dec);
1509
1510 tag = decode_sv (dec);
1511 if (!tag)
1512 goto fail;
1513
1514 if (!SvPOK (tag))
1515 ERR ("malformed JSON string, (tag) must be a string");
1516
1517 decode_ws (dec);
1518
1519 if (*dec->cur != ')')
1520 ERR (") expected after tag");
1521
1522 ++dec->cur;
1523
1524 decode_ws (dec);
1525
1526 val = decode_sv (dec);
1527 if (!val)
1528 goto fail;
1529
1530 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1531 ERR ("malformed JSON string, tag value must be an array");
1532
1533 {
1534 AV *av = (AV *)SvRV (val);
1535 int i, len = av_len (av) + 1;
1536 HV *stash = gv_stashsv (tag, 0);
1537 SV *sv;
1538
1539 if (!stash)
1540 ERR ("cannot decode perl-object (package does not exist)");
1541
1542 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1543
1544 if (!method)
1545 ERR ("cannot decode perl-object (package does not have a THAW method)");
1546
1547 dSP;
1548
1549 ENTER; SAVETMPS; PUSHMARK (SP);
1550 EXTEND (SP, len + 2);
1551 // we re-bless the reference to get overload and other niceties right
1552 PUSHs (tag);
1553 PUSHs (sv_json);
1554
1555 for (i = 0; i < len; ++i)
1556 PUSHs (*av_fetch (av, i, 1));
1557
1558 PUTBACK;
1559 call_sv ((SV *)GvCV (method), G_SCALAR);
1560 SPAGAIN;
1561
1562 SvREFCNT_dec (tag);
1563 SvREFCNT_dec (val);
1564 sv = SvREFCNT_inc (POPs);
1565
1566 PUTBACK;
1567
1568 FREETMPS; LEAVE;
1569
1570 return sv;
1571 }
1572
1573fail:
1574 SvREFCNT_dec (tag);
1575 SvREFCNT_dec (val);
1576 return 0;
1577}
1578
1579static SV *
1344decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1345{ 1581{
1346 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1347 // to parse everything. 1583 // to parse everything.
1348 switch (*dec->cur) 1584 switch (*dec->cur)
1349 { 1585 {
1350 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1351 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1352 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1353 1590
1354 case '-': 1591 case '-':
1355 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1356 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1357 return decode_num (dec); 1594 return decode_num (dec);
1359 case 't': 1596 case 't':
1360 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1361 { 1598 {
1362 dec->cur += 4; 1599 dec->cur += 4;
1363#if JSON_SLOW 1600#if JSON_SLOW
1364 json_true = get_bool ("JSON::XS::true"); 1601 types_true = get_bool ("Types::Serialiser::true");
1365#endif 1602#endif
1366 return newSVsv (json_true); 1603 return newSVsv (types_true);
1367 } 1604 }
1368 else 1605 else
1369 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1370 1607
1371 break; 1608 break;
1373 case 'f': 1610 case 'f':
1374 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1375 { 1612 {
1376 dec->cur += 5; 1613 dec->cur += 5;
1377#if JSON_SLOW 1614#if JSON_SLOW
1378 json_false = get_bool ("JSON::XS::false"); 1615 types_false = get_bool ("Types::Serialiser::false");
1379#endif 1616#endif
1380 return newSVsv (json_false); 1617 return newSVsv (types_false);
1381 } 1618 }
1382 else 1619 else
1383 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1384 1621
1385 break; 1622 break;
1394 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1395 1632
1396 break; 1633 break;
1397 1634
1398 default: 1635 default:
1399 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1400 break; 1637 break;
1401 } 1638 }
1402 1639
1403fail: 1640fail:
1404 return 0; 1641 return 0;
1405} 1642}
1406 1643
1407static SV * 1644static SV *
1408decode_json (SV *string, JSON *json, STRLEN *offset_return) 1645decode_json (SV *string, JSON *json, char **offset_return)
1409{ 1646{
1410 dec_t dec; 1647 dec_t dec;
1411 STRLEN offset;
1412 SV *sv; 1648 SV *sv;
1413 1649
1650 /* work around bugs in 5.10 where manipulating magic values
1651 * makes perl ignore the magic in subsequent accesses.
1652 * also make a copy of non-PV values, to get them into a clean
1653 * state (SvPV should do that, but it's buggy, see below).
1654 */
1414 SvGETMAGIC (string); 1655 /*SvGETMAGIC (string);*/
1656 if (SvMAGICAL (string) || !SvPOK (string))
1657 string = sv_2mortal (newSVsv (string));
1658
1415 SvUPGRADE (string, SVt_PV); 1659 SvUPGRADE (string, SVt_PV);
1416 1660
1417 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1661 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1662 * assertion with -DDEBUGGING, although SvCUR is documented to
1663 * return the xpv_cur field which certainly exists after upgrading.
1664 * according to nicholas clark, calling SvPOK fixes this.
1665 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1666 * and hope for the best.
1667 * Damnit, SvPV_nolen still trips over yet another assertion. This
1668 * assertion business is seriously broken, try yet another workaround
1669 * for the broken -DDEBUGGING.
1670 */
1671 {
1672#ifdef DEBUGGING
1673 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1674#else
1675 STRLEN offset = SvCUR (string);
1676#endif
1677
1678 if (offset > json->max_size && json->max_size)
1418 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1679 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1419 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1680 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1681 }
1420 1682
1421 if (json->flags & F_UTF8) 1683 if (DECODE_WANTS_OCTETS (json))
1422 sv_utf8_downgrade (string, 0); 1684 sv_utf8_downgrade (string, 0);
1423 else 1685 else
1424 sv_utf8_upgrade (string); 1686 sv_utf8_upgrade (string);
1425 1687
1426 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1688 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1427 1689
1428 dec.json = *json; 1690 dec.json = *json;
1429 dec.cur = SvPVX (string); 1691 dec.cur = SvPVX (string);
1430 dec.end = SvEND (string); 1692 dec.end = SvEND (string);
1431 dec.err = 0; 1693 dec.err = 0;
1432 dec.depth = 0; 1694 dec.depth = 0;
1433 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1434 1695
1435 if (dec.json.cb_object || dec.json.cb_sk_object) 1696 if (dec.json.cb_object || dec.json.cb_sk_object)
1436 dec.json.flags |= F_HOOK; 1697 dec.json.flags |= F_HOOK;
1437 1698
1438 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1699 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1439 1700
1440 decode_ws (&dec); 1701 decode_ws (&dec);
1441 sv = decode_sv (&dec); 1702 sv = decode_sv (&dec);
1703
1704 if (offset_return)
1705 *offset_return = dec.cur;
1442 1706
1443 if (!(offset_return || !sv)) 1707 if (!(offset_return || !sv))
1444 { 1708 {
1445 // check for trailing garbage 1709 // check for trailing garbage
1446 decode_ws (&dec); 1710 decode_ws (&dec);
1449 { 1713 {
1450 dec.err = "garbage after JSON object"; 1714 dec.err = "garbage after JSON object";
1451 SvREFCNT_dec (sv); 1715 SvREFCNT_dec (sv);
1452 sv = 0; 1716 sv = 0;
1453 } 1717 }
1454 }
1455
1456 if (offset_return || !sv)
1457 {
1458 offset = dec.json.flags & F_UTF8
1459 ? dec.cur - SvPVX (string)
1460 : utf8_distance (dec.cur, SvPVX (string));
1461
1462 if (offset_return)
1463 *offset_return = offset;
1464 } 1718 }
1465 1719
1466 if (!sv) 1720 if (!sv)
1467 { 1721 {
1468 SV *uni = sv_newmortal (); 1722 SV *uni = sv_newmortal ();
1474 SAVEVPTR (PL_curcop); 1728 SAVEVPTR (PL_curcop);
1475 PL_curcop = &cop; 1729 PL_curcop = &cop;
1476 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1730 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1477 LEAVE; 1731 LEAVE;
1478 1732
1479 croak ("%s, at character offset %d [\"%s\"]", 1733 croak ("%s, at character offset %d (before \"%s\")",
1480 dec.err, 1734 dec.err,
1481 (int)offset, 1735 (int)ptr_to_index (string, dec.cur),
1482 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1483 } 1737 }
1484 1738
1485 sv = sv_2mortal (sv); 1739 sv = sv_2mortal (sv);
1486 1740
1495 1749
1496static void 1750static void
1497incr_parse (JSON *self) 1751incr_parse (JSON *self)
1498{ 1752{
1499 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1753 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1754
1755 // the state machine here is a bit convoluted and could be simplified a lot
1756 // but this would make it slower, so...
1500 1757
1501 for (;;) 1758 for (;;)
1502 { 1759 {
1503 //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 1760 //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
1504 switch (self->incr_mode) 1761 switch (self->incr_mode)
1505 { 1762 {
1506 // only used for intiial whitespace skipping 1763 // only used for initial whitespace skipping
1507 case INCR_M_WS: 1764 case INCR_M_WS:
1508 for (;;) 1765 for (;;)
1509 { 1766 {
1510 if (*p > 0x20) 1767 if (*p > 0x20)
1511 { 1768 {
1769 if (*p == '#')
1770 {
1771 self->incr_mode = INCR_M_C0;
1772 goto incr_m_c;
1773 }
1774 else
1775 {
1512 self->incr_mode = INCR_M_JSON; 1776 self->incr_mode = INCR_M_JSON;
1513 goto incr_m_json; 1777 goto incr_m_json;
1778 }
1514 } 1779 }
1515 else if (!*p) 1780 else if (!*p)
1516 goto interrupt; 1781 goto interrupt;
1517 1782
1518 ++p; 1783 ++p;
1524 goto interrupt; 1789 goto interrupt;
1525 1790
1526 ++p; 1791 ++p;
1527 self->incr_mode = INCR_M_STR; 1792 self->incr_mode = INCR_M_STR;
1528 goto incr_m_str; 1793 goto incr_m_str;
1794
1795 // inside #-style comments
1796 case INCR_M_C0:
1797 case INCR_M_C1:
1798 incr_m_c:
1799 for (;;)
1800 {
1801 if (*p == '\n')
1802 {
1803 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1804 break;
1805 }
1806 else if (!*p)
1807 goto interrupt;
1808
1809 ++p;
1810 }
1811
1812 break;
1529 1813
1530 // inside a string 1814 // inside a string
1531 case INCR_M_STR: 1815 case INCR_M_STR:
1532 incr_m_str: 1816 incr_m_str:
1533 for (;;) 1817 for (;;)
1584 self->incr_mode = INCR_M_STR; 1868 self->incr_mode = INCR_M_STR;
1585 goto incr_m_str; 1869 goto incr_m_str;
1586 1870
1587 case '[': 1871 case '[':
1588 case '{': 1872 case '{':
1873 case '(':
1589 ++self->incr_nest; 1874 if (++self->incr_nest > self->max_depth)
1875 croak (ERR_NESTING_EXCEEDED);
1590 break; 1876 break;
1591 1877
1592 case ']': 1878 case ']':
1593 case '}': 1879 case '}':
1594 if (!--self->incr_nest) 1880 if (--self->incr_nest <= 0)
1595 goto interrupt; 1881 goto interrupt;
1882 break;
1883
1884 case ')':
1885 --self->incr_nest;
1886 break;
1887
1888 case '#':
1889 self->incr_mode = INCR_M_C1;
1890 goto incr_m_c;
1596 } 1891 }
1597 } 1892 }
1598 } 1893 }
1599 1894
1600 modechange: 1895 modechange:
1601 ; 1896 ;
1602 } 1897 }
1603 1898
1604interrupt: 1899interrupt:
1605 self->incr_pos = p - SvPVX (self->incr_text); 1900 self->incr_pos = p - SvPVX (self->incr_text);
1901 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1606 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1902 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1607} 1903}
1608 1904
1609///////////////////////////////////////////////////////////////////////////// 1905/////////////////////////////////////////////////////////////////////////////
1610// XS interface functions 1906// XS interface functions
1620 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1621 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1622 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1623 : -1; 1919 : -1;
1624 1920
1625 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1626 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1627 1923
1628 json_true = get_bool ("JSON::XS::true"); 1924 types_true = get_bool ("Types::Serialiser::true");
1629 json_false = get_bool ("JSON::XS::false"); 1925 types_false = get_bool ("Types::Serialiser::false");
1926
1927 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json);
1929
1930 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1630} 1931}
1631 1932
1632PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1633 1934
1634void CLONE (...) 1935void CLONE (...)
1635 CODE: 1936 CODE:
1636 json_stash = 0; 1937 json_stash = 0;
1637 json_boolean_stash = 0; 1938 types_boolean_stash = 0;
1638 1939
1639void new (char *klass) 1940void new (char *klass)
1640 PPCODE: 1941 PPCODE:
1641{ 1942{
1642 SV *pv = NEWSV (0, sizeof (JSON)); 1943 SV *pv = NEWSV (0, sizeof (JSON));
1643 SvPOK_only (pv); 1944 SvPOK_only (pv);
1644 Zero (SvPVX (pv), 1, JSON); 1945 json_init ((JSON *)SvPVX (pv));
1645 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1646 XPUSHs (sv_2mortal (sv_bless ( 1946 XPUSHs (sv_2mortal (sv_bless (
1647 newRV_noinc (pv), 1947 newRV_noinc (pv),
1648 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1649 ))); 1949 )));
1650} 1950}
1663 shrink = F_SHRINK 1963 shrink = F_SHRINK
1664 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1665 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1666 relaxed = F_RELAXED 1966 relaxed = F_RELAXED
1667 allow_unknown = F_ALLOW_UNKNOWN 1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1668 PPCODE: 1969 PPCODE:
1669{ 1970{
1670 if (enable) 1971 if (enable)
1671 self->flags |= ix; 1972 self->flags |= ix;
1672 else 1973 else
1688 get_shrink = F_SHRINK 1989 get_shrink = F_SHRINK
1689 get_allow_blessed = F_ALLOW_BLESSED 1990 get_allow_blessed = F_ALLOW_BLESSED
1690 get_convert_blessed = F_CONV_BLESSED 1991 get_convert_blessed = F_CONV_BLESSED
1691 get_relaxed = F_RELAXED 1992 get_relaxed = F_RELAXED
1692 get_allow_unknown = F_ALLOW_UNKNOWN 1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1693 PPCODE: 1995 PPCODE:
1694 XPUSHs (boolSV (self->flags & ix)); 1996 XPUSHs (boolSV (self->flags & ix));
1695 1997
1696void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1697 PPCODE: 1999 PPCODE:
1698{ 2000 self->max_depth = max_depth;
1699 UV log2 = 0;
1700
1701 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1702
1703 while ((1UL << log2) < max_depth)
1704 ++log2;
1705
1706 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1707
1708 XPUSHs (ST (0)); 2001 XPUSHs (ST (0));
1709}
1710 2002
1711U32 get_max_depth (JSON *self) 2003U32 get_max_depth (JSON *self)
1712 CODE: 2004 CODE:
1713 RETVAL = DEC_DEPTH (self->flags); 2005 RETVAL = self->max_depth;
1714 OUTPUT: 2006 OUTPUT:
1715 RETVAL 2007 RETVAL
1716 2008
1717void max_size (JSON *self, UV max_size = 0) 2009void max_size (JSON *self, U32 max_size = 0)
1718 PPCODE: 2010 PPCODE:
1719{ 2011 self->max_size = max_size;
1720 UV log2 = 0;
1721
1722 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1723 if (max_size == 1) max_size = 2;
1724
1725 while ((1UL << log2) < max_size)
1726 ++log2;
1727
1728 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1729
1730 XPUSHs (ST (0)); 2012 XPUSHs (ST (0));
1731}
1732 2013
1733int get_max_size (JSON *self) 2014int get_max_size (JSON *self)
1734 CODE: 2015 CODE:
1735 RETVAL = DEC_SIZE (self->flags); 2016 RETVAL = self->max_size;
1736 OUTPUT: 2017 OUTPUT:
1737 RETVAL 2018 RETVAL
1738 2019
1739void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2020void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1740 PPCODE: 2021 PPCODE:
1746} 2027}
1747 2028
1748void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2029void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1749 PPCODE: 2030 PPCODE:
1750{ 2031{
1751 if (!self->cb_sk_object) 2032 if (!self->cb_sk_object)
1752 self->cb_sk_object = newHV (); 2033 self->cb_sk_object = newHV ();
1753 2034
1754 if (SvOK (cb)) 2035 if (SvOK (cb))
1755 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2036 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1756 else 2037 else
1767 XPUSHs (ST (0)); 2048 XPUSHs (ST (0));
1768} 2049}
1769 2050
1770void encode (JSON *self, SV *scalar) 2051void encode (JSON *self, SV *scalar)
1771 PPCODE: 2052 PPCODE:
1772 XPUSHs (encode_json (scalar, self)); 2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2054 XPUSHs (scalar);
1773 2055
1774void decode (JSON *self, SV *jsonstr) 2056void decode (JSON *self, SV *jsonstr)
1775 PPCODE: 2057 PPCODE:
1776 XPUSHs (decode_json (jsonstr, self, 0)); 2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2059 XPUSHs (jsonstr);
1777 2060
1778void decode_prefix (JSON *self, SV *jsonstr) 2061void decode_prefix (JSON *self, SV *jsonstr)
1779 PPCODE: 2062 PPCODE:
1780{ 2063{
1781 STRLEN offset; 2064 SV *sv;
2065 char *offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1782 EXTEND (SP, 2); 2067 EXTEND (SP, 2);
1783 PUSHs (decode_json (jsonstr, self, &offset)); 2068 PUSHs (sv);
1784 PUSHs (sv_2mortal (newSVuv (offset))); 2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1785} 2070}
1786 2071
1787void incr_parse (JSON *self, SV *jsonstr = 0) 2072void incr_parse (JSON *self, SV *jsonstr = 0)
1788 PPCODE: 2073 PPCODE:
1789{ 2074{
1790 if (!self->incr_text) 2075 if (!self->incr_text)
1791 self->incr_text = newSVpvn ("", 0); 2076 self->incr_text = newSVpvn ("", 0);
2077
2078 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2079 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2080 if (DECODE_WANTS_OCTETS (self))
2081 {
2082 if (self->incr_pos)
2083 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2084 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2085
2086 sv_utf8_downgrade (self->incr_text, 0);
2087 }
2088 else
2089 {
2090 sv_utf8_upgrade (self->incr_text);
2091
2092 if (self->incr_pos)
2093 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2094 - (U8 *)SvPVX (self->incr_text);
2095 }
1792 2096
1793 // append data, if any 2097 // append data, if any
1794 if (jsonstr) 2098 if (jsonstr)
1795 { 2099 {
2100 /* make sure both strings have same encoding */
1796 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 2101 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2102 if (SvUTF8 (jsonstr))
2103 sv_utf8_downgrade (jsonstr, 0);
1797 { 2104 else
1798 /* utf-8-ness differs, need to upgrade */
1799 sv_utf8_upgrade (self->incr_text); 2105 sv_utf8_upgrade (jsonstr);
1800 2106
1801 if (self->incr_pos) 2107 /* and then just blindly append */
1802 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1803 - (U8 *)SvPVX (self->incr_text);
1804 }
1805
1806 { 2108 {
1807 STRLEN len; 2109 STRLEN len;
1808 const char *str = SvPV (jsonstr, len); 2110 const char *str = SvPV (jsonstr, len);
1809 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 2111 STRLEN cur = SvCUR (self->incr_text);
2112
2113 if (SvLEN (self->incr_text) <= cur + len)
2114 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2115
1810 Move (str, SvEND (self->incr_text), len, char); 2116 Move (str, SvEND (self->incr_text), len, char);
1811 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2117 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1812 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2118 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1813 } 2119 }
1814 } 2120 }
1815 2121
1816 if (GIMME_V != G_VOID) 2122 if (GIMME_V != G_VOID)
1817 do 2123 do
1818 { 2124 {
2125 SV *sv;
1819 STRLEN offset; 2126 char *offset;
1820 2127
1821 if (!INCR_DONE (self)) 2128 if (!INCR_DONE (self))
1822 { 2129 {
1823 incr_parse (self); 2130 incr_parse (self);
2131
2132 if (self->incr_pos > self->max_size && self->max_size)
2133 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2134 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2135
1824 if (!INCR_DONE (self)) 2136 if (!INCR_DONE (self))
2137 {
2138 // as an optimisation, do not accumulate white space in the incr buffer
2139 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2140 {
2141 self->incr_pos = 0;
2142 SvCUR_set (self->incr_text, 0);
2143 }
2144
1825 break; 2145 break;
2146 }
1826 } 2147 }
1827 2148
1828 XPUSHs (decode_json (self->incr_text, self, &offset)); 2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv);
1829 2151
1830 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1831 self->incr_pos -= offset; 2152 self->incr_pos -= offset - SvPVX (self->incr_text);
1832 self->incr_nest = 0; 2153 self->incr_nest = 0;
1833 self->incr_mode = 0; 2154 self->incr_mode = 0;
2155
2156 sv_chop (self->incr_text, offset);
1834 } 2157 }
1835 while (GIMME_V == G_ARRAY); 2158 while (GIMME_V == G_ARRAY);
1836} 2159}
1837 2160
1838SV *incr_text (JSON *self) 2161SV *incr_text (JSON *self)
1857 self->incr_nest = 0; 2180 self->incr_nest = 0;
1858 self->incr_mode = 0; 2181 self->incr_mode = 0;
1859 } 2182 }
1860} 2183}
1861 2184
2185void incr_reset (JSON *self)
2186 CODE:
2187{
2188 SvREFCNT_dec (self->incr_text);
2189 self->incr_text = 0;
2190 self->incr_pos = 0;
2191 self->incr_nest = 0;
2192 self->incr_mode = 0;
2193}
2194
1862void DESTROY (JSON *self) 2195void DESTROY (JSON *self)
1863 CODE: 2196 CODE:
1864 SvREFCNT_dec (self->cb_sk_object); 2197 SvREFCNT_dec (self->cb_sk_object);
1865 SvREFCNT_dec (self->cb_object); 2198 SvREFCNT_dec (self->cb_object);
1866 SvREFCNT_dec (self->incr_text); 2199 SvREFCNT_dec (self->incr_text);
1867 2200
1868PROTOTYPES: ENABLE 2201PROTOTYPES: ENABLE
1869 2202
1870void encode_json (SV *scalar) 2203void encode_json (SV *scalar)
1871 ALIAS:
1872 to_json_ = 0
1873 encode_json = F_UTF8
1874 PPCODE: 2204 PPCODE:
1875{ 2205{
1876 JSON json = { F_DEFAULT | ix }; 2206 JSON json;
1877 XPUSHs (encode_json (scalar, &json)); 2207 json_init (&json);
2208 json.flags |= F_UTF8;
2209 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2210 XPUSHs (scalar);
1878} 2211}
1879 2212
1880void decode_json (SV *jsonstr) 2213void decode_json (SV *jsonstr)
1881 ALIAS:
1882 from_json_ = 0
1883 decode_json = F_UTF8
1884 PPCODE: 2214 PPCODE:
1885{ 2215{
1886 JSON json = { F_DEFAULT | ix }; 2216 JSON json;
1887 XPUSHs (decode_json (jsonstr, &json, 0)); 2217 json_init (&json);
2218 json.flags |= F_UTF8;
2219 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2220 XPUSHs (jsonstr);
1888} 2221}
1889 2222
1890

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines