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.88 by root, Sun Jun 22 12:05:49 2008 UTC vs.
Revision 1.125 by root, Sun Feb 21 15:37:53 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
… …
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 <= 0 && (json)->incr_mode == INCR_M_JSON) 104#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 105
… …
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;
724 SAVESTACK_POS ();
725 PUSHMARK (SP);
726 EXTEND (SP, 2);
727 // we re-bless the reference to get overload and other niceties right
728 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
729 PUSHs (sv_json);
730
731 PUTBACK;
732 count = call_sv ((SV *)GvCV (method), G_ARRAY);
733 SPAGAIN;
734
735 // catch this surprisingly common error
736 if (SvROK (TOPs) && SvRV (TOPs) == sv)
737 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
738
739 encode_ch (enc, '(');
740 encode_ch (enc, '"');
741 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
742 encode_ch (enc, '"');
743 encode_ch (enc, ')');
744 encode_ch (enc, '[');
745
746 while (count)
747 {
748 encode_sv (enc, SP[1 - count--]);
749
750 if (count)
751 encode_ch (enc, ',');
752 }
753
754 encode_ch (enc, ']');
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;
763 PUSHMARK (SP);
764 // we re-bless the reference to get overload and other niceties right
765 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
766
767 // calling with G_SCALAR ensures that we always get a 1 return value
768 PUTBACK;
769 call_sv ((SV *)GvCV (method), G_SCALAR);
770 SPAGAIN;
771
772 // catch this surprisingly common error
773 if (SvROK (TOPs) && SvRV (TOPs) == sv)
774 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
775
776 sv = POPs;
777 PUTBACK;
778
779 encode_sv (enc, sv);
780
781 FREETMPS; LEAVE;
782 }
783 else if (enc->json.flags & F_ALLOW_BLESSED)
784 encode_str (enc, "null", 4, 0);
589 else 785 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", 786 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)))); 787 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
636 }
637 } 788 }
638 else if (svt == SVt_PVHV) 789 else if (svt == SVt_PVHV)
639 encode_hv (enc, (HV *)sv); 790 encode_hv (enc, (HV *)sv);
640 else if (svt == SVt_PVAV) 791 else if (svt == SVt_PVAV)
641 encode_av (enc, (AV *)sv); 792 encode_av (enc, (AV *)sv);
… …
717 } 868 }
718 else 869 else
719 { 870 {
720 // large integer, use the (rather slow) snprintf way. 871 // large integer, use the (rather slow) snprintf way.
721 need (enc, IVUV_MAXCHARS); 872 need (enc, IVUV_MAXCHARS);
722 enc->cur += 873 enc->cur +=
723 SvIsUV(sv) 874 SvIsUV(sv)
724 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 875 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
725 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 876 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
726 } 877 }
727 } 878 }
728 else if (SvROK (sv)) 879 else if (SvROK (sv))
729 encode_rv (enc, SvRV (sv)); 880 encode_rv (enc, SvRV (sv));
730 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 881 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
731 encode_str (enc, "null", 4, 0); 882 encode_str (enc, "null", 4, 0);
732 else 883 else
733 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 884 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
734 SvPV_nolen (sv), SvFLAGS (sv)); 885 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
886}
887
888static int
889json_scalar (SV *scalar)
890{
891 return 0;//D
892 if (!SvROK (scalar))
893 return 1;
735} 894}
736 895
737static SV * 896static SV *
738encode_json (SV *scalar, JSON *json) 897encode_json (SV *scalar, JSON *json)
739{ 898{
740 enc_t enc; 899 enc_t enc;
741 900
742 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 901 if (!(json->flags & F_ALLOW_NONREF) && json_scalar (scalar))
743 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 902 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
744 903
745 enc.json = *json; 904 enc.json = *json;
746 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 905 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
747 enc.cur = SvPVX (enc.sv); 906 enc.cur = SvPVX (enc.sv);
… …
751 : enc.json.flags & F_LATIN1 ? 0x000100UL 910 : enc.json.flags & F_LATIN1 ? 0x000100UL
752 : 0x110000UL; 911 : 0x110000UL;
753 912
754 SvPOK_only (enc.sv); 913 SvPOK_only (enc.sv);
755 encode_sv (&enc, scalar); 914 encode_sv (&enc, scalar);
915 encode_nl (&enc);
756 916
757 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 917 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
758 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 918 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
759 919
760 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 920 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
940 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1100 else if (expect_true (ch >= 0x20 && ch < 0x80))
941 *cur++ = ch; 1101 *cur++ = ch;
942 else if (ch >= 0x80) 1102 else if (ch >= 0x80)
943 { 1103 {
944 STRLEN clen; 1104 STRLEN clen;
945 UV uch;
946 1105
947 --dec_cur; 1106 --dec_cur;
948 1107
949 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1108 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
950 if (clen == (STRLEN)-1) 1109 if (clen == (STRLEN)-1)
951 ERR ("malformed UTF-8 character in JSON string"); 1110 ERR ("malformed UTF-8 character in JSON string");
952 1111
953 do 1112 do
954 *cur++ = *dec_cur++; 1113 *cur++ = *dec_cur++;
955 while (--clen); 1114 while (--clen);
956 1115
957 utf8 = 1; 1116 utf8 = 1;
958 } 1117 }
1118 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1119 *cur++ = ch;
959 else 1120 else
960 { 1121 {
961 --dec_cur; 1122 --dec_cur;
962 1123
963 if (!ch) 1124 if (!ch)
… …
971 { 1132 {
972 STRLEN len = cur - buf; 1133 STRLEN len = cur - buf;
973 1134
974 if (sv) 1135 if (sv)
975 { 1136 {
976 SvGROW (sv, SvCUR (sv) + len + 1); 1137 STRLEN cur = SvCUR (sv);
1138
1139 if (SvLEN (sv) <= cur + len)
1140 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1141
977 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1142 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
978 SvCUR_set (sv, SvCUR (sv) + len); 1143 SvCUR_set (sv, SvCUR (sv) + len);
979 } 1144 }
980 else 1145 else
981 sv = newSVpvn (buf, len); 1146 sv = newSVpvn (buf, len);
… …
1072 1237
1073 // special case the rather common 1..5-digit-int case 1238 // special case the rather common 1..5-digit-int case
1074 if (*start == '-') 1239 if (*start == '-')
1075 switch (len) 1240 switch (len)
1076 { 1241 {
1077 case 2: return newSViv (-( start [1] - '0' * 1)); 1242 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1078 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1243 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)); 1244 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)); 1245 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)); 1246 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1082 } 1247 }
1083 else 1248 else
1084 switch (len) 1249 switch (len)
1085 { 1250 {
1086 case 1: return newSViv ( start [0] - '0' * 1); 1251 case 1: return newSViv ( start [0] - '0' * 1);
1087 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1252 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); 1253 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); 1254 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); 1255 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1091 } 1256 }
1092 1257
1093 { 1258 {
1094 UV uv; 1259 UV uv;
1095 int numtype = grok_number (start, len, &uv); 1260 int numtype = grok_number (start, len, &uv);
… …
1104 } 1269 }
1105 1270
1106 len -= *start == '-' ? 1 : 0; 1271 len -= *start == '-' ? 1 : 0;
1107 1272
1108 // does not fit into IV or UV, try NV 1273 // does not fit into IV or UV, try NV
1109 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1274 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 1275 // fits into NV without loss of precision
1115 return newSVnv (Atof (start)); 1276 return newSVnv (json_atof (start));
1116 1277
1117 // everything else fails, convert it to a string 1278 // everything else fails, convert it to a string
1118 return newSVpvn (start, dec->cur - start); 1279 return newSVpvn (start, dec->cur - start);
1119 } 1280 }
1120 1281
1121 // loss of precision here 1282 // loss of precision here
1122 return newSVnv (Atof (start)); 1283 return newSVnv (json_atof (start));
1123 1284
1124fail: 1285fail:
1125 return 0; 1286 return 0;
1126} 1287}
1127 1288
… …
1151 if (*dec->cur == ']') 1312 if (*dec->cur == ']')
1152 { 1313 {
1153 ++dec->cur; 1314 ++dec->cur;
1154 break; 1315 break;
1155 } 1316 }
1156 1317
1157 if (*dec->cur != ',') 1318 if (*dec->cur != ',')
1158 ERR (", or ] expected while parsing array"); 1319 ERR (", or ] expected while parsing array");
1159 1320
1160 ++dec->cur; 1321 ++dec->cur;
1161 1322
… …
1285 1446
1286 hv_iterinit (hv); 1447 hv_iterinit (hv);
1287 he = hv_iternext (hv); 1448 he = hv_iternext (hv);
1288 hv_iterinit (hv); 1449 hv_iterinit (hv);
1289 1450
1290 // the next line creates a mortal sv each time its called. 1451 // the next line creates a mortal sv each time it's called.
1291 // might want to optimise this for common cases. 1452 // might want to optimise this for common cases.
1292 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1453 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1293 1454
1294 if (cb) 1455 if (cb)
1295 { 1456 {
1296 dSP; 1457 dSP;
1297 int count; 1458 int count;
1298 1459
1299 ENTER; SAVETMPS; PUSHMARK (SP); 1460 ENTER; SAVETMPS;
1461 SAVESTACK_POS ();
1462 PUSHMARK (SP);
1300 XPUSHs (HeVAL (he)); 1463 XPUSHs (HeVAL (he));
1464 sv_2mortal (sv);
1301 1465
1302 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1466 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1303 1467
1304 if (count == 1) 1468 if (count == 1)
1305 { 1469 {
1306 sv = newSVsv (POPs); 1470 sv = newSVsv (POPs);
1307 FREETMPS; LEAVE; 1471 FREETMPS; LEAVE;
1308 return sv; 1472 return sv;
1309 } 1473 }
1310 1474
1475 SvREFCNT_inc (sv);
1311 FREETMPS; LEAVE; 1476 FREETMPS; LEAVE;
1312 } 1477 }
1313 } 1478 }
1314 1479
1315 if (dec->json.cb_object) 1480 if (dec->json.cb_object)
1316 { 1481 {
1317 dSP; 1482 dSP;
1318 int count; 1483 int count;
1319 1484
1320 ENTER; SAVETMPS; PUSHMARK (SP); 1485 ENTER; SAVETMPS;
1486 SAVESTACK_POS ();
1487 PUSHMARK (SP);
1321 XPUSHs (sv_2mortal (sv)); 1488 XPUSHs (sv_2mortal (sv));
1322 1489
1323 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1490 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1324 1491
1325 if (count == 1) 1492 if (count == 1)
… …
1341 DEC_DEC_DEPTH; 1508 DEC_DEC_DEPTH;
1342 return 0; 1509 return 0;
1343} 1510}
1344 1511
1345static SV * 1512static SV *
1513decode_tag (dec_t *dec)
1514{
1515 SV *tag = 0;
1516 SV *val = 0;
1517
1518 if (!(dec->json.flags & F_ALLOW_TAGS))
1519 ERR ("malformed JSON string, neither array, object, number, string or atom");
1520
1521 ++dec->cur;
1522
1523 decode_ws (dec);
1524
1525 tag = decode_sv (dec);
1526 if (!tag)
1527 goto fail;
1528
1529 if (!SvPOK (tag))
1530 ERR ("malformed JSON string, (tag) must be a string");
1531
1532 decode_ws (dec);
1533
1534 if (*dec->cur != ')')
1535 ERR (") expected after tag");
1536
1537 ++dec->cur;
1538
1539 decode_ws (dec);
1540
1541 val = decode_sv (dec);
1542 if (!val)
1543 goto fail;
1544
1545 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1546 ERR ("malformed JSON string, tag value must be an array");
1547
1548 {
1549 AV *av = (AV *)SvRV (val);
1550 int i, len = av_len (av) + 1;
1551 HV *stash = gv_stashsv (tag, 0);
1552 SV *sv;
1553
1554 if (!stash)
1555 ERR ("cannot decode perl-object (package does not exist)");
1556
1557 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1558
1559 if (!method)
1560 ERR ("cannot decode perl-object (package does not have a THAW method)");
1561
1562 dSP;
1563
1564 ENTER; SAVETMPS;
1565 PUSHMARK (SP);
1566 EXTEND (SP, len + 2);
1567 // we re-bless the reference to get overload and other niceties right
1568 PUSHs (tag);
1569 PUSHs (sv_json);
1570
1571 for (i = 0; i < len; ++i)
1572 PUSHs (*av_fetch (av, i, 1));
1573
1574 PUTBACK;
1575 call_sv ((SV *)GvCV (method), G_SCALAR);
1576 SPAGAIN;
1577
1578 SvREFCNT_dec (tag);
1579 SvREFCNT_dec (val);
1580 sv = SvREFCNT_inc (POPs);
1581
1582 PUTBACK;
1583
1584 FREETMPS; LEAVE;
1585
1586 return sv;
1587 }
1588
1589fail:
1590 SvREFCNT_dec (tag);
1591 SvREFCNT_dec (val);
1592 return 0;
1593}
1594
1595static SV *
1346decode_sv (dec_t *dec) 1596decode_sv (dec_t *dec)
1347{ 1597{
1348 // the beauty of JSON: you need exactly one character lookahead 1598 // the beauty of JSON: you need exactly one character lookahead
1349 // to parse everything. 1599 // to parse everything.
1350 switch (*dec->cur) 1600 switch (*dec->cur)
1351 { 1601 {
1352 case '"': ++dec->cur; return decode_str (dec); 1602 case '"': ++dec->cur; return decode_str (dec);
1353 case '[': ++dec->cur; return decode_av (dec); 1603 case '[': ++dec->cur; return decode_av (dec);
1354 case '{': ++dec->cur; return decode_hv (dec); 1604 case '{': ++dec->cur; return decode_hv (dec);
1605 case '(': return decode_tag (dec);
1355 1606
1356 case '-': 1607 case '-':
1357 case '0': case '1': case '2': case '3': case '4': 1608 case '0': case '1': case '2': case '3': case '4':
1358 case '5': case '6': case '7': case '8': case '9': 1609 case '5': case '6': case '7': case '8': case '9':
1359 return decode_num (dec); 1610 return decode_num (dec);
… …
1361 case 't': 1612 case 't':
1362 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1613 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1363 { 1614 {
1364 dec->cur += 4; 1615 dec->cur += 4;
1365#if JSON_SLOW 1616#if JSON_SLOW
1366 json_true = get_bool ("JSON::XS::true"); 1617 types_true = get_bool ("Types::Serialiser::true");
1367#endif 1618#endif
1368 return newSVsv (json_true); 1619 return newSVsv (types_true);
1369 } 1620 }
1370 else 1621 else
1371 ERR ("'true' expected"); 1622 ERR ("'true' expected");
1372 1623
1373 break; 1624 break;
… …
1375 case 'f': 1626 case 'f':
1376 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1627 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1377 { 1628 {
1378 dec->cur += 5; 1629 dec->cur += 5;
1379#if JSON_SLOW 1630#if JSON_SLOW
1380 json_false = get_bool ("JSON::XS::false"); 1631 types_false = get_bool ("Types::Serialiser::false");
1381#endif 1632#endif
1382 return newSVsv (json_false); 1633 return newSVsv (types_false);
1383 } 1634 }
1384 else 1635 else
1385 ERR ("'false' expected"); 1636 ERR ("'false' expected");
1386 1637
1387 break; 1638 break;
… …
1396 ERR ("'null' expected"); 1647 ERR ("'null' expected");
1397 1648
1398 break; 1649 break;
1399 1650
1400 default: 1651 default:
1401 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1652 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1402 break; 1653 break;
1403 } 1654 }
1404 1655
1405fail: 1656fail:
1406 return 0; 1657 return 0;
1407} 1658}
1408 1659
1409static SV * 1660static SV *
1410decode_json (SV *string, JSON *json, STRLEN *offset_return) 1661decode_json (SV *string, JSON *json, char **offset_return)
1411{ 1662{
1412 dec_t dec; 1663 dec_t dec;
1413 STRLEN offset;
1414 SV *sv; 1664 SV *sv;
1415 1665
1666 /* work around bugs in 5.10 where manipulating magic values
1667 * makes perl ignore the magic in subsequent accesses.
1668 * also make a copy of non-PV values, to get them into a clean
1669 * state (SvPV should do that, but it's buggy, see below).
1670 */
1416 SvGETMAGIC (string); 1671 /*SvGETMAGIC (string);*/
1672 if (SvMAGICAL (string) || !SvPOK (string))
1673 string = sv_2mortal (newSVsv (string));
1674
1417 SvUPGRADE (string, SVt_PV); 1675 SvUPGRADE (string, SVt_PV);
1418 1676
1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1677 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to 1678 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading. 1679 * return the xpv_cur field which certainly exists after upgrading.
1422 * according to nicholas clark, calling SvPOK fixes this. 1680 * according to nicholas clark, calling SvPOK fixes this.
1681 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1682 * and hope for the best.
1683 * Damnit, SvPV_nolen still trips over yet another assertion. This
1684 * assertion business is seriously broken, try yet another workaround
1685 * for the broken -DDEBUGGING.
1423 */ 1686 */
1424 SvPOK (string); 1687 {
1688#ifdef DEBUGGING
1689 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1690#else
1691 STRLEN offset = SvCUR (string);
1692#endif
1425 1693
1426 if (SvCUR (string) > json->max_size && json->max_size) 1694 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", 1695 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); 1696 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1697 }
1429 1698
1430 if (json->flags & F_UTF8) 1699 if (DECODE_WANTS_OCTETS (json))
1431 sv_utf8_downgrade (string, 0); 1700 sv_utf8_downgrade (string, 0);
1432 else 1701 else
1433 sv_utf8_upgrade (string); 1702 sv_utf8_upgrade (string);
1434 1703
1435 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1704 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1445 1714
1446 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1715 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1447 1716
1448 decode_ws (&dec); 1717 decode_ws (&dec);
1449 sv = decode_sv (&dec); 1718 sv = decode_sv (&dec);
1719
1720 if (offset_return)
1721 *offset_return = dec.cur;
1450 1722
1451 if (!(offset_return || !sv)) 1723 if (!(offset_return || !sv))
1452 { 1724 {
1453 // check for trailing garbage 1725 // check for trailing garbage
1454 decode_ws (&dec); 1726 decode_ws (&dec);
… …
1457 { 1729 {
1458 dec.err = "garbage after JSON object"; 1730 dec.err = "garbage after JSON object";
1459 SvREFCNT_dec (sv); 1731 SvREFCNT_dec (sv);
1460 sv = 0; 1732 sv = 0;
1461 } 1733 }
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 } 1734 }
1473 1735
1474 if (!sv) 1736 if (!sv)
1475 { 1737 {
1476 SV *uni = sv_newmortal (); 1738 SV *uni = sv_newmortal ();
… …
1482 SAVEVPTR (PL_curcop); 1744 SAVEVPTR (PL_curcop);
1483 PL_curcop = &cop; 1745 PL_curcop = &cop;
1484 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1746 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1485 LEAVE; 1747 LEAVE;
1486 1748
1487 croak ("%s, at character offset %d [\"%s\"]", 1749 croak ("%s, at character offset %d (before \"%s\")",
1488 dec.err, 1750 dec.err,
1489 (int)offset, 1751 (int)ptr_to_index (string, dec.cur),
1490 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1752 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1491 } 1753 }
1492 1754
1493 sv = sv_2mortal (sv); 1755 sv = sv_2mortal (sv);
1494 1756
… …
1503 1765
1504static void 1766static void
1505incr_parse (JSON *self) 1767incr_parse (JSON *self)
1506{ 1768{
1507 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1769 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1770
1771 // the state machine here is a bit convoluted and could be simplified a lot
1772 // but this would make it slower, so...
1508 1773
1509 for (;;) 1774 for (;;)
1510 { 1775 {
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 1776 //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) 1777 switch (self->incr_mode)
1513 { 1778 {
1514 // only used for intiial whitespace skipping 1779 // only used for initial whitespace skipping
1515 case INCR_M_WS: 1780 case INCR_M_WS:
1516 for (;;) 1781 for (;;)
1517 { 1782 {
1518 if (*p > 0x20) 1783 if (*p > 0x20)
1519 { 1784 {
1785 if (*p == '#')
1786 {
1787 self->incr_mode = INCR_M_C0;
1788 goto incr_m_c;
1789 }
1790 else
1791 {
1520 self->incr_mode = INCR_M_JSON; 1792 self->incr_mode = INCR_M_JSON;
1521 goto incr_m_json; 1793 goto incr_m_json;
1794 }
1522 } 1795 }
1523 else if (!*p) 1796 else if (!*p)
1524 goto interrupt; 1797 goto interrupt;
1525 1798
1526 ++p; 1799 ++p;
… …
1532 goto interrupt; 1805 goto interrupt;
1533 1806
1534 ++p; 1807 ++p;
1535 self->incr_mode = INCR_M_STR; 1808 self->incr_mode = INCR_M_STR;
1536 goto incr_m_str; 1809 goto incr_m_str;
1810
1811 // inside #-style comments
1812 case INCR_M_C0:
1813 case INCR_M_C1:
1814 incr_m_c:
1815 for (;;)
1816 {
1817 if (*p == '\n')
1818 {
1819 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1820 break;
1821 }
1822 else if (!*p)
1823 goto interrupt;
1824
1825 ++p;
1826 }
1827
1828 break;
1537 1829
1538 // inside a string 1830 // inside a string
1539 case INCR_M_STR: 1831 case INCR_M_STR:
1540 incr_m_str: 1832 incr_m_str:
1541 for (;;) 1833 for (;;)
… …
1592 self->incr_mode = INCR_M_STR; 1884 self->incr_mode = INCR_M_STR;
1593 goto incr_m_str; 1885 goto incr_m_str;
1594 1886
1595 case '[': 1887 case '[':
1596 case '{': 1888 case '{':
1889 case '(':
1597 if (++self->incr_nest > self->max_depth) 1890 if (++self->incr_nest > self->max_depth)
1598 croak (ERR_NESTING_EXCEEDED); 1891 croak (ERR_NESTING_EXCEEDED);
1599 break; 1892 break;
1600 1893
1601 case ']': 1894 case ']':
1602 case '}': 1895 case '}':
1603 if (--self->incr_nest <= 0) 1896 if (--self->incr_nest <= 0)
1604 goto interrupt; 1897 goto interrupt;
1898 break;
1899
1900 case ')':
1901 --self->incr_nest;
1902 break;
1903
1904 case '#':
1905 self->incr_mode = INCR_M_C1;
1906 goto incr_m_c;
1605 } 1907 }
1606 } 1908 }
1607 } 1909 }
1608 1910
1609 modechange: 1911 modechange:
1610 ; 1912 ;
1611 } 1913 }
1612 1914
1613interrupt: 1915interrupt:
1614 self->incr_pos = p - SvPVX (self->incr_text); 1916 self->incr_pos = p - SvPVX (self->incr_text);
1917 //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 1918 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1616} 1919}
1617 1920
1618///////////////////////////////////////////////////////////////////////////// 1921/////////////////////////////////////////////////////////////////////////////
1619// XS interface functions 1922// XS interface functions
… …
1629 i >= '0' && i <= '9' ? i - '0' 1932 i >= '0' && i <= '9' ? i - '0'
1630 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1933 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1631 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1934 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1632 : -1; 1935 : -1;
1633 1936
1634 json_stash = gv_stashpv ("JSON::XS" , 1); 1937 json_stash = gv_stashpv ("JSON::XS" , 1);
1635 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1938 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1636 1939
1637 json_true = get_bool ("JSON::XS::true"); 1940 types_true = get_bool ("Types::Serialiser::true");
1638 json_false = get_bool ("JSON::XS::false"); 1941 types_false = get_bool ("Types::Serialiser::false");
1942
1943 sv_json = newSVpv ("JSON", 0);
1944 SvREADONLY_on (sv_json);
1945
1946 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1639} 1947}
1640 1948
1641PROTOTYPES: DISABLE 1949PROTOTYPES: DISABLE
1642 1950
1643void CLONE (...) 1951void CLONE (...)
1644 CODE: 1952 CODE:
1645 json_stash = 0; 1953 json_stash = 0;
1646 json_boolean_stash = 0; 1954 types_boolean_stash = 0;
1647 1955
1648void new (char *klass) 1956void new (char *klass)
1649 PPCODE: 1957 PPCODE:
1650{ 1958{
1651 SV *pv = NEWSV (0, sizeof (JSON)); 1959 SV *pv = NEWSV (0, sizeof (JSON));
1652 SvPOK_only (pv); 1960 SvPOK_only (pv);
1653 json_init ((JSON *)SvPVX (pv)); 1961 json_init ((JSON *)SvPVX (pv));
1654 XPUSHs (sv_2mortal (sv_bless ( 1962 XPUSHs (sv_2mortal (sv_bless (
1655 newRV_noinc (pv), 1963 newRV_noinc (pv),
1656 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1964 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1671 shrink = F_SHRINK 1979 shrink = F_SHRINK
1672 allow_blessed = F_ALLOW_BLESSED 1980 allow_blessed = F_ALLOW_BLESSED
1673 convert_blessed = F_CONV_BLESSED 1981 convert_blessed = F_CONV_BLESSED
1674 relaxed = F_RELAXED 1982 relaxed = F_RELAXED
1675 allow_unknown = F_ALLOW_UNKNOWN 1983 allow_unknown = F_ALLOW_UNKNOWN
1984 allow_tags = F_ALLOW_TAGS
1676 PPCODE: 1985 PPCODE:
1677{ 1986{
1678 if (enable) 1987 if (enable)
1679 self->flags |= ix; 1988 self->flags |= ix;
1680 else 1989 else
… …
1696 get_shrink = F_SHRINK 2005 get_shrink = F_SHRINK
1697 get_allow_blessed = F_ALLOW_BLESSED 2006 get_allow_blessed = F_ALLOW_BLESSED
1698 get_convert_blessed = F_CONV_BLESSED 2007 get_convert_blessed = F_CONV_BLESSED
1699 get_relaxed = F_RELAXED 2008 get_relaxed = F_RELAXED
1700 get_allow_unknown = F_ALLOW_UNKNOWN 2009 get_allow_unknown = F_ALLOW_UNKNOWN
2010 get_allow_tags = F_ALLOW_TAGS
1701 PPCODE: 2011 PPCODE:
1702 XPUSHs (boolSV (self->flags & ix)); 2012 XPUSHs (boolSV (self->flags & ix));
1703 2013
1704void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2014void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1705 PPCODE: 2015 PPCODE:
… …
1733} 2043}
1734 2044
1735void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2045void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1736 PPCODE: 2046 PPCODE:
1737{ 2047{
1738 if (!self->cb_sk_object) 2048 if (!self->cb_sk_object)
1739 self->cb_sk_object = newHV (); 2049 self->cb_sk_object = newHV ();
1740 2050
1741 if (SvOK (cb)) 2051 if (SvOK (cb))
1742 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2052 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1743 else 2053 else
… …
1754 XPUSHs (ST (0)); 2064 XPUSHs (ST (0));
1755} 2065}
1756 2066
1757void encode (JSON *self, SV *scalar) 2067void encode (JSON *self, SV *scalar)
1758 PPCODE: 2068 PPCODE:
1759 XPUSHs (encode_json (scalar, self)); 2069 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2070 XPUSHs (scalar);
1760 2071
1761void decode (JSON *self, SV *jsonstr) 2072void decode (JSON *self, SV *jsonstr)
1762 PPCODE: 2073 PPCODE:
1763 XPUSHs (decode_json (jsonstr, self, 0)); 2074 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2075 XPUSHs (jsonstr);
1764 2076
1765void decode_prefix (JSON *self, SV *jsonstr) 2077void decode_prefix (JSON *self, SV *jsonstr)
1766 PPCODE: 2078 PPCODE:
1767{ 2079{
1768 STRLEN offset; 2080 SV *sv;
2081 char *offset;
2082 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1769 EXTEND (SP, 2); 2083 EXTEND (SP, 2);
1770 PUSHs (decode_json (jsonstr, self, &offset)); 2084 PUSHs (sv);
1771 PUSHs (sv_2mortal (newSVuv (offset))); 2085 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1772} 2086}
1773 2087
1774void incr_parse (JSON *self, SV *jsonstr = 0) 2088void incr_parse (JSON *self, SV *jsonstr = 0)
1775 PPCODE: 2089 PPCODE:
1776{ 2090{
1777 if (!self->incr_text) 2091 if (!self->incr_text)
1778 self->incr_text = newSVpvn ("", 0); 2092 self->incr_text = newSVpvn ("", 0);
2093
2094 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2095 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2096 if (DECODE_WANTS_OCTETS (self))
2097 {
2098 if (self->incr_pos)
2099 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2100 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2101
2102 sv_utf8_downgrade (self->incr_text, 0);
2103 }
2104 else
2105 {
2106 sv_utf8_upgrade (self->incr_text);
2107
2108 if (self->incr_pos)
2109 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2110 - (U8 *)SvPVX (self->incr_text);
2111 }
1779 2112
1780 // append data, if any 2113 // append data, if any
1781 if (jsonstr) 2114 if (jsonstr)
1782 { 2115 {
2116 /* make sure both strings have same encoding */
1783 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 2117 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2118 if (SvUTF8 (jsonstr))
2119 sv_utf8_downgrade (jsonstr, 0);
1784 { 2120 else
1785 /* utf-8-ness differs, need to upgrade */
1786 sv_utf8_upgrade (self->incr_text); 2121 sv_utf8_upgrade (jsonstr);
1787 2122
1788 if (self->incr_pos) 2123 /* 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 { 2124 {
1794 STRLEN len; 2125 STRLEN len;
1795 const char *str = SvPV (jsonstr, len); 2126 const char *str = SvPV (jsonstr, len);
1796 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 2127 STRLEN cur = SvCUR (self->incr_text);
2128
2129 if (SvLEN (self->incr_text) <= cur + len)
2130 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2131
1797 Move (str, SvEND (self->incr_text), len, char); 2132 Move (str, SvEND (self->incr_text), len, char);
1798 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2133 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 2134 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1800 } 2135 }
1801 } 2136 }
1802 2137
1803 if (GIMME_V != G_VOID) 2138 if (GIMME_V != G_VOID)
1804 do 2139 do
1805 { 2140 {
2141 SV *sv;
1806 STRLEN offset; 2142 char *offset;
1807 2143
1808 if (!INCR_DONE (self)) 2144 if (!INCR_DONE (self))
1809 { 2145 {
1810 incr_parse (self); 2146 incr_parse (self);
1811 2147
1812 if (self->incr_pos > self->max_size && self->max_size) 2148 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", 2149 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); 2150 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1815 2151
1816 if (!INCR_DONE (self)) 2152 if (!INCR_DONE (self))
2153 {
2154 // as an optimisation, do not accumulate white space in the incr buffer
2155 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2156 {
2157 self->incr_pos = 0;
2158 SvCUR_set (self->incr_text, 0);
2159 }
2160
1817 break; 2161 break;
2162 }
1818 } 2163 }
1819 2164
1820 XPUSHs (decode_json (self->incr_text, self, &offset)); 2165 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2166 XPUSHs (sv);
1821 2167
1822 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1823 self->incr_pos -= offset; 2168 self->incr_pos -= offset - SvPVX (self->incr_text);
1824 self->incr_nest = 0; 2169 self->incr_nest = 0;
1825 self->incr_mode = 0; 2170 self->incr_mode = 0;
2171
2172 sv_chop (self->incr_text, offset);
1826 } 2173 }
1827 while (GIMME_V == G_ARRAY); 2174 while (GIMME_V == G_ARRAY);
1828} 2175}
1829 2176
1830SV *incr_text (JSON *self) 2177SV *incr_text (JSON *self)
… …
1868 SvREFCNT_dec (self->incr_text); 2215 SvREFCNT_dec (self->incr_text);
1869 2216
1870PROTOTYPES: ENABLE 2217PROTOTYPES: ENABLE
1871 2218
1872void encode_json (SV *scalar) 2219void encode_json (SV *scalar)
1873 ALIAS:
1874 to_json_ = 0
1875 encode_json = F_UTF8
1876 PPCODE: 2220 PPCODE:
1877{ 2221{
1878 JSON json; 2222 JSON json;
1879 json_init (&json); 2223 json_init (&json);
1880 json.flags |= ix; 2224 json.flags |= F_UTF8;
1881 XPUSHs (encode_json (scalar, &json)); 2225 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2226 XPUSHs (scalar);
1882} 2227}
1883 2228
1884void decode_json (SV *jsonstr) 2229void decode_json (SV *jsonstr)
1885 ALIAS:
1886 from_json_ = 0
1887 decode_json = F_UTF8
1888 PPCODE: 2230 PPCODE:
1889{ 2231{
1890 JSON json; 2232 JSON json;
1891 json_init (&json); 2233 json_init (&json);
1892 json.flags |= ix; 2234 json.flags |= F_UTF8;
1893 XPUSHs (decode_json (jsonstr, &json, 0)); 2235 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2236 XPUSHs (jsonstr);
1894} 2237}
1895 2238
1896

Diff Legend

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