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.89 by root, Sat Jul 19 04:21:32 2008 UTC vs.
Revision 1.119 by root, Mon Oct 28 23:19:54 2013 UTC

… …
12#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 14#endif
15 15
16// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
17// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif 20#endif
21 21
22// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 24
24#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
32#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
36#define F_ALLOW_UNKNOWN 0x00002000UL 37#define F_ALLOW_UNKNOWN 0x00002000UL
38#define F_ALLOW_TAGS 0x00004000UL
37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 39#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
38 40
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40 42
41#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
42#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
43 45
44#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
47
48#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
45 49
46#define SB do { 50#define SB do {
47#define SE } while (0) 51#define SE } while (0)
48 52
49#if __GNUC__ >= 3 53#if __GNUC__ >= 3
… …
69#else 73#else
70# define JSON_SLOW 0 74# define JSON_SLOW 0
71# define JSON_STASH json_stash 75# define JSON_STASH json_stash
72#endif 76#endif
73 77
78// the amount of HEs to allocate on the stack, when sorting keys
79#define STACK_HES 64
80
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 81static HV *json_stash, *types_boolean_stash; // JSON::XS::
75static SV *json_true, *json_false; 82static SV *types_true, *types_false, *sv_json;
76 83
77enum { 84enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 85 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 86 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 87 INCR_M_BS, // inside backslash
88 INCR_M_C0, // inside comment in initial whitespace sequence
89 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 90 INCR_M_JSON // outside anything, count nesting
82}; 91};
83 92
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 93#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 94
… …
175 *s++ = 0x80 | ( ch & 0x3f); 184 *s++ = 0x80 | ( ch & 0x3f);
176 185
177 return s; 186 return s;
178} 187}
179 188
189// convert offset pointer to character index, sv must be string
190static STRLEN
191ptr_to_index (SV *sv, char *offset)
192{
193 return SvUTF8 (sv)
194 ? utf8_distance (offset, SvPVX (sv))
195 : offset - SvPVX (sv);
196}
197
198/////////////////////////////////////////////////////////////////////////////
199// fp hell
200
201// scan a group of digits, and a trailing exponent
202static void
203json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
204{
205 UV uaccum = 0;
206 int eaccum = 0;
207
208 // if we recurse too deep, skip all remaining digits
209 // to avoid a stack overflow attack
210 if (expect_false (--maxdepth <= 0))
211 while (((U8)*s - '0') < 10)
212 ++s;
213
214 for (;;)
215 {
216 U8 dig = (U8)*s - '0';
217
218 if (expect_false (dig >= 10))
219 {
220 if (dig == (U8)((U8)'.' - (U8)'0'))
221 {
222 ++s;
223 json_atof_scan1 (s, accum, expo, 1, maxdepth);
224 }
225 else if ((dig | ' ') == 'e' - '0')
226 {
227 int exp2 = 0;
228 int neg = 0;
229
230 ++s;
231
232 if (*s == '-')
233 {
234 ++s;
235 neg = 1;
236 }
237 else if (*s == '+')
238 ++s;
239
240 while ((dig = (U8)*s - '0') < 10)
241 exp2 = exp2 * 10 + *s++ - '0';
242
243 *expo += neg ? -exp2 : exp2;
244 }
245
246 break;
247 }
248
249 ++s;
250
251 uaccum = uaccum * 10 + dig;
252 ++eaccum;
253
254 // if we have too many digits, then recurse for more
255 // we actually do this for rather few digits
256 if (uaccum >= (UV_MAX - 9) / 10)
257 {
258 if (postdp) *expo -= eaccum;
259 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
260 if (postdp) *expo += eaccum;
261
262 break;
263 }
264 }
265
266 // this relies greatly on the quality of the pow ()
267 // implementation of the platform, but a good
268 // implementation is hard to beat.
269 // (IEEE 754 conformant ones are required to be exact)
270 if (postdp) *expo -= eaccum;
271 *accum += uaccum * Perl_pow (10., *expo);
272 *expo += eaccum;
273}
274
275static NV
276json_atof (const char *s)
277{
278 NV accum = 0.;
279 int expo = 0;
280 int neg = 0;
281
282 if (*s == '-')
283 {
284 ++s;
285 neg = 1;
286 }
287
288 // a recursion depth of ten gives us >>500 bits
289 json_atof_scan1 (s, &accum, &expo, 0, 10);
290
291 return neg ? -accum : accum;
292}
180///////////////////////////////////////////////////////////////////////////// 293/////////////////////////////////////////////////////////////////////////////
181// encoder 294// encoder
182 295
183// structure used for encoding JSON 296// structure used for encoding JSON
184typedef struct 297typedef struct
… …
194INLINE void 307INLINE void
195need (enc_t *enc, STRLEN len) 308need (enc_t *enc, STRLEN len)
196{ 309{
197 if (expect_false (enc->cur + len >= enc->end)) 310 if (expect_false (enc->cur + len >= enc->end))
198 { 311 {
199 STRLEN cur = enc->cur - SvPVX (enc->sv); 312 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
200 SvGROW (enc->sv, cur + len + 1); 313 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
201 enc->cur = SvPVX (enc->sv) + cur; 314 enc->cur = SvPVX (enc->sv) + cur;
202 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 315 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
203 } 316 }
204} 317}
205 318
… …
280 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 393 (int)((uch - 0x10000) % 0x400 + 0xDC00));
281 enc->cur += 12; 394 enc->cur += 12;
282 } 395 }
283 else 396 else
284 { 397 {
285 static char hexdigit [16] = "0123456789abcdef";
286 need (enc, len += 5); 398 need (enc, len += 5);
287 *enc->cur++ = '\\'; 399 *enc->cur++ = '\\';
288 *enc->cur++ = 'u'; 400 *enc->cur++ = 'u';
289 *enc->cur++ = hexdigit [ uch >> 12 ]; 401 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
290 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 402 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
291 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 403 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
292 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 404 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
293 } 405 }
294 406
295 str += clen; 407 str += clen;
296 } 408 }
297 else if (enc->json.flags & F_LATIN1) 409 else if (enc->json.flags & F_LATIN1)
… …
372 484
373 if (enc->indent >= enc->json.max_depth) 485 if (enc->indent >= enc->json.max_depth)
374 croak (ERR_NESTING_EXCEEDED); 486 croak (ERR_NESTING_EXCEEDED);
375 487
376 encode_ch (enc, '['); 488 encode_ch (enc, '[');
377 489
378 if (len >= 0) 490 if (len >= 0)
379 { 491 {
380 encode_nl (enc); ++enc->indent; 492 encode_nl (enc); ++enc->indent;
381 493
382 for (i = 0; i <= len; ++i) 494 for (i = 0; i <= len; ++i)
… …
394 encode_comma (enc); 506 encode_comma (enc);
395 } 507 }
396 508
397 encode_nl (enc); --enc->indent; encode_indent (enc); 509 encode_nl (enc); --enc->indent; encode_indent (enc);
398 } 510 }
399 511
400 encode_ch (enc, ']'); 512 encode_ch (enc, ']');
401} 513}
402 514
403static void 515static void
404encode_hk (enc_t *enc, HE *he) 516encode_hk (enc_t *enc, HE *he)
… …
408 if (HeKLEN (he) == HEf_SVKEY) 520 if (HeKLEN (he) == HEf_SVKEY)
409 { 521 {
410 SV *sv = HeSVKEY (he); 522 SV *sv = HeSVKEY (he);
411 STRLEN len; 523 STRLEN len;
412 char *str; 524 char *str;
413 525
414 SvGETMAGIC (sv); 526 SvGETMAGIC (sv);
415 str = SvPV (sv, len); 527 str = SvPV (sv, len);
416 528
417 encode_str (enc, str, len, SvUTF8 (sv)); 529 encode_str (enc, str, len, SvUTF8 (sv));
418 } 530 }
… …
461 573
462 encode_ch (enc, '{'); 574 encode_ch (enc, '{');
463 575
464 // for canonical output we have to sort by keys first 576 // for canonical output we have to sort by keys first
465 // actually, this is mostly due to the stupid so-called 577 // actually, this is mostly due to the stupid so-called
466 // security workaround added somewhere in 5.8.x. 578 // security workaround added somewhere in 5.8.x
467 // that randomises hash orderings 579 // that randomises hash orderings
468 if (enc->json.flags & F_CANONICAL) 580 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
469 { 581 {
470 int count = hv_iterinit (hv); 582 int count = hv_iterinit (hv);
471 583
472 if (SvMAGICAL (hv)) 584 if (SvMAGICAL (hv))
473 { 585 {
… …
484 } 596 }
485 597
486 if (count) 598 if (count)
487 { 599 {
488 int i, fast = 1; 600 int i, fast = 1;
489#if defined(__BORLANDC__) || defined(_MSC_VER) 601 HE *hes_stack [STACK_HES];
490 HE **hes = _alloca (count * sizeof (HE)); 602 HE **hes = hes_stack;
491#else 603
492 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 604 // allocate larger arrays on the heap
493#endif 605 if (count > STACK_HES)
606 {
607 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
608 hes = (HE **)SvPVX (sv);
609 }
494 610
495 i = 0; 611 i = 0;
496 while ((he = hv_iternext (hv))) 612 while ((he = hv_iternext (hv)))
497 { 613 {
498 hes [i++] = he; 614 hes [i++] = he;
… …
573 SvGETMAGIC (sv); 689 SvGETMAGIC (sv);
574 svt = SvTYPE (sv); 690 svt = SvTYPE (sv);
575 691
576 if (expect_false (SvOBJECT (sv))) 692 if (expect_false (SvOBJECT (sv)))
577 { 693 {
578 HV *stash = !JSON_SLOW || json_boolean_stash 694 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
579 ? json_boolean_stash 695 ? types_boolean_stash
580 : gv_stashpv ("JSON::XS::Boolean", 1); 696 : gv_stashpv ("Types::Serialiser::Boolean", 1);
697 HV *stash = SvSTASH (sv);
581 698
582 if (SvSTASH (sv) == stash) 699 if (stash == boolean_stash)
583 { 700 {
584 if (SvIV (sv)) 701 if (SvIV (sv))
585 encode_str (enc, "true", 4, 0); 702 encode_str (enc, "true", 4, 0);
586 else 703 else
587 encode_str (enc, "false", 5, 0); 704 encode_str (enc, "false", 5, 0);
588 } 705 }
589 else 706 else if (enc->json.flags & F_CONV_BLESSED)
590 { 707 {
591#if 0 708 GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0);
592 if (0 && sv_derived_from (rv, "JSON::Literal")) 709
593 { 710 if (to_json)
594 // not yet
595 } 711 {
596#endif
597 if (enc->json.flags & F_CONV_BLESSED)
598 { 712 dSP;
713
714 ENTER; SAVETMPS; PUSHMARK (SP);
599 // we re-bless the reference to get overload and other niceties right 715 // 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))); 716 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
608 717
609 // calling with G_SCALAR ensures that we always get a 1 return value 718 // calling with G_SCALAR ensures that we always get a 1 return value
610 PUTBACK; 719 PUTBACK;
611 call_sv ((SV *)GvCV (to_json), G_SCALAR); 720 call_sv ((SV *)GvCV (to_json), G_SCALAR);
612 SPAGAIN; 721 SPAGAIN;
613 722
614 // catch this surprisingly common error 723 // catch this surprisingly common error
615 if (SvROK (TOPs) && SvRV (TOPs) == sv) 724 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))); 725 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
617 726
618 sv = POPs; 727 sv = POPs;
619 PUTBACK; 728 PUTBACK;
620 729
621 encode_sv (enc, sv); 730 encode_sv (enc, sv);
622 731
623 FREETMPS; LEAVE; 732 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 } 733 }
631 else if (enc->json.flags & F_ALLOW_BLESSED) 734 else if (enc->json.flags & F_ALLOW_BLESSED)
632 encode_str (enc, "null", 4, 0); 735 encode_str (enc, "null", 4, 0);
633 else 736 else
634 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 737 croak ("encountered object '%s' when conv_object is enabled, but TO_JSON is missing and allow_blessed disabled",
635 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 738 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
636 } 739 }
740 else if (enc->json.flags & F_ALLOW_TAGS)
741 {
742 GV *method = gv_fetchmethod_autoload (stash, "FREEZE", 0);
743
744 if (method)
745 {
746 int count;
747 dSP;
748
749 ENTER; SAVETMPS; PUSHMARK (SP);
750 EXTEND (SP, 2);
751 // we re-bless the reference to get overload and other niceties right
752 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
753 PUSHs (sv_json);
754
755 PUTBACK;
756 count = call_sv ((SV *)GvCV (method), G_ARRAY);
757 SPAGAIN;
758
759 // catch this surprisingly common error
760 if (SvROK (TOPs) && SvRV (TOPs) == sv)
761 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
762
763 encode_ch (enc, '(');
764 encode_ch (enc, '"');
765 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
766 encode_ch (enc, '"');
767 encode_ch (enc, ')');
768 encode_ch (enc, '[');
769
770 while (count)
771 {
772 encode_sv (enc, SP[1 - count--]);
773
774 if (count)
775 encode_ch (enc, ',');
776 }
777
778 encode_ch (enc, ']');
779
780 PUTBACK;
781
782 FREETMPS; LEAVE;
783 }
784 else if (enc->json.flags & F_ALLOW_BLESSED)
785 encode_str (enc, "null", 4, 0);
786 else
787 croak ("encountered object '%s' when allow_tags is enabled, but FREEZE is missing and allow_blessed disabled",
788 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
789 }
790 else if (enc->json.flags & F_ALLOW_BLESSED)
791 encode_str (enc, "null", 4, 0);
792 else
793 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled",
794 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
637 } 795 }
638 else if (svt == SVt_PVHV) 796 else if (svt == SVt_PVHV)
639 encode_hv (enc, (HV *)sv); 797 encode_hv (enc, (HV *)sv);
640 else if (svt == SVt_PVAV) 798 else if (svt == SVt_PVAV)
641 encode_av (enc, (AV *)sv); 799 encode_av (enc, (AV *)sv);
… …
717 } 875 }
718 else 876 else
719 { 877 {
720 // large integer, use the (rather slow) snprintf way. 878 // large integer, use the (rather slow) snprintf way.
721 need (enc, IVUV_MAXCHARS); 879 need (enc, IVUV_MAXCHARS);
722 enc->cur += 880 enc->cur +=
723 SvIsUV(sv) 881 SvIsUV(sv)
724 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 882 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
725 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 883 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
726 } 884 }
727 } 885 }
728 else if (SvROK (sv)) 886 else if (SvROK (sv))
729 encode_rv (enc, SvRV (sv)); 887 encode_rv (enc, SvRV (sv));
730 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 888 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
731 encode_str (enc, "null", 4, 0); 889 encode_str (enc, "null", 4, 0);
732 else 890 else
733 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 891 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
734 SvPV_nolen (sv), SvFLAGS (sv)); 892 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
735} 893}
736 894
737static SV * 895static SV *
738encode_json (SV *scalar, JSON *json) 896encode_json (SV *scalar, JSON *json)
739{ 897{
… …
751 : enc.json.flags & F_LATIN1 ? 0x000100UL 909 : enc.json.flags & F_LATIN1 ? 0x000100UL
752 : 0x110000UL; 910 : 0x110000UL;
753 911
754 SvPOK_only (enc.sv); 912 SvPOK_only (enc.sv);
755 encode_sv (&enc, scalar); 913 encode_sv (&enc, scalar);
914 encode_nl (&enc);
756 915
757 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 916 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
758 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 917 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
759 918
760 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 919 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
940 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1099 else if (expect_true (ch >= 0x20 && ch < 0x80))
941 *cur++ = ch; 1100 *cur++ = ch;
942 else if (ch >= 0x80) 1101 else if (ch >= 0x80)
943 { 1102 {
944 STRLEN clen; 1103 STRLEN clen;
945 UV uch;
946 1104
947 --dec_cur; 1105 --dec_cur;
948 1106
949 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1107 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
950 if (clen == (STRLEN)-1) 1108 if (clen == (STRLEN)-1)
951 ERR ("malformed UTF-8 character in JSON string"); 1109 ERR ("malformed UTF-8 character in JSON string");
952 1110
953 do 1111 do
954 *cur++ = *dec_cur++; 1112 *cur++ = *dec_cur++;
… …
971 { 1129 {
972 STRLEN len = cur - buf; 1130 STRLEN len = cur - buf;
973 1131
974 if (sv) 1132 if (sv)
975 { 1133 {
976 SvGROW (sv, SvCUR (sv) + len + 1); 1134 STRLEN cur = SvCUR (sv);
1135
1136 if (SvLEN (sv) <= cur + len)
1137 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1138
977 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1139 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
978 SvCUR_set (sv, SvCUR (sv) + len); 1140 SvCUR_set (sv, SvCUR (sv) + len);
979 } 1141 }
980 else 1142 else
981 sv = newSVpvn (buf, len); 1143 sv = newSVpvn (buf, len);
… …
1072 1234
1073 // special case the rather common 1..5-digit-int case 1235 // special case the rather common 1..5-digit-int case
1074 if (*start == '-') 1236 if (*start == '-')
1075 switch (len) 1237 switch (len)
1076 { 1238 {
1077 case 2: return newSViv (-( start [1] - '0' * 1)); 1239 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1078 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1240 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)); 1241 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)); 1242 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)); 1243 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1082 } 1244 }
1083 else 1245 else
1084 switch (len) 1246 switch (len)
1085 { 1247 {
1086 case 1: return newSViv ( start [0] - '0' * 1); 1248 case 1: return newSViv ( start [0] - '0' * 1);
1087 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1249 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); 1250 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); 1251 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); 1252 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1091 } 1253 }
1092 1254
1093 { 1255 {
1094 UV uv; 1256 UV uv;
1095 int numtype = grok_number (start, len, &uv); 1257 int numtype = grok_number (start, len, &uv);
… …
1104 } 1266 }
1105 1267
1106 len -= *start == '-' ? 1 : 0; 1268 len -= *start == '-' ? 1 : 0;
1107 1269
1108 // does not fit into IV or UV, try NV 1270 // does not fit into IV or UV, try NV
1109 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1271 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 1272 // fits into NV without loss of precision
1115 return newSVnv (Atof (start)); 1273 return newSVnv (json_atof (start));
1116 1274
1117 // everything else fails, convert it to a string 1275 // everything else fails, convert it to a string
1118 return newSVpvn (start, dec->cur - start); 1276 return newSVpvn (start, dec->cur - start);
1119 } 1277 }
1120 1278
1121 // loss of precision here 1279 // loss of precision here
1122 return newSVnv (Atof (start)); 1280 return newSVnv (json_atof (start));
1123 1281
1124fail: 1282fail:
1125 return 0; 1283 return 0;
1126} 1284}
1127 1285
… …
1151 if (*dec->cur == ']') 1309 if (*dec->cur == ']')
1152 { 1310 {
1153 ++dec->cur; 1311 ++dec->cur;
1154 break; 1312 break;
1155 } 1313 }
1156 1314
1157 if (*dec->cur != ',') 1315 if (*dec->cur != ',')
1158 ERR (", or ] expected while parsing array"); 1316 ERR (", or ] expected while parsing array");
1159 1317
1160 ++dec->cur; 1318 ++dec->cur;
1161 1319
… …
1296 dSP; 1454 dSP;
1297 int count; 1455 int count;
1298 1456
1299 ENTER; SAVETMPS; PUSHMARK (SP); 1457 ENTER; SAVETMPS; PUSHMARK (SP);
1300 XPUSHs (HeVAL (he)); 1458 XPUSHs (HeVAL (he));
1459 sv_2mortal (sv);
1301 1460
1302 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1461 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1303 1462
1304 if (count == 1) 1463 if (count == 1)
1305 { 1464 {
1306 sv = newSVsv (POPs); 1465 sv = newSVsv (POPs);
1307 FREETMPS; LEAVE; 1466 FREETMPS; LEAVE;
1308 return sv; 1467 return sv;
1309 } 1468 }
1310 1469
1470 SvREFCNT_inc (sv);
1311 FREETMPS; LEAVE; 1471 FREETMPS; LEAVE;
1312 } 1472 }
1313 } 1473 }
1314 1474
1315 if (dec->json.cb_object) 1475 if (dec->json.cb_object)
… …
1341 DEC_DEC_DEPTH; 1501 DEC_DEC_DEPTH;
1342 return 0; 1502 return 0;
1343} 1503}
1344 1504
1345static SV * 1505static SV *
1506decode_tag (dec_t *dec)
1507{
1508 SV *tag = 0;
1509 SV *val = 0;
1510
1511 if (!(dec->json.flags & F_ALLOW_TAGS))
1512 ERR ("malformed JSON string, neither array, object, number, string or atom");
1513
1514 ++dec->cur;
1515
1516 tag = decode_sv (dec);
1517 if (!tag)
1518 goto fail;
1519
1520 if (!SvPOK (tag))
1521 ERR ("malformed JSON string, (tag) must be a string");
1522
1523 if (*dec->cur != ')')
1524 ERR (") expected after tag");
1525
1526 ++dec->cur;
1527
1528 val = decode_sv (dec);
1529 if (!val)
1530 goto fail;
1531
1532 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1533 ERR ("malformed JSON string, tag value must be an array");
1534
1535 {
1536 AV *av = (AV *)SvRV (val);
1537 int i, len = av_len (av) + 1;
1538 HV *stash = gv_stashsv (tag, 0);
1539 SV *sv;
1540
1541 if (!stash)
1542 ERR ("cannot decode perl-object (package does not exist)");
1543
1544 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1545
1546 if (!method)
1547 ERR ("cannot decode perl-object (package does not have a THAW method)");
1548
1549 dSP;
1550
1551 ENTER; SAVETMPS; PUSHMARK (SP);
1552 EXTEND (SP, len + 2);
1553 // we re-bless the reference to get overload and other niceties right
1554 PUSHs (tag);
1555 PUSHs (sv_json);
1556
1557 for (i = 0; i < len; ++i)
1558 PUSHs (*av_fetch (av, i, 1));
1559
1560 PUTBACK;
1561 call_sv ((SV *)GvCV (method), G_SCALAR);
1562 SPAGAIN;
1563
1564 SvREFCNT_dec (tag);
1565 SvREFCNT_dec (val);
1566 sv = SvREFCNT_inc (POPs);
1567
1568 PUTBACK;
1569
1570 FREETMPS; LEAVE;
1571
1572 return sv;
1573 }
1574
1575fail:
1576 SvREFCNT_dec (tag);
1577 SvREFCNT_dec (val);
1578 return 0;
1579}
1580
1581static SV *
1346decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1347{ 1583{
1348 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1349 // to parse everything. 1585 // to parse everything.
1350 switch (*dec->cur) 1586 switch (*dec->cur)
1351 { 1587 {
1352 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1353 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1354 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1355 1592
1356 case '-': 1593 case '-':
1357 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1358 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1359 return decode_num (dec); 1596 return decode_num (dec);
… …
1361 case 't': 1598 case 't':
1362 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1363 { 1600 {
1364 dec->cur += 4; 1601 dec->cur += 4;
1365#if JSON_SLOW 1602#if JSON_SLOW
1366 json_true = get_bool ("JSON::XS::true"); 1603 types_true = get_bool ("Types::Serialiser::true");
1367#endif 1604#endif
1368 return newSVsv (json_true); 1605 return newSVsv (types_true);
1369 } 1606 }
1370 else 1607 else
1371 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1372 1609
1373 break; 1610 break;
… …
1375 case 'f': 1612 case 'f':
1376 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1377 { 1614 {
1378 dec->cur += 5; 1615 dec->cur += 5;
1379#if JSON_SLOW 1616#if JSON_SLOW
1380 json_false = get_bool ("JSON::XS::false"); 1617 types_false = get_bool ("Types::Serialiser::false");
1381#endif 1618#endif
1382 return newSVsv (json_false); 1619 return newSVsv (types_false);
1383 } 1620 }
1384 else 1621 else
1385 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1386 1623
1387 break; 1624 break;
… …
1396 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1397 1634
1398 break; 1635 break;
1399 1636
1400 default: 1637 default:
1401 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1402 break; 1639 break;
1403 } 1640 }
1404 1641
1405fail: 1642fail:
1406 return 0; 1643 return 0;
1407} 1644}
1408 1645
1409static SV * 1646static SV *
1410decode_json (SV *string, JSON *json, STRLEN *offset_return) 1647decode_json (SV *string, JSON *json, char **offset_return)
1411{ 1648{
1412 dec_t dec; 1649 dec_t dec;
1413 STRLEN offset;
1414 SV *sv; 1650 SV *sv;
1415 1651
1652 /* work around bugs in 5.10 where manipulating magic values
1653 * makes perl ignore the magic in subsequent accesses.
1654 * also make a copy of non-PV values, to get them into a clean
1655 * state (SvPV should do that, but it's buggy, see below).
1656 */
1416 SvGETMAGIC (string); 1657 /*SvGETMAGIC (string);*/
1658 if (SvMAGICAL (string) || !SvPOK (string))
1659 string = sv_2mortal (newSVsv (string));
1660
1417 SvUPGRADE (string, SVt_PV); 1661 SvUPGRADE (string, SVt_PV);
1418 1662
1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1663 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to 1664 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading. 1665 * return the xpv_cur field which certainly exists after upgrading.
1422 * according to nicholas clark, calling SvPOK fixes this. 1666 * according to nicholas clark, calling SvPOK fixes this.
1423 * But it doesn't fix it, so try another workaround, call SvPV_nolen 1667 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1424 * and hope for the best. 1668 * and hope for the best.
1669 * Damnit, SvPV_nolen still trips over yet another assertion. This
1670 * assertion business is seriously broken, try yet another workaround
1671 * for the broken -DDEBUGGING.
1425 */ 1672 */
1673 {
1426#ifdef DEBUGGING 1674#ifdef DEBUGGING
1427 SvPV_nolen (string); 1675 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1676#else
1677 STRLEN offset = SvCUR (string);
1428#endif 1678#endif
1429 1679
1430 if (SvCUR (string) > json->max_size && json->max_size) 1680 if (offset > json->max_size && json->max_size)
1431 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1681 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1432 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1682 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1683 }
1433 1684
1434 if (json->flags & F_UTF8) 1685 if (DECODE_WANTS_OCTETS (json))
1435 sv_utf8_downgrade (string, 0); 1686 sv_utf8_downgrade (string, 0);
1436 else 1687 else
1437 sv_utf8_upgrade (string); 1688 sv_utf8_upgrade (string);
1438 1689
1439 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1690 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1449 1700
1450 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1701 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1451 1702
1452 decode_ws (&dec); 1703 decode_ws (&dec);
1453 sv = decode_sv (&dec); 1704 sv = decode_sv (&dec);
1705
1706 if (offset_return)
1707 *offset_return = dec.cur;
1454 1708
1455 if (!(offset_return || !sv)) 1709 if (!(offset_return || !sv))
1456 { 1710 {
1457 // check for trailing garbage 1711 // check for trailing garbage
1458 decode_ws (&dec); 1712 decode_ws (&dec);
… …
1461 { 1715 {
1462 dec.err = "garbage after JSON object"; 1716 dec.err = "garbage after JSON object";
1463 SvREFCNT_dec (sv); 1717 SvREFCNT_dec (sv);
1464 sv = 0; 1718 sv = 0;
1465 } 1719 }
1466 }
1467
1468 if (offset_return || !sv)
1469 {
1470 offset = dec.json.flags & F_UTF8
1471 ? dec.cur - SvPVX (string)
1472 : utf8_distance (dec.cur, SvPVX (string));
1473
1474 if (offset_return)
1475 *offset_return = offset;
1476 } 1720 }
1477 1721
1478 if (!sv) 1722 if (!sv)
1479 { 1723 {
1480 SV *uni = sv_newmortal (); 1724 SV *uni = sv_newmortal ();
… …
1486 SAVEVPTR (PL_curcop); 1730 SAVEVPTR (PL_curcop);
1487 PL_curcop = &cop; 1731 PL_curcop = &cop;
1488 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1732 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1489 LEAVE; 1733 LEAVE;
1490 1734
1491 croak ("%s, at character offset %d [\"%s\"]", 1735 croak ("%s, at character offset %d (before \"%s\")",
1492 dec.err, 1736 dec.err,
1493 (int)offset, 1737 (int)ptr_to_index (string, dec.cur),
1494 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1495 } 1739 }
1496 1740
1497 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1498 1742
… …
1507 1751
1508static void 1752static void
1509incr_parse (JSON *self) 1753incr_parse (JSON *self)
1510{ 1754{
1511 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1755 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1756
1757 // the state machine here is a bit convoluted and could be simplified a lot
1758 // but this would make it slower, so...
1512 1759
1513 for (;;) 1760 for (;;)
1514 { 1761 {
1515 //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 1762 //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
1516 switch (self->incr_mode) 1763 switch (self->incr_mode)
1517 { 1764 {
1518 // only used for intiial whitespace skipping 1765 // only used for initial whitespace skipping
1519 case INCR_M_WS: 1766 case INCR_M_WS:
1520 for (;;) 1767 for (;;)
1521 { 1768 {
1522 if (*p > 0x20) 1769 if (*p > 0x20)
1523 { 1770 {
1771 if (*p == '#')
1772 {
1773 self->incr_mode = INCR_M_C0;
1774 goto incr_m_c;
1775 }
1776 else
1777 {
1524 self->incr_mode = INCR_M_JSON; 1778 self->incr_mode = INCR_M_JSON;
1525 goto incr_m_json; 1779 goto incr_m_json;
1780 }
1526 } 1781 }
1527 else if (!*p) 1782 else if (!*p)
1528 goto interrupt; 1783 goto interrupt;
1529 1784
1530 ++p; 1785 ++p;
… …
1536 goto interrupt; 1791 goto interrupt;
1537 1792
1538 ++p; 1793 ++p;
1539 self->incr_mode = INCR_M_STR; 1794 self->incr_mode = INCR_M_STR;
1540 goto incr_m_str; 1795 goto incr_m_str;
1796
1797 // inside #-style comments
1798 case INCR_M_C0:
1799 case INCR_M_C1:
1800 incr_m_c:
1801 for (;;)
1802 {
1803 if (*p == '\n')
1804 {
1805 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1806 break;
1807 }
1808 else if (!*p)
1809 goto interrupt;
1810
1811 ++p;
1812 }
1813
1814 break;
1541 1815
1542 // inside a string 1816 // inside a string
1543 case INCR_M_STR: 1817 case INCR_M_STR:
1544 incr_m_str: 1818 incr_m_str:
1545 for (;;) 1819 for (;;)
… …
1596 self->incr_mode = INCR_M_STR; 1870 self->incr_mode = INCR_M_STR;
1597 goto incr_m_str; 1871 goto incr_m_str;
1598 1872
1599 case '[': 1873 case '[':
1600 case '{': 1874 case '{':
1875 case '(':
1601 if (++self->incr_nest > self->max_depth) 1876 if (++self->incr_nest > self->max_depth)
1602 croak (ERR_NESTING_EXCEEDED); 1877 croak (ERR_NESTING_EXCEEDED);
1603 break; 1878 break;
1604 1879
1605 case ']': 1880 case ']':
1606 case '}': 1881 case '}':
1607 if (--self->incr_nest <= 0) 1882 if (--self->incr_nest <= 0)
1608 goto interrupt; 1883 goto interrupt;
1884 break;
1885
1886 case ')':
1887 --self->incr_nest;
1888 break;
1889
1890 case '#':
1891 self->incr_mode = INCR_M_C1;
1892 goto incr_m_c;
1609 } 1893 }
1610 } 1894 }
1611 } 1895 }
1612 1896
1613 modechange: 1897 modechange:
1614 ; 1898 ;
1615 } 1899 }
1616 1900
1617interrupt: 1901interrupt:
1618 self->incr_pos = p - SvPVX (self->incr_text); 1902 self->incr_pos = p - SvPVX (self->incr_text);
1903 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1619 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1904 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1620} 1905}
1621 1906
1622///////////////////////////////////////////////////////////////////////////// 1907/////////////////////////////////////////////////////////////////////////////
1623// XS interface functions 1908// XS interface functions
… …
1633 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1634 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1635 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1636 : -1; 1921 : -1;
1637 1922
1638 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1639 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1640 1925
1641 json_true = get_bool ("JSON::XS::true"); 1926 types_true = get_bool ("Types::Serialiser::true");
1642 json_false = get_bool ("JSON::XS::false"); 1927 types_false = get_bool ("Types::Serialiser::false");
1928
1929 sv_json = newSVpv ("JSON", 0);
1930 SvREADONLY_on (sv_json);
1931
1932 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1643} 1933}
1644 1934
1645PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1646 1936
1647void CLONE (...) 1937void CLONE (...)
1648 CODE: 1938 CODE:
1649 json_stash = 0; 1939 json_stash = 0;
1650 json_boolean_stash = 0; 1940 types_boolean_stash = 0;
1651 1941
1652void new (char *klass) 1942void new (char *klass)
1653 PPCODE: 1943 PPCODE:
1654{ 1944{
1655 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1656 SvPOK_only (pv); 1946 SvPOK_only (pv);
1657 json_init ((JSON *)SvPVX (pv)); 1947 json_init ((JSON *)SvPVX (pv));
1658 XPUSHs (sv_2mortal (sv_bless ( 1948 XPUSHs (sv_2mortal (sv_bless (
1659 newRV_noinc (pv), 1949 newRV_noinc (pv),
1660 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1675 shrink = F_SHRINK 1965 shrink = F_SHRINK
1676 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1677 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1678 relaxed = F_RELAXED 1968 relaxed = F_RELAXED
1679 allow_unknown = F_ALLOW_UNKNOWN 1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1680 PPCODE: 1971 PPCODE:
1681{ 1972{
1682 if (enable) 1973 if (enable)
1683 self->flags |= ix; 1974 self->flags |= ix;
1684 else 1975 else
… …
1700 get_shrink = F_SHRINK 1991 get_shrink = F_SHRINK
1701 get_allow_blessed = F_ALLOW_BLESSED 1992 get_allow_blessed = F_ALLOW_BLESSED
1702 get_convert_blessed = F_CONV_BLESSED 1993 get_convert_blessed = F_CONV_BLESSED
1703 get_relaxed = F_RELAXED 1994 get_relaxed = F_RELAXED
1704 get_allow_unknown = F_ALLOW_UNKNOWN 1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1705 PPCODE: 1997 PPCODE:
1706 XPUSHs (boolSV (self->flags & ix)); 1998 XPUSHs (boolSV (self->flags & ix));
1707 1999
1708void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1709 PPCODE: 2001 PPCODE:
… …
1737} 2029}
1738 2030
1739void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2031void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1740 PPCODE: 2032 PPCODE:
1741{ 2033{
1742 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1743 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1744 2036
1745 if (SvOK (cb)) 2037 if (SvOK (cb))
1746 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1747 else 2039 else
… …
1758 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1759} 2051}
1760 2052
1761void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1762 PPCODE: 2054 PPCODE:
1763 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1764 2057
1765void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1766 PPCODE: 2059 PPCODE:
1767 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1768 2062
1769void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1770 PPCODE: 2064 PPCODE:
1771{ 2065{
1772 STRLEN offset; 2066 SV *sv;
2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1773 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1774 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1775 PUSHs (sv_2mortal (newSVuv (offset))); 2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1776} 2072}
1777 2073
1778void incr_parse (JSON *self, SV *jsonstr = 0) 2074void incr_parse (JSON *self, SV *jsonstr = 0)
1779 PPCODE: 2075 PPCODE:
1780{ 2076{
1781 if (!self->incr_text) 2077 if (!self->incr_text)
1782 self->incr_text = newSVpvn ("", 0); 2078 self->incr_text = newSVpvn ("", 0);
2079
2080 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2081 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2082 if (DECODE_WANTS_OCTETS (self))
2083 {
2084 if (self->incr_pos)
2085 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2086 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2087
2088 sv_utf8_downgrade (self->incr_text, 0);
2089 }
2090 else
2091 {
2092 sv_utf8_upgrade (self->incr_text);
2093
2094 if (self->incr_pos)
2095 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2096 - (U8 *)SvPVX (self->incr_text);
2097 }
1783 2098
1784 // append data, if any 2099 // append data, if any
1785 if (jsonstr) 2100 if (jsonstr)
1786 { 2101 {
2102 /* make sure both strings have same encoding */
1787 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 2103 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2104 if (SvUTF8 (jsonstr))
2105 sv_utf8_downgrade (jsonstr, 0);
1788 { 2106 else
1789 /* utf-8-ness differs, need to upgrade */
1790 sv_utf8_upgrade (self->incr_text); 2107 sv_utf8_upgrade (jsonstr);
1791 2108
1792 if (self->incr_pos) 2109 /* and then just blindly append */
1793 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1794 - (U8 *)SvPVX (self->incr_text);
1795 }
1796
1797 { 2110 {
1798 STRLEN len; 2111 STRLEN len;
1799 const char *str = SvPV (jsonstr, len); 2112 const char *str = SvPV (jsonstr, len);
1800 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 2113 STRLEN cur = SvCUR (self->incr_text);
2114
2115 if (SvLEN (self->incr_text) <= cur + len)
2116 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2117
1801 Move (str, SvEND (self->incr_text), len, char); 2118 Move (str, SvEND (self->incr_text), len, char);
1802 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2119 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1803 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2120 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1804 } 2121 }
1805 } 2122 }
1806 2123
1807 if (GIMME_V != G_VOID) 2124 if (GIMME_V != G_VOID)
1808 do 2125 do
1809 { 2126 {
2127 SV *sv;
1810 STRLEN offset; 2128 char *offset;
1811 2129
1812 if (!INCR_DONE (self)) 2130 if (!INCR_DONE (self))
1813 { 2131 {
1814 incr_parse (self); 2132 incr_parse (self);
1815 2133
1816 if (self->incr_pos > self->max_size && self->max_size) 2134 if (self->incr_pos > self->max_size && self->max_size)
1817 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2135 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1818 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2136 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1819 2137
1820 if (!INCR_DONE (self)) 2138 if (!INCR_DONE (self))
2139 {
2140 // as an optimisation, do not accumulate white space in the incr buffer
2141 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2142 {
2143 self->incr_pos = 0;
2144 SvCUR_set (self->incr_text, 0);
2145 }
2146
1821 break; 2147 break;
2148 }
1822 } 2149 }
1823 2150
1824 XPUSHs (decode_json (self->incr_text, self, &offset)); 2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv);
1825 2153
1826 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1827 self->incr_pos -= offset; 2154 self->incr_pos -= offset - SvPVX (self->incr_text);
1828 self->incr_nest = 0; 2155 self->incr_nest = 0;
1829 self->incr_mode = 0; 2156 self->incr_mode = 0;
2157
2158 sv_chop (self->incr_text, offset);
1830 } 2159 }
1831 while (GIMME_V == G_ARRAY); 2160 while (GIMME_V == G_ARRAY);
1832} 2161}
1833 2162
1834SV *incr_text (JSON *self) 2163SV *incr_text (JSON *self)
… …
1872 SvREFCNT_dec (self->incr_text); 2201 SvREFCNT_dec (self->incr_text);
1873 2202
1874PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
1875 2204
1876void encode_json (SV *scalar) 2205void encode_json (SV *scalar)
1877 ALIAS:
1878 to_json_ = 0
1879 encode_json = F_UTF8
1880 PPCODE: 2206 PPCODE:
1881{ 2207{
1882 JSON json; 2208 JSON json;
1883 json_init (&json); 2209 json_init (&json);
1884 json.flags |= ix; 2210 json.flags |= F_UTF8;
1885 XPUSHs (encode_json (scalar, &json)); 2211 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2212 XPUSHs (scalar);
1886} 2213}
1887 2214
1888void decode_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
1889 ALIAS:
1890 from_json_ = 0
1891 decode_json = F_UTF8
1892 PPCODE: 2216 PPCODE:
1893{ 2217{
1894 JSON json; 2218 JSON json;
1895 json_init (&json); 2219 json_init (&json);
1896 json.flags |= ix; 2220 json.flags |= F_UTF8;
1897 XPUSHs (decode_json (jsonstr, &json, 0)); 2221 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2222 XPUSHs (jsonstr);
1898} 2223}
1899 2224
1900

Diff Legend

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