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.126 by root, Sun Feb 21 16:18:19 2016 UTC vs.
Revision 1.134 by root, Thu Nov 15 20:13:03 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{
… …
154 SvPV_renew (sv, SvCUR (sv) + 1); 158 SvPV_renew (sv, SvCUR (sv) + 1);
155#endif 159#endif
156 } 160 }
157} 161}
158 162
163/* adds two STRLENs together, slow, and with paranoia */
164STRLEN
165strlen_sum (STRLEN l1, STRLEN l2)
166{
167 size_t sum = l1 + l2;
168
169 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
170 croak ("JSON::XS: string size overflow");
171
172 return sum;
173}
174
175/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
176static char *
177json_sv_grow (SV *sv, size_t len1, size_t len2)
178{
179 len1 = strlen_sum (len1, len2);
180 len1 = strlen_sum (len1, len1 >> 1);
181
182 if (len1 > 4096 - 24)
183 len1 = (len1 | 4095) - 24;
184
185 return SvGROW (sv, len1);
186}
187
159// decode an utf-8 character and return it, or (UV)-1 in 188// decode a utf-8 character and return it, or (UV)-1 in
160// case of an error. 189// case of an error.
161// we special-case "safe" characters from U+80 .. U+7FF, 190// we special-case "safe" characters from U+80 .. U+7FF,
162// but use the very good perl function to parse anything else. 191// but use the very good perl function to parse anything else.
163// note that we never call this function for a ascii codepoints 192// note that we never call this function for a ascii codepoints
164INLINE UV 193INLINE UV
… …
318 if (len == 1) 347 if (len == 1)
319 if (*pv == '1') 348 if (*pv == '1')
320 return 1; 349 return 1;
321 else if (*pv == '0') 350 else if (*pv == '0')
322 return 0; 351 return 0;
323
324 } 352 }
325 353
326 return -1; 354 return -1;
327} 355}
328 356
… …
333 if (!SvROK (scalar)) 361 if (!SvROK (scalar))
334 return 1; 362 return 1;
335 363
336 scalar = SvRV (scalar); 364 scalar = SvRV (scalar);
337 365
366 if (SvTYPE (scalar) >= SVt_PVMG)
367 {
338 if (SvSTASH (scalar) == bool_stash) 368 if (SvSTASH (scalar) == bool_stash)
339 return 1; 369 return 1;
340 370
341 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0) 371 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
342 return 1; 372 return 1;
373 }
343 374
344 return 0; 375 return 0;
345} 376}
346 377
347///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
… …
359} enc_t; 390} enc_t;
360 391
361INLINE void 392INLINE void
362need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
363{ 394{
364 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
365 { 396 {
366 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
367 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
368 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
369 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
370 } 401 }
371} 402}
372 403
373INLINE void 404INLINE void
374encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
… …
390 421
391 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
392 { 423 {
393 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
394 { 425 {
395 need (enc, len += 1); 426 need (enc, len + 1);
396 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
397 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
398 } 429 }
399 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
400 { 431 {
401 need (enc, len += 1); 432 need (enc, len + 1);
402 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
403 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
404 } 435 }
405 else 436 else
406 *enc->cur++ = ch; 437 *enc->cur++ = ch;
… …
409 } 440 }
410 else 441 else
411 { 442 {
412 switch (ch) 443 switch (ch)
413 { 444 {
414 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 445 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
415 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 446 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
416 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 447 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
417 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 448 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
418 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 449 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
419 450
420 default: 451 default:
421 { 452 {
422 STRLEN clen; 453 STRLEN clen;
423 UV uch; 454 UV uch;
… …
439 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
440 { 471 {
441 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
442 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 473 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
443 474
444 need (enc, len += 11); 475 need (enc, len + 11);
445 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
446 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
447 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
448 enc->cur += 12; 479 enc->cur += 12;
449 } 480 }
450 else 481 else
451 { 482 {
452 need (enc, len += 5); 483 need (enc, len + 5);
453 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
454 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
455 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
456 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
457 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
465 *enc->cur++ = uch; 496 *enc->cur++ = uch;
466 str += clen; 497 str += clen;
467 } 498 }
468 else if (is_utf8) 499 else if (is_utf8)
469 { 500 {
470 need (enc, len += clen); 501 need (enc, len + clen);
471 do 502 do
472 { 503 {
473 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
474 } 505 }
475 while (--clen); 506 while (--clen);
476 } 507 }
477 else 508 else
478 { 509 {
479 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 510 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
480 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
481 ++str; 512 ++str;
482 } 513 }
483 } 514 }
484 } 515 }
… …
748 { 779 {
749 HV *stash = SvSTASH (sv); 780 HV *stash = SvSTASH (sv);
750 781
751 if (stash == bool_stash) 782 if (stash == bool_stash)
752 { 783 {
753 if (SvIV (sv))
754 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
755 else
756 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
757 } 786 }
758 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0))) 787 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
759 { 788 {
760 int count; 789 int count;
761 dSP; 790 dSP;
762 791
763 ENTER; SAVETMPS; 792 ENTER; SAVETMPS;
764 SAVESTACK_POS ();
765 PUSHMARK (SP); 793 PUSHMARK (SP);
766 EXTEND (SP, 2); 794 EXTEND (SP, 2);
767 // we re-bless the reference to get overload and other niceties right 795 // we re-bless the reference to get overload and other niceties right
768 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 796 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
769 PUSHs (sv_json); 797 PUSHs (sv_json);
… …
781 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash)); 809 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
782 encode_ch (enc, '"'); 810 encode_ch (enc, '"');
783 encode_ch (enc, ')'); 811 encode_ch (enc, ')');
784 encode_ch (enc, '['); 812 encode_ch (enc, '[');
785 813
786 while (count) 814 if (count)
787 { 815 {
816 int i;
817
818 for (i = 0; i < count - 1; ++i)
819 {
788 encode_sv (enc, SP[1 - count--]); 820 encode_sv (enc, SP[i + 1 - count]);
789
790 if (count)
791 encode_ch (enc, ','); 821 encode_ch (enc, ',');
822 }
823
824 encode_sv (enc, TOPs);
825 SP -= count;
792 } 826 }
793 827
794 encode_ch (enc, ']'); 828 encode_ch (enc, ']');
795 829
796 FREETMPS; LEAVE; 830 FREETMPS; LEAVE;
… …
1165 1199
1166 if (sv) 1200 if (sv)
1167 { 1201 {
1168 STRLEN cur = SvCUR (sv); 1202 STRLEN cur = SvCUR (sv);
1169 1203
1170 if (SvLEN (sv) <= cur + len) 1204 if (SvLEN (sv) - cur <= len)
1171 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1205 json_sv_grow (sv, cur, len);
1172 1206
1173 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1207 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1174 SvCUR_set (sv, SvCUR (sv) + len); 1208 SvCUR_set (sv, SvCUR (sv) + len);
1175 } 1209 }
1176 else 1210 else
… …
1487 { 1521 {
1488 dSP; 1522 dSP;
1489 int count; 1523 int count;
1490 1524
1491 ENTER; SAVETMPS; 1525 ENTER; SAVETMPS;
1492 SAVESTACK_POS ();
1493 PUSHMARK (SP); 1526 PUSHMARK (SP);
1494 XPUSHs (HeVAL (he)); 1527 XPUSHs (HeVAL (he));
1495 sv_2mortal (sv); 1528 sv_2mortal (sv);
1496 1529
1497 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1530 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
… …
1500 { 1533 {
1501 sv = newSVsv (POPs); 1534 sv = newSVsv (POPs);
1502 FREETMPS; LEAVE; 1535 FREETMPS; LEAVE;
1503 return sv; 1536 return sv;
1504 } 1537 }
1538 else if (count)
1539 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1505 1540
1506 SvREFCNT_inc (sv); 1541 SvREFCNT_inc (sv);
1507 FREETMPS; LEAVE; 1542 FREETMPS; LEAVE;
1508 } 1543 }
1509 } 1544 }
… …
1512 { 1547 {
1513 dSP; 1548 dSP;
1514 int count; 1549 int count;
1515 1550
1516 ENTER; SAVETMPS; 1551 ENTER; SAVETMPS;
1517 SAVESTACK_POS ();
1518 PUSHMARK (SP); 1552 PUSHMARK (SP);
1519 XPUSHs (sv_2mortal (sv)); 1553 XPUSHs (sv_2mortal (sv));
1520 1554
1521 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1555 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1522 1556
… …
1524 { 1558 {
1525 sv = newSVsv (POPs); 1559 sv = newSVsv (POPs);
1526 FREETMPS; LEAVE; 1560 FREETMPS; LEAVE;
1527 return sv; 1561 return sv;
1528 } 1562 }
1563 else if (count)
1564 croak ("filter_json_object callbacks must not return more than one scalar");
1529 1565
1530 SvREFCNT_inc (sv); 1566 SvREFCNT_inc (sv);
1531 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1532 } 1568 }
1533 } 1569 }
… …
1638 case '-': 1674 case '-':
1639 case '0': case '1': case '2': case '3': case '4': 1675 case '0': case '1': case '2': case '3': case '4':
1640 case '5': case '6': case '7': case '8': case '9': 1676 case '5': case '6': case '7': case '8': case '9':
1641 return decode_num (dec); 1677 return decode_num (dec);
1642 1678
1679 case 'f':
1680 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1681 {
1682 dec->cur += 5;
1683
1684 if (expect_false (!dec->json.v_false))
1685 dec->json.v_false = GET_BOOL (false);
1686
1687 return newSVsv (dec->json.v_false);
1688 }
1689 else
1690 ERR ("'false' expected");
1691
1692 break;
1693
1643 case 't': 1694 case 't':
1644 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1695 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1645 { 1696 {
1646 dec->cur += 4; 1697 dec->cur += 4;
1647#if JSON_SLOW 1698
1648 bool_true = get_bool ("Types::Serialiser::true"); 1699 if (expect_false (!dec->json.v_true))
1649#endif 1700 dec->json.v_true = GET_BOOL (true);
1701
1650 return newSVsv (bool_true); 1702 return newSVsv (dec->json.v_true);
1651 } 1703 }
1652 else 1704 else
1653 ERR ("'true' expected"); 1705 ERR ("'true' expected");
1654
1655 break;
1656
1657 case 'f':
1658 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1659 {
1660 dec->cur += 5;
1661#if JSON_SLOW
1662 bool_false = get_bool ("Types::Serialiser::false");
1663#endif
1664 return newSVsv (bool_false);
1665 }
1666 else
1667 ERR ("'false' expected");
1668 1706
1669 break; 1707 break;
1670 1708
1671 case 'n': 1709 case 'n':
1672 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1710 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1687fail: 1725fail:
1688 return 0; 1726 return 0;
1689} 1727}
1690 1728
1691static SV * 1729static SV *
1692decode_json (SV *string, JSON *json, char **offset_return) 1730decode_json (SV *string, JSON *json, STRLEN *offset_return)
1693{ 1731{
1694 dec_t dec; 1732 dec_t dec;
1695 SV *sv; 1733 SV *sv;
1696 1734
1697 /* work around bugs in 5.10 where manipulating magic values 1735 /* work around bugs in 5.10 where manipulating magic values
1698 * makes perl ignore the magic in subsequent accesses. 1736 * makes perl ignore the magic in subsequent accesses.
1699 * also make a copy of non-PV values, to get them into a clean 1737 * also make a copy of non-PV values, to get them into a clean
1700 * state (SvPV should do that, but it's buggy, see below). 1738 * state (SvPV should do that, but it's buggy, see below).
1739 *
1740 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1741 * as reported by Reini Urban.
1701 */ 1742 */
1702 /*SvGETMAGIC (string);*/ 1743 /*SvGETMAGIC (string);*/
1703 if (SvMAGICAL (string) || !SvPOK (string)) 1744 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1704 string = sv_2mortal (newSVsv (string)); 1745 string = sv_2mortal (newSVsv (string));
1705 1746
1706 SvUPGRADE (string, SVt_PV); 1747 SvUPGRADE (string, SVt_PV);
1707 1748
1708 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1749 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1747 1788
1748 decode_ws (&dec); 1789 decode_ws (&dec);
1749 sv = decode_sv (&dec); 1790 sv = decode_sv (&dec);
1750 1791
1751 if (offset_return) 1792 if (offset_return)
1752 *offset_return = dec.cur; 1793 *offset_return = dec.cur - SvPVX (string);
1753 1794 else if (sv)
1754 if (!(offset_return || !sv))
1755 { 1795 {
1756 // check for trailing garbage 1796 // check for trailing garbage
1757 decode_ws (&dec); 1797 decode_ws (&dec);
1758 1798
1759 if (*dec.cur) 1799 if (*dec.cur)
… …
1965 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2005 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1966 : -1; 2006 : -1;
1967 2007
1968 json_stash = gv_stashpv ("JSON::XS" , 1); 2008 json_stash = gv_stashpv ("JSON::XS" , 1);
1969 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); 2009 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
2010 bool_false = get_bool ("Types::Serialiser::false");
1970 bool_true = get_bool ("Types::Serialiser::true"); 2011 bool_true = get_bool ("Types::Serialiser::true");
1971 bool_false = get_bool ("Types::Serialiser::false");
1972 2012
1973 sv_json = newSVpv ("JSON", 0); 2013 sv_json = newSVpv ("JSON", 0);
1974 SvREADONLY_on (sv_json); 2014 SvREADONLY_on (sv_json);
1975 2015
1976 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2016 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
… …
1978 2018
1979PROTOTYPES: DISABLE 2019PROTOTYPES: DISABLE
1980 2020
1981void CLONE (...) 2021void CLONE (...)
1982 CODE: 2022 CODE:
2023 // as long as these writes are atomic, the race should not matter
2024 // as existing threads either already use 0, or use the old value,
2025 // which is sitll correct for the initial thread.
1983 json_stash = 0; 2026 json_stash = 0;
1984 bool_stash = 0; 2027 bool_stash = 0;
2028 bool_false = 0;
2029 bool_true = 0;
1985 2030
1986void new (char *klass) 2031void new (char *klass)
1987 PPCODE: 2032 PPCODE:
1988{ 2033{
1989 SV *pv = NEWSV (0, sizeof (JSON)); 2034 SV *pv = NEWSV (0, sizeof (JSON));
… …
1992 XPUSHs (sv_2mortal (sv_bless ( 2037 XPUSHs (sv_2mortal (sv_bless (
1993 newRV_noinc (pv), 2038 newRV_noinc (pv),
1994 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2039 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1995 ))); 2040 )));
1996} 2041}
2042
2043void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2044 PPCODE:
2045 self->v_false = newSVsv (v_false);
2046 self->v_true = newSVsv (v_true);
2047 XPUSHs (ST (0));
2048
2049void get_boolean_values (JSON *self)
2050 PPCODE:
2051 if (self->v_false && self->v_true)
2052 {
2053 EXTEND (SP, 2);
2054 PUSHs (self->v_false);
2055 PUSHs (self->v_true);
2056 }
1997 2057
1998void ascii (JSON *self, int enable = 1) 2058void ascii (JSON *self, int enable = 1)
1999 ALIAS: 2059 ALIAS:
2000 ascii = F_ASCII 2060 ascii = F_ASCII
2001 latin1 = F_LATIN1 2061 latin1 = F_LATIN1
… …
2106 2166
2107void decode_prefix (JSON *self, SV *jsonstr) 2167void decode_prefix (JSON *self, SV *jsonstr)
2108 PPCODE: 2168 PPCODE:
2109{ 2169{
2110 SV *sv; 2170 SV *sv;
2111 char *offset; 2171 STRLEN offset;
2112 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN; 2172 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2113 EXTEND (SP, 2); 2173 EXTEND (SP, 2);
2114 PUSHs (sv); 2174 PUSHs (sv);
2115 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2175 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2116} 2176}
2117 2177
2118void incr_parse (JSON *self, SV *jsonstr = 0) 2178void incr_parse (JSON *self, SV *jsonstr = 0)
2119 PPCODE: 2179 PPCODE:
2120{ 2180{
… …
2154 { 2214 {
2155 STRLEN len; 2215 STRLEN len;
2156 const char *str = SvPV (jsonstr, len); 2216 const char *str = SvPV (jsonstr, len);
2157 STRLEN cur = SvCUR (self->incr_text); 2217 STRLEN cur = SvCUR (self->incr_text);
2158 2218
2159 if (SvLEN (self->incr_text) <= cur + len) 2219 if (SvLEN (self->incr_text) - cur <= len)
2160 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2220 json_sv_grow (self->incr_text, cur, len);
2161 2221
2162 Move (str, SvEND (self->incr_text), len, char); 2222 Move (str, SvEND (self->incr_text), len, char);
2163 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2223 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2164 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2224 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2165 } 2225 }
… …
2167 2227
2168 if (GIMME_V != G_VOID) 2228 if (GIMME_V != G_VOID)
2169 do 2229 do
2170 { 2230 {
2171 SV *sv; 2231 SV *sv;
2172 char *offset; 2232 STRLEN offset;
2173 2233
2174 if (!INCR_DONE (self)) 2234 if (!INCR_DONE (self))
2175 { 2235 {
2176 incr_parse (self); 2236 incr_parse (self);
2177 2237
… …
2193 } 2253 }
2194 2254
2195 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN; 2255 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2196 XPUSHs (sv); 2256 XPUSHs (sv);
2197 2257
2198 self->incr_pos -= offset - SvPVX (self->incr_text); 2258 self->incr_pos -= offset;
2199 self->incr_nest = 0; 2259 self->incr_nest = 0;
2200 self->incr_mode = 0; 2260 self->incr_mode = 0;
2201 2261
2202 sv_chop (self->incr_text, offset); 2262 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2203 } 2263 }
2204 while (GIMME_V == G_ARRAY); 2264 while (GIMME_V == G_ARRAY);
2205} 2265}
2206 2266
2207SV *incr_text (JSON *self) 2267SV *incr_text (JSON *self)
… …
2238 self->incr_mode = 0; 2298 self->incr_mode = 0;
2239} 2299}
2240 2300
2241void DESTROY (JSON *self) 2301void DESTROY (JSON *self)
2242 CODE: 2302 CODE:
2303 SvREFCNT_dec (self->v_false);
2304 SvREFCNT_dec (self->v_true);
2243 SvREFCNT_dec (self->cb_sk_object); 2305 SvREFCNT_dec (self->cb_sk_object);
2244 SvREFCNT_dec (self->cb_object); 2306 SvREFCNT_dec (self->cb_object);
2245 SvREFCNT_dec (self->incr_text); 2307 SvREFCNT_dec (self->incr_text);
2246 2308
2247PROTOTYPES: ENABLE 2309PROTOTYPES: ENABLE

Diff Legend

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