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.8 by root, Fri Mar 23 16:13:59 2007 UTC vs.
Revision 1.25 by root, Fri Apr 6 20:37:22 2007 UTC

… …
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 8
9#define F_ASCII 0x00000001 9#define F_ASCII 0x00000001UL
10#define F_UTF8 0x00000002 10#define F_UTF8 0x00000002UL
11#define F_INDENT 0x00000004 11#define F_INDENT 0x00000004UL
12#define F_CANONICAL 0x00000008 12#define F_CANONICAL 0x00000008UL
13#define F_SPACE_BEFORE 0x00000010 13#define F_SPACE_BEFORE 0x00000010UL
14#define F_SPACE_AFTER 0x00000020 14#define F_SPACE_AFTER 0x00000020UL
15#define F_JSON_RPC 0x00000040
16#define F_ALLOW_NONREF 0x00000080 15#define F_ALLOW_NONREF 0x00000080UL
17#define F_SHRINK 0x00000100 16#define F_SHRINK 0x00000100UL
17#define F_MAXDEPTH 0xf8000000UL
18#define S_MAXDEPTH 27
19
20#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
21
22// F_SELFCONVERT? <=> to_json/toJson
23// F_BLESSED? <=> { $__class__$ => }
18 24
19#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 25#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
20#define F_DEFAULT 0 26#define F_DEFAULT (9UL << S_MAXDEPTH)
21 27
22#define INIT_SIZE 32 // initial scalar size to be allocated 28#define INIT_SIZE 32 // initial scalar size to be allocated
29#define INDENT_STEP 3 // spaces per indentation level
30
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
23 33
24#define SB do { 34#define SB do {
25#define SE } while (0) 35#define SE } while (0)
26 36
27static HV *json_stash; 37static HV *json_stash; // JSON::XS::
38
39/////////////////////////////////////////////////////////////////////////////
40// utility functions
41
42static UV *
43SvJSON (SV *sv)
44{
45 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
46 croak ("object is not of type JSON::XS");
47
48 return &SvUVX (SvRV (sv));
49}
50
51static void
52shrink (SV *sv)
53{
54 sv_utf8_downgrade (sv, 1);
55 if (SvLEN (sv) > SvCUR (sv) + 1)
56 {
57#ifdef SvPV_shrink_to_cur
58 SvPV_shrink_to_cur (sv);
59#elif defined (SvPV_renew)
60 SvPV_renew (sv, SvCUR (sv) + 1);
61#endif
62 }
63}
64
65// decode an utf-8 character and return it, or (UV)-1 in
66// case of an error.
67// we special-case "safe" characters from U+80 .. U+7FF,
68// but use the very good perl function to parse anything else.
69// note that we never call this function for a ascii codepoints
70static UV
71decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
72{
73 if (s[0] > 0xdf || s[0] < 0xc2)
74 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
75 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
76 {
77 *clen = 2;
78 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
79 }
80 else
81 {
82 *clen = (STRLEN)-1;
83 return (UV)-1;
84 }
85}
86
87/////////////////////////////////////////////////////////////////////////////
88// encoder
28 89
29// structure used for encoding JSON 90// structure used for encoding JSON
30typedef struct 91typedef struct
31{ 92{
32 char *cur; 93 char *cur; // SvPVX (sv) + current output position
33 STRLEN len; // SvLEN (sv)
34 char *end; // SvEND (sv) 94 char *end; // SvEND (sv)
35 SV *sv; 95 SV *sv; // result scalar
36 UV flags; 96 U32 flags; // F_*
37 int max_recurse; 97 U32 indent; // indentation level
38 int indent; 98 U32 maxdepth; // max. indentation/recursion level
39} enc_t; 99} enc_t;
40
41// structure used for decoding JSON
42typedef struct
43{
44 char *cur;
45 char *end;
46 const char *err;
47 UV flags;
48} dec_t;
49
50static UV *
51SvJSON (SV *sv)
52{
53 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
54 croak ("object is not of type JSON::XS");
55
56 return &SvUVX (SvRV (sv));
57}
58
59static void
60shrink (SV *sv)
61{
62 sv_utf8_downgrade (sv, 1);
63#ifdef SvPV_shrink_to_cur
64 SvPV_shrink_to_cur (sv);
65#endif
66}
67
68/////////////////////////////////////////////////////////////////////////////
69 100
70static void 101static void
71need (enc_t *enc, STRLEN len) 102need (enc_t *enc, STRLEN len)
72{ 103{
73 if (enc->cur + len >= enc->end) 104 if (enc->cur + len >= enc->end)
… …
131 STRLEN clen; 162 STRLEN clen;
132 UV uch; 163 UV uch;
133 164
134 if (is_utf8) 165 if (is_utf8)
135 { 166 {
136 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); 167 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
168 uch = decode_utf8 (str, end - str, &clen);
137 if (clen == (STRLEN)-1) 169 if (clen == (STRLEN)-1)
138 croak ("malformed UTF-8 character in string, cannot convert to JSON"); 170 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
139 } 171 }
140 else 172 else
141 { 173 {
142 uch = ch; 174 uch = ch;
143 clen = 1; 175 clen = 1;
144 } 176 }
145 177
178 if (uch > 0x10FFFFUL)
179 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
180
146 if (uch < 0x80 || enc->flags & F_ASCII) 181 if (uch < 0x80 || enc->flags & F_ASCII)
147 { 182 {
148 if (uch > 0xFFFFUL) 183 if (uch > 0xFFFFUL)
149 { 184 {
150 need (enc, len += 11); 185 need (enc, len += 11);
151 sprintf (enc->cur, "\\u%04x\\u%04x", 186 sprintf (enc->cur, "\\u%04x\\u%04x",
152 (uch - 0x10000) / 0x400 + 0xD800, 187 (int)((uch - 0x10000) / 0x400 + 0xD800),
153 (uch - 0x10000) % 0x400 + 0xDC00); 188 (int)((uch - 0x10000) % 0x400 + 0xDC00));
154 enc->cur += 12; 189 enc->cur += 12;
155 } 190 }
156 else 191 else
157 { 192 {
158 static char hexdigit [16] = "0123456789abcdef"; 193 static char hexdigit [16] = "0123456789abcdef";
… …
176 } 211 }
177 while (--clen); 212 while (--clen);
178 } 213 }
179 else 214 else
180 { 215 {
181 need (enc, len += 10); // never more than 11 bytes needed 216 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed
182 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 217 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
183 ++str; 218 ++str;
184 } 219 }
185 } 220 }
186 } 221 }
… …
188 223
189 --len; 224 --len;
190 } 225 }
191} 226}
192 227
193#define INDENT SB \ 228static void
229encode_indent (enc_t *enc)
230{
194 if (enc->flags & F_INDENT) \ 231 if (enc->flags & F_INDENT)
195 { \ 232 {
196 int i_; \ 233 int spaces = enc->indent * INDENT_STEP;
197 need (enc, enc->indent); \
198 for (i_ = enc->indent * 3; i_--; )\
199 encode_ch (enc, ' '); \
200 } \
201 SE
202 234
203#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE 235 need (enc, spaces);
204#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 236 memset (enc->cur, ' ', spaces);
205#define COMMA SB \ 237 enc->cur += spaces;
238 }
239}
240
241static void
242encode_space (enc_t *enc)
243{
244 need (enc, 1);
206 encode_ch (enc, ','); \ 245 encode_ch (enc, ' ');
246}
247
248static void
249encode_nl (enc_t *enc)
250{
207 if (enc->flags & F_INDENT) \ 251 if (enc->flags & F_INDENT)
208 NL; \ 252 {
253 need (enc, 1);
254 encode_ch (enc, '\n');
255 }
256}
257
258static void
259encode_comma (enc_t *enc)
260{
261 encode_ch (enc, ',');
262
263 if (enc->flags & F_INDENT)
264 encode_nl (enc);
209 else if (enc->flags & F_SPACE_AFTER) \ 265 else if (enc->flags & F_SPACE_AFTER)
210 SPACE; \ 266 encode_space (enc);
211 SE 267}
212 268
213static void encode_sv (enc_t *enc, SV *sv); 269static void encode_sv (enc_t *enc, SV *sv);
214 270
215static void 271static void
216encode_av (enc_t *enc, AV *av) 272encode_av (enc_t *enc, AV *av)
217{ 273{
218 int i, len = av_len (av); 274 int i, len = av_len (av);
219 275
220 encode_ch (enc, '['); NL; 276 if (enc->indent >= enc->maxdepth)
277 croak ("data structure too deep (hit recursion limit)");
278
279 encode_ch (enc, '['); encode_nl (enc);
221 ++enc->indent; 280 ++enc->indent;
222 281
223 for (i = 0; i <= len; ++i) 282 for (i = 0; i <= len; ++i)
224 { 283 {
225 INDENT; 284 encode_indent (enc);
226 encode_sv (enc, *av_fetch (av, i, 0)); 285 encode_sv (enc, *av_fetch (av, i, 0));
227 286
228 if (i < len) 287 if (i < len)
229 COMMA; 288 encode_comma (enc);
230 } 289 }
231 290
232 NL; 291 encode_nl (enc);
233 292
234 --enc->indent; 293 --enc->indent;
235 INDENT; encode_ch (enc, ']'); 294 encode_indent (enc); encode_ch (enc, ']');
236} 295}
237 296
238static void 297static void
239encode_he (enc_t *enc, HE *he) 298encode_he (enc_t *enc, HE *he)
240{ 299{
… …
254 else 313 else
255 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 314 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
256 315
257 encode_ch (enc, '"'); 316 encode_ch (enc, '"');
258 317
259 if (enc->flags & F_SPACE_BEFORE) SPACE; 318 if (enc->flags & F_SPACE_BEFORE) encode_space (enc);
260 encode_ch (enc, ':'); 319 encode_ch (enc, ':');
261 if (enc->flags & F_SPACE_AFTER ) SPACE; 320 if (enc->flags & F_SPACE_AFTER ) encode_space (enc);
262 encode_sv (enc, HeVAL (he)); 321 encode_sv (enc, HeVAL (he));
263} 322}
264 323
265// compare hash entries, used when all keys are bytestrings 324// compare hash entries, used when all keys are bytestrings
266static int 325static int
… …
272 HE *b = *(HE **)b_; 331 HE *b = *(HE **)b_;
273 332
274 STRLEN la = HeKLEN (a); 333 STRLEN la = HeKLEN (a);
275 STRLEN lb = HeKLEN (b); 334 STRLEN lb = HeKLEN (b);
276 335
277 if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 336 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))
278 cmp = la < lb ? -1 : la == lb ? 0 : 1; 337 cmp = la - lb;
279 338
280 return cmp; 339 return cmp;
281} 340}
282 341
283// compare hash entries, used when some keys are sv's or utf-x 342// compare hash entries, used when some keys are sv's or utf-x
… …
290static void 349static void
291encode_hv (enc_t *enc, HV *hv) 350encode_hv (enc_t *enc, HV *hv)
292{ 351{
293 int count, i; 352 int count, i;
294 353
354 if (enc->indent >= enc->maxdepth)
355 croak ("data structure too deep (hit recursion limit)");
356
295 encode_ch (enc, '{'); NL; ++enc->indent; 357 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
296 358
297 if ((count = hv_iterinit (hv))) 359 if ((count = hv_iterinit (hv)))
298 { 360 {
299 // for canonical output we have to sort by keys first 361 // for canonical output we have to sort by keys first
300 // actually, this is mostly due to the stupid so-called 362 // actually, this is mostly due to the stupid so-called
301 // security workaround added somewhere in 5.8.x. 363 // security workaround added somewhere in 5.8.x.
302 // that randomises hash orderings 364 // that randomises hash orderings
303 if (enc->flags & F_CANONICAL) 365 if (enc->flags & F_CANONICAL)
304 { 366 {
305 HE *he, *hes [count]; 367 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
306 int fast = 1; 368 int fast = 1;
307 369
308 i = 0; 370 i = 0;
309 while ((he = hv_iternext (hv))) 371 while ((he = hv_iternext (hv)))
310 { 372 {
… …
335 LEAVE; 397 LEAVE;
336 } 398 }
337 399
338 for (i = 0; i < count; ++i) 400 for (i = 0; i < count; ++i)
339 { 401 {
340 INDENT; 402 encode_indent (enc);
341 encode_he (enc, hes [i]); 403 encode_he (enc, hes [i]);
342 404
343 if (i < count - 1) 405 if (i < count - 1)
344 COMMA; 406 encode_comma (enc);
345 } 407 }
346 408
347 NL; 409 encode_nl (enc);
348 } 410 }
349 else 411 else
350 { 412 {
351 SV *sv;
352 HE *he = hv_iternext (hv); 413 HE *he = hv_iternext (hv);
353 414
354 for (;;) 415 for (;;)
355 { 416 {
356 INDENT; 417 encode_indent (enc);
357 encode_he (enc, he); 418 encode_he (enc, he);
358 419
359 if (!(he = hv_iternext (hv))) 420 if (!(he = hv_iternext (hv)))
360 break; 421 break;
361 422
362 COMMA; 423 encode_comma (enc);
363 } 424 }
364 425
365 NL; 426 encode_nl (enc);
366 } 427 }
367 } 428 }
368 429
369 --enc->indent; INDENT; encode_ch (enc, '}'); 430 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
431}
432
433// encode objects, arrays and special \0=false and \1=true values.
434static void
435encode_rv (enc_t *enc, SV *sv)
436{
437 svtype svt;
438
439 SvGETMAGIC (sv);
440 svt = SvTYPE (sv);
441
442 if (svt == SVt_PVHV)
443 encode_hv (enc, (HV *)sv);
444 else if (svt == SVt_PVAV)
445 encode_av (enc, (AV *)sv);
446 else if (svt < SVt_PVAV)
447 {
448 if (SvNIOK (sv) && SvIV (sv) == 0)
449 encode_str (enc, "false", 5, 0);
450 else if (SvNIOK (sv) && SvIV (sv) == 1)
451 encode_str (enc, "true", 4, 0);
452 else
453 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
454 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
455 }
456 else
457 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
458 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
370} 459}
371 460
372static void 461static void
373encode_sv (enc_t *enc, SV *sv) 462encode_sv (enc_t *enc, SV *sv)
374{ 463{
… …
395 SvIsUV(sv) 484 SvIsUV(sv)
396 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 485 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
397 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 486 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
398 } 487 }
399 else if (SvROK (sv)) 488 else if (SvROK (sv))
400 { 489 encode_rv (enc, SvRV (sv));
401 if (!--enc->max_recurse)
402 croak ("data structure too deep (hit recursion limit)");
403
404 sv = SvRV (sv);
405
406 switch (SvTYPE (sv))
407 {
408 case SVt_PVAV: encode_av (enc, (AV *)sv); break;
409 case SVt_PVHV: encode_hv (enc, (HV *)sv); break;
410
411 default:
412 croak ("JSON can only represent references to arrays or hashes");
413 }
414 }
415 else if (!SvOK (sv)) 490 else if (!SvOK (sv))
416 encode_str (enc, "null", 4, 0); 491 encode_str (enc, "null", 4, 0);
417 else 492 else
418 croak ("encountered perl type that JSON cannot handle"); 493 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
494 SvPV_nolen (sv), SvFLAGS (sv));
419} 495}
420 496
421static SV * 497static SV *
422encode_json (SV *scalar, UV flags) 498encode_json (SV *scalar, U32 flags)
423{ 499{
500 enc_t enc;
501
424 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 502 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
425 croak ("hash- or arraref required (not a simple scalar, use allow_nonref to allow this)"); 503 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
426 504
427 enc_t enc;
428 enc.flags = flags; 505 enc.flags = flags;
429 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 506 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
430 enc.cur = SvPVX (enc.sv); 507 enc.cur = SvPVX (enc.sv);
431 enc.end = SvEND (enc.sv); 508 enc.end = SvEND (enc.sv);
432 enc.max_recurse = 0;
433 enc.indent = 0; 509 enc.indent = 0;
510 enc.maxdepth = DEC_DEPTH (flags);
434 511
435 SvPOK_only (enc.sv); 512 SvPOK_only (enc.sv);
436 encode_sv (&enc, scalar); 513 encode_sv (&enc, scalar);
437 514
438 if (!(flags & (F_ASCII | F_UTF8))) 515 if (!(flags & (F_ASCII | F_UTF8)))
… …
445 522
446 return enc.sv; 523 return enc.sv;
447} 524}
448 525
449///////////////////////////////////////////////////////////////////////////// 526/////////////////////////////////////////////////////////////////////////////
527// decoder
450 528
451#define WS \ 529// structure used for decoding JSON
530typedef struct
531{
532 char *cur; // current parser pointer
533 char *end; // end of input string
534 const char *err; // parse error, if != 0
535 U32 flags; // F_*
536 U32 depth; // recursion depth
537 U32 maxdepth; // recursion depth limit
538} dec_t;
539
540static void
541decode_ws (dec_t *dec)
542{
452 for (;;) \ 543 for (;;)
453 { \ 544 {
454 char ch = *dec->cur; \ 545 char ch = *dec->cur;
546
455 if (ch > 0x20 \ 547 if (ch > 0x20
456 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ 548 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
457 break; \ 549 break;
550
458 ++dec->cur; \ 551 ++dec->cur;
459 } 552 }
553}
460 554
461#define ERR(reason) SB dec->err = reason; goto fail; SE 555#define ERR(reason) SB dec->err = reason; goto fail; SE
556
462#define EXPECT_CH(ch) SB \ 557#define EXPECT_CH(ch) SB \
463 if (*dec->cur != ch) \ 558 if (*dec->cur != ch) \
464 ERR (# ch " expected"); \ 559 ERR (# ch " expected"); \
465 ++dec->cur; \ 560 ++dec->cur; \
466 SE 561 SE
467 562
563#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
564#define DEC_DEC_DEPTH --dec->depth
565
468static SV *decode_sv (dec_t *dec); 566static SV *decode_sv (dec_t *dec);
469 567
470static signed char decode_hexdigit[256]; 568static signed char decode_hexdigit[256];
471 569
472static UV 570static UV
473decode_4hex (dec_t *dec) 571decode_4hex (dec_t *dec)
474{ 572{
475 signed char d1, d2, d3, d4; 573 signed char d1, d2, d3, d4;
574 unsigned char *cur = (unsigned char *)dec->cur;
476 575
477 d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]];
478 if (d1 < 0) ERR ("four hexadecimal digits expected"); 576 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");
479 d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]];
480 if (d2 < 0) ERR ("four hexadecimal digits expected"); 577 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");
481 d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
482 if (d3 < 0) ERR ("four hexadecimal digits expected"); 578 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");
483 d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
484 if (d4 < 0) ERR ("four hexadecimal digits expected"); 579 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");
485 580
486 dec->cur += 4; 581 dec->cur += 4;
487 582
488 return ((UV)d1) << 12 583 return ((UV)d1) << 12
489 | ((UV)d2) << 8 584 | ((UV)d2) << 8
… …
492 587
493fail: 588fail:
494 return (UV)-1; 589 return (UV)-1;
495} 590}
496 591
497#define APPEND_GROW(n) SB \
498 if (cur + (n) >= end) \
499 { \
500 STRLEN ofs = cur - SvPVX (sv); \
501 SvGROW (sv, ofs + (n) + 1); \
502 cur = SvPVX (sv) + ofs; \
503 end = SvEND (sv); \
504 } \
505 SE
506
507#define APPEND_CH(ch) SB \
508 APPEND_GROW (1); \
509 *cur++ = (ch); \
510 SE
511
512static SV * 592static SV *
513decode_str (dec_t *dec) 593decode_str (dec_t *dec)
514{ 594{
515 SV *sv = NEWSV (0,2); 595 SV *sv = 0;
516 int utf8 = 0; 596 int utf8 = 0;
517 char *cur = SvPVX (sv);
518 char *end = SvEND (sv);
519 597
520 for (;;) 598 do
521 { 599 {
522 unsigned char ch = *(unsigned char *)dec->cur; 600 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];
601 char *cur = buf;
523 602
524 if (ch == '"') 603 do
525 break;
526 else if (ch == '\\')
527 { 604 {
528 switch (*++dec->cur) 605 unsigned char ch = *(unsigned char *)dec->cur++;
606
607 if (ch == '"')
529 { 608 {
530 case '\\': 609 --dec->cur;
531 case '/': 610 break;
532 case '"': APPEND_CH (*dec->cur++); break; 611 }
533 612 else if (ch == '\\')
534 case 'b': APPEND_CH ('\010'); ++dec->cur; break; 613 {
535 case 't': APPEND_CH ('\011'); ++dec->cur; break; 614 switch (*dec->cur)
536 case 'n': APPEND_CH ('\012'); ++dec->cur; break;
537 case 'f': APPEND_CH ('\014'); ++dec->cur; break;
538 case 'r': APPEND_CH ('\015'); ++dec->cur; break;
539
540 case 'u':
541 { 615 {
542 UV lo, hi; 616 case '\\':
543 ++dec->cur; 617 case '/':
618 case '"': *cur++ = *dec->cur++; break;
544 619
545 hi = decode_4hex (dec); 620 case 'b': ++dec->cur; *cur++ = '\010'; break;
546 if (hi == (UV)-1) 621 case 't': ++dec->cur; *cur++ = '\011'; break;
547 goto fail; 622 case 'n': ++dec->cur; *cur++ = '\012'; break;
623 case 'f': ++dec->cur; *cur++ = '\014'; break;
624 case 'r': ++dec->cur; *cur++ = '\015'; break;
548 625
549 // possibly a surrogate pair 626 case 'u':
550 if (hi >= 0xd800 && hi < 0xdc00)
551 { 627 {
552 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 628 UV lo, hi;
553 ERR ("missing low surrogate character in surrogate pair");
554
555 dec->cur += 2; 629 ++dec->cur;
556 630
557 lo = decode_4hex (dec); 631 hi = decode_4hex (dec);
558 if (lo == (UV)-1) 632 if (hi == (UV)-1)
559 goto fail; 633 goto fail;
560 634
635 // possibly a surrogate pair
636 if (hi >= 0xd800)
637 if (hi < 0xdc00)
638 {
639 if (dec->cur [0] != '\\' || dec->cur [1] != 'u')
640 ERR ("missing low surrogate character in surrogate pair");
641
642 dec->cur += 2;
643
644 lo = decode_4hex (dec);
645 if (lo == (UV)-1)
646 goto fail;
647
561 if (lo < 0xdc00 || lo >= 0xe000) 648 if (lo < 0xdc00 || lo >= 0xe000)
562 ERR ("surrogate pair expected"); 649 ERR ("surrogate pair expected");
563 650
564 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; 651 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
652 }
653 else if (hi < 0xe000)
654 ERR ("missing high surrogate character in surrogate pair");
655
656 if (hi >= 0x80)
657 {
658 utf8 = 1;
659
660 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
661 }
662 else
663 *cur++ = hi;
565 } 664 }
566 else if (hi >= 0xdc00 && hi < 0xe000)
567 ERR ("missing high surrogate character in surrogate pair");
568
569 if (hi >= 0x80)
570 { 665 break;
571 utf8 = 1;
572 666
573 APPEND_GROW (4); // at most 4 bytes for 21 bits
574 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
575 }
576 else 667 default:
577 APPEND_CH (hi); 668 --dec->cur;
669 ERR ("illegal backslash escape sequence in string");
578 } 670 }
579 break; 671 }
672 else if (ch >= 0x20 && ch <= 0x7f)
673 *cur++ = ch;
674 else if (ch >= 0x80)
675 {
676 STRLEN clen;
677 UV uch;
580 678
581 default:
582 --dec->cur; 679 --dec->cur;
583 ERR ("illegal backslash escape sequence in string"); 680
681 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
682 if (clen == (STRLEN)-1)
683 ERR ("malformed UTF-8 character in JSON string");
684
685 do
686 *cur++ = *dec->cur++;
687 while (--clen);
688
689 utf8 = 1;
690 }
691 else
692 {
693 --dec->cur;
694
695 if (!ch)
696 ERR ("unexpected end of string while parsing JSON string");
697 else
698 ERR ("invalid character encountered while parsing JSON string");
584 } 699 }
585 } 700 }
586 else if (ch >= 0x20 && ch <= 0x7f) 701 while (cur < buf + SHORT_STRING_LEN);
587 APPEND_CH (*dec->cur++); 702
588 else if (ch >= 0x80)
589 { 703 {
590 STRLEN clen; 704 STRLEN len = cur - buf;
591 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
592 if (clen == (STRLEN)-1)
593 ERR ("malformed UTF-8 character in JSON string");
594 705
595 APPEND_GROW (clen); 706 if (sv)
596 do
597 { 707 {
598 *cur++ = *dec->cur++; 708 SvGROW (sv, SvCUR (sv) + len + 1);
709 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
710 SvCUR_set (sv, SvCUR (sv) + len);
599 } 711 }
600 while (--clen);
601
602 utf8 = 1;
603 }
604 else if (dec->cur == dec->end)
605 ERR ("unexpected end of string while parsing json string");
606 else 712 else
607 ERR ("invalid character encountered"); 713 sv = newSVpvn (buf, len);
608 } 714 }
715 }
716 while (*dec->cur != '"');
609 717
610 ++dec->cur; 718 ++dec->cur;
611 719
612 SvCUR_set (sv, cur - SvPVX (sv)); 720 if (sv)
613 721 {
614 SvPOK_only (sv); 722 SvPOK_only (sv);
615 *SvEND (sv) = 0; 723 *SvEND (sv) = 0;
616 724
617 if (utf8) 725 if (utf8)
618 SvUTF8_on (sv); 726 SvUTF8_on (sv);
619 727 }
620 if (dec->flags & F_SHRINK) 728 else
621 shrink (sv); 729 sv = newSVpvn ("", 0);
622 730
623 return sv; 731 return sv;
624 732
625fail: 733fail:
626 SvREFCNT_dec (sv);
627 return 0; 734 return 0;
628} 735}
629 736
630static SV * 737static SV *
631decode_num (dec_t *dec) 738decode_num (dec_t *dec)
… …
712static SV * 819static SV *
713decode_av (dec_t *dec) 820decode_av (dec_t *dec)
714{ 821{
715 AV *av = newAV (); 822 AV *av = newAV ();
716 823
717 WS; 824 DEC_INC_DEPTH;
825 decode_ws (dec);
826
718 if (*dec->cur == ']') 827 if (*dec->cur == ']')
719 ++dec->cur; 828 ++dec->cur;
720 else 829 else
721 for (;;) 830 for (;;)
722 { 831 {
… …
726 if (!value) 835 if (!value)
727 goto fail; 836 goto fail;
728 837
729 av_push (av, value); 838 av_push (av, value);
730 839
731 WS; 840 decode_ws (dec);
732 841
733 if (*dec->cur == ']') 842 if (*dec->cur == ']')
734 { 843 {
735 ++dec->cur; 844 ++dec->cur;
736 break; 845 break;
… …
740 ERR (", or ] expected while parsing array"); 849 ERR (", or ] expected while parsing array");
741 850
742 ++dec->cur; 851 ++dec->cur;
743 } 852 }
744 853
854 DEC_DEC_DEPTH;
745 return newRV_noinc ((SV *)av); 855 return newRV_noinc ((SV *)av);
746 856
747fail: 857fail:
748 SvREFCNT_dec (av); 858 SvREFCNT_dec (av);
859 DEC_DEC_DEPTH;
749 return 0; 860 return 0;
750} 861}
751 862
752static SV * 863static SV *
753decode_hv (dec_t *dec) 864decode_hv (dec_t *dec)
754{ 865{
755 HV *hv = newHV (); 866 HV *hv = newHV ();
756 867
757 WS; 868 DEC_INC_DEPTH;
869 decode_ws (dec);
870
758 if (*dec->cur == '}') 871 if (*dec->cur == '}')
759 ++dec->cur; 872 ++dec->cur;
760 else 873 else
761 for (;;) 874 for (;;)
762 { 875 {
763 SV *key, *value; 876 SV *key, *value;
764 877
765 WS; EXPECT_CH ('"'); 878 decode_ws (dec); EXPECT_CH ('"');
766 879
767 key = decode_str (dec); 880 key = decode_str (dec);
768 if (!key) 881 if (!key)
769 goto fail; 882 goto fail;
770 883
771 WS; EXPECT_CH (':'); 884 decode_ws (dec); EXPECT_CH (':');
772 885
773 value = decode_sv (dec); 886 value = decode_sv (dec);
774 if (!value) 887 if (!value)
775 { 888 {
776 SvREFCNT_dec (key); 889 SvREFCNT_dec (key);
777 goto fail; 890 goto fail;
778 } 891 }
779 892
780 //TODO: optimise
781 hv_store_ent (hv, key, value, 0); 893 hv_store_ent (hv, key, value, 0);
894 SvREFCNT_dec (key);
782 895
783 WS; 896 decode_ws (dec);
784 897
785 if (*dec->cur == '}') 898 if (*dec->cur == '}')
786 { 899 {
787 ++dec->cur; 900 ++dec->cur;
788 break; 901 break;
… …
792 ERR (", or } expected while parsing object/hash"); 905 ERR (", or } expected while parsing object/hash");
793 906
794 ++dec->cur; 907 ++dec->cur;
795 } 908 }
796 909
910 DEC_DEC_DEPTH;
797 return newRV_noinc ((SV *)hv); 911 return newRV_noinc ((SV *)hv);
798 912
799fail: 913fail:
800 SvREFCNT_dec (hv); 914 SvREFCNT_dec (hv);
915 DEC_DEC_DEPTH;
801 return 0; 916 return 0;
802} 917}
803 918
804static SV * 919static SV *
805decode_sv (dec_t *dec) 920decode_sv (dec_t *dec)
806{ 921{
807 WS; 922 decode_ws (dec);
808 switch (*dec->cur) 923 switch (*dec->cur)
809 { 924 {
810 case '"': ++dec->cur; return decode_str (dec); 925 case '"': ++dec->cur; return decode_str (dec);
811 case '[': ++dec->cur; return decode_av (dec); 926 case '[': ++dec->cur; return decode_av (dec);
812 case '{': ++dec->cur; return decode_hv (dec); 927 case '{': ++dec->cur; return decode_hv (dec);
… …
848 ERR ("'null' expected"); 963 ERR ("'null' expected");
849 964
850 break; 965 break;
851 966
852 default: 967 default:
853 ERR ("malformed json string, neither array, object, number, string or atom"); 968 ERR ("malformed JSON string, neither array, object, number, string or atom");
854 break; 969 break;
855 } 970 }
856 971
857fail: 972fail:
858 return 0; 973 return 0;
859} 974}
860 975
861static SV * 976static SV *
862decode_json (SV *string, UV flags) 977decode_json (SV *string, U32 flags)
863{ 978{
979 dec_t dec;
864 SV *sv; 980 SV *sv;
981
982 SvUPGRADE (string, SVt_PV);
865 983
866 if (flags & F_UTF8) 984 if (flags & F_UTF8)
867 sv_utf8_downgrade (string, 0); 985 sv_utf8_downgrade (string, 0);
868 else 986 else
869 sv_utf8_upgrade (string); 987 sv_utf8_upgrade (string);
870 988
871 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 989 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
872 990
873 dec_t dec;
874 dec.flags = flags; 991 dec.flags = flags;
875 dec.cur = SvPVX (string); 992 dec.cur = SvPVX (string);
876 dec.end = SvEND (string); 993 dec.end = SvEND (string);
877 dec.err = 0; 994 dec.err = 0;
995 dec.depth = 0;
996 dec.maxdepth = DEC_DEPTH (dec.flags);
878 997
998 *dec.end = 0; // this should basically be a nop, too, but make sure its there
879 sv = decode_sv (&dec); 999 sv = decode_sv (&dec);
880 1000
881 if (!sv) 1001 if (!sv)
882 { 1002 {
883 IV offset = dec.flags & F_UTF8 1003 IV offset = dec.flags & F_UTF8
… …
892 SAVEVPTR (PL_curcop); 1012 SAVEVPTR (PL_curcop);
893 PL_curcop = &cop; 1013 PL_curcop = &cop;
894 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1014 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
895 LEAVE; 1015 LEAVE;
896 1016
897 croak ("%s, at character offset %d (%s)", 1017 croak ("%s, at character offset %d [\"%s\"]",
898 dec.err, 1018 dec.err,
899 (int)offset, 1019 (int)offset,
900 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1020 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
901 } 1021 }
902 1022
903 sv = sv_2mortal (sv); 1023 sv = sv_2mortal (sv);
904 1024
905 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1025 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))
906 croak ("JSON object or array expected (but number, string, true, false or null found, use allow_nonref to allow this)"); 1026 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
907 1027
908 return sv; 1028 return sv;
909} 1029}
910 1030
1031/////////////////////////////////////////////////////////////////////////////
1032// XS interface functions
1033
911MODULE = JSON::XS PACKAGE = JSON::XS 1034MODULE = JSON::XS PACKAGE = JSON::XS
912 1035
913BOOT: 1036BOOT:
914{ 1037{
915 int i; 1038 int i;
916 1039
917 memset (decode_hexdigit, 0xff, 256); 1040 memset (decode_hexdigit, 0xff, 256);
1041
918 for (i = 10; i--; ) 1042 for (i = 0; i < 256; ++i)
919 decode_hexdigit ['0' + i] = i; 1043 decode_hexdigit [i] =
920 1044 i >= '0' && i <= '9' ? i - '0'
921 for (i = 7; i--; ) 1045 : i >= 'a' && i <= 'f' ? i - 'a' + 10
922 { 1046 : i >= 'A' && i <= 'F' ? i - 'A' + 10
923 decode_hexdigit ['a' + i] = 10 + i; 1047 : -1;
924 decode_hexdigit ['A' + i] = 10 + i;
925 }
926 1048
927 json_stash = gv_stashpv ("JSON::XS", 1); 1049 json_stash = gv_stashpv ("JSON::XS", 1);
928} 1050}
929 1051
930PROTOTYPES: DISABLE 1052PROTOTYPES: DISABLE
… …
941 utf8 = F_UTF8 1063 utf8 = F_UTF8
942 indent = F_INDENT 1064 indent = F_INDENT
943 canonical = F_CANONICAL 1065 canonical = F_CANONICAL
944 space_before = F_SPACE_BEFORE 1066 space_before = F_SPACE_BEFORE
945 space_after = F_SPACE_AFTER 1067 space_after = F_SPACE_AFTER
946 json_rpc = F_JSON_RPC
947 pretty = F_PRETTY 1068 pretty = F_PRETTY
948 allow_nonref = F_ALLOW_NONREF 1069 allow_nonref = F_ALLOW_NONREF
949 shrink = F_SHRINK 1070 shrink = F_SHRINK
950 CODE: 1071 CODE:
951{ 1072{
… …
958 RETVAL = newSVsv (self); 1079 RETVAL = newSVsv (self);
959} 1080}
960 OUTPUT: 1081 OUTPUT:
961 RETVAL 1082 RETVAL
962 1083
1084SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1085 CODE:
1086{
1087 UV *uv = SvJSON (self);
1088 UV log2 = 0;
1089
1090 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1091
1092 while ((1UL << log2) < max_depth)
1093 ++log2;
1094
1095 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1096
1097 RETVAL = newSVsv (self);
1098}
1099 OUTPUT:
1100 RETVAL
1101
963void encode (SV *self, SV *scalar) 1102void encode (SV *self, SV *scalar)
964 PPCODE: 1103 PPCODE:
965 XPUSHs (encode_json (scalar, *SvJSON (self))); 1104 XPUSHs (encode_json (scalar, *SvJSON (self)));
966 1105
967void decode (SV *self, SV *jsonstr) 1106void decode (SV *self, SV *jsonstr)
… …
969 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1108 XPUSHs (decode_json (jsonstr, *SvJSON (self)));
970 1109
971PROTOTYPES: ENABLE 1110PROTOTYPES: ENABLE
972 1111
973void to_json (SV *scalar) 1112void to_json (SV *scalar)
1113 ALIAS:
1114 objToJson = 0
974 PPCODE: 1115 PPCODE:
975 XPUSHs (encode_json (scalar, F_UTF8)); 1116 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
976 1117
977void from_json (SV *jsonstr) 1118void from_json (SV *jsonstr)
1119 ALIAS:
1120 jsonToObj = 0
978 PPCODE: 1121 PPCODE:
979 XPUSHs (decode_json (jsonstr, F_UTF8)); 1122 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8));
980 1123

Diff Legend

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