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.125 by root, Sun Feb 21 15:37:53 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
70#else 84#else
71# define JSON_SLOW 0 85# define JSON_SLOW 0
72# define JSON_STASH json_stash 86# define JSON_STASH json_stash
73#endif 87#endif
74 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
75static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
76static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
77 94
78enum { 95enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
187 return SvUTF8 (sv) 204 return SvUTF8 (sv)
188 ? utf8_distance (offset, SvPVX (sv)) 205 ? utf8_distance (offset, SvPVX (sv))
189 : offset - SvPVX (sv); 206 : offset - SvPVX (sv);
190} 207}
191 208
209/////////////////////////////////////////////////////////////////////////////
210// fp hell
211
212// scan a group of digits, and a trailing exponent
213static void
214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
215{
216 UV uaccum = 0;
217 int eaccum = 0;
218
219 // if we recurse too deep, skip all remaining digits
220 // to avoid a stack overflow attack
221 if (expect_false (--maxdepth <= 0))
222 while (((U8)*s - '0') < 10)
223 ++s;
224
225 for (;;)
226 {
227 U8 dig = (U8)*s - '0';
228
229 if (expect_false (dig >= 10))
230 {
231 if (dig == (U8)((U8)'.' - (U8)'0'))
232 {
233 ++s;
234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
235 }
236 else if ((dig | ' ') == 'e' - '0')
237 {
238 int exp2 = 0;
239 int neg = 0;
240
241 ++s;
242
243 if (*s == '-')
244 {
245 ++s;
246 neg = 1;
247 }
248 else if (*s == '+')
249 ++s;
250
251 while ((dig = (U8)*s - '0') < 10)
252 exp2 = exp2 * 10 + *s++ - '0';
253
254 *expo += neg ? -exp2 : exp2;
255 }
256
257 break;
258 }
259
260 ++s;
261
262 uaccum = uaccum * 10 + dig;
263 ++eaccum;
264
265 // if we have too many digits, then recurse for more
266 // we actually do this for rather few digits
267 if (uaccum >= (UV_MAX - 9) / 10)
268 {
269 if (postdp) *expo -= eaccum;
270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
271 if (postdp) *expo += eaccum;
272
273 break;
274 }
275 }
276
277 // this relies greatly on the quality of the pow ()
278 // implementation of the platform, but a good
279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
281 if (postdp) *expo -= eaccum;
282 *accum += uaccum * Perl_pow (10., *expo);
283 *expo += eaccum;
284}
285
286static NV
287json_atof (const char *s)
288{
289 NV accum = 0.;
290 int expo = 0;
291 int neg = 0;
292
293 if (*s == '-')
294 {
295 ++s;
296 neg = 1;
297 }
298
299 // a recursion depth of ten gives us >>500 bits
300 json_atof_scan1 (s, &accum, &expo, 0, 10);
301
302 return neg ? -accum : accum;
303}
192///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
193// encoder 305// encoder
194 306
195// structure used for encoding JSON 307// structure used for encoding JSON
196typedef struct 308typedef struct
383 495
384 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
385 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
386 498
387 encode_ch (enc, '['); 499 encode_ch (enc, '[');
388 500
389 if (len >= 0) 501 if (len >= 0)
390 { 502 {
391 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
392 504
393 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
405 encode_comma (enc); 517 encode_comma (enc);
406 } 518 }
407 519
408 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
409 } 521 }
410 522
411 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
412} 524}
413 525
414static void 526static void
415encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
419 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
420 { 532 {
421 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
422 STRLEN len; 534 STRLEN len;
423 char *str; 535 char *str;
424 536
425 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
426 str = SvPV (sv, len); 538 str = SvPV (sv, len);
427 539
428 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
429 } 541 }
495 } 607 }
496 608
497 if (count) 609 if (count)
498 { 610 {
499 int i, fast = 1; 611 int i, fast = 1;
500#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
501 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
502#else 614
503 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
504#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
505 621
506 i = 0; 622 i = 0;
507 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
508 { 624 {
509 hes [i++] = he; 625 hes [i++] = he;
578// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
579static void 695static void
580encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
581{ 697{
582 svtype svt; 698 svtype svt;
699 GV *method;
583 700
584 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
585 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
586 703
587 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
588 { 705 {
589 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
590 ? json_boolean_stash 707 ? types_boolean_stash
591 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
592 710
593 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
594 { 712 {
595 if (SvIV (sv)) 713 if (SvIV (sv))
596 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
597 else 715 else
598 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
599 } 717 }
718 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
719 {
720 int count;
721 dSP;
722
723 ENTER; SAVETMPS;
724 SAVESTACK_POS ();
725 PUSHMARK (SP);
726 EXTEND (SP, 2);
727 // we re-bless the reference to get overload and other niceties right
728 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
729 PUSHs (sv_json);
730
731 PUTBACK;
732 count = call_sv ((SV *)GvCV (method), G_ARRAY);
733 SPAGAIN;
734
735 // catch this surprisingly common error
736 if (SvROK (TOPs) && SvRV (TOPs) == sv)
737 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
738
739 encode_ch (enc, '(');
740 encode_ch (enc, '"');
741 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
742 encode_ch (enc, '"');
743 encode_ch (enc, ')');
744 encode_ch (enc, '[');
745
746 while (count)
747 {
748 encode_sv (enc, SP[1 - count--]);
749
750 if (count)
751 encode_ch (enc, ',');
752 }
753
754 encode_ch (enc, ']');
755
756 FREETMPS; LEAVE;
757 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 {
760 dSP;
761
762 ENTER; SAVETMPS;
763 PUSHMARK (SP);
764 // we re-bless the reference to get overload and other niceties right
765 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
766
767 // calling with G_SCALAR ensures that we always get a 1 return value
768 PUTBACK;
769 call_sv ((SV *)GvCV (method), G_SCALAR);
770 SPAGAIN;
771
772 // catch this surprisingly common error
773 if (SvROK (TOPs) && SvRV (TOPs) == sv)
774 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
775
776 sv = POPs;
777 PUTBACK;
778
779 encode_sv (enc, sv);
780
781 FREETMPS; LEAVE;
782 }
783 else if (enc->json.flags & F_ALLOW_BLESSED)
784 encode_str (enc, "null", 4, 0);
600 else 785 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", 786 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)))); 787 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
647 }
648 } 788 }
649 else if (svt == SVt_PVHV) 789 else if (svt == SVt_PVHV)
650 encode_hv (enc, (HV *)sv); 790 encode_hv (enc, (HV *)sv);
651 else if (svt == SVt_PVAV) 791 else if (svt == SVt_PVAV)
652 encode_av (enc, (AV *)sv); 792 encode_av (enc, (AV *)sv);
728 } 868 }
729 else 869 else
730 { 870 {
731 // large integer, use the (rather slow) snprintf way. 871 // large integer, use the (rather slow) snprintf way.
732 need (enc, IVUV_MAXCHARS); 872 need (enc, IVUV_MAXCHARS);
733 enc->cur += 873 enc->cur +=
734 SvIsUV(sv) 874 SvIsUV(sv)
735 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 875 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
736 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 876 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
737 } 877 }
738 } 878 }
739 else if (SvROK (sv)) 879 else if (SvROK (sv))
740 encode_rv (enc, SvRV (sv)); 880 encode_rv (enc, SvRV (sv));
741 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 881 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
742 encode_str (enc, "null", 4, 0); 882 encode_str (enc, "null", 4, 0);
743 else 883 else
744 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 884 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
745 SvPV_nolen (sv), SvFLAGS (sv)); 885 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
886}
887
888static int
889json_scalar (SV *scalar)
890{
891 return 0;//D
892 if (!SvROK (scalar))
893 return 1;
746} 894}
747 895
748static SV * 896static SV *
749encode_json (SV *scalar, JSON *json) 897encode_json (SV *scalar, JSON *json)
750{ 898{
751 enc_t enc; 899 enc_t enc;
752 900
753 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 901 if (!(json->flags & F_ALLOW_NONREF) && json_scalar (scalar))
754 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 902 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
755 903
756 enc.json = *json; 904 enc.json = *json;
757 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 905 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
758 enc.cur = SvPVX (enc.sv); 906 enc.cur = SvPVX (enc.sv);
965 *cur++ = *dec_cur++; 1113 *cur++ = *dec_cur++;
966 while (--clen); 1114 while (--clen);
967 1115
968 utf8 = 1; 1116 utf8 = 1;
969 } 1117 }
1118 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1119 *cur++ = ch;
970 else 1120 else
971 { 1121 {
972 --dec_cur; 1122 --dec_cur;
973 1123
974 if (!ch) 1124 if (!ch)
1119 } 1269 }
1120 1270
1121 len -= *start == '-' ? 1 : 0; 1271 len -= *start == '-' ? 1 : 0;
1122 1272
1123 // does not fit into IV or UV, try NV 1273 // does not fit into IV or UV, try NV
1124 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1274 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 1275 // fits into NV without loss of precision
1130 return newSVnv (Atof (start)); 1276 return newSVnv (json_atof (start));
1131 1277
1132 // everything else fails, convert it to a string 1278 // everything else fails, convert it to a string
1133 return newSVpvn (start, dec->cur - start); 1279 return newSVpvn (start, dec->cur - start);
1134 } 1280 }
1135 1281
1136 // loss of precision here 1282 // loss of precision here
1137 return newSVnv (Atof (start)); 1283 return newSVnv (json_atof (start));
1138 1284
1139fail: 1285fail:
1140 return 0; 1286 return 0;
1141} 1287}
1142 1288
1166 if (*dec->cur == ']') 1312 if (*dec->cur == ']')
1167 { 1313 {
1168 ++dec->cur; 1314 ++dec->cur;
1169 break; 1315 break;
1170 } 1316 }
1171 1317
1172 if (*dec->cur != ',') 1318 if (*dec->cur != ',')
1173 ERR (", or ] expected while parsing array"); 1319 ERR (", or ] expected while parsing array");
1174 1320
1175 ++dec->cur; 1321 ++dec->cur;
1176 1322
1300 1446
1301 hv_iterinit (hv); 1447 hv_iterinit (hv);
1302 he = hv_iternext (hv); 1448 he = hv_iternext (hv);
1303 hv_iterinit (hv); 1449 hv_iterinit (hv);
1304 1450
1305 // the next line creates a mortal sv each time its called. 1451 // the next line creates a mortal sv each time it's called.
1306 // might want to optimise this for common cases. 1452 // might want to optimise this for common cases.
1307 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1453 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1308 1454
1309 if (cb) 1455 if (cb)
1310 { 1456 {
1311 dSP; 1457 dSP;
1312 int count; 1458 int count;
1313 1459
1314 ENTER; SAVETMPS; PUSHMARK (SP); 1460 ENTER; SAVETMPS;
1461 SAVESTACK_POS ();
1462 PUSHMARK (SP);
1315 XPUSHs (HeVAL (he)); 1463 XPUSHs (HeVAL (he));
1464 sv_2mortal (sv);
1316 1465
1317 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1466 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1318 1467
1319 if (count == 1) 1468 if (count == 1)
1320 { 1469 {
1321 sv = newSVsv (POPs); 1470 sv = newSVsv (POPs);
1322 FREETMPS; LEAVE; 1471 FREETMPS; LEAVE;
1323 return sv; 1472 return sv;
1324 } 1473 }
1325 1474
1475 SvREFCNT_inc (sv);
1326 FREETMPS; LEAVE; 1476 FREETMPS; LEAVE;
1327 } 1477 }
1328 } 1478 }
1329 1479
1330 if (dec->json.cb_object) 1480 if (dec->json.cb_object)
1331 { 1481 {
1332 dSP; 1482 dSP;
1333 int count; 1483 int count;
1334 1484
1335 ENTER; SAVETMPS; PUSHMARK (SP); 1485 ENTER; SAVETMPS;
1486 SAVESTACK_POS ();
1487 PUSHMARK (SP);
1336 XPUSHs (sv_2mortal (sv)); 1488 XPUSHs (sv_2mortal (sv));
1337 1489
1338 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1490 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1339 1491
1340 if (count == 1) 1492 if (count == 1)
1356 DEC_DEC_DEPTH; 1508 DEC_DEC_DEPTH;
1357 return 0; 1509 return 0;
1358} 1510}
1359 1511
1360static SV * 1512static SV *
1513decode_tag (dec_t *dec)
1514{
1515 SV *tag = 0;
1516 SV *val = 0;
1517
1518 if (!(dec->json.flags & F_ALLOW_TAGS))
1519 ERR ("malformed JSON string, neither array, object, number, string or atom");
1520
1521 ++dec->cur;
1522
1523 decode_ws (dec);
1524
1525 tag = decode_sv (dec);
1526 if (!tag)
1527 goto fail;
1528
1529 if (!SvPOK (tag))
1530 ERR ("malformed JSON string, (tag) must be a string");
1531
1532 decode_ws (dec);
1533
1534 if (*dec->cur != ')')
1535 ERR (") expected after tag");
1536
1537 ++dec->cur;
1538
1539 decode_ws (dec);
1540
1541 val = decode_sv (dec);
1542 if (!val)
1543 goto fail;
1544
1545 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1546 ERR ("malformed JSON string, tag value must be an array");
1547
1548 {
1549 AV *av = (AV *)SvRV (val);
1550 int i, len = av_len (av) + 1;
1551 HV *stash = gv_stashsv (tag, 0);
1552 SV *sv;
1553
1554 if (!stash)
1555 ERR ("cannot decode perl-object (package does not exist)");
1556
1557 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1558
1559 if (!method)
1560 ERR ("cannot decode perl-object (package does not have a THAW method)");
1561
1562 dSP;
1563
1564 ENTER; SAVETMPS;
1565 PUSHMARK (SP);
1566 EXTEND (SP, len + 2);
1567 // we re-bless the reference to get overload and other niceties right
1568 PUSHs (tag);
1569 PUSHs (sv_json);
1570
1571 for (i = 0; i < len; ++i)
1572 PUSHs (*av_fetch (av, i, 1));
1573
1574 PUTBACK;
1575 call_sv ((SV *)GvCV (method), G_SCALAR);
1576 SPAGAIN;
1577
1578 SvREFCNT_dec (tag);
1579 SvREFCNT_dec (val);
1580 sv = SvREFCNT_inc (POPs);
1581
1582 PUTBACK;
1583
1584 FREETMPS; LEAVE;
1585
1586 return sv;
1587 }
1588
1589fail:
1590 SvREFCNT_dec (tag);
1591 SvREFCNT_dec (val);
1592 return 0;
1593}
1594
1595static SV *
1361decode_sv (dec_t *dec) 1596decode_sv (dec_t *dec)
1362{ 1597{
1363 // the beauty of JSON: you need exactly one character lookahead 1598 // the beauty of JSON: you need exactly one character lookahead
1364 // to parse everything. 1599 // to parse everything.
1365 switch (*dec->cur) 1600 switch (*dec->cur)
1366 { 1601 {
1367 case '"': ++dec->cur; return decode_str (dec); 1602 case '"': ++dec->cur; return decode_str (dec);
1368 case '[': ++dec->cur; return decode_av (dec); 1603 case '[': ++dec->cur; return decode_av (dec);
1369 case '{': ++dec->cur; return decode_hv (dec); 1604 case '{': ++dec->cur; return decode_hv (dec);
1605 case '(': return decode_tag (dec);
1370 1606
1371 case '-': 1607 case '-':
1372 case '0': case '1': case '2': case '3': case '4': 1608 case '0': case '1': case '2': case '3': case '4':
1373 case '5': case '6': case '7': case '8': case '9': 1609 case '5': case '6': case '7': case '8': case '9':
1374 return decode_num (dec); 1610 return decode_num (dec);
1376 case 't': 1612 case 't':
1377 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1613 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1378 { 1614 {
1379 dec->cur += 4; 1615 dec->cur += 4;
1380#if JSON_SLOW 1616#if JSON_SLOW
1381 json_true = get_bool ("JSON::XS::true"); 1617 types_true = get_bool ("Types::Serialiser::true");
1382#endif 1618#endif
1383 return newSVsv (json_true); 1619 return newSVsv (types_true);
1384 } 1620 }
1385 else 1621 else
1386 ERR ("'true' expected"); 1622 ERR ("'true' expected");
1387 1623
1388 break; 1624 break;
1390 case 'f': 1626 case 'f':
1391 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1627 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1392 { 1628 {
1393 dec->cur += 5; 1629 dec->cur += 5;
1394#if JSON_SLOW 1630#if JSON_SLOW
1395 json_false = get_bool ("JSON::XS::false"); 1631 types_false = get_bool ("Types::Serialiser::false");
1396#endif 1632#endif
1397 return newSVsv (json_false); 1633 return newSVsv (types_false);
1398 } 1634 }
1399 else 1635 else
1400 ERR ("'false' expected"); 1636 ERR ("'false' expected");
1401 1637
1402 break; 1638 break;
1411 ERR ("'null' expected"); 1647 ERR ("'null' expected");
1412 1648
1413 break; 1649 break;
1414 1650
1415 default: 1651 default:
1416 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1652 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1417 break; 1653 break;
1418 } 1654 }
1419 1655
1420fail: 1656fail:
1421 return 0; 1657 return 0;
1426{ 1662{
1427 dec_t dec; 1663 dec_t dec;
1428 SV *sv; 1664 SV *sv;
1429 1665
1430 /* work around bugs in 5.10 where manipulating magic values 1666 /* work around bugs in 5.10 where manipulating magic values
1431 * will perl ignore the magic in subsequent accesses 1667 * makes perl ignore the magic in subsequent accesses.
1668 * also make a copy of non-PV values, to get them into a clean
1669 * state (SvPV should do that, but it's buggy, see below).
1432 */ 1670 */
1433 /*SvGETMAGIC (string);*/ 1671 /*SvGETMAGIC (string);*/
1434 if (SvMAGICAL (string)) 1672 if (SvMAGICAL (string) || !SvPOK (string))
1435 string = sv_2mortal (newSVsv (string)); 1673 string = sv_2mortal (newSVsv (string));
1436 1674
1437 SvUPGRADE (string, SVt_PV); 1675 SvUPGRADE (string, SVt_PV);
1438 1676
1439 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1677 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1456 if (offset > json->max_size && json->max_size) 1694 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", 1695 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); 1696 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1459 } 1697 }
1460 1698
1461 if (json->flags & F_UTF8) 1699 if (DECODE_WANTS_OCTETS (json))
1462 sv_utf8_downgrade (string, 0); 1700 sv_utf8_downgrade (string, 0);
1463 else 1701 else
1464 sv_utf8_upgrade (string); 1702 sv_utf8_upgrade (string);
1465 1703
1466 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1704 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); 1746 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1509 LEAVE; 1747 LEAVE;
1510 1748
1511 croak ("%s, at character offset %d (before \"%s\")", 1749 croak ("%s, at character offset %d (before \"%s\")",
1512 dec.err, 1750 dec.err,
1513 ptr_to_index (string, dec.cur), 1751 (int)ptr_to_index (string, dec.cur),
1514 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1752 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1515 } 1753 }
1516 1754
1517 sv = sv_2mortal (sv); 1755 sv = sv_2mortal (sv);
1518 1756
1646 self->incr_mode = INCR_M_STR; 1884 self->incr_mode = INCR_M_STR;
1647 goto incr_m_str; 1885 goto incr_m_str;
1648 1886
1649 case '[': 1887 case '[':
1650 case '{': 1888 case '{':
1889 case '(':
1651 if (++self->incr_nest > self->max_depth) 1890 if (++self->incr_nest > self->max_depth)
1652 croak (ERR_NESTING_EXCEEDED); 1891 croak (ERR_NESTING_EXCEEDED);
1653 break; 1892 break;
1654 1893
1655 case ']': 1894 case ']':
1656 case '}': 1895 case '}':
1657 if (--self->incr_nest <= 0) 1896 if (--self->incr_nest <= 0)
1658 goto interrupt; 1897 goto interrupt;
1898 break;
1899
1900 case ')':
1901 --self->incr_nest;
1659 break; 1902 break;
1660 1903
1661 case '#': 1904 case '#':
1662 self->incr_mode = INCR_M_C1; 1905 self->incr_mode = INCR_M_C1;
1663 goto incr_m_c; 1906 goto incr_m_c;
1689 i >= '0' && i <= '9' ? i - '0' 1932 i >= '0' && i <= '9' ? i - '0'
1690 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1933 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1691 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1934 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1692 : -1; 1935 : -1;
1693 1936
1694 json_stash = gv_stashpv ("JSON::XS" , 1); 1937 json_stash = gv_stashpv ("JSON::XS" , 1);
1695 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1938 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1696 1939
1697 json_true = get_bool ("JSON::XS::true"); 1940 types_true = get_bool ("Types::Serialiser::true");
1698 json_false = get_bool ("JSON::XS::false"); 1941 types_false = get_bool ("Types::Serialiser::false");
1942
1943 sv_json = newSVpv ("JSON", 0);
1944 SvREADONLY_on (sv_json);
1699 1945
1700 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1946 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1701} 1947}
1702 1948
1703PROTOTYPES: DISABLE 1949PROTOTYPES: DISABLE
1704 1950
1705void CLONE (...) 1951void CLONE (...)
1706 CODE: 1952 CODE:
1707 json_stash = 0; 1953 json_stash = 0;
1708 json_boolean_stash = 0; 1954 types_boolean_stash = 0;
1709 1955
1710void new (char *klass) 1956void new (char *klass)
1711 PPCODE: 1957 PPCODE:
1712{ 1958{
1713 SV *pv = NEWSV (0, sizeof (JSON)); 1959 SV *pv = NEWSV (0, sizeof (JSON));
1714 SvPOK_only (pv); 1960 SvPOK_only (pv);
1715 json_init ((JSON *)SvPVX (pv)); 1961 json_init ((JSON *)SvPVX (pv));
1716 XPUSHs (sv_2mortal (sv_bless ( 1962 XPUSHs (sv_2mortal (sv_bless (
1717 newRV_noinc (pv), 1963 newRV_noinc (pv),
1718 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1964 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1733 shrink = F_SHRINK 1979 shrink = F_SHRINK
1734 allow_blessed = F_ALLOW_BLESSED 1980 allow_blessed = F_ALLOW_BLESSED
1735 convert_blessed = F_CONV_BLESSED 1981 convert_blessed = F_CONV_BLESSED
1736 relaxed = F_RELAXED 1982 relaxed = F_RELAXED
1737 allow_unknown = F_ALLOW_UNKNOWN 1983 allow_unknown = F_ALLOW_UNKNOWN
1984 allow_tags = F_ALLOW_TAGS
1738 PPCODE: 1985 PPCODE:
1739{ 1986{
1740 if (enable) 1987 if (enable)
1741 self->flags |= ix; 1988 self->flags |= ix;
1742 else 1989 else
1758 get_shrink = F_SHRINK 2005 get_shrink = F_SHRINK
1759 get_allow_blessed = F_ALLOW_BLESSED 2006 get_allow_blessed = F_ALLOW_BLESSED
1760 get_convert_blessed = F_CONV_BLESSED 2007 get_convert_blessed = F_CONV_BLESSED
1761 get_relaxed = F_RELAXED 2008 get_relaxed = F_RELAXED
1762 get_allow_unknown = F_ALLOW_UNKNOWN 2009 get_allow_unknown = F_ALLOW_UNKNOWN
2010 get_allow_tags = F_ALLOW_TAGS
1763 PPCODE: 2011 PPCODE:
1764 XPUSHs (boolSV (self->flags & ix)); 2012 XPUSHs (boolSV (self->flags & ix));
1765 2013
1766void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2014void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1767 PPCODE: 2015 PPCODE:
1795} 2043}
1796 2044
1797void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2045void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1798 PPCODE: 2046 PPCODE:
1799{ 2047{
1800 if (!self->cb_sk_object) 2048 if (!self->cb_sk_object)
1801 self->cb_sk_object = newHV (); 2049 self->cb_sk_object = newHV ();
1802 2050
1803 if (SvOK (cb)) 2051 if (SvOK (cb))
1804 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2052 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1805 else 2053 else
1816 XPUSHs (ST (0)); 2064 XPUSHs (ST (0));
1817} 2065}
1818 2066
1819void encode (JSON *self, SV *scalar) 2067void encode (JSON *self, SV *scalar)
1820 PPCODE: 2068 PPCODE:
1821 XPUSHs (encode_json (scalar, self)); 2069 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2070 XPUSHs (scalar);
1822 2071
1823void decode (JSON *self, SV *jsonstr) 2072void decode (JSON *self, SV *jsonstr)
1824 PPCODE: 2073 PPCODE:
1825 XPUSHs (decode_json (jsonstr, self, 0)); 2074 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2075 XPUSHs (jsonstr);
1826 2076
1827void decode_prefix (JSON *self, SV *jsonstr) 2077void decode_prefix (JSON *self, SV *jsonstr)
1828 PPCODE: 2078 PPCODE:
1829{ 2079{
2080 SV *sv;
1830 char *offset; 2081 char *offset;
2082 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1831 EXTEND (SP, 2); 2083 EXTEND (SP, 2);
1832 PUSHs (decode_json (jsonstr, self, &offset)); 2084 PUSHs (sv);
1833 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2085 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1834} 2086}
1835 2087
1836void incr_parse (JSON *self, SV *jsonstr = 0) 2088void incr_parse (JSON *self, SV *jsonstr = 0)
1837 PPCODE: 2089 PPCODE:
1838{ 2090{
1839 if (!self->incr_text) 2091 if (!self->incr_text)
1840 self->incr_text = newSVpvn ("", 0); 2092 self->incr_text = newSVpvn ("", 0);
2093
2094 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2095 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2096 if (DECODE_WANTS_OCTETS (self))
2097 {
2098 if (self->incr_pos)
2099 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2100 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2101
2102 sv_utf8_downgrade (self->incr_text, 0);
2103 }
2104 else
2105 {
2106 sv_utf8_upgrade (self->incr_text);
2107
2108 if (self->incr_pos)
2109 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2110 - (U8 *)SvPVX (self->incr_text);
2111 }
1841 2112
1842 // append data, if any 2113 // append data, if any
1843 if (jsonstr) 2114 if (jsonstr)
1844 { 2115 {
2116 /* make sure both strings have same encoding */
2117 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1845 if (SvUTF8 (jsonstr)) 2118 if (SvUTF8 (jsonstr))
2119 sv_utf8_downgrade (jsonstr, 0);
1846 { 2120 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); 2121 sv_utf8_upgrade (jsonstr);
1859 2122
2123 /* and then just blindly append */
1860 { 2124 {
1861 STRLEN len; 2125 STRLEN len;
1862 const char *str = SvPV (jsonstr, len); 2126 const char *str = SvPV (jsonstr, len);
1863 STRLEN cur = SvCUR (self->incr_text); 2127 STRLEN cur = SvCUR (self->incr_text);
1864 2128
1872 } 2136 }
1873 2137
1874 if (GIMME_V != G_VOID) 2138 if (GIMME_V != G_VOID)
1875 do 2139 do
1876 { 2140 {
2141 SV *sv;
1877 char *offset; 2142 char *offset;
1878 2143
1879 if (!INCR_DONE (self)) 2144 if (!INCR_DONE (self))
1880 { 2145 {
1881 incr_parse (self); 2146 incr_parse (self);
1883 if (self->incr_pos > self->max_size && self->max_size) 2148 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", 2149 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); 2150 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1886 2151
1887 if (!INCR_DONE (self)) 2152 if (!INCR_DONE (self))
2153 {
2154 // as an optimisation, do not accumulate white space in the incr buffer
2155 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2156 {
2157 self->incr_pos = 0;
2158 SvCUR_set (self->incr_text, 0);
2159 }
2160
1888 break; 2161 break;
2162 }
1889 } 2163 }
1890 2164
1891 XPUSHs (decode_json (self->incr_text, self, &offset)); 2165 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2166 XPUSHs (sv);
1892 2167
1893 self->incr_pos -= offset - SvPVX (self->incr_text); 2168 self->incr_pos -= offset - SvPVX (self->incr_text);
1894 self->incr_nest = 0; 2169 self->incr_nest = 0;
1895 self->incr_mode = 0; 2170 self->incr_mode = 0;
1896 2171
1940 SvREFCNT_dec (self->incr_text); 2215 SvREFCNT_dec (self->incr_text);
1941 2216
1942PROTOTYPES: ENABLE 2217PROTOTYPES: ENABLE
1943 2218
1944void encode_json (SV *scalar) 2219void encode_json (SV *scalar)
1945 ALIAS:
1946 to_json_ = 0
1947 encode_json = F_UTF8
1948 PPCODE: 2220 PPCODE:
1949{ 2221{
1950 JSON json; 2222 JSON json;
1951 json_init (&json); 2223 json_init (&json);
1952 json.flags |= ix; 2224 json.flags |= F_UTF8;
1953 XPUSHs (encode_json (scalar, &json)); 2225 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2226 XPUSHs (scalar);
1954} 2227}
1955 2228
1956void decode_json (SV *jsonstr) 2229void decode_json (SV *jsonstr)
1957 ALIAS:
1958 from_json_ = 0
1959 decode_json = F_UTF8
1960 PPCODE: 2230 PPCODE:
1961{ 2231{
1962 JSON json; 2232 JSON json;
1963 json_init (&json); 2233 json_init (&json);
1964 json.flags |= ix; 2234 json.flags |= F_UTF8;
1965 XPUSHs (decode_json (jsonstr, &json, 0)); 2235 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2236 XPUSHs (jsonstr);
1966} 2237}
1967 2238
1968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines