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.34 by root, Wed May 23 22:07:13 2007 UTC vs.
Revision 1.46 by root, Mon Jun 25 22:11:39 2007 UTC

9 9
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// some old perls do not have this, try to make it work, no
15// guarentees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13
18#endif
19
14#define F_ASCII 0x00000001UL 20#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL 21#define F_LATIN1 0x00000002UL
16#define F_UTF8 0x00000004UL 22#define F_UTF8 0x00000004UL
17#define F_INDENT 0x00000008UL 23#define F_INDENT 0x00000008UL
18#define F_CANONICAL 0x00000010UL 24#define F_CANONICAL 0x00000010UL
19#define F_SPACE_BEFORE 0x00000020UL 25#define F_SPACE_BEFORE 0x00000020UL
20#define F_SPACE_AFTER 0x00000040UL 26#define F_SPACE_AFTER 0x00000040UL
21#define F_ALLOW_NONREF 0x00000100UL 27#define F_ALLOW_NONREF 0x00000100UL
22#define F_SHRINK 0x00000200UL 28#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL // NYI
23#define F_MAXDEPTH 0xf8000000UL 31#define F_MAXDEPTH 0xf8000000UL
24#define S_MAXDEPTH 27 32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20
25 35
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27 37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
30 38
31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
32#define F_DEFAULT (9UL << S_MAXDEPTH) 40#define F_DEFAULT (9UL << S_MAXDEPTH)
33 41
34#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
35#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
36 44
37#define SHORT_STRING_LEN 512 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
38 46
39#define SB do { 47#define SB do {
40#define SE } while (0) 48#define SE } while (0)
41 49
50#if __GNUC__ >= 3
51# define expect(expr,value) __builtin_expect ((expr),(value))
52# define inline inline
53#else
54# define expect(expr,value) (expr)
55# define inline static
56#endif
57
58#define expect_false(expr) expect ((expr) != 0, 0)
59#define expect_true(expr) expect ((expr) != 0, 1)
60
42static HV *json_stash; // JSON::XS:: 61static HV *json_stash, *json_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false;
43 63
44///////////////////////////////////////////////////////////////////////////// 64/////////////////////////////////////////////////////////////////////////////
45// utility functions 65// utility functions
46 66
47static UV * 67static UV *
70// decode an utf-8 character and return it, or (UV)-1 in 90// decode an utf-8 character and return it, or (UV)-1 in
71// case of an error. 91// case of an error.
72// we special-case "safe" characters from U+80 .. U+7FF, 92// we special-case "safe" characters from U+80 .. U+7FF,
73// but use the very good perl function to parse anything else. 93// but use the very good perl function to parse anything else.
74// note that we never call this function for a ascii codepoints 94// note that we never call this function for a ascii codepoints
75static UV 95inline UV
76decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 96decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
77{ 97{
78 if (s[0] > 0xdf || s[0] < 0xc2) 98 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
79 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 99 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
80 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 100 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
81 { 101 {
82 *clen = 2; 102 *clen = 2;
83 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 103 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
101 U32 flags; // F_* 121 U32 flags; // F_*
102 U32 indent; // indentation level 122 U32 indent; // indentation level
103 U32 maxdepth; // max. indentation/recursion level 123 U32 maxdepth; // max. indentation/recursion level
104} enc_t; 124} enc_t;
105 125
106static void 126inline void
107need (enc_t *enc, STRLEN len) 127need (enc_t *enc, STRLEN len)
108{ 128{
109 if (enc->cur + len >= enc->end) 129 if (expect_false (enc->cur + len >= enc->end))
110 { 130 {
111 STRLEN cur = enc->cur - SvPVX (enc->sv); 131 STRLEN cur = enc->cur - SvPVX (enc->sv);
112 SvGROW (enc->sv, cur + len + 1); 132 SvGROW (enc->sv, cur + len + 1);
113 enc->cur = SvPVX (enc->sv) + cur; 133 enc->cur = SvPVX (enc->sv) + cur;
114 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 134 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
115 } 135 }
116} 136}
117 137
118static void 138inline void
119encode_ch (enc_t *enc, char ch) 139encode_ch (enc_t *enc, char ch)
120{ 140{
121 need (enc, 1); 141 need (enc, 1);
122 *enc->cur++ = ch; 142 *enc->cur++ = ch;
123} 143}
131 151
132 while (str < end) 152 while (str < end)
133 { 153 {
134 unsigned char ch = *(unsigned char *)str; 154 unsigned char ch = *(unsigned char *)str;
135 155
136 if (ch >= 0x20 && ch < 0x80) // most common case 156 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
137 { 157 {
138 if (ch == '"') // but with slow exceptions 158 if (expect_false (ch == '"')) // but with slow exceptions
139 { 159 {
140 need (enc, len += 1); 160 need (enc, len += 1);
141 *enc->cur++ = '\\'; 161 *enc->cur++ = '\\';
142 *enc->cur++ = '"'; 162 *enc->cur++ = '"';
143 } 163 }
144 else if (ch == '\\') 164 else if (expect_false (ch == '\\'))
145 { 165 {
146 need (enc, len += 1); 166 need (enc, len += 1);
147 *enc->cur++ = '\\'; 167 *enc->cur++ = '\\';
148 *enc->cur++ = '\\'; 168 *enc->cur++ = '\\';
149 } 169 }
167 STRLEN clen; 187 STRLEN clen;
168 UV uch; 188 UV uch;
169 189
170 if (is_utf8) 190 if (is_utf8)
171 { 191 {
172 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
173 uch = decode_utf8 (str, end - str, &clen); 192 uch = decode_utf8 (str, end - str, &clen);
174 if (clen == (STRLEN)-1) 193 if (clen == (STRLEN)-1)
175 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 194 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
176 } 195 }
177 else 196 else
233 252
234 --len; 253 --len;
235 } 254 }
236} 255}
237 256
238static void 257inline void
239encode_indent (enc_t *enc) 258encode_indent (enc_t *enc)
240{ 259{
241 if (enc->flags & F_INDENT) 260 if (enc->flags & F_INDENT)
242 { 261 {
243 int spaces = enc->indent * INDENT_STEP; 262 int spaces = enc->indent * INDENT_STEP;
246 memset (enc->cur, ' ', spaces); 265 memset (enc->cur, ' ', spaces);
247 enc->cur += spaces; 266 enc->cur += spaces;
248 } 267 }
249} 268}
250 269
251static void 270inline void
252encode_space (enc_t *enc) 271encode_space (enc_t *enc)
253{ 272{
254 need (enc, 1); 273 need (enc, 1);
255 encode_ch (enc, ' '); 274 encode_ch (enc, ' ');
256} 275}
257 276
258static void 277inline void
259encode_nl (enc_t *enc) 278encode_nl (enc_t *enc)
260{ 279{
261 if (enc->flags & F_INDENT) 280 if (enc->flags & F_INDENT)
262 { 281 {
263 need (enc, 1); 282 need (enc, 1);
264 encode_ch (enc, '\n'); 283 encode_ch (enc, '\n');
265 } 284 }
266} 285}
267 286
268static void 287inline void
269encode_comma (enc_t *enc) 288encode_comma (enc_t *enc)
270{ 289{
271 encode_ch (enc, ','); 290 encode_ch (enc, ',');
272 291
273 if (enc->flags & F_INDENT) 292 if (enc->flags & F_INDENT)
452 svtype svt; 471 svtype svt;
453 472
454 SvGETMAGIC (sv); 473 SvGETMAGIC (sv);
455 svt = SvTYPE (sv); 474 svt = SvTYPE (sv);
456 475
476 if (expect_false (SvOBJECT (sv)))
477 {
478 if (SvSTASH (sv) == json_boolean_stash)
479 {
480 if (SvIV (sv) == 0)
481 encode_str (enc, "false", 5, 0);
482 else
483 encode_str (enc, "true", 4, 0);
484 }
485 else
486 {
487#if 0
488 if (0 && sv_derived_from (rv, "JSON::Literal"))
489 {
490 // not yet
491 }
492#endif
493 if (enc->flags & F_CONV_BLESSED)
494 {
495 // we re-bless the reference to get overload and other niceties right
496 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
497
498 if (to_json)
499 {
500 dSP;
501 ENTER;
502 SAVETMPS;
503 PUSHMARK (SP);
504 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
505
506 // calling with G_SCALAR ensures that we always get a 1 reutrn value
507 // check anyways.
508 PUTBACK;
509 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
510 SPAGAIN;
511
512 encode_sv (enc, POPs);
513
514 FREETMPS;
515 LEAVE;
516 }
517 else if (enc->flags & F_ALLOW_BLESSED)
518 encode_str (enc, "null", 4, 0);
519 else
520 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
521 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
522 }
523 else if (enc->flags & F_ALLOW_BLESSED)
524 encode_str (enc, "null", 4, 0);
525 else
526 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
527 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
528 }
529 }
457 if (svt == SVt_PVHV) 530 else if (svt == SVt_PVHV)
458 encode_hv (enc, (HV *)sv); 531 encode_hv (enc, (HV *)sv);
459 else if (svt == SVt_PVAV) 532 else if (svt == SVt_PVAV)
460 encode_av (enc, (AV *)sv); 533 encode_av (enc, (AV *)sv);
461 else if (svt < SVt_PVAV) 534 else if (svt < SVt_PVAV)
462 { 535 {
486 encode_str (enc, str, len, SvUTF8 (sv)); 559 encode_str (enc, str, len, SvUTF8 (sv));
487 encode_ch (enc, '"'); 560 encode_ch (enc, '"');
488 } 561 }
489 else if (SvNOKp (sv)) 562 else if (SvNOKp (sv))
490 { 563 {
564 // trust that perl will do the right thing w.r.t. JSON syntax.
491 need (enc, NV_DIG + 32); 565 need (enc, NV_DIG + 32);
492 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 566 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
493 enc->cur += strlen (enc->cur); 567 enc->cur += strlen (enc->cur);
494 } 568 }
495 else if (SvIOKp (sv)) 569 else if (SvIOKp (sv))
496 { 570 {
497 need (enc, 64); 571 // we assume we can always read an IV as a UV
572 if (SvUV (sv) & ~(UV)0x7fff)
573 {
574 // large integer, use the (rather slow) snprintf way.
575 need (enc, sizeof (UV) * 3);
498 enc->cur += 576 enc->cur +=
499 SvIsUV(sv) 577 SvIsUV(sv)
500 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 578 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
501 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 579 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
580 }
581 else
582 {
583 // optimise the "small number case"
584 // code will likely be branchless and use only a single multiplication
585 I32 i = SvIV (sv);
586 U32 u;
587 char digit, nz = 0;
588
589 need (enc, 6);
590
591 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
592 u = i < 0 ? -i : i;
593
594 // convert to 4.28 fixed-point representation
595 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
596
597 // now output digit by digit, each time masking out the integer part
598 // and multiplying by 5 while moving the decimal point one to the right,
599 // resulting in a net multiplication by 10.
600 // we always write the digit to memory but conditionally increment
601 // the pointer, to ease the usage of conditional move instructions.
602 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
603 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
604 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
605 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
606 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
607 }
502 } 608 }
503 else if (SvROK (sv)) 609 else if (SvROK (sv))
504 encode_rv (enc, SvRV (sv)); 610 encode_rv (enc, SvRV (sv));
505 else if (!SvOK (sv)) 611 else if (!SvOK (sv))
506 encode_str (enc, "null", 4, 0); 612 encode_str (enc, "null", 4, 0);
551 U32 flags; // F_* 657 U32 flags; // F_*
552 U32 depth; // recursion depth 658 U32 depth; // recursion depth
553 U32 maxdepth; // recursion depth limit 659 U32 maxdepth; // recursion depth limit
554} dec_t; 660} dec_t;
555 661
556static void 662inline void
557decode_ws (dec_t *dec) 663decode_ws (dec_t *dec)
558{ 664{
559 for (;;) 665 for (;;)
560 { 666 {
561 char ch = *dec->cur; 667 char ch = *dec->cur;
587decode_4hex (dec_t *dec) 693decode_4hex (dec_t *dec)
588{ 694{
589 signed char d1, d2, d3, d4; 695 signed char d1, d2, d3, d4;
590 unsigned char *cur = (unsigned char *)dec->cur; 696 unsigned char *cur = (unsigned char *)dec->cur;
591 697
592 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 698 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
593 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 699 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
594 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 700 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
595 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 701 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
596 702
597 dec->cur += 4; 703 dec->cur += 4;
598 704
599 return ((UV)d1) << 12 705 return ((UV)d1) << 12
600 | ((UV)d2) << 8 706 | ((UV)d2) << 8
608static SV * 714static SV *
609decode_str (dec_t *dec) 715decode_str (dec_t *dec)
610{ 716{
611 SV *sv = 0; 717 SV *sv = 0;
612 int utf8 = 0; 718 int utf8 = 0;
719 char *dec_cur = dec->cur;
613 720
614 do 721 do
615 { 722 {
616 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 723 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
617 char *cur = buf; 724 char *cur = buf;
618 725
619 do 726 do
620 { 727 {
621 unsigned char ch = *(unsigned char *)dec->cur++; 728 unsigned char ch = *(unsigned char *)dec_cur++;
622 729
623 if (ch == '"') 730 if (expect_false (ch == '"'))
624 { 731 {
625 --dec->cur; 732 --dec_cur;
626 break; 733 break;
627 } 734 }
628 else if (ch == '\\') 735 else if (expect_false (ch == '\\'))
629 { 736 {
630 switch (*dec->cur) 737 switch (*dec_cur)
631 { 738 {
632 case '\\': 739 case '\\':
633 case '/': 740 case '/':
634 case '"': *cur++ = *dec->cur++; break; 741 case '"': *cur++ = *dec_cur++; break;
635 742
636 case 'b': ++dec->cur; *cur++ = '\010'; break; 743 case 'b': ++dec_cur; *cur++ = '\010'; break;
637 case 't': ++dec->cur; *cur++ = '\011'; break; 744 case 't': ++dec_cur; *cur++ = '\011'; break;
638 case 'n': ++dec->cur; *cur++ = '\012'; break; 745 case 'n': ++dec_cur; *cur++ = '\012'; break;
639 case 'f': ++dec->cur; *cur++ = '\014'; break; 746 case 'f': ++dec_cur; *cur++ = '\014'; break;
640 case 'r': ++dec->cur; *cur++ = '\015'; break; 747 case 'r': ++dec_cur; *cur++ = '\015'; break;
641 748
642 case 'u': 749 case 'u':
643 { 750 {
644 UV lo, hi; 751 UV lo, hi;
645 ++dec->cur; 752 ++dec_cur;
646 753
754 dec->cur = dec_cur;
647 hi = decode_4hex (dec); 755 hi = decode_4hex (dec);
756 dec_cur = dec->cur;
648 if (hi == (UV)-1) 757 if (hi == (UV)-1)
649 goto fail; 758 goto fail;
650 759
651 // possibly a surrogate pair 760 // possibly a surrogate pair
652 if (hi >= 0xd800) 761 if (hi >= 0xd800)
653 if (hi < 0xdc00) 762 if (hi < 0xdc00)
654 { 763 {
655 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 764 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
656 ERR ("missing low surrogate character in surrogate pair"); 765 ERR ("missing low surrogate character in surrogate pair");
657 766
658 dec->cur += 2; 767 dec_cur += 2;
659 768
769 dec->cur = dec_cur;
660 lo = decode_4hex (dec); 770 lo = decode_4hex (dec);
771 dec_cur = dec->cur;
661 if (lo == (UV)-1) 772 if (lo == (UV)-1)
662 goto fail; 773 goto fail;
663 774
664 if (lo < 0xdc00 || lo >= 0xe000) 775 if (lo < 0xdc00 || lo >= 0xe000)
665 ERR ("surrogate pair expected"); 776 ERR ("surrogate pair expected");
679 *cur++ = hi; 790 *cur++ = hi;
680 } 791 }
681 break; 792 break;
682 793
683 default: 794 default:
684 --dec->cur; 795 --dec_cur;
685 ERR ("illegal backslash escape sequence in string"); 796 ERR ("illegal backslash escape sequence in string");
686 } 797 }
687 } 798 }
688 else if (ch >= 0x20 && ch <= 0x7f) 799 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
689 *cur++ = ch; 800 *cur++ = ch;
690 else if (ch >= 0x80) 801 else if (ch >= 0x80)
691 { 802 {
692 STRLEN clen; 803 STRLEN clen;
693 UV uch; 804 UV uch;
694 805
695 --dec->cur; 806 --dec_cur;
696 807
697 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 808 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
698 if (clen == (STRLEN)-1) 809 if (clen == (STRLEN)-1)
699 ERR ("malformed UTF-8 character in JSON string"); 810 ERR ("malformed UTF-8 character in JSON string");
700 811
701 do 812 do
702 *cur++ = *dec->cur++; 813 *cur++ = *dec_cur++;
703 while (--clen); 814 while (--clen);
704 815
705 utf8 = 1; 816 utf8 = 1;
706 } 817 }
707 else 818 else
708 { 819 {
709 --dec->cur; 820 --dec_cur;
710 821
711 if (!ch) 822 if (!ch)
712 ERR ("unexpected end of string while parsing JSON string"); 823 ERR ("unexpected end of string while parsing JSON string");
713 else 824 else
714 ERR ("invalid character encountered while parsing JSON string"); 825 ERR ("invalid character encountered while parsing JSON string");
727 } 838 }
728 else 839 else
729 sv = newSVpvn (buf, len); 840 sv = newSVpvn (buf, len);
730 } 841 }
731 } 842 }
732 while (*dec->cur != '"'); 843 while (*dec_cur != '"');
733 844
734 ++dec->cur; 845 ++dec_cur;
735 846
736 if (sv) 847 if (sv)
737 { 848 {
738 SvPOK_only (sv); 849 SvPOK_only (sv);
739 *SvEND (sv) = 0; 850 *SvEND (sv) = 0;
742 SvUTF8_on (sv); 853 SvUTF8_on (sv);
743 } 854 }
744 else 855 else
745 sv = newSVpvn ("", 0); 856 sv = newSVpvn ("", 0);
746 857
858 dec->cur = dec_cur;
747 return sv; 859 return sv;
748 860
749fail: 861fail:
862 dec->cur = dec_cur;
750 return 0; 863 return 0;
751} 864}
752 865
753static SV * 866static SV *
754decode_num (dec_t *dec) 867decode_num (dec_t *dec)
812 is_nv = 1; 925 is_nv = 1;
813 } 926 }
814 927
815 if (!is_nv) 928 if (!is_nv)
816 { 929 {
817 UV uv; 930 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
818 int numtype = grok_number (start, dec->cur - start, &uv); 931 if (*start == '-')
819 if (numtype & IS_NUMBER_IN_UV) 932 switch (dec->cur - start)
820 if (numtype & IS_NUMBER_NEG)
821 { 933 {
822 if (uv < (UV)IV_MIN) 934 case 2: return newSViv (-( start [1] - '0' * 1));
823 return newSViv (-(IV)uv); 935 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
936 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
937 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
824 } 938 }
939 else
940 switch (dec->cur - start)
941 {
942 case 1: return newSViv ( start [0] - '0' * 1);
943 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
944 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
945 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
946 }
947
948 {
949 UV uv;
950 int numtype = grok_number (start, dec->cur - start, &uv);
951 if (numtype & IS_NUMBER_IN_UV)
952 if (numtype & IS_NUMBER_NEG)
953 {
954 if (uv < (UV)IV_MIN)
955 return newSViv (-(IV)uv);
956 }
825 else 957 else
826 return newSVuv (uv); 958 return newSVuv (uv);
959
960 // here would likely be the place for bigint support
827 } 961 }
962 }
828 963
964 // if we ever support bigint or bigfloat, this is the place for bigfloat
829 return newSVnv (Atof (start)); 965 return newSVnv (Atof (start));
830 966
831fail: 967fail:
832 return 0; 968 return 0;
833} 969}
887 if (*dec->cur == '}') 1023 if (*dec->cur == '}')
888 ++dec->cur; 1024 ++dec->cur;
889 else 1025 else
890 for (;;) 1026 for (;;)
891 { 1027 {
892 SV *key, *value;
893
894 decode_ws (dec); EXPECT_CH ('"'); 1028 decode_ws (dec); EXPECT_CH ('"');
895 1029
896 key = decode_str (dec); 1030 // heuristic: assume that
897 if (!key) 1031 // a) decode_str + hv_store_ent are abysmally slow
898 goto fail; 1032 // b) most hash keys are short, simple ascii text
1033 // so try to "fast-match" such strings to avoid
1034 // the overhead of hv_store_ent.
1035 {
1036 SV *value;
1037 char *p = dec->cur;
1038 char *e = p + 24; // only try up to 24 bytes
899 1039
900 decode_ws (dec); EXPECT_CH (':'); 1040 for (;;)
901
902 value = decode_sv (dec);
903 if (!value)
904 { 1041 {
1042 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1043 {
1044 // slow path, back up and use decode_str
1045 SV *key = decode_str (dec);
1046 if (!key)
1047 goto fail;
1048
1049 decode_ws (dec); EXPECT_CH (':');
1050
1051 value = decode_sv (dec);
1052 if (!value)
1053 {
1054 SvREFCNT_dec (key);
1055 goto fail;
1056 }
1057
1058 hv_store_ent (hv, key, value, 0);
905 SvREFCNT_dec (key); 1059 SvREFCNT_dec (key);
1060
1061 break;
1062 }
1063 else if (*p == '"')
1064 {
1065 // fast path, got a simple key
1066 char *key = dec->cur;
1067 int len = p - key;
1068 dec->cur = p + 1;
1069
1070 decode_ws (dec); EXPECT_CH (':');
1071
1072 value = decode_sv (dec);
1073 if (!value)
906 goto fail; 1074 goto fail;
1075
1076 hv_store (hv, key, len, value, 0);
1077
1078 break;
1079 }
1080
1081 ++p;
907 } 1082 }
908 1083 }
909 hv_store_ent (hv, key, value, 0);
910 SvREFCNT_dec (key);
911 1084
912 decode_ws (dec); 1085 decode_ws (dec);
913 1086
914 if (*dec->cur == '}') 1087 if (*dec->cur == '}')
915 { 1088 {
934 1107
935static SV * 1108static SV *
936decode_sv (dec_t *dec) 1109decode_sv (dec_t *dec)
937{ 1110{
938 decode_ws (dec); 1111 decode_ws (dec);
1112
1113 // the beauty of JSON: you need exactly one character lookahead
1114 // to parse anything.
939 switch (*dec->cur) 1115 switch (*dec->cur)
940 { 1116 {
941 case '"': ++dec->cur; return decode_str (dec); 1117 case '"': ++dec->cur; return decode_str (dec);
942 case '[': ++dec->cur; return decode_av (dec); 1118 case '[': ++dec->cur; return decode_av (dec);
943 case '{': ++dec->cur; return decode_hv (dec); 1119 case '{': ++dec->cur; return decode_hv (dec);
949 1125
950 case 't': 1126 case 't':
951 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1127 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
952 { 1128 {
953 dec->cur += 4; 1129 dec->cur += 4;
954 return newSViv (1); 1130 return SvREFCNT_inc (json_true);
955 } 1131 }
956 else 1132 else
957 ERR ("'true' expected"); 1133 ERR ("'true' expected");
958 1134
959 break; 1135 break;
960 1136
961 case 'f': 1137 case 'f':
962 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1138 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
963 { 1139 {
964 dec->cur += 5; 1140 dec->cur += 5;
965 return newSViv (0); 1141 return SvREFCNT_inc (json_false);
966 } 1142 }
967 else 1143 else
968 ERR ("'false' expected"); 1144 ERR ("'false' expected");
969 1145
970 break; 1146 break;
997 SV *sv; 1173 SV *sv;
998 1174
999 SvGETMAGIC (string); 1175 SvGETMAGIC (string);
1000 SvUPGRADE (string, SVt_PV); 1176 SvUPGRADE (string, SVt_PV);
1001 1177
1178 if (flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (flags))
1179 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1180 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (flags));
1181
1002 if (flags & F_UTF8) 1182 if (flags & F_UTF8)
1003 sv_utf8_downgrade (string, 0); 1183 sv_utf8_downgrade (string, 0);
1004 else 1184 else
1005 sv_utf8_upgrade (string); 1185 sv_utf8_upgrade (string);
1006 1186
1073 1253
1074BOOT: 1254BOOT:
1075{ 1255{
1076 int i; 1256 int i;
1077 1257
1078 memset (decode_hexdigit, 0xff, 256);
1079
1080 for (i = 0; i < 256; ++i) 1258 for (i = 0; i < 256; ++i)
1081 decode_hexdigit [i] = 1259 decode_hexdigit [i] =
1082 i >= '0' && i <= '9' ? i - '0' 1260 i >= '0' && i <= '9' ? i - '0'
1083 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1261 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1084 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1262 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1085 : -1; 1263 : -1;
1086 1264
1087 json_stash = gv_stashpv ("JSON::XS", 1); 1265 json_stash = gv_stashpv ("JSON::XS" , 1);
1266 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1267
1268 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1269 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1088} 1270}
1089 1271
1090PROTOTYPES: DISABLE 1272PROTOTYPES: DISABLE
1091 1273
1092SV *new (char *dummy) 1274SV *new (char *dummy)
1095 OUTPUT: 1277 OUTPUT:
1096 RETVAL 1278 RETVAL
1097 1279
1098SV *ascii (SV *self, int enable = 1) 1280SV *ascii (SV *self, int enable = 1)
1099 ALIAS: 1281 ALIAS:
1100 ascii = F_ASCII 1282 ascii = F_ASCII
1101 latin1 = F_LATIN1 1283 latin1 = F_LATIN1
1102 utf8 = F_UTF8 1284 utf8 = F_UTF8
1103 indent = F_INDENT 1285 indent = F_INDENT
1104 canonical = F_CANONICAL 1286 canonical = F_CANONICAL
1105 space_before = F_SPACE_BEFORE 1287 space_before = F_SPACE_BEFORE
1106 space_after = F_SPACE_AFTER 1288 space_after = F_SPACE_AFTER
1107 pretty = F_PRETTY 1289 pretty = F_PRETTY
1108 allow_nonref = F_ALLOW_NONREF 1290 allow_nonref = F_ALLOW_NONREF
1109 shrink = F_SHRINK 1291 shrink = F_SHRINK
1292 allow_blessed = F_ALLOW_BLESSED
1293 convert_blessed = F_CONV_BLESSED
1110 CODE: 1294 CODE:
1111{ 1295{
1112 UV *uv = SvJSON (self); 1296 UV *uv = SvJSON (self);
1113 if (enable) 1297 if (enable)
1114 *uv |= ix; 1298 *uv |= ix;
1136 RETVAL = newSVsv (self); 1320 RETVAL = newSVsv (self);
1137} 1321}
1138 OUTPUT: 1322 OUTPUT:
1139 RETVAL 1323 RETVAL
1140 1324
1325SV *max_size (SV *self, UV max_size = 0)
1326 CODE:
1327{
1328 UV *uv = SvJSON (self);
1329 UV log2 = 0;
1330
1331 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1332 if (max_size == 1) max_size = 2;
1333
1334 while ((1UL << log2) < max_size)
1335 ++log2;
1336
1337 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1338
1339 RETVAL = newSVsv (self);
1340}
1341 OUTPUT:
1342 RETVAL
1343
1141void encode (SV *self, SV *scalar) 1344void encode (SV *self, SV *scalar)
1142 PPCODE: 1345 PPCODE:
1143 XPUSHs (encode_json (scalar, *SvJSON (self))); 1346 XPUSHs (encode_json (scalar, *SvJSON (self)));
1144 1347
1145void decode (SV *self, SV *jsonstr) 1348void decode (SV *self, SV *jsonstr)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines