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.87 by root, Tue Jun 3 06:43:45 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
49#define F_ALLOW_TAGS 0x00004000UL
37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
38 51
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40 53
41#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
42#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
43 56
44#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)
45 60
46#define SB do { 61#define SB do {
47#define SE } while (0) 62#define SE } while (0)
48 63
49#if __GNUC__ >= 3 64#if __GNUC__ >= 3
… …
69#else 84#else
70# define JSON_SLOW 0 85# define JSON_SLOW 0
71# define JSON_STASH json_stash 86# define JSON_STASH json_stash
72#endif 87#endif
73 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
75static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
76 94
77enum { 95enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
80 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
81 INCR_M_JSON // outside anything, count nesting 101 INCR_M_JSON // outside anything, count nesting
82}; 102};
83 103
84#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)
85 105
86typedef struct { 106typedef struct {
87 U32 flags; 107 U32 flags;
88 U32 max_depth; 108 U32 max_depth;
89 STRLEN max_size; 109 STRLEN max_size;
… …
92 HV *cb_sk_object; 112 HV *cb_sk_object;
93 113
94 // for the incremental parser 114 // for the incremental parser
95 SV *incr_text; // the source text so far 115 SV *incr_text; // the source text so far
96 STRLEN incr_pos; // the current offset into the text 116 STRLEN incr_pos; // the current offset into the text
97 unsigned char incr_nest; // {[]}-nesting level 117 int incr_nest; // {[]}-nesting level
98 unsigned char incr_mode; 118 unsigned char incr_mode;
99} JSON; 119} JSON;
100 120
101INLINE void 121INLINE void
102json_init (JSON *json) 122json_init (JSON *json)
… …
175 *s++ = 0x80 | ( ch & 0x3f); 195 *s++ = 0x80 | ( ch & 0x3f);
176 196
177 return s; 197 return s;
178} 198}
179 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}
180///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
181// encoder 305// encoder
182 306
183// structure used for encoding JSON 307// structure used for encoding JSON
184typedef struct 308typedef struct
… …
194INLINE void 318INLINE void
195need (enc_t *enc, STRLEN len) 319need (enc_t *enc, STRLEN len)
196{ 320{
197 if (expect_false (enc->cur + len >= enc->end)) 321 if (expect_false (enc->cur + len >= enc->end))
198 { 322 {
199 STRLEN cur = enc->cur - SvPVX (enc->sv); 323 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
200 SvGROW (enc->sv, cur + len + 1); 324 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
201 enc->cur = SvPVX (enc->sv) + cur; 325 enc->cur = SvPVX (enc->sv) + cur;
202 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 326 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
203 } 327 }
204} 328}
205 329
… …
280 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 404 (int)((uch - 0x10000) % 0x400 + 0xDC00));
281 enc->cur += 12; 405 enc->cur += 12;
282 } 406 }
283 else 407 else
284 { 408 {
285 static char hexdigit [16] = "0123456789abcdef";
286 need (enc, len += 5); 409 need (enc, len += 5);
287 *enc->cur++ = '\\'; 410 *enc->cur++ = '\\';
288 *enc->cur++ = 'u'; 411 *enc->cur++ = 'u';
289 *enc->cur++ = hexdigit [ uch >> 12 ]; 412 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
290 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 413 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
291 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 414 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
292 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 415 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
293 } 416 }
294 417
295 str += clen; 418 str += clen;
296 } 419 }
297 else if (enc->json.flags & F_LATIN1) 420 else if (enc->json.flags & F_LATIN1)
… …
372 495
373 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
374 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
375 498
376 encode_ch (enc, '['); 499 encode_ch (enc, '[');
377 500
378 if (len >= 0) 501 if (len >= 0)
379 { 502 {
380 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
381 504
382 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
394 encode_comma (enc); 517 encode_comma (enc);
395 } 518 }
396 519
397 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
398 } 521 }
399 522
400 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
401} 524}
402 525
403static void 526static void
404encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
408 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
409 { 532 {
410 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
411 STRLEN len; 534 STRLEN len;
412 char *str; 535 char *str;
413 536
414 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
415 str = SvPV (sv, len); 538 str = SvPV (sv, len);
416 539
417 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
418 } 541 }
… …
461 584
462 encode_ch (enc, '{'); 585 encode_ch (enc, '{');
463 586
464 // for canonical output we have to sort by keys first 587 // for canonical output we have to sort by keys first
465 // actually, this is mostly due to the stupid so-called 588 // actually, this is mostly due to the stupid so-called
466 // security workaround added somewhere in 5.8.x. 589 // security workaround added somewhere in 5.8.x
467 // that randomises hash orderings 590 // that randomises hash orderings
468 if (enc->json.flags & F_CANONICAL) 591 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
469 { 592 {
470 int count = hv_iterinit (hv); 593 int count = hv_iterinit (hv);
471 594
472 if (SvMAGICAL (hv)) 595 if (SvMAGICAL (hv))
473 { 596 {
… …
484 } 607 }
485 608
486 if (count) 609 if (count)
487 { 610 {
488 int i, fast = 1; 611 int i, fast = 1;
489#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
490 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
491#else 614
492 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
493#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
494 621
495 i = 0; 622 i = 0;
496 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
497 { 624 {
498 hes [i++] = he; 625 hes [i++] = he;
… …
567// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
568static void 695static void
569encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
570{ 697{
571 svtype svt; 698 svtype svt;
699 GV *method;
572 700
573 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
574 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
575 703
576 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
577 { 705 {
578 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
579 ? json_boolean_stash 707 ? types_boolean_stash
580 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
581 710
582 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
583 { 712 {
584 if (SvIV (sv)) 713 if (SvIV (sv))
585 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
586 else 715 else
587 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
588 } 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);
589 else 784 else
590 {
591#if 0
592 if (0 && sv_derived_from (rv, "JSON::Literal"))
593 {
594 // not yet
595 }
596#endif
597 if (enc->json.flags & F_CONV_BLESSED)
598 {
599 // we re-bless the reference to get overload and other niceties right
600 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
601
602 if (to_json)
603 {
604 dSP;
605
606 ENTER; SAVETMPS; PUSHMARK (SP);
607 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
608
609 // calling with G_SCALAR ensures that we always get a 1 return value
610 PUTBACK;
611 call_sv ((SV *)GvCV (to_json), G_SCALAR);
612 SPAGAIN;
613
614 // catch this surprisingly common error
615 if (SvROK (TOPs) && SvRV (TOPs) == sv)
616 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
617
618 sv = POPs;
619 PUTBACK;
620
621 encode_sv (enc, sv);
622
623 FREETMPS; LEAVE;
624 }
625 else if (enc->json.flags & F_ALLOW_BLESSED)
626 encode_str (enc, "null", 4, 0);
627 else
628 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
629 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
630 }
631 else if (enc->json.flags & F_ALLOW_BLESSED)
632 encode_str (enc, "null", 4, 0);
633 else
634 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)",
635 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
636 }
637 } 787 }
638 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
639 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
640 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
641 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
717 } 867 }
718 else 868 else
719 { 869 {
720 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
721 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
722 enc->cur += 872 enc->cur +=
723 SvIsUV(sv) 873 SvIsUV(sv)
724 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
725 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
726 } 876 }
727 } 877 }
728 else if (SvROK (sv)) 878 else if (SvROK (sv))
729 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
730 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
731 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
732 else 882 else
733 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",
734 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
735} 885}
736 886
737static SV * 887static SV *
738encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
739{ 889{
… …
751 : enc.json.flags & F_LATIN1 ? 0x000100UL 901 : enc.json.flags & F_LATIN1 ? 0x000100UL
752 : 0x110000UL; 902 : 0x110000UL;
753 903
754 SvPOK_only (enc.sv); 904 SvPOK_only (enc.sv);
755 encode_sv (&enc, scalar); 905 encode_sv (&enc, scalar);
906 encode_nl (&enc);
756 907
757 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 908 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
758 *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
759 910
760 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 911 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
940 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1091 else if (expect_true (ch >= 0x20 && ch < 0x80))
941 *cur++ = ch; 1092 *cur++ = ch;
942 else if (ch >= 0x80) 1093 else if (ch >= 0x80)
943 { 1094 {
944 STRLEN clen; 1095 STRLEN clen;
945 UV uch;
946 1096
947 --dec_cur; 1097 --dec_cur;
948 1098
949 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1099 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
950 if (clen == (STRLEN)-1) 1100 if (clen == (STRLEN)-1)
951 ERR ("malformed UTF-8 character in JSON string"); 1101 ERR ("malformed UTF-8 character in JSON string");
952 1102
953 do 1103 do
954 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
… …
971 { 1121 {
972 STRLEN len = cur - buf; 1122 STRLEN len = cur - buf;
973 1123
974 if (sv) 1124 if (sv)
975 { 1125 {
976 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
977 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1131 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
978 SvCUR_set (sv, SvCUR (sv) + len); 1132 SvCUR_set (sv, SvCUR (sv) + len);
979 } 1133 }
980 else 1134 else
981 sv = newSVpvn (buf, len); 1135 sv = newSVpvn (buf, len);
… …
1072 1226
1073 // special case the rather common 1..5-digit-int case 1227 // special case the rather common 1..5-digit-int case
1074 if (*start == '-') 1228 if (*start == '-')
1075 switch (len) 1229 switch (len)
1076 { 1230 {
1077 case 2: return newSViv (-( start [1] - '0' * 1)); 1231 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1078 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1232 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1079 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));
1080 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));
1081 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));
1082 } 1236 }
1083 else 1237 else
1084 switch (len) 1238 switch (len)
1085 { 1239 {
1086 case 1: return newSViv ( start [0] - '0' * 1); 1240 case 1: return newSViv ( start [0] - '0' * 1);
1087 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1241 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1088 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);
1089 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);
1090 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);
1091 } 1245 }
1092 1246
1093 { 1247 {
1094 UV uv; 1248 UV uv;
1095 int numtype = grok_number (start, len, &uv); 1249 int numtype = grok_number (start, len, &uv);
… …
1104 } 1258 }
1105 1259
1106 len -= *start == '-' ? 1 : 0; 1260 len -= *start == '-' ? 1 : 0;
1107 1261
1108 // does not fit into IV or UV, try NV 1262 // does not fit into IV or UV, try NV
1109 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1263 if (len <= NV_DIG)
1110 #if defined (LDBL_DIG)
1111 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1112 #endif
1113 )
1114 // fits into NV without loss of precision 1264 // fits into NV without loss of precision
1115 return newSVnv (Atof (start)); 1265 return newSVnv (json_atof (start));
1116 1266
1117 // everything else fails, convert it to a string 1267 // everything else fails, convert it to a string
1118 return newSVpvn (start, dec->cur - start); 1268 return newSVpvn (start, dec->cur - start);
1119 } 1269 }
1120 1270
1121 // loss of precision here 1271 // loss of precision here
1122 return newSVnv (Atof (start)); 1272 return newSVnv (json_atof (start));
1123 1273
1124fail: 1274fail:
1125 return 0; 1275 return 0;
1126} 1276}
1127 1277
… …
1151 if (*dec->cur == ']') 1301 if (*dec->cur == ']')
1152 { 1302 {
1153 ++dec->cur; 1303 ++dec->cur;
1154 break; 1304 break;
1155 } 1305 }
1156 1306
1157 if (*dec->cur != ',') 1307 if (*dec->cur != ',')
1158 ERR (", or ] expected while parsing array"); 1308 ERR (", or ] expected while parsing array");
1159 1309
1160 ++dec->cur; 1310 ++dec->cur;
1161 1311
… …
1296 dSP; 1446 dSP;
1297 int count; 1447 int count;
1298 1448
1299 ENTER; SAVETMPS; PUSHMARK (SP); 1449 ENTER; SAVETMPS; PUSHMARK (SP);
1300 XPUSHs (HeVAL (he)); 1450 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv);
1301 1452
1302 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1303 1454
1304 if (count == 1) 1455 if (count == 1)
1305 { 1456 {
1306 sv = newSVsv (POPs); 1457 sv = newSVsv (POPs);
1307 FREETMPS; LEAVE; 1458 FREETMPS; LEAVE;
1308 return sv; 1459 return sv;
1309 } 1460 }
1310 1461
1462 SvREFCNT_inc (sv);
1311 FREETMPS; LEAVE; 1463 FREETMPS; LEAVE;
1312 } 1464 }
1313 } 1465 }
1314 1466
1315 if (dec->json.cb_object) 1467 if (dec->json.cb_object)
… …
1341 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1342 return 0; 1494 return 0;
1343} 1495}
1344 1496
1345static 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 *
1346decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1347{ 1581{
1348 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1349 // to parse everything. 1583 // to parse everything.
1350 switch (*dec->cur) 1584 switch (*dec->cur)
1351 { 1585 {
1352 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1353 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1354 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1355 1590
1356 case '-': 1591 case '-':
1357 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1358 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1359 return decode_num (dec); 1594 return decode_num (dec);
… …
1361 case 't': 1596 case 't':
1362 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1363 { 1598 {
1364 dec->cur += 4; 1599 dec->cur += 4;
1365#if JSON_SLOW 1600#if JSON_SLOW
1366 json_true = get_bool ("JSON::XS::true"); 1601 types_true = get_bool ("Types::Serialiser::true");
1367#endif 1602#endif
1368 return newSVsv (json_true); 1603 return newSVsv (types_true);
1369 } 1604 }
1370 else 1605 else
1371 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1372 1607
1373 break; 1608 break;
… …
1375 case 'f': 1610 case 'f':
1376 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1377 { 1612 {
1378 dec->cur += 5; 1613 dec->cur += 5;
1379#if JSON_SLOW 1614#if JSON_SLOW
1380 json_false = get_bool ("JSON::XS::false"); 1615 types_false = get_bool ("Types::Serialiser::false");
1381#endif 1616#endif
1382 return newSVsv (json_false); 1617 return newSVsv (types_false);
1383 } 1618 }
1384 else 1619 else
1385 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1386 1621
1387 break; 1622 break;
… …
1396 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1397 1632
1398 break; 1633 break;
1399 1634
1400 default: 1635 default:
1401 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1402 break; 1637 break;
1403 } 1638 }
1404 1639
1405fail: 1640fail:
1406 return 0; 1641 return 0;
1407} 1642}
1408 1643
1409static SV * 1644static SV *
1410decode_json (SV *string, JSON *json, STRLEN *offset_return) 1645decode_json (SV *string, JSON *json, char **offset_return)
1411{ 1646{
1412 dec_t dec; 1647 dec_t dec;
1413 STRLEN offset;
1414 SV *sv; 1648 SV *sv;
1415 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 */
1416 SvGETMAGIC (string); 1655 /*SvGETMAGIC (string);*/
1656 if (SvMAGICAL (string) || !SvPOK (string))
1657 string = sv_2mortal (newSVsv (string));
1658
1417 SvUPGRADE (string, SVt_PV); 1659 SvUPGRADE (string, SVt_PV);
1418 1660
1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1661 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to 1662 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading. 1663 * return the xpv_cur field which certainly exists after upgrading.
1422 * according to nicholas clark, calling SvPOK fixes this. 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.
1423 */ 1670 */
1424 SvPOK (string); 1671 {
1672#ifdef DEBUGGING
1673 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1674#else
1675 STRLEN offset = SvCUR (string);
1676#endif
1425 1677
1426 if (SvCUR (string) > json->max_size && json->max_size) 1678 if (offset > json->max_size && json->max_size)
1427 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",
1428 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1680 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1681 }
1429 1682
1430 if (json->flags & F_UTF8) 1683 if (DECODE_WANTS_OCTETS (json))
1431 sv_utf8_downgrade (string, 0); 1684 sv_utf8_downgrade (string, 0);
1432 else 1685 else
1433 sv_utf8_upgrade (string); 1686 sv_utf8_upgrade (string);
1434 1687
1435 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1688 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1445 1698
1446 *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
1447 1700
1448 decode_ws (&dec); 1701 decode_ws (&dec);
1449 sv = decode_sv (&dec); 1702 sv = decode_sv (&dec);
1703
1704 if (offset_return)
1705 *offset_return = dec.cur;
1450 1706
1451 if (!(offset_return || !sv)) 1707 if (!(offset_return || !sv))
1452 { 1708 {
1453 // check for trailing garbage 1709 // check for trailing garbage
1454 decode_ws (&dec); 1710 decode_ws (&dec);
… …
1457 { 1713 {
1458 dec.err = "garbage after JSON object"; 1714 dec.err = "garbage after JSON object";
1459 SvREFCNT_dec (sv); 1715 SvREFCNT_dec (sv);
1460 sv = 0; 1716 sv = 0;
1461 } 1717 }
1462 }
1463
1464 if (offset_return || !sv)
1465 {
1466 offset = dec.json.flags & F_UTF8
1467 ? dec.cur - SvPVX (string)
1468 : utf8_distance (dec.cur, SvPVX (string));
1469
1470 if (offset_return)
1471 *offset_return = offset;
1472 } 1718 }
1473 1719
1474 if (!sv) 1720 if (!sv)
1475 { 1721 {
1476 SV *uni = sv_newmortal (); 1722 SV *uni = sv_newmortal ();
… …
1482 SAVEVPTR (PL_curcop); 1728 SAVEVPTR (PL_curcop);
1483 PL_curcop = &cop; 1729 PL_curcop = &cop;
1484 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);
1485 LEAVE; 1731 LEAVE;
1486 1732
1487 croak ("%s, at character offset %d [\"%s\"]", 1733 croak ("%s, at character offset %d (before \"%s\")",
1488 dec.err, 1734 dec.err,
1489 (int)offset, 1735 (int)ptr_to_index (string, dec.cur),
1490 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1491 } 1737 }
1492 1738
1493 sv = sv_2mortal (sv); 1739 sv = sv_2mortal (sv);
1494 1740
… …
1503 1749
1504static void 1750static void
1505incr_parse (JSON *self) 1751incr_parse (JSON *self)
1506{ 1752{
1507 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...
1508 1757
1509 for (;;) 1758 for (;;)
1510 { 1759 {
1511 //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
1512 switch (self->incr_mode) 1761 switch (self->incr_mode)
1513 { 1762 {
1514 // only used for intiial whitespace skipping 1763 // only used for initial whitespace skipping
1515 case INCR_M_WS: 1764 case INCR_M_WS:
1516 for (;;) 1765 for (;;)
1517 { 1766 {
1518 if (*p > 0x20) 1767 if (*p > 0x20)
1519 { 1768 {
1769 if (*p == '#')
1770 {
1771 self->incr_mode = INCR_M_C0;
1772 goto incr_m_c;
1773 }
1774 else
1775 {
1520 self->incr_mode = INCR_M_JSON; 1776 self->incr_mode = INCR_M_JSON;
1521 goto incr_m_json; 1777 goto incr_m_json;
1778 }
1522 } 1779 }
1523 else if (!*p) 1780 else if (!*p)
1524 goto interrupt; 1781 goto interrupt;
1525 1782
1526 ++p; 1783 ++p;
… …
1532 goto interrupt; 1789 goto interrupt;
1533 1790
1534 ++p; 1791 ++p;
1535 self->incr_mode = INCR_M_STR; 1792 self->incr_mode = INCR_M_STR;
1536 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;
1537 1813
1538 // inside a string 1814 // inside a string
1539 case INCR_M_STR: 1815 case INCR_M_STR:
1540 incr_m_str: 1816 incr_m_str:
1541 for (;;) 1817 for (;;)
… …
1592 self->incr_mode = INCR_M_STR; 1868 self->incr_mode = INCR_M_STR;
1593 goto incr_m_str; 1869 goto incr_m_str;
1594 1870
1595 case '[': 1871 case '[':
1596 case '{': 1872 case '{':
1873 case '(':
1597 if (++self->incr_nest > self->max_depth) 1874 if (++self->incr_nest > self->max_depth)
1598 croak (ERR_NESTING_EXCEEDED); 1875 croak (ERR_NESTING_EXCEEDED);
1599 break; 1876 break;
1600 1877
1601 case ']': 1878 case ']':
1602 case '}': 1879 case '}':
1603 if (!--self->incr_nest) 1880 if (--self->incr_nest <= 0)
1604 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;
1605 } 1891 }
1606 } 1892 }
1607 } 1893 }
1608 1894
1609 modechange: 1895 modechange:
1610 ; 1896 ;
1611 } 1897 }
1612 1898
1613interrupt: 1899interrupt:
1614 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
1615 //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
1616} 1903}
1617 1904
1618///////////////////////////////////////////////////////////////////////////// 1905/////////////////////////////////////////////////////////////////////////////
1619// XS interface functions 1906// XS interface functions
… …
1629 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1630 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1631 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1632 : -1; 1919 : -1;
1633 1920
1634 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1635 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1636 1923
1637 json_true = get_bool ("JSON::XS::true"); 1924 types_true = get_bool ("Types::Serialiser::true");
1638 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 */
1639} 1931}
1640 1932
1641PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1642 1934
1643void CLONE (...) 1935void CLONE (...)
1644 CODE: 1936 CODE:
1645 json_stash = 0; 1937 json_stash = 0;
1646 json_boolean_stash = 0; 1938 types_boolean_stash = 0;
1647 1939
1648void new (char *klass) 1940void new (char *klass)
1649 PPCODE: 1941 PPCODE:
1650{ 1942{
1651 SV *pv = NEWSV (0, sizeof (JSON)); 1943 SV *pv = NEWSV (0, sizeof (JSON));
1652 SvPOK_only (pv); 1944 SvPOK_only (pv);
1653 json_init ((JSON *)SvPVX (pv)); 1945 json_init ((JSON *)SvPVX (pv));
1654 XPUSHs (sv_2mortal (sv_bless ( 1946 XPUSHs (sv_2mortal (sv_bless (
1655 newRV_noinc (pv), 1947 newRV_noinc (pv),
1656 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1671 shrink = F_SHRINK 1963 shrink = F_SHRINK
1672 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1673 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1674 relaxed = F_RELAXED 1966 relaxed = F_RELAXED
1675 allow_unknown = F_ALLOW_UNKNOWN 1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1676 PPCODE: 1969 PPCODE:
1677{ 1970{
1678 if (enable) 1971 if (enable)
1679 self->flags |= ix; 1972 self->flags |= ix;
1680 else 1973 else
… …
1696 get_shrink = F_SHRINK 1989 get_shrink = F_SHRINK
1697 get_allow_blessed = F_ALLOW_BLESSED 1990 get_allow_blessed = F_ALLOW_BLESSED
1698 get_convert_blessed = F_CONV_BLESSED 1991 get_convert_blessed = F_CONV_BLESSED
1699 get_relaxed = F_RELAXED 1992 get_relaxed = F_RELAXED
1700 get_allow_unknown = F_ALLOW_UNKNOWN 1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1701 PPCODE: 1995 PPCODE:
1702 XPUSHs (boolSV (self->flags & ix)); 1996 XPUSHs (boolSV (self->flags & ix));
1703 1997
1704void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1705 PPCODE: 1999 PPCODE:
… …
1733} 2027}
1734 2028
1735void 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)
1736 PPCODE: 2030 PPCODE:
1737{ 2031{
1738 if (!self->cb_sk_object) 2032 if (!self->cb_sk_object)
1739 self->cb_sk_object = newHV (); 2033 self->cb_sk_object = newHV ();
1740 2034
1741 if (SvOK (cb)) 2035 if (SvOK (cb))
1742 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2036 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1743 else 2037 else
… …
1754 XPUSHs (ST (0)); 2048 XPUSHs (ST (0));
1755} 2049}
1756 2050
1757void encode (JSON *self, SV *scalar) 2051void encode (JSON *self, SV *scalar)
1758 PPCODE: 2052 PPCODE:
1759 XPUSHs (encode_json (scalar, self)); 2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2054 XPUSHs (scalar);
1760 2055
1761void decode (JSON *self, SV *jsonstr) 2056void decode (JSON *self, SV *jsonstr)
1762 PPCODE: 2057 PPCODE:
1763 XPUSHs (decode_json (jsonstr, self, 0)); 2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2059 XPUSHs (jsonstr);
1764 2060
1765void decode_prefix (JSON *self, SV *jsonstr) 2061void decode_prefix (JSON *self, SV *jsonstr)
1766 PPCODE: 2062 PPCODE:
1767{ 2063{
1768 STRLEN offset; 2064 SV *sv;
2065 char *offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1769 EXTEND (SP, 2); 2067 EXTEND (SP, 2);
1770 PUSHs (decode_json (jsonstr, self, &offset)); 2068 PUSHs (sv);
1771 PUSHs (sv_2mortal (newSVuv (offset))); 2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1772} 2070}
1773 2071
1774void incr_parse (JSON *self, SV *jsonstr = 0) 2072void incr_parse (JSON *self, SV *jsonstr = 0)
1775 PPCODE: 2073 PPCODE:
1776{ 2074{
1777 if (!self->incr_text) 2075 if (!self->incr_text)
1778 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 }
1779 2096
1780 // append data, if any 2097 // append data, if any
1781 if (jsonstr) 2098 if (jsonstr)
1782 { 2099 {
2100 /* make sure both strings have same encoding */
1783 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);
1784 { 2104 else
1785 /* utf-8-ness differs, need to upgrade */
1786 sv_utf8_upgrade (self->incr_text); 2105 sv_utf8_upgrade (jsonstr);
1787 2106
1788 if (self->incr_pos) 2107 /* and then just blindly append */
1789 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1790 - (U8 *)SvPVX (self->incr_text);
1791 }
1792
1793 { 2108 {
1794 STRLEN len; 2109 STRLEN len;
1795 const char *str = SvPV (jsonstr, len); 2110 const char *str = SvPV (jsonstr, len);
1796 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
1797 Move (str, SvEND (self->incr_text), len, char); 2116 Move (str, SvEND (self->incr_text), len, char);
1798 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2117 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1799 *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
1800 } 2119 }
1801 } 2120 }
1802 2121
1803 if (GIMME_V != G_VOID) 2122 if (GIMME_V != G_VOID)
1804 do 2123 do
1805 { 2124 {
2125 SV *sv;
1806 STRLEN offset; 2126 char *offset;
1807 2127
1808 if (!INCR_DONE (self)) 2128 if (!INCR_DONE (self))
1809 { 2129 {
1810 incr_parse (self); 2130 incr_parse (self);
1811 2131
1812 if (self->incr_pos > self->max_size && self->max_size) 2132 if (self->incr_pos > self->max_size && self->max_size)
1813 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2133 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1814 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2134 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1815 2135
1816 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
1817 break; 2145 break;
2146 }
1818 } 2147 }
1819 2148
1820 XPUSHs (decode_json (self->incr_text, self, &offset)); 2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv);
1821 2151
1822 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1823 self->incr_pos -= offset; 2152 self->incr_pos -= offset - SvPVX (self->incr_text);
1824 self->incr_nest = 0; 2153 self->incr_nest = 0;
1825 self->incr_mode = 0; 2154 self->incr_mode = 0;
2155
2156 sv_chop (self->incr_text, offset);
1826 } 2157 }
1827 while (GIMME_V == G_ARRAY); 2158 while (GIMME_V == G_ARRAY);
1828} 2159}
1829 2160
1830SV *incr_text (JSON *self) 2161SV *incr_text (JSON *self)
… …
1868 SvREFCNT_dec (self->incr_text); 2199 SvREFCNT_dec (self->incr_text);
1869 2200
1870PROTOTYPES: ENABLE 2201PROTOTYPES: ENABLE
1871 2202
1872void encode_json (SV *scalar) 2203void encode_json (SV *scalar)
1873 ALIAS:
1874 to_json_ = 0
1875 encode_json = F_UTF8
1876 PPCODE: 2204 PPCODE:
1877{ 2205{
1878 JSON json; 2206 JSON json;
1879 json_init (&json); 2207 json_init (&json);
1880 json.flags |= ix; 2208 json.flags |= F_UTF8;
1881 XPUSHs (encode_json (scalar, &json)); 2209 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2210 XPUSHs (scalar);
1882} 2211}
1883 2212
1884void decode_json (SV *jsonstr) 2213void decode_json (SV *jsonstr)
1885 ALIAS:
1886 from_json_ = 0
1887 decode_json = F_UTF8
1888 PPCODE: 2214 PPCODE:
1889{ 2215{
1890 JSON json; 2216 JSON json;
1891 json_init (&json); 2217 json_init (&json);
1892 json.flags |= ix; 2218 json.flags |= F_UTF8;
1893 XPUSHs (decode_json (jsonstr, &json, 0)); 2219 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2220 XPUSHs (jsonstr);
1894} 2221}
1895 2222
1896

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines