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.17 by root, Sun Mar 25 02:46:41 2007 UTC vs.
Revision 1.43 by root, Sat Jun 23 23:49:29 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"
8 9
10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif
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
9#define F_ASCII 0x00000001 20#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002 22#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004 23#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008 24#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010 25#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020 26#define F_SPACE_AFTER 0x00000040UL
15#define F_ALLOW_NONREF 0x00000080 27#define F_ALLOW_NONREF 0x00000100UL
16#define F_SHRINK 0x00000100 28#define F_SHRINK 0x00000200UL
29#define F_MAXDEPTH 0xf8000000UL
30#define S_MAXDEPTH 27
17 31
18// F_SKIPINVALID? 32#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
19// F_EXECCODEREF? 33
20// F_SELFCONVERT? <=> { &__class__ => } 34// F_SELFCONVERT? <=> to_json/toJson
35// F_BLESSED? <=> { $__class__$ => }
21 36
22#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 37#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
23#define F_DEFAULT 0 38#define F_DEFAULT (9UL << S_MAXDEPTH)
24 39
25#define INIT_SIZE 32 // initial scalar size to be allocated 40#define INIT_SIZE 32 // initial scalar size to be allocated
26#define INDENT_STEP 3 // spaces per indentation level 41#define INDENT_STEP 3 // spaces per indentation level
27 42
28#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
29#define SHORT_STRING_LEN 512 // special-case strings of up to this size 43#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
30 44
31#define SB do { 45#define SB do {
32#define SE } while (0) 46#define SE } while (0)
33 47
48#if __GNUC__ >= 3
49# define expect(expr,value) __builtin_expect ((expr),(value))
50# define inline inline
51#else
52# define expect(expr,value) (expr)
53# define inline static
54#endif
55
56#define expect_false(expr) expect ((expr) != 0, 0)
57#define expect_true(expr) expect ((expr) != 0, 1)
58
34static HV *json_stash; // JSON::XS:: 59static HV *json_stash; // JSON::XS::
60static SV *json_true, *json_false;
35 61
36///////////////////////////////////////////////////////////////////////////// 62/////////////////////////////////////////////////////////////////////////////
37// utility functions 63// utility functions
38 64
39static UV * 65static UV *
62// decode an utf-8 character and return it, or (UV)-1 in 88// decode an utf-8 character and return it, or (UV)-1 in
63// case of an error. 89// case of an error.
64// we special-case "safe" characters from U+80 .. U+7FF, 90// we special-case "safe" characters from U+80 .. U+7FF,
65// but use the very good perl function to parse anything else. 91// but use the very good perl function to parse anything else.
66// note that we never call this function for a ascii codepoints 92// note that we never call this function for a ascii codepoints
67static UV 93inline UV
68decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 94decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
69{ 95{
70 if (s[0] > 0xdf || s[0] < 0xc2) 96 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
71 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 97 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
72 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 98 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
73 { 99 {
74 *clen = 2; 100 *clen = 2;
75 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 101 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
76 } 102 }
77 else 103 else
104 {
105 *clen = (STRLEN)-1;
78 return (UV)-1; 106 return (UV)-1;
107 }
79} 108}
80 109
81///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
82// encoder 111// encoder
83 112
85typedef struct 114typedef struct
86{ 115{
87 char *cur; // SvPVX (sv) + current output position 116 char *cur; // SvPVX (sv) + current output position
88 char *end; // SvEND (sv) 117 char *end; // SvEND (sv)
89 SV *sv; // result scalar 118 SV *sv; // result scalar
90 UV flags; // F_* 119 U32 flags; // F_*
91 int indent; // indentation level 120 U32 indent; // indentation level
92 int max_depth; // max. recursion level 121 U32 maxdepth; // max. indentation/recursion level
93} enc_t; 122} enc_t;
94 123
95static void 124inline void
96need (enc_t *enc, STRLEN len) 125need (enc_t *enc, STRLEN len)
97{ 126{
98 if (enc->cur + len >= enc->end) 127 if (expect_false (enc->cur + len >= enc->end))
99 { 128 {
100 STRLEN cur = enc->cur - SvPVX (enc->sv); 129 STRLEN cur = enc->cur - SvPVX (enc->sv);
101 SvGROW (enc->sv, cur + len + 1); 130 SvGROW (enc->sv, cur + len + 1);
102 enc->cur = SvPVX (enc->sv) + cur; 131 enc->cur = SvPVX (enc->sv) + cur;
103 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 132 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
104 } 133 }
105} 134}
106 135
107static void 136inline void
108encode_ch (enc_t *enc, char ch) 137encode_ch (enc_t *enc, char ch)
109{ 138{
110 need (enc, 1); 139 need (enc, 1);
111 *enc->cur++ = ch; 140 *enc->cur++ = ch;
112} 141}
120 149
121 while (str < end) 150 while (str < end)
122 { 151 {
123 unsigned char ch = *(unsigned char *)str; 152 unsigned char ch = *(unsigned char *)str;
124 153
125 if (ch >= 0x20 && ch < 0x80) // most common case 154 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
126 { 155 {
127 if (ch == '"') // but with slow exceptions 156 if (expect_false (ch == '"')) // but with slow exceptions
128 { 157 {
129 need (enc, len += 1); 158 need (enc, len += 1);
130 *enc->cur++ = '\\'; 159 *enc->cur++ = '\\';
131 *enc->cur++ = '"'; 160 *enc->cur++ = '"';
132 } 161 }
133 else if (ch == '\\') 162 else if (expect_false (ch == '\\'))
134 { 163 {
135 need (enc, len += 1); 164 need (enc, len += 1);
136 *enc->cur++ = '\\'; 165 *enc->cur++ = '\\';
137 *enc->cur++ = '\\'; 166 *enc->cur++ = '\\';
138 } 167 }
156 STRLEN clen; 185 STRLEN clen;
157 UV uch; 186 UV uch;
158 187
159 if (is_utf8) 188 if (is_utf8)
160 { 189 {
161 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
162 uch = decode_utf8 (str, end - str, &clen); 190 uch = decode_utf8 (str, end - str, &clen);
163 if (clen == (STRLEN)-1) 191 if (clen == (STRLEN)-1)
164 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 192 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
165 } 193 }
166 else 194 else
170 } 198 }
171 199
172 if (uch > 0x10FFFFUL) 200 if (uch > 0x10FFFFUL)
173 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 201 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
174 202
175 if (uch < 0x80 || enc->flags & F_ASCII) 203 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
176 { 204 {
177 if (uch > 0xFFFFUL) 205 if (uch > 0xFFFFUL)
178 { 206 {
179 need (enc, len += 11); 207 need (enc, len += 11);
180 sprintf (enc->cur, "\\u%04x\\u%04x", 208 sprintf (enc->cur, "\\u%04x\\u%04x",
194 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 222 *enc->cur++ = hexdigit [(uch >> 0) & 15];
195 } 223 }
196 224
197 str += clen; 225 str += clen;
198 } 226 }
227 else if (enc->flags & F_LATIN1)
228 {
229 *enc->cur++ = uch;
230 str += clen;
231 }
199 else if (is_utf8) 232 else if (is_utf8)
200 { 233 {
201 need (enc, len += clen); 234 need (enc, len += clen);
202 do 235 do
203 { 236 {
205 } 238 }
206 while (--clen); 239 while (--clen);
207 } 240 }
208 else 241 else
209 { 242 {
210 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed 243 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
211 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 244 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
212 ++str; 245 ++str;
213 } 246 }
214 } 247 }
215 } 248 }
217 250
218 --len; 251 --len;
219 } 252 }
220} 253}
221 254
222static void 255inline void
223encode_indent (enc_t *enc) 256encode_indent (enc_t *enc)
224{ 257{
225 if (enc->flags & F_INDENT) 258 if (enc->flags & F_INDENT)
226 { 259 {
227 int spaces = enc->indent * INDENT_STEP; 260 int spaces = enc->indent * INDENT_STEP;
230 memset (enc->cur, ' ', spaces); 263 memset (enc->cur, ' ', spaces);
231 enc->cur += spaces; 264 enc->cur += spaces;
232 } 265 }
233} 266}
234 267
235static void 268inline void
236encode_space (enc_t *enc) 269encode_space (enc_t *enc)
237{ 270{
238 need (enc, 1); 271 need (enc, 1);
239 encode_ch (enc, ' '); 272 encode_ch (enc, ' ');
240} 273}
241 274
242static void 275inline void
243encode_nl (enc_t *enc) 276encode_nl (enc_t *enc)
244{ 277{
245 if (enc->flags & F_INDENT) 278 if (enc->flags & F_INDENT)
246 { 279 {
247 need (enc, 1); 280 need (enc, 1);
248 encode_ch (enc, '\n'); 281 encode_ch (enc, '\n');
249 } 282 }
250} 283}
251 284
252static void 285inline void
253encode_comma (enc_t *enc) 286encode_comma (enc_t *enc)
254{ 287{
255 encode_ch (enc, ','); 288 encode_ch (enc, ',');
256 289
257 if (enc->flags & F_INDENT) 290 if (enc->flags & F_INDENT)
264 297
265static void 298static void
266encode_av (enc_t *enc, AV *av) 299encode_av (enc_t *enc, AV *av)
267{ 300{
268 int i, len = av_len (av); 301 int i, len = av_len (av);
302
303 if (enc->indent >= enc->maxdepth)
304 croak ("data structure too deep (hit recursion limit)");
269 305
270 encode_ch (enc, '['); encode_nl (enc); 306 encode_ch (enc, '['); encode_nl (enc);
271 ++enc->indent; 307 ++enc->indent;
272 308
273 for (i = 0; i <= len; ++i) 309 for (i = 0; i <= len; ++i)
340static void 376static void
341encode_hv (enc_t *enc, HV *hv) 377encode_hv (enc_t *enc, HV *hv)
342{ 378{
343 int count, i; 379 int count, i;
344 380
381 if (enc->indent >= enc->maxdepth)
382 croak ("data structure too deep (hit recursion limit)");
383
345 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 384 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
346 385
347 if ((count = hv_iterinit (hv))) 386 if ((count = hv_iterinit (hv)))
348 { 387 {
349 // for canonical output we have to sort by keys first 388 // for canonical output we have to sort by keys first
350 // actually, this is mostly due to the stupid so-called 389 // actually, this is mostly due to the stupid so-called
351 // security workaround added somewhere in 5.8.x. 390 // security workaround added somewhere in 5.8.x.
352 // that randomises hash orderings 391 // that randomises hash orderings
353 if (enc->flags & F_CANONICAL) 392 if (enc->flags & F_CANONICAL)
354 { 393 {
355 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
356 int fast = 1; 394 int fast = 1;
395 HE *he;
396#if defined(__BORLANDC__) || defined(_MSC_VER)
397 HE **hes = _alloca (count * sizeof (HE));
398#else
399 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
400#endif
357 401
358 i = 0; 402 i = 0;
359 while ((he = hv_iternext (hv))) 403 while ((he = hv_iternext (hv)))
360 { 404 {
361 hes [i++] = he; 405 hes [i++] = he;
396 440
397 encode_nl (enc); 441 encode_nl (enc);
398 } 442 }
399 else 443 else
400 { 444 {
401 SV *sv;
402 HE *he = hv_iternext (hv); 445 HE *he = hv_iternext (hv);
403 446
404 for (;;) 447 for (;;)
405 { 448 {
406 encode_indent (enc); 449 encode_indent (enc);
415 encode_nl (enc); 458 encode_nl (enc);
416 } 459 }
417 } 460 }
418 461
419 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 462 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
463}
464
465// encode objects, arrays and special \0=false and \1=true values.
466static void
467encode_rv (enc_t *enc, SV *sv)
468{
469 svtype svt;
470
471 SvGETMAGIC (sv);
472 svt = SvTYPE (sv);
473
474 if (svt == SVt_PVHV)
475 encode_hv (enc, (HV *)sv);
476 else if (svt == SVt_PVAV)
477 encode_av (enc, (AV *)sv);
478 else if (svt < SVt_PVAV)
479 {
480 if (SvNIOK (sv) && SvIV (sv) == 0)
481 encode_str (enc, "false", 5, 0);
482 else if (SvNIOK (sv) && SvIV (sv) == 1)
483 encode_str (enc, "true", 4, 0);
484 else
485 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
486 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
487 }
488 else
489 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
490 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
420} 491}
421 492
422static void 493static void
423encode_sv (enc_t *enc, SV *sv) 494encode_sv (enc_t *enc, SV *sv)
424{ 495{
432 encode_str (enc, str, len, SvUTF8 (sv)); 503 encode_str (enc, str, len, SvUTF8 (sv));
433 encode_ch (enc, '"'); 504 encode_ch (enc, '"');
434 } 505 }
435 else if (SvNOKp (sv)) 506 else if (SvNOKp (sv))
436 { 507 {
508 // trust that perl will do the right thing w.r.t. JSON syntax.
437 need (enc, NV_DIG + 32); 509 need (enc, NV_DIG + 32);
438 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 510 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
439 enc->cur += strlen (enc->cur); 511 enc->cur += strlen (enc->cur);
440 } 512 }
441 else if (SvIOKp (sv)) 513 else if (SvIOKp (sv))
442 { 514 {
443 need (enc, 64); 515 // we assume we can always read an IV as a UV
516 if (SvUV (sv) & ~(UV)0x7fff)
517 {
518 // large integer, use the (rather slow) snprintf way.
519 need (enc, sizeof (UV) * 3);
444 enc->cur += 520 enc->cur +=
445 SvIsUV(sv) 521 SvIsUV(sv)
446 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 522 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
447 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 523 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
524 }
525 else
526 {
527 // optimise the "small number case"
528 // code will likely be branchless and use only a single multiplication
529 I32 i = SvIV (sv);
530 U32 u;
531 char digit, nz = 0;
532
533 need (enc, 6);
534
535 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
536 u = i < 0 ? -i : i;
537
538 // convert to 4.28 fixed-point representation
539 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
540
541 // now output digit by digit, each time masking out the integer part
542 // and multiplying by 5 while moving the decimal point one to the right,
543 // resulting in a net multiplication by 10.
544 // we always write the digit to memory but conditionally increment
545 // the pointer, to ease the usage of conditional move instructions.
546 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
547 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
548 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
549 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
550 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
551 }
448 } 552 }
449 else if (SvROK (sv)) 553 else if (SvROK (sv))
450 { 554 encode_rv (enc, SvRV (sv));
451 SV *rv = SvRV (sv);
452
453 if (enc->indent >= enc->max_depth)
454 croak ("data structure too deep (hit recursion limit)");
455
456 switch (SvTYPE (rv))
457 {
458 case SVt_PVAV: encode_av (enc, (AV *)rv); break;
459 case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
460
461 default:
462 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
463 SvPV_nolen (sv));
464 }
465 }
466 else if (!SvOK (sv)) 555 else if (!SvOK (sv))
467 encode_str (enc, "null", 4, 0); 556 encode_str (enc, "null", 4, 0);
468 else 557 else
469 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 558 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
470 SvPV_nolen (sv), SvFLAGS (sv)); 559 SvPV_nolen (sv), SvFLAGS (sv));
471} 560}
472 561
473static SV * 562static SV *
474encode_json (SV *scalar, UV flags) 563encode_json (SV *scalar, U32 flags)
475{ 564{
565 enc_t enc;
566
476 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 567 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
477 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 568 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
478 569
479 enc_t enc;
480 enc.flags = flags; 570 enc.flags = flags;
481 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 571 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
482 enc.cur = SvPVX (enc.sv); 572 enc.cur = SvPVX (enc.sv);
483 enc.end = SvEND (enc.sv); 573 enc.end = SvEND (enc.sv);
484 enc.indent = 0; 574 enc.indent = 0;
485 enc.max_depth = 0x7fffffffUL; 575 enc.maxdepth = DEC_DEPTH (flags);
486 576
487 SvPOK_only (enc.sv); 577 SvPOK_only (enc.sv);
488 encode_sv (&enc, scalar); 578 encode_sv (&enc, scalar);
489 579
580 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
581 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
582
490 if (!(flags & (F_ASCII | F_UTF8))) 583 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
491 SvUTF8_on (enc.sv); 584 SvUTF8_on (enc.sv);
492
493 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
494 585
495 if (enc.flags & F_SHRINK) 586 if (enc.flags & F_SHRINK)
496 shrink (enc.sv); 587 shrink (enc.sv);
497 588
498 return enc.sv; 589 return enc.sv;
505typedef struct 596typedef struct
506{ 597{
507 char *cur; // current parser pointer 598 char *cur; // current parser pointer
508 char *end; // end of input string 599 char *end; // end of input string
509 const char *err; // parse error, if != 0 600 const char *err; // parse error, if != 0
510 UV flags; // F_* 601 U32 flags; // F_*
602 U32 depth; // recursion depth
603 U32 maxdepth; // recursion depth limit
511} dec_t; 604} dec_t;
512 605
513static void 606inline void
514decode_ws (dec_t *dec) 607decode_ws (dec_t *dec)
515{ 608{
516 for (;;) 609 for (;;)
517 { 610 {
518 char ch = *dec->cur; 611 char ch = *dec->cur;
524 ++dec->cur; 617 ++dec->cur;
525 } 618 }
526} 619}
527 620
528#define ERR(reason) SB dec->err = reason; goto fail; SE 621#define ERR(reason) SB dec->err = reason; goto fail; SE
622
529#define EXPECT_CH(ch) SB \ 623#define EXPECT_CH(ch) SB \
530 if (*dec->cur != ch) \ 624 if (*dec->cur != ch) \
531 ERR (# ch " expected"); \ 625 ERR (# ch " expected"); \
532 ++dec->cur; \ 626 ++dec->cur; \
533 SE 627 SE
534 628
629#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
630#define DEC_DEC_DEPTH --dec->depth
631
535static SV *decode_sv (dec_t *dec); 632static SV *decode_sv (dec_t *dec);
536 633
537static signed char decode_hexdigit[256]; 634static signed char decode_hexdigit[256];
538 635
539static UV 636static UV
540decode_4hex (dec_t *dec) 637decode_4hex (dec_t *dec)
541{ 638{
542 signed char d1, d2, d3, d4; 639 signed char d1, d2, d3, d4;
543 unsigned char *cur = (unsigned char *)dec->cur; 640 unsigned char *cur = (unsigned char *)dec->cur;
544 641
545 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 642 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
546 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 643 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
547 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 644 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
548 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 645 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
549 646
550 dec->cur += 4; 647 dec->cur += 4;
551 648
552 return ((UV)d1) << 12 649 return ((UV)d1) << 12
553 | ((UV)d2) << 8 650 | ((UV)d2) << 8
561static SV * 658static SV *
562decode_str (dec_t *dec) 659decode_str (dec_t *dec)
563{ 660{
564 SV *sv = 0; 661 SV *sv = 0;
565 int utf8 = 0; 662 int utf8 = 0;
663 char *dec_cur = dec->cur;
566 664
567 do 665 do
568 { 666 {
569 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN]; 667 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
570 char *cur = buf; 668 char *cur = buf;
571 669
572 do 670 do
573 { 671 {
574 unsigned char ch = *(unsigned char *)dec->cur++; 672 unsigned char ch = *(unsigned char *)dec_cur++;
575 673
576 if (ch == '"') 674 if (expect_false (ch == '"'))
577 { 675 {
578 --dec->cur; 676 --dec_cur;
579 break; 677 break;
580 } 678 }
581 else if (ch == '\\') 679 else if (expect_false (ch == '\\'))
582 { 680 {
583 switch (*dec->cur) 681 switch (*dec_cur)
584 { 682 {
585 case '\\': 683 case '\\':
586 case '/': 684 case '/':
587 case '"': *cur++ = *dec->cur++; break; 685 case '"': *cur++ = *dec_cur++; break;
588 686
589 case 'b': ++dec->cur; *cur++ = '\010'; break; 687 case 'b': ++dec_cur; *cur++ = '\010'; break;
590 case 't': ++dec->cur; *cur++ = '\011'; break; 688 case 't': ++dec_cur; *cur++ = '\011'; break;
591 case 'n': ++dec->cur; *cur++ = '\012'; break; 689 case 'n': ++dec_cur; *cur++ = '\012'; break;
592 case 'f': ++dec->cur; *cur++ = '\014'; break; 690 case 'f': ++dec_cur; *cur++ = '\014'; break;
593 case 'r': ++dec->cur; *cur++ = '\015'; break; 691 case 'r': ++dec_cur; *cur++ = '\015'; break;
594 692
595 case 'u': 693 case 'u':
596 { 694 {
597 UV lo, hi; 695 UV lo, hi;
598 ++dec->cur; 696 ++dec_cur;
599 697
698 dec->cur = dec_cur;
600 hi = decode_4hex (dec); 699 hi = decode_4hex (dec);
700 dec_cur = dec->cur;
601 if (hi == (UV)-1) 701 if (hi == (UV)-1)
602 goto fail; 702 goto fail;
603 703
604 // possibly a surrogate pair 704 // possibly a surrogate pair
605 if (hi >= 0xd800) 705 if (hi >= 0xd800)
606 if (hi < 0xdc00) 706 if (hi < 0xdc00)
607 { 707 {
608 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 708 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
609 ERR ("missing low surrogate character in surrogate pair"); 709 ERR ("missing low surrogate character in surrogate pair");
610 710
611 dec->cur += 2; 711 dec_cur += 2;
612 712
713 dec->cur = dec_cur;
613 lo = decode_4hex (dec); 714 lo = decode_4hex (dec);
715 dec_cur = dec->cur;
614 if (lo == (UV)-1) 716 if (lo == (UV)-1)
615 goto fail; 717 goto fail;
616 718
617 if (lo < 0xdc00 || lo >= 0xe000) 719 if (lo < 0xdc00 || lo >= 0xe000)
618 ERR ("surrogate pair expected"); 720 ERR ("surrogate pair expected");
632 *cur++ = hi; 734 *cur++ = hi;
633 } 735 }
634 break; 736 break;
635 737
636 default: 738 default:
637 --dec->cur; 739 --dec_cur;
638 ERR ("illegal backslash escape sequence in string"); 740 ERR ("illegal backslash escape sequence in string");
639 } 741 }
640 } 742 }
641 else if (ch >= 0x20 && ch <= 0x7f) 743 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
642 *cur++ = ch; 744 *cur++ = ch;
643 else if (ch >= 0x80) 745 else if (ch >= 0x80)
644 { 746 {
645 --dec->cur;
646
647 STRLEN clen; 747 STRLEN clen;
748 UV uch;
749
750 --dec_cur;
751
648 UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 752 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
649 if (clen == (STRLEN)-1) 753 if (clen == (STRLEN)-1)
650 ERR ("malformed UTF-8 character in JSON string"); 754 ERR ("malformed UTF-8 character in JSON string");
651 755
652 do 756 do
653 {
654 *cur++ = *dec->cur++; 757 *cur++ = *dec_cur++;
655 }
656 while (--clen); 758 while (--clen);
657 759
658 utf8 = 1; 760 utf8 = 1;
659 } 761 }
660 else if (!ch)
661 ERR ("unexpected end of string while parsing json string");
662 else 762 else
763 {
764 --dec_cur;
765
766 if (!ch)
767 ERR ("unexpected end of string while parsing JSON string");
768 else
663 ERR ("invalid character encountered"); 769 ERR ("invalid character encountered while parsing JSON string");
664 770 }
665 } 771 }
666 while (cur < buf + SHORT_STRING_LEN); 772 while (cur < buf + SHORT_STRING_LEN);
667 773
774 {
668 STRLEN len = cur - buf; 775 STRLEN len = cur - buf;
669 776
670 if (sv) 777 if (sv)
671 { 778 {
672 SvGROW (sv, SvCUR (sv) + len + 1); 779 SvGROW (sv, SvCUR (sv) + len + 1);
673 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 780 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
674 SvCUR_set (sv, SvCUR (sv) + len); 781 SvCUR_set (sv, SvCUR (sv) + len);
675 } 782 }
676 else 783 else
677 sv = newSVpvn (buf, len); 784 sv = newSVpvn (buf, len);
678 } 785 }
786 }
679 while (*dec->cur != '"'); 787 while (*dec_cur != '"');
680 788
681 ++dec->cur; 789 ++dec_cur;
682 790
683 if (sv) 791 if (sv)
684 { 792 {
685 SvPOK_only (sv); 793 SvPOK_only (sv);
686 *SvEND (sv) = 0; 794 *SvEND (sv) = 0;
689 SvUTF8_on (sv); 797 SvUTF8_on (sv);
690 } 798 }
691 else 799 else
692 sv = newSVpvn ("", 0); 800 sv = newSVpvn ("", 0);
693 801
802 dec->cur = dec_cur;
694 return sv; 803 return sv;
695 804
696fail: 805fail:
806 dec->cur = dec_cur;
697 return 0; 807 return 0;
698} 808}
699 809
700static SV * 810static SV *
701decode_num (dec_t *dec) 811decode_num (dec_t *dec)
759 is_nv = 1; 869 is_nv = 1;
760 } 870 }
761 871
762 if (!is_nv) 872 if (!is_nv)
763 { 873 {
764 UV uv; 874 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
765 int numtype = grok_number (start, dec->cur - start, &uv); 875 if (*start == '-')
766 if (numtype & IS_NUMBER_IN_UV) 876 switch (dec->cur - start)
767 if (numtype & IS_NUMBER_NEG)
768 { 877 {
769 if (uv < (UV)IV_MIN) 878 case 2: return newSViv (-( start [1] - '0' * 1));
770 return newSViv (-(IV)uv); 879 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
880 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
881 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
771 } 882 }
883 else
884 switch (dec->cur - start)
885 {
886 case 1: return newSViv ( start [0] - '0' * 1);
887 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
888 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
889 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
890 }
891
892 {
893 UV uv;
894 int numtype = grok_number (start, dec->cur - start, &uv);
895 if (numtype & IS_NUMBER_IN_UV)
896 if (numtype & IS_NUMBER_NEG)
897 {
898 if (uv < (UV)IV_MIN)
899 return newSViv (-(IV)uv);
900 }
772 else 901 else
773 return newSVuv (uv); 902 return newSVuv (uv);
903
904 // here would likely be the place for bigint support
774 } 905 }
906 }
775 907
908 // if we ever support bigint or bigfloat, this is the place for bigfloat
776 return newSVnv (Atof (start)); 909 return newSVnv (Atof (start));
777 910
778fail: 911fail:
779 return 0; 912 return 0;
780} 913}
782static SV * 915static SV *
783decode_av (dec_t *dec) 916decode_av (dec_t *dec)
784{ 917{
785 AV *av = newAV (); 918 AV *av = newAV ();
786 919
920 DEC_INC_DEPTH;
787 decode_ws (dec); 921 decode_ws (dec);
922
788 if (*dec->cur == ']') 923 if (*dec->cur == ']')
789 ++dec->cur; 924 ++dec->cur;
790 else 925 else
791 for (;;) 926 for (;;)
792 { 927 {
810 ERR (", or ] expected while parsing array"); 945 ERR (", or ] expected while parsing array");
811 946
812 ++dec->cur; 947 ++dec->cur;
813 } 948 }
814 949
950 DEC_DEC_DEPTH;
815 return newRV_noinc ((SV *)av); 951 return newRV_noinc ((SV *)av);
816 952
817fail: 953fail:
818 SvREFCNT_dec (av); 954 SvREFCNT_dec (av);
955 DEC_DEC_DEPTH;
819 return 0; 956 return 0;
820} 957}
821 958
822static SV * 959static SV *
823decode_hv (dec_t *dec) 960decode_hv (dec_t *dec)
824{ 961{
825 HV *hv = newHV (); 962 HV *hv = newHV ();
826 963
964 DEC_INC_DEPTH;
827 decode_ws (dec); 965 decode_ws (dec);
966
828 if (*dec->cur == '}') 967 if (*dec->cur == '}')
829 ++dec->cur; 968 ++dec->cur;
830 else 969 else
831 for (;;) 970 for (;;)
832 { 971 {
845 { 984 {
846 SvREFCNT_dec (key); 985 SvREFCNT_dec (key);
847 goto fail; 986 goto fail;
848 } 987 }
849 988
850 //TODO: optimise
851 hv_store_ent (hv, key, value, 0); 989 hv_store_ent (hv, key, value, 0);
990 SvREFCNT_dec (key);
852 991
853 decode_ws (dec); 992 decode_ws (dec);
854 993
855 if (*dec->cur == '}') 994 if (*dec->cur == '}')
856 { 995 {
862 ERR (", or } expected while parsing object/hash"); 1001 ERR (", or } expected while parsing object/hash");
863 1002
864 ++dec->cur; 1003 ++dec->cur;
865 } 1004 }
866 1005
1006 DEC_DEC_DEPTH;
867 return newRV_noinc ((SV *)hv); 1007 return newRV_noinc ((SV *)hv);
868 1008
869fail: 1009fail:
870 SvREFCNT_dec (hv); 1010 SvREFCNT_dec (hv);
1011 DEC_DEC_DEPTH;
871 return 0; 1012 return 0;
872} 1013}
873 1014
874static SV * 1015static SV *
875decode_sv (dec_t *dec) 1016decode_sv (dec_t *dec)
876{ 1017{
877 decode_ws (dec); 1018 decode_ws (dec);
1019
1020 // the beauty of JSON: you need exactly one character lookahead
1021 // to parse anything.
878 switch (*dec->cur) 1022 switch (*dec->cur)
879 { 1023 {
880 case '"': ++dec->cur; return decode_str (dec); 1024 case '"': ++dec->cur; return decode_str (dec);
881 case '[': ++dec->cur; return decode_av (dec); 1025 case '[': ++dec->cur; return decode_av (dec);
882 case '{': ++dec->cur; return decode_hv (dec); 1026 case '{': ++dec->cur; return decode_hv (dec);
888 1032
889 case 't': 1033 case 't':
890 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1034 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
891 { 1035 {
892 dec->cur += 4; 1036 dec->cur += 4;
893 return newSViv (1); 1037 return SvREFCNT_inc (json_true);
894 } 1038 }
895 else 1039 else
896 ERR ("'true' expected"); 1040 ERR ("'true' expected");
897 1041
898 break; 1042 break;
899 1043
900 case 'f': 1044 case 'f':
901 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1045 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
902 { 1046 {
903 dec->cur += 5; 1047 dec->cur += 5;
904 return newSViv (0); 1048 return SvREFCNT_inc (json_false);
905 } 1049 }
906 else 1050 else
907 ERR ("'false' expected"); 1051 ERR ("'false' expected");
908 1052
909 break; 1053 break;
918 ERR ("'null' expected"); 1062 ERR ("'null' expected");
919 1063
920 break; 1064 break;
921 1065
922 default: 1066 default:
923 ERR ("malformed json string, neither array, object, number, string or atom"); 1067 ERR ("malformed JSON string, neither array, object, number, string or atom");
924 break; 1068 break;
925 } 1069 }
926 1070
927fail: 1071fail:
928 return 0; 1072 return 0;
929} 1073}
930 1074
931static SV * 1075static SV *
932decode_json (SV *string, UV flags) 1076decode_json (SV *string, U32 flags, UV *offset_return)
933{ 1077{
1078 dec_t dec;
1079 UV offset;
934 SV *sv; 1080 SV *sv;
1081
1082 SvGETMAGIC (string);
1083 SvUPGRADE (string, SVt_PV);
935 1084
936 if (flags & F_UTF8) 1085 if (flags & F_UTF8)
937 sv_utf8_downgrade (string, 0); 1086 sv_utf8_downgrade (string, 0);
938 else 1087 else
939 sv_utf8_upgrade (string); 1088 sv_utf8_upgrade (string);
940 1089
941 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1090 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
942 1091
943 dec_t dec;
944 dec.flags = flags; 1092 dec.flags = flags;
945 dec.cur = SvPVX (string); 1093 dec.cur = SvPVX (string);
946 dec.end = SvEND (string); 1094 dec.end = SvEND (string);
947 dec.err = 0; 1095 dec.err = 0;
1096 dec.depth = 0;
1097 dec.maxdepth = DEC_DEPTH (dec.flags);
948 1098
1099 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
949 sv = decode_sv (&dec); 1100 sv = decode_sv (&dec);
950 1101
1102 if (!(offset_return || !sv))
1103 {
1104 // check for trailing garbage
1105 decode_ws (&dec);
1106
1107 if (*dec.cur)
1108 {
1109 dec.err = "garbage after JSON object";
1110 SvREFCNT_dec (sv);
1111 sv = 0;
1112 }
1113 }
1114
1115 if (offset_return || !sv)
1116 {
1117 offset = dec.flags & F_UTF8
1118 ? dec.cur - SvPVX (string)
1119 : utf8_distance (dec.cur, SvPVX (string));
1120
1121 if (offset_return)
1122 *offset_return = offset;
1123 }
1124
951 if (!sv) 1125 if (!sv)
952 { 1126 {
953 IV offset = dec.flags & F_UTF8
954 ? dec.cur - SvPVX (string)
955 : utf8_distance (dec.cur, SvPVX (string));
956 SV *uni = sv_newmortal (); 1127 SV *uni = sv_newmortal ();
957 1128
958 // horrible hack to silence warning inside pv_uni_display 1129 // horrible hack to silence warning inside pv_uni_display
959 COP cop = *PL_curcop; 1130 COP cop = *PL_curcop;
960 cop.cop_warnings = pWARN_NONE; 1131 cop.cop_warnings = pWARN_NONE;
962 SAVEVPTR (PL_curcop); 1133 SAVEVPTR (PL_curcop);
963 PL_curcop = &cop; 1134 PL_curcop = &cop;
964 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1135 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
965 LEAVE; 1136 LEAVE;
966 1137
967 croak ("%s, at character offset %d (%s)", 1138 croak ("%s, at character offset %d [\"%s\"]",
968 dec.err, 1139 dec.err,
969 (int)offset, 1140 (int)offset,
970 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1141 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
971 } 1142 }
972 1143
985 1156
986BOOT: 1157BOOT:
987{ 1158{
988 int i; 1159 int i;
989 1160
990 memset (decode_hexdigit, 0xff, 256);
991 for (i = 10; i--; ) 1161 for (i = 0; i < 256; ++i)
992 decode_hexdigit ['0' + i] = i; 1162 decode_hexdigit [i] =
993 1163 i >= '0' && i <= '9' ? i - '0'
994 for (i = 7; i--; ) 1164 : i >= 'a' && i <= 'f' ? i - 'a' + 10
995 { 1165 : i >= 'A' && i <= 'F' ? i - 'A' + 10
996 decode_hexdigit ['a' + i] = 10 + i; 1166 : -1;
997 decode_hexdigit ['A' + i] = 10 + i;
998 }
999 1167
1000 json_stash = gv_stashpv ("JSON::XS", 1); 1168 json_stash = gv_stashpv ("JSON::XS", 1);
1169
1170 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1171 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1001} 1172}
1002 1173
1003PROTOTYPES: DISABLE 1174PROTOTYPES: DISABLE
1004 1175
1005SV *new (char *dummy) 1176SV *new (char *dummy)
1009 RETVAL 1180 RETVAL
1010 1181
1011SV *ascii (SV *self, int enable = 1) 1182SV *ascii (SV *self, int enable = 1)
1012 ALIAS: 1183 ALIAS:
1013 ascii = F_ASCII 1184 ascii = F_ASCII
1185 latin1 = F_LATIN1
1014 utf8 = F_UTF8 1186 utf8 = F_UTF8
1015 indent = F_INDENT 1187 indent = F_INDENT
1016 canonical = F_CANONICAL 1188 canonical = F_CANONICAL
1017 space_before = F_SPACE_BEFORE 1189 space_before = F_SPACE_BEFORE
1018 space_after = F_SPACE_AFTER 1190 space_after = F_SPACE_AFTER
1030 RETVAL = newSVsv (self); 1202 RETVAL = newSVsv (self);
1031} 1203}
1032 OUTPUT: 1204 OUTPUT:
1033 RETVAL 1205 RETVAL
1034 1206
1207SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1208 CODE:
1209{
1210 UV *uv = SvJSON (self);
1211 UV log2 = 0;
1212
1213 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1214
1215 while ((1UL << log2) < max_depth)
1216 ++log2;
1217
1218 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1219
1220 RETVAL = newSVsv (self);
1221}
1222 OUTPUT:
1223 RETVAL
1224
1035void encode (SV *self, SV *scalar) 1225void encode (SV *self, SV *scalar)
1036 PPCODE: 1226 PPCODE:
1037 XPUSHs (encode_json (scalar, *SvJSON (self))); 1227 XPUSHs (encode_json (scalar, *SvJSON (self)));
1038 1228
1039void decode (SV *self, SV *jsonstr) 1229void decode (SV *self, SV *jsonstr)
1040 PPCODE: 1230 PPCODE:
1041 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1231 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
1232
1233void decode_prefix (SV *self, SV *jsonstr)
1234 PPCODE:
1235{
1236 UV offset;
1237 EXTEND (SP, 2);
1238 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
1239 PUSHs (sv_2mortal (newSVuv (offset)));
1240}
1042 1241
1043PROTOTYPES: ENABLE 1242PROTOTYPES: ENABLE
1044 1243
1045void to_json (SV *scalar) 1244void to_json (SV *scalar)
1046 ALIAS: 1245 ALIAS:
1047 objToJson = 0 1246 objToJson = 0
1048 PPCODE: 1247 PPCODE:
1049 XPUSHs (encode_json (scalar, F_UTF8)); 1248 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
1050 1249
1051void from_json (SV *jsonstr) 1250void from_json (SV *jsonstr)
1052 ALIAS: 1251 ALIAS:
1053 jsonToObj = 0 1252 jsonToObj = 0
1054 PPCODE: 1253 PPCODE:
1055 XPUSHs (decode_json (jsonstr, F_UTF8)); 1254 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0));
1056 1255

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines