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.104 by root, Tue Jan 19 00:31:13 2010 UTC vs.
Revision 1.126 by root, Sun Feb 21 16:18:19 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
279 // this relies greatly on the quality of the pow ()
280 // implementation of the platform, but a good
281 // implementation is hard to beat.
282 // (IEEE 754 conformant ones are required to be exact)
254 if (postdp) *expo -= eaccum; 283 if (postdp) *expo -= eaccum;
255 *accum += uaccum * pow (10., *expo); 284 *accum += uaccum * Perl_pow (10., *expo);
256 *expo += eaccum; 285 *expo += eaccum;
257} 286}
258 287
259static NV 288static NV
260json_atof (const char *s) 289json_atof (const char *s)
… …
267 { 296 {
268 ++s; 297 ++s;
269 neg = 1; 298 neg = 1;
270 } 299 }
271 300
301 // a recursion depth of ten gives us >>500 bits
272 json_atof_scan1 (s, &accum, &expo, 0); 302 json_atof_scan1 (s, &accum, &expo, 0, 10);
273 303
274 return neg ? -accum : accum; 304 return neg ? -accum : accum;
275} 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
276///////////////////////////////////////////////////////////////////////////// 347/////////////////////////////////////////////////////////////////////////////
277// encoder 348// encoder
278 349
279// structure used for encoding JSON 350// structure used for encoding JSON
280typedef struct 351typedef struct
… …
467 538
468 if (enc->indent >= enc->json.max_depth) 539 if (enc->indent >= enc->json.max_depth)
469 croak (ERR_NESTING_EXCEEDED); 540 croak (ERR_NESTING_EXCEEDED);
470 541
471 encode_ch (enc, '['); 542 encode_ch (enc, '[');
472 543
473 if (len >= 0) 544 if (len >= 0)
474 { 545 {
475 encode_nl (enc); ++enc->indent; 546 encode_nl (enc); ++enc->indent;
476 547
477 for (i = 0; i <= len; ++i) 548 for (i = 0; i <= len; ++i)
… …
489 encode_comma (enc); 560 encode_comma (enc);
490 } 561 }
491 562
492 encode_nl (enc); --enc->indent; encode_indent (enc); 563 encode_nl (enc); --enc->indent; encode_indent (enc);
493 } 564 }
494 565
495 encode_ch (enc, ']'); 566 encode_ch (enc, ']');
496} 567}
497 568
498static void 569static void
499encode_hk (enc_t *enc, HE *he) 570encode_hk (enc_t *enc, HE *he)
… …
503 if (HeKLEN (he) == HEf_SVKEY) 574 if (HeKLEN (he) == HEf_SVKEY)
504 { 575 {
505 SV *sv = HeSVKEY (he); 576 SV *sv = HeSVKEY (he);
506 STRLEN len; 577 STRLEN len;
507 char *str; 578 char *str;
508 579
509 SvGETMAGIC (sv); 580 SvGETMAGIC (sv);
510 str = SvPV (sv, len); 581 str = SvPV (sv, len);
511 582
512 encode_str (enc, str, len, SvUTF8 (sv)); 583 encode_str (enc, str, len, SvUTF8 (sv));
513 } 584 }
… …
579 } 650 }
580 651
581 if (count) 652 if (count)
582 { 653 {
583 int i, fast = 1; 654 int i, fast = 1;
584#if defined(__BORLANDC__) || defined(_MSC_VER) 655 HE *hes_stack [STACK_HES];
585 HE **hes = _alloca (count * sizeof (HE)); 656 HE **hes = hes_stack;
586#else 657
587 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 658 // allocate larger arrays on the heap
588#endif 659 if (count > STACK_HES)
660 {
661 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
662 hes = (HE **)SvPVX (sv);
663 }
589 664
590 i = 0; 665 i = 0;
591 while ((he = hv_iternext (hv))) 666 while ((he = hv_iternext (hv)))
592 { 667 {
593 hes [i++] = he; 668 hes [i++] = he;
… …
662// encode objects, arrays and special \0=false and \1=true values. 737// encode objects, arrays and special \0=false and \1=true values.
663static void 738static void
664encode_rv (enc_t *enc, SV *sv) 739encode_rv (enc_t *enc, SV *sv)
665{ 740{
666 svtype svt; 741 svtype svt;
742 GV *method;
667 743
668 SvGETMAGIC (sv); 744 SvGETMAGIC (sv);
669 svt = SvTYPE (sv); 745 svt = SvTYPE (sv);
670 746
671 if (expect_false (SvOBJECT (sv))) 747 if (expect_false (SvOBJECT (sv)))
672 { 748 {
673 HV *stash = !JSON_SLOW || json_boolean_stash 749 HV *stash = SvSTASH (sv);
674 ? json_boolean_stash
675 : gv_stashpv ("JSON::XS::Boolean", 1);
676 750
677 if (SvSTASH (sv) == stash) 751 if (stash == bool_stash)
678 { 752 {
679 if (SvIV (sv)) 753 if (SvIV (sv))
680 encode_str (enc, "true", 4, 0); 754 encode_str (enc, "true", 4, 0);
681 else 755 else
682 encode_str (enc, "false", 5, 0); 756 encode_str (enc, "false", 5, 0);
683 } 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);
684 else 825 else
685 {
686#if 0
687 if (0 && sv_derived_from (rv, "JSON::Literal"))
688 {
689 // not yet
690 }
691#endif
692 if (enc->json.flags & F_CONV_BLESSED)
693 {
694 // we re-bless the reference to get overload and other niceties right
695 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
696
697 if (to_json)
698 {
699 dSP;
700
701 ENTER; SAVETMPS; PUSHMARK (SP);
702 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
703
704 // calling with G_SCALAR ensures that we always get a 1 return value
705 PUTBACK;
706 call_sv ((SV *)GvCV (to_json), G_SCALAR);
707 SPAGAIN;
708
709 // catch this surprisingly common error
710 if (SvROK (TOPs) && SvRV (TOPs) == sv)
711 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
712
713 sv = POPs;
714 PUTBACK;
715
716 encode_sv (enc, sv);
717
718 FREETMPS; LEAVE;
719 }
720 else if (enc->json.flags & F_ALLOW_BLESSED)
721 encode_str (enc, "null", 4, 0);
722 else
723 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
724 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
725 }
726 else if (enc->json.flags & F_ALLOW_BLESSED)
727 encode_str (enc, "null", 4, 0);
728 else
729 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)",
730 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 827 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
731 }
732 } 828 }
733 else if (svt == SVt_PVHV) 829 else if (svt == SVt_PVHV)
734 encode_hv (enc, (HV *)sv); 830 encode_hv (enc, (HV *)sv);
735 else if (svt == SVt_PVAV) 831 else if (svt == SVt_PVAV)
736 encode_av (enc, (AV *)sv); 832 encode_av (enc, (AV *)sv);
737 else if (svt < SVt_PVAV) 833 else if (svt < SVt_PVAV)
738 { 834 {
739 STRLEN len = 0; 835 int bool_type = ref_bool_type (sv);
740 char *pv = svt ? SvPV (sv, len) : 0;
741 836
742 if (len == 1 && *pv == '1') 837 if (bool_type == 1)
743 encode_str (enc, "true", 4, 0); 838 encode_str (enc, "true", 4, 0);
744 else if (len == 1 && *pv == '0') 839 else if (bool_type == 0)
745 encode_str (enc, "false", 5, 0); 840 encode_str (enc, "false", 5, 0);
746 else if (enc->json.flags & F_ALLOW_UNKNOWN) 841 else if (enc->json.flags & F_ALLOW_UNKNOWN)
747 encode_str (enc, "null", 4, 0); 842 encode_str (enc, "null", 4, 0);
748 else 843 else
749 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",
… …
812 } 907 }
813 else 908 else
814 { 909 {
815 // large integer, use the (rather slow) snprintf way. 910 // large integer, use the (rather slow) snprintf way.
816 need (enc, IVUV_MAXCHARS); 911 need (enc, IVUV_MAXCHARS);
817 enc->cur += 912 enc->cur +=
818 SvIsUV(sv) 913 SvIsUV(sv)
819 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 914 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
820 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 915 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
821 } 916 }
822 } 917 }
823 else if (SvROK (sv)) 918 else if (SvROK (sv))
824 encode_rv (enc, SvRV (sv)); 919 encode_rv (enc, SvRV (sv));
825 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 920 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
826 encode_str (enc, "null", 4, 0); 921 encode_str (enc, "null", 4, 0);
827 else 922 else
828 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",
829 SvPV_nolen (sv), SvFLAGS (sv)); 924 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
830} 925}
831 926
832static SV * 927static SV *
833encode_json (SV *scalar, JSON *json) 928encode_json (SV *scalar, JSON *json)
834{ 929{
835 enc_t enc; 930 enc_t enc;
836 931
837 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 932 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
838 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)");
839 934
840 enc.json = *json; 935 enc.json = *json;
841 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 936 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
842 enc.cur = SvPVX (enc.sv); 937 enc.cur = SvPVX (enc.sv);
… …
1049 *cur++ = *dec_cur++; 1144 *cur++ = *dec_cur++;
1050 while (--clen); 1145 while (--clen);
1051 1146
1052 utf8 = 1; 1147 utf8 = 1;
1053 } 1148 }
1149 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1150 *cur++ = ch;
1054 else 1151 else
1055 { 1152 {
1056 --dec_cur; 1153 --dec_cur;
1057 1154
1058 if (!ch) 1155 if (!ch)
… …
1246 if (*dec->cur == ']') 1343 if (*dec->cur == ']')
1247 { 1344 {
1248 ++dec->cur; 1345 ++dec->cur;
1249 break; 1346 break;
1250 } 1347 }
1251 1348
1252 if (*dec->cur != ',') 1349 if (*dec->cur != ',')
1253 ERR (", or ] expected while parsing array"); 1350 ERR (", or ] expected while parsing array");
1254 1351
1255 ++dec->cur; 1352 ++dec->cur;
1256 1353
… …
1380 1477
1381 hv_iterinit (hv); 1478 hv_iterinit (hv);
1382 he = hv_iternext (hv); 1479 he = hv_iternext (hv);
1383 hv_iterinit (hv); 1480 hv_iterinit (hv);
1384 1481
1385 // the next line creates a mortal sv each time its called. 1482 // the next line creates a mortal sv each time it's called.
1386 // might want to optimise this for common cases. 1483 // might want to optimise this for common cases.
1387 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);
1388 1485
1389 if (cb) 1486 if (cb)
1390 { 1487 {
1391 dSP; 1488 dSP;
1392 int count; 1489 int count;
1393 1490
1394 ENTER; SAVETMPS; PUSHMARK (SP); 1491 ENTER; SAVETMPS;
1492 SAVESTACK_POS ();
1493 PUSHMARK (SP);
1395 XPUSHs (HeVAL (he)); 1494 XPUSHs (HeVAL (he));
1495 sv_2mortal (sv);
1396 1496
1397 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1497 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1398 1498
1399 if (count == 1) 1499 if (count == 1)
1400 { 1500 {
1401 sv = newSVsv (POPs); 1501 sv = newSVsv (POPs);
1402 FREETMPS; LEAVE; 1502 FREETMPS; LEAVE;
1403 return sv; 1503 return sv;
1404 } 1504 }
1405 1505
1506 SvREFCNT_inc (sv);
1406 FREETMPS; LEAVE; 1507 FREETMPS; LEAVE;
1407 } 1508 }
1408 } 1509 }
1409 1510
1410 if (dec->json.cb_object) 1511 if (dec->json.cb_object)
1411 { 1512 {
1412 dSP; 1513 dSP;
1413 int count; 1514 int count;
1414 1515
1415 ENTER; SAVETMPS; PUSHMARK (SP); 1516 ENTER; SAVETMPS;
1517 SAVESTACK_POS ();
1518 PUSHMARK (SP);
1416 XPUSHs (sv_2mortal (sv)); 1519 XPUSHs (sv_2mortal (sv));
1417 1520
1418 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1521 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1419 1522
1420 if (count == 1) 1523 if (count == 1)
… …
1436 DEC_DEC_DEPTH; 1539 DEC_DEC_DEPTH;
1437 return 0; 1540 return 0;
1438} 1541}
1439 1542
1440static 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 *
1441decode_sv (dec_t *dec) 1627decode_sv (dec_t *dec)
1442{ 1628{
1443 // the beauty of JSON: you need exactly one character lookahead 1629 // the beauty of JSON: you need exactly one character lookahead
1444 // to parse everything. 1630 // to parse everything.
1445 switch (*dec->cur) 1631 switch (*dec->cur)
1446 { 1632 {
1447 case '"': ++dec->cur; return decode_str (dec); 1633 case '"': ++dec->cur; return decode_str (dec);
1448 case '[': ++dec->cur; return decode_av (dec); 1634 case '[': ++dec->cur; return decode_av (dec);
1449 case '{': ++dec->cur; return decode_hv (dec); 1635 case '{': ++dec->cur; return decode_hv (dec);
1636 case '(': return decode_tag (dec);
1450 1637
1451 case '-': 1638 case '-':
1452 case '0': case '1': case '2': case '3': case '4': 1639 case '0': case '1': case '2': case '3': case '4':
1453 case '5': case '6': case '7': case '8': case '9': 1640 case '5': case '6': case '7': case '8': case '9':
1454 return decode_num (dec); 1641 return decode_num (dec);
… …
1456 case 't': 1643 case 't':
1457 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1644 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1458 { 1645 {
1459 dec->cur += 4; 1646 dec->cur += 4;
1460#if JSON_SLOW 1647#if JSON_SLOW
1461 json_true = get_bool ("JSON::XS::true"); 1648 bool_true = get_bool ("Types::Serialiser::true");
1462#endif 1649#endif
1463 return newSVsv (json_true); 1650 return newSVsv (bool_true);
1464 } 1651 }
1465 else 1652 else
1466 ERR ("'true' expected"); 1653 ERR ("'true' expected");
1467 1654
1468 break; 1655 break;
… …
1470 case 'f': 1657 case 'f':
1471 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1658 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1472 { 1659 {
1473 dec->cur += 5; 1660 dec->cur += 5;
1474#if JSON_SLOW 1661#if JSON_SLOW
1475 json_false = get_bool ("JSON::XS::false"); 1662 bool_false = get_bool ("Types::Serialiser::false");
1476#endif 1663#endif
1477 return newSVsv (json_false); 1664 return newSVsv (bool_false);
1478 } 1665 }
1479 else 1666 else
1480 ERR ("'false' expected"); 1667 ERR ("'false' expected");
1481 1668
1482 break; 1669 break;
… …
1491 ERR ("'null' expected"); 1678 ERR ("'null' expected");
1492 1679
1493 break; 1680 break;
1494 1681
1495 default: 1682 default:
1496 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1683 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1497 break; 1684 break;
1498 } 1685 }
1499 1686
1500fail: 1687fail:
1501 return 0; 1688 return 0;
… …
1506{ 1693{
1507 dec_t dec; 1694 dec_t dec;
1508 SV *sv; 1695 SV *sv;
1509 1696
1510 /* work around bugs in 5.10 where manipulating magic values 1697 /* work around bugs in 5.10 where manipulating magic values
1511 * 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).
1512 */ 1701 */
1513 /*SvGETMAGIC (string);*/ 1702 /*SvGETMAGIC (string);*/
1514 if (SvMAGICAL (string)) 1703 if (SvMAGICAL (string) || !SvPOK (string))
1515 string = sv_2mortal (newSVsv (string)); 1704 string = sv_2mortal (newSVsv (string));
1516 1705
1517 SvUPGRADE (string, SVt_PV); 1706 SvUPGRADE (string, SVt_PV);
1518 1707
1519 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1708 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1536 if (offset > json->max_size && json->max_size) 1725 if (offset > json->max_size && json->max_size)
1537 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1726 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1538 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1727 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1539 } 1728 }
1540 1729
1541 if (json->flags & F_UTF8) 1730 if (DECODE_WANTS_OCTETS (json))
1542 sv_utf8_downgrade (string, 0); 1731 sv_utf8_downgrade (string, 0);
1543 else 1732 else
1544 sv_utf8_upgrade (string); 1733 sv_utf8_upgrade (string);
1545 1734
1546 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1735 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1588 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1777 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1589 LEAVE; 1778 LEAVE;
1590 1779
1591 croak ("%s, at character offset %d (before \"%s\")", 1780 croak ("%s, at character offset %d (before \"%s\")",
1592 dec.err, 1781 dec.err,
1593 ptr_to_index (string, dec.cur), 1782 (int)ptr_to_index (string, dec.cur),
1594 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1783 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1595 } 1784 }
1596 1785
1597 sv = sv_2mortal (sv); 1786 sv = sv_2mortal (sv);
1598 1787
1599 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1788 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1600 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1789 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1601 1790
1602 return sv; 1791 return sv;
1603} 1792}
1604 1793
… …
1726 self->incr_mode = INCR_M_STR; 1915 self->incr_mode = INCR_M_STR;
1727 goto incr_m_str; 1916 goto incr_m_str;
1728 1917
1729 case '[': 1918 case '[':
1730 case '{': 1919 case '{':
1920 case '(':
1731 if (++self->incr_nest > self->max_depth) 1921 if (++self->incr_nest > self->max_depth)
1732 croak (ERR_NESTING_EXCEEDED); 1922 croak (ERR_NESTING_EXCEEDED);
1733 break; 1923 break;
1734 1924
1735 case ']': 1925 case ']':
1736 case '}': 1926 case '}':
1737 if (--self->incr_nest <= 0) 1927 if (--self->incr_nest <= 0)
1738 goto interrupt; 1928 goto interrupt;
1929 break;
1930
1931 case ')':
1932 --self->incr_nest;
1739 break; 1933 break;
1740 1934
1741 case '#': 1935 case '#':
1742 self->incr_mode = INCR_M_C1; 1936 self->incr_mode = INCR_M_C1;
1743 goto incr_m_c; 1937 goto incr_m_c;
… …
1769 i >= '0' && i <= '9' ? i - '0' 1963 i >= '0' && i <= '9' ? i - '0'
1770 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1964 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1771 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1965 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1772 : -1; 1966 : -1;
1773 1967
1774 json_stash = gv_stashpv ("JSON::XS" , 1); 1968 json_stash = gv_stashpv ("JSON::XS" , 1);
1775 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1969 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1776
1777 json_true = get_bool ("JSON::XS::true"); 1970 bool_true = get_bool ("Types::Serialiser::true");
1778 json_false = get_bool ("JSON::XS::false"); 1971 bool_false = get_bool ("Types::Serialiser::false");
1972
1973 sv_json = newSVpv ("JSON", 0);
1974 SvREADONLY_on (sv_json);
1779 1975
1780 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1976 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1781} 1977}
1782 1978
1783PROTOTYPES: DISABLE 1979PROTOTYPES: DISABLE
1784 1980
1785void CLONE (...) 1981void CLONE (...)
1786 CODE: 1982 CODE:
1787 json_stash = 0; 1983 json_stash = 0;
1788 json_boolean_stash = 0; 1984 bool_stash = 0;
1789 1985
1790void new (char *klass) 1986void new (char *klass)
1791 PPCODE: 1987 PPCODE:
1792{ 1988{
1793 SV *pv = NEWSV (0, sizeof (JSON)); 1989 SV *pv = NEWSV (0, sizeof (JSON));
1794 SvPOK_only (pv); 1990 SvPOK_only (pv);
1795 json_init ((JSON *)SvPVX (pv)); 1991 json_init ((JSON *)SvPVX (pv));
1796 XPUSHs (sv_2mortal (sv_bless ( 1992 XPUSHs (sv_2mortal (sv_bless (
1797 newRV_noinc (pv), 1993 newRV_noinc (pv),
1798 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1994 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1813 shrink = F_SHRINK 2009 shrink = F_SHRINK
1814 allow_blessed = F_ALLOW_BLESSED 2010 allow_blessed = F_ALLOW_BLESSED
1815 convert_blessed = F_CONV_BLESSED 2011 convert_blessed = F_CONV_BLESSED
1816 relaxed = F_RELAXED 2012 relaxed = F_RELAXED
1817 allow_unknown = F_ALLOW_UNKNOWN 2013 allow_unknown = F_ALLOW_UNKNOWN
2014 allow_tags = F_ALLOW_TAGS
1818 PPCODE: 2015 PPCODE:
1819{ 2016{
1820 if (enable) 2017 if (enable)
1821 self->flags |= ix; 2018 self->flags |= ix;
1822 else 2019 else
… …
1838 get_shrink = F_SHRINK 2035 get_shrink = F_SHRINK
1839 get_allow_blessed = F_ALLOW_BLESSED 2036 get_allow_blessed = F_ALLOW_BLESSED
1840 get_convert_blessed = F_CONV_BLESSED 2037 get_convert_blessed = F_CONV_BLESSED
1841 get_relaxed = F_RELAXED 2038 get_relaxed = F_RELAXED
1842 get_allow_unknown = F_ALLOW_UNKNOWN 2039 get_allow_unknown = F_ALLOW_UNKNOWN
2040 get_allow_tags = F_ALLOW_TAGS
1843 PPCODE: 2041 PPCODE:
1844 XPUSHs (boolSV (self->flags & ix)); 2042 XPUSHs (boolSV (self->flags & ix));
1845 2043
1846void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2044void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1847 PPCODE: 2045 PPCODE:
… …
1875} 2073}
1876 2074
1877void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2075void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1878 PPCODE: 2076 PPCODE:
1879{ 2077{
1880 if (!self->cb_sk_object) 2078 if (!self->cb_sk_object)
1881 self->cb_sk_object = newHV (); 2079 self->cb_sk_object = newHV ();
1882 2080
1883 if (SvOK (cb)) 2081 if (SvOK (cb))
1884 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2082 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1885 else 2083 else
… …
1896 XPUSHs (ST (0)); 2094 XPUSHs (ST (0));
1897} 2095}
1898 2096
1899void encode (JSON *self, SV *scalar) 2097void encode (JSON *self, SV *scalar)
1900 PPCODE: 2098 PPCODE:
1901 XPUSHs (encode_json (scalar, self)); 2099 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2100 XPUSHs (scalar);
1902 2101
1903void decode (JSON *self, SV *jsonstr) 2102void decode (JSON *self, SV *jsonstr)
1904 PPCODE: 2103 PPCODE:
1905 XPUSHs (decode_json (jsonstr, self, 0)); 2104 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2105 XPUSHs (jsonstr);
1906 2106
1907void decode_prefix (JSON *self, SV *jsonstr) 2107void decode_prefix (JSON *self, SV *jsonstr)
1908 PPCODE: 2108 PPCODE:
1909{ 2109{
2110 SV *sv;
1910 char *offset; 2111 char *offset;
2112 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1911 EXTEND (SP, 2); 2113 EXTEND (SP, 2);
1912 PUSHs (decode_json (jsonstr, self, &offset)); 2114 PUSHs (sv);
1913 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2115 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1914} 2116}
1915 2117
1916void incr_parse (JSON *self, SV *jsonstr = 0) 2118void incr_parse (JSON *self, SV *jsonstr = 0)
1917 PPCODE: 2119 PPCODE:
1918{ 2120{
1919 if (!self->incr_text) 2121 if (!self->incr_text)
1920 self->incr_text = newSVpvn ("", 0); 2122 self->incr_text = newSVpvn ("", 0);
2123
2124 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2125 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2126 if (DECODE_WANTS_OCTETS (self))
2127 {
2128 if (self->incr_pos)
2129 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2130 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2131
2132 sv_utf8_downgrade (self->incr_text, 0);
2133 }
2134 else
2135 {
2136 sv_utf8_upgrade (self->incr_text);
2137
2138 if (self->incr_pos)
2139 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2140 - (U8 *)SvPVX (self->incr_text);
2141 }
1921 2142
1922 // append data, if any 2143 // append data, if any
1923 if (jsonstr) 2144 if (jsonstr)
1924 { 2145 {
2146 /* make sure both strings have same encoding */
2147 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1925 if (SvUTF8 (jsonstr)) 2148 if (SvUTF8 (jsonstr))
2149 sv_utf8_downgrade (jsonstr, 0);
1926 { 2150 else
1927 if (!SvUTF8 (self->incr_text))
1928 {
1929 /* utf-8-ness differs, need to upgrade */
1930 sv_utf8_upgrade (self->incr_text);
1931
1932 if (self->incr_pos)
1933 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1934 - (U8 *)SvPVX (self->incr_text);
1935 }
1936 }
1937 else if (SvUTF8 (self->incr_text))
1938 sv_utf8_upgrade (jsonstr); 2151 sv_utf8_upgrade (jsonstr);
1939 2152
2153 /* and then just blindly append */
1940 { 2154 {
1941 STRLEN len; 2155 STRLEN len;
1942 const char *str = SvPV (jsonstr, len); 2156 const char *str = SvPV (jsonstr, len);
1943 STRLEN cur = SvCUR (self->incr_text); 2157 STRLEN cur = SvCUR (self->incr_text);
1944 2158
… …
1952 } 2166 }
1953 2167
1954 if (GIMME_V != G_VOID) 2168 if (GIMME_V != G_VOID)
1955 do 2169 do
1956 { 2170 {
2171 SV *sv;
1957 char *offset; 2172 char *offset;
1958 2173
1959 if (!INCR_DONE (self)) 2174 if (!INCR_DONE (self))
1960 { 2175 {
1961 incr_parse (self); 2176 incr_parse (self);
… …
1963 if (self->incr_pos > self->max_size && self->max_size) 2178 if (self->incr_pos > self->max_size && self->max_size)
1964 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2179 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1965 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2180 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1966 2181
1967 if (!INCR_DONE (self)) 2182 if (!INCR_DONE (self))
2183 {
2184 // as an optimisation, do not accumulate white space in the incr buffer
2185 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2186 {
2187 self->incr_pos = 0;
2188 SvCUR_set (self->incr_text, 0);
2189 }
2190
1968 break; 2191 break;
2192 }
1969 } 2193 }
1970 2194
1971 XPUSHs (decode_json (self->incr_text, self, &offset)); 2195 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2196 XPUSHs (sv);
1972 2197
1973 self->incr_pos -= offset - SvPVX (self->incr_text); 2198 self->incr_pos -= offset - SvPVX (self->incr_text);
1974 self->incr_nest = 0; 2199 self->incr_nest = 0;
1975 self->incr_mode = 0; 2200 self->incr_mode = 0;
1976 2201
… …
2020 SvREFCNT_dec (self->incr_text); 2245 SvREFCNT_dec (self->incr_text);
2021 2246
2022PROTOTYPES: ENABLE 2247PROTOTYPES: ENABLE
2023 2248
2024void encode_json (SV *scalar) 2249void encode_json (SV *scalar)
2025 ALIAS:
2026 to_json_ = 0
2027 encode_json = F_UTF8
2028 PPCODE: 2250 PPCODE:
2029{ 2251{
2030 JSON json; 2252 JSON json;
2031 json_init (&json); 2253 json_init (&json);
2032 json.flags |= ix; 2254 json.flags |= F_UTF8;
2033 XPUSHs (encode_json (scalar, &json)); 2255 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2256 XPUSHs (scalar);
2034} 2257}
2035 2258
2036void decode_json (SV *jsonstr) 2259void decode_json (SV *jsonstr)
2037 ALIAS:
2038 from_json_ = 0
2039 decode_json = F_UTF8
2040 PPCODE: 2260 PPCODE:
2041{ 2261{
2042 JSON json; 2262 JSON json;
2043 json_init (&json); 2263 json_init (&json);
2044 json.flags |= ix; 2264 json.flags |= F_UTF8;
2045 XPUSHs (decode_json (jsonstr, &json, 0)); 2265 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2266 XPUSHs (jsonstr);
2046} 2267}
2047 2268

Diff Legend

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