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.128 by root, Fri Oct 7 05:18:48 2016 UTC vs.
Revision 1.135 by root, Thu Nov 15 20:49:12 2018 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 15#endif
15 16
… …
49#define F_ALLOW_TAGS 0x00004000UL 50#define F_ALLOW_TAGS 0x00004000UL
50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
51 52
52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
53 54
54#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
55#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
56 57
57#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 58#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
58 59
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8) 60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
… …
77 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
78 79
79#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
80 81
81#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
82# define JSON_SLOW 1
83# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1)) 84# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
85# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
85#else 86#else
86# define JSON_SLOW 0
87# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash 88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
89#endif 90#endif
90 91
91// the amount of HEs to allocate on the stack, when sorting keys 92// the amount of HEs to allocate on the stack, when sorting keys
92#define STACK_HES 64 93#define STACK_HES 64
93 94
94static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean:: 95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
95static SV *bool_true, *bool_false, *sv_json; 96static SV *bool_false, *bool_true;
97static SV *sv_json;
96 98
97enum { 99enum {
98 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
99 INCR_M_STR, // inside string 101 INCR_M_STR, // inside string
100 INCR_M_BS, // inside backslash 102 INCR_M_BS, // inside backslash
… …
116 // for the incremental parser 118 // for the incremental parser
117 SV *incr_text; // the source text so far 119 SV *incr_text; // the source text so far
118 STRLEN incr_pos; // the current offset into the text 120 STRLEN incr_pos; // the current offset into the text
119 int incr_nest; // {[]}-nesting level 121 int incr_nest; // {[]}-nesting level
120 unsigned char incr_mode; 122 unsigned char incr_mode;
123
124 SV *v_false, *v_true;
121} JSON; 125} JSON;
122 126
123INLINE void 127INLINE void
124json_init (JSON *json) 128json_init (JSON *json)
125{ 129{
126 Zero (json, 1, JSON); 130 static const JSON init = { F_ALLOW_NONREF, 512 };
127 json->max_depth = 512; 131
132 *json = init;
128} 133}
129 134
130///////////////////////////////////////////////////////////////////////////// 135/////////////////////////////////////////////////////////////////////////////
131// utility functions 136// utility functions
132 137
… …
154 SvPV_renew (sv, SvCUR (sv) + 1); 159 SvPV_renew (sv, SvCUR (sv) + 1);
155#endif 160#endif
156 } 161 }
157} 162}
158 163
164/* adds two STRLENs together, slow, and with paranoia */
165STRLEN
166strlen_sum (STRLEN l1, STRLEN l2)
167{
168 size_t sum = l1 + l2;
169
170 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
171 croak ("JSON::XS: string size overflow");
172
173 return sum;
174}
175
176/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
177static char *
178json_sv_grow (SV *sv, size_t len1, size_t len2)
179{
180 len1 = strlen_sum (len1, len2);
181 len1 = strlen_sum (len1, len1 >> 1);
182
183 if (len1 > 4096 - 24)
184 len1 = (len1 | 4095) - 24;
185
186 return SvGROW (sv, len1);
187}
188
159// decode an utf-8 character and return it, or (UV)-1 in 189// decode a utf-8 character and return it, or (UV)-1 in
160// case of an error. 190// case of an error.
161// we special-case "safe" characters from U+80 .. U+7FF, 191// we special-case "safe" characters from U+80 .. U+7FF,
162// but use the very good perl function to parse anything else. 192// but use the very good perl function to parse anything else.
163// note that we never call this function for a ascii codepoints 193// note that we never call this function for a ascii codepoints
164INLINE UV 194INLINE UV
… …
361} enc_t; 391} enc_t;
362 392
363INLINE void 393INLINE void
364need (enc_t *enc, STRLEN len) 394need (enc_t *enc, STRLEN len)
365{ 395{
366 if (expect_false (enc->cur + len >= enc->end)) 396 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
367 { 397 {
368 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 398 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
369 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 399 char *buf = json_sv_grow (enc->sv, cur, len);
370 enc->cur = SvPVX (enc->sv) + cur; 400 enc->cur = buf + cur;
371 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 401 enc->end = buf + SvLEN (enc->sv) - 1;
372 } 402 }
373} 403}
374 404
375INLINE void 405INLINE void
376encode_ch (enc_t *enc, char ch) 406encode_ch (enc_t *enc, char ch)
… …
392 422
393 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 423 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
394 { 424 {
395 if (expect_false (ch == '"')) // but with slow exceptions 425 if (expect_false (ch == '"')) // but with slow exceptions
396 { 426 {
397 need (enc, len += 1); 427 need (enc, len + 1);
398 *enc->cur++ = '\\'; 428 *enc->cur++ = '\\';
399 *enc->cur++ = '"'; 429 *enc->cur++ = '"';
400 } 430 }
401 else if (expect_false (ch == '\\')) 431 else if (expect_false (ch == '\\'))
402 { 432 {
403 need (enc, len += 1); 433 need (enc, len + 1);
404 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
405 *enc->cur++ = '\\'; 435 *enc->cur++ = '\\';
406 } 436 }
407 else 437 else
408 *enc->cur++ = ch; 438 *enc->cur++ = ch;
… …
411 } 441 }
412 else 442 else
413 { 443 {
414 switch (ch) 444 switch (ch)
415 { 445 {
416 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 446 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
417 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 447 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
418 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 448 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
419 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 449 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
420 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 450 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
421 451
422 default: 452 default:
423 { 453 {
424 STRLEN clen; 454 STRLEN clen;
425 UV uch; 455 UV uch;
… …
441 if (uch >= 0x10000UL) 471 if (uch >= 0x10000UL)
442 { 472 {
443 if (uch >= 0x110000UL) 473 if (uch >= 0x110000UL)
444 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 474 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
445 475
446 need (enc, len += 11); 476 need (enc, len + 11);
447 sprintf (enc->cur, "\\u%04x\\u%04x", 477 sprintf (enc->cur, "\\u%04x\\u%04x",
448 (int)((uch - 0x10000) / 0x400 + 0xD800), 478 (int)((uch - 0x10000) / 0x400 + 0xD800),
449 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 479 (int)((uch - 0x10000) % 0x400 + 0xDC00));
450 enc->cur += 12; 480 enc->cur += 12;
451 } 481 }
452 else 482 else
453 { 483 {
454 need (enc, len += 5); 484 need (enc, len + 5);
455 *enc->cur++ = '\\'; 485 *enc->cur++ = '\\';
456 *enc->cur++ = 'u'; 486 *enc->cur++ = 'u';
457 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 487 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
458 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
459 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 489 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
467 *enc->cur++ = uch; 497 *enc->cur++ = uch;
468 str += clen; 498 str += clen;
469 } 499 }
470 else if (is_utf8) 500 else if (is_utf8)
471 { 501 {
472 need (enc, len += clen); 502 need (enc, len + clen);
473 do 503 do
474 { 504 {
475 *enc->cur++ = *str++; 505 *enc->cur++ = *str++;
476 } 506 }
477 while (--clen); 507 while (--clen);
478 } 508 }
479 else 509 else
480 { 510 {
481 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 511 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
482 enc->cur = encode_utf8 (enc->cur, uch); 512 enc->cur = encode_utf8 (enc->cur, uch);
483 ++str; 513 ++str;
484 } 514 }
485 } 515 }
486 } 516 }
… …
750 { 780 {
751 HV *stash = SvSTASH (sv); 781 HV *stash = SvSTASH (sv);
752 782
753 if (stash == bool_stash) 783 if (stash == bool_stash)
754 { 784 {
755 if (SvIV (sv))
756 encode_str (enc, "true", 4, 0); 785 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
757 else
758 encode_str (enc, "false", 5, 0); 786 else encode_str (enc, "false", 5, 0);
759 } 787 }
760 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0))) 788 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
761 { 789 {
762 int count; 790 int count;
763 dSP; 791 dSP;
764 792
765 ENTER; SAVETMPS; 793 ENTER; SAVETMPS;
766 SAVESTACK_POS ();
767 PUSHMARK (SP); 794 PUSHMARK (SP);
768 EXTEND (SP, 2); 795 EXTEND (SP, 2);
769 // we re-bless the reference to get overload and other niceties right 796 // we re-bless the reference to get overload and other niceties right
770 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 797 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
771 PUSHs (sv_json); 798 PUSHs (sv_json);
… …
783 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash)); 810 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
784 encode_ch (enc, '"'); 811 encode_ch (enc, '"');
785 encode_ch (enc, ')'); 812 encode_ch (enc, ')');
786 encode_ch (enc, '['); 813 encode_ch (enc, '[');
787 814
788 while (count) 815 if (count)
789 { 816 {
817 int i;
818
819 for (i = 0; i < count - 1; ++i)
820 {
790 encode_sv (enc, SP[1 - count--]); 821 encode_sv (enc, SP[i + 1 - count]);
791
792 if (count)
793 encode_ch (enc, ','); 822 encode_ch (enc, ',');
823 }
824
825 encode_sv (enc, TOPs);
826 SP -= count;
794 } 827 }
795 828
796 encode_ch (enc, ']'); 829 encode_ch (enc, ']');
797 830
798 FREETMPS; LEAVE; 831 FREETMPS; LEAVE;
… …
1167 1200
1168 if (sv) 1201 if (sv)
1169 { 1202 {
1170 STRLEN cur = SvCUR (sv); 1203 STRLEN cur = SvCUR (sv);
1171 1204
1172 if (SvLEN (sv) <= cur + len) 1205 if (SvLEN (sv) - cur <= len)
1173 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1206 json_sv_grow (sv, cur, len);
1174 1207
1175 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1208 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1176 SvCUR_set (sv, SvCUR (sv) + len); 1209 SvCUR_set (sv, SvCUR (sv) + len);
1177 } 1210 }
1178 else 1211 else
… …
1489 { 1522 {
1490 dSP; 1523 dSP;
1491 int count; 1524 int count;
1492 1525
1493 ENTER; SAVETMPS; 1526 ENTER; SAVETMPS;
1494 SAVESTACK_POS ();
1495 PUSHMARK (SP); 1527 PUSHMARK (SP);
1496 XPUSHs (HeVAL (he)); 1528 XPUSHs (HeVAL (he));
1497 sv_2mortal (sv); 1529 sv_2mortal (sv);
1498 1530
1499 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1531 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
… …
1502 { 1534 {
1503 sv = newSVsv (POPs); 1535 sv = newSVsv (POPs);
1504 FREETMPS; LEAVE; 1536 FREETMPS; LEAVE;
1505 return sv; 1537 return sv;
1506 } 1538 }
1539 else if (count)
1540 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1507 1541
1508 SvREFCNT_inc (sv); 1542 SvREFCNT_inc (sv);
1509 FREETMPS; LEAVE; 1543 FREETMPS; LEAVE;
1510 } 1544 }
1511 } 1545 }
… …
1514 { 1548 {
1515 dSP; 1549 dSP;
1516 int count; 1550 int count;
1517 1551
1518 ENTER; SAVETMPS; 1552 ENTER; SAVETMPS;
1519 SAVESTACK_POS ();
1520 PUSHMARK (SP); 1553 PUSHMARK (SP);
1521 XPUSHs (sv_2mortal (sv)); 1554 XPUSHs (sv_2mortal (sv));
1522 1555
1523 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1556 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1524 1557
… …
1526 { 1559 {
1527 sv = newSVsv (POPs); 1560 sv = newSVsv (POPs);
1528 FREETMPS; LEAVE; 1561 FREETMPS; LEAVE;
1529 return sv; 1562 return sv;
1530 } 1563 }
1564 else if (count)
1565 croak ("filter_json_object callbacks must not return more than one scalar");
1531 1566
1532 SvREFCNT_inc (sv); 1567 SvREFCNT_inc (sv);
1533 FREETMPS; LEAVE; 1568 FREETMPS; LEAVE;
1534 } 1569 }
1535 } 1570 }
… …
1640 case '-': 1675 case '-':
1641 case '0': case '1': case '2': case '3': case '4': 1676 case '0': case '1': case '2': case '3': case '4':
1642 case '5': case '6': case '7': case '8': case '9': 1677 case '5': case '6': case '7': case '8': case '9':
1643 return decode_num (dec); 1678 return decode_num (dec);
1644 1679
1680 case 'f':
1681 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1682 {
1683 dec->cur += 5;
1684
1685 if (expect_false (!dec->json.v_false))
1686 dec->json.v_false = GET_BOOL (false);
1687
1688 return newSVsv (dec->json.v_false);
1689 }
1690 else
1691 ERR ("'false' expected");
1692
1693 break;
1694
1645 case 't': 1695 case 't':
1646 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1696 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1647 { 1697 {
1648 dec->cur += 4; 1698 dec->cur += 4;
1649#if JSON_SLOW 1699
1650 bool_true = get_bool ("Types::Serialiser::true"); 1700 if (expect_false (!dec->json.v_true))
1651#endif 1701 dec->json.v_true = GET_BOOL (true);
1702
1652 return newSVsv (bool_true); 1703 return newSVsv (dec->json.v_true);
1653 } 1704 }
1654 else 1705 else
1655 ERR ("'true' expected"); 1706 ERR ("'true' expected");
1656
1657 break;
1658
1659 case 'f':
1660 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1661 {
1662 dec->cur += 5;
1663#if JSON_SLOW
1664 bool_false = get_bool ("Types::Serialiser::false");
1665#endif
1666 return newSVsv (bool_false);
1667 }
1668 else
1669 ERR ("'false' expected");
1670 1707
1671 break; 1708 break;
1672 1709
1673 case 'n': 1710 case 'n':
1674 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1711 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1689fail: 1726fail:
1690 return 0; 1727 return 0;
1691} 1728}
1692 1729
1693static SV * 1730static SV *
1694decode_json (SV *string, JSON *json, char **offset_return) 1731decode_json (SV *string, JSON *json, STRLEN *offset_return)
1695{ 1732{
1696 dec_t dec; 1733 dec_t dec;
1697 SV *sv; 1734 SV *sv;
1698 1735
1699 /* work around bugs in 5.10 where manipulating magic values 1736 /* work around bugs in 5.10 where manipulating magic values
… …
1752 1789
1753 decode_ws (&dec); 1790 decode_ws (&dec);
1754 sv = decode_sv (&dec); 1791 sv = decode_sv (&dec);
1755 1792
1756 if (offset_return) 1793 if (offset_return)
1757 *offset_return = dec.cur; 1794 *offset_return = dec.cur - SvPVX (string);
1758 1795 else if (sv)
1759 if (!(offset_return || !sv))
1760 { 1796 {
1761 // check for trailing garbage 1797 // check for trailing garbage
1762 decode_ws (&dec); 1798 decode_ws (&dec);
1763 1799
1764 if (*dec.cur) 1800 if (dec.cur != dec.end)
1765 { 1801 {
1766 dec.err = "garbage after JSON object"; 1802 dec.err = "garbage after JSON object";
1767 SvREFCNT_dec (sv); 1803 SvREFCNT_dec (sv);
1768 sv = 0; 1804 sv = 0;
1769 } 1805 }
… …
1970 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2006 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1971 : -1; 2007 : -1;
1972 2008
1973 json_stash = gv_stashpv ("JSON::XS" , 1); 2009 json_stash = gv_stashpv ("JSON::XS" , 1);
1974 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2010 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
2011 bool_false = get_bool ("Types::Serialiser::false");
1975 bool_true = get_bool ("Types::Serialiser::true"); 2012 bool_true = get_bool ("Types::Serialiser::true");
1976 bool_false = get_bool ("Types::Serialiser::false");
1977 2013
1978 sv_json = newSVpv ("JSON", 0); 2014 sv_json = newSVpv ("JSON", 0);
1979 SvREADONLY_on (sv_json); 2015 SvREADONLY_on (sv_json);
1980 2016
1981 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2017 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
… …
1983 2019
1984PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1985 2021
1986void CLONE (...) 2022void CLONE (...)
1987 CODE: 2023 CODE:
2024 // as long as these writes are atomic, the race should not matter
2025 // as existing threads either already use 0, or use the old value,
2026 // which is sitll correct for the initial thread.
1988 json_stash = 0; 2027 json_stash = 0;
1989 bool_stash = 0; 2028 bool_stash = 0;
2029 bool_false = 0;
2030 bool_true = 0;
1990 2031
1991void new (char *klass) 2032void new (char *klass)
1992 PPCODE: 2033 PPCODE:
1993{ 2034{
1994 SV *pv = NEWSV (0, sizeof (JSON)); 2035 SV *pv = NEWSV (0, sizeof (JSON));
… …
1997 XPUSHs (sv_2mortal (sv_bless ( 2038 XPUSHs (sv_2mortal (sv_bless (
1998 newRV_noinc (pv), 2039 newRV_noinc (pv),
1999 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2040 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
2000 ))); 2041 )));
2001} 2042}
2043
2044void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2045 PPCODE:
2046 self->v_false = newSVsv (v_false);
2047 self->v_true = newSVsv (v_true);
2048 XPUSHs (ST (0));
2049
2050void get_boolean_values (JSON *self)
2051 PPCODE:
2052 if (self->v_false && self->v_true)
2053 {
2054 EXTEND (SP, 2);
2055 PUSHs (self->v_false);
2056 PUSHs (self->v_true);
2057 }
2002 2058
2003void ascii (JSON *self, int enable = 1) 2059void ascii (JSON *self, int enable = 1)
2004 ALIAS: 2060 ALIAS:
2005 ascii = F_ASCII 2061 ascii = F_ASCII
2006 latin1 = F_LATIN1 2062 latin1 = F_LATIN1
… …
2111 2167
2112void decode_prefix (JSON *self, SV *jsonstr) 2168void decode_prefix (JSON *self, SV *jsonstr)
2113 PPCODE: 2169 PPCODE:
2114{ 2170{
2115 SV *sv; 2171 SV *sv;
2116 char *offset; 2172 STRLEN offset;
2117 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2173 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2118 EXTEND (SP, 2); 2174 EXTEND (SP, 2);
2119 PUSHs (sv); 2175 PUSHs (sv);
2120 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2176 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2121} 2177}
2122 2178
2123void incr_parse (JSON *self, SV *jsonstr = 0) 2179void incr_parse (JSON *self, SV *jsonstr = 0)
2124 PPCODE: 2180 PPCODE:
2125{ 2181{
… …
2159 { 2215 {
2160 STRLEN len; 2216 STRLEN len;
2161 const char *str = SvPV (jsonstr, len); 2217 const char *str = SvPV (jsonstr, len);
2162 STRLEN cur = SvCUR (self->incr_text); 2218 STRLEN cur = SvCUR (self->incr_text);
2163 2219
2164 if (SvLEN (self->incr_text) <= cur + len) 2220 if (SvLEN (self->incr_text) - cur <= len)
2165 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2221 json_sv_grow (self->incr_text, cur, len);
2166 2222
2167 Move (str, SvEND (self->incr_text), len, char); 2223 Move (str, SvEND (self->incr_text), len, char);
2168 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2224 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2169 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2225 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2170 } 2226 }
… …
2172 2228
2173 if (GIMME_V != G_VOID) 2229 if (GIMME_V != G_VOID)
2174 do 2230 do
2175 { 2231 {
2176 SV *sv; 2232 SV *sv;
2177 char *offset; 2233 STRLEN offset;
2178 2234
2179 if (!INCR_DONE (self)) 2235 if (!INCR_DONE (self))
2180 { 2236 {
2181 incr_parse (self); 2237 incr_parse (self);
2182 2238
… …
2198 } 2254 }
2199 2255
2200 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2256 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2201 XPUSHs (sv); 2257 XPUSHs (sv);
2202 2258
2203 self->incr_pos -= offset - SvPVX (self->incr_text); 2259 self->incr_pos -= offset;
2204 self->incr_nest = 0; 2260 self->incr_nest = 0;
2205 self->incr_mode = 0; 2261 self->incr_mode = 0;
2206 2262
2207 sv_chop (self->incr_text, offset); 2263 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2208 } 2264 }
2209 while (GIMME_V == G_ARRAY); 2265 while (GIMME_V == G_ARRAY);
2210} 2266}
2211 2267
2212SV *incr_text (JSON *self) 2268SV *incr_text (JSON *self)
… …
2243 self->incr_mode = 0; 2299 self->incr_mode = 0;
2244} 2300}
2245 2301
2246void DESTROY (JSON *self) 2302void DESTROY (JSON *self)
2247 CODE: 2303 CODE:
2304 SvREFCNT_dec (self->v_false);
2305 SvREFCNT_dec (self->v_true);
2248 SvREFCNT_dec (self->cb_sk_object); 2306 SvREFCNT_dec (self->cb_sk_object);
2249 SvREFCNT_dec (self->cb_object); 2307 SvREFCNT_dec (self->cb_object);
2250 SvREFCNT_dec (self->incr_text); 2308 SvREFCNT_dec (self->incr_text);
2251 2309
2252PROTOTYPES: ENABLE 2310PROTOTYPES: ENABLE

Diff Legend

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