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.101 by root, Tue Sep 8 18:00:03 2009 UTC vs.
Revision 1.117 by root, Fri Oct 25 20:19:57 2013 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
… …
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))
… …
69#else 72#else
70# define JSON_SLOW 0 73# define JSON_SLOW 0
71# define JSON_STASH json_stash 74# define JSON_STASH json_stash
72#endif 75#endif
73 76
77// the amount of HEs to allocate on the stack, when sorting keys
78#define STACK_HES 64
79
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 80static HV *json_stash, *json_boolean_stash; // JSON::XS::
75static SV *json_true, *json_false; 81static SV *json_true, *json_false;
76 82
77enum { 83enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 84 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 85 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 86 INCR_M_BS, // inside backslash
87 INCR_M_C0, // inside comment in initial whitespace sequence
88 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 89 INCR_M_JSON // outside anything, count nesting
82}; 90};
83 91
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 92#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 93
… …
184 return SvUTF8 (sv) 192 return SvUTF8 (sv)
185 ? utf8_distance (offset, SvPVX (sv)) 193 ? utf8_distance (offset, SvPVX (sv))
186 : offset - SvPVX (sv); 194 : offset - SvPVX (sv);
187} 195}
188 196
197/////////////////////////////////////////////////////////////////////////////
198// fp hell
199
200// scan a group of digits, and a trailing exponent
201static void
202json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
203{
204 UV uaccum = 0;
205 int eaccum = 0;
206
207 // if we recurse too deep, skip all remaining digits
208 // to avoid a stack overflow attack
209 if (expect_false (--maxdepth <= 0))
210 while (((U8)*s - '0') < 10)
211 ++s;
212
213 for (;;)
214 {
215 U8 dig = (U8)*s - '0';
216
217 if (expect_false (dig >= 10))
218 {
219 if (dig == (U8)((U8)'.' - (U8)'0'))
220 {
221 ++s;
222 json_atof_scan1 (s, accum, expo, 1, maxdepth);
223 }
224 else if ((dig | ' ') == 'e' - '0')
225 {
226 int exp2 = 0;
227 int neg = 0;
228
229 ++s;
230
231 if (*s == '-')
232 {
233 ++s;
234 neg = 1;
235 }
236 else if (*s == '+')
237 ++s;
238
239 while ((dig = (U8)*s - '0') < 10)
240 exp2 = exp2 * 10 + *s++ - '0';
241
242 *expo += neg ? -exp2 : exp2;
243 }
244
245 break;
246 }
247
248 ++s;
249
250 uaccum = uaccum * 10 + dig;
251 ++eaccum;
252
253 // if we have too many digits, then recurse for more
254 // we actually do this for rather few digits
255 if (uaccum >= (UV_MAX - 9) / 10)
256 {
257 if (postdp) *expo -= eaccum;
258 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
259 if (postdp) *expo += eaccum;
260
261 break;
262 }
263 }
264
265 // this relies greatly on the quality of the pow ()
266 // implementation of the platform, but a good
267 // implementation is hard to beat.
268 // (IEEE 754 conformant ones are required to be exact)
269 if (postdp) *expo -= eaccum;
270 *accum += uaccum * Perl_pow (10., *expo);
271 *expo += eaccum;
272}
273
274static NV
275json_atof (const char *s)
276{
277 NV accum = 0.;
278 int expo = 0;
279 int neg = 0;
280
281 if (*s == '-')
282 {
283 ++s;
284 neg = 1;
285 }
286
287 // a recursion depth of ten gives us >>500 bits
288 json_atof_scan1 (s, &accum, &expo, 0, 10);
289
290 return neg ? -accum : accum;
291}
189///////////////////////////////////////////////////////////////////////////// 292/////////////////////////////////////////////////////////////////////////////
190// encoder 293// encoder
191 294
192// structure used for encoding JSON 295// structure used for encoding JSON
193typedef struct 296typedef struct
… …
380 483
381 if (enc->indent >= enc->json.max_depth) 484 if (enc->indent >= enc->json.max_depth)
382 croak (ERR_NESTING_EXCEEDED); 485 croak (ERR_NESTING_EXCEEDED);
383 486
384 encode_ch (enc, '['); 487 encode_ch (enc, '[');
385 488
386 if (len >= 0) 489 if (len >= 0)
387 { 490 {
388 encode_nl (enc); ++enc->indent; 491 encode_nl (enc); ++enc->indent;
389 492
390 for (i = 0; i <= len; ++i) 493 for (i = 0; i <= len; ++i)
… …
402 encode_comma (enc); 505 encode_comma (enc);
403 } 506 }
404 507
405 encode_nl (enc); --enc->indent; encode_indent (enc); 508 encode_nl (enc); --enc->indent; encode_indent (enc);
406 } 509 }
407 510
408 encode_ch (enc, ']'); 511 encode_ch (enc, ']');
409} 512}
410 513
411static void 514static void
412encode_hk (enc_t *enc, HE *he) 515encode_hk (enc_t *enc, HE *he)
… …
416 if (HeKLEN (he) == HEf_SVKEY) 519 if (HeKLEN (he) == HEf_SVKEY)
417 { 520 {
418 SV *sv = HeSVKEY (he); 521 SV *sv = HeSVKEY (he);
419 STRLEN len; 522 STRLEN len;
420 char *str; 523 char *str;
421 524
422 SvGETMAGIC (sv); 525 SvGETMAGIC (sv);
423 str = SvPV (sv, len); 526 str = SvPV (sv, len);
424 527
425 encode_str (enc, str, len, SvUTF8 (sv)); 528 encode_str (enc, str, len, SvUTF8 (sv));
426 } 529 }
… …
492 } 595 }
493 596
494 if (count) 597 if (count)
495 { 598 {
496 int i, fast = 1; 599 int i, fast = 1;
497#if defined(__BORLANDC__) || defined(_MSC_VER) 600 HE *hes_stack [STACK_HES];
498 HE **hes = _alloca (count * sizeof (HE)); 601 HE **hes = hes_stack;
499#else 602
500 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 603 // allocate larger arrays on the heap
501#endif 604 if (count > STACK_HES)
605 {
606 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
607 hes = (HE **)SvPVX (sv);
608 }
502 609
503 i = 0; 610 i = 0;
504 while ((he = hv_iternext (hv))) 611 while ((he = hv_iternext (hv)))
505 { 612 {
506 hes [i++] = he; 613 hes [i++] = he;
… …
725 } 832 }
726 else 833 else
727 { 834 {
728 // large integer, use the (rather slow) snprintf way. 835 // large integer, use the (rather slow) snprintf way.
729 need (enc, IVUV_MAXCHARS); 836 need (enc, IVUV_MAXCHARS);
730 enc->cur += 837 enc->cur +=
731 SvIsUV(sv) 838 SvIsUV(sv)
732 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 839 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
733 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 840 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
734 } 841 }
735 } 842 }
736 else if (SvROK (sv)) 843 else if (SvROK (sv))
737 encode_rv (enc, SvRV (sv)); 844 encode_rv (enc, SvRV (sv));
738 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 845 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
739 encode_str (enc, "null", 4, 0); 846 encode_str (enc, "null", 4, 0);
740 else 847 else
741 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 848 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
742 SvPV_nolen (sv), SvFLAGS (sv)); 849 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
743} 850}
744 851
745static SV * 852static SV *
746encode_json (SV *scalar, JSON *json) 853encode_json (SV *scalar, JSON *json)
747{ 854{
… …
1116 } 1223 }
1117 1224
1118 len -= *start == '-' ? 1 : 0; 1225 len -= *start == '-' ? 1 : 0;
1119 1226
1120 // does not fit into IV or UV, try NV 1227 // does not fit into IV or UV, try NV
1121 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1228 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 1229 // fits into NV without loss of precision
1127 return newSVnv (Atof (start)); 1230 return newSVnv (json_atof (start));
1128 1231
1129 // everything else fails, convert it to a string 1232 // everything else fails, convert it to a string
1130 return newSVpvn (start, dec->cur - start); 1233 return newSVpvn (start, dec->cur - start);
1131 } 1234 }
1132 1235
1133 // loss of precision here 1236 // loss of precision here
1134 return newSVnv (Atof (start)); 1237 return newSVnv (json_atof (start));
1135 1238
1136fail: 1239fail:
1137 return 0; 1240 return 0;
1138} 1241}
1139 1242
… …
1163 if (*dec->cur == ']') 1266 if (*dec->cur == ']')
1164 { 1267 {
1165 ++dec->cur; 1268 ++dec->cur;
1166 break; 1269 break;
1167 } 1270 }
1168 1271
1169 if (*dec->cur != ',') 1272 if (*dec->cur != ',')
1170 ERR (", or ] expected while parsing array"); 1273 ERR (", or ] expected while parsing array");
1171 1274
1172 ++dec->cur; 1275 ++dec->cur;
1173 1276
… …
1308 dSP; 1411 dSP;
1309 int count; 1412 int count;
1310 1413
1311 ENTER; SAVETMPS; PUSHMARK (SP); 1414 ENTER; SAVETMPS; PUSHMARK (SP);
1312 XPUSHs (HeVAL (he)); 1415 XPUSHs (HeVAL (he));
1416 sv_2mortal (sv);
1313 1417
1314 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1418 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1315 1419
1316 if (count == 1) 1420 if (count == 1)
1317 { 1421 {
1318 sv = newSVsv (POPs); 1422 sv = newSVsv (POPs);
1319 FREETMPS; LEAVE; 1423 FREETMPS; LEAVE;
1320 return sv; 1424 return sv;
1321 } 1425 }
1322 1426
1427 SvREFCNT_inc (sv);
1323 FREETMPS; LEAVE; 1428 FREETMPS; LEAVE;
1324 } 1429 }
1325 } 1430 }
1326 1431
1327 if (dec->json.cb_object) 1432 if (dec->json.cb_object)
… …
1359{ 1464{
1360 // the beauty of JSON: you need exactly one character lookahead 1465 // the beauty of JSON: you need exactly one character lookahead
1361 // to parse everything. 1466 // to parse everything.
1362 switch (*dec->cur) 1467 switch (*dec->cur)
1363 { 1468 {
1364 case '"': ++dec->cur; return decode_str (dec); 1469 case '"': ++dec->cur; return decode_str (dec);
1365 case '[': ++dec->cur; return decode_av (dec); 1470 case '[': ++dec->cur; return decode_av (dec);
1366 case '{': ++dec->cur; return decode_hv (dec); 1471 case '{': ++dec->cur; return decode_hv (dec);
1367 1472
1368 case '-': 1473 case '-':
1369 case '0': case '1': case '2': case '3': case '4': 1474 case '0': case '1': case '2': case '3': case '4':
1370 case '5': case '6': case '7': case '8': case '9': 1475 case '5': case '6': case '7': case '8': case '9':
… …
1423{ 1528{
1424 dec_t dec; 1529 dec_t dec;
1425 SV *sv; 1530 SV *sv;
1426 1531
1427 /* work around bugs in 5.10 where manipulating magic values 1532 /* work around bugs in 5.10 where manipulating magic values
1428 * will perl ignore the magic in subsequent accesses 1533 * makes perl ignore the magic in subsequent accesses.
1534 * also make a copy of non-PV values, to get them into a clean
1535 * state (SvPV should do that, but it's buggy, see below).
1429 */ 1536 */
1430 /*SvGETMAGIC (string);*/ 1537 /*SvGETMAGIC (string);*/
1431 if (SvMAGICAL (string)) 1538 if (SvMAGICAL (string) || !SvPOK (string))
1432 string = sv_2mortal (newSVsv (string)); 1539 string = sv_2mortal (newSVsv (string));
1433 1540
1434 SvUPGRADE (string, SVt_PV); 1541 SvUPGRADE (string, SVt_PV);
1435 1542
1436 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1543 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1453 if (offset > json->max_size && json->max_size) 1560 if (offset > json->max_size && json->max_size)
1454 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1561 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1455 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1562 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1456 } 1563 }
1457 1564
1458 if (json->flags & F_UTF8) 1565 if (DECODE_WANTS_OCTETS (json))
1459 sv_utf8_downgrade (string, 0); 1566 sv_utf8_downgrade (string, 0);
1460 else 1567 else
1461 sv_utf8_upgrade (string); 1568 sv_utf8_upgrade (string);
1462 1569
1463 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1570 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1505 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1612 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1506 LEAVE; 1613 LEAVE;
1507 1614
1508 croak ("%s, at character offset %d (before \"%s\")", 1615 croak ("%s, at character offset %d (before \"%s\")",
1509 dec.err, 1616 dec.err,
1510 ptr_to_index (string, dec.cur), 1617 (int)ptr_to_index (string, dec.cur),
1511 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1618 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1512 } 1619 }
1513 1620
1514 sv = sv_2mortal (sv); 1621 sv = sv_2mortal (sv);
1515 1622
… …
1524 1631
1525static void 1632static void
1526incr_parse (JSON *self) 1633incr_parse (JSON *self)
1527{ 1634{
1528 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1635 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1636
1637 // the state machine here is a bit convoluted and could be simplified a lot
1638 // but this would make it slower, so...
1529 1639
1530 for (;;) 1640 for (;;)
1531 { 1641 {
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 1642 //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) 1643 switch (self->incr_mode)
1534 { 1644 {
1535 // only used for intiial whitespace skipping 1645 // only used for initial whitespace skipping
1536 case INCR_M_WS: 1646 case INCR_M_WS:
1537 for (;;) 1647 for (;;)
1538 { 1648 {
1539 if (*p > 0x20) 1649 if (*p > 0x20)
1540 { 1650 {
1651 if (*p == '#')
1652 {
1653 self->incr_mode = INCR_M_C0;
1654 goto incr_m_c;
1655 }
1656 else
1657 {
1541 self->incr_mode = INCR_M_JSON; 1658 self->incr_mode = INCR_M_JSON;
1542 goto incr_m_json; 1659 goto incr_m_json;
1660 }
1543 } 1661 }
1544 else if (!*p) 1662 else if (!*p)
1545 goto interrupt; 1663 goto interrupt;
1546 1664
1547 ++p; 1665 ++p;
… …
1553 goto interrupt; 1671 goto interrupt;
1554 1672
1555 ++p; 1673 ++p;
1556 self->incr_mode = INCR_M_STR; 1674 self->incr_mode = INCR_M_STR;
1557 goto incr_m_str; 1675 goto incr_m_str;
1676
1677 // inside #-style comments
1678 case INCR_M_C0:
1679 case INCR_M_C1:
1680 incr_m_c:
1681 for (;;)
1682 {
1683 if (*p == '\n')
1684 {
1685 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1686 break;
1687 }
1688 else if (!*p)
1689 goto interrupt;
1690
1691 ++p;
1692 }
1693
1694 break;
1558 1695
1559 // inside a string 1696 // inside a string
1560 case INCR_M_STR: 1697 case INCR_M_STR:
1561 incr_m_str: 1698 incr_m_str:
1562 for (;;) 1699 for (;;)
… …
1621 1758
1622 case ']': 1759 case ']':
1623 case '}': 1760 case '}':
1624 if (--self->incr_nest <= 0) 1761 if (--self->incr_nest <= 0)
1625 goto interrupt; 1762 goto interrupt;
1763 break;
1764
1765 case '#':
1766 self->incr_mode = INCR_M_C1;
1767 goto incr_m_c;
1626 } 1768 }
1627 } 1769 }
1628 } 1770 }
1629 1771
1630 modechange: 1772 modechange:
1631 ; 1773 ;
1632 } 1774 }
1633 1775
1634interrupt: 1776interrupt:
1635 self->incr_pos = p - SvPVX (self->incr_text); 1777 self->incr_pos = p - SvPVX (self->incr_text);
1778 //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 1779 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1637} 1780}
1638 1781
1639///////////////////////////////////////////////////////////////////////////// 1782/////////////////////////////////////////////////////////////////////////////
1640// XS interface functions 1783// XS interface functions
… …
1669 json_boolean_stash = 0; 1812 json_boolean_stash = 0;
1670 1813
1671void new (char *klass) 1814void new (char *klass)
1672 PPCODE: 1815 PPCODE:
1673{ 1816{
1674 SV *pv = NEWSV (0, sizeof (JSON)); 1817 SV *pv = NEWSV (0, sizeof (JSON));
1675 SvPOK_only (pv); 1818 SvPOK_only (pv);
1676 json_init ((JSON *)SvPVX (pv)); 1819 json_init ((JSON *)SvPVX (pv));
1677 XPUSHs (sv_2mortal (sv_bless ( 1820 XPUSHs (sv_2mortal (sv_bless (
1678 newRV_noinc (pv), 1821 newRV_noinc (pv),
1679 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1822 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1756} 1899}
1757 1900
1758void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 1901void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1759 PPCODE: 1902 PPCODE:
1760{ 1903{
1761 if (!self->cb_sk_object) 1904 if (!self->cb_sk_object)
1762 self->cb_sk_object = newHV (); 1905 self->cb_sk_object = newHV ();
1763 1906
1764 if (SvOK (cb)) 1907 if (SvOK (cb))
1765 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 1908 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1766 else 1909 else
… …
1777 XPUSHs (ST (0)); 1920 XPUSHs (ST (0));
1778} 1921}
1779 1922
1780void encode (JSON *self, SV *scalar) 1923void encode (JSON *self, SV *scalar)
1781 PPCODE: 1924 PPCODE:
1782 XPUSHs (encode_json (scalar, self)); 1925 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
1926 XPUSHs (scalar);
1783 1927
1784void decode (JSON *self, SV *jsonstr) 1928void decode (JSON *self, SV *jsonstr)
1785 PPCODE: 1929 PPCODE:
1786 XPUSHs (decode_json (jsonstr, self, 0)); 1930 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
1931 XPUSHs (jsonstr);
1787 1932
1788void decode_prefix (JSON *self, SV *jsonstr) 1933void decode_prefix (JSON *self, SV *jsonstr)
1789 PPCODE: 1934 PPCODE:
1790{ 1935{
1936 SV *sv;
1791 char *offset; 1937 char *offset;
1938 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1792 EXTEND (SP, 2); 1939 EXTEND (SP, 2);
1793 PUSHs (decode_json (jsonstr, self, &offset)); 1940 PUSHs (sv);
1794 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 1941 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1795} 1942}
1796 1943
1797void incr_parse (JSON *self, SV *jsonstr = 0) 1944void incr_parse (JSON *self, SV *jsonstr = 0)
1798 PPCODE: 1945 PPCODE:
1799{ 1946{
1800 if (!self->incr_text) 1947 if (!self->incr_text)
1801 self->incr_text = newSVpvn ("", 0); 1948 self->incr_text = newSVpvn ("", 0);
1949
1950 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1951 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1952 if (DECODE_WANTS_OCTETS (self))
1953 {
1954 if (self->incr_pos)
1955 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1956 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1957
1958 sv_utf8_downgrade (self->incr_text, 0);
1959 }
1960 else
1961 {
1962 sv_utf8_upgrade (self->incr_text);
1963
1964 if (self->incr_pos)
1965 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1966 - (U8 *)SvPVX (self->incr_text);
1967 }
1802 1968
1803 // append data, if any 1969 // append data, if any
1804 if (jsonstr) 1970 if (jsonstr)
1805 { 1971 {
1972 /* make sure both strings have same encoding */
1973 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1806 if (SvUTF8 (jsonstr)) 1974 if (SvUTF8 (jsonstr))
1975 sv_utf8_downgrade (jsonstr, 0);
1807 { 1976 else
1808 if (!SvUTF8 (self->incr_text))
1809 {
1810 /* utf-8-ness differs, need to upgrade */
1811 sv_utf8_upgrade (self->incr_text);
1812
1813 if (self->incr_pos)
1814 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1815 - (U8 *)SvPVX (self->incr_text);
1816 }
1817 }
1818 else if (SvUTF8 (self->incr_text))
1819 sv_utf8_upgrade (jsonstr); 1977 sv_utf8_upgrade (jsonstr);
1820 1978
1979 /* and then just blindly append */
1821 { 1980 {
1822 STRLEN len; 1981 STRLEN len;
1823 const char *str = SvPV (jsonstr, len); 1982 const char *str = SvPV (jsonstr, len);
1824 STRLEN cur = SvCUR (self->incr_text); 1983 STRLEN cur = SvCUR (self->incr_text);
1825 1984
… …
1833 } 1992 }
1834 1993
1835 if (GIMME_V != G_VOID) 1994 if (GIMME_V != G_VOID)
1836 do 1995 do
1837 { 1996 {
1997 SV *sv;
1838 char *offset; 1998 char *offset;
1839 1999
1840 if (!INCR_DONE (self)) 2000 if (!INCR_DONE (self))
1841 { 2001 {
1842 incr_parse (self); 2002 incr_parse (self);
… …
1844 if (self->incr_pos > self->max_size && self->max_size) 2004 if (self->incr_pos > self->max_size && self->max_size)
1845 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2005 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1846 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2006 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1847 2007
1848 if (!INCR_DONE (self)) 2008 if (!INCR_DONE (self))
2009 {
2010 // as an optimisation, do not accumulate white space in the incr buffer
2011 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2012 {
2013 self->incr_pos = 0;
2014 SvCUR_set (self->incr_text, 0);
2015 }
2016
1849 break; 2017 break;
2018 }
1850 } 2019 }
1851 2020
1852 XPUSHs (decode_json (self->incr_text, self, &offset)); 2021 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2022 XPUSHs (sv);
1853 2023
1854 self->incr_pos -= offset - SvPVX (self->incr_text); 2024 self->incr_pos -= offset - SvPVX (self->incr_text);
1855 self->incr_nest = 0; 2025 self->incr_nest = 0;
1856 self->incr_mode = 0; 2026 self->incr_mode = 0;
1857 2027
… …
1909 PPCODE: 2079 PPCODE:
1910{ 2080{
1911 JSON json; 2081 JSON json;
1912 json_init (&json); 2082 json_init (&json);
1913 json.flags |= ix; 2083 json.flags |= ix;
1914 XPUSHs (encode_json (scalar, &json)); 2084 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2085 XPUSHs (scalar);
1915} 2086}
1916 2087
1917void decode_json (SV *jsonstr) 2088void decode_json (SV *jsonstr)
1918 ALIAS: 2089 ALIAS:
1919 from_json_ = 0 2090 from_json_ = 0
… …
1921 PPCODE: 2092 PPCODE:
1922{ 2093{
1923 JSON json; 2094 JSON json;
1924 json_init (&json); 2095 json_init (&json);
1925 json.flags |= ix; 2096 json.flags |= ix;
1926 XPUSHs (decode_json (jsonstr, &json, 0)); 2097 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2098 XPUSHs (jsonstr);
1927} 2099}
1928 2100
1929

Diff Legend

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