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.23 by root, Tue Apr 3 23:34:17 2007 UTC vs.
Revision 1.40 by root, Tue Jun 12 01:27:02 2007 UTC

… …
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include "assert.h"
6#include "string.h" 6#include "string.h"
7#include "stdlib.h" 7#include "stdlib.h"
8#include "stdio.h"
9
10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif
8 13
9#define F_ASCII 0x00000001UL 14#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002UL 16#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004UL 17#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008UL 18#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010UL 19#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020UL 20#define F_SPACE_AFTER 0x00000040UL
15#define F_ALLOW_NONREF 0x00000080UL 21#define F_ALLOW_NONREF 0x00000100UL
16#define F_SHRINK 0x00000100UL 22#define F_SHRINK 0x00000200UL
17#define F_MAXDEPTH 0xf8000000UL 23#define F_MAXDEPTH 0xf8000000UL
18#define S_MAXDEPTH 27 24#define S_MAXDEPTH 27
19 25
20#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
21 27
22// F_SELFCONVERT? <=> to_json/toJson 28// F_SELFCONVERT? <=> to_json/toJson
23// F_BLESSED? <=> { $__class__$ => } 29// F_BLESSED? <=> { $__class__$ => }
24 30
25#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
26#define F_DEFAULT (12UL << S_MAXDEPTH) 32#define F_DEFAULT (9UL << S_MAXDEPTH)
27 33
28#define INIT_SIZE 32 // initial scalar size to be allocated 34#define INIT_SIZE 32 // initial scalar size to be allocated
29#define INDENT_STEP 3 // spaces per indentation level 35#define INDENT_STEP 3 // spaces per indentation level
30 36
31#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
32#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
33 38
34#define SB do { 39#define SB do {
35#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)
36 52
37static HV *json_stash; // JSON::XS:: 53static HV *json_stash; // JSON::XS::
38 54
39///////////////////////////////////////////////////////////////////////////// 55/////////////////////////////////////////////////////////////////////////////
40// utility functions 56// utility functions
… …
65// 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
66// case of an error. 82// case of an error.
67// we special-case "safe" characters from U+80 .. U+7FF, 83// we special-case "safe" characters from U+80 .. U+7FF,
68// but use the very good perl function to parse anything else. 84// but use the very good perl function to parse anything else.
69// note that we never call this function for a ascii codepoints 85// note that we never call this function for a ascii codepoints
70static UV 86inline UV
71decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 87decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
72{ 88{
73 if (s[0] > 0xdf || s[0] < 0xc2) 89 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
74 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 90 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
75 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 91 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
76 { 92 {
77 *clen = 2; 93 *clen = 2;
78 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 94 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
… …
96 U32 flags; // F_* 112 U32 flags; // F_*
97 U32 indent; // indentation level 113 U32 indent; // indentation level
98 U32 maxdepth; // max. indentation/recursion level 114 U32 maxdepth; // max. indentation/recursion level
99} enc_t; 115} enc_t;
100 116
101static void 117inline void
102need (enc_t *enc, STRLEN len) 118need (enc_t *enc, STRLEN len)
103{ 119{
104 if (enc->cur + len >= enc->end) 120 if (expect_false (enc->cur + len >= enc->end))
105 { 121 {
106 STRLEN cur = enc->cur - SvPVX (enc->sv); 122 STRLEN cur = enc->cur - SvPVX (enc->sv);
107 SvGROW (enc->sv, cur + len + 1); 123 SvGROW (enc->sv, cur + len + 1);
108 enc->cur = SvPVX (enc->sv) + cur; 124 enc->cur = SvPVX (enc->sv) + cur;
109 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 125 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
110 } 126 }
111} 127}
112 128
113static void 129inline void
114encode_ch (enc_t *enc, char ch) 130encode_ch (enc_t *enc, char ch)
115{ 131{
116 need (enc, 1); 132 need (enc, 1);
117 *enc->cur++ = ch; 133 *enc->cur++ = ch;
118} 134}
… …
126 142
127 while (str < end) 143 while (str < end)
128 { 144 {
129 unsigned char ch = *(unsigned char *)str; 145 unsigned char ch = *(unsigned char *)str;
130 146
131 if (ch >= 0x20 && ch < 0x80) // most common case 147 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
132 { 148 {
133 if (ch == '"') // but with slow exceptions 149 if (expect_false (ch == '"')) // but with slow exceptions
134 { 150 {
135 need (enc, len += 1); 151 need (enc, len += 1);
136 *enc->cur++ = '\\'; 152 *enc->cur++ = '\\';
137 *enc->cur++ = '"'; 153 *enc->cur++ = '"';
138 } 154 }
139 else if (ch == '\\') 155 else if (expect_false (ch == '\\'))
140 { 156 {
141 need (enc, len += 1); 157 need (enc, len += 1);
142 *enc->cur++ = '\\'; 158 *enc->cur++ = '\\';
143 *enc->cur++ = '\\'; 159 *enc->cur++ = '\\';
144 } 160 }
… …
162 STRLEN clen; 178 STRLEN clen;
163 UV uch; 179 UV uch;
164 180
165 if (is_utf8) 181 if (is_utf8)
166 { 182 {
167 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
168 uch = decode_utf8 (str, end - str, &clen); 183 uch = decode_utf8 (str, end - str, &clen);
169 if (clen == (STRLEN)-1) 184 if (clen == (STRLEN)-1)
170 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 185 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
171 } 186 }
172 else 187 else
… …
176 } 191 }
177 192
178 if (uch > 0x10FFFFUL) 193 if (uch > 0x10FFFFUL)
179 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 194 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
180 195
181 if (uch < 0x80 || enc->flags & F_ASCII) 196 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
182 { 197 {
183 if (uch > 0xFFFFUL) 198 if (uch > 0xFFFFUL)
184 { 199 {
185 need (enc, len += 11); 200 need (enc, len += 11);
186 sprintf (enc->cur, "\\u%04x\\u%04x", 201 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
200 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 215 *enc->cur++ = hexdigit [(uch >> 0) & 15];
201 } 216 }
202 217
203 str += clen; 218 str += clen;
204 } 219 }
220 else if (enc->flags & F_LATIN1)
221 {
222 *enc->cur++ = uch;
223 str += clen;
224 }
205 else if (is_utf8) 225 else if (is_utf8)
206 { 226 {
207 need (enc, len += clen); 227 need (enc, len += clen);
208 do 228 do
209 { 229 {
… …
211 } 231 }
212 while (--clen); 232 while (--clen);
213 } 233 }
214 else 234 else
215 { 235 {
216 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed 236 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
217 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 237 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
218 ++str; 238 ++str;
219 } 239 }
220 } 240 }
221 } 241 }
… …
223 243
224 --len; 244 --len;
225 } 245 }
226} 246}
227 247
228static void 248inline void
229encode_indent (enc_t *enc) 249encode_indent (enc_t *enc)
230{ 250{
231 if (enc->flags & F_INDENT) 251 if (enc->flags & F_INDENT)
232 { 252 {
233 int spaces = enc->indent * INDENT_STEP; 253 int spaces = enc->indent * INDENT_STEP;
… …
236 memset (enc->cur, ' ', spaces); 256 memset (enc->cur, ' ', spaces);
237 enc->cur += spaces; 257 enc->cur += spaces;
238 } 258 }
239} 259}
240 260
241static void 261inline void
242encode_space (enc_t *enc) 262encode_space (enc_t *enc)
243{ 263{
244 need (enc, 1); 264 need (enc, 1);
245 encode_ch (enc, ' '); 265 encode_ch (enc, ' ');
246} 266}
247 267
248static void 268inline void
249encode_nl (enc_t *enc) 269encode_nl (enc_t *enc)
250{ 270{
251 if (enc->flags & F_INDENT) 271 if (enc->flags & F_INDENT)
252 { 272 {
253 need (enc, 1); 273 need (enc, 1);
254 encode_ch (enc, '\n'); 274 encode_ch (enc, '\n');
255 } 275 }
256} 276}
257 277
258static void 278inline void
259encode_comma (enc_t *enc) 279encode_comma (enc_t *enc)
260{ 280{
261 encode_ch (enc, ','); 281 encode_ch (enc, ',');
262 282
263 if (enc->flags & F_INDENT) 283 if (enc->flags & F_INDENT)
… …
362 // actually, this is mostly due to the stupid so-called 382 // actually, this is mostly due to the stupid so-called
363 // security workaround added somewhere in 5.8.x. 383 // security workaround added somewhere in 5.8.x.
364 // that randomises hash orderings 384 // that randomises hash orderings
365 if (enc->flags & F_CANONICAL) 385 if (enc->flags & F_CANONICAL)
366 { 386 {
367 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
368 int fast = 1; 387 int fast = 1;
388 HE *he;
389#if defined(__BORLANDC__) || defined(_MSC_VER)
390 HE **hes = _alloca (count * sizeof (HE));
391#else
392 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
393#endif
369 394
370 i = 0; 395 i = 0;
371 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
372 { 397 {
373 hes [i++] = he; 398 hes [i++] = he;
… …
408 433
409 encode_nl (enc); 434 encode_nl (enc);
410 } 435 }
411 else 436 else
412 { 437 {
413 SV *sv;
414 HE *he = hv_iternext (hv); 438 HE *he = hv_iternext (hv);
415 439
416 for (;;) 440 for (;;)
417 { 441 {
418 encode_indent (enc); 442 encode_indent (enc);
… …
433 457
434// encode objects, arrays and special \0=false and \1=true values. 458// encode objects, arrays and special \0=false and \1=true values.
435static void 459static void
436encode_rv (enc_t *enc, SV *sv) 460encode_rv (enc_t *enc, SV *sv)
437{ 461{
462 svtype svt;
463
438 SvGETMAGIC (sv); 464 SvGETMAGIC (sv);
439
440 svtype svt = SvTYPE (sv); 465 svt = SvTYPE (sv);
441 466
442 if (svt == SVt_PVHV) 467 if (svt == SVt_PVHV)
443 encode_hv (enc, (HV *)sv); 468 encode_hv (enc, (HV *)sv);
444 else if (svt == SVt_PVAV) 469 else if (svt == SVt_PVAV)
445 encode_av (enc, (AV *)sv); 470 encode_av (enc, (AV *)sv);
… …
471 encode_str (enc, str, len, SvUTF8 (sv)); 496 encode_str (enc, str, len, SvUTF8 (sv));
472 encode_ch (enc, '"'); 497 encode_ch (enc, '"');
473 } 498 }
474 else if (SvNOKp (sv)) 499 else if (SvNOKp (sv))
475 { 500 {
501 // trust that perl will do the right thing w.r.t. JSON syntax.
476 need (enc, NV_DIG + 32); 502 need (enc, NV_DIG + 32);
477 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 503 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
478 enc->cur += strlen (enc->cur); 504 enc->cur += strlen (enc->cur);
479 } 505 }
480 else if (SvIOKp (sv)) 506 else if (SvIOKp (sv))
481 { 507 {
482 need (enc, 64); 508 // we assume we can always read an IV as a UV
509 if (SvUV (sv) & ~(UV)0x7fff)
510 {
511 // large integer, use the (rather slow) snprintf way.
512 need (enc, sizeof (UV) * 3);
483 enc->cur += 513 enc->cur +=
484 SvIsUV(sv) 514 SvIsUV(sv)
485 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 515 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
486 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 516 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
517 }
518 else
519 {
520 // optimise the "small number case"
521 // code will likely be branchless and use only a single multiplication
522 I32 i = SvIV (sv);
523 U32 u;
524 char digit, nz = 0;
525
526 need (enc, 6);
527
528 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
529 u = i < 0 ? -i : i;
530
531 // convert to 4.28 fixed-point representation
532 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
533
534 // now output digit by digit, each time masking out the integer part
535 // and multiplying by 5 while moving the decimal point one to the right,
536 // resulting in a net multiplication by 10.
537 // we always write the digit to memory but conditionally increment
538 // the pointer, to ease the usage of conditional move instructions.
539 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
540 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
541 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
542 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
543 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
544 }
487 } 545 }
488 else if (SvROK (sv)) 546 else if (SvROK (sv))
489 encode_rv (enc, SvRV (sv)); 547 encode_rv (enc, SvRV (sv));
490 else if (!SvOK (sv)) 548 else if (!SvOK (sv))
491 encode_str (enc, "null", 4, 0); 549 encode_str (enc, "null", 4, 0);
… …
495} 553}
496 554
497static SV * 555static SV *
498encode_json (SV *scalar, U32 flags) 556encode_json (SV *scalar, U32 flags)
499{ 557{
558 enc_t enc;
559
500 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 560 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
501 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 561 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
502 562
503 enc_t enc;
504 enc.flags = flags; 563 enc.flags = flags;
505 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 564 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
506 enc.cur = SvPVX (enc.sv); 565 enc.cur = SvPVX (enc.sv);
507 enc.end = SvEND (enc.sv); 566 enc.end = SvEND (enc.sv);
508 enc.indent = 0; 567 enc.indent = 0;
509 enc.maxdepth = DEC_DEPTH (flags); 568 enc.maxdepth = DEC_DEPTH (flags);
510 569
511 SvPOK_only (enc.sv); 570 SvPOK_only (enc.sv);
512 encode_sv (&enc, scalar); 571 encode_sv (&enc, scalar);
513 572
573 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
574 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
575
514 if (!(flags & (F_ASCII | F_UTF8))) 576 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
515 SvUTF8_on (enc.sv); 577 SvUTF8_on (enc.sv);
516
517 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
518 578
519 if (enc.flags & F_SHRINK) 579 if (enc.flags & F_SHRINK)
520 shrink (enc.sv); 580 shrink (enc.sv);
521 581
522 return enc.sv; 582 return enc.sv;
… …
534 U32 flags; // F_* 594 U32 flags; // F_*
535 U32 depth; // recursion depth 595 U32 depth; // recursion depth
536 U32 maxdepth; // recursion depth limit 596 U32 maxdepth; // recursion depth limit
537} dec_t; 597} dec_t;
538 598
539static void 599inline void
540decode_ws (dec_t *dec) 600decode_ws (dec_t *dec)
541{ 601{
542 for (;;) 602 for (;;)
543 { 603 {
544 char ch = *dec->cur; 604 char ch = *dec->cur;
… …
570decode_4hex (dec_t *dec) 630decode_4hex (dec_t *dec)
571{ 631{
572 signed char d1, d2, d3, d4; 632 signed char d1, d2, d3, d4;
573 unsigned char *cur = (unsigned char *)dec->cur; 633 unsigned char *cur = (unsigned char *)dec->cur;
574 634
575 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 635 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
576 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 636 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
577 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 637 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
578 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 638 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
579 639
580 dec->cur += 4; 640 dec->cur += 4;
581 641
582 return ((UV)d1) << 12 642 return ((UV)d1) << 12
583 | ((UV)d2) << 8 643 | ((UV)d2) << 8
… …
591static SV * 651static SV *
592decode_str (dec_t *dec) 652decode_str (dec_t *dec)
593{ 653{
594 SV *sv = 0; 654 SV *sv = 0;
595 int utf8 = 0; 655 int utf8 = 0;
656 char *dec_cur = dec->cur;
596 657
597 do 658 do
598 { 659 {
599 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN]; 660 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
600 char *cur = buf; 661 char *cur = buf;
601 662
602 do 663 do
603 { 664 {
604 unsigned char ch = *(unsigned char *)dec->cur++; 665 unsigned char ch = *(unsigned char *)dec_cur++;
605 666
606 if (ch == '"') 667 if (expect_false (ch == '"'))
607 { 668 {
608 --dec->cur; 669 --dec_cur;
609 break; 670 break;
610 } 671 }
611 else if (ch == '\\') 672 else if (expect_false (ch == '\\'))
612 { 673 {
613 switch (*dec->cur) 674 switch (*dec_cur)
614 { 675 {
615 case '\\': 676 case '\\':
616 case '/': 677 case '/':
617 case '"': *cur++ = *dec->cur++; break; 678 case '"': *cur++ = *dec_cur++; break;
618 679
619 case 'b': ++dec->cur; *cur++ = '\010'; break; 680 case 'b': ++dec_cur; *cur++ = '\010'; break;
620 case 't': ++dec->cur; *cur++ = '\011'; break; 681 case 't': ++dec_cur; *cur++ = '\011'; break;
621 case 'n': ++dec->cur; *cur++ = '\012'; break; 682 case 'n': ++dec_cur; *cur++ = '\012'; break;
622 case 'f': ++dec->cur; *cur++ = '\014'; break; 683 case 'f': ++dec_cur; *cur++ = '\014'; break;
623 case 'r': ++dec->cur; *cur++ = '\015'; break; 684 case 'r': ++dec_cur; *cur++ = '\015'; break;
624 685
625 case 'u': 686 case 'u':
626 { 687 {
627 UV lo, hi; 688 UV lo, hi;
628 ++dec->cur; 689 ++dec_cur;
629 690
691 dec->cur = dec_cur;
630 hi = decode_4hex (dec); 692 hi = decode_4hex (dec);
693 dec_cur = dec->cur;
631 if (hi == (UV)-1) 694 if (hi == (UV)-1)
632 goto fail; 695 goto fail;
633 696
634 // possibly a surrogate pair 697 // possibly a surrogate pair
635 if (hi >= 0xd800) 698 if (hi >= 0xd800)
636 if (hi < 0xdc00) 699 if (hi < 0xdc00)
637 { 700 {
638 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 701 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
639 ERR ("missing low surrogate character in surrogate pair"); 702 ERR ("missing low surrogate character in surrogate pair");
640 703
641 dec->cur += 2; 704 dec_cur += 2;
642 705
706 dec->cur = dec_cur;
643 lo = decode_4hex (dec); 707 lo = decode_4hex (dec);
708 dec_cur = dec->cur;
644 if (lo == (UV)-1) 709 if (lo == (UV)-1)
645 goto fail; 710 goto fail;
646 711
647 if (lo < 0xdc00 || lo >= 0xe000) 712 if (lo < 0xdc00 || lo >= 0xe000)
648 ERR ("surrogate pair expected"); 713 ERR ("surrogate pair expected");
… …
662 *cur++ = hi; 727 *cur++ = hi;
663 } 728 }
664 break; 729 break;
665 730
666 default: 731 default:
667 --dec->cur; 732 --dec_cur;
668 ERR ("illegal backslash escape sequence in string"); 733 ERR ("illegal backslash escape sequence in string");
669 } 734 }
670 } 735 }
671 else if (ch >= 0x20 && ch <= 0x7f) 736 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
672 *cur++ = ch; 737 *cur++ = ch;
673 else if (ch >= 0x80) 738 else if (ch >= 0x80)
674 { 739 {
675 --dec->cur;
676
677 STRLEN clen; 740 STRLEN clen;
741 UV uch;
742
743 --dec_cur;
744
678 UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 745 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
679 if (clen == (STRLEN)-1) 746 if (clen == (STRLEN)-1)
680 ERR ("malformed UTF-8 character in JSON string"); 747 ERR ("malformed UTF-8 character in JSON string");
681 748
682 do 749 do
683 *cur++ = *dec->cur++; 750 *cur++ = *dec_cur++;
684 while (--clen); 751 while (--clen);
685 752
686 utf8 = 1; 753 utf8 = 1;
687 } 754 }
688 else 755 else
689 { 756 {
690 --dec->cur; 757 --dec_cur;
691 758
692 if (!ch) 759 if (!ch)
693 ERR ("unexpected end of string while parsing json string"); 760 ERR ("unexpected end of string while parsing JSON string");
694 else 761 else
695 ERR ("invalid character encountered while parsing json string"); 762 ERR ("invalid character encountered while parsing JSON string");
696 } 763 }
697 } 764 }
698 while (cur < buf + SHORT_STRING_LEN); 765 while (cur < buf + SHORT_STRING_LEN);
699 766
767 {
700 STRLEN len = cur - buf; 768 STRLEN len = cur - buf;
701 769
702 if (sv) 770 if (sv)
703 { 771 {
704 SvGROW (sv, SvCUR (sv) + len + 1); 772 SvGROW (sv, SvCUR (sv) + len + 1);
705 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 773 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
706 SvCUR_set (sv, SvCUR (sv) + len); 774 SvCUR_set (sv, SvCUR (sv) + len);
707 } 775 }
708 else 776 else
709 sv = newSVpvn (buf, len); 777 sv = newSVpvn (buf, len);
710 } 778 }
779 }
711 while (*dec->cur != '"'); 780 while (*dec_cur != '"');
712 781
713 ++dec->cur; 782 ++dec_cur;
714 783
715 if (sv) 784 if (sv)
716 { 785 {
717 SvPOK_only (sv); 786 SvPOK_only (sv);
718 *SvEND (sv) = 0; 787 *SvEND (sv) = 0;
… …
721 SvUTF8_on (sv); 790 SvUTF8_on (sv);
722 } 791 }
723 else 792 else
724 sv = newSVpvn ("", 0); 793 sv = newSVpvn ("", 0);
725 794
795 dec->cur = dec_cur;
726 return sv; 796 return sv;
727 797
728fail: 798fail:
799 dec->cur = dec_cur;
729 return 0; 800 return 0;
730} 801}
731 802
732static SV * 803static SV *
733decode_num (dec_t *dec) 804decode_num (dec_t *dec)
… …
791 is_nv = 1; 862 is_nv = 1;
792 } 863 }
793 864
794 if (!is_nv) 865 if (!is_nv)
795 { 866 {
796 UV uv; 867 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
797 int numtype = grok_number (start, dec->cur - start, &uv); 868 if (*start == '-')
798 if (numtype & IS_NUMBER_IN_UV) 869 switch (dec->cur - start)
799 if (numtype & IS_NUMBER_NEG)
800 { 870 {
801 if (uv < (UV)IV_MIN) 871 case 2: return newSViv (-( start [1] - '0' * 1));
802 return newSViv (-(IV)uv); 872 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
873 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
874 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
803 } 875 }
876 else
877 switch (dec->cur - start)
878 {
879 case 1: return newSViv ( start [0] - '0' * 1);
880 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
881 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
882 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
883 }
884
885 {
886 UV uv;
887 int numtype = grok_number (start, dec->cur - start, &uv);
888 if (numtype & IS_NUMBER_IN_UV)
889 if (numtype & IS_NUMBER_NEG)
890 {
891 if (uv < (UV)IV_MIN)
892 return newSViv (-(IV)uv);
893 }
804 else 894 else
805 return newSVuv (uv); 895 return newSVuv (uv);
896
897 // here would likely be the place for bigint support
806 } 898 }
899 }
807 900
901 // if we ever support bigint or bigfloat, this is the place for bigfloat
808 return newSVnv (Atof (start)); 902 return newSVnv (Atof (start));
809 903
810fail: 904fail:
811 return 0; 905 return 0;
812} 906}
… …
913 1007
914static SV * 1008static SV *
915decode_sv (dec_t *dec) 1009decode_sv (dec_t *dec)
916{ 1010{
917 decode_ws (dec); 1011 decode_ws (dec);
1012
1013 // the beauty of JSON: you need exactly one character lookahead
1014 // to parse anything.
918 switch (*dec->cur) 1015 switch (*dec->cur)
919 { 1016 {
920 case '"': ++dec->cur; return decode_str (dec); 1017 case '"': ++dec->cur; return decode_str (dec);
921 case '[': ++dec->cur; return decode_av (dec); 1018 case '[': ++dec->cur; return decode_av (dec);
922 case '{': ++dec->cur; return decode_hv (dec); 1019 case '{': ++dec->cur; return decode_hv (dec);
… …
958 ERR ("'null' expected"); 1055 ERR ("'null' expected");
959 1056
960 break; 1057 break;
961 1058
962 default: 1059 default:
963 ERR ("malformed json string, neither array, object, number, string or atom"); 1060 ERR ("malformed JSON string, neither array, object, number, string or atom");
964 break; 1061 break;
965 } 1062 }
966 1063
967fail: 1064fail:
968 return 0; 1065 return 0;
969} 1066}
970 1067
971static SV * 1068static SV *
972decode_json (SV *string, U32 flags) 1069decode_json (SV *string, U32 flags, UV *offset_return)
973{ 1070{
1071 dec_t dec;
1072 UV offset;
974 SV *sv; 1073 SV *sv;
975 1074
1075 SvGETMAGIC (string);
976 SvUPGRADE (string, SVt_PV); 1076 SvUPGRADE (string, SVt_PV);
977 1077
978 if (flags & F_UTF8) 1078 if (flags & F_UTF8)
979 sv_utf8_downgrade (string, 0); 1079 sv_utf8_downgrade (string, 0);
980 else 1080 else
981 sv_utf8_upgrade (string); 1081 sv_utf8_upgrade (string);
982 1082
983 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1083 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
984 1084
985 dec_t dec;
986 dec.flags = flags; 1085 dec.flags = flags;
987 dec.cur = SvPVX (string); 1086 dec.cur = SvPVX (string);
988 dec.end = SvEND (string); 1087 dec.end = SvEND (string);
989 dec.err = 0; 1088 dec.err = 0;
990 dec.depth = 0; 1089 dec.depth = 0;
991 dec.maxdepth = DEC_DEPTH (dec.flags); 1090 dec.maxdepth = DEC_DEPTH (dec.flags);
992 1091
993 *dec.end = 0; // this should basically be a nop, too, but make sure its there 1092 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
994 sv = decode_sv (&dec); 1093 sv = decode_sv (&dec);
995 1094
1095 if (!(offset_return || !sv))
1096 {
1097 // check for trailing garbage
1098 decode_ws (&dec);
1099
1100 if (*dec.cur)
1101 {
1102 dec.err = "garbage after JSON object";
1103 SvREFCNT_dec (sv);
1104 sv = 0;
1105 }
1106 }
1107
1108 if (offset_return || !sv)
1109 {
1110 offset = dec.flags & F_UTF8
1111 ? dec.cur - SvPVX (string)
1112 : utf8_distance (dec.cur, SvPVX (string));
1113
1114 if (offset_return)
1115 *offset_return = offset;
1116 }
1117
996 if (!sv) 1118 if (!sv)
997 { 1119 {
998 IV offset = dec.flags & F_UTF8
999 ? dec.cur - SvPVX (string)
1000 : utf8_distance (dec.cur, SvPVX (string));
1001 SV *uni = sv_newmortal (); 1120 SV *uni = sv_newmortal ();
1002 1121
1003 // horrible hack to silence warning inside pv_uni_display 1122 // horrible hack to silence warning inside pv_uni_display
1004 COP cop = *PL_curcop; 1123 COP cop = *PL_curcop;
1005 cop.cop_warnings = pWARN_NONE; 1124 cop.cop_warnings = pWARN_NONE;
… …
1030 1149
1031BOOT: 1150BOOT:
1032{ 1151{
1033 int i; 1152 int i;
1034 1153
1035 memset (decode_hexdigit, 0xff, 256);
1036
1037 for (i = 0; i < 256; ++i) 1154 for (i = 0; i < 256; ++i)
1038 decode_hexdigit [i] = 1155 decode_hexdigit [i] =
1039 i >= '0' && i <= '9' ? i - '0' 1156 i >= '0' && i <= '9' ? i - '0'
1040 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1157 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1041 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1158 : i >= 'A' && i <= 'F' ? i - 'A' + 10
… …
1053 RETVAL 1170 RETVAL
1054 1171
1055SV *ascii (SV *self, int enable = 1) 1172SV *ascii (SV *self, int enable = 1)
1056 ALIAS: 1173 ALIAS:
1057 ascii = F_ASCII 1174 ascii = F_ASCII
1175 latin1 = F_LATIN1
1058 utf8 = F_UTF8 1176 utf8 = F_UTF8
1059 indent = F_INDENT 1177 indent = F_INDENT
1060 canonical = F_CANONICAL 1178 canonical = F_CANONICAL
1061 space_before = F_SPACE_BEFORE 1179 space_before = F_SPACE_BEFORE
1062 space_after = F_SPACE_AFTER 1180 space_after = F_SPACE_AFTER
… …
1074 RETVAL = newSVsv (self); 1192 RETVAL = newSVsv (self);
1075} 1193}
1076 OUTPUT: 1194 OUTPUT:
1077 RETVAL 1195 RETVAL
1078 1196
1079SV *max_depth (SV *self, int max_depth = 0x80000000UL) 1197SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1080 CODE: 1198 CODE:
1081{ 1199{
1082 UV *uv = SvJSON (self); 1200 UV *uv = SvJSON (self);
1083 UV log2 = 0; 1201 UV log2 = 0;
1084 1202
… …
1098 PPCODE: 1216 PPCODE:
1099 XPUSHs (encode_json (scalar, *SvJSON (self))); 1217 XPUSHs (encode_json (scalar, *SvJSON (self)));
1100 1218
1101void decode (SV *self, SV *jsonstr) 1219void decode (SV *self, SV *jsonstr)
1102 PPCODE: 1220 PPCODE:
1103 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1221 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
1222
1223void decode_prefix (SV *self, SV *jsonstr)
1224 PPCODE:
1225{
1226 UV offset;
1227 EXTEND (SP, 2);
1228 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
1229 PUSHs (sv_2mortal (newSVuv (offset)));
1230}
1104 1231
1105PROTOTYPES: ENABLE 1232PROTOTYPES: ENABLE
1106 1233
1107void to_json (SV *scalar) 1234void to_json (SV *scalar)
1108 ALIAS: 1235 ALIAS:
… …
1112 1239
1113void from_json (SV *jsonstr) 1240void from_json (SV *jsonstr)
1114 ALIAS: 1241 ALIAS:
1115 jsonToObj = 0 1242 jsonToObj = 0
1116 PPCODE: 1243 PPCODE:
1117 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8)); 1244 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0));
1118 1245

Diff Legend

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