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.115 by root, Fri Dec 21 05:16:19 2012 UTC vs.
Revision 1.121 by root, Tue Oct 29 00:06:40 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
… …
75#endif 76#endif
76 77
77// the amount of HEs to allocate on the stack, when sorting keys 78// the amount of HEs to allocate on the stack, when sorting keys
78#define STACK_HES 64 79#define STACK_HES 64
79 80
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 81static HV *json_stash, *types_boolean_stash; // JSON::XS::
81static SV *json_true, *json_false; 82static SV *types_true, *types_false, *sv_json;
82 83
83enum { 84enum {
84 INCR_M_WS = 0, // initial whitespace skipping, must be 0 85 INCR_M_WS = 0, // initial whitespace skipping, must be 0
85 INCR_M_STR, // inside string 86 INCR_M_STR, // inside string
86 INCR_M_BS, // inside backslash 87 INCR_M_BS, // inside backslash
… …
483 484
484 if (enc->indent >= enc->json.max_depth) 485 if (enc->indent >= enc->json.max_depth)
485 croak (ERR_NESTING_EXCEEDED); 486 croak (ERR_NESTING_EXCEEDED);
486 487
487 encode_ch (enc, '['); 488 encode_ch (enc, '[');
488 489
489 if (len >= 0) 490 if (len >= 0)
490 { 491 {
491 encode_nl (enc); ++enc->indent; 492 encode_nl (enc); ++enc->indent;
492 493
493 for (i = 0; i <= len; ++i) 494 for (i = 0; i <= len; ++i)
… …
505 encode_comma (enc); 506 encode_comma (enc);
506 } 507 }
507 508
508 encode_nl (enc); --enc->indent; encode_indent (enc); 509 encode_nl (enc); --enc->indent; encode_indent (enc);
509 } 510 }
510 511
511 encode_ch (enc, ']'); 512 encode_ch (enc, ']');
512} 513}
513 514
514static void 515static void
515encode_hk (enc_t *enc, HE *he) 516encode_hk (enc_t *enc, HE *he)
… …
519 if (HeKLEN (he) == HEf_SVKEY) 520 if (HeKLEN (he) == HEf_SVKEY)
520 { 521 {
521 SV *sv = HeSVKEY (he); 522 SV *sv = HeSVKEY (he);
522 STRLEN len; 523 STRLEN len;
523 char *str; 524 char *str;
524 525
525 SvGETMAGIC (sv); 526 SvGETMAGIC (sv);
526 str = SvPV (sv, len); 527 str = SvPV (sv, len);
527 528
528 encode_str (enc, str, len, SvUTF8 (sv)); 529 encode_str (enc, str, len, SvUTF8 (sv));
529 } 530 }
… …
597 if (count) 598 if (count)
598 { 599 {
599 int i, fast = 1; 600 int i, fast = 1;
600 HE *hes_stack [STACK_HES]; 601 HE *hes_stack [STACK_HES];
601 HE **hes = hes_stack; 602 HE **hes = hes_stack;
602 603
603 // allocate larger arrays on the heap 604 // allocate larger arrays on the heap
604 if (count > STACK_HES) 605 if (count > STACK_HES)
605 { 606 {
606 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes))); 607 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
607 hes = (HE **)SvPVX (sv); 608 hes = (HE **)SvPVX (sv);
… …
682// encode objects, arrays and special \0=false and \1=true values. 683// encode objects, arrays and special \0=false and \1=true values.
683static void 684static void
684encode_rv (enc_t *enc, SV *sv) 685encode_rv (enc_t *enc, SV *sv)
685{ 686{
686 svtype svt; 687 svtype svt;
688 GV *method;
687 689
688 SvGETMAGIC (sv); 690 SvGETMAGIC (sv);
689 svt = SvTYPE (sv); 691 svt = SvTYPE (sv);
690 692
691 if (expect_false (SvOBJECT (sv))) 693 if (expect_false (SvOBJECT (sv)))
692 { 694 {
693 HV *stash = !JSON_SLOW || json_boolean_stash 695 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
694 ? json_boolean_stash 696 ? types_boolean_stash
695 : gv_stashpv ("JSON::XS::Boolean", 1); 697 : gv_stashpv ("Types::Serialiser::Boolean", 1);
698 HV *stash = SvSTASH (sv);
696 699
697 if (SvSTASH (sv) == stash) 700 if (stash == boolean_stash)
698 { 701 {
699 if (SvIV (sv)) 702 if (SvIV (sv))
700 encode_str (enc, "true", 4, 0); 703 encode_str (enc, "true", 4, 0);
701 else 704 else
702 encode_str (enc, "false", 5, 0); 705 encode_str (enc, "false", 5, 0);
703 } 706 }
707 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
708 {
709 int count;
710 dSP;
711
712 ENTER; SAVETMPS; PUSHMARK (SP);
713 EXTEND (SP, 2);
714 // we re-bless the reference to get overload and other niceties right
715 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
716 PUSHs (sv_json);
717
718 PUTBACK;
719 count = call_sv ((SV *)GvCV (method), G_ARRAY);
720 SPAGAIN;
721
722 // catch this surprisingly common error
723 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
726 encode_ch (enc, '(');
727 encode_ch (enc, '"');
728 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
729 encode_ch (enc, '"');
730 encode_ch (enc, ')');
731 encode_ch (enc, '[');
732
733 while (count)
734 {
735 encode_sv (enc, SP[1 - count--]);
736
737 if (count)
738 encode_ch (enc, ',');
739 }
740
741 encode_ch (enc, ']');
742
743 PUTBACK;
744
745 FREETMPS; LEAVE;
746 }
747 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
748 {
749 dSP;
750
751 ENTER; SAVETMPS; PUSHMARK (SP);
752 // we re-bless the reference to get overload and other niceties right
753 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
754
755 // calling with G_SCALAR ensures that we always get a 1 return value
756 PUTBACK;
757 call_sv ((SV *)GvCV (method), G_SCALAR);
758 SPAGAIN;
759
760 // catch this surprisingly common error
761 if (SvROK (TOPs) && SvRV (TOPs) == sv)
762 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
763
764 sv = POPs;
765 PUTBACK;
766
767 encode_sv (enc, sv);
768
769 FREETMPS; LEAVE;
770 }
771 else if (enc->json.flags & F_ALLOW_BLESSED)
772 encode_str (enc, "null", 4, 0);
704 else 773 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", 774 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)))); 775 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
751 }
752 } 776 }
753 else if (svt == SVt_PVHV) 777 else if (svt == SVt_PVHV)
754 encode_hv (enc, (HV *)sv); 778 encode_hv (enc, (HV *)sv);
755 else if (svt == SVt_PVAV) 779 else if (svt == SVt_PVAV)
756 encode_av (enc, (AV *)sv); 780 encode_av (enc, (AV *)sv);
… …
843 else if (SvROK (sv)) 867 else if (SvROK (sv))
844 encode_rv (enc, SvRV (sv)); 868 encode_rv (enc, SvRV (sv));
845 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 869 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
846 encode_str (enc, "null", 4, 0); 870 encode_str (enc, "null", 4, 0);
847 else 871 else
848 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 872 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
849 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 873 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
850} 874}
851 875
852static SV * 876static SV *
853encode_json (SV *scalar, JSON *json) 877encode_json (SV *scalar, JSON *json)
… …
1266 if (*dec->cur == ']') 1290 if (*dec->cur == ']')
1267 { 1291 {
1268 ++dec->cur; 1292 ++dec->cur;
1269 break; 1293 break;
1270 } 1294 }
1271 1295
1272 if (*dec->cur != ',') 1296 if (*dec->cur != ',')
1273 ERR (", or ] expected while parsing array"); 1297 ERR (", or ] expected while parsing array");
1274 1298
1275 ++dec->cur; 1299 ++dec->cur;
1276 1300
… …
1458 DEC_DEC_DEPTH; 1482 DEC_DEC_DEPTH;
1459 return 0; 1483 return 0;
1460} 1484}
1461 1485
1462static SV * 1486static SV *
1487decode_tag (dec_t *dec)
1488{
1489 SV *tag = 0;
1490 SV *val = 0;
1491
1492 if (!(dec->json.flags & F_ALLOW_TAGS))
1493 ERR ("malformed JSON string, neither array, object, number, string or atom");
1494
1495 ++dec->cur;
1496
1497 decode_ws (dec);
1498
1499 tag = decode_sv (dec);
1500 if (!tag)
1501 goto fail;
1502
1503 if (!SvPOK (tag))
1504 ERR ("malformed JSON string, (tag) must be a string");
1505
1506 decode_ws (dec);
1507
1508 if (*dec->cur != ')')
1509 ERR (") expected after tag");
1510
1511 ++dec->cur;
1512
1513 decode_ws (dec);
1514
1515 val = decode_sv (dec);
1516 if (!val)
1517 goto fail;
1518
1519 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1520 ERR ("malformed JSON string, tag value must be an array");
1521
1522 {
1523 AV *av = (AV *)SvRV (val);
1524 int i, len = av_len (av) + 1;
1525 HV *stash = gv_stashsv (tag, 0);
1526 SV *sv;
1527
1528 if (!stash)
1529 ERR ("cannot decode perl-object (package does not exist)");
1530
1531 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1532
1533 if (!method)
1534 ERR ("cannot decode perl-object (package does not have a THAW method)");
1535
1536 dSP;
1537
1538 ENTER; SAVETMPS; PUSHMARK (SP);
1539 EXTEND (SP, len + 2);
1540 // we re-bless the reference to get overload and other niceties right
1541 PUSHs (tag);
1542 PUSHs (sv_json);
1543
1544 for (i = 0; i < len; ++i)
1545 PUSHs (*av_fetch (av, i, 1));
1546
1547 PUTBACK;
1548 call_sv ((SV *)GvCV (method), G_SCALAR);
1549 SPAGAIN;
1550
1551 SvREFCNT_dec (tag);
1552 SvREFCNT_dec (val);
1553 sv = SvREFCNT_inc (POPs);
1554
1555 PUTBACK;
1556
1557 FREETMPS; LEAVE;
1558
1559 return sv;
1560 }
1561
1562fail:
1563 SvREFCNT_dec (tag);
1564 SvREFCNT_dec (val);
1565 return 0;
1566}
1567
1568static SV *
1463decode_sv (dec_t *dec) 1569decode_sv (dec_t *dec)
1464{ 1570{
1465 // the beauty of JSON: you need exactly one character lookahead 1571 // the beauty of JSON: you need exactly one character lookahead
1466 // to parse everything. 1572 // to parse everything.
1467 switch (*dec->cur) 1573 switch (*dec->cur)
1468 { 1574 {
1469 case '"': ++dec->cur; return decode_str (dec); 1575 case '"': ++dec->cur; return decode_str (dec);
1470 case '[': ++dec->cur; return decode_av (dec); 1576 case '[': ++dec->cur; return decode_av (dec);
1471 case '{': ++dec->cur; return decode_hv (dec); 1577 case '{': ++dec->cur; return decode_hv (dec);
1578 case '(': return decode_tag (dec);
1472 1579
1473 case '-': 1580 case '-':
1474 case '0': case '1': case '2': case '3': case '4': 1581 case '0': case '1': case '2': case '3': case '4':
1475 case '5': case '6': case '7': case '8': case '9': 1582 case '5': case '6': case '7': case '8': case '9':
1476 return decode_num (dec); 1583 return decode_num (dec);
… …
1478 case 't': 1585 case 't':
1479 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1586 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1480 { 1587 {
1481 dec->cur += 4; 1588 dec->cur += 4;
1482#if JSON_SLOW 1589#if JSON_SLOW
1483 json_true = get_bool ("JSON::XS::true"); 1590 types_true = get_bool ("Types::Serialiser::true");
1484#endif 1591#endif
1485 return newSVsv (json_true); 1592 return newSVsv (types_true);
1486 } 1593 }
1487 else 1594 else
1488 ERR ("'true' expected"); 1595 ERR ("'true' expected");
1489 1596
1490 break; 1597 break;
… …
1492 case 'f': 1599 case 'f':
1493 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1600 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1494 { 1601 {
1495 dec->cur += 5; 1602 dec->cur += 5;
1496#if JSON_SLOW 1603#if JSON_SLOW
1497 json_false = get_bool ("JSON::XS::false"); 1604 types_false = get_bool ("Types::Serialiser::false");
1498#endif 1605#endif
1499 return newSVsv (json_false); 1606 return newSVsv (types_false);
1500 } 1607 }
1501 else 1608 else
1502 ERR ("'false' expected"); 1609 ERR ("'false' expected");
1503 1610
1504 break; 1611 break;
… …
1513 ERR ("'null' expected"); 1620 ERR ("'null' expected");
1514 1621
1515 break; 1622 break;
1516 1623
1517 default: 1624 default:
1518 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1625 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1519 break; 1626 break;
1520 } 1627 }
1521 1628
1522fail: 1629fail:
1523 return 0; 1630 return 0;
… …
1528{ 1635{
1529 dec_t dec; 1636 dec_t dec;
1530 SV *sv; 1637 SV *sv;
1531 1638
1532 /* work around bugs in 5.10 where manipulating magic values 1639 /* work around bugs in 5.10 where manipulating magic values
1533 * will perl ignore the magic in subsequent accesses. 1640 * makes perl ignore the magic in subsequent accesses.
1534 * also make a copy of non-PV values, to get them into a clean 1641 * also make a copy of non-PV values, to get them into a clean
1535 * state (SvPV should do that, but it's buggy, see below). 1642 * state (SvPV should do that, but it's buggy, see below).
1536 */ 1643 */
1537 /*SvGETMAGIC (string);*/ 1644 /*SvGETMAGIC (string);*/
1538 if (SvMAGICAL (string) || !SvPOK (string)) 1645 if (SvMAGICAL (string) || !SvPOK (string))
… …
1750 self->incr_mode = INCR_M_STR; 1857 self->incr_mode = INCR_M_STR;
1751 goto incr_m_str; 1858 goto incr_m_str;
1752 1859
1753 case '[': 1860 case '[':
1754 case '{': 1861 case '{':
1862 case '(':
1755 if (++self->incr_nest > self->max_depth) 1863 if (++self->incr_nest > self->max_depth)
1756 croak (ERR_NESTING_EXCEEDED); 1864 croak (ERR_NESTING_EXCEEDED);
1757 break; 1865 break;
1758 1866
1759 case ']': 1867 case ']':
1760 case '}': 1868 case '}':
1761 if (--self->incr_nest <= 0) 1869 if (--self->incr_nest <= 0)
1762 goto interrupt; 1870 goto interrupt;
1871 break;
1872
1873 case ')':
1874 --self->incr_nest;
1763 break; 1875 break;
1764 1876
1765 case '#': 1877 case '#':
1766 self->incr_mode = INCR_M_C1; 1878 self->incr_mode = INCR_M_C1;
1767 goto incr_m_c; 1879 goto incr_m_c;
… …
1793 i >= '0' && i <= '9' ? i - '0' 1905 i >= '0' && i <= '9' ? i - '0'
1794 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1906 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1795 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1907 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1796 : -1; 1908 : -1;
1797 1909
1798 json_stash = gv_stashpv ("JSON::XS" , 1); 1910 json_stash = gv_stashpv ("JSON::XS" , 1);
1799 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1911 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1800 1912
1801 json_true = get_bool ("JSON::XS::true"); 1913 types_true = get_bool ("Types::Serialiser::true");
1802 json_false = get_bool ("JSON::XS::false"); 1914 types_false = get_bool ("Types::Serialiser::false");
1915
1916 sv_json = newSVpv ("JSON", 0);
1917 SvREADONLY_on (sv_json);
1803 1918
1804 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1919 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1805} 1920}
1806 1921
1807PROTOTYPES: DISABLE 1922PROTOTYPES: DISABLE
1808 1923
1809void CLONE (...) 1924void CLONE (...)
1810 CODE: 1925 CODE:
1811 json_stash = 0; 1926 json_stash = 0;
1812 json_boolean_stash = 0; 1927 types_boolean_stash = 0;
1813 1928
1814void new (char *klass) 1929void new (char *klass)
1815 PPCODE: 1930 PPCODE:
1816{ 1931{
1817 SV *pv = NEWSV (0, sizeof (JSON)); 1932 SV *pv = NEWSV (0, sizeof (JSON));
… …
1837 shrink = F_SHRINK 1952 shrink = F_SHRINK
1838 allow_blessed = F_ALLOW_BLESSED 1953 allow_blessed = F_ALLOW_BLESSED
1839 convert_blessed = F_CONV_BLESSED 1954 convert_blessed = F_CONV_BLESSED
1840 relaxed = F_RELAXED 1955 relaxed = F_RELAXED
1841 allow_unknown = F_ALLOW_UNKNOWN 1956 allow_unknown = F_ALLOW_UNKNOWN
1957 allow_tags = F_ALLOW_TAGS
1842 PPCODE: 1958 PPCODE:
1843{ 1959{
1844 if (enable) 1960 if (enable)
1845 self->flags |= ix; 1961 self->flags |= ix;
1846 else 1962 else
… …
1862 get_shrink = F_SHRINK 1978 get_shrink = F_SHRINK
1863 get_allow_blessed = F_ALLOW_BLESSED 1979 get_allow_blessed = F_ALLOW_BLESSED
1864 get_convert_blessed = F_CONV_BLESSED 1980 get_convert_blessed = F_CONV_BLESSED
1865 get_relaxed = F_RELAXED 1981 get_relaxed = F_RELAXED
1866 get_allow_unknown = F_ALLOW_UNKNOWN 1982 get_allow_unknown = F_ALLOW_UNKNOWN
1983 get_allow_tags = F_ALLOW_TAGS
1867 PPCODE: 1984 PPCODE:
1868 XPUSHs (boolSV (self->flags & ix)); 1985 XPUSHs (boolSV (self->flags & ix));
1869 1986
1870void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1987void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1871 PPCODE: 1988 PPCODE:
… …
2071 SvREFCNT_dec (self->incr_text); 2188 SvREFCNT_dec (self->incr_text);
2072 2189
2073PROTOTYPES: ENABLE 2190PROTOTYPES: ENABLE
2074 2191
2075void encode_json (SV *scalar) 2192void encode_json (SV *scalar)
2076 ALIAS:
2077 to_json_ = 0
2078 encode_json = F_UTF8
2079 PPCODE: 2193 PPCODE:
2080{ 2194{
2081 JSON json; 2195 JSON json;
2082 json_init (&json); 2196 json_init (&json);
2083 json.flags |= ix; 2197 json.flags |= F_UTF8;
2084 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN; 2198 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2085 XPUSHs (scalar); 2199 XPUSHs (scalar);
2086} 2200}
2087 2201
2088void decode_json (SV *jsonstr) 2202void decode_json (SV *jsonstr)
2089 ALIAS:
2090 from_json_ = 0
2091 decode_json = F_UTF8
2092 PPCODE: 2203 PPCODE:
2093{ 2204{
2094 JSON json; 2205 JSON json;
2095 json_init (&json); 2206 json_init (&json);
2096 json.flags |= ix; 2207 json.flags |= F_UTF8;
2097 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN; 2208 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2098 XPUSHs (jsonstr); 2209 XPUSHs (jsonstr);
2099} 2210}
2100 2211

Diff Legend

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