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.112 by root, Thu Aug 11 17:06:53 2011 UTC vs.
Revision 1.119 by root, Mon Oct 28 23:19:54 2013 UTC

… …
33#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 37#define F_ALLOW_UNKNOWN 0x00002000UL
38#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 39#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 40
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 42
42#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
… …
72#else 73#else
73# define JSON_SLOW 0 74# define JSON_SLOW 0
74# define JSON_STASH json_stash 75# define JSON_STASH json_stash
75#endif 76#endif
76 77
78// the amount of HEs to allocate on the stack, when sorting keys
79#define STACK_HES 64
80
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 81static HV *json_stash, *types_boolean_stash; // JSON::XS::
78static SV *json_true, *json_false; 82static SV *types_true, *types_false, *sv_json;
79 83
80enum { 84enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0 85 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string 86 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash 87 INCR_M_BS, // inside backslash
… …
480 484
481 if (enc->indent >= enc->json.max_depth) 485 if (enc->indent >= enc->json.max_depth)
482 croak (ERR_NESTING_EXCEEDED); 486 croak (ERR_NESTING_EXCEEDED);
483 487
484 encode_ch (enc, '['); 488 encode_ch (enc, '[');
485 489
486 if (len >= 0) 490 if (len >= 0)
487 { 491 {
488 encode_nl (enc); ++enc->indent; 492 encode_nl (enc); ++enc->indent;
489 493
490 for (i = 0; i <= len; ++i) 494 for (i = 0; i <= len; ++i)
… …
502 encode_comma (enc); 506 encode_comma (enc);
503 } 507 }
504 508
505 encode_nl (enc); --enc->indent; encode_indent (enc); 509 encode_nl (enc); --enc->indent; encode_indent (enc);
506 } 510 }
507 511
508 encode_ch (enc, ']'); 512 encode_ch (enc, ']');
509} 513}
510 514
511static void 515static void
512encode_hk (enc_t *enc, HE *he) 516encode_hk (enc_t *enc, HE *he)
… …
516 if (HeKLEN (he) == HEf_SVKEY) 520 if (HeKLEN (he) == HEf_SVKEY)
517 { 521 {
518 SV *sv = HeSVKEY (he); 522 SV *sv = HeSVKEY (he);
519 STRLEN len; 523 STRLEN len;
520 char *str; 524 char *str;
521 525
522 SvGETMAGIC (sv); 526 SvGETMAGIC (sv);
523 str = SvPV (sv, len); 527 str = SvPV (sv, len);
524 528
525 encode_str (enc, str, len, SvUTF8 (sv)); 529 encode_str (enc, str, len, SvUTF8 (sv));
526 } 530 }
… …
592 } 596 }
593 597
594 if (count) 598 if (count)
595 { 599 {
596 int i, fast = 1; 600 int i, fast = 1;
597#if defined(__BORLANDC__) || defined(_MSC_VER) 601 HE *hes_stack [STACK_HES];
598 HE **hes = _alloca (count * sizeof (HE)); 602 HE **hes = hes_stack;
599#else 603
600 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 604 // allocate larger arrays on the heap
601#endif 605 if (count > STACK_HES)
606 {
607 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
608 hes = (HE **)SvPVX (sv);
609 }
602 610
603 i = 0; 611 i = 0;
604 while ((he = hv_iternext (hv))) 612 while ((he = hv_iternext (hv)))
605 { 613 {
606 hes [i++] = he; 614 hes [i++] = he;
… …
681 SvGETMAGIC (sv); 689 SvGETMAGIC (sv);
682 svt = SvTYPE (sv); 690 svt = SvTYPE (sv);
683 691
684 if (expect_false (SvOBJECT (sv))) 692 if (expect_false (SvOBJECT (sv)))
685 { 693 {
686 HV *stash = !JSON_SLOW || json_boolean_stash 694 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
687 ? json_boolean_stash 695 ? types_boolean_stash
688 : gv_stashpv ("JSON::XS::Boolean", 1); 696 : gv_stashpv ("Types::Serialiser::Boolean", 1);
697 HV *stash = SvSTASH (sv);
689 698
690 if (SvSTASH (sv) == stash) 699 if (stash == boolean_stash)
691 { 700 {
692 if (SvIV (sv)) 701 if (SvIV (sv))
693 encode_str (enc, "true", 4, 0); 702 encode_str (enc, "true", 4, 0);
694 else 703 else
695 encode_str (enc, "false", 5, 0); 704 encode_str (enc, "false", 5, 0);
696 } 705 }
697 else 706 else if (enc->json.flags & F_CONV_BLESSED)
698 { 707 {
699#if 0 708 GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0);
700 if (0 && sv_derived_from (rv, "JSON::Literal")) 709
701 { 710 if (to_json)
702 // not yet
703 } 711 {
704#endif
705 if (enc->json.flags & F_CONV_BLESSED)
706 { 712 dSP;
713
714 ENTER; SAVETMPS; PUSHMARK (SP);
707 // we re-bless the reference to get overload and other niceties right 715 // we re-bless the reference to get overload and other niceties right
708 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
709
710 if (to_json)
711 {
712 dSP;
713
714 ENTER; SAVETMPS; PUSHMARK (SP);
715 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 716 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
716 717
717 // calling with G_SCALAR ensures that we always get a 1 return value 718 // calling with G_SCALAR ensures that we always get a 1 return value
718 PUTBACK; 719 PUTBACK;
719 call_sv ((SV *)GvCV (to_json), G_SCALAR); 720 call_sv ((SV *)GvCV (to_json), G_SCALAR);
720 SPAGAIN; 721 SPAGAIN;
721 722
722 // catch this surprisingly common error 723 // catch this surprisingly common error
723 if (SvROK (TOPs) && SvRV (TOPs) == sv) 724 if (SvROK (TOPs) && SvRV (TOPs) == sv)
724 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 725 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
725 726
726 sv = POPs; 727 sv = POPs;
727 PUTBACK; 728 PUTBACK;
728 729
729 encode_sv (enc, sv); 730 encode_sv (enc, sv);
730 731
731 FREETMPS; LEAVE; 732 FREETMPS; LEAVE;
732 }
733 else if (enc->json.flags & F_ALLOW_BLESSED)
734 encode_str (enc, "null", 4, 0);
735 else
736 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
737 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
738 } 733 }
739 else if (enc->json.flags & F_ALLOW_BLESSED) 734 else if (enc->json.flags & F_ALLOW_BLESSED)
740 encode_str (enc, "null", 4, 0); 735 encode_str (enc, "null", 4, 0);
741 else 736 else
742 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 737 croak ("encountered object '%s' when conv_object is enabled, but TO_JSON is missing and allow_blessed disabled",
743 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 738 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744 } 739 }
740 else if (enc->json.flags & F_ALLOW_TAGS)
741 {
742 GV *method = gv_fetchmethod_autoload (stash, "FREEZE", 0);
743
744 if (method)
745 {
746 int count;
747 dSP;
748
749 ENTER; SAVETMPS; PUSHMARK (SP);
750 EXTEND (SP, 2);
751 // we re-bless the reference to get overload and other niceties right
752 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
753 PUSHs (sv_json);
754
755 PUTBACK;
756 count = call_sv ((SV *)GvCV (method), G_ARRAY);
757 SPAGAIN;
758
759 // catch this surprisingly common error
760 if (SvROK (TOPs) && SvRV (TOPs) == sv)
761 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
762
763 encode_ch (enc, '(');
764 encode_ch (enc, '"');
765 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
766 encode_ch (enc, '"');
767 encode_ch (enc, ')');
768 encode_ch (enc, '[');
769
770 while (count)
771 {
772 encode_sv (enc, SP[1 - count--]);
773
774 if (count)
775 encode_ch (enc, ',');
776 }
777
778 encode_ch (enc, ']');
779
780 PUTBACK;
781
782 FREETMPS; LEAVE;
783 }
784 else if (enc->json.flags & F_ALLOW_BLESSED)
785 encode_str (enc, "null", 4, 0);
786 else
787 croak ("encountered object '%s' when allow_tags is enabled, but FREEZE is missing and allow_blessed disabled",
788 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
789 }
790 else if (enc->json.flags & F_ALLOW_BLESSED)
791 encode_str (enc, "null", 4, 0);
792 else
793 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled",
794 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
745 } 795 }
746 else if (svt == SVt_PVHV) 796 else if (svt == SVt_PVHV)
747 encode_hv (enc, (HV *)sv); 797 encode_hv (enc, (HV *)sv);
748 else if (svt == SVt_PVAV) 798 else if (svt == SVt_PVAV)
749 encode_av (enc, (AV *)sv); 799 encode_av (enc, (AV *)sv);
… …
825 } 875 }
826 else 876 else
827 { 877 {
828 // large integer, use the (rather slow) snprintf way. 878 // large integer, use the (rather slow) snprintf way.
829 need (enc, IVUV_MAXCHARS); 879 need (enc, IVUV_MAXCHARS);
830 enc->cur += 880 enc->cur +=
831 SvIsUV(sv) 881 SvIsUV(sv)
832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 882 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 883 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834 } 884 }
835 } 885 }
836 else if (SvROK (sv)) 886 else if (SvROK (sv))
837 encode_rv (enc, SvRV (sv)); 887 encode_rv (enc, SvRV (sv));
838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 888 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
839 encode_str (enc, "null", 4, 0); 889 encode_str (enc, "null", 4, 0);
840 else 890 else
841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 891 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842 SvPV_nolen (sv), SvFLAGS (sv)); 892 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843} 893}
844 894
845static SV * 895static SV *
846encode_json (SV *scalar, JSON *json) 896encode_json (SV *scalar, JSON *json)
847{ 897{
… …
1259 if (*dec->cur == ']') 1309 if (*dec->cur == ']')
1260 { 1310 {
1261 ++dec->cur; 1311 ++dec->cur;
1262 break; 1312 break;
1263 } 1313 }
1264 1314
1265 if (*dec->cur != ',') 1315 if (*dec->cur != ',')
1266 ERR (", or ] expected while parsing array"); 1316 ERR (", or ] expected while parsing array");
1267 1317
1268 ++dec->cur; 1318 ++dec->cur;
1269 1319
… …
1451 DEC_DEC_DEPTH; 1501 DEC_DEC_DEPTH;
1452 return 0; 1502 return 0;
1453} 1503}
1454 1504
1455static SV * 1505static SV *
1506decode_tag (dec_t *dec)
1507{
1508 SV *tag = 0;
1509 SV *val = 0;
1510
1511 if (!(dec->json.flags & F_ALLOW_TAGS))
1512 ERR ("malformed JSON string, neither array, object, number, string or atom");
1513
1514 ++dec->cur;
1515
1516 tag = decode_sv (dec);
1517 if (!tag)
1518 goto fail;
1519
1520 if (!SvPOK (tag))
1521 ERR ("malformed JSON string, (tag) must be a string");
1522
1523 if (*dec->cur != ')')
1524 ERR (") expected after tag");
1525
1526 ++dec->cur;
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 *
1456decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1457{ 1583{
1458 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1459 // to parse everything. 1585 // to parse everything.
1460 switch (*dec->cur) 1586 switch (*dec->cur)
1461 { 1587 {
1462 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1463 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1464 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1465 1592
1466 case '-': 1593 case '-':
1467 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1468 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1469 return decode_num (dec); 1596 return decode_num (dec);
… …
1471 case 't': 1598 case 't':
1472 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473 { 1600 {
1474 dec->cur += 4; 1601 dec->cur += 4;
1475#if JSON_SLOW 1602#if JSON_SLOW
1476 json_true = get_bool ("JSON::XS::true"); 1603 types_true = get_bool ("Types::Serialiser::true");
1477#endif 1604#endif
1478 return newSVsv (json_true); 1605 return newSVsv (types_true);
1479 } 1606 }
1480 else 1607 else
1481 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1482 1609
1483 break; 1610 break;
… …
1485 case 'f': 1612 case 'f':
1486 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1487 { 1614 {
1488 dec->cur += 5; 1615 dec->cur += 5;
1489#if JSON_SLOW 1616#if JSON_SLOW
1490 json_false = get_bool ("JSON::XS::false"); 1617 types_false = get_bool ("Types::Serialiser::false");
1491#endif 1618#endif
1492 return newSVsv (json_false); 1619 return newSVsv (types_false);
1493 } 1620 }
1494 else 1621 else
1495 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1496 1623
1497 break; 1624 break;
… …
1506 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1507 1634
1508 break; 1635 break;
1509 1636
1510 default: 1637 default:
1511 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512 break; 1639 break;
1513 } 1640 }
1514 1641
1515fail: 1642fail:
1516 return 0; 1643 return 0;
… …
1521{ 1648{
1522 dec_t dec; 1649 dec_t dec;
1523 SV *sv; 1650 SV *sv;
1524 1651
1525 /* work around bugs in 5.10 where manipulating magic values 1652 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses. 1653 * makes perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean 1654 * also make a copy of non-PV values, to get them into a clean
1528 * state (SvPV should do that, but it's buggy, see below). 1655 * state (SvPV should do that, but it's buggy, see below).
1529 */ 1656 */
1530 /*SvGETMAGIC (string);*/ 1657 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string)) 1658 if (SvMAGICAL (string) || !SvPOK (string))
… …
1605 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);
1606 LEAVE; 1733 LEAVE;
1607 1734
1608 croak ("%s, at character offset %d (before \"%s\")", 1735 croak ("%s, at character offset %d (before \"%s\")",
1609 dec.err, 1736 dec.err,
1610 ptr_to_index (string, dec.cur), 1737 (int)ptr_to_index (string, dec.cur),
1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612 } 1739 }
1613 1740
1614 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1615 1742
… …
1743 self->incr_mode = INCR_M_STR; 1870 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str; 1871 goto incr_m_str;
1745 1872
1746 case '[': 1873 case '[':
1747 case '{': 1874 case '{':
1875 case '(':
1748 if (++self->incr_nest > self->max_depth) 1876 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED); 1877 croak (ERR_NESTING_EXCEEDED);
1750 break; 1878 break;
1751 1879
1752 case ']': 1880 case ']':
1753 case '}': 1881 case '}':
1754 if (--self->incr_nest <= 0) 1882 if (--self->incr_nest <= 0)
1755 goto interrupt; 1883 goto interrupt;
1884 break;
1885
1886 case ')':
1887 --self->incr_nest;
1756 break; 1888 break;
1757 1889
1758 case '#': 1890 case '#':
1759 self->incr_mode = INCR_M_C1; 1891 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c; 1892 goto incr_m_c;
… …
1786 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1787 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1788 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1789 : -1; 1921 : -1;
1790 1922
1791 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1793 1925
1794 json_true = get_bool ("JSON::XS::true"); 1926 types_true = get_bool ("Types::Serialiser::true");
1795 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);
1796 1931
1797 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 */
1798} 1933}
1799 1934
1800PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1801 1936
1802void CLONE (...) 1937void CLONE (...)
1803 CODE: 1938 CODE:
1804 json_stash = 0; 1939 json_stash = 0;
1805 json_boolean_stash = 0; 1940 types_boolean_stash = 0;
1806 1941
1807void new (char *klass) 1942void new (char *klass)
1808 PPCODE: 1943 PPCODE:
1809{ 1944{
1810 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1811 SvPOK_only (pv); 1946 SvPOK_only (pv);
1812 json_init ((JSON *)SvPVX (pv)); 1947 json_init ((JSON *)SvPVX (pv));
1813 XPUSHs (sv_2mortal (sv_bless ( 1948 XPUSHs (sv_2mortal (sv_bless (
1814 newRV_noinc (pv), 1949 newRV_noinc (pv),
1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1830 shrink = F_SHRINK 1965 shrink = F_SHRINK
1831 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1832 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1833 relaxed = F_RELAXED 1968 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN 1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1835 PPCODE: 1971 PPCODE:
1836{ 1972{
1837 if (enable) 1973 if (enable)
1838 self->flags |= ix; 1974 self->flags |= ix;
1839 else 1975 else
… …
1855 get_shrink = F_SHRINK 1991 get_shrink = F_SHRINK
1856 get_allow_blessed = F_ALLOW_BLESSED 1992 get_allow_blessed = F_ALLOW_BLESSED
1857 get_convert_blessed = F_CONV_BLESSED 1993 get_convert_blessed = F_CONV_BLESSED
1858 get_relaxed = F_RELAXED 1994 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN 1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1860 PPCODE: 1997 PPCODE:
1861 XPUSHs (boolSV (self->flags & ix)); 1998 XPUSHs (boolSV (self->flags & ix));
1862 1999
1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864 PPCODE: 2001 PPCODE:
… …
1892} 2029}
1893 2030
1894void 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)
1895 PPCODE: 2032 PPCODE:
1896{ 2033{
1897 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1898 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1899 2036
1900 if (SvOK (cb)) 2037 if (SvOK (cb))
1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902 else 2039 else
… …
1913 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1914} 2051}
1915 2052
1916void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1917 PPCODE: 2054 PPCODE:
1918 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1919 2057
1920void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1921 PPCODE: 2059 PPCODE:
1922 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1923 2062
1924void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1925 PPCODE: 2064 PPCODE:
1926{ 2065{
2066 SV *sv;
1927 char *offset; 2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1929 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1930 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1931} 2072}
1932 2073
1933void incr_parse (JSON *self, SV *jsonstr = 0) 2074void incr_parse (JSON *self, SV *jsonstr = 0)
1934 PPCODE: 2075 PPCODE:
… …
1981 } 2122 }
1982 2123
1983 if (GIMME_V != G_VOID) 2124 if (GIMME_V != G_VOID)
1984 do 2125 do
1985 { 2126 {
2127 SV *sv;
1986 char *offset; 2128 char *offset;
1987 2129
1988 if (!INCR_DONE (self)) 2130 if (!INCR_DONE (self))
1989 { 2131 {
1990 incr_parse (self); 2132 incr_parse (self);
… …
2004 2146
2005 break; 2147 break;
2006 } 2148 }
2007 } 2149 }
2008 2150
2009 XPUSHs (decode_json (self->incr_text, self, &offset)); 2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv);
2010 2153
2011 self->incr_pos -= offset - SvPVX (self->incr_text); 2154 self->incr_pos -= offset - SvPVX (self->incr_text);
2012 self->incr_nest = 0; 2155 self->incr_nest = 0;
2013 self->incr_mode = 0; 2156 self->incr_mode = 0;
2014 2157
… …
2058 SvREFCNT_dec (self->incr_text); 2201 SvREFCNT_dec (self->incr_text);
2059 2202
2060PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
2061 2204
2062void encode_json (SV *scalar) 2205void encode_json (SV *scalar)
2063 ALIAS:
2064 to_json_ = 0
2065 encode_json = F_UTF8
2066 PPCODE: 2206 PPCODE:
2067{ 2207{
2068 JSON json; 2208 JSON json;
2069 json_init (&json); 2209 json_init (&json);
2070 json.flags |= ix; 2210 json.flags |= F_UTF8;
2071 XPUSHs (encode_json (scalar, &json)); 2211 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2212 XPUSHs (scalar);
2072} 2213}
2073 2214
2074void decode_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
2075 ALIAS:
2076 from_json_ = 0
2077 decode_json = F_UTF8
2078 PPCODE: 2216 PPCODE:
2079{ 2217{
2080 JSON json; 2218 JSON json;
2081 json_init (&json); 2219 json_init (&json);
2082 json.flags |= ix; 2220 json.flags |= F_UTF8;
2083 XPUSHs (decode_json (jsonstr, &json, 0)); 2221 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2222 XPUSHs (jsonstr);
2084} 2223}
2085 2224

Diff Legend

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