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.25 by root, Fri Apr 6 20:37:22 2007 UTC vs.
Revision 1.30 by root, Wed May 9 16:10:37 2007 UTC

… …
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include "assert.h"
6#include "string.h" 6#include "string.h"
7#include "stdlib.h" 7#include "stdlib.h"
8#include "stdio.h"
9
10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif
8 13
9#define F_ASCII 0x00000001UL 14#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002UL 16#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004UL 17#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008UL 18#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010UL 19#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020UL 20#define F_SPACE_AFTER 0x00000040UL
15#define F_ALLOW_NONREF 0x00000080UL 21#define F_ALLOW_NONREF 0x00000100UL
16#define F_SHRINK 0x00000100UL 22#define F_SHRINK 0x00000200UL
17#define F_MAXDEPTH 0xf8000000UL 23#define F_MAXDEPTH 0xf8000000UL
18#define S_MAXDEPTH 27 24#define S_MAXDEPTH 27
19 25
20#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
21 27
… …
26#define F_DEFAULT (9UL << S_MAXDEPTH) 32#define F_DEFAULT (9UL << S_MAXDEPTH)
27 33
28#define INIT_SIZE 32 // initial scalar size to be allocated 34#define INIT_SIZE 32 // initial scalar size to be allocated
29#define INDENT_STEP 3 // spaces per indentation level 35#define INDENT_STEP 3 // spaces per indentation level
30 36
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 37#define SHORT_STRING_LEN 512 // special-case strings of up to this size
33 38
34#define SB do { 39#define SB do {
35#define SE } while (0) 40#define SE } while (0)
36 41
… …
104 if (enc->cur + len >= enc->end) 109 if (enc->cur + len >= enc->end)
105 { 110 {
106 STRLEN cur = enc->cur - SvPVX (enc->sv); 111 STRLEN cur = enc->cur - SvPVX (enc->sv);
107 SvGROW (enc->sv, cur + len + 1); 112 SvGROW (enc->sv, cur + len + 1);
108 enc->cur = SvPVX (enc->sv) + cur; 113 enc->cur = SvPVX (enc->sv) + cur;
109 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 114 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
110 } 115 }
111} 116}
112 117
113static void 118static void
114encode_ch (enc_t *enc, char ch) 119encode_ch (enc_t *enc, char ch)
… …
176 } 181 }
177 182
178 if (uch > 0x10FFFFUL) 183 if (uch > 0x10FFFFUL)
179 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 184 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
180 185
181 if (uch < 0x80 || enc->flags & F_ASCII) 186 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
182 { 187 {
183 if (uch > 0xFFFFUL) 188 if (uch > 0xFFFFUL)
184 { 189 {
185 need (enc, len += 11); 190 need (enc, len += 11);
186 sprintf (enc->cur, "\\u%04x\\u%04x", 191 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
200 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 205 *enc->cur++ = hexdigit [(uch >> 0) & 15];
201 } 206 }
202 207
203 str += clen; 208 str += clen;
204 } 209 }
210 else if (enc->flags & F_LATIN1)
211 {
212 *enc->cur++ = uch;
213 str += clen;
214 }
205 else if (is_utf8) 215 else if (is_utf8)
206 { 216 {
207 need (enc, len += clen); 217 need (enc, len += clen);
208 do 218 do
209 { 219 {
… …
211 } 221 }
212 while (--clen); 222 while (--clen);
213 } 223 }
214 else 224 else
215 { 225 {
216 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed 226 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
217 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 227 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
218 ++str; 228 ++str;
219 } 229 }
220 } 230 }
221 } 231 }
… …
510 enc.maxdepth = DEC_DEPTH (flags); 520 enc.maxdepth = DEC_DEPTH (flags);
511 521
512 SvPOK_only (enc.sv); 522 SvPOK_only (enc.sv);
513 encode_sv (&enc, scalar); 523 encode_sv (&enc, scalar);
514 524
525 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
526 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
527
515 if (!(flags & (F_ASCII | F_UTF8))) 528 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
516 SvUTF8_on (enc.sv); 529 SvUTF8_on (enc.sv);
517
518 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
519 530
520 if (enc.flags & F_SHRINK) 531 if (enc.flags & F_SHRINK)
521 shrink (enc.sv); 532 shrink (enc.sv);
522 533
523 return enc.sv; 534 return enc.sv;
… …
595 SV *sv = 0; 606 SV *sv = 0;
596 int utf8 = 0; 607 int utf8 = 0;
597 608
598 do 609 do
599 { 610 {
600 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN]; 611 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
601 char *cur = buf; 612 char *cur = buf;
602 613
603 do 614 do
604 { 615 {
605 unsigned char ch = *(unsigned char *)dec->cur++; 616 unsigned char ch = *(unsigned char *)dec->cur++;
… …
977decode_json (SV *string, U32 flags) 988decode_json (SV *string, U32 flags)
978{ 989{
979 dec_t dec; 990 dec_t dec;
980 SV *sv; 991 SV *sv;
981 992
993 SvGETMAGIC (string);
982 SvUPGRADE (string, SVt_PV); 994 SvUPGRADE (string, SVt_PV);
983 995
984 if (flags & F_UTF8) 996 if (flags & F_UTF8)
985 sv_utf8_downgrade (string, 0); 997 sv_utf8_downgrade (string, 0);
986 else 998 else
… …
1058 RETVAL 1070 RETVAL
1059 1071
1060SV *ascii (SV *self, int enable = 1) 1072SV *ascii (SV *self, int enable = 1)
1061 ALIAS: 1073 ALIAS:
1062 ascii = F_ASCII 1074 ascii = F_ASCII
1075 latin1 = F_LATIN1
1063 utf8 = F_UTF8 1076 utf8 = F_UTF8
1064 indent = F_INDENT 1077 indent = F_INDENT
1065 canonical = F_CANONICAL 1078 canonical = F_CANONICAL
1066 space_before = F_SPACE_BEFORE 1079 space_before = F_SPACE_BEFORE
1067 space_after = F_SPACE_AFTER 1080 space_after = F_SPACE_AFTER

Diff Legend

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