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.108 by root, Tue Aug 17 23:27:36 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
… …
72#else 84#else
73# define JSON_SLOW 0 85# define JSON_SLOW 0
74# define JSON_STASH json_stash 86# define JSON_STASH json_stash
75#endif 87#endif
76 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
78static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
79 94
80enum { 95enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
… …
260 } 275 }
261 276
262 // this relies greatly on the quality of the pow () 277 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good 278 // implementation of the platform, but a good
264 // implementation is hard to beat. 279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
265 if (postdp) *expo -= eaccum; 281 if (postdp) *expo -= eaccum;
266 *accum += uaccum * Perl_pow (10., *expo); 282 *accum += uaccum * Perl_pow (10., *expo);
267 *expo += eaccum; 283 *expo += eaccum;
268} 284}
269 285
… …
479 495
480 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
481 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
482 498
483 encode_ch (enc, '['); 499 encode_ch (enc, '[');
484 500
485 if (len >= 0) 501 if (len >= 0)
486 { 502 {
487 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
488 504
489 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
501 encode_comma (enc); 517 encode_comma (enc);
502 } 518 }
503 519
504 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
505 } 521 }
506 522
507 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
508} 524}
509 525
510static void 526static void
511encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
515 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
516 { 532 {
517 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
518 STRLEN len; 534 STRLEN len;
519 char *str; 535 char *str;
520 536
521 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
522 str = SvPV (sv, len); 538 str = SvPV (sv, len);
523 539
524 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
525 } 541 }
… …
591 } 607 }
592 608
593 if (count) 609 if (count)
594 { 610 {
595 int i, fast = 1; 611 int i, fast = 1;
596#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
597 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
598#else 614
599 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
600#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
601 621
602 i = 0; 622 i = 0;
603 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
604 { 624 {
605 hes [i++] = he; 625 hes [i++] = he;
… …
674// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
675static void 695static void
676encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
677{ 697{
678 svtype svt; 698 svtype svt;
699 GV *method;
679 700
680 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
681 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
682 703
683 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
684 { 705 {
685 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
686 ? json_boolean_stash 707 ? types_boolean_stash
687 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
688 710
689 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
690 { 712 {
691 if (SvIV (sv)) 713 if (SvIV (sv))
692 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
693 else 715 else
694 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
695 } 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);
696 else 784 else
697 {
698#if 0
699 if (0 && sv_derived_from (rv, "JSON::Literal"))
700 {
701 // not yet
702 }
703#endif
704 if (enc->json.flags & F_CONV_BLESSED)
705 {
706 // we re-bless the reference to get overload and other niceties right
707 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
708
709 if (to_json)
710 {
711 dSP;
712
713 ENTER; SAVETMPS; PUSHMARK (SP);
714 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
715
716 // calling with G_SCALAR ensures that we always get a 1 return value
717 PUTBACK;
718 call_sv ((SV *)GvCV (to_json), G_SCALAR);
719 SPAGAIN;
720
721 // catch this surprisingly common error
722 if (SvROK (TOPs) && SvRV (TOPs) == sv)
723 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
724
725 sv = POPs;
726 PUTBACK;
727
728 encode_sv (enc, sv);
729
730 FREETMPS; LEAVE;
731 }
732 else if (enc->json.flags & F_ALLOW_BLESSED)
733 encode_str (enc, "null", 4, 0);
734 else
735 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
736 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
737 }
738 else if (enc->json.flags & F_ALLOW_BLESSED)
739 encode_str (enc, "null", 4, 0);
740 else
741 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)",
742 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
743 }
744 } 787 }
745 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
746 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
747 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
748 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
824 } 867 }
825 else 868 else
826 { 869 {
827 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
828 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
829 enc->cur += 872 enc->cur +=
830 SvIsUV(sv) 873 SvIsUV(sv)
831 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833 } 876 }
834 } 877 }
835 else if (SvROK (sv)) 878 else if (SvROK (sv))
836 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
837 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
838 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
839 else 882 else
840 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",
841 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
842} 885}
843 886
844static SV * 887static SV *
845encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
846{ 889{
… …
1061 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
1062 while (--clen); 1105 while (--clen);
1063 1106
1064 utf8 = 1; 1107 utf8 = 1;
1065 } 1108 }
1109 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1110 *cur++ = ch;
1066 else 1111 else
1067 { 1112 {
1068 --dec_cur; 1113 --dec_cur;
1069 1114
1070 if (!ch) 1115 if (!ch)
… …
1258 if (*dec->cur == ']') 1303 if (*dec->cur == ']')
1259 { 1304 {
1260 ++dec->cur; 1305 ++dec->cur;
1261 break; 1306 break;
1262 } 1307 }
1263 1308
1264 if (*dec->cur != ',') 1309 if (*dec->cur != ',')
1265 ERR (", or ] expected while parsing array"); 1310 ERR (", or ] expected while parsing array");
1266 1311
1267 ++dec->cur; 1312 ++dec->cur;
1268 1313
… …
1450 DEC_DEC_DEPTH; 1495 DEC_DEC_DEPTH;
1451 return 0; 1496 return 0;
1452} 1497}
1453 1498
1454static 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 *
1455decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1456{ 1583{
1457 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1458 // to parse everything. 1585 // to parse everything.
1459 switch (*dec->cur) 1586 switch (*dec->cur)
1460 { 1587 {
1461 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1462 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1463 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1464 1592
1465 case '-': 1593 case '-':
1466 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1467 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1468 return decode_num (dec); 1596 return decode_num (dec);
… …
1470 case 't': 1598 case 't':
1471 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1472 { 1600 {
1473 dec->cur += 4; 1601 dec->cur += 4;
1474#if JSON_SLOW 1602#if JSON_SLOW
1475 json_true = get_bool ("JSON::XS::true"); 1603 types_true = get_bool ("Types::Serialiser::true");
1476#endif 1604#endif
1477 return newSVsv (json_true); 1605 return newSVsv (types_true);
1478 } 1606 }
1479 else 1607 else
1480 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1481 1609
1482 break; 1610 break;
… …
1484 case 'f': 1612 case 'f':
1485 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1486 { 1614 {
1487 dec->cur += 5; 1615 dec->cur += 5;
1488#if JSON_SLOW 1616#if JSON_SLOW
1489 json_false = get_bool ("JSON::XS::false"); 1617 types_false = get_bool ("Types::Serialiser::false");
1490#endif 1618#endif
1491 return newSVsv (json_false); 1619 return newSVsv (types_false);
1492 } 1620 }
1493 else 1621 else
1494 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1495 1623
1496 break; 1624 break;
… …
1505 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1506 1634
1507 break; 1635 break;
1508 1636
1509 default: 1637 default:
1510 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1511 break; 1639 break;
1512 } 1640 }
1513 1641
1514fail: 1642fail:
1515 return 0; 1643 return 0;
… …
1520{ 1648{
1521 dec_t dec; 1649 dec_t dec;
1522 SV *sv; 1650 SV *sv;
1523 1651
1524 /* work around bugs in 5.10 where manipulating magic values 1652 /* work around bugs in 5.10 where manipulating magic values
1525 * 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).
1526 */ 1656 */
1527 /*SvGETMAGIC (string);*/ 1657 /*SvGETMAGIC (string);*/
1528 if (SvMAGICAL (string)) 1658 if (SvMAGICAL (string) || !SvPOK (string))
1529 string = sv_2mortal (newSVsv (string)); 1659 string = sv_2mortal (newSVsv (string));
1530 1660
1531 SvUPGRADE (string, SVt_PV); 1661 SvUPGRADE (string, SVt_PV);
1532 1662
1533 /* 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
… …
1602 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);
1603 LEAVE; 1733 LEAVE;
1604 1734
1605 croak ("%s, at character offset %d (before \"%s\")", 1735 croak ("%s, at character offset %d (before \"%s\")",
1606 dec.err, 1736 dec.err,
1607 ptr_to_index (string, dec.cur), 1737 (int)ptr_to_index (string, dec.cur),
1608 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1609 } 1739 }
1610 1740
1611 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1612 1742
… …
1740 self->incr_mode = INCR_M_STR; 1870 self->incr_mode = INCR_M_STR;
1741 goto incr_m_str; 1871 goto incr_m_str;
1742 1872
1743 case '[': 1873 case '[':
1744 case '{': 1874 case '{':
1875 case '(':
1745 if (++self->incr_nest > self->max_depth) 1876 if (++self->incr_nest > self->max_depth)
1746 croak (ERR_NESTING_EXCEEDED); 1877 croak (ERR_NESTING_EXCEEDED);
1747 break; 1878 break;
1748 1879
1749 case ']': 1880 case ']':
1750 case '}': 1881 case '}':
1751 if (--self->incr_nest <= 0) 1882 if (--self->incr_nest <= 0)
1752 goto interrupt; 1883 goto interrupt;
1884 break;
1885
1886 case ')':
1887 --self->incr_nest;
1753 break; 1888 break;
1754 1889
1755 case '#': 1890 case '#':
1756 self->incr_mode = INCR_M_C1; 1891 self->incr_mode = INCR_M_C1;
1757 goto incr_m_c; 1892 goto incr_m_c;
… …
1783 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1784 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1785 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1786 : -1; 1921 : -1;
1787 1922
1788 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1789 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1790 1925
1791 json_true = get_bool ("JSON::XS::true"); 1926 types_true = get_bool ("Types::Serialiser::true");
1792 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);
1793 1931
1794 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 */
1795} 1933}
1796 1934
1797PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1798 1936
1799void CLONE (...) 1937void CLONE (...)
1800 CODE: 1938 CODE:
1801 json_stash = 0; 1939 json_stash = 0;
1802 json_boolean_stash = 0; 1940 types_boolean_stash = 0;
1803 1941
1804void new (char *klass) 1942void new (char *klass)
1805 PPCODE: 1943 PPCODE:
1806{ 1944{
1807 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1808 SvPOK_only (pv); 1946 SvPOK_only (pv);
1809 json_init ((JSON *)SvPVX (pv)); 1947 json_init ((JSON *)SvPVX (pv));
1810 XPUSHs (sv_2mortal (sv_bless ( 1948 XPUSHs (sv_2mortal (sv_bless (
1811 newRV_noinc (pv), 1949 newRV_noinc (pv),
1812 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1827 shrink = F_SHRINK 1965 shrink = F_SHRINK
1828 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1829 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1830 relaxed = F_RELAXED 1968 relaxed = F_RELAXED
1831 allow_unknown = F_ALLOW_UNKNOWN 1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1832 PPCODE: 1971 PPCODE:
1833{ 1972{
1834 if (enable) 1973 if (enable)
1835 self->flags |= ix; 1974 self->flags |= ix;
1836 else 1975 else
… …
1852 get_shrink = F_SHRINK 1991 get_shrink = F_SHRINK
1853 get_allow_blessed = F_ALLOW_BLESSED 1992 get_allow_blessed = F_ALLOW_BLESSED
1854 get_convert_blessed = F_CONV_BLESSED 1993 get_convert_blessed = F_CONV_BLESSED
1855 get_relaxed = F_RELAXED 1994 get_relaxed = F_RELAXED
1856 get_allow_unknown = F_ALLOW_UNKNOWN 1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1857 PPCODE: 1997 PPCODE:
1858 XPUSHs (boolSV (self->flags & ix)); 1998 XPUSHs (boolSV (self->flags & ix));
1859 1999
1860void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1861 PPCODE: 2001 PPCODE:
… …
1889} 2029}
1890 2030
1891void 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)
1892 PPCODE: 2032 PPCODE:
1893{ 2033{
1894 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1895 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1896 2036
1897 if (SvOK (cb)) 2037 if (SvOK (cb))
1898 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1899 else 2039 else
… …
1910 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1911} 2051}
1912 2052
1913void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1914 PPCODE: 2054 PPCODE:
1915 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1916 2057
1917void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1918 PPCODE: 2059 PPCODE:
1919 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1920 2062
1921void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1922 PPCODE: 2064 PPCODE:
1923{ 2065{
2066 SV *sv;
1924 char *offset; 2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1925 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1926 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1927 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1928} 2072}
1929 2073
1930void incr_parse (JSON *self, SV *jsonstr = 0) 2074void incr_parse (JSON *self, SV *jsonstr = 0)
1931 PPCODE: 2075 PPCODE:
… …
1978 } 2122 }
1979 2123
1980 if (GIMME_V != G_VOID) 2124 if (GIMME_V != G_VOID)
1981 do 2125 do
1982 { 2126 {
2127 SV *sv;
1983 char *offset; 2128 char *offset;
1984 2129
1985 if (!INCR_DONE (self)) 2130 if (!INCR_DONE (self))
1986 { 2131 {
1987 incr_parse (self); 2132 incr_parse (self);
… …
1989 if (self->incr_pos > self->max_size && self->max_size) 2134 if (self->incr_pos > self->max_size && self->max_size)
1990 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",
1991 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2136 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1992 2137
1993 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
1994 break; 2147 break;
2148 }
1995 } 2149 }
1996 2150
1997 XPUSHs (decode_json (self->incr_text, self, &offset)); 2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv);
1998 2153
1999 self->incr_pos -= offset - SvPVX (self->incr_text); 2154 self->incr_pos -= offset - SvPVX (self->incr_text);
2000 self->incr_nest = 0; 2155 self->incr_nest = 0;
2001 self->incr_mode = 0; 2156 self->incr_mode = 0;
2002 2157
… …
2046 SvREFCNT_dec (self->incr_text); 2201 SvREFCNT_dec (self->incr_text);
2047 2202
2048PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
2049 2204
2050void encode_json (SV *scalar) 2205void encode_json (SV *scalar)
2051 ALIAS:
2052 to_json_ = 0
2053 encode_json = F_UTF8
2054 PPCODE: 2206 PPCODE:
2055{ 2207{
2056 JSON json; 2208 JSON json;
2057 json_init (&json); 2209 json_init (&json);
2058 json.flags |= ix; 2210 json.flags |= F_UTF8;
2059 XPUSHs (encode_json (scalar, &json)); 2211 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2212 XPUSHs (scalar);
2060} 2213}
2061 2214
2062void decode_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
2063 ALIAS:
2064 from_json_ = 0
2065 decode_json = F_UTF8
2066 PPCODE: 2216 PPCODE:
2067{ 2217{
2068 JSON json; 2218 JSON json;
2069 json_init (&json); 2219 json_init (&json);
2070 json.flags |= ix; 2220 json.flags |= F_UTF8;
2071 XPUSHs (decode_json (jsonstr, &json, 0)); 2221 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2222 XPUSHs (jsonstr);
2072} 2223}
2073 2224

Diff Legend

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