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.118 by root, Fri Oct 25 20:27:57 2013 UTC vs.
Revision 1.122 by root, Tue Oct 29 15:55:49 2013 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
… …
75#endif 87#endif
76 88
77// the amount of HEs to allocate on the stack, when sorting keys 89// the amount of HEs to allocate on the stack, when sorting keys
78#define STACK_HES 64 90#define STACK_HES 64
79 91
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
81static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
82 94
83enum { 95enum {
84 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
85 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
86 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
… …
682// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
683static void 695static void
684encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
685{ 697{
686 svtype svt; 698 svtype svt;
699 GV *method;
687 700
688 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
689 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
690 703
691 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
692 { 705 {
693 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
694 ? json_boolean_stash 707 ? types_boolean_stash
695 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
696 710
697 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
698 { 712 {
699 if (SvIV (sv)) 713 if (SvIV (sv))
700 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
701 else 715 else
702 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
703 } 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::TO_JSON 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);
704 else 784 else
705 {
706#if 0
707 if (0 && sv_derived_from (rv, "JSON::Literal"))
708 {
709 // not yet
710 }
711#endif
712 if (enc->json.flags & F_CONV_BLESSED)
713 {
714 // we re-bless the reference to get overload and other niceties right
715 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
716
717 if (to_json)
718 {
719 dSP;
720
721 ENTER; SAVETMPS; PUSHMARK (SP);
722 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
723
724 // calling with G_SCALAR ensures that we always get a 1 return value
725 PUTBACK;
726 call_sv ((SV *)GvCV (to_json), G_SCALAR);
727 SPAGAIN;
728
729 // catch this surprisingly common error
730 if (SvROK (TOPs) && SvRV (TOPs) == sv)
731 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
732
733 sv = POPs;
734 PUTBACK;
735
736 encode_sv (enc, sv);
737
738 FREETMPS; LEAVE;
739 }
740 else if (enc->json.flags & F_ALLOW_BLESSED)
741 encode_str (enc, "null", 4, 0);
742 else
743 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
744 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
745 }
746 else if (enc->json.flags & F_ALLOW_BLESSED)
747 encode_str (enc, "null", 4, 0);
748 else
749 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)",
750 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
751 }
752 } 787 }
753 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
754 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
755 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
756 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
1458 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1459 return 0; 1494 return 0;
1460} 1495}
1461 1496
1462static SV * 1497static SV *
1498decode_tag (dec_t *dec)
1499{
1500 SV *tag = 0;
1501 SV *val = 0;
1502
1503 if (!(dec->json.flags & F_ALLOW_TAGS))
1504 ERR ("malformed JSON string, neither array, object, number, string or atom");
1505
1506 ++dec->cur;
1507
1508 decode_ws (dec);
1509
1510 tag = decode_sv (dec);
1511 if (!tag)
1512 goto fail;
1513
1514 if (!SvPOK (tag))
1515 ERR ("malformed JSON string, (tag) must be a string");
1516
1517 decode_ws (dec);
1518
1519 if (*dec->cur != ')')
1520 ERR (") expected after tag");
1521
1522 ++dec->cur;
1523
1524 decode_ws (dec);
1525
1526 val = decode_sv (dec);
1527 if (!val)
1528 goto fail;
1529
1530 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1531 ERR ("malformed JSON string, tag value must be an array");
1532
1533 {
1534 AV *av = (AV *)SvRV (val);
1535 int i, len = av_len (av) + 1;
1536 HV *stash = gv_stashsv (tag, 0);
1537 SV *sv;
1538
1539 if (!stash)
1540 ERR ("cannot decode perl-object (package does not exist)");
1541
1542 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1543
1544 if (!method)
1545 ERR ("cannot decode perl-object (package does not have a THAW method)");
1546
1547 dSP;
1548
1549 ENTER; SAVETMPS; PUSHMARK (SP);
1550 EXTEND (SP, len + 2);
1551 // we re-bless the reference to get overload and other niceties right
1552 PUSHs (tag);
1553 PUSHs (sv_json);
1554
1555 for (i = 0; i < len; ++i)
1556 PUSHs (*av_fetch (av, i, 1));
1557
1558 PUTBACK;
1559 call_sv ((SV *)GvCV (method), G_SCALAR);
1560 SPAGAIN;
1561
1562 SvREFCNT_dec (tag);
1563 SvREFCNT_dec (val);
1564 sv = SvREFCNT_inc (POPs);
1565
1566 PUTBACK;
1567
1568 FREETMPS; LEAVE;
1569
1570 return sv;
1571 }
1572
1573fail:
1574 SvREFCNT_dec (tag);
1575 SvREFCNT_dec (val);
1576 return 0;
1577}
1578
1579static SV *
1463decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1464{ 1581{
1465 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1466 // to parse everything. 1583 // to parse everything.
1467 switch (*dec->cur) 1584 switch (*dec->cur)
1468 { 1585 {
1469 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1470 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1471 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1472 1590
1473 case '-': 1591 case '-':
1474 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1475 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1476 return decode_num (dec); 1594 return decode_num (dec);
… …
1478 case 't': 1596 case 't':
1479 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1480 { 1598 {
1481 dec->cur += 4; 1599 dec->cur += 4;
1482#if JSON_SLOW 1600#if JSON_SLOW
1483 json_true = get_bool ("JSON::XS::true"); 1601 types_true = get_bool ("Types::Serialiser::true");
1484#endif 1602#endif
1485 return newSVsv (json_true); 1603 return newSVsv (types_true);
1486 } 1604 }
1487 else 1605 else
1488 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1489 1607
1490 break; 1608 break;
… …
1492 case 'f': 1610 case 'f':
1493 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1494 { 1612 {
1495 dec->cur += 5; 1613 dec->cur += 5;
1496#if JSON_SLOW 1614#if JSON_SLOW
1497 json_false = get_bool ("JSON::XS::false"); 1615 types_false = get_bool ("Types::Serialiser::false");
1498#endif 1616#endif
1499 return newSVsv (json_false); 1617 return newSVsv (types_false);
1500 } 1618 }
1501 else 1619 else
1502 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1503 1621
1504 break; 1622 break;
… …
1513 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1514 1632
1515 break; 1633 break;
1516 1634
1517 default: 1635 default:
1518 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1519 break; 1637 break;
1520 } 1638 }
1521 1639
1522fail: 1640fail:
1523 return 0; 1641 return 0;
… …
1750 self->incr_mode = INCR_M_STR; 1868 self->incr_mode = INCR_M_STR;
1751 goto incr_m_str; 1869 goto incr_m_str;
1752 1870
1753 case '[': 1871 case '[':
1754 case '{': 1872 case '{':
1873 case '(':
1755 if (++self->incr_nest > self->max_depth) 1874 if (++self->incr_nest > self->max_depth)
1756 croak (ERR_NESTING_EXCEEDED); 1875 croak (ERR_NESTING_EXCEEDED);
1757 break; 1876 break;
1758 1877
1759 case ']': 1878 case ']':
1760 case '}': 1879 case '}':
1761 if (--self->incr_nest <= 0) 1880 if (--self->incr_nest <= 0)
1762 goto interrupt; 1881 goto interrupt;
1882 break;
1883
1884 case ')':
1885 --self->incr_nest;
1763 break; 1886 break;
1764 1887
1765 case '#': 1888 case '#':
1766 self->incr_mode = INCR_M_C1; 1889 self->incr_mode = INCR_M_C1;
1767 goto incr_m_c; 1890 goto incr_m_c;
… …
1793 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1794 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1795 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1796 : -1; 1919 : -1;
1797 1920
1798 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1799 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1800 1923
1801 json_true = get_bool ("JSON::XS::true"); 1924 types_true = get_bool ("Types::Serialiser::true");
1802 json_false = get_bool ("JSON::XS::false"); 1925 types_false = get_bool ("Types::Serialiser::false");
1926
1927 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json);
1803 1929
1804 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1930 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1805} 1931}
1806 1932
1807PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1808 1934
1809void CLONE (...) 1935void CLONE (...)
1810 CODE: 1936 CODE:
1811 json_stash = 0; 1937 json_stash = 0;
1812 json_boolean_stash = 0; 1938 types_boolean_stash = 0;
1813 1939
1814void new (char *klass) 1940void new (char *klass)
1815 PPCODE: 1941 PPCODE:
1816{ 1942{
1817 SV *pv = NEWSV (0, sizeof (JSON)); 1943 SV *pv = NEWSV (0, sizeof (JSON));
… …
1837 shrink = F_SHRINK 1963 shrink = F_SHRINK
1838 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1839 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1840 relaxed = F_RELAXED 1966 relaxed = F_RELAXED
1841 allow_unknown = F_ALLOW_UNKNOWN 1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1842 PPCODE: 1969 PPCODE:
1843{ 1970{
1844 if (enable) 1971 if (enable)
1845 self->flags |= ix; 1972 self->flags |= ix;
1846 else 1973 else
… …
1862 get_shrink = F_SHRINK 1989 get_shrink = F_SHRINK
1863 get_allow_blessed = F_ALLOW_BLESSED 1990 get_allow_blessed = F_ALLOW_BLESSED
1864 get_convert_blessed = F_CONV_BLESSED 1991 get_convert_blessed = F_CONV_BLESSED
1865 get_relaxed = F_RELAXED 1992 get_relaxed = F_RELAXED
1866 get_allow_unknown = F_ALLOW_UNKNOWN 1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1867 PPCODE: 1995 PPCODE:
1868 XPUSHs (boolSV (self->flags & ix)); 1996 XPUSHs (boolSV (self->flags & ix));
1869 1997
1870void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1871 PPCODE: 1999 PPCODE:

Diff Legend

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