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.100 by root, Sat Sep 5 23:00:56 2009 UTC vs.
Revision 1.104 by root, Tue Jan 19 00:31:13 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)
198{
199 UV uaccum = 0;
200 int eaccum = 0;
201
202 for (;;)
203 {
204 U8 dig = (U8)*s - '0';
205
206 if (expect_false (dig >= 10))
207 {
208 if (dig == (U8)((U8)'.' - (U8)'0'))
209 {
210 ++s;
211 json_atof_scan1 (s, accum, expo, 1);
212 }
213 else if ((dig | ' ') == 'e' - '0')
214 {
215 int exp2 = 0;
216 int neg = 0;
217
218 ++s;
219
220 if (*s == '-')
221 {
222 ++s;
223 neg = 1;
224 }
225 else if (*s == '+')
226 ++s;
227
228 while ((dig = (U8)*s - '0') < 10)
229 exp2 = exp2 * 10 + *s++ - '0';
230
231 *expo += neg ? -exp2 : exp2;
232 }
233
234 break;
235 }
236
237 ++s;
238
239 uaccum = uaccum * 10 + dig;
240 ++eaccum;
241
242 // if we have too many digits, then recurse for more
243 // we actually do this for rather few digits
244 if (uaccum >= (UV_MAX - 9) / 10)
245 {
246 if (postdp) *expo -= eaccum;
247 json_atof_scan1 (s, accum, expo, postdp);
248 if (postdp) *expo += eaccum;
249
250 break;
251 }
252 }
253
254 if (postdp) *expo -= eaccum;
255 *accum += uaccum * pow (10., *expo);
256 *expo += eaccum;
257}
258
259static NV
260json_atof (const char *s)
261{
262 NV accum = 0.;
263 int expo = 0;
264 int neg = 0;
265
266 if (*s == '-')
267 {
268 ++s;
269 neg = 1;
270 }
271
272 json_atof_scan1 (s, &accum, &expo, 0);
273
274 return neg ? -accum : accum;
275}
189///////////////////////////////////////////////////////////////////////////// 276/////////////////////////////////////////////////////////////////////////////
190// encoder 277// encoder
191 278
192// structure used for encoding JSON 279// structure used for encoding JSON
193typedef struct 280typedef struct
… …
949 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1036 else if (expect_true (ch >= 0x20 && ch < 0x80))
950 *cur++ = ch; 1037 *cur++ = ch;
951 else if (ch >= 0x80) 1038 else if (ch >= 0x80)
952 { 1039 {
953 STRLEN clen; 1040 STRLEN clen;
954 UV uch;
955 1041
956 --dec_cur; 1042 --dec_cur;
957 1043
958 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1044 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
959 if (clen == (STRLEN)-1) 1045 if (clen == (STRLEN)-1)
960 ERR ("malformed UTF-8 character in JSON string"); 1046 ERR ("malformed UTF-8 character in JSON string");
961 1047
962 do 1048 do
963 *cur++ = *dec_cur++; 1049 *cur++ = *dec_cur++;
… …
1117 } 1203 }
1118 1204
1119 len -= *start == '-' ? 1 : 0; 1205 len -= *start == '-' ? 1 : 0;
1120 1206
1121 // does not fit into IV or UV, try NV 1207 // does not fit into IV or UV, try NV
1122 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1208 if (len <= NV_DIG)
1123 #if defined (LDBL_DIG)
1124 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1125 #endif
1126 )
1127 // fits into NV without loss of precision 1209 // fits into NV without loss of precision
1128 return newSVnv (Atof (start)); 1210 return newSVnv (json_atof (start));
1129 1211
1130 // everything else fails, convert it to a string 1212 // everything else fails, convert it to a string
1131 return newSVpvn (start, dec->cur - start); 1213 return newSVpvn (start, dec->cur - start);
1132 } 1214 }
1133 1215
1134 // loss of precision here 1216 // loss of precision here
1135 return newSVnv (Atof (start)); 1217 return newSVnv (json_atof (start));
1136 1218
1137fail: 1219fail:
1138 return 0; 1220 return 0;
1139} 1221}
1140 1222
… …
1526static void 1608static void
1527incr_parse (JSON *self) 1609incr_parse (JSON *self)
1528{ 1610{
1529 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1611 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1530 1612
1613 // the state machine here is a bit convoluted and could be simplified a lot
1614 // but this would make it slower, so...
1615
1531 for (;;) 1616 for (;;)
1532 { 1617 {
1533 //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 1618 //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
1534 switch (self->incr_mode) 1619 switch (self->incr_mode)
1535 { 1620 {
1536 // only used for intiial whitespace skipping 1621 // only used for initial whitespace skipping
1537 case INCR_M_WS: 1622 case INCR_M_WS:
1538 for (;;) 1623 for (;;)
1539 { 1624 {
1540 if (*p > 0x20) 1625 if (*p > 0x20)
1541 { 1626 {
1627 if (*p == '#')
1628 {
1629 self->incr_mode = INCR_M_C0;
1630 goto incr_m_c;
1631 }
1632 else
1633 {
1542 self->incr_mode = INCR_M_JSON; 1634 self->incr_mode = INCR_M_JSON;
1543 goto incr_m_json; 1635 goto incr_m_json;
1636 }
1544 } 1637 }
1545 else if (!*p) 1638 else if (!*p)
1546 goto interrupt; 1639 goto interrupt;
1547 1640
1548 ++p; 1641 ++p;
… …
1554 goto interrupt; 1647 goto interrupt;
1555 1648
1556 ++p; 1649 ++p;
1557 self->incr_mode = INCR_M_STR; 1650 self->incr_mode = INCR_M_STR;
1558 goto incr_m_str; 1651 goto incr_m_str;
1652
1653 // inside #-style comments
1654 case INCR_M_C0:
1655 case INCR_M_C1:
1656 incr_m_c:
1657 for (;;)
1658 {
1659 if (*p == '\n')
1660 {
1661 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1662 break;
1663 }
1664 else if (!*p)
1665 goto interrupt;
1666
1667 ++p;
1668 }
1669
1670 break;
1559 1671
1560 // inside a string 1672 // inside a string
1561 case INCR_M_STR: 1673 case INCR_M_STR:
1562 incr_m_str: 1674 incr_m_str:
1563 for (;;) 1675 for (;;)
… …
1622 1734
1623 case ']': 1735 case ']':
1624 case '}': 1736 case '}':
1625 if (--self->incr_nest <= 0) 1737 if (--self->incr_nest <= 0)
1626 goto interrupt; 1738 goto interrupt;
1739 break;
1740
1741 case '#':
1742 self->incr_mode = INCR_M_C1;
1743 goto incr_m_c;
1627 } 1744 }
1628 } 1745 }
1629 } 1746 }
1630 1747
1631 modechange: 1748 modechange:
1632 ; 1749 ;
1633 } 1750 }
1634 1751
1635interrupt: 1752interrupt:
1636 self->incr_pos = p - SvPVX (self->incr_text); 1753 self->incr_pos = p - SvPVX (self->incr_text);
1754 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1637 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1755 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1638} 1756}
1639 1757
1640///////////////////////////////////////////////////////////////////////////// 1758/////////////////////////////////////////////////////////////////////////////
1641// XS interface functions 1759// XS interface functions
… …
1925 json_init (&json); 2043 json_init (&json);
1926 json.flags |= ix; 2044 json.flags |= ix;
1927 XPUSHs (decode_json (jsonstr, &json, 0)); 2045 XPUSHs (decode_json (jsonstr, &json, 0));
1928} 2046}
1929 2047
1930

Diff Legend

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