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.2 by root, Thu Mar 22 17:28:50 2007 UTC vs.
Revision 1.4 by root, Thu Mar 22 21:13:58 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
16 17
17#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 18#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
18#define F_DEFAULT 0 19#define F_DEFAULT 0
19 20
20#define INIT_SIZE 32 // initial scalar size to be allocated 21#define INIT_SIZE 32 // initial scalar size to be allocated
… …
39// structure used for decoding JSON 40// structure used for decoding JSON
40typedef struct 41typedef struct
41{ 42{
42 char *cur; 43 char *cur;
43 char *end; 44 char *end;
44 char *err; 45 const char *err;
45 UV flags; 46 UV flags;
46} dec_t; 47} dec_t;
47 48
48static UV * 49static UV *
49SvJSON (SV *sv) 50SvJSON (SV *sv)
… …
62 if (enc->cur + len >= enc->end) 63 if (enc->cur + len >= enc->end)
63 { 64 {
64 STRLEN cur = enc->cur - SvPVX (enc->sv); 65 STRLEN cur = enc->cur - SvPVX (enc->sv);
65 SvGROW (enc->sv, cur + len + 1); 66 SvGROW (enc->sv, cur + len + 1);
66 enc->cur = SvPVX (enc->sv) + cur; 67 enc->cur = SvPVX (enc->sv) + cur;
67 enc->end = SvEND (enc->sv); 68 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv);
68 } 69 }
69} 70}
70 71
71static void 72static void
72encode_ch (enc_t *enc, char ch) 73encode_ch (enc_t *enc, char ch)
… …
78static void 79static void
79encode_str (enc_t *enc, char *str, STRLEN len, int is_utf8) 80encode_str (enc_t *enc, char *str, STRLEN len, int is_utf8)
80{ 81{
81 char *end = str + len; 82 char *end = str + len;
82 83
84 need (enc, len);
85
83 while (str < end) 86 while (str < end)
84 { 87 {
85 unsigned char ch = *(unsigned char *)str; 88 unsigned char ch = *(unsigned char *)str;
89
90 if (ch == '"')
91 {
92 need (enc, len += 1);
93 *enc->cur++ = '\\';
94 *enc->cur++ = '"';
95 ++str;
96 }
97 else if (ch == '\\')
98 {
99 need (enc, len += 1);
100 *enc->cur++ = '\\';
101 *enc->cur++ = '\\';
102 ++str;
103 }
86 if (ch >= 0x20 && ch < 0x80) // most common case 104 else if (ch >= 0x20 && ch < 0x80) // most common case
87 { 105 {
88 *enc->cur++ = ch; 106 *enc->cur++ = ch;
89 str++; 107 ++str;
108 }
109 else if (ch == '\015')
110 {
111 need (enc, len += 1);
112 *enc->cur++ = '\\';
113 *enc->cur++ = 'r';
114 ++str;
115 }
116 else if (ch == '\012')
117 {
118 need (enc, len += 1);
119 *enc->cur++ = '\\';
120 *enc->cur++ = 'n';
121 ++str;
90 } 122 }
91 else 123 else
92 { 124 {
93 STRLEN clen; 125 STRLEN clen;
94 UV uch; 126 UV uch;
… …
103 { 135 {
104 uch = ch; 136 uch = ch;
105 clen = 1; 137 clen = 1;
106 } 138 }
107 139
108 need (enc, len += 6);
109
110 if (uch < 0xa0 || enc->flags & F_ASCII) 140 if (uch < 0x80 || enc->flags & F_ASCII)
111 { 141 {
112 if (uch > 0xFFFFUL) 142 if (uch > 0xFFFFUL)
113 { 143 {
114 len += 6;
115 need (enc, len += 6); 144 need (enc, len += 11);
116 sprintf (enc->cur, "\\u%04x\\u%04x", 145 sprintf (enc->cur, "\\u%04x\\u%04x",
117 (uch - 0x10000) / 0x400 + 0xD800, 146 (uch - 0x10000) / 0x400 + 0xD800,
118 (uch - 0x10000) % 0x400 + 0xDC00); 147 (uch - 0x10000) % 0x400 + 0xDC00);
119 enc->cur += 12; 148 enc->cur += 12;
120 } 149 }
121 else 150 else
122 { 151 {
123 sprintf (enc->cur, "\\u%04x", uch); 152 static char hexdigit [16] = "0123456789abcdef";
153 need (enc, len += 5);
154 *enc->cur++ = '\\';
124 enc->cur += 6; 155 *enc->cur++ = 'u';
156 *enc->cur++ = hexdigit [ uch >> 12 ];
157 *enc->cur++ = hexdigit [(uch >> 8) & 15];
158 *enc->cur++ = hexdigit [(uch >> 4) & 15];
159 *enc->cur++ = hexdigit [(uch >> 0) & 15];
125 } 160 }
161
162 str += clen;
126 } 163 }
127 else if (is_utf8) 164 else if (is_utf8)
128 { 165 {
129 memcpy (enc->cur, str, clen); 166 need (enc, len += clen);
167 while (clen--)
130 enc->cur += clen; 168 *enc->cur++ = *str++;
131 } 169 }
132 else 170 else
171 {
172 need (enc, 10); // never more than 11 bytes needed
133 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 173 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
134 174 ++str;
135 str += clen; 175 }
136 } 176 }
137 177
138 --len; 178 --len;
139 } 179 }
140} 180}
… …
191 231
192 if (HeKLEN (he) == HEf_SVKEY) 232 if (HeKLEN (he) == HEf_SVKEY)
193 { 233 {
194 SV *sv = HeSVKEY (he); 234 SV *sv = HeSVKEY (he);
195 STRLEN len; 235 STRLEN len;
236 char *str;
237
238 SvGETMAGIC (sv);
196 char *str = SvPV (sv, len); 239 str = SvPV (sv, len);
197 240
198 encode_str (enc, str, len, SvUTF8 (sv)); 241 encode_str (enc, str, len, SvUTF8 (sv));
199 } 242 }
200 else 243 else
201 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 244 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
… …
312} 355}
313 356
314static void 357static void
315encode_sv (enc_t *enc, SV *sv) 358encode_sv (enc_t *enc, SV *sv)
316{ 359{
360 SvGETMAGIC (sv);
361
317 if (SvPOKp (sv)) 362 if (SvPOKp (sv))
318 { 363 {
319 STRLEN len; 364 STRLEN len;
320 char *str = SvPV (sv, len); 365 char *str = SvPV (sv, len);
321 encode_ch (enc, '"'); 366 encode_ch (enc, '"');
… …
359} 404}
360 405
361static SV * 406static SV *
362encode_json (SV *scalar, UV flags) 407encode_json (SV *scalar, UV flags)
363{ 408{
409 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
410 croak ("hash- or arraref required (not a simple scalar, use allow_nonref to allow this)");
411
364 enc_t enc; 412 enc_t enc;
365 enc.flags = flags; 413 enc.flags = flags;
366 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 414 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
367 enc.cur = SvPVX (enc.sv); 415 enc.cur = SvPVX (enc.sv);
368 enc.end = SvEND (enc.sv); 416 enc.end = SvEND (enc.sv);
… …
398 ++dec->cur; \ 446 ++dec->cur; \
399 SE 447 SE
400 448
401static SV *decode_sv (dec_t *dec); 449static SV *decode_sv (dec_t *dec);
402 450
403#define APPEND_CH(ch) SB \
404 SvGROW (sv, cur + 1 + 1); \
405 SvPVX (sv)[cur++] = (ch); \
406 SE
407
408static signed char decode_hexdigit[256]; 451static signed char decode_hexdigit[256];
409 452
410static UV 453static UV
411decode_4hex (dec_t *dec) 454decode_4hex (dec_t *dec)
412{ 455{
… …
430 473
431fail: 474fail:
432 return (UV)-1; 475 return (UV)-1;
433} 476}
434 477
478#define APPEND_GROW(n) SB \
479 if (cur + (n) >= end) \
480 { \
481 STRLEN ofs = cur - SvPVX (sv); \
482 SvGROW (sv, ofs + (n) + 1); \
483 cur = SvPVX (sv) + ofs; \
484 end = SvEND (sv); \
485 } \
486 SE
487
488#define APPEND_CH(ch) SB \
489 APPEND_GROW (1); \
490 *cur++ = (ch); \
491 SE
492
435static SV * 493static SV *
436decode_str (dec_t *dec) 494decode_str (dec_t *dec)
437{ 495{
438 SV *sv = NEWSV (0,2); 496 SV *sv = NEWSV (0,2);
439 STRLEN cur = 0;
440 int utf8 = 0; 497 int utf8 = 0;
498 char *cur = SvPVX (sv);
499 char *end = SvEND (sv);
441 500
442 for (;;) 501 for (;;)
443 { 502 {
444 unsigned char ch = *(unsigned char *)dec->cur; 503 unsigned char ch = *(unsigned char *)dec->cur;
445 504
… …
490 549
491 if (hi >= 0x80) 550 if (hi >= 0x80)
492 { 551 {
493 utf8 = 1; 552 utf8 = 1;
494 553
495 SvGROW (sv, cur + 4 + 1); // at most 4 bytes for 21 bits 554 APPEND_GROW (4); // at most 4 bytes for 21 bits
496 cur = (char *)uvuni_to_utf8_flags (SvPVX (sv) + cur, hi, 0) - SvPVX (sv); 555 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
497 } 556 }
498 else 557 else
499 APPEND_CH (hi); 558 APPEND_CH (hi);
500 } 559 }
501 break; 560 break;
… …
508 STRLEN clen; 567 STRLEN clen;
509 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY); 568 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
510 if (clen < 0) 569 if (clen < 0)
511 ERR ("malformed UTF-8 character in string, cannot convert to JSON"); 570 ERR ("malformed UTF-8 character in string, cannot convert to JSON");
512 571
513 SvGROW (sv, cur + clen + 1); // at most 4 bytes for 21 bits 572 APPEND_GROW (clen);
514 memcpy (SvPVX (sv) + cur, dec->cur, clen); 573 memcpy (cur, dec->cur, clen);
574 cur += clen;
515 dec->cur += clen; 575 dec->cur += clen;
516 } 576 }
517 else 577 else
518 ERR ("invalid character encountered"); 578 ERR ("invalid character encountered");
519 } 579 }
520 580
521 ++dec->cur; 581 ++dec->cur;
522 582
583 SvCUR_set (sv, cur - SvPVX (sv));
584
523 SvPOK_only (sv); 585 SvPOK_only (sv);
524
525 SvCUR_set (sv, cur);
526 *SvEND (sv) = 0; 586 *SvEND (sv) = 0;
527 587
528 if (utf8) 588 if (utf8)
529 SvUTF8_on (sv); 589 SvUTF8_on (sv);
530 590
… …
772 dec.err, 832 dec.err,
773 (int)offset, 833 (int)offset,
774 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 834 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
775 } 835 }
776 836
777 sv_dump (sv);//D
778 return sv_2mortal (sv); 837 sv = sv_2mortal (sv);
838
839 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv))
840 croak ("JSON object or array expected (but number, string, true, false or null found, use allow_nonref to allow this)");
841
842 return sv;
779} 843}
780 844
781MODULE = JSON::XS PACKAGE = JSON::XS 845MODULE = JSON::XS PACKAGE = JSON::XS
782 846
783BOOT: 847BOOT:
… …
786 850
787 memset (decode_hexdigit, 0xff, 256); 851 memset (decode_hexdigit, 0xff, 256);
788 for (i = 10; i--; ) 852 for (i = 10; i--; )
789 decode_hexdigit ['0' + i] = i; 853 decode_hexdigit ['0' + i] = i;
790 854
791 for (i = 6; --i; ) 855 for (i = 7; i--; )
792 { 856 {
793 decode_hexdigit ['a' + i] = 10 + i; 857 decode_hexdigit ['a' + i] = 10 + i;
794 decode_hexdigit ['A' + i] = 10 + i; 858 decode_hexdigit ['A' + i] = 10 + i;
795 } 859 }
796 860
797 json_stash = gv_stashpv ("JSON::XS", 1); 861 json_stash = gv_stashpv ("JSON::XS", 1);
798} 862}
863
864PROTOTYPES: DISABLE
799 865
800SV *new (char *dummy) 866SV *new (char *dummy)
801 CODE: 867 CODE:
802 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 868 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash);
803 OUTPUT: 869 OUTPUT:
… …
811 canonical = F_CANONICAL 877 canonical = F_CANONICAL
812 space_before = F_SPACE_BEFORE 878 space_before = F_SPACE_BEFORE
813 space_after = F_SPACE_AFTER 879 space_after = F_SPACE_AFTER
814 json_rpc = F_JSON_RPC 880 json_rpc = F_JSON_RPC
815 pretty = F_PRETTY 881 pretty = F_PRETTY
882 allow_nonref = F_ALLOW_NONREF
816 CODE: 883 CODE:
817{ 884{
818 UV *uv = SvJSON (self); 885 UV *uv = SvJSON (self);
819 if (enable) 886 if (enable)
820 *uv |= ix; 887 *uv |= ix;
… …
832 899
833void decode (SV *self, SV *jsonstr) 900void decode (SV *self, SV *jsonstr)
834 PPCODE: 901 PPCODE:
835 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 902 XPUSHs (decode_json (jsonstr, *SvJSON (self)));
836 903
904PROTOTYPES: ENABLE
905
837void to_json (SV *scalar) 906void to_json (SV *scalar)
838 PPCODE: 907 PPCODE:
839 XPUSHs (encode_json (scalar, F_UTF8)); 908 XPUSHs (encode_json (scalar, F_UTF8));
840 909
841void from_json (SV *jsonstr) 910void from_json (SV *jsonstr)

Diff Legend

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