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.9 by root, Fri Mar 23 17:40:29 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 or illegal unicode character in string [%.11s], cannot convert to JSON", str); 170 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
139 } 171 }
140 else 172 else
141 { 173 {
… …
150 { 182 {
151 if (uch > 0xFFFFUL) 183 if (uch > 0xFFFFUL)
152 { 184 {
153 need (enc, len += 11); 185 need (enc, len += 11);
154 sprintf (enc->cur, "\\u%04x\\u%04x", 186 sprintf (enc->cur, "\\u%04x\\u%04x",
155 (uch - 0x10000) / 0x400 + 0xD800, 187 (int)((uch - 0x10000) / 0x400 + 0xD800),
156 (uch - 0x10000) % 0x400 + 0xDC00); 188 (int)((uch - 0x10000) % 0x400 + 0xDC00));
157 enc->cur += 12; 189 enc->cur += 12;
158 } 190 }
159 else 191 else
160 { 192 {
161 static char hexdigit [16] = "0123456789abcdef"; 193 static char hexdigit [16] = "0123456789abcdef";
… …
179 } 211 }
180 while (--clen); 212 while (--clen);
181 } 213 }
182 else 214 else
183 { 215 {
184 need (enc, len += 10); // never more than 11 bytes needed 216 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed
185 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 217 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
186 ++str; 218 ++str;
187 } 219 }
188 } 220 }
189 } 221 }
… …
191 223
192 --len; 224 --len;
193 } 225 }
194} 226}
195 227
196#define INDENT SB \ 228static void
229encode_indent (enc_t *enc)
230{
197 if (enc->flags & F_INDENT) \ 231 if (enc->flags & F_INDENT)
198 { \ 232 {
199 int i_; \ 233 int spaces = enc->indent * INDENT_STEP;
200 need (enc, enc->indent); \
201 for (i_ = enc->indent * 3; i_--; )\
202 encode_ch (enc, ' '); \
203 } \
204 SE
205 234
206#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE 235 need (enc, spaces);
207#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 236 memset (enc->cur, ' ', spaces);
208#define COMMA SB \ 237 enc->cur += spaces;
238 }
239}
240
241static void
242encode_space (enc_t *enc)
243{
244 need (enc, 1);
209 encode_ch (enc, ','); \ 245 encode_ch (enc, ' ');
246}
247
248static void
249encode_nl (enc_t *enc)
250{
210 if (enc->flags & F_INDENT) \ 251 if (enc->flags & F_INDENT)
211 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);
212 else if (enc->flags & F_SPACE_AFTER) \ 265 else if (enc->flags & F_SPACE_AFTER)
213 SPACE; \ 266 encode_space (enc);
214 SE 267}
215 268
216static void encode_sv (enc_t *enc, SV *sv); 269static void encode_sv (enc_t *enc, SV *sv);
217 270
218static void 271static void
219encode_av (enc_t *enc, AV *av) 272encode_av (enc_t *enc, AV *av)
220{ 273{
221 int i, len = av_len (av); 274 int i, len = av_len (av);
222 275
223 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);
224 ++enc->indent; 280 ++enc->indent;
225 281
226 for (i = 0; i <= len; ++i) 282 for (i = 0; i <= len; ++i)
227 { 283 {
228 INDENT; 284 encode_indent (enc);
229 encode_sv (enc, *av_fetch (av, i, 0)); 285 encode_sv (enc, *av_fetch (av, i, 0));
230 286
231 if (i < len) 287 if (i < len)
232 COMMA; 288 encode_comma (enc);
233 } 289 }
234 290
235 NL; 291 encode_nl (enc);
236 292
237 --enc->indent; 293 --enc->indent;
238 INDENT; encode_ch (enc, ']'); 294 encode_indent (enc); encode_ch (enc, ']');
239} 295}
240 296
241static void 297static void
242encode_he (enc_t *enc, HE *he) 298encode_he (enc_t *enc, HE *he)
243{ 299{
… …
257 else 313 else
258 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 314 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
259 315
260 encode_ch (enc, '"'); 316 encode_ch (enc, '"');
261 317
262 if (enc->flags & F_SPACE_BEFORE) SPACE; 318 if (enc->flags & F_SPACE_BEFORE) encode_space (enc);
263 encode_ch (enc, ':'); 319 encode_ch (enc, ':');
264 if (enc->flags & F_SPACE_AFTER ) SPACE; 320 if (enc->flags & F_SPACE_AFTER ) encode_space (enc);
265 encode_sv (enc, HeVAL (he)); 321 encode_sv (enc, HeVAL (he));
266} 322}
267 323
268// compare hash entries, used when all keys are bytestrings 324// compare hash entries, used when all keys are bytestrings
269static int 325static int
… …
275 HE *b = *(HE **)b_; 331 HE *b = *(HE **)b_;
276 332
277 STRLEN la = HeKLEN (a); 333 STRLEN la = HeKLEN (a);
278 STRLEN lb = HeKLEN (b); 334 STRLEN lb = HeKLEN (b);
279 335
280 if (!(cmp == memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 336 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb)))
281 cmp = la < lb ? -1 : la == lb ? 0 : 1; 337 cmp = la - lb;
282 338
283 return cmp; 339 return cmp;
284} 340}
285 341
286// 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
… …
293static void 349static void
294encode_hv (enc_t *enc, HV *hv) 350encode_hv (enc_t *enc, HV *hv)
295{ 351{
296 int count, i; 352 int count, i;
297 353
354 if (enc->indent >= enc->maxdepth)
355 croak ("data structure too deep (hit recursion limit)");
356
298 encode_ch (enc, '{'); NL; ++enc->indent; 357 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
299 358
300 if ((count = hv_iterinit (hv))) 359 if ((count = hv_iterinit (hv)))
301 { 360 {
302 // for canonical output we have to sort by keys first 361 // for canonical output we have to sort by keys first
303 // actually, this is mostly due to the stupid so-called 362 // actually, this is mostly due to the stupid so-called
304 // security workaround added somewhere in 5.8.x. 363 // security workaround added somewhere in 5.8.x.
305 // that randomises hash orderings 364 // that randomises hash orderings
306 if (enc->flags & F_CANONICAL) 365 if (enc->flags & F_CANONICAL)
307 { 366 {
308 HE *he, *hes [count]; 367 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
309 int fast = 1; 368 int fast = 1;
310 369
311 i = 0; 370 i = 0;
312 while ((he = hv_iternext (hv))) 371 while ((he = hv_iternext (hv)))
313 { 372 {
… …
338 LEAVE; 397 LEAVE;
339 } 398 }
340 399
341 for (i = 0; i < count; ++i) 400 for (i = 0; i < count; ++i)
342 { 401 {
343 INDENT; 402 encode_indent (enc);
344 encode_he (enc, hes [i]); 403 encode_he (enc, hes [i]);
345 404
346 if (i < count - 1) 405 if (i < count - 1)
347 COMMA; 406 encode_comma (enc);
348 } 407 }
349 408
350 NL; 409 encode_nl (enc);
351 } 410 }
352 else 411 else
353 { 412 {
354 SV *sv;
355 HE *he = hv_iternext (hv); 413 HE *he = hv_iternext (hv);
356 414
357 for (;;) 415 for (;;)
358 { 416 {
359 INDENT; 417 encode_indent (enc);
360 encode_he (enc, he); 418 encode_he (enc, he);
361 419
362 if (!(he = hv_iternext (hv))) 420 if (!(he = hv_iternext (hv)))
363 break; 421 break;
364 422
365 COMMA; 423 encode_comma (enc);
366 } 424 }
367 425
368 NL; 426 encode_nl (enc);
369 } 427 }
370 } 428 }
371 429
372 --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))));
373} 459}
374 460
375static void 461static void
376encode_sv (enc_t *enc, SV *sv) 462encode_sv (enc_t *enc, SV *sv)
377{ 463{
… …
398 SvIsUV(sv) 484 SvIsUV(sv)
399 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 485 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv))
400 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 486 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv));
401 } 487 }
402 else if (SvROK (sv)) 488 else if (SvROK (sv))
403 { 489 encode_rv (enc, SvRV (sv));
404 SV *rv = SvRV (sv);
405
406 if (!--enc->max_recurse)
407 croak ("data structure too deep (hit recursion limit)");
408
409 switch (SvTYPE (rv))
410 {
411 case SVt_PVAV: encode_av (enc, (AV *)rv); break;
412 case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
413
414 default:
415 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
416 SvPV_nolen (sv));
417 }
418 }
419 else if (!SvOK (sv)) 490 else if (!SvOK (sv))
420 encode_str (enc, "null", 4, 0); 491 encode_str (enc, "null", 4, 0);
421 else 492 else
422 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 493 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
423 SvPV_nolen (sv), SvFLAGS (sv)); 494 SvPV_nolen (sv), SvFLAGS (sv));
424} 495}
425 496
426static SV * 497static SV *
427encode_json (SV *scalar, UV flags) 498encode_json (SV *scalar, U32 flags)
428{ 499{
500 enc_t enc;
501
429 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 502 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
430 croak ("hash- or arrayref expected (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)");
431 504
432 enc_t enc;
433 enc.flags = flags; 505 enc.flags = flags;
434 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 506 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
435 enc.cur = SvPVX (enc.sv); 507 enc.cur = SvPVX (enc.sv);
436 enc.end = SvEND (enc.sv); 508 enc.end = SvEND (enc.sv);
437 enc.max_recurse = 0;
438 enc.indent = 0; 509 enc.indent = 0;
510 enc.maxdepth = DEC_DEPTH (flags);
439 511
440 SvPOK_only (enc.sv); 512 SvPOK_only (enc.sv);
441 encode_sv (&enc, scalar); 513 encode_sv (&enc, scalar);
442 514
443 if (!(flags & (F_ASCII | F_UTF8))) 515 if (!(flags & (F_ASCII | F_UTF8)))
… …
450 522
451 return enc.sv; 523 return enc.sv;
452} 524}
453 525
454///////////////////////////////////////////////////////////////////////////// 526/////////////////////////////////////////////////////////////////////////////
527// decoder
455 528
456#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{
457 for (;;) \ 543 for (;;)
458 { \ 544 {
459 char ch = *dec->cur; \ 545 char ch = *dec->cur;
546
460 if (ch > 0x20 \ 547 if (ch > 0x20
461 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ 548 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
462 break; \ 549 break;
550
463 ++dec->cur; \ 551 ++dec->cur;
464 } 552 }
553}
465 554
466#define ERR(reason) SB dec->err = reason; goto fail; SE 555#define ERR(reason) SB dec->err = reason; goto fail; SE
556
467#define EXPECT_CH(ch) SB \ 557#define EXPECT_CH(ch) SB \
468 if (*dec->cur != ch) \ 558 if (*dec->cur != ch) \
469 ERR (# ch " expected"); \ 559 ERR (# ch " expected"); \
470 ++dec->cur; \ 560 ++dec->cur; \
471 SE 561 SE
472 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
473static SV *decode_sv (dec_t *dec); 566static SV *decode_sv (dec_t *dec);
474 567
475static signed char decode_hexdigit[256]; 568static signed char decode_hexdigit[256];
476 569
477static UV 570static UV
478decode_4hex (dec_t *dec) 571decode_4hex (dec_t *dec)
479{ 572{
480 signed char d1, d2, d3, d4; 573 signed char d1, d2, d3, d4;
574 unsigned char *cur = (unsigned char *)dec->cur;
481 575
482 d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]];
483 if (d1 < 0) ERR ("four hexadecimal digits expected"); 576 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected");
484 d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]];
485 if (d2 < 0) ERR ("four hexadecimal digits expected"); 577 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected");
486 d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
487 if (d3 < 0) ERR ("four hexadecimal digits expected"); 578 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected");
488 d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
489 if (d4 < 0) ERR ("four hexadecimal digits expected"); 579 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected");
490 580
491 dec->cur += 4; 581 dec->cur += 4;
492 582
493 return ((UV)d1) << 12 583 return ((UV)d1) << 12
494 | ((UV)d2) << 8 584 | ((UV)d2) << 8
… …
497 587
498fail: 588fail:
499 return (UV)-1; 589 return (UV)-1;
500} 590}
501 591
502#define APPEND_GROW(n) SB \
503 if (cur + (n) >= end) \
504 { \
505 STRLEN ofs = cur - SvPVX (sv); \
506 SvGROW (sv, ofs + (n) + 1); \
507 cur = SvPVX (sv) + ofs; \
508 end = SvEND (sv); \
509 } \
510 SE
511
512#define APPEND_CH(ch) SB \
513 APPEND_GROW (1); \
514 *cur++ = (ch); \
515 SE
516
517static SV * 592static SV *
518decode_str (dec_t *dec) 593decode_str (dec_t *dec)
519{ 594{
520 SV *sv = NEWSV (0,2); 595 SV *sv = 0;
521 int utf8 = 0; 596 int utf8 = 0;
522 char *cur = SvPVX (sv);
523 char *end = SvEND (sv);
524 597
525 for (;;) 598 do
526 { 599 {
527 unsigned char ch = *(unsigned char *)dec->cur; 600 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN];
601 char *cur = buf;
528 602
529 if (ch == '"') 603 do
530 break;
531 else if (ch == '\\')
532 { 604 {
533 switch (*++dec->cur) 605 unsigned char ch = *(unsigned char *)dec->cur++;
606
607 if (ch == '"')
534 { 608 {
535 case '\\': 609 --dec->cur;
536 case '/': 610 break;
537 case '"': APPEND_CH (*dec->cur++); break; 611 }
538 612 else if (ch == '\\')
539 case 'b': APPEND_CH ('\010'); ++dec->cur; break; 613 {
540 case 't': APPEND_CH ('\011'); ++dec->cur; break; 614 switch (*dec->cur)
541 case 'n': APPEND_CH ('\012'); ++dec->cur; break;
542 case 'f': APPEND_CH ('\014'); ++dec->cur; break;
543 case 'r': APPEND_CH ('\015'); ++dec->cur; break;
544
545 case 'u':
546 { 615 {
547 UV lo, hi; 616 case '\\':
548 ++dec->cur; 617 case '/':
618 case '"': *cur++ = *dec->cur++; break;
549 619
550 hi = decode_4hex (dec); 620 case 'b': ++dec->cur; *cur++ = '\010'; break;
551 if (hi == (UV)-1) 621 case 't': ++dec->cur; *cur++ = '\011'; break;
552 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;
553 625
554 // possibly a surrogate pair 626 case 'u':
555 if (hi >= 0xd800 && hi < 0xdc00)
556 { 627 {
557 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 628 UV lo, hi;
558 ERR ("missing low surrogate character in surrogate pair");
559
560 dec->cur += 2; 629 ++dec->cur;
561 630
562 lo = decode_4hex (dec); 631 hi = decode_4hex (dec);
563 if (lo == (UV)-1) 632 if (hi == (UV)-1)
564 goto fail; 633 goto fail;
565 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
566 if (lo < 0xdc00 || lo >= 0xe000) 648 if (lo < 0xdc00 || lo >= 0xe000)
567 ERR ("surrogate pair expected"); 649 ERR ("surrogate pair expected");
568 650
569 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;
570 } 664 }
571 else if (hi >= 0xdc00 && hi < 0xe000)
572 ERR ("missing high surrogate character in surrogate pair");
573
574 if (hi >= 0x80)
575 { 665 break;
576 utf8 = 1;
577 666
578 APPEND_GROW (4); // at most 4 bytes for 21 bits
579 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
580 }
581 else 667 default:
582 APPEND_CH (hi); 668 --dec->cur;
669 ERR ("illegal backslash escape sequence in string");
583 } 670 }
584 break; 671 }
672 else if (ch >= 0x20 && ch <= 0x7f)
673 *cur++ = ch;
674 else if (ch >= 0x80)
675 {
676 STRLEN clen;
677 UV uch;
585 678
586 default:
587 --dec->cur; 679 --dec->cur;
588 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");
589 } 699 }
590 } 700 }
591 else if (ch >= 0x20 && ch <= 0x7f) 701 while (cur < buf + SHORT_STRING_LEN);
592 APPEND_CH (*dec->cur++); 702
593 else if (ch >= 0x80)
594 { 703 {
595 STRLEN clen; 704 STRLEN len = cur - buf;
596 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
597 if (clen == (STRLEN)-1)
598 ERR ("malformed UTF-8 character in JSON string");
599 705
600 APPEND_GROW (clen); 706 if (sv)
601 do
602 { 707 {
603 *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);
604 } 711 }
605 while (--clen);
606
607 utf8 = 1;
608 }
609 else if (dec->cur == dec->end)
610 ERR ("unexpected end of string while parsing json string");
611 else 712 else
612 ERR ("invalid character encountered"); 713 sv = newSVpvn (buf, len);
613 } 714 }
715 }
716 while (*dec->cur != '"');
614 717
615 ++dec->cur; 718 ++dec->cur;
616 719
617 SvCUR_set (sv, cur - SvPVX (sv)); 720 if (sv)
618 721 {
619 SvPOK_only (sv); 722 SvPOK_only (sv);
620 *SvEND (sv) = 0; 723 *SvEND (sv) = 0;
621 724
622 if (utf8) 725 if (utf8)
623 SvUTF8_on (sv); 726 SvUTF8_on (sv);
624 727 }
625 if (dec->flags & F_SHRINK) 728 else
626 shrink (sv); 729 sv = newSVpvn ("", 0);
627 730
628 return sv; 731 return sv;
629 732
630fail: 733fail:
631 SvREFCNT_dec (sv);
632 return 0; 734 return 0;
633} 735}
634 736
635static SV * 737static SV *
636decode_num (dec_t *dec) 738decode_num (dec_t *dec)
… …
717static SV * 819static SV *
718decode_av (dec_t *dec) 820decode_av (dec_t *dec)
719{ 821{
720 AV *av = newAV (); 822 AV *av = newAV ();
721 823
722 WS; 824 DEC_INC_DEPTH;
825 decode_ws (dec);
826
723 if (*dec->cur == ']') 827 if (*dec->cur == ']')
724 ++dec->cur; 828 ++dec->cur;
725 else 829 else
726 for (;;) 830 for (;;)
727 { 831 {
… …
731 if (!value) 835 if (!value)
732 goto fail; 836 goto fail;
733 837
734 av_push (av, value); 838 av_push (av, value);
735 839
736 WS; 840 decode_ws (dec);
737 841
738 if (*dec->cur == ']') 842 if (*dec->cur == ']')
739 { 843 {
740 ++dec->cur; 844 ++dec->cur;
741 break; 845 break;
… …
745 ERR (", or ] expected while parsing array"); 849 ERR (", or ] expected while parsing array");
746 850
747 ++dec->cur; 851 ++dec->cur;
748 } 852 }
749 853
854 DEC_DEC_DEPTH;
750 return newRV_noinc ((SV *)av); 855 return newRV_noinc ((SV *)av);
751 856
752fail: 857fail:
753 SvREFCNT_dec (av); 858 SvREFCNT_dec (av);
859 DEC_DEC_DEPTH;
754 return 0; 860 return 0;
755} 861}
756 862
757static SV * 863static SV *
758decode_hv (dec_t *dec) 864decode_hv (dec_t *dec)
759{ 865{
760 HV *hv = newHV (); 866 HV *hv = newHV ();
761 867
762 WS; 868 DEC_INC_DEPTH;
869 decode_ws (dec);
870
763 if (*dec->cur == '}') 871 if (*dec->cur == '}')
764 ++dec->cur; 872 ++dec->cur;
765 else 873 else
766 for (;;) 874 for (;;)
767 { 875 {
768 SV *key, *value; 876 SV *key, *value;
769 877
770 WS; EXPECT_CH ('"'); 878 decode_ws (dec); EXPECT_CH ('"');
771 879
772 key = decode_str (dec); 880 key = decode_str (dec);
773 if (!key) 881 if (!key)
774 goto fail; 882 goto fail;
775 883
776 WS; EXPECT_CH (':'); 884 decode_ws (dec); EXPECT_CH (':');
777 885
778 value = decode_sv (dec); 886 value = decode_sv (dec);
779 if (!value) 887 if (!value)
780 { 888 {
781 SvREFCNT_dec (key); 889 SvREFCNT_dec (key);
782 goto fail; 890 goto fail;
783 } 891 }
784 892
785 //TODO: optimise
786 hv_store_ent (hv, key, value, 0); 893 hv_store_ent (hv, key, value, 0);
894 SvREFCNT_dec (key);
787 895
788 WS; 896 decode_ws (dec);
789 897
790 if (*dec->cur == '}') 898 if (*dec->cur == '}')
791 { 899 {
792 ++dec->cur; 900 ++dec->cur;
793 break; 901 break;
… …
797 ERR (", or } expected while parsing object/hash"); 905 ERR (", or } expected while parsing object/hash");
798 906
799 ++dec->cur; 907 ++dec->cur;
800 } 908 }
801 909
910 DEC_DEC_DEPTH;
802 return newRV_noinc ((SV *)hv); 911 return newRV_noinc ((SV *)hv);
803 912
804fail: 913fail:
805 SvREFCNT_dec (hv); 914 SvREFCNT_dec (hv);
915 DEC_DEC_DEPTH;
806 return 0; 916 return 0;
807} 917}
808 918
809static SV * 919static SV *
810decode_sv (dec_t *dec) 920decode_sv (dec_t *dec)
811{ 921{
812 WS; 922 decode_ws (dec);
813 switch (*dec->cur) 923 switch (*dec->cur)
814 { 924 {
815 case '"': ++dec->cur; return decode_str (dec); 925 case '"': ++dec->cur; return decode_str (dec);
816 case '[': ++dec->cur; return decode_av (dec); 926 case '[': ++dec->cur; return decode_av (dec);
817 case '{': ++dec->cur; return decode_hv (dec); 927 case '{': ++dec->cur; return decode_hv (dec);
… …
853 ERR ("'null' expected"); 963 ERR ("'null' expected");
854 964
855 break; 965 break;
856 966
857 default: 967 default:
858 ERR ("malformed json string, neither array, object, number, string or atom"); 968 ERR ("malformed JSON string, neither array, object, number, string or atom");
859 break; 969 break;
860 } 970 }
861 971
862fail: 972fail:
863 return 0; 973 return 0;
864} 974}
865 975
866static SV * 976static SV *
867decode_json (SV *string, UV flags) 977decode_json (SV *string, U32 flags)
868{ 978{
979 dec_t dec;
869 SV *sv; 980 SV *sv;
981
982 SvUPGRADE (string, SVt_PV);
870 983
871 if (flags & F_UTF8) 984 if (flags & F_UTF8)
872 sv_utf8_downgrade (string, 0); 985 sv_utf8_downgrade (string, 0);
873 else 986 else
874 sv_utf8_upgrade (string); 987 sv_utf8_upgrade (string);
875 988
876 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 989 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
877 990
878 dec_t dec;
879 dec.flags = flags; 991 dec.flags = flags;
880 dec.cur = SvPVX (string); 992 dec.cur = SvPVX (string);
881 dec.end = SvEND (string); 993 dec.end = SvEND (string);
882 dec.err = 0; 994 dec.err = 0;
995 dec.depth = 0;
996 dec.maxdepth = DEC_DEPTH (dec.flags);
883 997
998 *dec.end = 0; // this should basically be a nop, too, but make sure its there
884 sv = decode_sv (&dec); 999 sv = decode_sv (&dec);
885 1000
886 if (!sv) 1001 if (!sv)
887 { 1002 {
888 IV offset = dec.flags & F_UTF8 1003 IV offset = dec.flags & F_UTF8
… …
897 SAVEVPTR (PL_curcop); 1012 SAVEVPTR (PL_curcop);
898 PL_curcop = &cop; 1013 PL_curcop = &cop;
899 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);
900 LEAVE; 1015 LEAVE;
901 1016
902 croak ("%s, at character offset %d (%s)", 1017 croak ("%s, at character offset %d [\"%s\"]",
903 dec.err, 1018 dec.err,
904 (int)offset, 1019 (int)offset,
905 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1020 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
906 } 1021 }
907 1022
… …
911 croak ("JSON text must be an object or array (but found number, string, true, false or null, 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)");
912 1027
913 return sv; 1028 return sv;
914} 1029}
915 1030
1031/////////////////////////////////////////////////////////////////////////////
1032// XS interface functions
1033
916MODULE = JSON::XS PACKAGE = JSON::XS 1034MODULE = JSON::XS PACKAGE = JSON::XS
917 1035
918BOOT: 1036BOOT:
919{ 1037{
920 int i; 1038 int i;
921 1039
922 memset (decode_hexdigit, 0xff, 256); 1040 memset (decode_hexdigit, 0xff, 256);
1041
923 for (i = 10; i--; ) 1042 for (i = 0; i < 256; ++i)
924 decode_hexdigit ['0' + i] = i; 1043 decode_hexdigit [i] =
925 1044 i >= '0' && i <= '9' ? i - '0'
926 for (i = 7; i--; ) 1045 : i >= 'a' && i <= 'f' ? i - 'a' + 10
927 { 1046 : i >= 'A' && i <= 'F' ? i - 'A' + 10
928 decode_hexdigit ['a' + i] = 10 + i; 1047 : -1;
929 decode_hexdigit ['A' + i] = 10 + i;
930 }
931 1048
932 json_stash = gv_stashpv ("JSON::XS", 1); 1049 json_stash = gv_stashpv ("JSON::XS", 1);
933} 1050}
934 1051
935PROTOTYPES: DISABLE 1052PROTOTYPES: DISABLE
… …
946 utf8 = F_UTF8 1063 utf8 = F_UTF8
947 indent = F_INDENT 1064 indent = F_INDENT
948 canonical = F_CANONICAL 1065 canonical = F_CANONICAL
949 space_before = F_SPACE_BEFORE 1066 space_before = F_SPACE_BEFORE
950 space_after = F_SPACE_AFTER 1067 space_after = F_SPACE_AFTER
951 json_rpc = F_JSON_RPC
952 pretty = F_PRETTY 1068 pretty = F_PRETTY
953 allow_nonref = F_ALLOW_NONREF 1069 allow_nonref = F_ALLOW_NONREF
954 shrink = F_SHRINK 1070 shrink = F_SHRINK
955 CODE: 1071 CODE:
956{ 1072{
… …
963 RETVAL = newSVsv (self); 1079 RETVAL = newSVsv (self);
964} 1080}
965 OUTPUT: 1081 OUTPUT:
966 RETVAL 1082 RETVAL
967 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
968void encode (SV *self, SV *scalar) 1102void encode (SV *self, SV *scalar)
969 PPCODE: 1103 PPCODE:
970 XPUSHs (encode_json (scalar, *SvJSON (self))); 1104 XPUSHs (encode_json (scalar, *SvJSON (self)));
971 1105
972void decode (SV *self, SV *jsonstr) 1106void decode (SV *self, SV *jsonstr)
… …
974 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1108 XPUSHs (decode_json (jsonstr, *SvJSON (self)));
975 1109
976PROTOTYPES: ENABLE 1110PROTOTYPES: ENABLE
977 1111
978void to_json (SV *scalar) 1112void to_json (SV *scalar)
1113 ALIAS:
1114 objToJson = 0
979 PPCODE: 1115 PPCODE:
980 XPUSHs (encode_json (scalar, F_UTF8)); 1116 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
981 1117
982void from_json (SV *jsonstr) 1118void from_json (SV *jsonstr)
1119 ALIAS:
1120 jsonToObj = 0
983 PPCODE: 1121 PPCODE:
984 XPUSHs (decode_json (jsonstr, F_UTF8)); 1122 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8));
985 1123

Diff Legend

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