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.95 by root, Sun Feb 22 06:55:28 2009 UTC vs.
Revision 1.108 by root, Tue Aug 17 23:27:36 2010 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// 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
… …
41#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
42#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
43 44
44#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
45 46
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
48
46#define SB do { 49#define SB do {
47#define SE } while (0) 50#define SE } while (0)
48 51
49#if __GNUC__ >= 3 52#if __GNUC__ >= 3
50# define expect(expr,value) __builtin_expect ((expr), (value)) 53# define expect(expr,value) __builtin_expect ((expr), (value))
… …
76 79
77enum { 80enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 81 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 82 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 83 INCR_M_BS, // inside backslash
84 INCR_M_C0, // inside comment in initial whitespace sequence
85 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 86 INCR_M_JSON // outside anything, count nesting
82}; 87};
83 88
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 89#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 90
… …
175 *s++ = 0x80 | ( ch & 0x3f); 180 *s++ = 0x80 | ( ch & 0x3f);
176 181
177 return s; 182 return s;
178} 183}
179 184
185// convert offset pointer to character index, sv must be string
186static STRLEN
187ptr_to_index (SV *sv, char *offset)
188{
189 return SvUTF8 (sv)
190 ? utf8_distance (offset, SvPVX (sv))
191 : offset - SvPVX (sv);
192}
193
194/////////////////////////////////////////////////////////////////////////////
195// fp hell
196
197// scan a group of digits, and a trailing exponent
198static void
199json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
200{
201 UV uaccum = 0;
202 int eaccum = 0;
203
204 // if we recurse too deep, skip all remaining digits
205 // to avoid a stack overflow attack
206 if (expect_false (--maxdepth <= 0))
207 while (((U8)*s - '0') < 10)
208 ++s;
209
210 for (;;)
211 {
212 U8 dig = (U8)*s - '0';
213
214 if (expect_false (dig >= 10))
215 {
216 if (dig == (U8)((U8)'.' - (U8)'0'))
217 {
218 ++s;
219 json_atof_scan1 (s, accum, expo, 1, maxdepth);
220 }
221 else if ((dig | ' ') == 'e' - '0')
222 {
223 int exp2 = 0;
224 int neg = 0;
225
226 ++s;
227
228 if (*s == '-')
229 {
230 ++s;
231 neg = 1;
232 }
233 else if (*s == '+')
234 ++s;
235
236 while ((dig = (U8)*s - '0') < 10)
237 exp2 = exp2 * 10 + *s++ - '0';
238
239 *expo += neg ? -exp2 : exp2;
240 }
241
242 break;
243 }
244
245 ++s;
246
247 uaccum = uaccum * 10 + dig;
248 ++eaccum;
249
250 // if we have too many digits, then recurse for more
251 // we actually do this for rather few digits
252 if (uaccum >= (UV_MAX - 9) / 10)
253 {
254 if (postdp) *expo -= eaccum;
255 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
256 if (postdp) *expo += eaccum;
257
258 break;
259 }
260 }
261
262 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good
264 // implementation is hard to beat.
265 if (postdp) *expo -= eaccum;
266 *accum += uaccum * Perl_pow (10., *expo);
267 *expo += eaccum;
268}
269
270static NV
271json_atof (const char *s)
272{
273 NV accum = 0.;
274 int expo = 0;
275 int neg = 0;
276
277 if (*s == '-')
278 {
279 ++s;
280 neg = 1;
281 }
282
283 // a recursion depth of ten gives us >>500 bits
284 json_atof_scan1 (s, &accum, &expo, 0, 10);
285
286 return neg ? -accum : accum;
287}
180///////////////////////////////////////////////////////////////////////////// 288/////////////////////////////////////////////////////////////////////////////
181// encoder 289// encoder
182 290
183// structure used for encoding JSON 291// structure used for encoding JSON
184typedef struct 292typedef struct
… …
462 570
463 // for canonical output we have to sort by keys first 571 // for canonical output we have to sort by keys first
464 // actually, this is mostly due to the stupid so-called 572 // actually, this is mostly due to the stupid so-called
465 // security workaround added somewhere in 5.8.x 573 // security workaround added somewhere in 5.8.x
466 // that randomises hash orderings 574 // that randomises hash orderings
467 if (enc->json.flags & F_CANONICAL) 575 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
468 { 576 {
469 int count = hv_iterinit (hv); 577 int count = hv_iterinit (hv);
470 578
471 if (SvMAGICAL (hv)) 579 if (SvMAGICAL (hv))
472 { 580 {
… …
750 : enc.json.flags & F_LATIN1 ? 0x000100UL 858 : enc.json.flags & F_LATIN1 ? 0x000100UL
751 : 0x110000UL; 859 : 0x110000UL;
752 860
753 SvPOK_only (enc.sv); 861 SvPOK_only (enc.sv);
754 encode_sv (&enc, scalar); 862 encode_sv (&enc, scalar);
863 encode_nl (&enc);
755 864
756 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 865 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
757 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 866 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
758 867
759 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 868 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
939 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1048 else if (expect_true (ch >= 0x20 && ch < 0x80))
940 *cur++ = ch; 1049 *cur++ = ch;
941 else if (ch >= 0x80) 1050 else if (ch >= 0x80)
942 { 1051 {
943 STRLEN clen; 1052 STRLEN clen;
944 UV uch;
945 1053
946 --dec_cur; 1054 --dec_cur;
947 1055
948 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1056 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
949 if (clen == (STRLEN)-1) 1057 if (clen == (STRLEN)-1)
950 ERR ("malformed UTF-8 character in JSON string"); 1058 ERR ("malformed UTF-8 character in JSON string");
951 1059
952 do 1060 do
953 *cur++ = *dec_cur++; 1061 *cur++ = *dec_cur++;
… …
1075 1183
1076 // special case the rather common 1..5-digit-int case 1184 // special case the rather common 1..5-digit-int case
1077 if (*start == '-') 1185 if (*start == '-')
1078 switch (len) 1186 switch (len)
1079 { 1187 {
1080 case 2: return newSViv (-( start [1] - '0' * 1)); 1188 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1081 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1189 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1082 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1190 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1083 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1191 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1084 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1192 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1085 } 1193 }
1086 else 1194 else
1087 switch (len) 1195 switch (len)
1088 { 1196 {
1089 case 1: return newSViv ( start [0] - '0' * 1); 1197 case 1: return newSViv ( start [0] - '0' * 1);
1090 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1198 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1091 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1199 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1092 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1200 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1093 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1201 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1094 } 1202 }
1095 1203
1096 { 1204 {
1097 UV uv; 1205 UV uv;
1098 int numtype = grok_number (start, len, &uv); 1206 int numtype = grok_number (start, len, &uv);
… …
1107 } 1215 }
1108 1216
1109 len -= *start == '-' ? 1 : 0; 1217 len -= *start == '-' ? 1 : 0;
1110 1218
1111 // does not fit into IV or UV, try NV 1219 // does not fit into IV or UV, try NV
1112 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1220 if (len <= NV_DIG)
1113 #if defined (LDBL_DIG)
1114 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1115 #endif
1116 )
1117 // fits into NV without loss of precision 1221 // fits into NV without loss of precision
1118 return newSVnv (Atof (start)); 1222 return newSVnv (json_atof (start));
1119 1223
1120 // everything else fails, convert it to a string 1224 // everything else fails, convert it to a string
1121 return newSVpvn (start, dec->cur - start); 1225 return newSVpvn (start, dec->cur - start);
1122 } 1226 }
1123 1227
1124 // loss of precision here 1228 // loss of precision here
1125 return newSVnv (Atof (start)); 1229 return newSVnv (json_atof (start));
1126 1230
1127fail: 1231fail:
1128 return 0; 1232 return 0;
1129} 1233}
1130 1234
… …
1299 dSP; 1403 dSP;
1300 int count; 1404 int count;
1301 1405
1302 ENTER; SAVETMPS; PUSHMARK (SP); 1406 ENTER; SAVETMPS; PUSHMARK (SP);
1303 XPUSHs (HeVAL (he)); 1407 XPUSHs (HeVAL (he));
1408 sv_2mortal (sv);
1304 1409
1305 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1410 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1306 1411
1307 if (count == 1) 1412 if (count == 1)
1308 { 1413 {
1309 sv = newSVsv (POPs); 1414 sv = newSVsv (POPs);
1310 FREETMPS; LEAVE; 1415 FREETMPS; LEAVE;
1311 return sv; 1416 return sv;
1312 } 1417 }
1313 1418
1419 SvREFCNT_inc (sv);
1314 FREETMPS; LEAVE; 1420 FREETMPS; LEAVE;
1315 } 1421 }
1316 } 1422 }
1317 1423
1318 if (dec->json.cb_object) 1424 if (dec->json.cb_object)
… …
1408fail: 1514fail:
1409 return 0; 1515 return 0;
1410} 1516}
1411 1517
1412static SV * 1518static SV *
1413decode_json (SV *string, JSON *json, STRLEN *offset_return) 1519decode_json (SV *string, JSON *json, char **offset_return)
1414{ 1520{
1415 dec_t dec; 1521 dec_t dec;
1416 STRLEN offset;
1417 SV *sv; 1522 SV *sv;
1418 1523
1419 /* work around bugs in 5.10 where manipulating magic values 1524 /* work around bugs in 5.10 where manipulating magic values
1420 * will perl ignore the magic in subsequent accesses 1525 * will perl ignore the magic in subsequent accesses
1421 */ 1526 */
… …
1433 * and hope for the best. 1538 * and hope for the best.
1434 * Damnit, SvPV_nolen still trips over yet another assertion. This 1539 * Damnit, SvPV_nolen still trips over yet another assertion. This
1435 * assertion business is seriously broken, try yet another workaround 1540 * assertion business is seriously broken, try yet another workaround
1436 * for the broken -DDEBUGGING. 1541 * for the broken -DDEBUGGING.
1437 */ 1542 */
1543 {
1438#ifdef DEBUGGING 1544#ifdef DEBUGGING
1439 offset = SvOK (string) ? sv_len (string) : 0; 1545 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1440#else 1546#else
1441 offset = SvCUR (string); 1547 STRLEN offset = SvCUR (string);
1442#endif 1548#endif
1443 1549
1444 if (offset > json->max_size && json->max_size) 1550 if (offset > json->max_size && json->max_size)
1445 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1551 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1446 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1552 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1553 }
1447 1554
1448 if (json->flags & F_UTF8) 1555 if (DECODE_WANTS_OCTETS (json))
1449 sv_utf8_downgrade (string, 0); 1556 sv_utf8_downgrade (string, 0);
1450 else 1557 else
1451 sv_utf8_upgrade (string); 1558 sv_utf8_upgrade (string);
1452 1559
1453 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1560 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1463 1570
1464 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1571 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1465 1572
1466 decode_ws (&dec); 1573 decode_ws (&dec);
1467 sv = decode_sv (&dec); 1574 sv = decode_sv (&dec);
1575
1576 if (offset_return)
1577 *offset_return = dec.cur;
1468 1578
1469 if (!(offset_return || !sv)) 1579 if (!(offset_return || !sv))
1470 { 1580 {
1471 // check for trailing garbage 1581 // check for trailing garbage
1472 decode_ws (&dec); 1582 decode_ws (&dec);
… …
1475 { 1585 {
1476 dec.err = "garbage after JSON object"; 1586 dec.err = "garbage after JSON object";
1477 SvREFCNT_dec (sv); 1587 SvREFCNT_dec (sv);
1478 sv = 0; 1588 sv = 0;
1479 } 1589 }
1480 }
1481
1482 if (offset_return || !sv)
1483 {
1484 offset = dec.json.flags & F_UTF8
1485 ? dec.cur - SvPVX (string)
1486 : utf8_distance (dec.cur, SvPVX (string));
1487
1488 if (offset_return)
1489 *offset_return = offset;
1490 } 1590 }
1491 1591
1492 if (!sv) 1592 if (!sv)
1493 { 1593 {
1494 SV *uni = sv_newmortal (); 1594 SV *uni = sv_newmortal ();
… …
1500 SAVEVPTR (PL_curcop); 1600 SAVEVPTR (PL_curcop);
1501 PL_curcop = &cop; 1601 PL_curcop = &cop;
1502 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1602 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1503 LEAVE; 1603 LEAVE;
1504 1604
1505 croak ("%s, at character offset %d [\"%s\"]", 1605 croak ("%s, at character offset %d (before \"%s\")",
1506 dec.err, 1606 dec.err,
1507 (int)offset, 1607 ptr_to_index (string, dec.cur),
1508 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1608 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1509 } 1609 }
1510 1610
1511 sv = sv_2mortal (sv); 1611 sv = sv_2mortal (sv);
1512 1612
… …
1521 1621
1522static void 1622static void
1523incr_parse (JSON *self) 1623incr_parse (JSON *self)
1524{ 1624{
1525 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1625 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1626
1627 // the state machine here is a bit convoluted and could be simplified a lot
1628 // but this would make it slower, so...
1526 1629
1527 for (;;) 1630 for (;;)
1528 { 1631 {
1529 //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 1632 //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
1530 switch (self->incr_mode) 1633 switch (self->incr_mode)
1531 { 1634 {
1532 // only used for intiial whitespace skipping 1635 // only used for initial whitespace skipping
1533 case INCR_M_WS: 1636 case INCR_M_WS:
1534 for (;;) 1637 for (;;)
1535 { 1638 {
1536 if (*p > 0x20) 1639 if (*p > 0x20)
1537 { 1640 {
1641 if (*p == '#')
1642 {
1643 self->incr_mode = INCR_M_C0;
1644 goto incr_m_c;
1645 }
1646 else
1647 {
1538 self->incr_mode = INCR_M_JSON; 1648 self->incr_mode = INCR_M_JSON;
1539 goto incr_m_json; 1649 goto incr_m_json;
1650 }
1540 } 1651 }
1541 else if (!*p) 1652 else if (!*p)
1542 goto interrupt; 1653 goto interrupt;
1543 1654
1544 ++p; 1655 ++p;
… …
1550 goto interrupt; 1661 goto interrupt;
1551 1662
1552 ++p; 1663 ++p;
1553 self->incr_mode = INCR_M_STR; 1664 self->incr_mode = INCR_M_STR;
1554 goto incr_m_str; 1665 goto incr_m_str;
1666
1667 // inside #-style comments
1668 case INCR_M_C0:
1669 case INCR_M_C1:
1670 incr_m_c:
1671 for (;;)
1672 {
1673 if (*p == '\n')
1674 {
1675 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1676 break;
1677 }
1678 else if (!*p)
1679 goto interrupt;
1680
1681 ++p;
1682 }
1683
1684 break;
1555 1685
1556 // inside a string 1686 // inside a string
1557 case INCR_M_STR: 1687 case INCR_M_STR:
1558 incr_m_str: 1688 incr_m_str:
1559 for (;;) 1689 for (;;)
… …
1618 1748
1619 case ']': 1749 case ']':
1620 case '}': 1750 case '}':
1621 if (--self->incr_nest <= 0) 1751 if (--self->incr_nest <= 0)
1622 goto interrupt; 1752 goto interrupt;
1753 break;
1754
1755 case '#':
1756 self->incr_mode = INCR_M_C1;
1757 goto incr_m_c;
1623 } 1758 }
1624 } 1759 }
1625 } 1760 }
1626 1761
1627 modechange: 1762 modechange:
1628 ; 1763 ;
1629 } 1764 }
1630 1765
1631interrupt: 1766interrupt:
1632 self->incr_pos = p - SvPVX (self->incr_text); 1767 self->incr_pos = p - SvPVX (self->incr_text);
1768 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1633 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1769 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1634} 1770}
1635 1771
1636///////////////////////////////////////////////////////////////////////////// 1772/////////////////////////////////////////////////////////////////////////////
1637// XS interface functions 1773// XS interface functions
… …
1652 json_stash = gv_stashpv ("JSON::XS" , 1); 1788 json_stash = gv_stashpv ("JSON::XS" , 1);
1653 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1789 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1654 1790
1655 json_true = get_bool ("JSON::XS::true"); 1791 json_true = get_bool ("JSON::XS::true");
1656 json_false = get_bool ("JSON::XS::false"); 1792 json_false = get_bool ("JSON::XS::false");
1793
1794 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1657} 1795}
1658 1796
1659PROTOTYPES: DISABLE 1797PROTOTYPES: DISABLE
1660 1798
1661void CLONE (...) 1799void CLONE (...)
… …
1781 XPUSHs (decode_json (jsonstr, self, 0)); 1919 XPUSHs (decode_json (jsonstr, self, 0));
1782 1920
1783void decode_prefix (JSON *self, SV *jsonstr) 1921void decode_prefix (JSON *self, SV *jsonstr)
1784 PPCODE: 1922 PPCODE:
1785{ 1923{
1786 STRLEN offset; 1924 char *offset;
1787 EXTEND (SP, 2); 1925 EXTEND (SP, 2);
1788 PUSHs (decode_json (jsonstr, self, &offset)); 1926 PUSHs (decode_json (jsonstr, self, &offset));
1789 PUSHs (sv_2mortal (newSVuv (offset))); 1927 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1790} 1928}
1791 1929
1792void incr_parse (JSON *self, SV *jsonstr = 0) 1930void incr_parse (JSON *self, SV *jsonstr = 0)
1793 PPCODE: 1931 PPCODE:
1794{ 1932{
1795 if (!self->incr_text) 1933 if (!self->incr_text)
1796 self->incr_text = newSVpvn ("", 0); 1934 self->incr_text = newSVpvn ("", 0);
1935
1936 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1937 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1938 if (DECODE_WANTS_OCTETS (self))
1939 {
1940 if (self->incr_pos)
1941 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1942 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1943
1944 sv_utf8_downgrade (self->incr_text, 0);
1945 }
1946 else
1947 {
1948 sv_utf8_upgrade (self->incr_text);
1949
1950 if (self->incr_pos)
1951 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1952 - (U8 *)SvPVX (self->incr_text);
1953 }
1797 1954
1798 // append data, if any 1955 // append data, if any
1799 if (jsonstr) 1956 if (jsonstr)
1800 { 1957 {
1958 /* make sure both strings have same encoding */
1801 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 1959 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1960 if (SvUTF8 (jsonstr))
1961 sv_utf8_downgrade (jsonstr, 0);
1802 { 1962 else
1803 /* utf-8-ness differs, need to upgrade */
1804 sv_utf8_upgrade (self->incr_text); 1963 sv_utf8_upgrade (jsonstr);
1805 1964
1806 if (self->incr_pos) 1965 /* and then just blindly append */
1807 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1808 - (U8 *)SvPVX (self->incr_text);
1809 }
1810
1811 { 1966 {
1812 STRLEN len; 1967 STRLEN len;
1813 const char *str = SvPV (jsonstr, len); 1968 const char *str = SvPV (jsonstr, len);
1814 STRLEN cur = SvCUR (self->incr_text); 1969 STRLEN cur = SvCUR (self->incr_text);
1815 1970
… …
1823 } 1978 }
1824 1979
1825 if (GIMME_V != G_VOID) 1980 if (GIMME_V != G_VOID)
1826 do 1981 do
1827 { 1982 {
1828 STRLEN offset; 1983 char *offset;
1829 1984
1830 if (!INCR_DONE (self)) 1985 if (!INCR_DONE (self))
1831 { 1986 {
1832 incr_parse (self); 1987 incr_parse (self);
1833 1988
… …
1839 break; 1994 break;
1840 } 1995 }
1841 1996
1842 XPUSHs (decode_json (self->incr_text, self, &offset)); 1997 XPUSHs (decode_json (self->incr_text, self, &offset));
1843 1998
1844 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1845 self->incr_pos -= offset; 1999 self->incr_pos -= offset - SvPVX (self->incr_text);
1846 self->incr_nest = 0; 2000 self->incr_nest = 0;
1847 self->incr_mode = 0; 2001 self->incr_mode = 0;
2002
2003 sv_chop (self->incr_text, offset);
1848 } 2004 }
1849 while (GIMME_V == G_ARRAY); 2005 while (GIMME_V == G_ARRAY);
1850} 2006}
1851 2007
1852SV *incr_text (JSON *self) 2008SV *incr_text (JSON *self)
… …
1913 json_init (&json); 2069 json_init (&json);
1914 json.flags |= ix; 2070 json.flags |= ix;
1915 XPUSHs (decode_json (jsonstr, &json, 0)); 2071 XPUSHs (decode_json (jsonstr, &json, 0));
1916} 2072}
1917 2073
1918

Diff Legend

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