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.85 by root, Sat Apr 5 18:15:46 2008 UTC vs.
Revision 1.100 by root, Sat Sep 5 23:00:56 2009 UTC

… …
12#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 14#endif
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// guarentees, 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 20#endif
21 21
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
… …
79 INCR_M_STR, // inside string 79 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 80 INCR_M_BS, // inside backslash
81 INCR_M_JSON // outside anything, count nesting 81 INCR_M_JSON // outside anything, count nesting
82}; 82};
83 83
84#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON) 84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 85
86typedef struct { 86typedef struct {
87 U32 flags; 87 U32 flags;
88 U32 max_depth; 88 U32 max_depth;
89 STRLEN max_size; 89 STRLEN max_size;
… …
92 HV *cb_sk_object; 92 HV *cb_sk_object;
93 93
94 // for the incremental parser 94 // for the incremental parser
95 SV *incr_text; // the source text so far 95 SV *incr_text; // the source text so far
96 STRLEN incr_pos; // the current offset into the text 96 STRLEN incr_pos; // the current offset into the text
97 unsigned char incr_nest; // {[]}-nesting level 97 int incr_nest; // {[]}-nesting level
98 unsigned char incr_mode; 98 unsigned char incr_mode;
99} JSON; 99} JSON;
100 100
101INLINE void 101INLINE void
102json_init (JSON *json) 102json_init (JSON *json)
… …
121 121
122INLINE void 122INLINE void
123shrink (SV *sv) 123shrink (SV *sv)
124{ 124{
125 sv_utf8_downgrade (sv, 1); 125 sv_utf8_downgrade (sv, 1);
126
126 if (SvLEN (sv) > SvCUR (sv) + 1) 127 if (SvLEN (sv) > SvCUR (sv) + 1)
127 { 128 {
128#ifdef SvPV_shrink_to_cur 129#ifdef SvPV_shrink_to_cur
129 SvPV_shrink_to_cur (sv); 130 SvPV_shrink_to_cur (sv);
130#elif defined (SvPV_renew) 131#elif defined (SvPV_renew)
… …
174 *s++ = 0x80 | ( ch & 0x3f); 175 *s++ = 0x80 | ( ch & 0x3f);
175 176
176 return s; 177 return s;
177} 178}
178 179
180// convert offset pointer to character index, sv must be string
181static STRLEN
182ptr_to_index (SV *sv, char *offset)
183{
184 return SvUTF8 (sv)
185 ? utf8_distance (offset, SvPVX (sv))
186 : offset - SvPVX (sv);
187}
188
179///////////////////////////////////////////////////////////////////////////// 189/////////////////////////////////////////////////////////////////////////////
180// encoder 190// encoder
181 191
182// structure used for encoding JSON 192// structure used for encoding JSON
183typedef struct 193typedef struct
… …
193INLINE void 203INLINE void
194need (enc_t *enc, STRLEN len) 204need (enc_t *enc, STRLEN len)
195{ 205{
196 if (expect_false (enc->cur + len >= enc->end)) 206 if (expect_false (enc->cur + len >= enc->end))
197 { 207 {
198 STRLEN cur = enc->cur - SvPVX (enc->sv); 208 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
199 SvGROW (enc->sv, cur + len + 1); 209 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
200 enc->cur = SvPVX (enc->sv) + cur; 210 enc->cur = SvPVX (enc->sv) + cur;
201 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 211 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
202 } 212 }
203} 213}
204 214
… …
279 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 289 (int)((uch - 0x10000) % 0x400 + 0xDC00));
280 enc->cur += 12; 290 enc->cur += 12;
281 } 291 }
282 else 292 else
283 { 293 {
284 static char hexdigit [16] = "0123456789abcdef";
285 need (enc, len += 5); 294 need (enc, len += 5);
286 *enc->cur++ = '\\'; 295 *enc->cur++ = '\\';
287 *enc->cur++ = 'u'; 296 *enc->cur++ = 'u';
288 *enc->cur++ = hexdigit [ uch >> 12 ]; 297 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
289 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 298 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
290 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 299 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
291 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 300 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
292 } 301 }
293 302
294 str += clen; 303 str += clen;
295 } 304 }
296 else if (enc->json.flags & F_LATIN1) 305 else if (enc->json.flags & F_LATIN1)
… …
460 469
461 encode_ch (enc, '{'); 470 encode_ch (enc, '{');
462 471
463 // for canonical output we have to sort by keys first 472 // for canonical output we have to sort by keys first
464 // actually, this is mostly due to the stupid so-called 473 // actually, this is mostly due to the stupid so-called
465 // security workaround added somewhere in 5.8.x. 474 // security workaround added somewhere in 5.8.x
466 // that randomises hash orderings 475 // that randomises hash orderings
467 if (enc->json.flags & F_CANONICAL) 476 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
468 { 477 {
469 int count = hv_iterinit (hv); 478 int count = hv_iterinit (hv);
470 479
471 if (SvMAGICAL (hv)) 480 if (SvMAGICAL (hv))
472 { 481 {
… …
750 : enc.json.flags & F_LATIN1 ? 0x000100UL 759 : enc.json.flags & F_LATIN1 ? 0x000100UL
751 : 0x110000UL; 760 : 0x110000UL;
752 761
753 SvPOK_only (enc.sv); 762 SvPOK_only (enc.sv);
754 encode_sv (&enc, scalar); 763 encode_sv (&enc, scalar);
764 encode_nl (&enc);
755 765
756 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 766 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
757 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 767 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
758 768
759 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 769 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
970 { 980 {
971 STRLEN len = cur - buf; 981 STRLEN len = cur - buf;
972 982
973 if (sv) 983 if (sv)
974 { 984 {
975 SvGROW (sv, SvCUR (sv) + len + 1); 985 STRLEN cur = SvCUR (sv);
986
987 if (SvLEN (sv) <= cur + len)
988 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
989
976 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 990 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
977 SvCUR_set (sv, SvCUR (sv) + len); 991 SvCUR_set (sv, SvCUR (sv) + len);
978 } 992 }
979 else 993 else
980 sv = newSVpvn (buf, len); 994 sv = newSVpvn (buf, len);
… …
1071 1085
1072 // special case the rather common 1..5-digit-int case 1086 // special case the rather common 1..5-digit-int case
1073 if (*start == '-') 1087 if (*start == '-')
1074 switch (len) 1088 switch (len)
1075 { 1089 {
1076 case 2: return newSViv (-( start [1] - '0' * 1)); 1090 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1077 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1091 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1078 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1092 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1079 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1093 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1080 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1094 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1081 } 1095 }
1082 else 1096 else
1083 switch (len) 1097 switch (len)
1084 { 1098 {
1085 case 1: return newSViv ( start [0] - '0' * 1); 1099 case 1: return newSViv ( start [0] - '0' * 1);
1086 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1100 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1087 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1101 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1088 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1102 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1089 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1103 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1090 } 1104 }
1091 1105
1092 { 1106 {
1093 UV uv; 1107 UV uv;
1094 int numtype = grok_number (start, len, &uv); 1108 int numtype = grok_number (start, len, &uv);
… …
1404fail: 1418fail:
1405 return 0; 1419 return 0;
1406} 1420}
1407 1421
1408static SV * 1422static SV *
1409decode_json (SV *string, JSON *json, STRLEN *offset_return) 1423decode_json (SV *string, JSON *json, char **offset_return)
1410{ 1424{
1411 dec_t dec; 1425 dec_t dec;
1412 STRLEN offset;
1413 SV *sv; 1426 SV *sv;
1414 1427
1428 /* work around bugs in 5.10 where manipulating magic values
1429 * will perl ignore the magic in subsequent accesses
1430 */
1415 SvGETMAGIC (string); 1431 /*SvGETMAGIC (string);*/
1432 if (SvMAGICAL (string))
1433 string = sv_2mortal (newSVsv (string));
1434
1416 SvUPGRADE (string, SVt_PV); 1435 SvUPGRADE (string, SVt_PV);
1417 1436
1437 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1438 * assertion with -DDEBUGGING, although SvCUR is documented to
1439 * return the xpv_cur field which certainly exists after upgrading.
1440 * according to nicholas clark, calling SvPOK fixes this.
1441 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1442 * and hope for the best.
1443 * Damnit, SvPV_nolen still trips over yet another assertion. This
1444 * assertion business is seriously broken, try yet another workaround
1445 * for the broken -DDEBUGGING.
1446 */
1447 {
1448#ifdef DEBUGGING
1449 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1450#else
1451 STRLEN offset = SvCUR (string);
1452#endif
1453
1418 if (SvCUR (string) > json->max_size && json->max_size) 1454 if (offset > json->max_size && json->max_size)
1419 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1455 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1420 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1456 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1457 }
1421 1458
1422 if (json->flags & F_UTF8) 1459 if (json->flags & F_UTF8)
1423 sv_utf8_downgrade (string, 0); 1460 sv_utf8_downgrade (string, 0);
1424 else 1461 else
1425 sv_utf8_upgrade (string); 1462 sv_utf8_upgrade (string);
… …
1437 1474
1438 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1475 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1439 1476
1440 decode_ws (&dec); 1477 decode_ws (&dec);
1441 sv = decode_sv (&dec); 1478 sv = decode_sv (&dec);
1479
1480 if (offset_return)
1481 *offset_return = dec.cur;
1442 1482
1443 if (!(offset_return || !sv)) 1483 if (!(offset_return || !sv))
1444 { 1484 {
1445 // check for trailing garbage 1485 // check for trailing garbage
1446 decode_ws (&dec); 1486 decode_ws (&dec);
… …
1449 { 1489 {
1450 dec.err = "garbage after JSON object"; 1490 dec.err = "garbage after JSON object";
1451 SvREFCNT_dec (sv); 1491 SvREFCNT_dec (sv);
1452 sv = 0; 1492 sv = 0;
1453 } 1493 }
1454 }
1455
1456 if (offset_return || !sv)
1457 {
1458 offset = dec.json.flags & F_UTF8
1459 ? dec.cur - SvPVX (string)
1460 : utf8_distance (dec.cur, SvPVX (string));
1461
1462 if (offset_return)
1463 *offset_return = offset;
1464 } 1494 }
1465 1495
1466 if (!sv) 1496 if (!sv)
1467 { 1497 {
1468 SV *uni = sv_newmortal (); 1498 SV *uni = sv_newmortal ();
… …
1474 SAVEVPTR (PL_curcop); 1504 SAVEVPTR (PL_curcop);
1475 PL_curcop = &cop; 1505 PL_curcop = &cop;
1476 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1506 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1477 LEAVE; 1507 LEAVE;
1478 1508
1479 croak ("%s, at character offset %d [\"%s\"]", 1509 croak ("%s, at character offset %d (before \"%s\")",
1480 dec.err, 1510 dec.err,
1481 (int)offset, 1511 ptr_to_index (string, dec.cur),
1482 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1512 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1483 } 1513 }
1484 1514
1485 sv = sv_2mortal (sv); 1515 sv = sv_2mortal (sv);
1486 1516
… …
1590 croak (ERR_NESTING_EXCEEDED); 1620 croak (ERR_NESTING_EXCEEDED);
1591 break; 1621 break;
1592 1622
1593 case ']': 1623 case ']':
1594 case '}': 1624 case '}':
1595 if (!--self->incr_nest) 1625 if (--self->incr_nest <= 0)
1596 goto interrupt; 1626 goto interrupt;
1597 } 1627 }
1598 } 1628 }
1599 } 1629 }
1600 1630
… …
1626 json_stash = gv_stashpv ("JSON::XS" , 1); 1656 json_stash = gv_stashpv ("JSON::XS" , 1);
1627 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1657 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1628 1658
1629 json_true = get_bool ("JSON::XS::true"); 1659 json_true = get_bool ("JSON::XS::true");
1630 json_false = get_bool ("JSON::XS::false"); 1660 json_false = get_bool ("JSON::XS::false");
1661
1662 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1631} 1663}
1632 1664
1633PROTOTYPES: DISABLE 1665PROTOTYPES: DISABLE
1634 1666
1635void CLONE (...) 1667void CLONE (...)
… …
1755 XPUSHs (decode_json (jsonstr, self, 0)); 1787 XPUSHs (decode_json (jsonstr, self, 0));
1756 1788
1757void decode_prefix (JSON *self, SV *jsonstr) 1789void decode_prefix (JSON *self, SV *jsonstr)
1758 PPCODE: 1790 PPCODE:
1759{ 1791{
1760 STRLEN offset; 1792 char *offset;
1761 EXTEND (SP, 2); 1793 EXTEND (SP, 2);
1762 PUSHs (decode_json (jsonstr, self, &offset)); 1794 PUSHs (decode_json (jsonstr, self, &offset));
1763 PUSHs (sv_2mortal (newSVuv (offset))); 1795 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1764} 1796}
1765 1797
1766void incr_parse (JSON *self, SV *jsonstr = 0) 1798void incr_parse (JSON *self, SV *jsonstr = 0)
1767 PPCODE: 1799 PPCODE:
1768{ 1800{
… …
1770 self->incr_text = newSVpvn ("", 0); 1802 self->incr_text = newSVpvn ("", 0);
1771 1803
1772 // append data, if any 1804 // append data, if any
1773 if (jsonstr) 1805 if (jsonstr)
1774 { 1806 {
1775 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 1807 if (SvUTF8 (jsonstr))
1776 { 1808 {
1809 if (!SvUTF8 (self->incr_text))
1810 {
1777 /* utf-8-ness differs, need to upgrade */ 1811 /* utf-8-ness differs, need to upgrade */
1778 sv_utf8_upgrade (self->incr_text); 1812 sv_utf8_upgrade (self->incr_text);
1779 1813
1780 if (self->incr_pos) 1814 if (self->incr_pos)
1781 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos) 1815 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1782 - (U8 *)SvPVX (self->incr_text); 1816 - (U8 *)SvPVX (self->incr_text);
1817 }
1783 } 1818 }
1819 else if (SvUTF8 (self->incr_text))
1820 sv_utf8_upgrade (jsonstr);
1784 1821
1785 { 1822 {
1786 STRLEN len; 1823 STRLEN len;
1787 const char *str = SvPV (jsonstr, len); 1824 const char *str = SvPV (jsonstr, len);
1788 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 1825 STRLEN cur = SvCUR (self->incr_text);
1826
1827 if (SvLEN (self->incr_text) <= cur + len)
1828 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1829
1789 Move (str, SvEND (self->incr_text), len, char); 1830 Move (str, SvEND (self->incr_text), len, char);
1790 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 1831 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1791 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 1832 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1792 } 1833 }
1793 } 1834 }
1794 1835
1795 if (GIMME_V != G_VOID) 1836 if (GIMME_V != G_VOID)
1796 do 1837 do
1797 { 1838 {
1798 STRLEN offset; 1839 char *offset;
1799 1840
1800 if (!INCR_DONE (self)) 1841 if (!INCR_DONE (self))
1801 { 1842 {
1802 incr_parse (self); 1843 incr_parse (self);
1803 1844
… …
1809 break; 1850 break;
1810 } 1851 }
1811 1852
1812 XPUSHs (decode_json (self->incr_text, self, &offset)); 1853 XPUSHs (decode_json (self->incr_text, self, &offset));
1813 1854
1814 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1815 self->incr_pos -= offset; 1855 self->incr_pos -= offset - SvPVX (self->incr_text);
1816 self->incr_nest = 0; 1856 self->incr_nest = 0;
1817 self->incr_mode = 0; 1857 self->incr_mode = 0;
1858
1859 sv_chop (self->incr_text, offset);
1818 } 1860 }
1819 while (GIMME_V == G_ARRAY); 1861 while (GIMME_V == G_ARRAY);
1820} 1862}
1821 1863
1822SV *incr_text (JSON *self) 1864SV *incr_text (JSON *self)
… …
1841 self->incr_nest = 0; 1883 self->incr_nest = 0;
1842 self->incr_mode = 0; 1884 self->incr_mode = 0;
1843 } 1885 }
1844} 1886}
1845 1887
1888void incr_reset (JSON *self)
1889 CODE:
1890{
1891 SvREFCNT_dec (self->incr_text);
1892 self->incr_text = 0;
1893 self->incr_pos = 0;
1894 self->incr_nest = 0;
1895 self->incr_mode = 0;
1896}
1897
1846void DESTROY (JSON *self) 1898void DESTROY (JSON *self)
1847 CODE: 1899 CODE:
1848 SvREFCNT_dec (self->cb_sk_object); 1900 SvREFCNT_dec (self->cb_sk_object);
1849 SvREFCNT_dec (self->cb_object); 1901 SvREFCNT_dec (self->cb_object);
1850 SvREFCNT_dec (self->incr_text); 1902 SvREFCNT_dec (self->incr_text);

Diff Legend

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