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.124 by root, Mon Nov 24 18:42:51 2014 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
… …
192///////////////////////////////////////////////////////////////////////////// 209/////////////////////////////////////////////////////////////////////////////
193// fp hell 210// fp hell
194 211
195// scan a group of digits, and a trailing exponent 212// scan a group of digits, and a trailing exponent
196static void 213static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp) 214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{ 215{
199 UV uaccum = 0; 216 UV uaccum = 0;
200 int eaccum = 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;
201 224
202 for (;;) 225 for (;;)
203 { 226 {
204 U8 dig = (U8)*s - '0'; 227 U8 dig = (U8)*s - '0';
205 228
206 if (expect_false (dig >= 10)) 229 if (expect_false (dig >= 10))
207 { 230 {
208 if (dig == (U8)((U8)'.' - (U8)'0')) 231 if (dig == (U8)((U8)'.' - (U8)'0'))
209 { 232 {
210 ++s; 233 ++s;
211 json_atof_scan1 (s, accum, expo, 1); 234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
212 } 235 }
213 else if ((dig | ' ') == 'e' - '0') 236 else if ((dig | ' ') == 'e' - '0')
214 { 237 {
215 int exp2 = 0; 238 int exp2 = 0;
216 int neg = 0; 239 int neg = 0;
… …
242 // if we have too many digits, then recurse for more 265 // if we have too many digits, then recurse for more
243 // we actually do this for rather few digits 266 // we actually do this for rather few digits
244 if (uaccum >= (UV_MAX - 9) / 10) 267 if (uaccum >= (UV_MAX - 9) / 10)
245 { 268 {
246 if (postdp) *expo -= eaccum; 269 if (postdp) *expo -= eaccum;
247 json_atof_scan1 (s, accum, expo, postdp); 270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
248 if (postdp) *expo += eaccum; 271 if (postdp) *expo += eaccum;
249 272
250 break; 273 break;
251 } 274 }
252 } 275 }
253 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)
254 if (postdp) *expo -= eaccum; 281 if (postdp) *expo -= eaccum;
255 *accum += uaccum * pow (10., *expo); 282 *accum += uaccum * Perl_pow (10., *expo);
256 *expo += eaccum; 283 *expo += eaccum;
257} 284}
258 285
259static NV 286static NV
260json_atof (const char *s) 287json_atof (const char *s)
… …
267 { 294 {
268 ++s; 295 ++s;
269 neg = 1; 296 neg = 1;
270 } 297 }
271 298
299 // a recursion depth of ten gives us >>500 bits
272 json_atof_scan1 (s, &accum, &expo, 0); 300 json_atof_scan1 (s, &accum, &expo, 0, 10);
273 301
274 return neg ? -accum : accum; 302 return neg ? -accum : accum;
275} 303}
276///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
277// encoder 305// encoder
… …
467 495
468 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
469 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
470 498
471 encode_ch (enc, '['); 499 encode_ch (enc, '[');
472 500
473 if (len >= 0) 501 if (len >= 0)
474 { 502 {
475 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
476 504
477 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
489 encode_comma (enc); 517 encode_comma (enc);
490 } 518 }
491 519
492 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
493 } 521 }
494 522
495 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
496} 524}
497 525
498static void 526static void
499encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
503 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
504 { 532 {
505 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
506 STRLEN len; 534 STRLEN len;
507 char *str; 535 char *str;
508 536
509 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
510 str = SvPV (sv, len); 538 str = SvPV (sv, len);
511 539
512 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
513 } 541 }
… …
579 } 607 }
580 608
581 if (count) 609 if (count)
582 { 610 {
583 int i, fast = 1; 611 int i, fast = 1;
584#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
585 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
586#else 614
587 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
588#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
589 621
590 i = 0; 622 i = 0;
591 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
592 { 624 {
593 hes [i++] = he; 625 hes [i++] = he;
… …
662// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
663static void 695static void
664encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
665{ 697{
666 svtype svt; 698 svtype svt;
699 GV *method;
667 700
668 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
669 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
670 703
671 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
672 { 705 {
673 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
674 ? json_boolean_stash 707 ? types_boolean_stash
675 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
676 710
677 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
678 { 712 {
679 if (SvIV (sv)) 713 if (SvIV (sv))
680 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
681 else 715 else
682 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
683 } 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; PUSHMARK (SP);
724 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json);
728
729 PUTBACK;
730 count = call_sv ((SV *)GvCV (method), G_ARRAY);
731 SPAGAIN;
732
733 // catch this surprisingly common error
734 if (SvROK (TOPs) && SvRV (TOPs) == sv)
735 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
736
737 encode_ch (enc, '(');
738 encode_ch (enc, '"');
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"');
741 encode_ch (enc, ')');
742 encode_ch (enc, '[');
743
744 while (count)
745 {
746 encode_sv (enc, SP[1 - count--]);
747
748 if (count)
749 encode_ch (enc, ',');
750 }
751
752 encode_ch (enc, ']');
753
754 PUTBACK;
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; PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765
766 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK;
768 call_sv ((SV *)GvCV (method), G_SCALAR);
769 SPAGAIN;
770
771 // catch this surprisingly common error
772 if (SvROK (TOPs) && SvRV (TOPs) == sv)
773 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
774
775 sv = POPs;
776 PUTBACK;
777
778 encode_sv (enc, sv);
779
780 FREETMPS; LEAVE;
781 }
782 else if (enc->json.flags & F_ALLOW_BLESSED)
783 encode_str (enc, "null", 4, 0);
684 else 784 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", 785 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)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
731 }
732 } 787 }
733 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
734 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
735 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
736 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
812 } 867 }
813 else 868 else
814 { 869 {
815 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
816 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
817 enc->cur += 872 enc->cur +=
818 SvIsUV(sv) 873 SvIsUV(sv)
819 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
820 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
821 } 876 }
822 } 877 }
823 else if (SvROK (sv)) 878 else if (SvROK (sv))
824 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
825 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
826 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
827 else 882 else
828 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 883 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
829 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
830} 885}
831 886
832static SV * 887static SV *
833encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
834{ 889{
… …
1049 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
1050 while (--clen); 1105 while (--clen);
1051 1106
1052 utf8 = 1; 1107 utf8 = 1;
1053 } 1108 }
1109 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1110 *cur++ = ch;
1054 else 1111 else
1055 { 1112 {
1056 --dec_cur; 1113 --dec_cur;
1057 1114
1058 if (!ch) 1115 if (!ch)
… …
1246 if (*dec->cur == ']') 1303 if (*dec->cur == ']')
1247 { 1304 {
1248 ++dec->cur; 1305 ++dec->cur;
1249 break; 1306 break;
1250 } 1307 }
1251 1308
1252 if (*dec->cur != ',') 1309 if (*dec->cur != ',')
1253 ERR (", or ] expected while parsing array"); 1310 ERR (", or ] expected while parsing array");
1254 1311
1255 ++dec->cur; 1312 ++dec->cur;
1256 1313
… …
1391 dSP; 1448 dSP;
1392 int count; 1449 int count;
1393 1450
1394 ENTER; SAVETMPS; PUSHMARK (SP); 1451 ENTER; SAVETMPS; PUSHMARK (SP);
1395 XPUSHs (HeVAL (he)); 1452 XPUSHs (HeVAL (he));
1453 sv_2mortal (sv);
1396 1454
1397 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1455 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1398 1456
1399 if (count == 1) 1457 if (count == 1)
1400 { 1458 {
1401 sv = newSVsv (POPs); 1459 sv = newSVsv (POPs);
1402 FREETMPS; LEAVE; 1460 FREETMPS; LEAVE;
1403 return sv; 1461 return sv;
1404 } 1462 }
1405 1463
1464 SvREFCNT_inc (sv);
1406 FREETMPS; LEAVE; 1465 FREETMPS; LEAVE;
1407 } 1466 }
1408 } 1467 }
1409 1468
1410 if (dec->json.cb_object) 1469 if (dec->json.cb_object)
… …
1436 DEC_DEC_DEPTH; 1495 DEC_DEC_DEPTH;
1437 return 0; 1496 return 0;
1438} 1497}
1439 1498
1440static SV * 1499static SV *
1500decode_tag (dec_t *dec)
1501{
1502 SV *tag = 0;
1503 SV *val = 0;
1504
1505 if (!(dec->json.flags & F_ALLOW_TAGS))
1506 ERR ("malformed JSON string, neither array, object, number, string or atom");
1507
1508 ++dec->cur;
1509
1510 decode_ws (dec);
1511
1512 tag = decode_sv (dec);
1513 if (!tag)
1514 goto fail;
1515
1516 if (!SvPOK (tag))
1517 ERR ("malformed JSON string, (tag) must be a string");
1518
1519 decode_ws (dec);
1520
1521 if (*dec->cur != ')')
1522 ERR (") expected after tag");
1523
1524 ++dec->cur;
1525
1526 decode_ws (dec);
1527
1528 val = decode_sv (dec);
1529 if (!val)
1530 goto fail;
1531
1532 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1533 ERR ("malformed JSON string, tag value must be an array");
1534
1535 {
1536 AV *av = (AV *)SvRV (val);
1537 int i, len = av_len (av) + 1;
1538 HV *stash = gv_stashsv (tag, 0);
1539 SV *sv;
1540
1541 if (!stash)
1542 ERR ("cannot decode perl-object (package does not exist)");
1543
1544 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1545
1546 if (!method)
1547 ERR ("cannot decode perl-object (package does not have a THAW method)");
1548
1549 dSP;
1550
1551 ENTER; SAVETMPS; PUSHMARK (SP);
1552 EXTEND (SP, len + 2);
1553 // we re-bless the reference to get overload and other niceties right
1554 PUSHs (tag);
1555 PUSHs (sv_json);
1556
1557 for (i = 0; i < len; ++i)
1558 PUSHs (*av_fetch (av, i, 1));
1559
1560 PUTBACK;
1561 call_sv ((SV *)GvCV (method), G_SCALAR);
1562 SPAGAIN;
1563
1564 SvREFCNT_dec (tag);
1565 SvREFCNT_dec (val);
1566 sv = SvREFCNT_inc (POPs);
1567
1568 PUTBACK;
1569
1570 FREETMPS; LEAVE;
1571
1572 return sv;
1573 }
1574
1575fail:
1576 SvREFCNT_dec (tag);
1577 SvREFCNT_dec (val);
1578 return 0;
1579}
1580
1581static SV *
1441decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1442{ 1583{
1443 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1444 // to parse everything. 1585 // to parse everything.
1445 switch (*dec->cur) 1586 switch (*dec->cur)
1446 { 1587 {
1447 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1448 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1449 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1450 1592
1451 case '-': 1593 case '-':
1452 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1453 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1454 return decode_num (dec); 1596 return decode_num (dec);
… …
1456 case 't': 1598 case 't':
1457 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1458 { 1600 {
1459 dec->cur += 4; 1601 dec->cur += 4;
1460#if JSON_SLOW 1602#if JSON_SLOW
1461 json_true = get_bool ("JSON::XS::true"); 1603 types_true = get_bool ("Types::Serialiser::true");
1462#endif 1604#endif
1463 return newSVsv (json_true); 1605 return newSVsv (types_true);
1464 } 1606 }
1465 else 1607 else
1466 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1467 1609
1468 break; 1610 break;
… …
1470 case 'f': 1612 case 'f':
1471 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1472 { 1614 {
1473 dec->cur += 5; 1615 dec->cur += 5;
1474#if JSON_SLOW 1616#if JSON_SLOW
1475 json_false = get_bool ("JSON::XS::false"); 1617 types_false = get_bool ("Types::Serialiser::false");
1476#endif 1618#endif
1477 return newSVsv (json_false); 1619 return newSVsv (types_false);
1478 } 1620 }
1479 else 1621 else
1480 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1481 1623
1482 break; 1624 break;
… …
1491 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1492 1634
1493 break; 1635 break;
1494 1636
1495 default: 1637 default:
1496 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1497 break; 1639 break;
1498 } 1640 }
1499 1641
1500fail: 1642fail:
1501 return 0; 1643 return 0;
… …
1506{ 1648{
1507 dec_t dec; 1649 dec_t dec;
1508 SV *sv; 1650 SV *sv;
1509 1651
1510 /* work around bugs in 5.10 where manipulating magic values 1652 /* work around bugs in 5.10 where manipulating magic values
1511 * will perl ignore the magic in subsequent accesses 1653 * makes perl ignore the magic in subsequent accesses.
1654 * also make a copy of non-PV values, to get them into a clean
1655 * state (SvPV should do that, but it's buggy, see below).
1512 */ 1656 */
1513 /*SvGETMAGIC (string);*/ 1657 /*SvGETMAGIC (string);*/
1514 if (SvMAGICAL (string)) 1658 if (SvMAGICAL (string) || !SvPOK (string))
1515 string = sv_2mortal (newSVsv (string)); 1659 string = sv_2mortal (newSVsv (string));
1516 1660
1517 SvUPGRADE (string, SVt_PV); 1661 SvUPGRADE (string, SVt_PV);
1518 1662
1519 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1663 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1536 if (offset > json->max_size && json->max_size) 1680 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", 1681 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); 1682 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1539 } 1683 }
1540 1684
1541 if (json->flags & F_UTF8) 1685 if (DECODE_WANTS_OCTETS (json))
1542 sv_utf8_downgrade (string, 0); 1686 sv_utf8_downgrade (string, 0);
1543 else 1687 else
1544 sv_utf8_upgrade (string); 1688 sv_utf8_upgrade (string);
1545 1689
1546 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1690 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); 1732 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1589 LEAVE; 1733 LEAVE;
1590 1734
1591 croak ("%s, at character offset %d (before \"%s\")", 1735 croak ("%s, at character offset %d (before \"%s\")",
1592 dec.err, 1736 dec.err,
1593 ptr_to_index (string, dec.cur), 1737 (int)ptr_to_index (string, dec.cur),
1594 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1595 } 1739 }
1596 1740
1597 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1598 1742
… …
1726 self->incr_mode = INCR_M_STR; 1870 self->incr_mode = INCR_M_STR;
1727 goto incr_m_str; 1871 goto incr_m_str;
1728 1872
1729 case '[': 1873 case '[':
1730 case '{': 1874 case '{':
1875 case '(':
1731 if (++self->incr_nest > self->max_depth) 1876 if (++self->incr_nest > self->max_depth)
1732 croak (ERR_NESTING_EXCEEDED); 1877 croak (ERR_NESTING_EXCEEDED);
1733 break; 1878 break;
1734 1879
1735 case ']': 1880 case ']':
1736 case '}': 1881 case '}':
1737 if (--self->incr_nest <= 0) 1882 if (--self->incr_nest <= 0)
1738 goto interrupt; 1883 goto interrupt;
1884 break;
1885
1886 case ')':
1887 --self->incr_nest;
1739 break; 1888 break;
1740 1889
1741 case '#': 1890 case '#':
1742 self->incr_mode = INCR_M_C1; 1891 self->incr_mode = INCR_M_C1;
1743 goto incr_m_c; 1892 goto incr_m_c;
… …
1769 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1770 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1771 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1772 : -1; 1921 : -1;
1773 1922
1774 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1775 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1776 1925
1777 json_true = get_bool ("JSON::XS::true"); 1926 types_true = get_bool ("Types::Serialiser::true");
1778 json_false = get_bool ("JSON::XS::false"); 1927 types_false = get_bool ("Types::Serialiser::false");
1928
1929 sv_json = newSVpv ("JSON", 0);
1930 SvREADONLY_on (sv_json);
1779 1931
1780 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1932 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1781} 1933}
1782 1934
1783PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1784 1936
1785void CLONE (...) 1937void CLONE (...)
1786 CODE: 1938 CODE:
1787 json_stash = 0; 1939 json_stash = 0;
1788 json_boolean_stash = 0; 1940 types_boolean_stash = 0;
1789 1941
1790void new (char *klass) 1942void new (char *klass)
1791 PPCODE: 1943 PPCODE:
1792{ 1944{
1793 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1794 SvPOK_only (pv); 1946 SvPOK_only (pv);
1795 json_init ((JSON *)SvPVX (pv)); 1947 json_init ((JSON *)SvPVX (pv));
1796 XPUSHs (sv_2mortal (sv_bless ( 1948 XPUSHs (sv_2mortal (sv_bless (
1797 newRV_noinc (pv), 1949 newRV_noinc (pv),
1798 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1813 shrink = F_SHRINK 1965 shrink = F_SHRINK
1814 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1815 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1816 relaxed = F_RELAXED 1968 relaxed = F_RELAXED
1817 allow_unknown = F_ALLOW_UNKNOWN 1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1818 PPCODE: 1971 PPCODE:
1819{ 1972{
1820 if (enable) 1973 if (enable)
1821 self->flags |= ix; 1974 self->flags |= ix;
1822 else 1975 else
… …
1838 get_shrink = F_SHRINK 1991 get_shrink = F_SHRINK
1839 get_allow_blessed = F_ALLOW_BLESSED 1992 get_allow_blessed = F_ALLOW_BLESSED
1840 get_convert_blessed = F_CONV_BLESSED 1993 get_convert_blessed = F_CONV_BLESSED
1841 get_relaxed = F_RELAXED 1994 get_relaxed = F_RELAXED
1842 get_allow_unknown = F_ALLOW_UNKNOWN 1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1843 PPCODE: 1997 PPCODE:
1844 XPUSHs (boolSV (self->flags & ix)); 1998 XPUSHs (boolSV (self->flags & ix));
1845 1999
1846void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1847 PPCODE: 2001 PPCODE:
… …
1875} 2029}
1876 2030
1877void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2031void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1878 PPCODE: 2032 PPCODE:
1879{ 2033{
1880 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1881 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1882 2036
1883 if (SvOK (cb)) 2037 if (SvOK (cb))
1884 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1885 else 2039 else
… …
1896 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1897} 2051}
1898 2052
1899void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1900 PPCODE: 2054 PPCODE:
1901 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1902 2057
1903void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1904 PPCODE: 2059 PPCODE:
1905 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1906 2062
1907void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1908 PPCODE: 2064 PPCODE:
1909{ 2065{
2066 SV *sv;
1910 char *offset; 2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1911 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1912 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1913 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1914} 2072}
1915 2073
1916void incr_parse (JSON *self, SV *jsonstr = 0) 2074void incr_parse (JSON *self, SV *jsonstr = 0)
1917 PPCODE: 2075 PPCODE:
1918{ 2076{
1919 if (!self->incr_text) 2077 if (!self->incr_text)
1920 self->incr_text = newSVpvn ("", 0); 2078 self->incr_text = newSVpvn ("", 0);
2079
2080 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2081 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2082 if (DECODE_WANTS_OCTETS (self))
2083 {
2084 if (self->incr_pos)
2085 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2086 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2087
2088 sv_utf8_downgrade (self->incr_text, 0);
2089 }
2090 else
2091 {
2092 sv_utf8_upgrade (self->incr_text);
2093
2094 if (self->incr_pos)
2095 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2096 - (U8 *)SvPVX (self->incr_text);
2097 }
1921 2098
1922 // append data, if any 2099 // append data, if any
1923 if (jsonstr) 2100 if (jsonstr)
1924 { 2101 {
2102 /* make sure both strings have same encoding */
2103 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1925 if (SvUTF8 (jsonstr)) 2104 if (SvUTF8 (jsonstr))
2105 sv_utf8_downgrade (jsonstr, 0);
1926 { 2106 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); 2107 sv_utf8_upgrade (jsonstr);
1939 2108
2109 /* and then just blindly append */
1940 { 2110 {
1941 STRLEN len; 2111 STRLEN len;
1942 const char *str = SvPV (jsonstr, len); 2112 const char *str = SvPV (jsonstr, len);
1943 STRLEN cur = SvCUR (self->incr_text); 2113 STRLEN cur = SvCUR (self->incr_text);
1944 2114
… …
1952 } 2122 }
1953 2123
1954 if (GIMME_V != G_VOID) 2124 if (GIMME_V != G_VOID)
1955 do 2125 do
1956 { 2126 {
2127 SV *sv;
1957 char *offset; 2128 char *offset;
1958 2129
1959 if (!INCR_DONE (self)) 2130 if (!INCR_DONE (self))
1960 { 2131 {
1961 incr_parse (self); 2132 incr_parse (self);
… …
1963 if (self->incr_pos > self->max_size && self->max_size) 2134 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", 2135 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); 2136 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1966 2137
1967 if (!INCR_DONE (self)) 2138 if (!INCR_DONE (self))
2139 {
2140 // as an optimisation, do not accumulate white space in the incr buffer
2141 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2142 {
2143 self->incr_pos = 0;
2144 SvCUR_set (self->incr_text, 0);
2145 }
2146
1968 break; 2147 break;
2148 }
1969 } 2149 }
1970 2150
1971 XPUSHs (decode_json (self->incr_text, self, &offset)); 2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv);
1972 2153
1973 self->incr_pos -= offset - SvPVX (self->incr_text); 2154 self->incr_pos -= offset - SvPVX (self->incr_text);
1974 self->incr_nest = 0; 2155 self->incr_nest = 0;
1975 self->incr_mode = 0; 2156 self->incr_mode = 0;
1976 2157
… …
2020 SvREFCNT_dec (self->incr_text); 2201 SvREFCNT_dec (self->incr_text);
2021 2202
2022PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
2023 2204
2024void encode_json (SV *scalar) 2205void encode_json (SV *scalar)
2025 ALIAS:
2026 to_json_ = 0
2027 encode_json = F_UTF8
2028 PPCODE: 2206 PPCODE:
2029{ 2207{
2030 JSON json; 2208 JSON json;
2031 json_init (&json); 2209 json_init (&json);
2032 json.flags |= ix; 2210 json.flags |= F_UTF8;
2033 XPUSHs (encode_json (scalar, &json)); 2211 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2212 XPUSHs (scalar);
2034} 2213}
2035 2214
2036void decode_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
2037 ALIAS:
2038 from_json_ = 0
2039 decode_json = F_UTF8
2040 PPCODE: 2216 PPCODE:
2041{ 2217{
2042 JSON json; 2218 JSON json;
2043 json_init (&json); 2219 json_init (&json);
2044 json.flags |= ix; 2220 json.flags |= F_UTF8;
2045 XPUSHs (decode_json (jsonstr, &json, 0)); 2221 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2222 XPUSHs (jsonstr);
2046} 2223}
2047 2224

Diff Legend

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