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.120 by root, Mon Oct 28 23:23:10 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;
… …
567// encode objects, arrays and special \0=false and \1=true values. 683// encode objects, arrays and special \0=false and \1=true values.
568static void 684static void
569encode_rv (enc_t *enc, SV *sv) 685encode_rv (enc_t *enc, SV *sv)
570{ 686{
571 svtype svt; 687 svtype svt;
688 GV *method;
572 689
573 SvGETMAGIC (sv); 690 SvGETMAGIC (sv);
574 svt = SvTYPE (sv); 691 svt = SvTYPE (sv);
575 692
576 if (expect_false (SvOBJECT (sv))) 693 if (expect_false (SvOBJECT (sv)))
577 { 694 {
578 HV *stash = !JSON_SLOW || json_boolean_stash 695 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
579 ? json_boolean_stash 696 ? types_boolean_stash
580 : gv_stashpv ("JSON::XS::Boolean", 1); 697 : gv_stashpv ("Types::Serialiser::Boolean", 1);
698 HV *stash = SvSTASH (sv);
581 699
582 if (SvSTASH (sv) == stash) 700 if (stash == boolean_stash)
583 { 701 {
584 if (SvIV (sv)) 702 if (SvIV (sv))
585 encode_str (enc, "true", 4, 0); 703 encode_str (enc, "true", 4, 0);
586 else 704 else
587 encode_str (enc, "false", 5, 0); 705 encode_str (enc, "false", 5, 0);
588 } 706 }
707 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
708 {
709 int count;
710 dSP;
711
712 ENTER; SAVETMPS; PUSHMARK (SP);
713 EXTEND (SP, 2);
714 // we re-bless the reference to get overload and other niceties right
715 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
716 PUSHs (sv_json);
717
718 PUTBACK;
719 count = call_sv ((SV *)GvCV (method), G_ARRAY);
720 SPAGAIN;
721
722 // catch this surprisingly common error
723 if (SvROK (TOPs) && SvRV (TOPs) == sv)
724 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
725
726 encode_ch (enc, '(');
727 encode_ch (enc, '"');
728 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
729 encode_ch (enc, '"');
730 encode_ch (enc, ')');
731 encode_ch (enc, '[');
732
733 while (count)
734 {
735 encode_sv (enc, SP[1 - count--]);
736
737 if (count)
738 encode_ch (enc, ',');
739 }
740
741 encode_ch (enc, ']');
742
743 PUTBACK;
744
745 FREETMPS; LEAVE;
746 }
747 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
748 {
749 dSP;
750
751 ENTER; SAVETMPS; PUSHMARK (SP);
752 // we re-bless the reference to get overload and other niceties right
753 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
754
755 // calling with G_SCALAR ensures that we always get a 1 return value
756 PUTBACK;
757 call_sv ((SV *)GvCV (method), G_SCALAR);
758 SPAGAIN;
759
760 // catch this surprisingly common error
761 if (SvROK (TOPs) && SvRV (TOPs) == sv)
762 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
763
764 sv = POPs;
765 PUTBACK;
766
767 encode_sv (enc, sv);
768
769 FREETMPS; LEAVE;
770 }
771 else if (enc->json.flags & F_ALLOW_BLESSED)
772 encode_str (enc, "null", 4, 0);
589 else 773 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", 774 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)))); 775 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
636 }
637 } 776 }
638 else if (svt == SVt_PVHV) 777 else if (svt == SVt_PVHV)
639 encode_hv (enc, (HV *)sv); 778 encode_hv (enc, (HV *)sv);
640 else if (svt == SVt_PVAV) 779 else if (svt == SVt_PVAV)
641 encode_av (enc, (AV *)sv); 780 encode_av (enc, (AV *)sv);
… …
717 } 856 }
718 else 857 else
719 { 858 {
720 // large integer, use the (rather slow) snprintf way. 859 // large integer, use the (rather slow) snprintf way.
721 need (enc, IVUV_MAXCHARS); 860 need (enc, IVUV_MAXCHARS);
722 enc->cur += 861 enc->cur +=
723 SvIsUV(sv) 862 SvIsUV(sv)
724 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 863 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
725 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 864 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
726 } 865 }
727 } 866 }
728 else if (SvROK (sv)) 867 else if (SvROK (sv))
729 encode_rv (enc, SvRV (sv)); 868 encode_rv (enc, SvRV (sv));
730 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 869 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
731 encode_str (enc, "null", 4, 0); 870 encode_str (enc, "null", 4, 0);
732 else 871 else
733 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 872 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
734 SvPV_nolen (sv), SvFLAGS (sv)); 873 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
735} 874}
736 875
737static SV * 876static SV *
738encode_json (SV *scalar, JSON *json) 877encode_json (SV *scalar, JSON *json)
739{ 878{
… …
751 : enc.json.flags & F_LATIN1 ? 0x000100UL 890 : enc.json.flags & F_LATIN1 ? 0x000100UL
752 : 0x110000UL; 891 : 0x110000UL;
753 892
754 SvPOK_only (enc.sv); 893 SvPOK_only (enc.sv);
755 encode_sv (&enc, scalar); 894 encode_sv (&enc, scalar);
895 encode_nl (&enc);
756 896
757 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 897 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
758 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 898 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
759 899
760 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 900 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
940 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1080 else if (expect_true (ch >= 0x20 && ch < 0x80))
941 *cur++ = ch; 1081 *cur++ = ch;
942 else if (ch >= 0x80) 1082 else if (ch >= 0x80)
943 { 1083 {
944 STRLEN clen; 1084 STRLEN clen;
945 UV uch;
946 1085
947 --dec_cur; 1086 --dec_cur;
948 1087
949 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1088 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
950 if (clen == (STRLEN)-1) 1089 if (clen == (STRLEN)-1)
951 ERR ("malformed UTF-8 character in JSON string"); 1090 ERR ("malformed UTF-8 character in JSON string");
952 1091
953 do 1092 do
954 *cur++ = *dec_cur++; 1093 *cur++ = *dec_cur++;
… …
971 { 1110 {
972 STRLEN len = cur - buf; 1111 STRLEN len = cur - buf;
973 1112
974 if (sv) 1113 if (sv)
975 { 1114 {
976 SvGROW (sv, SvCUR (sv) + len + 1); 1115 STRLEN cur = SvCUR (sv);
1116
1117 if (SvLEN (sv) <= cur + len)
1118 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1119
977 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1120 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
978 SvCUR_set (sv, SvCUR (sv) + len); 1121 SvCUR_set (sv, SvCUR (sv) + len);
979 } 1122 }
980 else 1123 else
981 sv = newSVpvn (buf, len); 1124 sv = newSVpvn (buf, len);
… …
1072 1215
1073 // special case the rather common 1..5-digit-int case 1216 // special case the rather common 1..5-digit-int case
1074 if (*start == '-') 1217 if (*start == '-')
1075 switch (len) 1218 switch (len)
1076 { 1219 {
1077 case 2: return newSViv (-( start [1] - '0' * 1)); 1220 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1078 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1221 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)); 1222 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)); 1223 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)); 1224 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1082 } 1225 }
1083 else 1226 else
1084 switch (len) 1227 switch (len)
1085 { 1228 {
1086 case 1: return newSViv ( start [0] - '0' * 1); 1229 case 1: return newSViv ( start [0] - '0' * 1);
1087 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1230 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); 1231 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); 1232 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); 1233 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1091 } 1234 }
1092 1235
1093 { 1236 {
1094 UV uv; 1237 UV uv;
1095 int numtype = grok_number (start, len, &uv); 1238 int numtype = grok_number (start, len, &uv);
… …
1104 } 1247 }
1105 1248
1106 len -= *start == '-' ? 1 : 0; 1249 len -= *start == '-' ? 1 : 0;
1107 1250
1108 // does not fit into IV or UV, try NV 1251 // does not fit into IV or UV, try NV
1109 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1252 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 1253 // fits into NV without loss of precision
1115 return newSVnv (Atof (start)); 1254 return newSVnv (json_atof (start));
1116 1255
1117 // everything else fails, convert it to a string 1256 // everything else fails, convert it to a string
1118 return newSVpvn (start, dec->cur - start); 1257 return newSVpvn (start, dec->cur - start);
1119 } 1258 }
1120 1259
1121 // loss of precision here 1260 // loss of precision here
1122 return newSVnv (Atof (start)); 1261 return newSVnv (json_atof (start));
1123 1262
1124fail: 1263fail:
1125 return 0; 1264 return 0;
1126} 1265}
1127 1266
… …
1151 if (*dec->cur == ']') 1290 if (*dec->cur == ']')
1152 { 1291 {
1153 ++dec->cur; 1292 ++dec->cur;
1154 break; 1293 break;
1155 } 1294 }
1156 1295
1157 if (*dec->cur != ',') 1296 if (*dec->cur != ',')
1158 ERR (", or ] expected while parsing array"); 1297 ERR (", or ] expected while parsing array");
1159 1298
1160 ++dec->cur; 1299 ++dec->cur;
1161 1300
… …
1296 dSP; 1435 dSP;
1297 int count; 1436 int count;
1298 1437
1299 ENTER; SAVETMPS; PUSHMARK (SP); 1438 ENTER; SAVETMPS; PUSHMARK (SP);
1300 XPUSHs (HeVAL (he)); 1439 XPUSHs (HeVAL (he));
1440 sv_2mortal (sv);
1301 1441
1302 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1442 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1303 1443
1304 if (count == 1) 1444 if (count == 1)
1305 { 1445 {
1306 sv = newSVsv (POPs); 1446 sv = newSVsv (POPs);
1307 FREETMPS; LEAVE; 1447 FREETMPS; LEAVE;
1308 return sv; 1448 return sv;
1309 } 1449 }
1310 1450
1451 SvREFCNT_inc (sv);
1311 FREETMPS; LEAVE; 1452 FREETMPS; LEAVE;
1312 } 1453 }
1313 } 1454 }
1314 1455
1315 if (dec->json.cb_object) 1456 if (dec->json.cb_object)
… …
1341 DEC_DEC_DEPTH; 1482 DEC_DEC_DEPTH;
1342 return 0; 1483 return 0;
1343} 1484}
1344 1485
1345static SV * 1486static SV *
1487decode_tag (dec_t *dec)
1488{
1489 SV *tag = 0;
1490 SV *val = 0;
1491
1492 if (!(dec->json.flags & F_ALLOW_TAGS))
1493 ERR ("malformed JSON string, neither array, object, number, string or atom");
1494
1495 ++dec->cur;
1496
1497 tag = decode_sv (dec);
1498 if (!tag)
1499 goto fail;
1500
1501 if (!SvPOK (tag))
1502 ERR ("malformed JSON string, (tag) must be a string");
1503
1504 if (*dec->cur != ')')
1505 ERR (") expected after tag");
1506
1507 ++dec->cur;
1508
1509 val = decode_sv (dec);
1510 if (!val)
1511 goto fail;
1512
1513 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1514 ERR ("malformed JSON string, tag value must be an array");
1515
1516 {
1517 AV *av = (AV *)SvRV (val);
1518 int i, len = av_len (av) + 1;
1519 HV *stash = gv_stashsv (tag, 0);
1520 SV *sv;
1521
1522 if (!stash)
1523 ERR ("cannot decode perl-object (package does not exist)");
1524
1525 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1526
1527 if (!method)
1528 ERR ("cannot decode perl-object (package does not have a THAW method)");
1529
1530 dSP;
1531
1532 ENTER; SAVETMPS; PUSHMARK (SP);
1533 EXTEND (SP, len + 2);
1534 // we re-bless the reference to get overload and other niceties right
1535 PUSHs (tag);
1536 PUSHs (sv_json);
1537
1538 for (i = 0; i < len; ++i)
1539 PUSHs (*av_fetch (av, i, 1));
1540
1541 PUTBACK;
1542 call_sv ((SV *)GvCV (method), G_SCALAR);
1543 SPAGAIN;
1544
1545 SvREFCNT_dec (tag);
1546 SvREFCNT_dec (val);
1547 sv = SvREFCNT_inc (POPs);
1548
1549 PUTBACK;
1550
1551 FREETMPS; LEAVE;
1552
1553 return sv;
1554 }
1555
1556fail:
1557 SvREFCNT_dec (tag);
1558 SvREFCNT_dec (val);
1559 return 0;
1560}
1561
1562static SV *
1346decode_sv (dec_t *dec) 1563decode_sv (dec_t *dec)
1347{ 1564{
1348 // the beauty of JSON: you need exactly one character lookahead 1565 // the beauty of JSON: you need exactly one character lookahead
1349 // to parse everything. 1566 // to parse everything.
1350 switch (*dec->cur) 1567 switch (*dec->cur)
1351 { 1568 {
1352 case '"': ++dec->cur; return decode_str (dec); 1569 case '"': ++dec->cur; return decode_str (dec);
1353 case '[': ++dec->cur; return decode_av (dec); 1570 case '[': ++dec->cur; return decode_av (dec);
1354 case '{': ++dec->cur; return decode_hv (dec); 1571 case '{': ++dec->cur; return decode_hv (dec);
1572 case '(': return decode_tag (dec);
1355 1573
1356 case '-': 1574 case '-':
1357 case '0': case '1': case '2': case '3': case '4': 1575 case '0': case '1': case '2': case '3': case '4':
1358 case '5': case '6': case '7': case '8': case '9': 1576 case '5': case '6': case '7': case '8': case '9':
1359 return decode_num (dec); 1577 return decode_num (dec);
… …
1361 case 't': 1579 case 't':
1362 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1580 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1363 { 1581 {
1364 dec->cur += 4; 1582 dec->cur += 4;
1365#if JSON_SLOW 1583#if JSON_SLOW
1366 json_true = get_bool ("JSON::XS::true"); 1584 types_true = get_bool ("Types::Serialiser::true");
1367#endif 1585#endif
1368 return newSVsv (json_true); 1586 return newSVsv (types_true);
1369 } 1587 }
1370 else 1588 else
1371 ERR ("'true' expected"); 1589 ERR ("'true' expected");
1372 1590
1373 break; 1591 break;
… …
1375 case 'f': 1593 case 'f':
1376 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1594 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1377 { 1595 {
1378 dec->cur += 5; 1596 dec->cur += 5;
1379#if JSON_SLOW 1597#if JSON_SLOW
1380 json_false = get_bool ("JSON::XS::false"); 1598 types_false = get_bool ("Types::Serialiser::false");
1381#endif 1599#endif
1382 return newSVsv (json_false); 1600 return newSVsv (types_false);
1383 } 1601 }
1384 else 1602 else
1385 ERR ("'false' expected"); 1603 ERR ("'false' expected");
1386 1604
1387 break; 1605 break;
… …
1396 ERR ("'null' expected"); 1614 ERR ("'null' expected");
1397 1615
1398 break; 1616 break;
1399 1617
1400 default: 1618 default:
1401 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1619 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1402 break; 1620 break;
1403 } 1621 }
1404 1622
1405fail: 1623fail:
1406 return 0; 1624 return 0;
1407} 1625}
1408 1626
1409static SV * 1627static SV *
1410decode_json (SV *string, JSON *json, STRLEN *offset_return) 1628decode_json (SV *string, JSON *json, char **offset_return)
1411{ 1629{
1412 dec_t dec; 1630 dec_t dec;
1413 STRLEN offset;
1414 SV *sv; 1631 SV *sv;
1415 1632
1633 /* work around bugs in 5.10 where manipulating magic values
1634 * makes perl ignore the magic in subsequent accesses.
1635 * also make a copy of non-PV values, to get them into a clean
1636 * state (SvPV should do that, but it's buggy, see below).
1637 */
1416 SvGETMAGIC (string); 1638 /*SvGETMAGIC (string);*/
1639 if (SvMAGICAL (string) || !SvPOK (string))
1640 string = sv_2mortal (newSVsv (string));
1641
1417 SvUPGRADE (string, SVt_PV); 1642 SvUPGRADE (string, SVt_PV);
1418 1643
1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1644 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to 1645 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading. 1646 * return the xpv_cur field which certainly exists after upgrading.
1422 * according to nicholas clark, calling SvPOK fixes this. 1647 * according to nicholas clark, calling SvPOK fixes this.
1648 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1649 * and hope for the best.
1650 * Damnit, SvPV_nolen still trips over yet another assertion. This
1651 * assertion business is seriously broken, try yet another workaround
1652 * for the broken -DDEBUGGING.
1423 */ 1653 */
1424 SvPOK (string); 1654 {
1655#ifdef DEBUGGING
1656 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1657#else
1658 STRLEN offset = SvCUR (string);
1659#endif
1425 1660
1426 if (SvCUR (string) > json->max_size && json->max_size) 1661 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", 1662 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); 1663 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1664 }
1429 1665
1430 if (json->flags & F_UTF8) 1666 if (DECODE_WANTS_OCTETS (json))
1431 sv_utf8_downgrade (string, 0); 1667 sv_utf8_downgrade (string, 0);
1432 else 1668 else
1433 sv_utf8_upgrade (string); 1669 sv_utf8_upgrade (string);
1434 1670
1435 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1671 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1445 1681
1446 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1682 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1447 1683
1448 decode_ws (&dec); 1684 decode_ws (&dec);
1449 sv = decode_sv (&dec); 1685 sv = decode_sv (&dec);
1686
1687 if (offset_return)
1688 *offset_return = dec.cur;
1450 1689
1451 if (!(offset_return || !sv)) 1690 if (!(offset_return || !sv))
1452 { 1691 {
1453 // check for trailing garbage 1692 // check for trailing garbage
1454 decode_ws (&dec); 1693 decode_ws (&dec);
… …
1457 { 1696 {
1458 dec.err = "garbage after JSON object"; 1697 dec.err = "garbage after JSON object";
1459 SvREFCNT_dec (sv); 1698 SvREFCNT_dec (sv);
1460 sv = 0; 1699 sv = 0;
1461 } 1700 }
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 } 1701 }
1473 1702
1474 if (!sv) 1703 if (!sv)
1475 { 1704 {
1476 SV *uni = sv_newmortal (); 1705 SV *uni = sv_newmortal ();
… …
1482 SAVEVPTR (PL_curcop); 1711 SAVEVPTR (PL_curcop);
1483 PL_curcop = &cop; 1712 PL_curcop = &cop;
1484 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1713 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1485 LEAVE; 1714 LEAVE;
1486 1715
1487 croak ("%s, at character offset %d [\"%s\"]", 1716 croak ("%s, at character offset %d (before \"%s\")",
1488 dec.err, 1717 dec.err,
1489 (int)offset, 1718 (int)ptr_to_index (string, dec.cur),
1490 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1719 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1491 } 1720 }
1492 1721
1493 sv = sv_2mortal (sv); 1722 sv = sv_2mortal (sv);
1494 1723
… …
1503 1732
1504static void 1733static void
1505incr_parse (JSON *self) 1734incr_parse (JSON *self)
1506{ 1735{
1507 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1736 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1737
1738 // the state machine here is a bit convoluted and could be simplified a lot
1739 // but this would make it slower, so...
1508 1740
1509 for (;;) 1741 for (;;)
1510 { 1742 {
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 1743 //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) 1744 switch (self->incr_mode)
1513 { 1745 {
1514 // only used for intiial whitespace skipping 1746 // only used for initial whitespace skipping
1515 case INCR_M_WS: 1747 case INCR_M_WS:
1516 for (;;) 1748 for (;;)
1517 { 1749 {
1518 if (*p > 0x20) 1750 if (*p > 0x20)
1519 { 1751 {
1752 if (*p == '#')
1753 {
1754 self->incr_mode = INCR_M_C0;
1755 goto incr_m_c;
1756 }
1757 else
1758 {
1520 self->incr_mode = INCR_M_JSON; 1759 self->incr_mode = INCR_M_JSON;
1521 goto incr_m_json; 1760 goto incr_m_json;
1761 }
1522 } 1762 }
1523 else if (!*p) 1763 else if (!*p)
1524 goto interrupt; 1764 goto interrupt;
1525 1765
1526 ++p; 1766 ++p;
… …
1532 goto interrupt; 1772 goto interrupt;
1533 1773
1534 ++p; 1774 ++p;
1535 self->incr_mode = INCR_M_STR; 1775 self->incr_mode = INCR_M_STR;
1536 goto incr_m_str; 1776 goto incr_m_str;
1777
1778 // inside #-style comments
1779 case INCR_M_C0:
1780 case INCR_M_C1:
1781 incr_m_c:
1782 for (;;)
1783 {
1784 if (*p == '\n')
1785 {
1786 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1787 break;
1788 }
1789 else if (!*p)
1790 goto interrupt;
1791
1792 ++p;
1793 }
1794
1795 break;
1537 1796
1538 // inside a string 1797 // inside a string
1539 case INCR_M_STR: 1798 case INCR_M_STR:
1540 incr_m_str: 1799 incr_m_str:
1541 for (;;) 1800 for (;;)
… …
1592 self->incr_mode = INCR_M_STR; 1851 self->incr_mode = INCR_M_STR;
1593 goto incr_m_str; 1852 goto incr_m_str;
1594 1853
1595 case '[': 1854 case '[':
1596 case '{': 1855 case '{':
1856 case '(':
1597 if (++self->incr_nest > self->max_depth) 1857 if (++self->incr_nest > self->max_depth)
1598 croak (ERR_NESTING_EXCEEDED); 1858 croak (ERR_NESTING_EXCEEDED);
1599 break; 1859 break;
1600 1860
1601 case ']': 1861 case ']':
1602 case '}': 1862 case '}':
1603 if (--self->incr_nest <= 0) 1863 if (--self->incr_nest <= 0)
1604 goto interrupt; 1864 goto interrupt;
1865 break;
1866
1867 case ')':
1868 --self->incr_nest;
1869 break;
1870
1871 case '#':
1872 self->incr_mode = INCR_M_C1;
1873 goto incr_m_c;
1605 } 1874 }
1606 } 1875 }
1607 } 1876 }
1608 1877
1609 modechange: 1878 modechange:
1610 ; 1879 ;
1611 } 1880 }
1612 1881
1613interrupt: 1882interrupt:
1614 self->incr_pos = p - SvPVX (self->incr_text); 1883 self->incr_pos = p - SvPVX (self->incr_text);
1884 //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 1885 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1616} 1886}
1617 1887
1618///////////////////////////////////////////////////////////////////////////// 1888/////////////////////////////////////////////////////////////////////////////
1619// XS interface functions 1889// XS interface functions
… …
1629 i >= '0' && i <= '9' ? i - '0' 1899 i >= '0' && i <= '9' ? i - '0'
1630 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1900 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1631 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1901 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1632 : -1; 1902 : -1;
1633 1903
1634 json_stash = gv_stashpv ("JSON::XS" , 1); 1904 json_stash = gv_stashpv ("JSON::XS" , 1);
1635 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1905 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1636 1906
1637 json_true = get_bool ("JSON::XS::true"); 1907 types_true = get_bool ("Types::Serialiser::true");
1638 json_false = get_bool ("JSON::XS::false"); 1908 types_false = get_bool ("Types::Serialiser::false");
1909
1910 sv_json = newSVpv ("JSON", 0);
1911 SvREADONLY_on (sv_json);
1912
1913 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1639} 1914}
1640 1915
1641PROTOTYPES: DISABLE 1916PROTOTYPES: DISABLE
1642 1917
1643void CLONE (...) 1918void CLONE (...)
1644 CODE: 1919 CODE:
1645 json_stash = 0; 1920 json_stash = 0;
1646 json_boolean_stash = 0; 1921 types_boolean_stash = 0;
1647 1922
1648void new (char *klass) 1923void new (char *klass)
1649 PPCODE: 1924 PPCODE:
1650{ 1925{
1651 SV *pv = NEWSV (0, sizeof (JSON)); 1926 SV *pv = NEWSV (0, sizeof (JSON));
1652 SvPOK_only (pv); 1927 SvPOK_only (pv);
1653 json_init ((JSON *)SvPVX (pv)); 1928 json_init ((JSON *)SvPVX (pv));
1654 XPUSHs (sv_2mortal (sv_bless ( 1929 XPUSHs (sv_2mortal (sv_bless (
1655 newRV_noinc (pv), 1930 newRV_noinc (pv),
1656 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1931 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1671 shrink = F_SHRINK 1946 shrink = F_SHRINK
1672 allow_blessed = F_ALLOW_BLESSED 1947 allow_blessed = F_ALLOW_BLESSED
1673 convert_blessed = F_CONV_BLESSED 1948 convert_blessed = F_CONV_BLESSED
1674 relaxed = F_RELAXED 1949 relaxed = F_RELAXED
1675 allow_unknown = F_ALLOW_UNKNOWN 1950 allow_unknown = F_ALLOW_UNKNOWN
1951 allow_tags = F_ALLOW_TAGS
1676 PPCODE: 1952 PPCODE:
1677{ 1953{
1678 if (enable) 1954 if (enable)
1679 self->flags |= ix; 1955 self->flags |= ix;
1680 else 1956 else
… …
1696 get_shrink = F_SHRINK 1972 get_shrink = F_SHRINK
1697 get_allow_blessed = F_ALLOW_BLESSED 1973 get_allow_blessed = F_ALLOW_BLESSED
1698 get_convert_blessed = F_CONV_BLESSED 1974 get_convert_blessed = F_CONV_BLESSED
1699 get_relaxed = F_RELAXED 1975 get_relaxed = F_RELAXED
1700 get_allow_unknown = F_ALLOW_UNKNOWN 1976 get_allow_unknown = F_ALLOW_UNKNOWN
1977 get_allow_tags = F_ALLOW_TAGS
1701 PPCODE: 1978 PPCODE:
1702 XPUSHs (boolSV (self->flags & ix)); 1979 XPUSHs (boolSV (self->flags & ix));
1703 1980
1704void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1981void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1705 PPCODE: 1982 PPCODE:
… …
1733} 2010}
1734 2011
1735void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2012void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1736 PPCODE: 2013 PPCODE:
1737{ 2014{
1738 if (!self->cb_sk_object) 2015 if (!self->cb_sk_object)
1739 self->cb_sk_object = newHV (); 2016 self->cb_sk_object = newHV ();
1740 2017
1741 if (SvOK (cb)) 2018 if (SvOK (cb))
1742 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2019 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1743 else 2020 else
… …
1754 XPUSHs (ST (0)); 2031 XPUSHs (ST (0));
1755} 2032}
1756 2033
1757void encode (JSON *self, SV *scalar) 2034void encode (JSON *self, SV *scalar)
1758 PPCODE: 2035 PPCODE:
1759 XPUSHs (encode_json (scalar, self)); 2036 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2037 XPUSHs (scalar);
1760 2038
1761void decode (JSON *self, SV *jsonstr) 2039void decode (JSON *self, SV *jsonstr)
1762 PPCODE: 2040 PPCODE:
1763 XPUSHs (decode_json (jsonstr, self, 0)); 2041 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2042 XPUSHs (jsonstr);
1764 2043
1765void decode_prefix (JSON *self, SV *jsonstr) 2044void decode_prefix (JSON *self, SV *jsonstr)
1766 PPCODE: 2045 PPCODE:
1767{ 2046{
1768 STRLEN offset; 2047 SV *sv;
2048 char *offset;
2049 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1769 EXTEND (SP, 2); 2050 EXTEND (SP, 2);
1770 PUSHs (decode_json (jsonstr, self, &offset)); 2051 PUSHs (sv);
1771 PUSHs (sv_2mortal (newSVuv (offset))); 2052 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1772} 2053}
1773 2054
1774void incr_parse (JSON *self, SV *jsonstr = 0) 2055void incr_parse (JSON *self, SV *jsonstr = 0)
1775 PPCODE: 2056 PPCODE:
1776{ 2057{
1777 if (!self->incr_text) 2058 if (!self->incr_text)
1778 self->incr_text = newSVpvn ("", 0); 2059 self->incr_text = newSVpvn ("", 0);
2060
2061 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2062 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2063 if (DECODE_WANTS_OCTETS (self))
2064 {
2065 if (self->incr_pos)
2066 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2067 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2068
2069 sv_utf8_downgrade (self->incr_text, 0);
2070 }
2071 else
2072 {
2073 sv_utf8_upgrade (self->incr_text);
2074
2075 if (self->incr_pos)
2076 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2077 - (U8 *)SvPVX (self->incr_text);
2078 }
1779 2079
1780 // append data, if any 2080 // append data, if any
1781 if (jsonstr) 2081 if (jsonstr)
1782 { 2082 {
2083 /* make sure both strings have same encoding */
1783 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 2084 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2085 if (SvUTF8 (jsonstr))
2086 sv_utf8_downgrade (jsonstr, 0);
1784 { 2087 else
1785 /* utf-8-ness differs, need to upgrade */
1786 sv_utf8_upgrade (self->incr_text); 2088 sv_utf8_upgrade (jsonstr);
1787 2089
1788 if (self->incr_pos) 2090 /* 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 { 2091 {
1794 STRLEN len; 2092 STRLEN len;
1795 const char *str = SvPV (jsonstr, len); 2093 const char *str = SvPV (jsonstr, len);
1796 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 2094 STRLEN cur = SvCUR (self->incr_text);
2095
2096 if (SvLEN (self->incr_text) <= cur + len)
2097 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2098
1797 Move (str, SvEND (self->incr_text), len, char); 2099 Move (str, SvEND (self->incr_text), len, char);
1798 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2100 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 2101 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1800 } 2102 }
1801 } 2103 }
1802 2104
1803 if (GIMME_V != G_VOID) 2105 if (GIMME_V != G_VOID)
1804 do 2106 do
1805 { 2107 {
2108 SV *sv;
1806 STRLEN offset; 2109 char *offset;
1807 2110
1808 if (!INCR_DONE (self)) 2111 if (!INCR_DONE (self))
1809 { 2112 {
1810 incr_parse (self); 2113 incr_parse (self);
1811 2114
1812 if (self->incr_pos > self->max_size && self->max_size) 2115 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", 2116 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); 2117 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1815 2118
1816 if (!INCR_DONE (self)) 2119 if (!INCR_DONE (self))
2120 {
2121 // as an optimisation, do not accumulate white space in the incr buffer
2122 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2123 {
2124 self->incr_pos = 0;
2125 SvCUR_set (self->incr_text, 0);
2126 }
2127
1817 break; 2128 break;
2129 }
1818 } 2130 }
1819 2131
1820 XPUSHs (decode_json (self->incr_text, self, &offset)); 2132 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2133 XPUSHs (sv);
1821 2134
1822 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1823 self->incr_pos -= offset; 2135 self->incr_pos -= offset - SvPVX (self->incr_text);
1824 self->incr_nest = 0; 2136 self->incr_nest = 0;
1825 self->incr_mode = 0; 2137 self->incr_mode = 0;
2138
2139 sv_chop (self->incr_text, offset);
1826 } 2140 }
1827 while (GIMME_V == G_ARRAY); 2141 while (GIMME_V == G_ARRAY);
1828} 2142}
1829 2143
1830SV *incr_text (JSON *self) 2144SV *incr_text (JSON *self)
… …
1868 SvREFCNT_dec (self->incr_text); 2182 SvREFCNT_dec (self->incr_text);
1869 2183
1870PROTOTYPES: ENABLE 2184PROTOTYPES: ENABLE
1871 2185
1872void encode_json (SV *scalar) 2186void encode_json (SV *scalar)
1873 ALIAS:
1874 to_json_ = 0
1875 encode_json = F_UTF8
1876 PPCODE: 2187 PPCODE:
1877{ 2188{
1878 JSON json; 2189 JSON json;
1879 json_init (&json); 2190 json_init (&json);
1880 json.flags |= ix; 2191 json.flags |= F_UTF8;
1881 XPUSHs (encode_json (scalar, &json)); 2192 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2193 XPUSHs (scalar);
1882} 2194}
1883 2195
1884void decode_json (SV *jsonstr) 2196void decode_json (SV *jsonstr)
1885 ALIAS:
1886 from_json_ = 0
1887 decode_json = F_UTF8
1888 PPCODE: 2197 PPCODE:
1889{ 2198{
1890 JSON json; 2199 JSON json;
1891 json_init (&json); 2200 json_init (&json);
1892 json.flags |= ix; 2201 json.flags |= F_UTF8;
1893 XPUSHs (decode_json (jsonstr, &json, 0)); 2202 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2203 XPUSHs (jsonstr);
1894} 2204}
1895 2205
1896

Diff Legend

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