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.29 by root, Wed May 9 15:34:04 2007 UTC vs.
Revision 1.39 by root, Mon Jun 11 03:42:57 2007 UTC

… …
10#if defined(__BORLANDC__) || defined(_MSC_VER) 10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 12#endif
13 13
14#define F_ASCII 0x00000001UL 14#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL
15#define F_UTF8 0x00000002UL 16#define F_UTF8 0x00000004UL
16#define F_INDENT 0x00000004UL 17#define F_INDENT 0x00000008UL
17#define F_CANONICAL 0x00000008UL 18#define F_CANONICAL 0x00000010UL
18#define F_SPACE_BEFORE 0x00000010UL 19#define F_SPACE_BEFORE 0x00000020UL
19#define F_SPACE_AFTER 0x00000020UL 20#define F_SPACE_AFTER 0x00000040UL
20#define F_ALLOW_NONREF 0x00000080UL 21#define F_ALLOW_NONREF 0x00000100UL
21#define F_SHRINK 0x00000100UL 22#define F_SHRINK 0x00000200UL
22#define F_MAXDEPTH 0xf8000000UL 23#define F_MAXDEPTH 0xf8000000UL
23#define S_MAXDEPTH 27 24#define S_MAXDEPTH 27
24 25
25#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
26 27
… …
31#define F_DEFAULT (9UL << S_MAXDEPTH) 32#define F_DEFAULT (9UL << S_MAXDEPTH)
32 33
33#define INIT_SIZE 32 // initial scalar size to be allocated 34#define INIT_SIZE 32 // initial scalar size to be allocated
34#define INDENT_STEP 3 // spaces per indentation level 35#define INDENT_STEP 3 // spaces per indentation level
35 36
36#define SHORT_STRING_LEN 512 // special-case strings of up to this size 37#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
37 38
38#define SB do { 39#define SB do {
39#define SE } while (0) 40#define SE } while (0)
41
42#if __GNUC__ >= 3
43# define expect(expr,value) __builtin_expect ((expr),(value))
44# define inline inline
45#else
46# define expect(expr,value) (expr)
47# define inline static
48#endif
49
50#define expect_false(expr) expect ((expr) != 0, 0)
51#define expect_true(expr) expect ((expr) != 0, 1)
40 52
41static HV *json_stash; // JSON::XS:: 53static HV *json_stash; // JSON::XS::
42 54
43///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
44// utility functions 56// utility functions
… …
69// decode an utf-8 character and return it, or (UV)-1 in 81// decode an utf-8 character and return it, or (UV)-1 in
70// case of an error. 82// case of an error.
71// we special-case "safe" characters from U+80 .. U+7FF, 83// we special-case "safe" characters from U+80 .. U+7FF,
72// but use the very good perl function to parse anything else. 84// but use the very good perl function to parse anything else.
73// note that we never call this function for a ascii codepoints 85// note that we never call this function for a ascii codepoints
74static UV 86inline UV
75decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 87decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
76{ 88{
77 if (s[0] > 0xdf || s[0] < 0xc2) 89 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
78 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 90 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
79 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 91 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
80 { 92 {
81 *clen = 2; 93 *clen = 2;
82 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 94 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
… …
100 U32 flags; // F_* 112 U32 flags; // F_*
101 U32 indent; // indentation level 113 U32 indent; // indentation level
102 U32 maxdepth; // max. indentation/recursion level 114 U32 maxdepth; // max. indentation/recursion level
103} enc_t; 115} enc_t;
104 116
105static void 117inline void
106need (enc_t *enc, STRLEN len) 118need (enc_t *enc, STRLEN len)
107{ 119{
108 if (enc->cur + len >= enc->end) 120 if (expect_false (enc->cur + len >= enc->end))
109 { 121 {
110 STRLEN cur = enc->cur - SvPVX (enc->sv); 122 STRLEN cur = enc->cur - SvPVX (enc->sv);
111 SvGROW (enc->sv, cur + len + 1); 123 SvGROW (enc->sv, cur + len + 1);
112 enc->cur = SvPVX (enc->sv) + cur; 124 enc->cur = SvPVX (enc->sv) + cur;
113 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 125 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
114 } 126 }
115} 127}
116 128
117static void 129inline void
118encode_ch (enc_t *enc, char ch) 130encode_ch (enc_t *enc, char ch)
119{ 131{
120 need (enc, 1); 132 need (enc, 1);
121 *enc->cur++ = ch; 133 *enc->cur++ = ch;
122} 134}
… …
130 142
131 while (str < end) 143 while (str < end)
132 { 144 {
133 unsigned char ch = *(unsigned char *)str; 145 unsigned char ch = *(unsigned char *)str;
134 146
135 if (ch >= 0x20 && ch < 0x80) // most common case 147 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
136 { 148 {
137 if (ch == '"') // but with slow exceptions 149 if (expect_false (ch == '"')) // but with slow exceptions
138 { 150 {
139 need (enc, len += 1); 151 need (enc, len += 1);
140 *enc->cur++ = '\\'; 152 *enc->cur++ = '\\';
141 *enc->cur++ = '"'; 153 *enc->cur++ = '"';
142 } 154 }
143 else if (ch == '\\') 155 else if (expect_false (ch == '\\'))
144 { 156 {
145 need (enc, len += 1); 157 need (enc, len += 1);
146 *enc->cur++ = '\\'; 158 *enc->cur++ = '\\';
147 *enc->cur++ = '\\'; 159 *enc->cur++ = '\\';
148 } 160 }
… …
180 } 192 }
181 193
182 if (uch > 0x10FFFFUL) 194 if (uch > 0x10FFFFUL)
183 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 195 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
184 196
185 if (uch < 0x80 || enc->flags & F_ASCII) 197 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
186 { 198 {
187 if (uch > 0xFFFFUL) 199 if (uch > 0xFFFFUL)
188 { 200 {
189 need (enc, len += 11); 201 need (enc, len += 11);
190 sprintf (enc->cur, "\\u%04x\\u%04x", 202 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
204 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 216 *enc->cur++ = hexdigit [(uch >> 0) & 15];
205 } 217 }
206 218
207 str += clen; 219 str += clen;
208 } 220 }
221 else if (enc->flags & F_LATIN1)
222 {
223 *enc->cur++ = uch;
224 str += clen;
225 }
209 else if (is_utf8) 226 else if (is_utf8)
210 { 227 {
211 need (enc, len += clen); 228 need (enc, len += clen);
212 do 229 do
213 { 230 {
… …
227 244
228 --len; 245 --len;
229 } 246 }
230} 247}
231 248
232static void 249inline void
233encode_indent (enc_t *enc) 250encode_indent (enc_t *enc)
234{ 251{
235 if (enc->flags & F_INDENT) 252 if (enc->flags & F_INDENT)
236 { 253 {
237 int spaces = enc->indent * INDENT_STEP; 254 int spaces = enc->indent * INDENT_STEP;
… …
240 memset (enc->cur, ' ', spaces); 257 memset (enc->cur, ' ', spaces);
241 enc->cur += spaces; 258 enc->cur += spaces;
242 } 259 }
243} 260}
244 261
245static void 262inline void
246encode_space (enc_t *enc) 263encode_space (enc_t *enc)
247{ 264{
248 need (enc, 1); 265 need (enc, 1);
249 encode_ch (enc, ' '); 266 encode_ch (enc, ' ');
250} 267}
251 268
252static void 269inline void
253encode_nl (enc_t *enc) 270encode_nl (enc_t *enc)
254{ 271{
255 if (enc->flags & F_INDENT) 272 if (enc->flags & F_INDENT)
256 { 273 {
257 need (enc, 1); 274 need (enc, 1);
258 encode_ch (enc, '\n'); 275 encode_ch (enc, '\n');
259 } 276 }
260} 277}
261 278
262static void 279inline void
263encode_comma (enc_t *enc) 280encode_comma (enc_t *enc)
264{ 281{
265 encode_ch (enc, ','); 282 encode_ch (enc, ',');
266 283
267 if (enc->flags & F_INDENT) 284 if (enc->flags & F_INDENT)
… …
366 // actually, this is mostly due to the stupid so-called 383 // actually, this is mostly due to the stupid so-called
367 // security workaround added somewhere in 5.8.x. 384 // security workaround added somewhere in 5.8.x.
368 // that randomises hash orderings 385 // that randomises hash orderings
369 if (enc->flags & F_CANONICAL) 386 if (enc->flags & F_CANONICAL)
370 { 387 {
371 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
372 int fast = 1; 388 int fast = 1;
389 HE *he;
390#if defined(__BORLANDC__) || defined(_MSC_VER)
391 HE **hes = _alloca (count * sizeof (HE));
392#else
393 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
394#endif
373 395
374 i = 0; 396 i = 0;
375 while ((he = hv_iternext (hv))) 397 while ((he = hv_iternext (hv)))
376 { 398 {
377 hes [i++] = he; 399 hes [i++] = he;
… …
475 encode_str (enc, str, len, SvUTF8 (sv)); 497 encode_str (enc, str, len, SvUTF8 (sv));
476 encode_ch (enc, '"'); 498 encode_ch (enc, '"');
477 } 499 }
478 else if (SvNOKp (sv)) 500 else if (SvNOKp (sv))
479 { 501 {
502 // trust that perl will do the right thing w.r.t. JSON syntax.
480 need (enc, NV_DIG + 32); 503 need (enc, NV_DIG + 32);
481 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 504 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
482 enc->cur += strlen (enc->cur); 505 enc->cur += strlen (enc->cur);
483 } 506 }
484 else if (SvIOKp (sv)) 507 else if (SvIOKp (sv))
485 { 508 {
486 need (enc, 64); 509 // we assume we can always read an IV as a UV
510 if (SvUV (sv) & ~(UV)0x7fff)
511 {
512 // large integer, use the (rather slow) snprintf way.
513 need (enc, sizeof (UV) * 3);
487 enc->cur += 514 enc->cur +=
488 SvIsUV(sv) 515 SvIsUV(sv)
489 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 516 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
490 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 517 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
518 }
519 else
520 {
521 // optimise the "small number case"
522 // code will likely be branchless and use only a single multiplication
523 I32 i = SvIV (sv);
524 U32 u;
525 char digit, nz = 0;
526
527 need (enc, 6);
528
529 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
530 u = i < 0 ? -i : i;
531
532 // convert to 4.28 fixed-point representation
533 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
534
535 // now output digit by digit, each time masking out the integer part
536 // and multiplying by 5 while moving the decimal point one to the right,
537 // resulting in a net multiplication by 10.
538 // we always write the digit to memory but conditionally increment
539 // the pointer, to ease the usage of conditional move instructions.
540 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
541 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
542 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
543 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
544 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
545 }
491 } 546 }
492 else if (SvROK (sv)) 547 else if (SvROK (sv))
493 encode_rv (enc, SvRV (sv)); 548 encode_rv (enc, SvRV (sv));
494 else if (!SvOK (sv)) 549 else if (!SvOK (sv))
495 encode_str (enc, "null", 4, 0); 550 encode_str (enc, "null", 4, 0);
… …
514 enc.maxdepth = DEC_DEPTH (flags); 569 enc.maxdepth = DEC_DEPTH (flags);
515 570
516 SvPOK_only (enc.sv); 571 SvPOK_only (enc.sv);
517 encode_sv (&enc, scalar); 572 encode_sv (&enc, scalar);
518 573
519 if (!(flags & (F_ASCII | F_UTF8)))
520 SvUTF8_on (enc.sv);
521
522 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 574 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
523 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 575 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
576
577 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
578 SvUTF8_on (enc.sv);
524 579
525 if (enc.flags & F_SHRINK) 580 if (enc.flags & F_SHRINK)
526 shrink (enc.sv); 581 shrink (enc.sv);
527 582
528 return enc.sv; 583 return enc.sv;
… …
540 U32 flags; // F_* 595 U32 flags; // F_*
541 U32 depth; // recursion depth 596 U32 depth; // recursion depth
542 U32 maxdepth; // recursion depth limit 597 U32 maxdepth; // recursion depth limit
543} dec_t; 598} dec_t;
544 599
545static void 600inline void
546decode_ws (dec_t *dec) 601decode_ws (dec_t *dec)
547{ 602{
548 for (;;) 603 for (;;)
549 { 604 {
550 char ch = *dec->cur; 605 char ch = *dec->cur;
… …
576decode_4hex (dec_t *dec) 631decode_4hex (dec_t *dec)
577{ 632{
578 signed char d1, d2, d3, d4; 633 signed char d1, d2, d3, d4;
579 unsigned char *cur = (unsigned char *)dec->cur; 634 unsigned char *cur = (unsigned char *)dec->cur;
580 635
581 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 636 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("four hexadecimal digits expected");
582 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 637 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("four hexadecimal digits expected");
583 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 638 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("four hexadecimal digits expected");
584 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 639 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("four hexadecimal digits expected");
585 640
586 dec->cur += 4; 641 dec->cur += 4;
587 642
588 return ((UV)d1) << 12 643 return ((UV)d1) << 12
589 | ((UV)d2) << 8 644 | ((UV)d2) << 8
… …
597static SV * 652static SV *
598decode_str (dec_t *dec) 653decode_str (dec_t *dec)
599{ 654{
600 SV *sv = 0; 655 SV *sv = 0;
601 int utf8 = 0; 656 int utf8 = 0;
657 char *dec_cur = dec->cur;
602 658
603 do 659 do
604 { 660 {
605 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 661 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
606 char *cur = buf; 662 char *cur = buf;
607 663
608 do 664 do
609 { 665 {
610 unsigned char ch = *(unsigned char *)dec->cur++; 666 unsigned char ch = *(unsigned char *)dec_cur++;
611 667
612 if (ch == '"') 668 if (expect_false (ch == '"'))
613 { 669 {
614 --dec->cur; 670 --dec_cur;
615 break; 671 break;
616 } 672 }
617 else if (ch == '\\') 673 else if (expect_false (ch == '\\'))
618 { 674 {
619 switch (*dec->cur) 675 switch (*dec_cur)
620 { 676 {
621 case '\\': 677 case '\\':
622 case '/': 678 case '/':
623 case '"': *cur++ = *dec->cur++; break; 679 case '"': *cur++ = *dec_cur++; break;
624 680
625 case 'b': ++dec->cur; *cur++ = '\010'; break; 681 case 'b': ++dec_cur; *cur++ = '\010'; break;
626 case 't': ++dec->cur; *cur++ = '\011'; break; 682 case 't': ++dec_cur; *cur++ = '\011'; break;
627 case 'n': ++dec->cur; *cur++ = '\012'; break; 683 case 'n': ++dec_cur; *cur++ = '\012'; break;
628 case 'f': ++dec->cur; *cur++ = '\014'; break; 684 case 'f': ++dec_cur; *cur++ = '\014'; break;
629 case 'r': ++dec->cur; *cur++ = '\015'; break; 685 case 'r': ++dec_cur; *cur++ = '\015'; break;
630 686
631 case 'u': 687 case 'u':
632 { 688 {
633 UV lo, hi; 689 UV lo, hi;
634 ++dec->cur; 690 ++dec_cur;
635 691
692 dec->cur = dec_cur;
636 hi = decode_4hex (dec); 693 hi = decode_4hex (dec);
694 dec_cur = dec->cur;
637 if (hi == (UV)-1) 695 if (hi == (UV)-1)
638 goto fail; 696 goto fail;
639 697
640 // possibly a surrogate pair 698 // possibly a surrogate pair
641 if (hi >= 0xd800) 699 if (hi >= 0xd800)
642 if (hi < 0xdc00) 700 if (hi < 0xdc00)
643 { 701 {
644 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 702 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
645 ERR ("missing low surrogate character in surrogate pair"); 703 ERR ("missing low surrogate character in surrogate pair");
646 704
647 dec->cur += 2; 705 dec_cur += 2;
648 706
707 dec->cur = dec_cur;
649 lo = decode_4hex (dec); 708 lo = decode_4hex (dec);
709 dec_cur = dec->cur;
650 if (lo == (UV)-1) 710 if (lo == (UV)-1)
651 goto fail; 711 goto fail;
652 712
653 if (lo < 0xdc00 || lo >= 0xe000) 713 if (lo < 0xdc00 || lo >= 0xe000)
654 ERR ("surrogate pair expected"); 714 ERR ("surrogate pair expected");
… …
668 *cur++ = hi; 728 *cur++ = hi;
669 } 729 }
670 break; 730 break;
671 731
672 default: 732 default:
673 --dec->cur; 733 --dec_cur;
674 ERR ("illegal backslash escape sequence in string"); 734 ERR ("illegal backslash escape sequence in string");
675 } 735 }
676 } 736 }
677 else if (ch >= 0x20 && ch <= 0x7f) 737 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
678 *cur++ = ch; 738 *cur++ = ch;
679 else if (ch >= 0x80) 739 else if (ch >= 0x80)
680 { 740 {
681 STRLEN clen; 741 STRLEN clen;
682 UV uch; 742 UV uch;
683 743
684 --dec->cur; 744 --dec_cur;
685 745
686 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 746 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
687 if (clen == (STRLEN)-1) 747 if (clen == (STRLEN)-1)
688 ERR ("malformed UTF-8 character in JSON string"); 748 ERR ("malformed UTF-8 character in JSON string");
689 749
690 do 750 do
691 *cur++ = *dec->cur++; 751 *cur++ = *dec_cur++;
692 while (--clen); 752 while (--clen);
693 753
694 utf8 = 1; 754 utf8 = 1;
695 } 755 }
696 else 756 else
697 { 757 {
698 --dec->cur; 758 --dec_cur;
699 759
700 if (!ch) 760 if (!ch)
701 ERR ("unexpected end of string while parsing JSON string"); 761 ERR ("unexpected end of string while parsing JSON string");
702 else 762 else
703 ERR ("invalid character encountered while parsing JSON string"); 763 ERR ("invalid character encountered while parsing JSON string");
… …
716 } 776 }
717 else 777 else
718 sv = newSVpvn (buf, len); 778 sv = newSVpvn (buf, len);
719 } 779 }
720 } 780 }
721 while (*dec->cur != '"'); 781 while (*dec_cur != '"');
722 782
723 ++dec->cur; 783 ++dec_cur;
724 784
725 if (sv) 785 if (sv)
726 { 786 {
727 SvPOK_only (sv); 787 SvPOK_only (sv);
728 *SvEND (sv) = 0; 788 *SvEND (sv) = 0;
… …
731 SvUTF8_on (sv); 791 SvUTF8_on (sv);
732 } 792 }
733 else 793 else
734 sv = newSVpvn ("", 0); 794 sv = newSVpvn ("", 0);
735 795
796 dec->cur = dec_cur;
736 return sv; 797 return sv;
737 798
738fail: 799fail:
800 dec->cur = dec_cur;
739 return 0; 801 return 0;
740} 802}
741 803
742static SV * 804static SV *
743decode_num (dec_t *dec) 805decode_num (dec_t *dec)
… …
801 is_nv = 1; 863 is_nv = 1;
802 } 864 }
803 865
804 if (!is_nv) 866 if (!is_nv)
805 { 867 {
806 UV uv; 868 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
807 int numtype = grok_number (start, dec->cur - start, &uv); 869 if (*start == '-')
808 if (numtype & IS_NUMBER_IN_UV) 870 switch (dec->cur - start)
809 if (numtype & IS_NUMBER_NEG)
810 { 871 {
811 if (uv < (UV)IV_MIN) 872 case 2: return newSViv (-( start [1] - '0' ));
812 return newSViv (-(IV)uv); 873 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
874 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
875 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
813 } 876 }
877 else
878 switch (dec->cur - start)
879 {
880 case 1: return newSViv ( start [0] - '0' );
881 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
882 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
883 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
884 }
885
886 {
887 UV uv;
888 int numtype = grok_number (start, dec->cur - start, &uv);
889 if (numtype & IS_NUMBER_IN_UV)
890 if (numtype & IS_NUMBER_NEG)
891 {
892 if (uv < (UV)IV_MIN)
893 return newSViv (-(IV)uv);
894 }
814 else 895 else
815 return newSVuv (uv); 896 return newSVuv (uv);
897 }
816 } 898 }
817 899
818 return newSVnv (Atof (start)); 900 return newSVnv (Atof (start));
819 901
820fail: 902fail:
… …
977fail: 1059fail:
978 return 0; 1060 return 0;
979} 1061}
980 1062
981static SV * 1063static SV *
982decode_json (SV *string, U32 flags) 1064decode_json (SV *string, U32 flags, UV *offset_return)
983{ 1065{
984 dec_t dec; 1066 dec_t dec;
1067 UV offset;
985 SV *sv; 1068 SV *sv;
986 1069
987 SvGETMAGIC (string); 1070 SvGETMAGIC (string);
988 SvUPGRADE (string, SVt_PV); 1071 SvUPGRADE (string, SVt_PV);
989 1072
… …
999 dec.end = SvEND (string); 1082 dec.end = SvEND (string);
1000 dec.err = 0; 1083 dec.err = 0;
1001 dec.depth = 0; 1084 dec.depth = 0;
1002 dec.maxdepth = DEC_DEPTH (dec.flags); 1085 dec.maxdepth = DEC_DEPTH (dec.flags);
1003 1086
1004 *dec.end = 0; // this should basically be a nop, too, but make sure its there 1087 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1005 sv = decode_sv (&dec); 1088 sv = decode_sv (&dec);
1006 1089
1090 if (!(offset_return || !sv))
1091 {
1092 // check for trailing garbage
1093 decode_ws (&dec);
1094
1095 if (*dec.cur)
1096 {
1097 dec.err = "garbage after JSON object";
1098 SvREFCNT_dec (sv);
1099 sv = 0;
1100 }
1101 }
1102
1103 if (offset_return || !sv)
1104 {
1105 offset = dec.flags & F_UTF8
1106 ? dec.cur - SvPVX (string)
1107 : utf8_distance (dec.cur, SvPVX (string));
1108
1109 if (offset_return)
1110 *offset_return = offset;
1111 }
1112
1007 if (!sv) 1113 if (!sv)
1008 { 1114 {
1009 IV offset = dec.flags & F_UTF8
1010 ? dec.cur - SvPVX (string)
1011 : utf8_distance (dec.cur, SvPVX (string));
1012 SV *uni = sv_newmortal (); 1115 SV *uni = sv_newmortal ();
1013 1116
1014 // horrible hack to silence warning inside pv_uni_display 1117 // horrible hack to silence warning inside pv_uni_display
1015 COP cop = *PL_curcop; 1118 COP cop = *PL_curcop;
1016 cop.cop_warnings = pWARN_NONE; 1119 cop.cop_warnings = pWARN_NONE;
… …
1064 RETVAL 1167 RETVAL
1065 1168
1066SV *ascii (SV *self, int enable = 1) 1169SV *ascii (SV *self, int enable = 1)
1067 ALIAS: 1170 ALIAS:
1068 ascii = F_ASCII 1171 ascii = F_ASCII
1172 latin1 = F_LATIN1
1069 utf8 = F_UTF8 1173 utf8 = F_UTF8
1070 indent = F_INDENT 1174 indent = F_INDENT
1071 canonical = F_CANONICAL 1175 canonical = F_CANONICAL
1072 space_before = F_SPACE_BEFORE 1176 space_before = F_SPACE_BEFORE
1073 space_after = F_SPACE_AFTER 1177 space_after = F_SPACE_AFTER
… …
1109 PPCODE: 1213 PPCODE:
1110 XPUSHs (encode_json (scalar, *SvJSON (self))); 1214 XPUSHs (encode_json (scalar, *SvJSON (self)));
1111 1215
1112void decode (SV *self, SV *jsonstr) 1216void decode (SV *self, SV *jsonstr)
1113 PPCODE: 1217 PPCODE:
1114 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1218 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
1219
1220void decode_prefix (SV *self, SV *jsonstr)
1221 PPCODE:
1222{
1223 UV offset;
1224 EXTEND (SP, 2);
1225 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
1226 PUSHs (sv_2mortal (newSVuv (offset)));
1227}
1115 1228
1116PROTOTYPES: ENABLE 1229PROTOTYPES: ENABLE
1117 1230
1118void to_json (SV *scalar) 1231void to_json (SV *scalar)
1119 ALIAS: 1232 ALIAS:
… …
1123 1236
1124void from_json (SV *jsonstr) 1237void from_json (SV *jsonstr)
1125 ALIAS: 1238 ALIAS:
1126 jsonToObj = 0 1239 jsonToObj = 0
1127 PPCODE: 1240 PPCODE:
1128 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8)); 1241 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0));
1129 1242

Diff Legend

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