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.99 by root, Sat Aug 8 10:06:02 2009 UTC vs.
Revision 1.107 by root, Wed Mar 17 01:45:43 2010 UTC

… …
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 20#endif
21 21
22// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 24
24#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
76 77
77enum { 78enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 79 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 80 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 81 INCR_M_BS, // inside backslash
82 INCR_M_C0, // inside comment in initial whitespace sequence
83 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 84 INCR_M_JSON // outside anything, count nesting
82}; 85};
83 86
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 87#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 88
… …
184 return SvUTF8 (sv) 187 return SvUTF8 (sv)
185 ? utf8_distance (offset, SvPVX (sv)) 188 ? utf8_distance (offset, SvPVX (sv))
186 : offset - SvPVX (sv); 189 : offset - SvPVX (sv);
187} 190}
188 191
192/////////////////////////////////////////////////////////////////////////////
193// fp hell
194
195// scan a group of digits, and a trailing exponent
196static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{
199 UV uaccum = 0;
200 int eaccum = 0;
201
202 // if we recurse too deep, skip all remaining digits
203 // to avoid a stack overflow attack
204 if (expect_false (--maxdepth <= 0))
205 while (((U8)*s - '0') < 10)
206 ++s;
207
208 for (;;)
209 {
210 U8 dig = (U8)*s - '0';
211
212 if (expect_false (dig >= 10))
213 {
214 if (dig == (U8)((U8)'.' - (U8)'0'))
215 {
216 ++s;
217 json_atof_scan1 (s, accum, expo, 1, maxdepth);
218 }
219 else if ((dig | ' ') == 'e' - '0')
220 {
221 int exp2 = 0;
222 int neg = 0;
223
224 ++s;
225
226 if (*s == '-')
227 {
228 ++s;
229 neg = 1;
230 }
231 else if (*s == '+')
232 ++s;
233
234 while ((dig = (U8)*s - '0') < 10)
235 exp2 = exp2 * 10 + *s++ - '0';
236
237 *expo += neg ? -exp2 : exp2;
238 }
239
240 break;
241 }
242
243 ++s;
244
245 uaccum = uaccum * 10 + dig;
246 ++eaccum;
247
248 // if we have too many digits, then recurse for more
249 // we actually do this for rather few digits
250 if (uaccum >= (UV_MAX - 9) / 10)
251 {
252 if (postdp) *expo -= eaccum;
253 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
254 if (postdp) *expo += eaccum;
255
256 break;
257 }
258 }
259
260 // this relies greatly on the quality of the pow ()
261 // implementation of the platform, but a good
262 // implementation is hard to beat.
263 if (postdp) *expo -= eaccum;
264 *accum += uaccum * Perl_pow (10., *expo);
265 *expo += eaccum;
266}
267
268static NV
269json_atof (const char *s)
270{
271 NV accum = 0.;
272 int expo = 0;
273 int neg = 0;
274
275 if (*s == '-')
276 {
277 ++s;
278 neg = 1;
279 }
280
281 // a recursion depth of ten gives us >>500 bits
282 json_atof_scan1 (s, &accum, &expo, 0, 10);
283
284 return neg ? -accum : accum;
285}
189///////////////////////////////////////////////////////////////////////////// 286/////////////////////////////////////////////////////////////////////////////
190// encoder 287// encoder
191 288
192// structure used for encoding JSON 289// structure used for encoding JSON
193typedef struct 290typedef struct
… …
759 : enc.json.flags & F_LATIN1 ? 0x000100UL 856 : enc.json.flags & F_LATIN1 ? 0x000100UL
760 : 0x110000UL; 857 : 0x110000UL;
761 858
762 SvPOK_only (enc.sv); 859 SvPOK_only (enc.sv);
763 encode_sv (&enc, scalar); 860 encode_sv (&enc, scalar);
861 encode_nl (&enc);
764 862
765 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 863 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
766 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 864 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
767 865
768 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 866 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
948 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1046 else if (expect_true (ch >= 0x20 && ch < 0x80))
949 *cur++ = ch; 1047 *cur++ = ch;
950 else if (ch >= 0x80) 1048 else if (ch >= 0x80)
951 { 1049 {
952 STRLEN clen; 1050 STRLEN clen;
953 UV uch;
954 1051
955 --dec_cur; 1052 --dec_cur;
956 1053
957 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1054 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
958 if (clen == (STRLEN)-1) 1055 if (clen == (STRLEN)-1)
959 ERR ("malformed UTF-8 character in JSON string"); 1056 ERR ("malformed UTF-8 character in JSON string");
960 1057
961 do 1058 do
962 *cur++ = *dec_cur++; 1059 *cur++ = *dec_cur++;
… …
1116 } 1213 }
1117 1214
1118 len -= *start == '-' ? 1 : 0; 1215 len -= *start == '-' ? 1 : 0;
1119 1216
1120 // does not fit into IV or UV, try NV 1217 // does not fit into IV or UV, try NV
1121 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1218 if (len <= NV_DIG)
1122 #if defined (LDBL_DIG)
1123 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1124 #endif
1125 )
1126 // fits into NV without loss of precision 1219 // fits into NV without loss of precision
1127 return newSVnv (Atof (start)); 1220 return newSVnv (json_atof (start));
1128 1221
1129 // everything else fails, convert it to a string 1222 // everything else fails, convert it to a string
1130 return newSVpvn (start, dec->cur - start); 1223 return newSVpvn (start, dec->cur - start);
1131 } 1224 }
1132 1225
1133 // loss of precision here 1226 // loss of precision here
1134 return newSVnv (Atof (start)); 1227 return newSVnv (json_atof (start));
1135 1228
1136fail: 1229fail:
1137 return 0; 1230 return 0;
1138} 1231}
1139 1232
… …
1308 dSP; 1401 dSP;
1309 int count; 1402 int count;
1310 1403
1311 ENTER; SAVETMPS; PUSHMARK (SP); 1404 ENTER; SAVETMPS; PUSHMARK (SP);
1312 XPUSHs (HeVAL (he)); 1405 XPUSHs (HeVAL (he));
1406 sv_2mortal (sv);
1313 1407
1314 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1408 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1315 1409
1316 if (count == 1) 1410 if (count == 1)
1317 { 1411 {
1318 sv = newSVsv (POPs); 1412 sv = newSVsv (POPs);
1319 FREETMPS; LEAVE; 1413 FREETMPS; LEAVE;
1320 return sv; 1414 return sv;
1321 } 1415 }
1322 1416
1417 SvREFCNT_inc (sv);
1323 FREETMPS; LEAVE; 1418 FREETMPS; LEAVE;
1324 } 1419 }
1325 } 1420 }
1326 1421
1327 if (dec->json.cb_object) 1422 if (dec->json.cb_object)
… …
1525static void 1620static void
1526incr_parse (JSON *self) 1621incr_parse (JSON *self)
1527{ 1622{
1528 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1623 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1529 1624
1625 // the state machine here is a bit convoluted and could be simplified a lot
1626 // but this would make it slower, so...
1627
1530 for (;;) 1628 for (;;)
1531 { 1629 {
1532 //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 1630 //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
1533 switch (self->incr_mode) 1631 switch (self->incr_mode)
1534 { 1632 {
1535 // only used for intiial whitespace skipping 1633 // only used for initial whitespace skipping
1536 case INCR_M_WS: 1634 case INCR_M_WS:
1537 for (;;) 1635 for (;;)
1538 { 1636 {
1539 if (*p > 0x20) 1637 if (*p > 0x20)
1540 { 1638 {
1639 if (*p == '#')
1640 {
1641 self->incr_mode = INCR_M_C0;
1642 goto incr_m_c;
1643 }
1644 else
1645 {
1541 self->incr_mode = INCR_M_JSON; 1646 self->incr_mode = INCR_M_JSON;
1542 goto incr_m_json; 1647 goto incr_m_json;
1648 }
1543 } 1649 }
1544 else if (!*p) 1650 else if (!*p)
1545 goto interrupt; 1651 goto interrupt;
1546 1652
1547 ++p; 1653 ++p;
… …
1553 goto interrupt; 1659 goto interrupt;
1554 1660
1555 ++p; 1661 ++p;
1556 self->incr_mode = INCR_M_STR; 1662 self->incr_mode = INCR_M_STR;
1557 goto incr_m_str; 1663 goto incr_m_str;
1664
1665 // inside #-style comments
1666 case INCR_M_C0:
1667 case INCR_M_C1:
1668 incr_m_c:
1669 for (;;)
1670 {
1671 if (*p == '\n')
1672 {
1673 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1674 break;
1675 }
1676 else if (!*p)
1677 goto interrupt;
1678
1679 ++p;
1680 }
1681
1682 break;
1558 1683
1559 // inside a string 1684 // inside a string
1560 case INCR_M_STR: 1685 case INCR_M_STR:
1561 incr_m_str: 1686 incr_m_str:
1562 for (;;) 1687 for (;;)
… …
1621 1746
1622 case ']': 1747 case ']':
1623 case '}': 1748 case '}':
1624 if (--self->incr_nest <= 0) 1749 if (--self->incr_nest <= 0)
1625 goto interrupt; 1750 goto interrupt;
1751 break;
1752
1753 case '#':
1754 self->incr_mode = INCR_M_C1;
1755 goto incr_m_c;
1626 } 1756 }
1627 } 1757 }
1628 } 1758 }
1629 1759
1630 modechange: 1760 modechange:
1631 ; 1761 ;
1632 } 1762 }
1633 1763
1634interrupt: 1764interrupt:
1635 self->incr_pos = p - SvPVX (self->incr_text); 1765 self->incr_pos = p - SvPVX (self->incr_text);
1766 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1636 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1767 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1637} 1768}
1638 1769
1639///////////////////////////////////////////////////////////////////////////// 1770/////////////////////////////////////////////////////////////////////////////
1640// XS interface functions 1771// XS interface functions
… …
1924 json_init (&json); 2055 json_init (&json);
1925 json.flags |= ix; 2056 json.flags |= ix;
1926 XPUSHs (decode_json (jsonstr, &json, 0)); 2057 XPUSHs (decode_json (jsonstr, &json, 0));
1927} 2058}
1928 2059
1929

Diff Legend

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