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.105 by root, Tue Jan 19 01:07:27 2010 UTC vs.
Revision 1.127 by root, Fri Feb 26 21:46:45 2016 UTC

… …
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// guarantees, 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
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
20#endif 31#endif
21 32
22// three extra for rounding, sign, and end of string 33// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) 34#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24 35
… …
33#define F_SHRINK 0x00000200UL 44#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 45#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 46#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 47#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 48#define F_ALLOW_UNKNOWN 0x00002000UL
49#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 51
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 53
42#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
44 56
45#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)
46 60
47#define SB do { 61#define SB do {
48#define SE } while (0) 62#define SE } while (0)
49 63
50#if __GNUC__ >= 3 64#if __GNUC__ >= 3
… …
65#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 79#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
66 80
67#ifdef USE_ITHREADS 81#ifdef USE_ITHREADS
68# define JSON_SLOW 1 82# define JSON_SLOW 1
69# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
70#else 85#else
71# define JSON_SLOW 0 86# define JSON_SLOW 0
72# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
73#endif 89#endif
74 90
75static HV *json_stash, *json_boolean_stash; // JSON::XS:: 91// the amount of HEs to allocate on the stack, when sorting keys
76static SV *json_true, *json_false; 92#define STACK_HES 64
93
94static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
95static SV *bool_true, *bool_false, *sv_json;
77 96
78enum { 97enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0 98 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string 99 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash 100 INCR_M_BS, // inside backslash
… …
192///////////////////////////////////////////////////////////////////////////// 211/////////////////////////////////////////////////////////////////////////////
193// fp hell 212// fp hell
194 213
195// scan a group of digits, and a trailing exponent 214// scan a group of digits, and a trailing exponent
196static void 215static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp) 216json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{ 217{
199 UV uaccum = 0; 218 UV uaccum = 0;
200 int eaccum = 0; 219 int eaccum = 0;
220
221 // if we recurse too deep, skip all remaining digits
222 // to avoid a stack overflow attack
223 if (expect_false (--maxdepth <= 0))
224 while (((U8)*s - '0') < 10)
225 ++s;
201 226
202 for (;;) 227 for (;;)
203 { 228 {
204 U8 dig = (U8)*s - '0'; 229 U8 dig = (U8)*s - '0';
205 230
206 if (expect_false (dig >= 10)) 231 if (expect_false (dig >= 10))
207 { 232 {
208 if (dig == (U8)((U8)'.' - (U8)'0')) 233 if (dig == (U8)((U8)'.' - (U8)'0'))
209 { 234 {
210 ++s; 235 ++s;
211 json_atof_scan1 (s, accum, expo, 1); 236 json_atof_scan1 (s, accum, expo, 1, maxdepth);
212 } 237 }
213 else if ((dig | ' ') == 'e' - '0') 238 else if ((dig | ' ') == 'e' - '0')
214 { 239 {
215 int exp2 = 0; 240 int exp2 = 0;
216 int neg = 0; 241 int neg = 0;
… …
242 // if we have too many digits, then recurse for more 267 // if we have too many digits, then recurse for more
243 // we actually do this for rather few digits 268 // we actually do this for rather few digits
244 if (uaccum >= (UV_MAX - 9) / 10) 269 if (uaccum >= (UV_MAX - 9) / 10)
245 { 270 {
246 if (postdp) *expo -= eaccum; 271 if (postdp) *expo -= eaccum;
247 json_atof_scan1 (s, accum, expo, postdp); 272 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
248 if (postdp) *expo += eaccum; 273 if (postdp) *expo += eaccum;
249 274
250 break; 275 break;
251 } 276 }
252 } 277 }
253 278
254 // this relies greatly on the quality of the pow () 279 // this relies greatly on the quality of the pow ()
255 // implementation of the platform, but a good 280 // implementation of the platform, but a good
256 // implementation is hard to beat. 281 // implementation is hard to beat.
282 // (IEEE 754 conformant ones are required to be exact)
257 if (postdp) *expo -= eaccum; 283 if (postdp) *expo -= eaccum;
258 *accum += uaccum * Perl_pow (10., *expo); 284 *accum += uaccum * Perl_pow (10., *expo);
259 *expo += eaccum; 285 *expo += eaccum;
260} 286}
261 287
… …
270 { 296 {
271 ++s; 297 ++s;
272 neg = 1; 298 neg = 1;
273 } 299 }
274 300
301 // a recursion depth of ten gives us >>500 bits
275 json_atof_scan1 (s, &accum, &expo, 0); 302 json_atof_scan1 (s, &accum, &expo, 0, 10);
276 303
277 return neg ? -accum : accum; 304 return neg ? -accum : accum;
278} 305}
306
307// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
308static int
309ref_bool_type (SV *sv)
310{
311 svtype svt = SvTYPE (sv);
312
313 if (svt < SVt_PVAV)
314 {
315 STRLEN len = 0;
316 char *pv = svt ? SvPV (sv, len) : 0;
317
318 if (len == 1)
319 if (*pv == '1')
320 return 1;
321 else if (*pv == '0')
322 return 0;
323
324 }
325
326 return -1;
327}
328
329// returns whether scalar is not a reference in the sense of allow_nonref
330static int
331json_nonref (SV *scalar)
332{
333 if (!SvROK (scalar))
334 return 1;
335
336 scalar = SvRV (scalar);
337
338 if (SvSTASH (scalar) == bool_stash)
339 return 1;
340
341 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
342 return 1;
343
344 return 0;
345}
346
279///////////////////////////////////////////////////////////////////////////// 347/////////////////////////////////////////////////////////////////////////////
280// encoder 348// encoder
281 349
282// structure used for encoding JSON 350// structure used for encoding JSON
283typedef struct 351typedef struct
… …
470 538
471 if (enc->indent >= enc->json.max_depth) 539 if (enc->indent >= enc->json.max_depth)
472 croak (ERR_NESTING_EXCEEDED); 540 croak (ERR_NESTING_EXCEEDED);
473 541
474 encode_ch (enc, '['); 542 encode_ch (enc, '[');
475 543
476 if (len >= 0) 544 if (len >= 0)
477 { 545 {
478 encode_nl (enc); ++enc->indent; 546 encode_nl (enc); ++enc->indent;
479 547
480 for (i = 0; i <= len; ++i) 548 for (i = 0; i <= len; ++i)
… …
492 encode_comma (enc); 560 encode_comma (enc);
493 } 561 }
494 562
495 encode_nl (enc); --enc->indent; encode_indent (enc); 563 encode_nl (enc); --enc->indent; encode_indent (enc);
496 } 564 }
497 565
498 encode_ch (enc, ']'); 566 encode_ch (enc, ']');
499} 567}
500 568
501static void 569static void
502encode_hk (enc_t *enc, HE *he) 570encode_hk (enc_t *enc, HE *he)
… …
506 if (HeKLEN (he) == HEf_SVKEY) 574 if (HeKLEN (he) == HEf_SVKEY)
507 { 575 {
508 SV *sv = HeSVKEY (he); 576 SV *sv = HeSVKEY (he);
509 STRLEN len; 577 STRLEN len;
510 char *str; 578 char *str;
511 579
512 SvGETMAGIC (sv); 580 SvGETMAGIC (sv);
513 str = SvPV (sv, len); 581 str = SvPV (sv, len);
514 582
515 encode_str (enc, str, len, SvUTF8 (sv)); 583 encode_str (enc, str, len, SvUTF8 (sv));
516 } 584 }
… …
582 } 650 }
583 651
584 if (count) 652 if (count)
585 { 653 {
586 int i, fast = 1; 654 int i, fast = 1;
587#if defined(__BORLANDC__) || defined(_MSC_VER) 655 HE *hes_stack [STACK_HES];
588 HE **hes = _alloca (count * sizeof (HE)); 656 HE **hes = hes_stack;
589#else 657
590 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 658 // allocate larger arrays on the heap
591#endif 659 if (count > STACK_HES)
660 {
661 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
662 hes = (HE **)SvPVX (sv);
663 }
592 664
593 i = 0; 665 i = 0;
594 while ((he = hv_iternext (hv))) 666 while ((he = hv_iternext (hv)))
595 { 667 {
596 hes [i++] = he; 668 hes [i++] = he;
… …
665// encode objects, arrays and special \0=false and \1=true values. 737// encode objects, arrays and special \0=false and \1=true values.
666static void 738static void
667encode_rv (enc_t *enc, SV *sv) 739encode_rv (enc_t *enc, SV *sv)
668{ 740{
669 svtype svt; 741 svtype svt;
742 GV *method;
670 743
671 SvGETMAGIC (sv); 744 SvGETMAGIC (sv);
672 svt = SvTYPE (sv); 745 svt = SvTYPE (sv);
673 746
674 if (expect_false (SvOBJECT (sv))) 747 if (expect_false (SvOBJECT (sv)))
675 { 748 {
676 HV *stash = !JSON_SLOW || json_boolean_stash 749 HV *stash = SvSTASH (sv);
677 ? json_boolean_stash
678 : gv_stashpv ("JSON::XS::Boolean", 1);
679 750
680 if (SvSTASH (sv) == stash) 751 if (stash == bool_stash)
681 { 752 {
682 if (SvIV (sv)) 753 if (SvIV (sv))
683 encode_str (enc, "true", 4, 0); 754 encode_str (enc, "true", 4, 0);
684 else 755 else
685 encode_str (enc, "false", 5, 0); 756 encode_str (enc, "false", 5, 0);
686 } 757 }
758 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
759 {
760 int count;
761 dSP;
762
763 ENTER; SAVETMPS;
764 SAVESTACK_POS ();
765 PUSHMARK (SP);
766 EXTEND (SP, 2);
767 // we re-bless the reference to get overload and other niceties right
768 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
769 PUSHs (sv_json);
770
771 PUTBACK;
772 count = call_sv ((SV *)GvCV (method), G_ARRAY);
773 SPAGAIN;
774
775 // catch this surprisingly common error
776 if (SvROK (TOPs) && SvRV (TOPs) == sv)
777 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
778
779 encode_ch (enc, '(');
780 encode_ch (enc, '"');
781 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
782 encode_ch (enc, '"');
783 encode_ch (enc, ')');
784 encode_ch (enc, '[');
785
786 while (count)
787 {
788 encode_sv (enc, SP[1 - count--]);
789
790 if (count)
791 encode_ch (enc, ',');
792 }
793
794 encode_ch (enc, ']');
795
796 FREETMPS; LEAVE;
797 }
798 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
799 {
800 dSP;
801
802 ENTER; SAVETMPS;
803 PUSHMARK (SP);
804 // we re-bless the reference to get overload and other niceties right
805 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
806
807 // calling with G_SCALAR ensures that we always get a 1 return value
808 PUTBACK;
809 call_sv ((SV *)GvCV (method), G_SCALAR);
810 SPAGAIN;
811
812 // catch this surprisingly common error
813 if (SvROK (TOPs) && SvRV (TOPs) == sv)
814 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
815
816 sv = POPs;
817 PUTBACK;
818
819 encode_sv (enc, sv);
820
821 FREETMPS; LEAVE;
822 }
823 else if (enc->json.flags & F_ALLOW_BLESSED)
824 encode_str (enc, "null", 4, 0);
687 else 825 else
688 {
689#if 0
690 if (0 && sv_derived_from (rv, "JSON::Literal"))
691 {
692 // not yet
693 }
694#endif
695 if (enc->json.flags & F_CONV_BLESSED)
696 {
697 // we re-bless the reference to get overload and other niceties right
698 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
699
700 if (to_json)
701 {
702 dSP;
703
704 ENTER; SAVETMPS; PUSHMARK (SP);
705 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
706
707 // calling with G_SCALAR ensures that we always get a 1 return value
708 PUTBACK;
709 call_sv ((SV *)GvCV (to_json), G_SCALAR);
710 SPAGAIN;
711
712 // catch this surprisingly common error
713 if (SvROK (TOPs) && SvRV (TOPs) == sv)
714 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
715
716 sv = POPs;
717 PUTBACK;
718
719 encode_sv (enc, sv);
720
721 FREETMPS; LEAVE;
722 }
723 else if (enc->json.flags & F_ALLOW_BLESSED)
724 encode_str (enc, "null", 4, 0);
725 else
726 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
727 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
728 }
729 else if (enc->json.flags & F_ALLOW_BLESSED)
730 encode_str (enc, "null", 4, 0);
731 else
732 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 826 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
733 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 827 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
734 }
735 } 828 }
736 else if (svt == SVt_PVHV) 829 else if (svt == SVt_PVHV)
737 encode_hv (enc, (HV *)sv); 830 encode_hv (enc, (HV *)sv);
738 else if (svt == SVt_PVAV) 831 else if (svt == SVt_PVAV)
739 encode_av (enc, (AV *)sv); 832 encode_av (enc, (AV *)sv);
740 else if (svt < SVt_PVAV) 833 else if (svt < SVt_PVAV)
741 { 834 {
742 STRLEN len = 0; 835 int bool_type = ref_bool_type (sv);
743 char *pv = svt ? SvPV (sv, len) : 0;
744 836
745 if (len == 1 && *pv == '1') 837 if (bool_type == 1)
746 encode_str (enc, "true", 4, 0); 838 encode_str (enc, "true", 4, 0);
747 else if (len == 1 && *pv == '0') 839 else if (bool_type == 0)
748 encode_str (enc, "false", 5, 0); 840 encode_str (enc, "false", 5, 0);
749 else if (enc->json.flags & F_ALLOW_UNKNOWN) 841 else if (enc->json.flags & F_ALLOW_UNKNOWN)
750 encode_str (enc, "null", 4, 0); 842 encode_str (enc, "null", 4, 0);
751 else 843 else
752 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 844 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
815 } 907 }
816 else 908 else
817 { 909 {
818 // large integer, use the (rather slow) snprintf way. 910 // large integer, use the (rather slow) snprintf way.
819 need (enc, IVUV_MAXCHARS); 911 need (enc, IVUV_MAXCHARS);
820 enc->cur += 912 enc->cur +=
821 SvIsUV(sv) 913 SvIsUV(sv)
822 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 914 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
823 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 915 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
824 } 916 }
825 } 917 }
826 else if (SvROK (sv)) 918 else if (SvROK (sv))
827 encode_rv (enc, SvRV (sv)); 919 encode_rv (enc, SvRV (sv));
828 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 920 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
829 encode_str (enc, "null", 4, 0); 921 encode_str (enc, "null", 4, 0);
830 else 922 else
831 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 923 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
832 SvPV_nolen (sv), SvFLAGS (sv)); 924 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
833} 925}
834 926
835static SV * 927static SV *
836encode_json (SV *scalar, JSON *json) 928encode_json (SV *scalar, JSON *json)
837{ 929{
838 enc_t enc; 930 enc_t enc;
839 931
840 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 932 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
841 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 933 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
842 934
843 enc.json = *json; 935 enc.json = *json;
844 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 936 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
845 enc.cur = SvPVX (enc.sv); 937 enc.cur = SvPVX (enc.sv);
… …
1052 *cur++ = *dec_cur++; 1144 *cur++ = *dec_cur++;
1053 while (--clen); 1145 while (--clen);
1054 1146
1055 utf8 = 1; 1147 utf8 = 1;
1056 } 1148 }
1149 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1150 *cur++ = ch;
1057 else 1151 else
1058 { 1152 {
1059 --dec_cur; 1153 --dec_cur;
1060 1154
1061 if (!ch) 1155 if (!ch)
… …
1249 if (*dec->cur == ']') 1343 if (*dec->cur == ']')
1250 { 1344 {
1251 ++dec->cur; 1345 ++dec->cur;
1252 break; 1346 break;
1253 } 1347 }
1254 1348
1255 if (*dec->cur != ',') 1349 if (*dec->cur != ',')
1256 ERR (", or ] expected while parsing array"); 1350 ERR (", or ] expected while parsing array");
1257 1351
1258 ++dec->cur; 1352 ++dec->cur;
1259 1353
… …
1383 1477
1384 hv_iterinit (hv); 1478 hv_iterinit (hv);
1385 he = hv_iternext (hv); 1479 he = hv_iternext (hv);
1386 hv_iterinit (hv); 1480 hv_iterinit (hv);
1387 1481
1388 // the next line creates a mortal sv each time its called. 1482 // the next line creates a mortal sv each time it's called.
1389 // might want to optimise this for common cases. 1483 // might want to optimise this for common cases.
1390 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1484 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1391 1485
1392 if (cb) 1486 if (cb)
1393 { 1487 {
1394 dSP; 1488 dSP;
1395 int count; 1489 int count;
1396 1490
1397 ENTER; SAVETMPS; PUSHMARK (SP); 1491 ENTER; SAVETMPS;
1492 SAVESTACK_POS ();
1493 PUSHMARK (SP);
1398 XPUSHs (HeVAL (he)); 1494 XPUSHs (HeVAL (he));
1495 sv_2mortal (sv);
1399 1496
1400 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1497 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1401 1498
1402 if (count == 1) 1499 if (count == 1)
1403 { 1500 {
1404 sv = newSVsv (POPs); 1501 sv = newSVsv (POPs);
1405 FREETMPS; LEAVE; 1502 FREETMPS; LEAVE;
1406 return sv; 1503 return sv;
1407 } 1504 }
1408 1505
1506 SvREFCNT_inc (sv);
1409 FREETMPS; LEAVE; 1507 FREETMPS; LEAVE;
1410 } 1508 }
1411 } 1509 }
1412 1510
1413 if (dec->json.cb_object) 1511 if (dec->json.cb_object)
1414 { 1512 {
1415 dSP; 1513 dSP;
1416 int count; 1514 int count;
1417 1515
1418 ENTER; SAVETMPS; PUSHMARK (SP); 1516 ENTER; SAVETMPS;
1517 SAVESTACK_POS ();
1518 PUSHMARK (SP);
1419 XPUSHs (sv_2mortal (sv)); 1519 XPUSHs (sv_2mortal (sv));
1420 1520
1421 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1521 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1422 1522
1423 if (count == 1) 1523 if (count == 1)
… …
1439 DEC_DEC_DEPTH; 1539 DEC_DEC_DEPTH;
1440 return 0; 1540 return 0;
1441} 1541}
1442 1542
1443static SV * 1543static SV *
1544decode_tag (dec_t *dec)
1545{
1546 SV *tag = 0;
1547 SV *val = 0;
1548
1549 if (!(dec->json.flags & F_ALLOW_TAGS))
1550 ERR ("malformed JSON string, neither array, object, number, string or atom");
1551
1552 ++dec->cur;
1553
1554 decode_ws (dec);
1555
1556 tag = decode_sv (dec);
1557 if (!tag)
1558 goto fail;
1559
1560 if (!SvPOK (tag))
1561 ERR ("malformed JSON string, (tag) must be a string");
1562
1563 decode_ws (dec);
1564
1565 if (*dec->cur != ')')
1566 ERR (") expected after tag");
1567
1568 ++dec->cur;
1569
1570 decode_ws (dec);
1571
1572 val = decode_sv (dec);
1573 if (!val)
1574 goto fail;
1575
1576 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1577 ERR ("malformed JSON string, tag value must be an array");
1578
1579 {
1580 AV *av = (AV *)SvRV (val);
1581 int i, len = av_len (av) + 1;
1582 HV *stash = gv_stashsv (tag, 0);
1583 SV *sv;
1584
1585 if (!stash)
1586 ERR ("cannot decode perl-object (package does not exist)");
1587
1588 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1589
1590 if (!method)
1591 ERR ("cannot decode perl-object (package does not have a THAW method)");
1592
1593 dSP;
1594
1595 ENTER; SAVETMPS;
1596 PUSHMARK (SP);
1597 EXTEND (SP, len + 2);
1598 // we re-bless the reference to get overload and other niceties right
1599 PUSHs (tag);
1600 PUSHs (sv_json);
1601
1602 for (i = 0; i < len; ++i)
1603 PUSHs (*av_fetch (av, i, 1));
1604
1605 PUTBACK;
1606 call_sv ((SV *)GvCV (method), G_SCALAR);
1607 SPAGAIN;
1608
1609 SvREFCNT_dec (tag);
1610 SvREFCNT_dec (val);
1611 sv = SvREFCNT_inc (POPs);
1612
1613 PUTBACK;
1614
1615 FREETMPS; LEAVE;
1616
1617 return sv;
1618 }
1619
1620fail:
1621 SvREFCNT_dec (tag);
1622 SvREFCNT_dec (val);
1623 return 0;
1624}
1625
1626static SV *
1444decode_sv (dec_t *dec) 1627decode_sv (dec_t *dec)
1445{ 1628{
1446 // the beauty of JSON: you need exactly one character lookahead 1629 // the beauty of JSON: you need exactly one character lookahead
1447 // to parse everything. 1630 // to parse everything.
1448 switch (*dec->cur) 1631 switch (*dec->cur)
1449 { 1632 {
1450 case '"': ++dec->cur; return decode_str (dec); 1633 case '"': ++dec->cur; return decode_str (dec);
1451 case '[': ++dec->cur; return decode_av (dec); 1634 case '[': ++dec->cur; return decode_av (dec);
1452 case '{': ++dec->cur; return decode_hv (dec); 1635 case '{': ++dec->cur; return decode_hv (dec);
1636 case '(': return decode_tag (dec);
1453 1637
1454 case '-': 1638 case '-':
1455 case '0': case '1': case '2': case '3': case '4': 1639 case '0': case '1': case '2': case '3': case '4':
1456 case '5': case '6': case '7': case '8': case '9': 1640 case '5': case '6': case '7': case '8': case '9':
1457 return decode_num (dec); 1641 return decode_num (dec);
… …
1459 case 't': 1643 case 't':
1460 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1644 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1461 { 1645 {
1462 dec->cur += 4; 1646 dec->cur += 4;
1463#if JSON_SLOW 1647#if JSON_SLOW
1464 json_true = get_bool ("JSON::XS::true"); 1648 bool_true = get_bool ("Types::Serialiser::true");
1465#endif 1649#endif
1466 return newSVsv (json_true); 1650 return newSVsv (bool_true);
1467 } 1651 }
1468 else 1652 else
1469 ERR ("'true' expected"); 1653 ERR ("'true' expected");
1470 1654
1471 break; 1655 break;
… …
1473 case 'f': 1657 case 'f':
1474 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1658 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1475 { 1659 {
1476 dec->cur += 5; 1660 dec->cur += 5;
1477#if JSON_SLOW 1661#if JSON_SLOW
1478 json_false = get_bool ("JSON::XS::false"); 1662 bool_false = get_bool ("Types::Serialiser::false");
1479#endif 1663#endif
1480 return newSVsv (json_false); 1664 return newSVsv (bool_false);
1481 } 1665 }
1482 else 1666 else
1483 ERR ("'false' expected"); 1667 ERR ("'false' expected");
1484 1668
1485 break; 1669 break;
… …
1494 ERR ("'null' expected"); 1678 ERR ("'null' expected");
1495 1679
1496 break; 1680 break;
1497 1681
1498 default: 1682 default:
1499 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1683 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1500 break; 1684 break;
1501 } 1685 }
1502 1686
1503fail: 1687fail:
1504 return 0; 1688 return 0;
… …
1509{ 1693{
1510 dec_t dec; 1694 dec_t dec;
1511 SV *sv; 1695 SV *sv;
1512 1696
1513 /* work around bugs in 5.10 where manipulating magic values 1697 /* work around bugs in 5.10 where manipulating magic values
1514 * will perl ignore the magic in subsequent accesses 1698 * makes perl ignore the magic in subsequent accesses.
1699 * also make a copy of non-PV values, to get them into a clean
1700 * state (SvPV should do that, but it's buggy, see below).
1701 *
1702 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1703 * as reported by Reini Urban.
1515 */ 1704 */
1516 /*SvGETMAGIC (string);*/ 1705 /*SvGETMAGIC (string);*/
1517 if (SvMAGICAL (string)) 1706 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1518 string = sv_2mortal (newSVsv (string)); 1707 string = sv_2mortal (newSVsv (string));
1519 1708
1520 SvUPGRADE (string, SVt_PV); 1709 SvUPGRADE (string, SVt_PV);
1521 1710
1522 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1711 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1539 if (offset > json->max_size && json->max_size) 1728 if (offset > json->max_size && json->max_size)
1540 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1729 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1541 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1730 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1542 } 1731 }
1543 1732
1544 if (json->flags & F_UTF8) 1733 if (DECODE_WANTS_OCTETS (json))
1545 sv_utf8_downgrade (string, 0); 1734 sv_utf8_downgrade (string, 0);
1546 else 1735 else
1547 sv_utf8_upgrade (string); 1736 sv_utf8_upgrade (string);
1548 1737
1549 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1738 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1591 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1780 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1592 LEAVE; 1781 LEAVE;
1593 1782
1594 croak ("%s, at character offset %d (before \"%s\")", 1783 croak ("%s, at character offset %d (before \"%s\")",
1595 dec.err, 1784 dec.err,
1596 ptr_to_index (string, dec.cur), 1785 (int)ptr_to_index (string, dec.cur),
1597 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1786 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1598 } 1787 }
1599 1788
1600 sv = sv_2mortal (sv); 1789 sv = sv_2mortal (sv);
1601 1790
1602 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1791 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1603 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1792 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1604 1793
1605 return sv; 1794 return sv;
1606} 1795}
1607 1796
… …
1729 self->incr_mode = INCR_M_STR; 1918 self->incr_mode = INCR_M_STR;
1730 goto incr_m_str; 1919 goto incr_m_str;
1731 1920
1732 case '[': 1921 case '[':
1733 case '{': 1922 case '{':
1923 case '(':
1734 if (++self->incr_nest > self->max_depth) 1924 if (++self->incr_nest > self->max_depth)
1735 croak (ERR_NESTING_EXCEEDED); 1925 croak (ERR_NESTING_EXCEEDED);
1736 break; 1926 break;
1737 1927
1738 case ']': 1928 case ']':
1739 case '}': 1929 case '}':
1740 if (--self->incr_nest <= 0) 1930 if (--self->incr_nest <= 0)
1741 goto interrupt; 1931 goto interrupt;
1932 break;
1933
1934 case ')':
1935 --self->incr_nest;
1742 break; 1936 break;
1743 1937
1744 case '#': 1938 case '#':
1745 self->incr_mode = INCR_M_C1; 1939 self->incr_mode = INCR_M_C1;
1746 goto incr_m_c; 1940 goto incr_m_c;
… …
1772 i >= '0' && i <= '9' ? i - '0' 1966 i >= '0' && i <= '9' ? i - '0'
1773 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1967 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1774 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1968 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1775 : -1; 1969 : -1;
1776 1970
1777 json_stash = gv_stashpv ("JSON::XS" , 1); 1971 json_stash = gv_stashpv ("JSON::XS" , 1);
1778 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1972 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1779
1780 json_true = get_bool ("JSON::XS::true"); 1973 bool_true = get_bool ("Types::Serialiser::true");
1781 json_false = get_bool ("JSON::XS::false"); 1974 bool_false = get_bool ("Types::Serialiser::false");
1975
1976 sv_json = newSVpv ("JSON", 0);
1977 SvREADONLY_on (sv_json);
1782 1978
1783 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1979 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1784} 1980}
1785 1981
1786PROTOTYPES: DISABLE 1982PROTOTYPES: DISABLE
1787 1983
1788void CLONE (...) 1984void CLONE (...)
1789 CODE: 1985 CODE:
1790 json_stash = 0; 1986 json_stash = 0;
1791 json_boolean_stash = 0; 1987 bool_stash = 0;
1792 1988
1793void new (char *klass) 1989void new (char *klass)
1794 PPCODE: 1990 PPCODE:
1795{ 1991{
1796 SV *pv = NEWSV (0, sizeof (JSON)); 1992 SV *pv = NEWSV (0, sizeof (JSON));
1797 SvPOK_only (pv); 1993 SvPOK_only (pv);
1798 json_init ((JSON *)SvPVX (pv)); 1994 json_init ((JSON *)SvPVX (pv));
1799 XPUSHs (sv_2mortal (sv_bless ( 1995 XPUSHs (sv_2mortal (sv_bless (
1800 newRV_noinc (pv), 1996 newRV_noinc (pv),
1801 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1997 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1816 shrink = F_SHRINK 2012 shrink = F_SHRINK
1817 allow_blessed = F_ALLOW_BLESSED 2013 allow_blessed = F_ALLOW_BLESSED
1818 convert_blessed = F_CONV_BLESSED 2014 convert_blessed = F_CONV_BLESSED
1819 relaxed = F_RELAXED 2015 relaxed = F_RELAXED
1820 allow_unknown = F_ALLOW_UNKNOWN 2016 allow_unknown = F_ALLOW_UNKNOWN
2017 allow_tags = F_ALLOW_TAGS
1821 PPCODE: 2018 PPCODE:
1822{ 2019{
1823 if (enable) 2020 if (enable)
1824 self->flags |= ix; 2021 self->flags |= ix;
1825 else 2022 else
… …
1841 get_shrink = F_SHRINK 2038 get_shrink = F_SHRINK
1842 get_allow_blessed = F_ALLOW_BLESSED 2039 get_allow_blessed = F_ALLOW_BLESSED
1843 get_convert_blessed = F_CONV_BLESSED 2040 get_convert_blessed = F_CONV_BLESSED
1844 get_relaxed = F_RELAXED 2041 get_relaxed = F_RELAXED
1845 get_allow_unknown = F_ALLOW_UNKNOWN 2042 get_allow_unknown = F_ALLOW_UNKNOWN
2043 get_allow_tags = F_ALLOW_TAGS
1846 PPCODE: 2044 PPCODE:
1847 XPUSHs (boolSV (self->flags & ix)); 2045 XPUSHs (boolSV (self->flags & ix));
1848 2046
1849void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2047void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1850 PPCODE: 2048 PPCODE:
… …
1878} 2076}
1879 2077
1880void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2078void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1881 PPCODE: 2079 PPCODE:
1882{ 2080{
1883 if (!self->cb_sk_object) 2081 if (!self->cb_sk_object)
1884 self->cb_sk_object = newHV (); 2082 self->cb_sk_object = newHV ();
1885 2083
1886 if (SvOK (cb)) 2084 if (SvOK (cb))
1887 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2085 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1888 else 2086 else
… …
1899 XPUSHs (ST (0)); 2097 XPUSHs (ST (0));
1900} 2098}
1901 2099
1902void encode (JSON *self, SV *scalar) 2100void encode (JSON *self, SV *scalar)
1903 PPCODE: 2101 PPCODE:
1904 XPUSHs (encode_json (scalar, self)); 2102 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2103 XPUSHs (scalar);
1905 2104
1906void decode (JSON *self, SV *jsonstr) 2105void decode (JSON *self, SV *jsonstr)
1907 PPCODE: 2106 PPCODE:
1908 XPUSHs (decode_json (jsonstr, self, 0)); 2107 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2108 XPUSHs (jsonstr);
1909 2109
1910void decode_prefix (JSON *self, SV *jsonstr) 2110void decode_prefix (JSON *self, SV *jsonstr)
1911 PPCODE: 2111 PPCODE:
1912{ 2112{
2113 SV *sv;
1913 char *offset; 2114 char *offset;
2115 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1914 EXTEND (SP, 2); 2116 EXTEND (SP, 2);
1915 PUSHs (decode_json (jsonstr, self, &offset)); 2117 PUSHs (sv);
1916 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2118 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1917} 2119}
1918 2120
1919void incr_parse (JSON *self, SV *jsonstr = 0) 2121void incr_parse (JSON *self, SV *jsonstr = 0)
1920 PPCODE: 2122 PPCODE:
1921{ 2123{
1922 if (!self->incr_text) 2124 if (!self->incr_text)
1923 self->incr_text = newSVpvn ("", 0); 2125 self->incr_text = newSVpvn ("", 0);
2126
2127 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2128 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2129 if (DECODE_WANTS_OCTETS (self))
2130 {
2131 if (self->incr_pos)
2132 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2133 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2134
2135 sv_utf8_downgrade (self->incr_text, 0);
2136 }
2137 else
2138 {
2139 sv_utf8_upgrade (self->incr_text);
2140
2141 if (self->incr_pos)
2142 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2143 - (U8 *)SvPVX (self->incr_text);
2144 }
1924 2145
1925 // append data, if any 2146 // append data, if any
1926 if (jsonstr) 2147 if (jsonstr)
1927 { 2148 {
2149 /* make sure both strings have same encoding */
2150 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1928 if (SvUTF8 (jsonstr)) 2151 if (SvUTF8 (jsonstr))
2152 sv_utf8_downgrade (jsonstr, 0);
1929 { 2153 else
1930 if (!SvUTF8 (self->incr_text))
1931 {
1932 /* utf-8-ness differs, need to upgrade */
1933 sv_utf8_upgrade (self->incr_text);
1934
1935 if (self->incr_pos)
1936 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1937 - (U8 *)SvPVX (self->incr_text);
1938 }
1939 }
1940 else if (SvUTF8 (self->incr_text))
1941 sv_utf8_upgrade (jsonstr); 2154 sv_utf8_upgrade (jsonstr);
1942 2155
2156 /* and then just blindly append */
1943 { 2157 {
1944 STRLEN len; 2158 STRLEN len;
1945 const char *str = SvPV (jsonstr, len); 2159 const char *str = SvPV (jsonstr, len);
1946 STRLEN cur = SvCUR (self->incr_text); 2160 STRLEN cur = SvCUR (self->incr_text);
1947 2161
… …
1955 } 2169 }
1956 2170
1957 if (GIMME_V != G_VOID) 2171 if (GIMME_V != G_VOID)
1958 do 2172 do
1959 { 2173 {
2174 SV *sv;
1960 char *offset; 2175 char *offset;
1961 2176
1962 if (!INCR_DONE (self)) 2177 if (!INCR_DONE (self))
1963 { 2178 {
1964 incr_parse (self); 2179 incr_parse (self);
… …
1966 if (self->incr_pos > self->max_size && self->max_size) 2181 if (self->incr_pos > self->max_size && self->max_size)
1967 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2182 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1968 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2183 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1969 2184
1970 if (!INCR_DONE (self)) 2185 if (!INCR_DONE (self))
2186 {
2187 // as an optimisation, do not accumulate white space in the incr buffer
2188 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2189 {
2190 self->incr_pos = 0;
2191 SvCUR_set (self->incr_text, 0);
2192 }
2193
1971 break; 2194 break;
2195 }
1972 } 2196 }
1973 2197
1974 XPUSHs (decode_json (self->incr_text, self, &offset)); 2198 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2199 XPUSHs (sv);
1975 2200
1976 self->incr_pos -= offset - SvPVX (self->incr_text); 2201 self->incr_pos -= offset - SvPVX (self->incr_text);
1977 self->incr_nest = 0; 2202 self->incr_nest = 0;
1978 self->incr_mode = 0; 2203 self->incr_mode = 0;
1979 2204
… …
2023 SvREFCNT_dec (self->incr_text); 2248 SvREFCNT_dec (self->incr_text);
2024 2249
2025PROTOTYPES: ENABLE 2250PROTOTYPES: ENABLE
2026 2251
2027void encode_json (SV *scalar) 2252void encode_json (SV *scalar)
2028 ALIAS:
2029 to_json_ = 0
2030 encode_json = F_UTF8
2031 PPCODE: 2253 PPCODE:
2032{ 2254{
2033 JSON json; 2255 JSON json;
2034 json_init (&json); 2256 json_init (&json);
2035 json.flags |= ix; 2257 json.flags |= F_UTF8;
2036 XPUSHs (encode_json (scalar, &json)); 2258 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2259 XPUSHs (scalar);
2037} 2260}
2038 2261
2039void decode_json (SV *jsonstr) 2262void decode_json (SV *jsonstr)
2040 ALIAS:
2041 from_json_ = 0
2042 decode_json = F_UTF8
2043 PPCODE: 2263 PPCODE:
2044{ 2264{
2045 JSON json; 2265 JSON json;
2046 json_init (&json); 2266 json_init (&json);
2047 json.flags |= ix; 2267 json.flags |= F_UTF8;
2048 XPUSHs (decode_json (jsonstr, &json, 0)); 2268 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2269 XPUSHs (jsonstr);
2049} 2270}
2050 2271

Diff Legend

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