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.1 by root, Thu Mar 22 16:40:16 2007 UTC vs.
Revision 1.8 by root, Fri Mar 23 16:13:59 2007 UTC

… …
11#define F_INDENT 0x00000004 11#define F_INDENT 0x00000004
12#define F_CANONICAL 0x00000008 12#define F_CANONICAL 0x00000008
13#define F_SPACE_BEFORE 0x00000010 13#define F_SPACE_BEFORE 0x00000010
14#define F_SPACE_AFTER 0x00000020 14#define F_SPACE_AFTER 0x00000020
15#define F_JSON_RPC 0x00000040 15#define F_JSON_RPC 0x00000040
16#define F_ALLOW_NONREF 0x00000080
17#define F_SHRINK 0x00000100
16 18
19#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
17#define F_DEFAULT 0 20#define F_DEFAULT 0
18 21
19#define INIT_SIZE 32 // initial scalar size to be allocated 22#define INIT_SIZE 32 // initial scalar size to be allocated
20 23
21#define SB do { 24#define SB do {
… …
38// structure used for decoding JSON 41// structure used for decoding JSON
39typedef struct 42typedef struct
40{ 43{
41 char *cur; 44 char *cur;
42 char *end; 45 char *end;
43 char *err; 46 const char *err;
44 UV flags; 47 UV flags;
45} dec_t; 48} dec_t;
46 49
47static UV * 50static UV *
48SvJSON (SV *sv) 51SvJSON (SV *sv)
49{ 52{
50 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash)) 53 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
51 croak ("object is not of type JSON::XS"); 54 croak ("object is not of type JSON::XS");
52 55
53 return &SvUVX (SvRV (sv)); 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
54} 66}
55 67
56///////////////////////////////////////////////////////////////////////////// 68/////////////////////////////////////////////////////////////////////////////
57 69
58static void 70static void
… …
61 if (enc->cur + len >= enc->end) 73 if (enc->cur + len >= enc->end)
62 { 74 {
63 STRLEN cur = enc->cur - SvPVX (enc->sv); 75 STRLEN cur = enc->cur - SvPVX (enc->sv);
64 SvGROW (enc->sv, cur + len + 1); 76 SvGROW (enc->sv, cur + len + 1);
65 enc->cur = SvPVX (enc->sv) + cur; 77 enc->cur = SvPVX (enc->sv) + cur;
66 enc->end = SvEND (enc->sv); 78 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv);
67 } 79 }
68} 80}
69 81
70static void 82static void
71encode_ch (enc_t *enc, char ch) 83encode_ch (enc_t *enc, char ch)
… …
77static void 89static void
78encode_str (enc_t *enc, char *str, STRLEN len, int is_utf8) 90encode_str (enc_t *enc, char *str, STRLEN len, int is_utf8)
79{ 91{
80 char *end = str + len; 92 char *end = str + len;
81 93
94 need (enc, len);
95
82 while (str < end) 96 while (str < end)
83 { 97 {
84 unsigned char ch = *(unsigned char *)str; 98 unsigned char ch = *(unsigned char *)str;
99
85 if (ch >= 0x20 && ch < 0x80) // most common case 100 if (ch >= 0x20 && ch < 0x80) // most common case
86 { 101 {
102 if (ch == '"') // but with slow exceptions
103 {
104 need (enc, len += 1);
105 *enc->cur++ = '\\';
106 *enc->cur++ = '"';
107 }
108 else if (ch == '\\')
109 {
110 need (enc, len += 1);
111 *enc->cur++ = '\\';
112 *enc->cur++ = '\\';
113 }
114 else
87 *enc->cur++ = ch; 115 *enc->cur++ = ch;
116
88 str++; 117 ++str;
89 } 118 }
90 else 119 else
91 { 120 {
92 STRLEN clen; 121 switch (ch)
93 UV uch;
94
95 if (is_utf8)
96 { 122 {
97 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); 123 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
98 if (clen < 0) 124 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
99 croak ("malformed UTF-8 character in string, cannot convert to JSON"); 125 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
100 } 126 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
101 else 127 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
102 {
103 uch = ch;
104 clen = 1;
105 }
106 128
107 need (enc, len += 6); 129 default:
108
109 if (uch < 0xa0 || enc->flags & F_ASCII)
110 {
111 if (uch > 0xFFFFUL)
112 { 130 {
131 STRLEN clen;
132 UV uch;
133
134 if (is_utf8)
135 {
136 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
137 if (clen == (STRLEN)-1)
138 croak ("malformed UTF-8 character in string, cannot convert to JSON");
139 }
140 else
141 {
142 uch = ch;
113 len += 6; 143 clen = 1;
144 }
145
146 if (uch < 0x80 || enc->flags & F_ASCII)
147 {
148 if (uch > 0xFFFFUL)
149 {
114 need (enc, len += 6); 150 need (enc, len += 11);
115 sprintf (enc->cur, "\\u%04x\\u%04x", 151 sprintf (enc->cur, "\\u%04x\\u%04x",
116 (uch - 0x10000) / 0x400 + 0xD800, 152 (uch - 0x10000) / 0x400 + 0xD800,
117 (uch - 0x10000) % 0x400 + 0xDC00); 153 (uch - 0x10000) % 0x400 + 0xDC00);
118 enc->cur += 12; 154 enc->cur += 12;
155 }
156 else
157 {
158 static char hexdigit [16] = "0123456789abcdef";
159 need (enc, len += 5);
160 *enc->cur++ = '\\';
161 *enc->cur++ = 'u';
162 *enc->cur++ = hexdigit [ uch >> 12 ];
163 *enc->cur++ = hexdigit [(uch >> 8) & 15];
164 *enc->cur++ = hexdigit [(uch >> 4) & 15];
165 *enc->cur++ = hexdigit [(uch >> 0) & 15];
166 }
167
168 str += clen;
119 } 169 }
170 else if (is_utf8)
171 {
172 need (enc, len += clen);
173 do
174 {
175 *enc->cur++ = *str++;
176 }
177 while (--clen);
178 }
120 else 179 else
121 { 180 {
122 sprintf (enc->cur, "\\u%04x", uch); 181 need (enc, len += 10); // never more than 11 bytes needed
123 enc->cur += 6; 182 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
183 ++str;
184 }
124 } 185 }
125 } 186 }
126 else if (is_utf8)
127 {
128 memcpy (enc->cur, str, clen);
129 enc->cur += clen;
130 }
131 else
132 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
133
134 str += clen;
135 } 187 }
136 188
137 --len; 189 --len;
138 } 190 }
139} 191}
… …
146 for (i_ = enc->indent * 3; i_--; )\ 198 for (i_ = enc->indent * 3; i_--; )\
147 encode_ch (enc, ' '); \ 199 encode_ch (enc, ' '); \
148 } \ 200 } \
149 SE 201 SE
150 202
151#define SPACE SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, ' '); } SE 203#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE
152#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 204#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE
153#define COMMA SB \ 205#define COMMA SB \
154 encode_ch (enc, ','); \ 206 encode_ch (enc, ','); \
155 if (enc->flags & F_INDENT) \ 207 if (enc->flags & F_INDENT) \
156 NL; \ 208 NL; \
… …
190 242
191 if (HeKLEN (he) == HEf_SVKEY) 243 if (HeKLEN (he) == HEf_SVKEY)
192 { 244 {
193 SV *sv = HeSVKEY (he); 245 SV *sv = HeSVKEY (he);
194 STRLEN len; 246 STRLEN len;
247 char *str;
248
249 SvGETMAGIC (sv);
195 char *str = SvPV (sv, len); 250 str = SvPV (sv, len);
196 251
197 encode_str (enc, str, len, SvUTF8 (sv)); 252 encode_str (enc, str, len, SvUTF8 (sv));
198 } 253 }
199 else 254 else
200 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 255 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
… …
262 317
263 if (fast) 318 if (fast)
264 qsort (hes, count, sizeof (HE *), he_cmp_fast); 319 qsort (hes, count, sizeof (HE *), he_cmp_fast);
265 else 320 else
266 { 321 {
267 // hack to disable "use bytes" 322 // hack to forcefully disable "use bytes"
268 COP *oldcop = PL_curcop, cop; 323 COP cop = *PL_curcop;
269 cop.op_private = 0; 324 cop.op_private = 0;
325
326 ENTER;
327 SAVETMPS;
328
329 SAVEVPTR (PL_curcop);
270 PL_curcop = &cop; 330 PL_curcop = &cop;
271 331
272 SAVETMPS;
273 qsort (hes, count, sizeof (HE *), he_cmp_slow); 332 qsort (hes, count, sizeof (HE *), he_cmp_slow);
333
274 FREETMPS; 334 FREETMPS;
275 335 LEAVE;
276 PL_curcop = oldcop;
277 } 336 }
278 337
279 for (i = 0; i < count; ++i) 338 for (i = 0; i < count; ++i)
280 { 339 {
281 INDENT; 340 INDENT;
… …
311} 370}
312 371
313static void 372static void
314encode_sv (enc_t *enc, SV *sv) 373encode_sv (enc_t *enc, SV *sv)
315{ 374{
375 SvGETMAGIC (sv);
376
316 if (SvPOKp (sv)) 377 if (SvPOKp (sv))
317 { 378 {
318 STRLEN len; 379 STRLEN len;
319 char *str = SvPV (sv, len); 380 char *str = SvPV (sv, len);
320 encode_ch (enc, '"'); 381 encode_ch (enc, '"');
… …
358} 419}
359 420
360static SV * 421static SV *
361encode_json (SV *scalar, UV flags) 422encode_json (SV *scalar, UV flags)
362{ 423{
424 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
425 croak ("hash- or arraref required (not a simple scalar, use allow_nonref to allow this)");
426
363 enc_t enc; 427 enc_t enc;
364 enc.flags = flags; 428 enc.flags = flags;
365 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 429 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
366 enc.cur = SvPVX (enc.sv); 430 enc.cur = SvPVX (enc.sv);
367 enc.end = SvEND (enc.sv); 431 enc.end = SvEND (enc.sv);
… …
373 437
374 if (!(flags & (F_ASCII | F_UTF8))) 438 if (!(flags & (F_ASCII | F_UTF8)))
375 SvUTF8_on (enc.sv); 439 SvUTF8_on (enc.sv);
376 440
377 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 441 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
442
443 if (enc.flags & F_SHRINK)
444 shrink (enc.sv);
445
378 return enc.sv; 446 return enc.sv;
379} 447}
380 448
381///////////////////////////////////////////////////////////////////////////// 449/////////////////////////////////////////////////////////////////////////////
382 450
… …
397 ++dec->cur; \ 465 ++dec->cur; \
398 SE 466 SE
399 467
400static SV *decode_sv (dec_t *dec); 468static SV *decode_sv (dec_t *dec);
401 469
402#define APPEND_CH(ch) SB \
403 SvGROW (sv, cur + 1 + 1); \
404 SvPVX (sv)[cur++] = (ch); \
405 SE
406
407static signed char decode_hexdigit[256]; 470static signed char decode_hexdigit[256];
408 471
409static UV 472static UV
410decode_4hex (dec_t *dec) 473decode_4hex (dec_t *dec)
411{ 474{
… …
429 492
430fail: 493fail:
431 return (UV)-1; 494 return (UV)-1;
432} 495}
433 496
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
434static SV * 512static SV *
435decode_str (dec_t *dec) 513decode_str (dec_t *dec)
436{ 514{
437 SV *sv = NEWSV (0,2); 515 SV *sv = NEWSV (0,2);
438 STRLEN cur = 0;
439 int utf8 = 0; 516 int utf8 = 0;
517 char *cur = SvPVX (sv);
518 char *end = SvEND (sv);
440 519
441 for (;;) 520 for (;;)
442 { 521 {
443 unsigned char ch = *(unsigned char *)dec->cur; 522 unsigned char ch = *(unsigned char *)dec->cur;
444 523
… …
469 548
470 // possibly a surrogate pair 549 // possibly a surrogate pair
471 if (hi >= 0xd800 && hi < 0xdc00) 550 if (hi >= 0xd800 && hi < 0xdc00)
472 { 551 {
473 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 552 if (dec->cur [0] != '\\' || dec->cur [1] != 'u')
474 ERR ("illegal surrogate character"); 553 ERR ("missing low surrogate character in surrogate pair");
475 554
476 dec->cur += 2; 555 dec->cur += 2;
477 556
478 lo = decode_4hex (dec); 557 lo = decode_4hex (dec);
479 if (lo == (UV)-1) 558 if (lo == (UV)-1)
… …
482 if (lo < 0xdc00 || lo >= 0xe000) 561 if (lo < 0xdc00 || lo >= 0xe000)
483 ERR ("surrogate pair expected"); 562 ERR ("surrogate pair expected");
484 563
485 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; 564 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
486 } 565 }
487 else if (lo >= 0xdc00 && lo < 0xe000) 566 else if (hi >= 0xdc00 && hi < 0xe000)
488 ERR ("illegal surrogate character"); 567 ERR ("missing high surrogate character in surrogate pair");
489 568
490 if (hi >= 0x80) 569 if (hi >= 0x80)
491 { 570 {
492 utf8 = 1; 571 utf8 = 1;
493 572
494 SvGROW (sv, cur + 4 + 1); // at most 4 bytes for 21 bits 573 APPEND_GROW (4); // at most 4 bytes for 21 bits
495 cur = (char *)uvuni_to_utf8_flags (SvPVX (sv) + cur, hi, 0) - SvPVX (sv); 574 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
496 } 575 }
497 else 576 else
498 APPEND_CH (hi); 577 APPEND_CH (hi);
499 } 578 }
500 break; 579 break;
580
581 default:
582 --dec->cur;
583 ERR ("illegal backslash escape sequence in string");
501 } 584 }
502 } 585 }
503 else if (ch >= 0x20 && ch <= 0x7f) 586 else if (ch >= 0x20 && ch <= 0x7f)
504 APPEND_CH (*dec->cur++); 587 APPEND_CH (*dec->cur++);
505 else if (ch >= 0x80) 588 else if (ch >= 0x80)
506 { 589 {
507 STRLEN clen; 590 STRLEN clen;
508 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY); 591 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
509 if (clen < 0) 592 if (clen == (STRLEN)-1)
510 ERR ("malformed UTF-8 character in string, cannot convert to JSON"); 593 ERR ("malformed UTF-8 character in JSON string");
511 594
512 SvGROW (sv, cur + clen + 1); // at most 4 bytes for 21 bits 595 APPEND_GROW (clen);
513 memcpy (SvPVX (sv) + cur, dec->cur, clen); 596 do
514 dec->cur += clen; 597 {
598 *cur++ = *dec->cur++;
599 }
600 while (--clen);
601
602 utf8 = 1;
515 } 603 }
604 else if (dec->cur == dec->end)
605 ERR ("unexpected end of string while parsing json string");
516 else 606 else
517 ERR ("invalid character encountered"); 607 ERR ("invalid character encountered");
518 } 608 }
519 609
520 ++dec->cur; 610 ++dec->cur;
521 611
612 SvCUR_set (sv, cur - SvPVX (sv));
613
522 SvPOK_only (sv); 614 SvPOK_only (sv);
523
524 SvCUR_set (sv, cur);
525 *SvEND (sv) = 0; 615 *SvEND (sv) = 0;
526 616
527 if (utf8) 617 if (utf8)
528 SvUTF8_on (sv); 618 SvUTF8_on (sv);
619
620 if (dec->flags & F_SHRINK)
621 shrink (sv);
529 622
530 return sv; 623 return sv;
531 624
532fail: 625fail:
533 SvREFCNT_dec (sv); 626 SvREFCNT_dec (sv);
… …
548 { 641 {
549 ++dec->cur; 642 ++dec->cur;
550 if (*dec->cur >= '0' && *dec->cur <= '9') 643 if (*dec->cur >= '0' && *dec->cur <= '9')
551 ERR ("malformed number (leading zero must not be followed by another digit)"); 644 ERR ("malformed number (leading zero must not be followed by another digit)");
552 } 645 }
553 646 else if (*dec->cur < '0' || *dec->cur > '9')
554 // int 647 ERR ("malformed number (no digits after initial minus)");
648 else
649 do
650 {
651 ++dec->cur;
652 }
555 while (*dec->cur >= '0' && *dec->cur <= '9') 653 while (*dec->cur >= '0' && *dec->cur <= '9');
556 ++dec->cur;
557 654
558 // [frac] 655 // [frac]
559 if (*dec->cur == '.') 656 if (*dec->cur == '.')
560 { 657 {
561 is_nv = 1; 658 ++dec->cur;
659
660 if (*dec->cur < '0' || *dec->cur > '9')
661 ERR ("malformed number (no digits after decimal point)");
562 662
563 do 663 do
564 { 664 {
565 ++dec->cur; 665 ++dec->cur;
566 } 666 }
567 while (*dec->cur >= '0' && *dec->cur <= '9'); 667 while (*dec->cur >= '0' && *dec->cur <= '9');
668
669 is_nv = 1;
568 } 670 }
569 671
570 // [exp] 672 // [exp]
571 if (*dec->cur == 'e' || *dec->cur == 'E') 673 if (*dec->cur == 'e' || *dec->cur == 'E')
572 { 674 {
573 is_nv = 1;
574
575 ++dec->cur; 675 ++dec->cur;
676
576 if (*dec->cur == '-' || *dec->cur == '+') 677 if (*dec->cur == '-' || *dec->cur == '+')
577 ++dec->cur; 678 ++dec->cur;
578 679
680 if (*dec->cur < '0' || *dec->cur > '9')
681 ERR ("malformed number (no digits after exp sign)");
682
683 do
684 {
685 ++dec->cur;
686 }
579 while (*dec->cur >= '0' && *dec->cur <= '9') 687 while (*dec->cur >= '0' && *dec->cur <= '9');
580 ++dec->cur; 688
689 is_nv = 1;
581 } 690 }
582 691
583 if (!is_nv) 692 if (!is_nv)
584 { 693 {
585 UV uv; 694 UV uv;
… …
603static SV * 712static SV *
604decode_av (dec_t *dec) 713decode_av (dec_t *dec)
605{ 714{
606 AV *av = newAV (); 715 AV *av = newAV ();
607 716
717 WS;
718 if (*dec->cur == ']')
719 ++dec->cur;
720 else
608 for (;;) 721 for (;;)
609 { 722 {
610 SV *value; 723 SV *value;
611 724
612 value = decode_sv (dec); 725 value = decode_sv (dec);
613 if (!value) 726 if (!value)
614 goto fail; 727 goto fail;
615 728
616 av_push (av, value); 729 av_push (av, value);
617 730
618 WS; 731 WS;
619 732
620 if (*dec->cur == ']') 733 if (*dec->cur == ']')
621 { 734 {
622 ++dec->cur; 735 ++dec->cur;
623 break; 736 break;
737 }
624 } 738
625
626 if (*dec->cur != ',') 739 if (*dec->cur != ',')
627 ERR (", or ] expected while parsing array"); 740 ERR (", or ] expected while parsing array");
628 741
629 ++dec->cur; 742 ++dec->cur;
630 } 743 }
631 744
632 return newRV_noinc ((SV *)av); 745 return newRV_noinc ((SV *)av);
633 746
634fail: 747fail:
635 SvREFCNT_dec (av); 748 SvREFCNT_dec (av);
… …
639static SV * 752static SV *
640decode_hv (dec_t *dec) 753decode_hv (dec_t *dec)
641{ 754{
642 HV *hv = newHV (); 755 HV *hv = newHV ();
643 756
757 WS;
758 if (*dec->cur == '}')
759 ++dec->cur;
760 else
644 for (;;) 761 for (;;)
645 { 762 {
646 SV *key, *value; 763 SV *key, *value;
647 764
648 WS; EXPECT_CH ('"'); 765 WS; EXPECT_CH ('"');
649 766
650 key = decode_str (dec); 767 key = decode_str (dec);
651 if (!key) 768 if (!key)
652 goto fail;
653
654 WS; EXPECT_CH (':');
655
656 value = decode_sv (dec);
657 if (!value)
658 {
659 SvREFCNT_dec (key);
660 goto fail; 769 goto fail;
770
771 WS; EXPECT_CH (':');
772
773 value = decode_sv (dec);
774 if (!value)
775 {
776 SvREFCNT_dec (key);
777 goto fail;
661 } 778 }
662 779
663 //TODO: optimise 780 //TODO: optimise
664 hv_store_ent (hv, key, value, 0); 781 hv_store_ent (hv, key, value, 0);
665 782
666 WS; 783 WS;
667 784
668 if (*dec->cur == '}') 785 if (*dec->cur == '}')
669 { 786 {
670 ++dec->cur; 787 ++dec->cur;
671 break; 788 break;
672 } 789 }
673 790
674 if (*dec->cur != ',') 791 if (*dec->cur != ',')
675 ERR (", or } expected while parsing object/hash"); 792 ERR (", or } expected while parsing object/hash");
676 793
677 ++dec->cur; 794 ++dec->cur;
678 } 795 }
679 796
680 return newRV_noinc ((SV *)hv); 797 return newRV_noinc ((SV *)hv);
681 798
682fail: 799fail:
683 SvREFCNT_dec (hv); 800 SvREFCNT_dec (hv);
… …
723 840
724 case 'n': 841 case 'n':
725 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 842 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
726 { 843 {
727 dec->cur += 4; 844 dec->cur += 4;
728 return newSViv (1); 845 return newSVsv (&PL_sv_undef);
729 } 846 }
730 else 847 else
731 ERR ("'null' expected"); 848 ERR ("'null' expected");
732 849
733 break; 850 break;
734 851
735 default: 852 default:
736 ERR ("malformed json string"); 853 ERR ("malformed json string, neither array, object, number, string or atom");
737 break; 854 break;
738 } 855 }
739 856
740fail: 857fail:
741 return 0; 858 return 0;
… …
744static SV * 861static SV *
745decode_json (SV *string, UV flags) 862decode_json (SV *string, UV flags)
746{ 863{
747 SV *sv; 864 SV *sv;
748 865
749 if (!(flags & F_UTF8)) 866 if (flags & F_UTF8)
867 sv_utf8_downgrade (string, 0);
868 else
750 sv_utf8_upgrade (string); 869 sv_utf8_upgrade (string);
751 870
752 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 871 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
753 872
754 dec_t dec; 873 dec_t dec;
755 dec.flags = flags; 874 dec.flags = flags;
756 dec.cur = SvPVX (string); 875 dec.cur = SvPVX (string);
757 dec.end = SvEND (string); 876 dec.end = SvEND (string);
758 dec.err = 0; 877 dec.err = 0;
759 878
760 *dec.end = 1; // invalid anywhere
761 sv = decode_sv (&dec); 879 sv = decode_sv (&dec);
762 *dec.end = 0;
763 880
764 if (!sv) 881 if (!sv)
765 { 882 {
883 IV offset = dec.flags & F_UTF8
884 ? dec.cur - SvPVX (string)
766 IV offset = utf8_distance (dec.cur, SvPVX (string)); 885 : utf8_distance (dec.cur, SvPVX (string));
767 SV *uni = sv_newmortal (); 886 SV *uni = sv_newmortal ();
768 887
888 // horrible hack to silence warning inside pv_uni_display
889 COP cop = *PL_curcop;
890 cop.cop_warnings = pWARN_NONE;
891 ENTER;
892 SAVEVPTR (PL_curcop);
893 PL_curcop = &cop;
769 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 894 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
895 LEAVE;
896
770 croak ("%s, at character %d (%s)", 897 croak ("%s, at character offset %d (%s)",
771 dec.err, 898 dec.err,
772 (int)offset, 899 (int)offset,
773 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 900 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
774 } 901 }
775 902
776 sv_dump (sv);//D
777 return sv_2mortal (sv); 903 sv = sv_2mortal (sv);
904
905 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)");
907
908 return sv;
778} 909}
779 910
780MODULE = JSON::XS PACKAGE = JSON::XS 911MODULE = JSON::XS PACKAGE = JSON::XS
781 912
782BOOT: 913BOOT:
… …
785 916
786 memset (decode_hexdigit, 0xff, 256); 917 memset (decode_hexdigit, 0xff, 256);
787 for (i = 10; i--; ) 918 for (i = 10; i--; )
788 decode_hexdigit ['0' + i] = i; 919 decode_hexdigit ['0' + i] = i;
789 920
790 for (i = 6; --i; ) 921 for (i = 7; i--; )
791 { 922 {
792 decode_hexdigit ['a' + i] = 10 + i; 923 decode_hexdigit ['a' + i] = 10 + i;
793 decode_hexdigit ['A' + i] = 10 + i; 924 decode_hexdigit ['A' + i] = 10 + i;
794 } 925 }
795 926
796 json_stash = gv_stashpv ("JSON::XS", 1); 927 json_stash = gv_stashpv ("JSON::XS", 1);
797} 928}
929
930PROTOTYPES: DISABLE
798 931
799SV *new (char *dummy) 932SV *new (char *dummy)
800 CODE: 933 CODE:
801 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 934 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);
802 OUTPUT: 935 OUTPUT:
803 RETVAL 936 RETVAL
804 937
805SV *ascii (SV *self, int enable) 938SV *ascii (SV *self, int enable = 1)
806 ALIAS: 939 ALIAS:
807 ascii = F_ASCII 940 ascii = F_ASCII
808 utf8 = F_UTF8 941 utf8 = F_UTF8
809 indent = F_INDENT 942 indent = F_INDENT
810 canonical = F_CANONICAL 943 canonical = F_CANONICAL
811 space_before = F_SPACE_BEFORE 944 space_before = F_SPACE_BEFORE
812 space_after = F_SPACE_AFTER 945 space_after = F_SPACE_AFTER
813 json_rpc = F_JSON_RPC 946 json_rpc = F_JSON_RPC
947 pretty = F_PRETTY
948 allow_nonref = F_ALLOW_NONREF
949 shrink = F_SHRINK
814 CODE: 950 CODE:
815{ 951{
816 UV *uv = SvJSON (self); 952 UV *uv = SvJSON (self);
817 if (enable) 953 if (enable)
818 *uv |= ix; 954 *uv |= ix;
… …
826 962
827void encode (SV *self, SV *scalar) 963void encode (SV *self, SV *scalar)
828 PPCODE: 964 PPCODE:
829 XPUSHs (encode_json (scalar, *SvJSON (self))); 965 XPUSHs (encode_json (scalar, *SvJSON (self)));
830 966
831void decode (SV *self, SV *jsondata) 967void decode (SV *self, SV *jsonstr)
832 PPCODE: 968 PPCODE:
833 XPUSHs (decode_json (jsondata, *SvJSON (self))); 969 XPUSHs (decode_json (jsonstr, *SvJSON (self)));
834 970
971PROTOTYPES: ENABLE
972
973void to_json (SV *scalar)
974 PPCODE:
975 XPUSHs (encode_json (scalar, F_UTF8));
976
977void from_json (SV *jsonstr)
978 PPCODE:
979 XPUSHs (decode_json (jsonstr, F_UTF8));
980

Diff Legend

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