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.103 by root, Wed Jan 6 08:01:39 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
185ptr_to_index (SV *sv, char *offset) 204ptr_to_index (SV *sv, char *offset)
186{ 205{
187 return SvUTF8 (sv) 206 return SvUTF8 (sv)
188 ? utf8_distance (offset, SvPVX (sv)) 207 ? utf8_distance (offset, SvPVX (sv))
189 : offset - SvPVX (sv); 208 : offset - SvPVX (sv);
209}
210
211/////////////////////////////////////////////////////////////////////////////
212// fp hell
213
214// scan a group of digits, and a trailing exponent
215static void
216json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
217{
218 UV uaccum = 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;
226
227 for (;;)
228 {
229 U8 dig = (U8)*s - '0';
230
231 if (expect_false (dig >= 10))
232 {
233 if (dig == (U8)((U8)'.' - (U8)'0'))
234 {
235 ++s;
236 json_atof_scan1 (s, accum, expo, 1, maxdepth);
237 }
238 else if ((dig | ' ') == 'e' - '0')
239 {
240 int exp2 = 0;
241 int neg = 0;
242
243 ++s;
244
245 if (*s == '-')
246 {
247 ++s;
248 neg = 1;
249 }
250 else if (*s == '+')
251 ++s;
252
253 while ((dig = (U8)*s - '0') < 10)
254 exp2 = exp2 * 10 + *s++ - '0';
255
256 *expo += neg ? -exp2 : exp2;
257 }
258
259 break;
260 }
261
262 ++s;
263
264 uaccum = uaccum * 10 + dig;
265 ++eaccum;
266
267 // if we have too many digits, then recurse for more
268 // we actually do this for rather few digits
269 if (uaccum >= (UV_MAX - 9) / 10)
270 {
271 if (postdp) *expo -= eaccum;
272 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
273 if (postdp) *expo += eaccum;
274
275 break;
276 }
277 }
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)
283 if (postdp) *expo -= eaccum;
284 *accum += uaccum * Perl_pow (10., *expo);
285 *expo += eaccum;
286}
287
288static NV
289json_atof (const char *s)
290{
291 NV accum = 0.;
292 int expo = 0;
293 int neg = 0;
294
295 if (*s == '-')
296 {
297 ++s;
298 neg = 1;
299 }
300
301 // a recursion depth of ten gives us >>500 bits
302 json_atof_scan1 (s, &accum, &expo, 0, 10);
303
304 return neg ? -accum : accum;
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;
190} 345}
191 346
192///////////////////////////////////////////////////////////////////////////// 347/////////////////////////////////////////////////////////////////////////////
193// encoder 348// encoder
194 349
383 538
384 if (enc->indent >= enc->json.max_depth) 539 if (enc->indent >= enc->json.max_depth)
385 croak (ERR_NESTING_EXCEEDED); 540 croak (ERR_NESTING_EXCEEDED);
386 541
387 encode_ch (enc, '['); 542 encode_ch (enc, '[');
388 543
389 if (len >= 0) 544 if (len >= 0)
390 { 545 {
391 encode_nl (enc); ++enc->indent; 546 encode_nl (enc); ++enc->indent;
392 547
393 for (i = 0; i <= len; ++i) 548 for (i = 0; i <= len; ++i)
405 encode_comma (enc); 560 encode_comma (enc);
406 } 561 }
407 562
408 encode_nl (enc); --enc->indent; encode_indent (enc); 563 encode_nl (enc); --enc->indent; encode_indent (enc);
409 } 564 }
410 565
411 encode_ch (enc, ']'); 566 encode_ch (enc, ']');
412} 567}
413 568
414static void 569static void
415encode_hk (enc_t *enc, HE *he) 570encode_hk (enc_t *enc, HE *he)
419 if (HeKLEN (he) == HEf_SVKEY) 574 if (HeKLEN (he) == HEf_SVKEY)
420 { 575 {
421 SV *sv = HeSVKEY (he); 576 SV *sv = HeSVKEY (he);
422 STRLEN len; 577 STRLEN len;
423 char *str; 578 char *str;
424 579
425 SvGETMAGIC (sv); 580 SvGETMAGIC (sv);
426 str = SvPV (sv, len); 581 str = SvPV (sv, len);
427 582
428 encode_str (enc, str, len, SvUTF8 (sv)); 583 encode_str (enc, str, len, SvUTF8 (sv));
429 } 584 }
495 } 650 }
496 651
497 if (count) 652 if (count)
498 { 653 {
499 int i, fast = 1; 654 int i, fast = 1;
500#if defined(__BORLANDC__) || defined(_MSC_VER) 655 HE *hes_stack [STACK_HES];
501 HE **hes = _alloca (count * sizeof (HE)); 656 HE **hes = hes_stack;
502#else 657
503 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 658 // allocate larger arrays on the heap
504#endif 659 if (count > STACK_HES)
660 {
661 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
662 hes = (HE **)SvPVX (sv);
663 }
505 664
506 i = 0; 665 i = 0;
507 while ((he = hv_iternext (hv))) 666 while ((he = hv_iternext (hv)))
508 { 667 {
509 hes [i++] = he; 668 hes [i++] = he;
578// encode objects, arrays and special \0=false and \1=true values. 737// encode objects, arrays and special \0=false and \1=true values.
579static void 738static void
580encode_rv (enc_t *enc, SV *sv) 739encode_rv (enc_t *enc, SV *sv)
581{ 740{
582 svtype svt; 741 svtype svt;
742 GV *method;
583 743
584 SvGETMAGIC (sv); 744 SvGETMAGIC (sv);
585 svt = SvTYPE (sv); 745 svt = SvTYPE (sv);
586 746
587 if (expect_false (SvOBJECT (sv))) 747 if (expect_false (SvOBJECT (sv)))
588 { 748 {
589 HV *stash = !JSON_SLOW || json_boolean_stash 749 HV *stash = SvSTASH (sv);
590 ? json_boolean_stash
591 : gv_stashpv ("JSON::XS::Boolean", 1);
592 750
593 if (SvSTASH (sv) == stash) 751 if (stash == bool_stash)
594 { 752 {
595 if (SvIV (sv)) 753 if (SvIV (sv))
596 encode_str (enc, "true", 4, 0); 754 encode_str (enc, "true", 4, 0);
597 else 755 else
598 encode_str (enc, "false", 5, 0); 756 encode_str (enc, "false", 5, 0);
599 } 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);
600 else 825 else
601 {
602#if 0
603 if (0 && sv_derived_from (rv, "JSON::Literal"))
604 {
605 // not yet
606 }
607#endif
608 if (enc->json.flags & F_CONV_BLESSED)
609 {
610 // we re-bless the reference to get overload and other niceties right
611 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
612
613 if (to_json)
614 {
615 dSP;
616
617 ENTER; SAVETMPS; PUSHMARK (SP);
618 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
619
620 // calling with G_SCALAR ensures that we always get a 1 return value
621 PUTBACK;
622 call_sv ((SV *)GvCV (to_json), G_SCALAR);
623 SPAGAIN;
624
625 // catch this surprisingly common error
626 if (SvROK (TOPs) && SvRV (TOPs) == sv)
627 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
628
629 sv = POPs;
630 PUTBACK;
631
632 encode_sv (enc, sv);
633
634 FREETMPS; LEAVE;
635 }
636 else if (enc->json.flags & F_ALLOW_BLESSED)
637 encode_str (enc, "null", 4, 0);
638 else
639 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
640 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
641 }
642 else if (enc->json.flags & F_ALLOW_BLESSED)
643 encode_str (enc, "null", 4, 0);
644 else
645 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)",
646 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 827 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
647 }
648 } 828 }
649 else if (svt == SVt_PVHV) 829 else if (svt == SVt_PVHV)
650 encode_hv (enc, (HV *)sv); 830 encode_hv (enc, (HV *)sv);
651 else if (svt == SVt_PVAV) 831 else if (svt == SVt_PVAV)
652 encode_av (enc, (AV *)sv); 832 encode_av (enc, (AV *)sv);
653 else if (svt < SVt_PVAV) 833 else if (svt < SVt_PVAV)
654 { 834 {
655 STRLEN len = 0; 835 int bool_type = ref_bool_type (sv);
656 char *pv = svt ? SvPV (sv, len) : 0;
657 836
658 if (len == 1 && *pv == '1') 837 if (bool_type == 1)
659 encode_str (enc, "true", 4, 0); 838 encode_str (enc, "true", 4, 0);
660 else if (len == 1 && *pv == '0') 839 else if (bool_type == 0)
661 encode_str (enc, "false", 5, 0); 840 encode_str (enc, "false", 5, 0);
662 else if (enc->json.flags & F_ALLOW_UNKNOWN) 841 else if (enc->json.flags & F_ALLOW_UNKNOWN)
663 encode_str (enc, "null", 4, 0); 842 encode_str (enc, "null", 4, 0);
664 else 843 else
665 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",
728 } 907 }
729 else 908 else
730 { 909 {
731 // large integer, use the (rather slow) snprintf way. 910 // large integer, use the (rather slow) snprintf way.
732 need (enc, IVUV_MAXCHARS); 911 need (enc, IVUV_MAXCHARS);
733 enc->cur += 912 enc->cur +=
734 SvIsUV(sv) 913 SvIsUV(sv)
735 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 914 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
736 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 915 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
737 } 916 }
738 } 917 }
739 else if (SvROK (sv)) 918 else if (SvROK (sv))
740 encode_rv (enc, SvRV (sv)); 919 encode_rv (enc, SvRV (sv));
741 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 920 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
742 encode_str (enc, "null", 4, 0); 921 encode_str (enc, "null", 4, 0);
743 else 922 else
744 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",
745 SvPV_nolen (sv), SvFLAGS (sv)); 924 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
746} 925}
747 926
748static SV * 927static SV *
749encode_json (SV *scalar, JSON *json) 928encode_json (SV *scalar, JSON *json)
750{ 929{
751 enc_t enc; 930 enc_t enc;
752 931
753 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 932 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
754 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)");
755 934
756 enc.json = *json; 935 enc.json = *json;
757 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 936 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
758 enc.cur = SvPVX (enc.sv); 937 enc.cur = SvPVX (enc.sv);
965 *cur++ = *dec_cur++; 1144 *cur++ = *dec_cur++;
966 while (--clen); 1145 while (--clen);
967 1146
968 utf8 = 1; 1147 utf8 = 1;
969 } 1148 }
1149 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1150 *cur++ = ch;
970 else 1151 else
971 { 1152 {
972 --dec_cur; 1153 --dec_cur;
973 1154
974 if (!ch) 1155 if (!ch)
1119 } 1300 }
1120 1301
1121 len -= *start == '-' ? 1 : 0; 1302 len -= *start == '-' ? 1 : 0;
1122 1303
1123 // does not fit into IV or UV, try NV 1304 // does not fit into IV or UV, try NV
1124 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1305 if (len <= NV_DIG)
1125 #if defined (LDBL_DIG)
1126 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1127 #endif
1128 )
1129 // fits into NV without loss of precision 1306 // fits into NV without loss of precision
1130 return newSVnv (Atof (start)); 1307 return newSVnv (json_atof (start));
1131 1308
1132 // everything else fails, convert it to a string 1309 // everything else fails, convert it to a string
1133 return newSVpvn (start, dec->cur - start); 1310 return newSVpvn (start, dec->cur - start);
1134 } 1311 }
1135 1312
1136 // loss of precision here 1313 // loss of precision here
1137 return newSVnv (Atof (start)); 1314 return newSVnv (json_atof (start));
1138 1315
1139fail: 1316fail:
1140 return 0; 1317 return 0;
1141} 1318}
1142 1319
1166 if (*dec->cur == ']') 1343 if (*dec->cur == ']')
1167 { 1344 {
1168 ++dec->cur; 1345 ++dec->cur;
1169 break; 1346 break;
1170 } 1347 }
1171 1348
1172 if (*dec->cur != ',') 1349 if (*dec->cur != ',')
1173 ERR (", or ] expected while parsing array"); 1350 ERR (", or ] expected while parsing array");
1174 1351
1175 ++dec->cur; 1352 ++dec->cur;
1176 1353
1300 1477
1301 hv_iterinit (hv); 1478 hv_iterinit (hv);
1302 he = hv_iternext (hv); 1479 he = hv_iternext (hv);
1303 hv_iterinit (hv); 1480 hv_iterinit (hv);
1304 1481
1305 // the next line creates a mortal sv each time its called. 1482 // the next line creates a mortal sv each time it's called.
1306 // might want to optimise this for common cases. 1483 // might want to optimise this for common cases.
1307 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);
1308 1485
1309 if (cb) 1486 if (cb)
1310 { 1487 {
1311 dSP; 1488 dSP;
1312 int count; 1489 int count;
1313 1490
1314 ENTER; SAVETMPS; PUSHMARK (SP); 1491 ENTER; SAVETMPS;
1492 SAVESTACK_POS ();
1493 PUSHMARK (SP);
1315 XPUSHs (HeVAL (he)); 1494 XPUSHs (HeVAL (he));
1495 sv_2mortal (sv);
1316 1496
1317 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1497 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1318 1498
1319 if (count == 1) 1499 if (count == 1)
1320 { 1500 {
1321 sv = newSVsv (POPs); 1501 sv = newSVsv (POPs);
1322 FREETMPS; LEAVE; 1502 FREETMPS; LEAVE;
1323 return sv; 1503 return sv;
1324 } 1504 }
1325 1505
1506 SvREFCNT_inc (sv);
1326 FREETMPS; LEAVE; 1507 FREETMPS; LEAVE;
1327 } 1508 }
1328 } 1509 }
1329 1510
1330 if (dec->json.cb_object) 1511 if (dec->json.cb_object)
1331 { 1512 {
1332 dSP; 1513 dSP;
1333 int count; 1514 int count;
1334 1515
1335 ENTER; SAVETMPS; PUSHMARK (SP); 1516 ENTER; SAVETMPS;
1517 SAVESTACK_POS ();
1518 PUSHMARK (SP);
1336 XPUSHs (sv_2mortal (sv)); 1519 XPUSHs (sv_2mortal (sv));
1337 1520
1338 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1521 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1339 1522
1340 if (count == 1) 1523 if (count == 1)
1356 DEC_DEC_DEPTH; 1539 DEC_DEC_DEPTH;
1357 return 0; 1540 return 0;
1358} 1541}
1359 1542
1360static 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 *
1361decode_sv (dec_t *dec) 1627decode_sv (dec_t *dec)
1362{ 1628{
1363 // the beauty of JSON: you need exactly one character lookahead 1629 // the beauty of JSON: you need exactly one character lookahead
1364 // to parse everything. 1630 // to parse everything.
1365 switch (*dec->cur) 1631 switch (*dec->cur)
1366 { 1632 {
1367 case '"': ++dec->cur; return decode_str (dec); 1633 case '"': ++dec->cur; return decode_str (dec);
1368 case '[': ++dec->cur; return decode_av (dec); 1634 case '[': ++dec->cur; return decode_av (dec);
1369 case '{': ++dec->cur; return decode_hv (dec); 1635 case '{': ++dec->cur; return decode_hv (dec);
1636 case '(': return decode_tag (dec);
1370 1637
1371 case '-': 1638 case '-':
1372 case '0': case '1': case '2': case '3': case '4': 1639 case '0': case '1': case '2': case '3': case '4':
1373 case '5': case '6': case '7': case '8': case '9': 1640 case '5': case '6': case '7': case '8': case '9':
1374 return decode_num (dec); 1641 return decode_num (dec);
1376 case 't': 1643 case 't':
1377 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1644 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1378 { 1645 {
1379 dec->cur += 4; 1646 dec->cur += 4;
1380#if JSON_SLOW 1647#if JSON_SLOW
1381 json_true = get_bool ("JSON::XS::true"); 1648 bool_true = get_bool ("Types::Serialiser::true");
1382#endif 1649#endif
1383 return newSVsv (json_true); 1650 return newSVsv (bool_true);
1384 } 1651 }
1385 else 1652 else
1386 ERR ("'true' expected"); 1653 ERR ("'true' expected");
1387 1654
1388 break; 1655 break;
1390 case 'f': 1657 case 'f':
1391 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1658 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1392 { 1659 {
1393 dec->cur += 5; 1660 dec->cur += 5;
1394#if JSON_SLOW 1661#if JSON_SLOW
1395 json_false = get_bool ("JSON::XS::false"); 1662 bool_false = get_bool ("Types::Serialiser::false");
1396#endif 1663#endif
1397 return newSVsv (json_false); 1664 return newSVsv (bool_false);
1398 } 1665 }
1399 else 1666 else
1400 ERR ("'false' expected"); 1667 ERR ("'false' expected");
1401 1668
1402 break; 1669 break;
1411 ERR ("'null' expected"); 1678 ERR ("'null' expected");
1412 1679
1413 break; 1680 break;
1414 1681
1415 default: 1682 default:
1416 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1683 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1417 break; 1684 break;
1418 } 1685 }
1419 1686
1420fail: 1687fail:
1421 return 0; 1688 return 0;
1426{ 1693{
1427 dec_t dec; 1694 dec_t dec;
1428 SV *sv; 1695 SV *sv;
1429 1696
1430 /* work around bugs in 5.10 where manipulating magic values 1697 /* work around bugs in 5.10 where manipulating magic values
1431 * 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.
1432 */ 1704 */
1433 /*SvGETMAGIC (string);*/ 1705 /*SvGETMAGIC (string);*/
1434 if (SvMAGICAL (string)) 1706 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1435 string = sv_2mortal (newSVsv (string)); 1707 string = sv_2mortal (newSVsv (string));
1436 1708
1437 SvUPGRADE (string, SVt_PV); 1709 SvUPGRADE (string, SVt_PV);
1438 1710
1439 /* 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
1456 if (offset > json->max_size && json->max_size) 1728 if (offset > json->max_size && json->max_size)
1457 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",
1458 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1730 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1459 } 1731 }
1460 1732
1461 if (json->flags & F_UTF8) 1733 if (DECODE_WANTS_OCTETS (json))
1462 sv_utf8_downgrade (string, 0); 1734 sv_utf8_downgrade (string, 0);
1463 else 1735 else
1464 sv_utf8_upgrade (string); 1736 sv_utf8_upgrade (string);
1465 1737
1466 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1738 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1508 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);
1509 LEAVE; 1781 LEAVE;
1510 1782
1511 croak ("%s, at character offset %d (before \"%s\")", 1783 croak ("%s, at character offset %d (before \"%s\")",
1512 dec.err, 1784 dec.err,
1513 ptr_to_index (string, dec.cur), 1785 (int)ptr_to_index (string, dec.cur),
1514 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1786 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1515 } 1787 }
1516 1788
1517 sv = sv_2mortal (sv); 1789 sv = sv_2mortal (sv);
1518 1790
1519 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1791 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1520 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)");
1521 1793
1522 return sv; 1794 return sv;
1523} 1795}
1524 1796
1646 self->incr_mode = INCR_M_STR; 1918 self->incr_mode = INCR_M_STR;
1647 goto incr_m_str; 1919 goto incr_m_str;
1648 1920
1649 case '[': 1921 case '[':
1650 case '{': 1922 case '{':
1923 case '(':
1651 if (++self->incr_nest > self->max_depth) 1924 if (++self->incr_nest > self->max_depth)
1652 croak (ERR_NESTING_EXCEEDED); 1925 croak (ERR_NESTING_EXCEEDED);
1653 break; 1926 break;
1654 1927
1655 case ']': 1928 case ']':
1656 case '}': 1929 case '}':
1657 if (--self->incr_nest <= 0) 1930 if (--self->incr_nest <= 0)
1658 goto interrupt; 1931 goto interrupt;
1932 break;
1933
1934 case ')':
1935 --self->incr_nest;
1659 break; 1936 break;
1660 1937
1661 case '#': 1938 case '#':
1662 self->incr_mode = INCR_M_C1; 1939 self->incr_mode = INCR_M_C1;
1663 goto incr_m_c; 1940 goto incr_m_c;
1689 i >= '0' && i <= '9' ? i - '0' 1966 i >= '0' && i <= '9' ? i - '0'
1690 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1967 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1691 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1968 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1692 : -1; 1969 : -1;
1693 1970
1694 json_stash = gv_stashpv ("JSON::XS" , 1); 1971 json_stash = gv_stashpv ("JSON::XS" , 1);
1695 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1972 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1696
1697 json_true = get_bool ("JSON::XS::true"); 1973 bool_true = get_bool ("Types::Serialiser::true");
1698 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);
1699 1978
1700 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 */
1701} 1980}
1702 1981
1703PROTOTYPES: DISABLE 1982PROTOTYPES: DISABLE
1704 1983
1705void CLONE (...) 1984void CLONE (...)
1706 CODE: 1985 CODE:
1707 json_stash = 0; 1986 json_stash = 0;
1708 json_boolean_stash = 0; 1987 bool_stash = 0;
1709 1988
1710void new (char *klass) 1989void new (char *klass)
1711 PPCODE: 1990 PPCODE:
1712{ 1991{
1713 SV *pv = NEWSV (0, sizeof (JSON)); 1992 SV *pv = NEWSV (0, sizeof (JSON));
1714 SvPOK_only (pv); 1993 SvPOK_only (pv);
1715 json_init ((JSON *)SvPVX (pv)); 1994 json_init ((JSON *)SvPVX (pv));
1716 XPUSHs (sv_2mortal (sv_bless ( 1995 XPUSHs (sv_2mortal (sv_bless (
1717 newRV_noinc (pv), 1996 newRV_noinc (pv),
1718 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1997 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1733 shrink = F_SHRINK 2012 shrink = F_SHRINK
1734 allow_blessed = F_ALLOW_BLESSED 2013 allow_blessed = F_ALLOW_BLESSED
1735 convert_blessed = F_CONV_BLESSED 2014 convert_blessed = F_CONV_BLESSED
1736 relaxed = F_RELAXED 2015 relaxed = F_RELAXED
1737 allow_unknown = F_ALLOW_UNKNOWN 2016 allow_unknown = F_ALLOW_UNKNOWN
2017 allow_tags = F_ALLOW_TAGS
1738 PPCODE: 2018 PPCODE:
1739{ 2019{
1740 if (enable) 2020 if (enable)
1741 self->flags |= ix; 2021 self->flags |= ix;
1742 else 2022 else
1758 get_shrink = F_SHRINK 2038 get_shrink = F_SHRINK
1759 get_allow_blessed = F_ALLOW_BLESSED 2039 get_allow_blessed = F_ALLOW_BLESSED
1760 get_convert_blessed = F_CONV_BLESSED 2040 get_convert_blessed = F_CONV_BLESSED
1761 get_relaxed = F_RELAXED 2041 get_relaxed = F_RELAXED
1762 get_allow_unknown = F_ALLOW_UNKNOWN 2042 get_allow_unknown = F_ALLOW_UNKNOWN
2043 get_allow_tags = F_ALLOW_TAGS
1763 PPCODE: 2044 PPCODE:
1764 XPUSHs (boolSV (self->flags & ix)); 2045 XPUSHs (boolSV (self->flags & ix));
1765 2046
1766void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2047void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1767 PPCODE: 2048 PPCODE:
1795} 2076}
1796 2077
1797void 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)
1798 PPCODE: 2079 PPCODE:
1799{ 2080{
1800 if (!self->cb_sk_object) 2081 if (!self->cb_sk_object)
1801 self->cb_sk_object = newHV (); 2082 self->cb_sk_object = newHV ();
1802 2083
1803 if (SvOK (cb)) 2084 if (SvOK (cb))
1804 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2085 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1805 else 2086 else
1816 XPUSHs (ST (0)); 2097 XPUSHs (ST (0));
1817} 2098}
1818 2099
1819void encode (JSON *self, SV *scalar) 2100void encode (JSON *self, SV *scalar)
1820 PPCODE: 2101 PPCODE:
1821 XPUSHs (encode_json (scalar, self)); 2102 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2103 XPUSHs (scalar);
1822 2104
1823void decode (JSON *self, SV *jsonstr) 2105void decode (JSON *self, SV *jsonstr)
1824 PPCODE: 2106 PPCODE:
1825 XPUSHs (decode_json (jsonstr, self, 0)); 2107 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2108 XPUSHs (jsonstr);
1826 2109
1827void decode_prefix (JSON *self, SV *jsonstr) 2110void decode_prefix (JSON *self, SV *jsonstr)
1828 PPCODE: 2111 PPCODE:
1829{ 2112{
2113 SV *sv;
1830 char *offset; 2114 char *offset;
2115 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1831 EXTEND (SP, 2); 2116 EXTEND (SP, 2);
1832 PUSHs (decode_json (jsonstr, self, &offset)); 2117 PUSHs (sv);
1833 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2118 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1834} 2119}
1835 2120
1836void incr_parse (JSON *self, SV *jsonstr = 0) 2121void incr_parse (JSON *self, SV *jsonstr = 0)
1837 PPCODE: 2122 PPCODE:
1838{ 2123{
1839 if (!self->incr_text) 2124 if (!self->incr_text)
1840 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 }
1841 2145
1842 // append data, if any 2146 // append data, if any
1843 if (jsonstr) 2147 if (jsonstr)
1844 { 2148 {
2149 /* make sure both strings have same encoding */
2150 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1845 if (SvUTF8 (jsonstr)) 2151 if (SvUTF8 (jsonstr))
2152 sv_utf8_downgrade (jsonstr, 0);
1846 { 2153 else
1847 if (!SvUTF8 (self->incr_text))
1848 {
1849 /* utf-8-ness differs, need to upgrade */
1850 sv_utf8_upgrade (self->incr_text);
1851
1852 if (self->incr_pos)
1853 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1854 - (U8 *)SvPVX (self->incr_text);
1855 }
1856 }
1857 else if (SvUTF8 (self->incr_text))
1858 sv_utf8_upgrade (jsonstr); 2154 sv_utf8_upgrade (jsonstr);
1859 2155
2156 /* and then just blindly append */
1860 { 2157 {
1861 STRLEN len; 2158 STRLEN len;
1862 const char *str = SvPV (jsonstr, len); 2159 const char *str = SvPV (jsonstr, len);
1863 STRLEN cur = SvCUR (self->incr_text); 2160 STRLEN cur = SvCUR (self->incr_text);
1864 2161
1872 } 2169 }
1873 2170
1874 if (GIMME_V != G_VOID) 2171 if (GIMME_V != G_VOID)
1875 do 2172 do
1876 { 2173 {
2174 SV *sv;
1877 char *offset; 2175 char *offset;
1878 2176
1879 if (!INCR_DONE (self)) 2177 if (!INCR_DONE (self))
1880 { 2178 {
1881 incr_parse (self); 2179 incr_parse (self);
1883 if (self->incr_pos > self->max_size && self->max_size) 2181 if (self->incr_pos > self->max_size && self->max_size)
1884 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",
1885 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2183 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1886 2184
1887 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
1888 break; 2194 break;
2195 }
1889 } 2196 }
1890 2197
1891 XPUSHs (decode_json (self->incr_text, self, &offset)); 2198 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2199 XPUSHs (sv);
1892 2200
1893 self->incr_pos -= offset - SvPVX (self->incr_text); 2201 self->incr_pos -= offset - SvPVX (self->incr_text);
1894 self->incr_nest = 0; 2202 self->incr_nest = 0;
1895 self->incr_mode = 0; 2203 self->incr_mode = 0;
1896 2204
1940 SvREFCNT_dec (self->incr_text); 2248 SvREFCNT_dec (self->incr_text);
1941 2249
1942PROTOTYPES: ENABLE 2250PROTOTYPES: ENABLE
1943 2251
1944void encode_json (SV *scalar) 2252void encode_json (SV *scalar)
1945 ALIAS:
1946 to_json_ = 0
1947 encode_json = F_UTF8
1948 PPCODE: 2253 PPCODE:
1949{ 2254{
1950 JSON json; 2255 JSON json;
1951 json_init (&json); 2256 json_init (&json);
1952 json.flags |= ix; 2257 json.flags |= F_UTF8;
1953 XPUSHs (encode_json (scalar, &json)); 2258 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2259 XPUSHs (scalar);
1954} 2260}
1955 2261
1956void decode_json (SV *jsonstr) 2262void decode_json (SV *jsonstr)
1957 ALIAS:
1958 from_json_ = 0
1959 decode_json = F_UTF8
1960 PPCODE: 2263 PPCODE:
1961{ 2264{
1962 JSON json; 2265 JSON json;
1963 json_init (&json); 2266 json_init (&json);
1964 json.flags |= ix; 2267 json.flags |= F_UTF8;
1965 XPUSHs (decode_json (jsonstr, &json, 0)); 2268 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2269 XPUSHs (jsonstr);
1966} 2270}
1967 2271
1968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines