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.75 by root, Wed Mar 19 15:37:54 2008 UTC vs.
Revision 1.84 by root, Thu Mar 27 06:37:35 2008 UTC

… …
31#define F_ALLOW_NONREF 0x00000100UL 31#define F_ALLOW_NONREF 0x00000100UL
32#define F_SHRINK 0x00000200UL 32#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 33#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 34#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 35#define F_RELAXED 0x00001000UL
36#define F_ALLOW_UNKNOWN 0x00002000UL
36 37
37#define F_MAXDEPTH 0xf8000000UL 38#define F_MAXDEPTH 0xf8000000UL
38#define S_MAXDEPTH 27 39#define S_MAXDEPTH 27
39#define F_MAXSIZE 0x01f00000UL 40#define F_MAXSIZE 0x01f00000UL
40#define S_MAXSIZE 20 41#define S_MAXSIZE 20
… …
78#endif 79#endif
79 80
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 81static HV *json_stash, *json_boolean_stash; // JSON::XS::
81static SV *json_true, *json_false; 82static SV *json_true, *json_false;
82 83
84enum {
85 INCR_M_WS = 0, // initial whitespace skipping, must be 0
86 INCR_M_STR, // inside string
87 INCR_M_BS, // inside backslash
88 INCR_M_JSON // outside anything, count nesting
89};
90
91#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)
92
83typedef struct { 93typedef struct {
84 U32 flags; 94 U32 flags;
85 SV *cb_object; 95 SV *cb_object;
86 HV *cb_sk_object; 96 HV *cb_sk_object;
97
98 // for the incremental parser
99 SV *incr_text; // the source text so far
100 STRLEN incr_pos; // the current offset into the text
101 int incr_nest; // {[]}-nesting level
102 int incr_mode;
87} JSON; 103} JSON;
88 104
89///////////////////////////////////////////////////////////////////////////// 105/////////////////////////////////////////////////////////////////////////////
90// utility functions 106// utility functions
107
108INLINE SV *
109get_bool (const char *name)
110{
111 SV *sv = get_sv (name, 1);
112
113 SvREADONLY_on (sv);
114 SvREADONLY_on (SvRV (sv));
115
116 return sv;
117}
91 118
92INLINE void 119INLINE void
93shrink (SV *sv) 120shrink (SV *sv)
94{ 121{
95 sv_utf8_downgrade (sv, 1); 122 sv_utf8_downgrade (sv, 1);
… …
423 450
424static void 451static void
425encode_hv (enc_t *enc, HV *hv) 452encode_hv (enc_t *enc, HV *hv)
426{ 453{
427 HE *he; 454 HE *he;
428 int count;
429 455
430 if (enc->indent >= enc->maxdepth) 456 if (enc->indent >= enc->maxdepth)
431 croak ("data structure too deep (hit recursion limit)"); 457 croak ("data structure too deep (hit recursion limit)");
432 458
433 encode_ch (enc, '{'); 459 encode_ch (enc, '{');
… …
617 643
618 if (len == 1 && *pv == '1') 644 if (len == 1 && *pv == '1')
619 encode_str (enc, "true", 4, 0); 645 encode_str (enc, "true", 4, 0);
620 else if (len == 1 && *pv == '0') 646 else if (len == 1 && *pv == '0')
621 encode_str (enc, "false", 5, 0); 647 encode_str (enc, "false", 5, 0);
648 else if (enc->json.flags & F_ALLOW_UNKNOWN)
649 encode_str (enc, "null", 4, 0);
622 else 650 else
623 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 651 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
624 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 652 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625 } 653 }
654 else if (enc->json.flags & F_ALLOW_UNKNOWN)
655 encode_str (enc, "null", 4, 0);
626 else 656 else
627 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 657 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
628 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 658 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629} 659}
630 660
… …
692 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 722 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693 } 723 }
694 } 724 }
695 else if (SvROK (sv)) 725 else if (SvROK (sv))
696 encode_rv (enc, SvRV (sv)); 726 encode_rv (enc, SvRV (sv));
697 else if (!SvOK (sv)) 727 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
698 encode_str (enc, "null", 4, 0); 728 encode_str (enc, "null", 4, 0);
699 else 729 else
700 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 730 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
701 SvPV_nolen (sv), SvFLAGS (sv)); 731 SvPV_nolen (sv), SvFLAGS (sv));
702} 732}
… …
1171 char *p = dec->cur; 1201 char *p = dec->cur;
1172 char *e = p + 24; // only try up to 24 bytes 1202 char *e = p + 24; // only try up to 24 bytes
1173 1203
1174 for (;;) 1204 for (;;)
1175 { 1205 {
1176 // the >= 0x80 is true on most architectures 1206 // the >= 0x80 is false on most architectures
1177 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1207 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1178 { 1208 {
1179 // slow path, back up and use decode_str 1209 // slow path, back up and use decode_str
1180 SV *key = decode_str (dec); 1210 SV *key = decode_str (dec);
1181 if (!key) 1211 if (!key)
… …
1329 case 't': 1359 case 't':
1330 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1360 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331 { 1361 {
1332 dec->cur += 4; 1362 dec->cur += 4;
1333#if JSON_SLOW 1363#if JSON_SLOW
1334 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1364 json_true = get_bool ("JSON::XS::true");
1335#endif 1365#endif
1336 return SvREFCNT_inc (json_true); 1366 return newSVsv (json_true);
1337 } 1367 }
1338 else 1368 else
1339 ERR ("'true' expected"); 1369 ERR ("'true' expected");
1340 1370
1341 break; 1371 break;
… …
1343 case 'f': 1373 case 'f':
1344 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1374 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345 { 1375 {
1346 dec->cur += 5; 1376 dec->cur += 5;
1347#if JSON_SLOW 1377#if JSON_SLOW
1348 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1378 json_false = get_bool ("JSON::XS::false");
1349#endif 1379#endif
1350 return SvREFCNT_inc (json_false); 1380 return newSVsv (json_false);
1351 } 1381 }
1352 else 1382 else
1353 ERR ("'false' expected"); 1383 ERR ("'false' expected");
1354 1384
1355 break; 1385 break;
… …
1373fail: 1403fail:
1374 return 0; 1404 return 0;
1375} 1405}
1376 1406
1377static SV * 1407static SV *
1378decode_json (SV *string, JSON *json, UV *offset_return) 1408decode_json (SV *string, JSON *json, STRLEN *offset_return)
1379{ 1409{
1380 dec_t dec; 1410 dec_t dec;
1381 UV offset; 1411 STRLEN offset;
1382 SV *sv; 1412 SV *sv;
1383 1413
1384 SvGETMAGIC (string); 1414 SvGETMAGIC (string);
1385 SvUPGRADE (string, SVt_PV); 1415 SvUPGRADE (string, SVt_PV);
1386 1416
… …
1459 1489
1460 return sv; 1490 return sv;
1461} 1491}
1462 1492
1463///////////////////////////////////////////////////////////////////////////// 1493/////////////////////////////////////////////////////////////////////////////
1494// incremental parser
1495
1496static void
1497incr_parse (JSON *self)
1498{
1499 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1500
1501 for (;;)
1502 {
1503 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1504 switch (self->incr_mode)
1505 {
1506 // only used for intiial whitespace skipping
1507 case INCR_M_WS:
1508 for (;;)
1509 {
1510 if (*p > 0x20)
1511 {
1512 self->incr_mode = INCR_M_JSON;
1513 goto incr_m_json;
1514 }
1515 else if (!*p)
1516 goto interrupt;
1517
1518 ++p;
1519 }
1520
1521 // skip a single char inside a string (for \\-processing)
1522 case INCR_M_BS:
1523 if (!*p)
1524 goto interrupt;
1525
1526 ++p;
1527 self->incr_mode = INCR_M_STR;
1528 goto incr_m_str;
1529
1530 // inside a string
1531 case INCR_M_STR:
1532 incr_m_str:
1533 for (;;)
1534 {
1535 if (*p == '"')
1536 {
1537 ++p;
1538 self->incr_mode = INCR_M_JSON;
1539
1540 if (!self->incr_nest)
1541 goto interrupt;
1542
1543 goto incr_m_json;
1544 }
1545 else if (*p == '\\')
1546 {
1547 ++p; // "virtually" consumes character after \
1548
1549 if (!*p) // if at end of string we have to switch modes
1550 {
1551 self->incr_mode = INCR_M_BS;
1552 goto interrupt;
1553 }
1554 }
1555 else if (!*p)
1556 goto interrupt;
1557
1558 ++p;
1559 }
1560
1561 // after initial ws, outside string
1562 case INCR_M_JSON:
1563 incr_m_json:
1564 for (;;)
1565 {
1566 switch (*p++)
1567 {
1568 case 0:
1569 --p;
1570 goto interrupt;
1571
1572 case 0x09:
1573 case 0x0a:
1574 case 0x0d:
1575 case 0x20:
1576 if (!self->incr_nest)
1577 {
1578 --p; // do not eat the whitespace, let the next round do it
1579 goto interrupt;
1580 }
1581 break;
1582
1583 case '"':
1584 self->incr_mode = INCR_M_STR;
1585 goto incr_m_str;
1586
1587 case '[':
1588 case '{':
1589 ++self->incr_nest;
1590 break;
1591
1592 case ']':
1593 case '}':
1594 if (!--self->incr_nest)
1595 goto interrupt;
1596 }
1597 }
1598 }
1599
1600 modechange:
1601 ;
1602 }
1603
1604interrupt:
1605 self->incr_pos = p - SvPVX (self->incr_text);
1606 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1607}
1608
1609/////////////////////////////////////////////////////////////////////////////
1464// XS interface functions 1610// XS interface functions
1465 1611
1466MODULE = JSON::XS PACKAGE = JSON::XS 1612MODULE = JSON::XS PACKAGE = JSON::XS
1467 1613
1468BOOT: 1614BOOT:
… …
1477 : -1; 1623 : -1;
1478 1624
1479 json_stash = gv_stashpv ("JSON::XS" , 1); 1625 json_stash = gv_stashpv ("JSON::XS" , 1);
1480 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1626 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1481 1627
1482 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1628 json_true = get_bool ("JSON::XS::true");
1483 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1629 json_false = get_bool ("JSON::XS::false");
1484} 1630}
1485 1631
1486PROTOTYPES: DISABLE 1632PROTOTYPES: DISABLE
1487 1633
1488void CLONE (...) 1634void CLONE (...)
… …
1516 allow_nonref = F_ALLOW_NONREF 1662 allow_nonref = F_ALLOW_NONREF
1517 shrink = F_SHRINK 1663 shrink = F_SHRINK
1518 allow_blessed = F_ALLOW_BLESSED 1664 allow_blessed = F_ALLOW_BLESSED
1519 convert_blessed = F_CONV_BLESSED 1665 convert_blessed = F_CONV_BLESSED
1520 relaxed = F_RELAXED 1666 relaxed = F_RELAXED
1667 allow_unknown = F_ALLOW_UNKNOWN
1521 PPCODE: 1668 PPCODE:
1522{ 1669{
1523 if (enable) 1670 if (enable)
1524 self->flags |= ix; 1671 self->flags |= ix;
1525 else 1672 else
… …
1540 get_allow_nonref = F_ALLOW_NONREF 1687 get_allow_nonref = F_ALLOW_NONREF
1541 get_shrink = F_SHRINK 1688 get_shrink = F_SHRINK
1542 get_allow_blessed = F_ALLOW_BLESSED 1689 get_allow_blessed = F_ALLOW_BLESSED
1543 get_convert_blessed = F_CONV_BLESSED 1690 get_convert_blessed = F_CONV_BLESSED
1544 get_relaxed = F_RELAXED 1691 get_relaxed = F_RELAXED
1692 get_allow_unknown = F_ALLOW_UNKNOWN
1545 PPCODE: 1693 PPCODE:
1546 XPUSHs (boolSV (self->flags & ix)); 1694 XPUSHs (boolSV (self->flags & ix));
1547 1695
1548void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1696void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1549 PPCODE: 1697 PPCODE:
… …
1628 XPUSHs (decode_json (jsonstr, self, 0)); 1776 XPUSHs (decode_json (jsonstr, self, 0));
1629 1777
1630void decode_prefix (JSON *self, SV *jsonstr) 1778void decode_prefix (JSON *self, SV *jsonstr)
1631 PPCODE: 1779 PPCODE:
1632{ 1780{
1633 UV offset; 1781 STRLEN offset;
1634 EXTEND (SP, 2); 1782 EXTEND (SP, 2);
1635 PUSHs (decode_json (jsonstr, self, &offset)); 1783 PUSHs (decode_json (jsonstr, self, &offset));
1636 PUSHs (sv_2mortal (newSVuv (offset))); 1784 PUSHs (sv_2mortal (newSVuv (offset)));
1785}
1786
1787void incr_parse (JSON *self, SV *jsonstr = 0)
1788 PPCODE:
1789{
1790 if (!self->incr_text)
1791 self->incr_text = newSVpvn ("", 0);
1792
1793 // append data, if any
1794 if (jsonstr)
1795 {
1796 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
1797 {
1798 /* utf-8-ness differs, need to upgrade */
1799 sv_utf8_upgrade (self->incr_text);
1800
1801 if (self->incr_pos)
1802 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1803 - (U8 *)SvPVX (self->incr_text);
1804 }
1805
1806 {
1807 STRLEN len;
1808 const char *str = SvPV (jsonstr, len);
1809 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
1810 Move (str, SvEND (self->incr_text), len, char);
1811 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1812 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1813 }
1814 }
1815
1816 if (GIMME_V != G_VOID)
1817 do
1818 {
1819 STRLEN offset;
1820
1821 if (!INCR_DONE (self))
1822 {
1823 incr_parse (self);
1824 if (!INCR_DONE (self))
1825 break;
1826 }
1827
1828 XPUSHs (decode_json (self->incr_text, self, &offset));
1829
1830 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1831 self->incr_pos -= offset;
1832 self->incr_nest = 0;
1833 self->incr_mode = 0;
1834 }
1835 while (GIMME_V == G_ARRAY);
1836}
1837
1838SV *incr_text (JSON *self)
1839 ATTRS: lvalue
1840 CODE:
1841{
1842 if (self->incr_pos)
1843 croak ("incr_text can not be called when the incremental parser already started parsing");
1844
1845 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1846}
1847 OUTPUT:
1848 RETVAL
1849
1850void incr_skip (JSON *self)
1851 CODE:
1852{
1853 if (self->incr_pos)
1854 {
1855 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
1856 self->incr_pos = 0;
1857 self->incr_nest = 0;
1858 self->incr_mode = 0;
1859 }
1637} 1860}
1638 1861
1639void DESTROY (JSON *self) 1862void DESTROY (JSON *self)
1640 CODE: 1863 CODE:
1641 SvREFCNT_dec (self->cb_sk_object); 1864 SvREFCNT_dec (self->cb_sk_object);
1642 SvREFCNT_dec (self->cb_object); 1865 SvREFCNT_dec (self->cb_object);
1866 SvREFCNT_dec (self->incr_text);
1643 1867
1644PROTOTYPES: ENABLE 1868PROTOTYPES: ENABLE
1645 1869
1646void encode_json (SV *scalar) 1870void encode_json (SV *scalar)
1871 ALIAS:
1872 to_json_ = 0
1873 encode_json = F_UTF8
1647 PPCODE: 1874 PPCODE:
1648{ 1875{
1649 JSON json = { F_DEFAULT | F_UTF8 }; 1876 JSON json = { F_DEFAULT | ix };
1650 XPUSHs (encode_json (scalar, &json)); 1877 XPUSHs (encode_json (scalar, &json));
1651} 1878}
1652 1879
1653void decode_json (SV *jsonstr) 1880void decode_json (SV *jsonstr)
1881 ALIAS:
1882 from_json_ = 0
1883 decode_json = F_UTF8
1654 PPCODE: 1884 PPCODE:
1655{ 1885{
1656 JSON json = { F_DEFAULT | F_UTF8 }; 1886 JSON json = { F_DEFAULT | ix };
1657 XPUSHs (decode_json (jsonstr, &json, 0)); 1887 XPUSHs (decode_json (jsonstr, &json, 0));
1658} 1888}
1659 1889
1890

Diff Legend

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