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.94 by root, Thu Nov 20 03:59:53 2008 UTC vs.
Revision 1.128 by root, Fri Oct 7 05:18:48 2016 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
… …
64#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 79#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
65 80
66#ifdef USE_ITHREADS 81#ifdef USE_ITHREADS
67# define JSON_SLOW 1 82# define JSON_SLOW 1
68# 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))
84# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
69#else 85#else
70# define JSON_SLOW 0 86# define JSON_SLOW 0
71# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
72#endif 89#endif
73 90
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 91// the amount of HEs to allocate on the stack, when sorting keys
75static SV *json_true, *json_false; 92#define STACK_HES 64
93
94static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
95static SV *bool_true, *bool_false, *sv_json;
76 96
77enum { 97enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 98 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 99 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 100 INCR_M_BS, // inside backslash
101 INCR_M_C0, // inside comment in initial whitespace sequence
102 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 103 INCR_M_JSON // outside anything, count nesting
82}; 104};
83 105
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 106#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 107
… …
175 *s++ = 0x80 | ( ch & 0x3f); 197 *s++ = 0x80 | ( ch & 0x3f);
176 198
177 return s; 199 return s;
178} 200}
179 201
202// convert offset pointer to character index, sv must be string
203static STRLEN
204ptr_to_index (SV *sv, char *offset)
205{
206 return SvUTF8 (sv)
207 ? utf8_distance (offset, SvPVX (sv))
208 : offset - SvPVX (sv);
209}
210
211/////////////////////////////////////////////////////////////////////////////
212// fp hell
213
214// scan a group of digits, and a trailing exponent
215static void
216json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
217{
218 UV uaccum = 0;
219 int eaccum = 0;
220
221 // if we recurse too deep, skip all remaining digits
222 // to avoid a stack overflow attack
223 if (expect_false (--maxdepth <= 0))
224 while (((U8)*s - '0') < 10)
225 ++s;
226
227 for (;;)
228 {
229 U8 dig = (U8)*s - '0';
230
231 if (expect_false (dig >= 10))
232 {
233 if (dig == (U8)((U8)'.' - (U8)'0'))
234 {
235 ++s;
236 json_atof_scan1 (s, accum, expo, 1, maxdepth);
237 }
238 else if ((dig | ' ') == 'e' - '0')
239 {
240 int exp2 = 0;
241 int neg = 0;
242
243 ++s;
244
245 if (*s == '-')
246 {
247 ++s;
248 neg = 1;
249 }
250 else if (*s == '+')
251 ++s;
252
253 while ((dig = (U8)*s - '0') < 10)
254 exp2 = exp2 * 10 + *s++ - '0';
255
256 *expo += neg ? -exp2 : exp2;
257 }
258
259 break;
260 }
261
262 ++s;
263
264 uaccum = uaccum * 10 + dig;
265 ++eaccum;
266
267 // if we have too many digits, then recurse for more
268 // we actually do this for rather few digits
269 if (uaccum >= (UV_MAX - 9) / 10)
270 {
271 if (postdp) *expo -= eaccum;
272 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
273 if (postdp) *expo += eaccum;
274
275 break;
276 }
277 }
278
279 // this relies greatly on the quality of the pow ()
280 // implementation of the platform, but a good
281 // implementation is hard to beat.
282 // (IEEE 754 conformant ones are required to be exact)
283 if (postdp) *expo -= eaccum;
284 *accum += uaccum * Perl_pow (10., *expo);
285 *expo += eaccum;
286}
287
288static NV
289json_atof (const char *s)
290{
291 NV accum = 0.;
292 int expo = 0;
293 int neg = 0;
294
295 if (*s == '-')
296 {
297 ++s;
298 neg = 1;
299 }
300
301 // a recursion depth of ten gives us >>500 bits
302 json_atof_scan1 (s, &accum, &expo, 0, 10);
303
304 return neg ? -accum : accum;
305}
306
307// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
308static int
309ref_bool_type (SV *sv)
310{
311 svtype svt = SvTYPE (sv);
312
313 if (svt < SVt_PVAV)
314 {
315 STRLEN len = 0;
316 char *pv = svt ? SvPV (sv, len) : 0;
317
318 if (len == 1)
319 if (*pv == '1')
320 return 1;
321 else if (*pv == '0')
322 return 0;
323 }
324
325 return -1;
326}
327
328// returns whether scalar is not a reference in the sense of allow_nonref
329static int
330json_nonref (SV *scalar)
331{
332 if (!SvROK (scalar))
333 return 1;
334
335 scalar = SvRV (scalar);
336
337 if (SvTYPE (scalar) >= SVt_PVMG)
338 {
339 if (SvSTASH (scalar) == bool_stash)
340 return 1;
341
342 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
343 return 1;
344 }
345
346 return 0;
347}
348
180///////////////////////////////////////////////////////////////////////////// 349/////////////////////////////////////////////////////////////////////////////
181// encoder 350// encoder
182 351
183// structure used for encoding JSON 352// structure used for encoding JSON
184typedef struct 353typedef struct
… …
195need (enc_t *enc, STRLEN len) 364need (enc_t *enc, STRLEN len)
196{ 365{
197 if (expect_false (enc->cur + len >= enc->end)) 366 if (expect_false (enc->cur + len >= enc->end))
198 { 367 {
199 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 368 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
200 SvGROW (enc->sv, cur + len + 1); 369 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
201 enc->cur = SvPVX (enc->sv) + cur; 370 enc->cur = SvPVX (enc->sv) + cur;
202 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 371 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
203 } 372 }
204} 373}
205 374
… …
371 540
372 if (enc->indent >= enc->json.max_depth) 541 if (enc->indent >= enc->json.max_depth)
373 croak (ERR_NESTING_EXCEEDED); 542 croak (ERR_NESTING_EXCEEDED);
374 543
375 encode_ch (enc, '['); 544 encode_ch (enc, '[');
376 545
377 if (len >= 0) 546 if (len >= 0)
378 { 547 {
379 encode_nl (enc); ++enc->indent; 548 encode_nl (enc); ++enc->indent;
380 549
381 for (i = 0; i <= len; ++i) 550 for (i = 0; i <= len; ++i)
… …
393 encode_comma (enc); 562 encode_comma (enc);
394 } 563 }
395 564
396 encode_nl (enc); --enc->indent; encode_indent (enc); 565 encode_nl (enc); --enc->indent; encode_indent (enc);
397 } 566 }
398 567
399 encode_ch (enc, ']'); 568 encode_ch (enc, ']');
400} 569}
401 570
402static void 571static void
403encode_hk (enc_t *enc, HE *he) 572encode_hk (enc_t *enc, HE *he)
… …
407 if (HeKLEN (he) == HEf_SVKEY) 576 if (HeKLEN (he) == HEf_SVKEY)
408 { 577 {
409 SV *sv = HeSVKEY (he); 578 SV *sv = HeSVKEY (he);
410 STRLEN len; 579 STRLEN len;
411 char *str; 580 char *str;
412 581
413 SvGETMAGIC (sv); 582 SvGETMAGIC (sv);
414 str = SvPV (sv, len); 583 str = SvPV (sv, len);
415 584
416 encode_str (enc, str, len, SvUTF8 (sv)); 585 encode_str (enc, str, len, SvUTF8 (sv));
417 } 586 }
… …
462 631
463 // for canonical output we have to sort by keys first 632 // for canonical output we have to sort by keys first
464 // actually, this is mostly due to the stupid so-called 633 // actually, this is mostly due to the stupid so-called
465 // security workaround added somewhere in 5.8.x 634 // security workaround added somewhere in 5.8.x
466 // that randomises hash orderings 635 // that randomises hash orderings
467 if (enc->json.flags & F_CANONICAL) 636 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
468 { 637 {
469 int count = hv_iterinit (hv); 638 int count = hv_iterinit (hv);
470 639
471 if (SvMAGICAL (hv)) 640 if (SvMAGICAL (hv))
472 { 641 {
… …
483 } 652 }
484 653
485 if (count) 654 if (count)
486 { 655 {
487 int i, fast = 1; 656 int i, fast = 1;
488#if defined(__BORLANDC__) || defined(_MSC_VER) 657 HE *hes_stack [STACK_HES];
489 HE **hes = _alloca (count * sizeof (HE)); 658 HE **hes = hes_stack;
490#else 659
491 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 660 // allocate larger arrays on the heap
492#endif 661 if (count > STACK_HES)
662 {
663 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
664 hes = (HE **)SvPVX (sv);
665 }
493 666
494 i = 0; 667 i = 0;
495 while ((he = hv_iternext (hv))) 668 while ((he = hv_iternext (hv)))
496 { 669 {
497 hes [i++] = he; 670 hes [i++] = he;
… …
566// encode objects, arrays and special \0=false and \1=true values. 739// encode objects, arrays and special \0=false and \1=true values.
567static void 740static void
568encode_rv (enc_t *enc, SV *sv) 741encode_rv (enc_t *enc, SV *sv)
569{ 742{
570 svtype svt; 743 svtype svt;
744 GV *method;
571 745
572 SvGETMAGIC (sv); 746 SvGETMAGIC (sv);
573 svt = SvTYPE (sv); 747 svt = SvTYPE (sv);
574 748
575 if (expect_false (SvOBJECT (sv))) 749 if (expect_false (SvOBJECT (sv)))
576 { 750 {
577 HV *stash = !JSON_SLOW || json_boolean_stash 751 HV *stash = SvSTASH (sv);
578 ? json_boolean_stash
579 : gv_stashpv ("JSON::XS::Boolean", 1);
580 752
581 if (SvSTASH (sv) == stash) 753 if (stash == bool_stash)
582 { 754 {
583 if (SvIV (sv)) 755 if (SvIV (sv))
584 encode_str (enc, "true", 4, 0); 756 encode_str (enc, "true", 4, 0);
585 else 757 else
586 encode_str (enc, "false", 5, 0); 758 encode_str (enc, "false", 5, 0);
587 } 759 }
760 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
761 {
762 int count;
763 dSP;
764
765 ENTER; SAVETMPS;
766 SAVESTACK_POS ();
767 PUSHMARK (SP);
768 EXTEND (SP, 2);
769 // we re-bless the reference to get overload and other niceties right
770 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
771 PUSHs (sv_json);
772
773 PUTBACK;
774 count = call_sv ((SV *)GvCV (method), G_ARRAY);
775 SPAGAIN;
776
777 // catch this surprisingly common error
778 if (SvROK (TOPs) && SvRV (TOPs) == sv)
779 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
780
781 encode_ch (enc, '(');
782 encode_ch (enc, '"');
783 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
784 encode_ch (enc, '"');
785 encode_ch (enc, ')');
786 encode_ch (enc, '[');
787
788 while (count)
789 {
790 encode_sv (enc, SP[1 - count--]);
791
792 if (count)
793 encode_ch (enc, ',');
794 }
795
796 encode_ch (enc, ']');
797
798 FREETMPS; LEAVE;
799 }
800 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
801 {
802 dSP;
803
804 ENTER; SAVETMPS;
805 PUSHMARK (SP);
806 // we re-bless the reference to get overload and other niceties right
807 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
808
809 // calling with G_SCALAR ensures that we always get a 1 return value
810 PUTBACK;
811 call_sv ((SV *)GvCV (method), G_SCALAR);
812 SPAGAIN;
813
814 // catch this surprisingly common error
815 if (SvROK (TOPs) && SvRV (TOPs) == sv)
816 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
817
818 sv = POPs;
819 PUTBACK;
820
821 encode_sv (enc, sv);
822
823 FREETMPS; LEAVE;
824 }
825 else if (enc->json.flags & F_ALLOW_BLESSED)
826 encode_str (enc, "null", 4, 0);
588 else 827 else
589 {
590#if 0
591 if (0 && sv_derived_from (rv, "JSON::Literal"))
592 {
593 // not yet
594 }
595#endif
596 if (enc->json.flags & F_CONV_BLESSED)
597 {
598 // we re-bless the reference to get overload and other niceties right
599 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
600
601 if (to_json)
602 {
603 dSP;
604
605 ENTER; SAVETMPS; PUSHMARK (SP);
606 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
607
608 // calling with G_SCALAR ensures that we always get a 1 return value
609 PUTBACK;
610 call_sv ((SV *)GvCV (to_json), G_SCALAR);
611 SPAGAIN;
612
613 // catch this surprisingly common error
614 if (SvROK (TOPs) && SvRV (TOPs) == sv)
615 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
616
617 sv = POPs;
618 PUTBACK;
619
620 encode_sv (enc, sv);
621
622 FREETMPS; LEAVE;
623 }
624 else if (enc->json.flags & F_ALLOW_BLESSED)
625 encode_str (enc, "null", 4, 0);
626 else
627 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
628 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629 }
630 else if (enc->json.flags & F_ALLOW_BLESSED)
631 encode_str (enc, "null", 4, 0);
632 else
633 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 828 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
634 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 829 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
635 }
636 } 830 }
637 else if (svt == SVt_PVHV) 831 else if (svt == SVt_PVHV)
638 encode_hv (enc, (HV *)sv); 832 encode_hv (enc, (HV *)sv);
639 else if (svt == SVt_PVAV) 833 else if (svt == SVt_PVAV)
640 encode_av (enc, (AV *)sv); 834 encode_av (enc, (AV *)sv);
641 else if (svt < SVt_PVAV) 835 else if (svt < SVt_PVAV)
642 { 836 {
643 STRLEN len = 0; 837 int bool_type = ref_bool_type (sv);
644 char *pv = svt ? SvPV (sv, len) : 0;
645 838
646 if (len == 1 && *pv == '1') 839 if (bool_type == 1)
647 encode_str (enc, "true", 4, 0); 840 encode_str (enc, "true", 4, 0);
648 else if (len == 1 && *pv == '0') 841 else if (bool_type == 0)
649 encode_str (enc, "false", 5, 0); 842 encode_str (enc, "false", 5, 0);
650 else if (enc->json.flags & F_ALLOW_UNKNOWN) 843 else if (enc->json.flags & F_ALLOW_UNKNOWN)
651 encode_str (enc, "null", 4, 0); 844 encode_str (enc, "null", 4, 0);
652 else 845 else
653 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 846 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
716 } 909 }
717 else 910 else
718 { 911 {
719 // large integer, use the (rather slow) snprintf way. 912 // large integer, use the (rather slow) snprintf way.
720 need (enc, IVUV_MAXCHARS); 913 need (enc, IVUV_MAXCHARS);
721 enc->cur += 914 enc->cur +=
722 SvIsUV(sv) 915 SvIsUV(sv)
723 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 916 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
724 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 917 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
725 } 918 }
726 } 919 }
727 else if (SvROK (sv)) 920 else if (SvROK (sv))
728 encode_rv (enc, SvRV (sv)); 921 encode_rv (enc, SvRV (sv));
729 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 922 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
730 encode_str (enc, "null", 4, 0); 923 encode_str (enc, "null", 4, 0);
731 else 924 else
732 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 925 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
733 SvPV_nolen (sv), SvFLAGS (sv)); 926 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
734} 927}
735 928
736static SV * 929static SV *
737encode_json (SV *scalar, JSON *json) 930encode_json (SV *scalar, JSON *json)
738{ 931{
739 enc_t enc; 932 enc_t enc;
740 933
741 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 934 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
742 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 935 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
743 936
744 enc.json = *json; 937 enc.json = *json;
745 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 938 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
746 enc.cur = SvPVX (enc.sv); 939 enc.cur = SvPVX (enc.sv);
… …
750 : enc.json.flags & F_LATIN1 ? 0x000100UL 943 : enc.json.flags & F_LATIN1 ? 0x000100UL
751 : 0x110000UL; 944 : 0x110000UL;
752 945
753 SvPOK_only (enc.sv); 946 SvPOK_only (enc.sv);
754 encode_sv (&enc, scalar); 947 encode_sv (&enc, scalar);
948 encode_nl (&enc);
755 949
756 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 950 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
757 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 951 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
758 952
759 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 953 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
939 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1133 else if (expect_true (ch >= 0x20 && ch < 0x80))
940 *cur++ = ch; 1134 *cur++ = ch;
941 else if (ch >= 0x80) 1135 else if (ch >= 0x80)
942 { 1136 {
943 STRLEN clen; 1137 STRLEN clen;
944 UV uch;
945 1138
946 --dec_cur; 1139 --dec_cur;
947 1140
948 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1141 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
949 if (clen == (STRLEN)-1) 1142 if (clen == (STRLEN)-1)
950 ERR ("malformed UTF-8 character in JSON string"); 1143 ERR ("malformed UTF-8 character in JSON string");
951 1144
952 do 1145 do
953 *cur++ = *dec_cur++; 1146 *cur++ = *dec_cur++;
954 while (--clen); 1147 while (--clen);
955 1148
956 utf8 = 1; 1149 utf8 = 1;
957 } 1150 }
1151 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1152 *cur++ = ch;
958 else 1153 else
959 { 1154 {
960 --dec_cur; 1155 --dec_cur;
961 1156
962 if (!ch) 1157 if (!ch)
… …
970 { 1165 {
971 STRLEN len = cur - buf; 1166 STRLEN len = cur - buf;
972 1167
973 if (sv) 1168 if (sv)
974 { 1169 {
975 SvGROW (sv, SvCUR (sv) + len + 1); 1170 STRLEN cur = SvCUR (sv);
1171
1172 if (SvLEN (sv) <= cur + len)
1173 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1174
976 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1175 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
977 SvCUR_set (sv, SvCUR (sv) + len); 1176 SvCUR_set (sv, SvCUR (sv) + len);
978 } 1177 }
979 else 1178 else
980 sv = newSVpvn (buf, len); 1179 sv = newSVpvn (buf, len);
… …
1071 1270
1072 // special case the rather common 1..5-digit-int case 1271 // special case the rather common 1..5-digit-int case
1073 if (*start == '-') 1272 if (*start == '-')
1074 switch (len) 1273 switch (len)
1075 { 1274 {
1076 case 2: return newSViv (-( start [1] - '0' * 1)); 1275 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1077 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1276 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1078 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1277 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1079 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1278 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1080 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1279 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1081 } 1280 }
1082 else 1281 else
1083 switch (len) 1282 switch (len)
1084 { 1283 {
1085 case 1: return newSViv ( start [0] - '0' * 1); 1284 case 1: return newSViv ( start [0] - '0' * 1);
1086 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1285 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1087 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1286 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1088 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1287 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1089 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1288 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1090 } 1289 }
1091 1290
1092 { 1291 {
1093 UV uv; 1292 UV uv;
1094 int numtype = grok_number (start, len, &uv); 1293 int numtype = grok_number (start, len, &uv);
… …
1103 } 1302 }
1104 1303
1105 len -= *start == '-' ? 1 : 0; 1304 len -= *start == '-' ? 1 : 0;
1106 1305
1107 // does not fit into IV or UV, try NV 1306 // does not fit into IV or UV, try NV
1108 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1307 if (len <= NV_DIG)
1109 #if defined (LDBL_DIG)
1110 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1111 #endif
1112 )
1113 // fits into NV without loss of precision 1308 // fits into NV without loss of precision
1114 return newSVnv (Atof (start)); 1309 return newSVnv (json_atof (start));
1115 1310
1116 // everything else fails, convert it to a string 1311 // everything else fails, convert it to a string
1117 return newSVpvn (start, dec->cur - start); 1312 return newSVpvn (start, dec->cur - start);
1118 } 1313 }
1119 1314
1120 // loss of precision here 1315 // loss of precision here
1121 return newSVnv (Atof (start)); 1316 return newSVnv (json_atof (start));
1122 1317
1123fail: 1318fail:
1124 return 0; 1319 return 0;
1125} 1320}
1126 1321
… …
1150 if (*dec->cur == ']') 1345 if (*dec->cur == ']')
1151 { 1346 {
1152 ++dec->cur; 1347 ++dec->cur;
1153 break; 1348 break;
1154 } 1349 }
1155 1350
1156 if (*dec->cur != ',') 1351 if (*dec->cur != ',')
1157 ERR (", or ] expected while parsing array"); 1352 ERR (", or ] expected while parsing array");
1158 1353
1159 ++dec->cur; 1354 ++dec->cur;
1160 1355
… …
1284 1479
1285 hv_iterinit (hv); 1480 hv_iterinit (hv);
1286 he = hv_iternext (hv); 1481 he = hv_iternext (hv);
1287 hv_iterinit (hv); 1482 hv_iterinit (hv);
1288 1483
1289 // the next line creates a mortal sv each time its called. 1484 // the next line creates a mortal sv each time it's called.
1290 // might want to optimise this for common cases. 1485 // might want to optimise this for common cases.
1291 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1486 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1292 1487
1293 if (cb) 1488 if (cb)
1294 { 1489 {
1295 dSP; 1490 dSP;
1296 int count; 1491 int count;
1297 1492
1298 ENTER; SAVETMPS; PUSHMARK (SP); 1493 ENTER; SAVETMPS;
1494 SAVESTACK_POS ();
1495 PUSHMARK (SP);
1299 XPUSHs (HeVAL (he)); 1496 XPUSHs (HeVAL (he));
1497 sv_2mortal (sv);
1300 1498
1301 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1499 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1302 1500
1303 if (count == 1) 1501 if (count == 1)
1304 { 1502 {
1305 sv = newSVsv (POPs); 1503 sv = newSVsv (POPs);
1306 FREETMPS; LEAVE; 1504 FREETMPS; LEAVE;
1307 return sv; 1505 return sv;
1308 } 1506 }
1309 1507
1508 SvREFCNT_inc (sv);
1310 FREETMPS; LEAVE; 1509 FREETMPS; LEAVE;
1311 } 1510 }
1312 } 1511 }
1313 1512
1314 if (dec->json.cb_object) 1513 if (dec->json.cb_object)
1315 { 1514 {
1316 dSP; 1515 dSP;
1317 int count; 1516 int count;
1318 1517
1319 ENTER; SAVETMPS; PUSHMARK (SP); 1518 ENTER; SAVETMPS;
1519 SAVESTACK_POS ();
1520 PUSHMARK (SP);
1320 XPUSHs (sv_2mortal (sv)); 1521 XPUSHs (sv_2mortal (sv));
1321 1522
1322 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1523 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1323 1524
1324 if (count == 1) 1525 if (count == 1)
… …
1340 DEC_DEC_DEPTH; 1541 DEC_DEC_DEPTH;
1341 return 0; 1542 return 0;
1342} 1543}
1343 1544
1344static SV * 1545static SV *
1546decode_tag (dec_t *dec)
1547{
1548 SV *tag = 0;
1549 SV *val = 0;
1550
1551 if (!(dec->json.flags & F_ALLOW_TAGS))
1552 ERR ("malformed JSON string, neither array, object, number, string or atom");
1553
1554 ++dec->cur;
1555
1556 decode_ws (dec);
1557
1558 tag = decode_sv (dec);
1559 if (!tag)
1560 goto fail;
1561
1562 if (!SvPOK (tag))
1563 ERR ("malformed JSON string, (tag) must be a string");
1564
1565 decode_ws (dec);
1566
1567 if (*dec->cur != ')')
1568 ERR (") expected after tag");
1569
1570 ++dec->cur;
1571
1572 decode_ws (dec);
1573
1574 val = decode_sv (dec);
1575 if (!val)
1576 goto fail;
1577
1578 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1579 ERR ("malformed JSON string, tag value must be an array");
1580
1581 {
1582 AV *av = (AV *)SvRV (val);
1583 int i, len = av_len (av) + 1;
1584 HV *stash = gv_stashsv (tag, 0);
1585 SV *sv;
1586
1587 if (!stash)
1588 ERR ("cannot decode perl-object (package does not exist)");
1589
1590 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1591
1592 if (!method)
1593 ERR ("cannot decode perl-object (package does not have a THAW method)");
1594
1595 dSP;
1596
1597 ENTER; SAVETMPS;
1598 PUSHMARK (SP);
1599 EXTEND (SP, len + 2);
1600 // we re-bless the reference to get overload and other niceties right
1601 PUSHs (tag);
1602 PUSHs (sv_json);
1603
1604 for (i = 0; i < len; ++i)
1605 PUSHs (*av_fetch (av, i, 1));
1606
1607 PUTBACK;
1608 call_sv ((SV *)GvCV (method), G_SCALAR);
1609 SPAGAIN;
1610
1611 SvREFCNT_dec (tag);
1612 SvREFCNT_dec (val);
1613 sv = SvREFCNT_inc (POPs);
1614
1615 PUTBACK;
1616
1617 FREETMPS; LEAVE;
1618
1619 return sv;
1620 }
1621
1622fail:
1623 SvREFCNT_dec (tag);
1624 SvREFCNT_dec (val);
1625 return 0;
1626}
1627
1628static SV *
1345decode_sv (dec_t *dec) 1629decode_sv (dec_t *dec)
1346{ 1630{
1347 // the beauty of JSON: you need exactly one character lookahead 1631 // the beauty of JSON: you need exactly one character lookahead
1348 // to parse everything. 1632 // to parse everything.
1349 switch (*dec->cur) 1633 switch (*dec->cur)
1350 { 1634 {
1351 case '"': ++dec->cur; return decode_str (dec); 1635 case '"': ++dec->cur; return decode_str (dec);
1352 case '[': ++dec->cur; return decode_av (dec); 1636 case '[': ++dec->cur; return decode_av (dec);
1353 case '{': ++dec->cur; return decode_hv (dec); 1637 case '{': ++dec->cur; return decode_hv (dec);
1638 case '(': return decode_tag (dec);
1354 1639
1355 case '-': 1640 case '-':
1356 case '0': case '1': case '2': case '3': case '4': 1641 case '0': case '1': case '2': case '3': case '4':
1357 case '5': case '6': case '7': case '8': case '9': 1642 case '5': case '6': case '7': case '8': case '9':
1358 return decode_num (dec); 1643 return decode_num (dec);
… …
1360 case 't': 1645 case 't':
1361 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1646 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1362 { 1647 {
1363 dec->cur += 4; 1648 dec->cur += 4;
1364#if JSON_SLOW 1649#if JSON_SLOW
1365 json_true = get_bool ("JSON::XS::true"); 1650 bool_true = get_bool ("Types::Serialiser::true");
1366#endif 1651#endif
1367 return newSVsv (json_true); 1652 return newSVsv (bool_true);
1368 } 1653 }
1369 else 1654 else
1370 ERR ("'true' expected"); 1655 ERR ("'true' expected");
1371 1656
1372 break; 1657 break;
… …
1374 case 'f': 1659 case 'f':
1375 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1660 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1376 { 1661 {
1377 dec->cur += 5; 1662 dec->cur += 5;
1378#if JSON_SLOW 1663#if JSON_SLOW
1379 json_false = get_bool ("JSON::XS::false"); 1664 bool_false = get_bool ("Types::Serialiser::false");
1380#endif 1665#endif
1381 return newSVsv (json_false); 1666 return newSVsv (bool_false);
1382 } 1667 }
1383 else 1668 else
1384 ERR ("'false' expected"); 1669 ERR ("'false' expected");
1385 1670
1386 break; 1671 break;
… …
1395 ERR ("'null' expected"); 1680 ERR ("'null' expected");
1396 1681
1397 break; 1682 break;
1398 1683
1399 default: 1684 default:
1400 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1685 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1401 break; 1686 break;
1402 } 1687 }
1403 1688
1404fail: 1689fail:
1405 return 0; 1690 return 0;
1406} 1691}
1407 1692
1408static SV * 1693static SV *
1409decode_json (SV *string, JSON *json, STRLEN *offset_return) 1694decode_json (SV *string, JSON *json, char **offset_return)
1410{ 1695{
1411 dec_t dec; 1696 dec_t dec;
1412 STRLEN offset;
1413 SV *sv; 1697 SV *sv;
1414 1698
1415 /* work around bugs in 5.10 where manipulating magic values 1699 /* work around bugs in 5.10 where manipulating magic values
1416 * will perl ignore the magic in subsequent accesses 1700 * makes perl ignore the magic in subsequent accesses.
1701 * also make a copy of non-PV values, to get them into a clean
1702 * state (SvPV should do that, but it's buggy, see below).
1703 *
1704 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1705 * as reported by Reini Urban.
1417 */ 1706 */
1418 /*SvGETMAGIC (string);*/ 1707 /*SvGETMAGIC (string);*/
1419 if (SvMAGICAL (string)) 1708 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1420 string = sv_2mortal (newSVsv (string)); 1709 string = sv_2mortal (newSVsv (string));
1421 1710
1422 SvUPGRADE (string, SVt_PV); 1711 SvUPGRADE (string, SVt_PV);
1423 1712
1424 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1713 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1429 * and hope for the best. 1718 * and hope for the best.
1430 * Damnit, SvPV_nolen still trips over yet another assertion. This 1719 * Damnit, SvPV_nolen still trips over yet another assertion. This
1431 * assertion business is seriously broken, try yet another workaround 1720 * assertion business is seriously broken, try yet another workaround
1432 * for the broken -DDEBUGGING. 1721 * for the broken -DDEBUGGING.
1433 */ 1722 */
1723 {
1434#ifdef DEBUGGING 1724#ifdef DEBUGGING
1435 offset = SvOK (string) ? sv_len (string) : 0; 1725 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1436#else 1726#else
1437 offset = SvCUR (string); 1727 STRLEN offset = SvCUR (string);
1438#endif 1728#endif
1439 1729
1440 if (offset > json->max_size && json->max_size) 1730 if (offset > json->max_size && json->max_size)
1441 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1731 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1442 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1732 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1733 }
1443 1734
1444 if (json->flags & F_UTF8) 1735 if (DECODE_WANTS_OCTETS (json))
1445 sv_utf8_downgrade (string, 0); 1736 sv_utf8_downgrade (string, 0);
1446 else 1737 else
1447 sv_utf8_upgrade (string); 1738 sv_utf8_upgrade (string);
1448 1739
1449 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1740 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1459 1750
1460 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1751 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1461 1752
1462 decode_ws (&dec); 1753 decode_ws (&dec);
1463 sv = decode_sv (&dec); 1754 sv = decode_sv (&dec);
1755
1756 if (offset_return)
1757 *offset_return = dec.cur;
1464 1758
1465 if (!(offset_return || !sv)) 1759 if (!(offset_return || !sv))
1466 { 1760 {
1467 // check for trailing garbage 1761 // check for trailing garbage
1468 decode_ws (&dec); 1762 decode_ws (&dec);
… …
1471 { 1765 {
1472 dec.err = "garbage after JSON object"; 1766 dec.err = "garbage after JSON object";
1473 SvREFCNT_dec (sv); 1767 SvREFCNT_dec (sv);
1474 sv = 0; 1768 sv = 0;
1475 } 1769 }
1476 }
1477
1478 if (offset_return || !sv)
1479 {
1480 offset = dec.json.flags & F_UTF8
1481 ? dec.cur - SvPVX (string)
1482 : utf8_distance (dec.cur, SvPVX (string));
1483
1484 if (offset_return)
1485 *offset_return = offset;
1486 } 1770 }
1487 1771
1488 if (!sv) 1772 if (!sv)
1489 { 1773 {
1490 SV *uni = sv_newmortal (); 1774 SV *uni = sv_newmortal ();
… …
1496 SAVEVPTR (PL_curcop); 1780 SAVEVPTR (PL_curcop);
1497 PL_curcop = &cop; 1781 PL_curcop = &cop;
1498 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1782 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1499 LEAVE; 1783 LEAVE;
1500 1784
1501 croak ("%s, at character offset %d [\"%s\"]", 1785 croak ("%s, at character offset %d (before \"%s\")",
1502 dec.err, 1786 dec.err,
1503 (int)offset, 1787 (int)ptr_to_index (string, dec.cur),
1504 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1788 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1505 } 1789 }
1506 1790
1507 sv = sv_2mortal (sv); 1791 sv = sv_2mortal (sv);
1508 1792
1509 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1793 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1510 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1794 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1511 1795
1512 return sv; 1796 return sv;
1513} 1797}
1514 1798
… …
1517 1801
1518static void 1802static void
1519incr_parse (JSON *self) 1803incr_parse (JSON *self)
1520{ 1804{
1521 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1805 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1806
1807 // the state machine here is a bit convoluted and could be simplified a lot
1808 // but this would make it slower, so...
1522 1809
1523 for (;;) 1810 for (;;)
1524 { 1811 {
1525 //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 1812 //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
1526 switch (self->incr_mode) 1813 switch (self->incr_mode)
1527 { 1814 {
1528 // only used for intiial whitespace skipping 1815 // only used for initial whitespace skipping
1529 case INCR_M_WS: 1816 case INCR_M_WS:
1530 for (;;) 1817 for (;;)
1531 { 1818 {
1532 if (*p > 0x20) 1819 if (*p > 0x20)
1533 { 1820 {
1821 if (*p == '#')
1822 {
1823 self->incr_mode = INCR_M_C0;
1824 goto incr_m_c;
1825 }
1826 else
1827 {
1534 self->incr_mode = INCR_M_JSON; 1828 self->incr_mode = INCR_M_JSON;
1535 goto incr_m_json; 1829 goto incr_m_json;
1830 }
1536 } 1831 }
1537 else if (!*p) 1832 else if (!*p)
1538 goto interrupt; 1833 goto interrupt;
1539 1834
1540 ++p; 1835 ++p;
… …
1546 goto interrupt; 1841 goto interrupt;
1547 1842
1548 ++p; 1843 ++p;
1549 self->incr_mode = INCR_M_STR; 1844 self->incr_mode = INCR_M_STR;
1550 goto incr_m_str; 1845 goto incr_m_str;
1846
1847 // inside #-style comments
1848 case INCR_M_C0:
1849 case INCR_M_C1:
1850 incr_m_c:
1851 for (;;)
1852 {
1853 if (*p == '\n')
1854 {
1855 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1856 break;
1857 }
1858 else if (!*p)
1859 goto interrupt;
1860
1861 ++p;
1862 }
1863
1864 break;
1551 1865
1552 // inside a string 1866 // inside a string
1553 case INCR_M_STR: 1867 case INCR_M_STR:
1554 incr_m_str: 1868 incr_m_str:
1555 for (;;) 1869 for (;;)
… …
1606 self->incr_mode = INCR_M_STR; 1920 self->incr_mode = INCR_M_STR;
1607 goto incr_m_str; 1921 goto incr_m_str;
1608 1922
1609 case '[': 1923 case '[':
1610 case '{': 1924 case '{':
1925 case '(':
1611 if (++self->incr_nest > self->max_depth) 1926 if (++self->incr_nest > self->max_depth)
1612 croak (ERR_NESTING_EXCEEDED); 1927 croak (ERR_NESTING_EXCEEDED);
1613 break; 1928 break;
1614 1929
1615 case ']': 1930 case ']':
1616 case '}': 1931 case '}':
1617 if (--self->incr_nest <= 0) 1932 if (--self->incr_nest <= 0)
1618 goto interrupt; 1933 goto interrupt;
1934 break;
1935
1936 case ')':
1937 --self->incr_nest;
1938 break;
1939
1940 case '#':
1941 self->incr_mode = INCR_M_C1;
1942 goto incr_m_c;
1619 } 1943 }
1620 } 1944 }
1621 } 1945 }
1622 1946
1623 modechange: 1947 modechange:
1624 ; 1948 ;
1625 } 1949 }
1626 1950
1627interrupt: 1951interrupt:
1628 self->incr_pos = p - SvPVX (self->incr_text); 1952 self->incr_pos = p - SvPVX (self->incr_text);
1953 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1629 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1954 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1630} 1955}
1631 1956
1632///////////////////////////////////////////////////////////////////////////// 1957/////////////////////////////////////////////////////////////////////////////
1633// XS interface functions 1958// XS interface functions
… …
1643 i >= '0' && i <= '9' ? i - '0' 1968 i >= '0' && i <= '9' ? i - '0'
1644 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1969 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1645 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1970 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1646 : -1; 1971 : -1;
1647 1972
1648 json_stash = gv_stashpv ("JSON::XS" , 1); 1973 json_stash = gv_stashpv ("JSON::XS" , 1);
1649 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1974 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1650
1651 json_true = get_bool ("JSON::XS::true"); 1975 bool_true = get_bool ("Types::Serialiser::true");
1652 json_false = get_bool ("JSON::XS::false"); 1976 bool_false = get_bool ("Types::Serialiser::false");
1977
1978 sv_json = newSVpv ("JSON", 0);
1979 SvREADONLY_on (sv_json);
1980
1981 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1653} 1982}
1654 1983
1655PROTOTYPES: DISABLE 1984PROTOTYPES: DISABLE
1656 1985
1657void CLONE (...) 1986void CLONE (...)
1658 CODE: 1987 CODE:
1659 json_stash = 0; 1988 json_stash = 0;
1660 json_boolean_stash = 0; 1989 bool_stash = 0;
1661 1990
1662void new (char *klass) 1991void new (char *klass)
1663 PPCODE: 1992 PPCODE:
1664{ 1993{
1665 SV *pv = NEWSV (0, sizeof (JSON)); 1994 SV *pv = NEWSV (0, sizeof (JSON));
1666 SvPOK_only (pv); 1995 SvPOK_only (pv);
1667 json_init ((JSON *)SvPVX (pv)); 1996 json_init ((JSON *)SvPVX (pv));
1668 XPUSHs (sv_2mortal (sv_bless ( 1997 XPUSHs (sv_2mortal (sv_bless (
1669 newRV_noinc (pv), 1998 newRV_noinc (pv),
1670 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1999 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1685 shrink = F_SHRINK 2014 shrink = F_SHRINK
1686 allow_blessed = F_ALLOW_BLESSED 2015 allow_blessed = F_ALLOW_BLESSED
1687 convert_blessed = F_CONV_BLESSED 2016 convert_blessed = F_CONV_BLESSED
1688 relaxed = F_RELAXED 2017 relaxed = F_RELAXED
1689 allow_unknown = F_ALLOW_UNKNOWN 2018 allow_unknown = F_ALLOW_UNKNOWN
2019 allow_tags = F_ALLOW_TAGS
1690 PPCODE: 2020 PPCODE:
1691{ 2021{
1692 if (enable) 2022 if (enable)
1693 self->flags |= ix; 2023 self->flags |= ix;
1694 else 2024 else
… …
1710 get_shrink = F_SHRINK 2040 get_shrink = F_SHRINK
1711 get_allow_blessed = F_ALLOW_BLESSED 2041 get_allow_blessed = F_ALLOW_BLESSED
1712 get_convert_blessed = F_CONV_BLESSED 2042 get_convert_blessed = F_CONV_BLESSED
1713 get_relaxed = F_RELAXED 2043 get_relaxed = F_RELAXED
1714 get_allow_unknown = F_ALLOW_UNKNOWN 2044 get_allow_unknown = F_ALLOW_UNKNOWN
2045 get_allow_tags = F_ALLOW_TAGS
1715 PPCODE: 2046 PPCODE:
1716 XPUSHs (boolSV (self->flags & ix)); 2047 XPUSHs (boolSV (self->flags & ix));
1717 2048
1718void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2049void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1719 PPCODE: 2050 PPCODE:
… …
1747} 2078}
1748 2079
1749void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2080void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1750 PPCODE: 2081 PPCODE:
1751{ 2082{
1752 if (!self->cb_sk_object) 2083 if (!self->cb_sk_object)
1753 self->cb_sk_object = newHV (); 2084 self->cb_sk_object = newHV ();
1754 2085
1755 if (SvOK (cb)) 2086 if (SvOK (cb))
1756 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2087 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1757 else 2088 else
… …
1768 XPUSHs (ST (0)); 2099 XPUSHs (ST (0));
1769} 2100}
1770 2101
1771void encode (JSON *self, SV *scalar) 2102void encode (JSON *self, SV *scalar)
1772 PPCODE: 2103 PPCODE:
1773 XPUSHs (encode_json (scalar, self)); 2104 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2105 XPUSHs (scalar);
1774 2106
1775void decode (JSON *self, SV *jsonstr) 2107void decode (JSON *self, SV *jsonstr)
1776 PPCODE: 2108 PPCODE:
1777 XPUSHs (decode_json (jsonstr, self, 0)); 2109 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2110 XPUSHs (jsonstr);
1778 2111
1779void decode_prefix (JSON *self, SV *jsonstr) 2112void decode_prefix (JSON *self, SV *jsonstr)
1780 PPCODE: 2113 PPCODE:
1781{ 2114{
1782 STRLEN offset; 2115 SV *sv;
2116 char *offset;
2117 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1783 EXTEND (SP, 2); 2118 EXTEND (SP, 2);
1784 PUSHs (decode_json (jsonstr, self, &offset)); 2119 PUSHs (sv);
1785 PUSHs (sv_2mortal (newSVuv (offset))); 2120 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1786} 2121}
1787 2122
1788void incr_parse (JSON *self, SV *jsonstr = 0) 2123void incr_parse (JSON *self, SV *jsonstr = 0)
1789 PPCODE: 2124 PPCODE:
1790{ 2125{
1791 if (!self->incr_text) 2126 if (!self->incr_text)
1792 self->incr_text = newSVpvn ("", 0); 2127 self->incr_text = newSVpvn ("", 0);
2128
2129 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2130 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2131 if (DECODE_WANTS_OCTETS (self))
2132 {
2133 if (self->incr_pos)
2134 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2135 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2136
2137 sv_utf8_downgrade (self->incr_text, 0);
2138 }
2139 else
2140 {
2141 sv_utf8_upgrade (self->incr_text);
2142
2143 if (self->incr_pos)
2144 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2145 - (U8 *)SvPVX (self->incr_text);
2146 }
1793 2147
1794 // append data, if any 2148 // append data, if any
1795 if (jsonstr) 2149 if (jsonstr)
1796 { 2150 {
2151 /* make sure both strings have same encoding */
1797 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 2152 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2153 if (SvUTF8 (jsonstr))
2154 sv_utf8_downgrade (jsonstr, 0);
1798 { 2155 else
1799 /* utf-8-ness differs, need to upgrade */
1800 sv_utf8_upgrade (self->incr_text); 2156 sv_utf8_upgrade (jsonstr);
1801 2157
1802 if (self->incr_pos) 2158 /* and then just blindly append */
1803 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1804 - (U8 *)SvPVX (self->incr_text);
1805 }
1806
1807 { 2159 {
1808 STRLEN len; 2160 STRLEN len;
1809 const char *str = SvPV (jsonstr, len); 2161 const char *str = SvPV (jsonstr, len);
1810 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 2162 STRLEN cur = SvCUR (self->incr_text);
2163
2164 if (SvLEN (self->incr_text) <= cur + len)
2165 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2166
1811 Move (str, SvEND (self->incr_text), len, char); 2167 Move (str, SvEND (self->incr_text), len, char);
1812 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2168 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1813 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2169 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1814 } 2170 }
1815 } 2171 }
1816 2172
1817 if (GIMME_V != G_VOID) 2173 if (GIMME_V != G_VOID)
1818 do 2174 do
1819 { 2175 {
2176 SV *sv;
1820 STRLEN offset; 2177 char *offset;
1821 2178
1822 if (!INCR_DONE (self)) 2179 if (!INCR_DONE (self))
1823 { 2180 {
1824 incr_parse (self); 2181 incr_parse (self);
1825 2182
1826 if (self->incr_pos > self->max_size && self->max_size) 2183 if (self->incr_pos > self->max_size && self->max_size)
1827 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2184 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1828 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2185 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1829 2186
1830 if (!INCR_DONE (self)) 2187 if (!INCR_DONE (self))
2188 {
2189 // as an optimisation, do not accumulate white space in the incr buffer
2190 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2191 {
2192 self->incr_pos = 0;
2193 SvCUR_set (self->incr_text, 0);
2194 }
2195
1831 break; 2196 break;
2197 }
1832 } 2198 }
1833 2199
1834 XPUSHs (decode_json (self->incr_text, self, &offset)); 2200 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2201 XPUSHs (sv);
1835 2202
1836 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1837 self->incr_pos -= offset; 2203 self->incr_pos -= offset - SvPVX (self->incr_text);
1838 self->incr_nest = 0; 2204 self->incr_nest = 0;
1839 self->incr_mode = 0; 2205 self->incr_mode = 0;
2206
2207 sv_chop (self->incr_text, offset);
1840 } 2208 }
1841 while (GIMME_V == G_ARRAY); 2209 while (GIMME_V == G_ARRAY);
1842} 2210}
1843 2211
1844SV *incr_text (JSON *self) 2212SV *incr_text (JSON *self)
… …
1882 SvREFCNT_dec (self->incr_text); 2250 SvREFCNT_dec (self->incr_text);
1883 2251
1884PROTOTYPES: ENABLE 2252PROTOTYPES: ENABLE
1885 2253
1886void encode_json (SV *scalar) 2254void encode_json (SV *scalar)
1887 ALIAS:
1888 to_json_ = 0
1889 encode_json = F_UTF8
1890 PPCODE: 2255 PPCODE:
1891{ 2256{
1892 JSON json; 2257 JSON json;
1893 json_init (&json); 2258 json_init (&json);
1894 json.flags |= ix; 2259 json.flags |= F_UTF8;
1895 XPUSHs (encode_json (scalar, &json)); 2260 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2261 XPUSHs (scalar);
1896} 2262}
1897 2263
1898void decode_json (SV *jsonstr) 2264void decode_json (SV *jsonstr)
1899 ALIAS:
1900 from_json_ = 0
1901 decode_json = F_UTF8
1902 PPCODE: 2265 PPCODE:
1903{ 2266{
1904 JSON json; 2267 JSON json;
1905 json_init (&json); 2268 json_init (&json);
1906 json.flags |= ix; 2269 json.flags |= F_UTF8;
1907 XPUSHs (decode_json (jsonstr, &json, 0)); 2270 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2271 XPUSHs (jsonstr);
1908} 2272}
1909 2273
1910

Diff Legend

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