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.26 by root, Fri Apr 6 21:17:09 2007 UTC vs.
Revision 1.51 by root, Mon Jul 2 00:48:18 2007 UTC

… …
9 9
10#if defined(__BORLANDC__) || defined(_MSC_VER) 10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 12#endif
13 13
14// some old perls do not have this, try to make it work, no
15// guarentees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13
18#endif
19
14#define F_ASCII 0x00000001UL 20#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL
15#define F_UTF8 0x00000002UL 22#define F_UTF8 0x00000004UL
16#define F_INDENT 0x00000004UL 23#define F_INDENT 0x00000008UL
17#define F_CANONICAL 0x00000008UL 24#define F_CANONICAL 0x00000010UL
18#define F_SPACE_BEFORE 0x00000010UL 25#define F_SPACE_BEFORE 0x00000020UL
19#define F_SPACE_AFTER 0x00000020UL 26#define F_SPACE_AFTER 0x00000040UL
20#define F_ALLOW_NONREF 0x00000080UL 27#define F_ALLOW_NONREF 0x00000100UL
21#define F_SHRINK 0x00000100UL 28#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL
22#define F_MAXDEPTH 0xf8000000UL 31#define F_MAXDEPTH 0xf8000000UL
23#define S_MAXDEPTH 27 32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20
35#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
24 36
25#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
26 38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
27// F_SELFCONVERT? <=> to_json/toJson
28// F_BLESSED? <=> { $__class__$ => }
29 39
30#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
31#define F_DEFAULT (9UL << S_MAXDEPTH) 41#define F_DEFAULT (9UL << S_MAXDEPTH)
32 42
33#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
34#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
35 45
36#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
37#define SHORT_STRING_LEN 512 // special-case strings of up to this size 46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
38 47
39#define SB do { 48#define SB do {
40#define SE } while (0) 49#define SE } while (0)
41 50
51#if __GNUC__ >= 3
52# define expect(expr,value) __builtin_expect ((expr),(value))
53# define inline inline
54#else
55# define expect(expr,value) (expr)
56# define inline static
57#endif
58
59#define expect_false(expr) expect ((expr) != 0, 0)
60#define expect_true(expr) expect ((expr) != 0, 1)
61
42static HV *json_stash; // JSON::XS:: 62static HV *json_stash, *json_boolean_stash; // JSON::XS::
63static SV *json_true, *json_false;
64
65typedef struct {
66 U32 flags;
67 SV *cb_object, *cb_sk_object;
68} JSON;
43 69
44///////////////////////////////////////////////////////////////////////////// 70/////////////////////////////////////////////////////////////////////////////
45// utility functions 71// utility functions
46 72
47static UV * 73inline void
48SvJSON (SV *sv)
49{
50 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
51 croak ("object is not of type JSON::XS");
52
53 return &SvUVX (SvRV (sv));
54}
55
56static void
57shrink (SV *sv) 74shrink (SV *sv)
58{ 75{
59 sv_utf8_downgrade (sv, 1); 76 sv_utf8_downgrade (sv, 1);
60 if (SvLEN (sv) > SvCUR (sv) + 1) 77 if (SvLEN (sv) > SvCUR (sv) + 1)
61 { 78 {
… …
70// decode an utf-8 character and return it, or (UV)-1 in 87// decode an utf-8 character and return it, or (UV)-1 in
71// case of an error. 88// case of an error.
72// we special-case "safe" characters from U+80 .. U+7FF, 89// we special-case "safe" characters from U+80 .. U+7FF,
73// but use the very good perl function to parse anything else. 90// but use the very good perl function to parse anything else.
74// note that we never call this function for a ascii codepoints 91// note that we never call this function for a ascii codepoints
75static UV 92inline UV
76decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 93decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
77{ 94{
78 if (s[0] > 0xdf || s[0] < 0xc2) 95 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
79 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 96 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
80 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 97 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
81 { 98 {
82 *clen = 2; 99 *clen = 2;
83 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 100 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
… …
96typedef struct 113typedef struct
97{ 114{
98 char *cur; // SvPVX (sv) + current output position 115 char *cur; // SvPVX (sv) + current output position
99 char *end; // SvEND (sv) 116 char *end; // SvEND (sv)
100 SV *sv; // result scalar 117 SV *sv; // result scalar
101 U32 flags; // F_* 118 JSON json;
102 U32 indent; // indentation level 119 U32 indent; // indentation level
103 U32 maxdepth; // max. indentation/recursion level 120 U32 maxdepth; // max. indentation/recursion level
104} enc_t; 121} enc_t;
105 122
106static void 123inline void
107need (enc_t *enc, STRLEN len) 124need (enc_t *enc, STRLEN len)
108{ 125{
109 if (enc->cur + len >= enc->end) 126 if (expect_false (enc->cur + len >= enc->end))
110 { 127 {
111 STRLEN cur = enc->cur - SvPVX (enc->sv); 128 STRLEN cur = enc->cur - SvPVX (enc->sv);
112 SvGROW (enc->sv, cur + len + 1); 129 SvGROW (enc->sv, cur + len + 1);
113 enc->cur = SvPVX (enc->sv) + cur; 130 enc->cur = SvPVX (enc->sv) + cur;
114 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 131 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
115 } 132 }
116} 133}
117 134
118static void 135inline void
119encode_ch (enc_t *enc, char ch) 136encode_ch (enc_t *enc, char ch)
120{ 137{
121 need (enc, 1); 138 need (enc, 1);
122 *enc->cur++ = ch; 139 *enc->cur++ = ch;
123} 140}
… …
131 148
132 while (str < end) 149 while (str < end)
133 { 150 {
134 unsigned char ch = *(unsigned char *)str; 151 unsigned char ch = *(unsigned char *)str;
135 152
136 if (ch >= 0x20 && ch < 0x80) // most common case 153 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
137 { 154 {
138 if (ch == '"') // but with slow exceptions 155 if (expect_false (ch == '"')) // but with slow exceptions
139 { 156 {
140 need (enc, len += 1); 157 need (enc, len += 1);
141 *enc->cur++ = '\\'; 158 *enc->cur++ = '\\';
142 *enc->cur++ = '"'; 159 *enc->cur++ = '"';
143 } 160 }
144 else if (ch == '\\') 161 else if (expect_false (ch == '\\'))
145 { 162 {
146 need (enc, len += 1); 163 need (enc, len += 1);
147 *enc->cur++ = '\\'; 164 *enc->cur++ = '\\';
148 *enc->cur++ = '\\'; 165 *enc->cur++ = '\\';
149 } 166 }
… …
167 STRLEN clen; 184 STRLEN clen;
168 UV uch; 185 UV uch;
169 186
170 if (is_utf8) 187 if (is_utf8)
171 { 188 {
172 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
173 uch = decode_utf8 (str, end - str, &clen); 189 uch = decode_utf8 (str, end - str, &clen);
174 if (clen == (STRLEN)-1) 190 if (clen == (STRLEN)-1)
175 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 191 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
176 } 192 }
177 else 193 else
… …
181 } 197 }
182 198
183 if (uch > 0x10FFFFUL) 199 if (uch > 0x10FFFFUL)
184 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 200 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
185 201
186 if (uch < 0x80 || enc->flags & F_ASCII) 202 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
187 { 203 {
188 if (uch > 0xFFFFUL) 204 if (uch > 0xFFFFUL)
189 { 205 {
190 need (enc, len += 11); 206 need (enc, len += 11);
191 sprintf (enc->cur, "\\u%04x\\u%04x", 207 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
205 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 221 *enc->cur++ = hexdigit [(uch >> 0) & 15];
206 } 222 }
207 223
208 str += clen; 224 str += clen;
209 } 225 }
226 else if (enc->json.flags & F_LATIN1)
227 {
228 *enc->cur++ = uch;
229 str += clen;
230 }
210 else if (is_utf8) 231 else if (is_utf8)
211 { 232 {
212 need (enc, len += clen); 233 need (enc, len += clen);
213 do 234 do
214 { 235 {
… …
216 } 237 }
217 while (--clen); 238 while (--clen);
218 } 239 }
219 else 240 else
220 { 241 {
221 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed 242 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
222 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 243 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
223 ++str; 244 ++str;
224 } 245 }
225 } 246 }
226 } 247 }
… …
228 249
229 --len; 250 --len;
230 } 251 }
231} 252}
232 253
233static void 254inline void
234encode_indent (enc_t *enc) 255encode_indent (enc_t *enc)
235{ 256{
236 if (enc->flags & F_INDENT) 257 if (enc->json.flags & F_INDENT)
237 { 258 {
238 int spaces = enc->indent * INDENT_STEP; 259 int spaces = enc->indent * INDENT_STEP;
239 260
240 need (enc, spaces); 261 need (enc, spaces);
241 memset (enc->cur, ' ', spaces); 262 memset (enc->cur, ' ', spaces);
242 enc->cur += spaces; 263 enc->cur += spaces;
243 } 264 }
244} 265}
245 266
246static void 267inline void
247encode_space (enc_t *enc) 268encode_space (enc_t *enc)
248{ 269{
249 need (enc, 1); 270 need (enc, 1);
250 encode_ch (enc, ' '); 271 encode_ch (enc, ' ');
251} 272}
252 273
253static void 274inline void
254encode_nl (enc_t *enc) 275encode_nl (enc_t *enc)
255{ 276{
256 if (enc->flags & F_INDENT) 277 if (enc->json.flags & F_INDENT)
257 { 278 {
258 need (enc, 1); 279 need (enc, 1);
259 encode_ch (enc, '\n'); 280 encode_ch (enc, '\n');
260 } 281 }
261} 282}
262 283
263static void 284inline void
264encode_comma (enc_t *enc) 285encode_comma (enc_t *enc)
265{ 286{
266 encode_ch (enc, ','); 287 encode_ch (enc, ',');
267 288
268 if (enc->flags & F_INDENT) 289 if (enc->json.flags & F_INDENT)
269 encode_nl (enc); 290 encode_nl (enc);
270 else if (enc->flags & F_SPACE_AFTER) 291 else if (enc->json.flags & F_SPACE_AFTER)
271 encode_space (enc); 292 encode_space (enc);
272} 293}
273 294
274static void encode_sv (enc_t *enc, SV *sv); 295static void encode_sv (enc_t *enc, SV *sv);
275 296
… …
318 else 339 else
319 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 340 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
320 341
321 encode_ch (enc, '"'); 342 encode_ch (enc, '"');
322 343
323 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 344 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
324 encode_ch (enc, ':'); 345 encode_ch (enc, ':');
325 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 346 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
326 encode_sv (enc, HeVAL (he)); 347 encode_sv (enc, HeVAL (he));
327} 348}
328 349
329// compare hash entries, used when all keys are bytestrings 350// compare hash entries, used when all keys are bytestrings
330static int 351static int
… …
365 { 386 {
366 // for canonical output we have to sort by keys first 387 // for canonical output we have to sort by keys first
367 // actually, this is mostly due to the stupid so-called 388 // actually, this is mostly due to the stupid so-called
368 // security workaround added somewhere in 5.8.x. 389 // security workaround added somewhere in 5.8.x.
369 // that randomises hash orderings 390 // that randomises hash orderings
370 if (enc->flags & F_CANONICAL) 391 if (enc->json.flags & F_CANONICAL)
371 { 392 {
372 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
373 int fast = 1; 393 int fast = 1;
394 HE *he;
395#if defined(__BORLANDC__) || defined(_MSC_VER)
396 HE **hes = _alloca (count * sizeof (HE));
397#else
398 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
399#endif
374 400
375 i = 0; 401 i = 0;
376 while ((he = hv_iternext (hv))) 402 while ((he = hv_iternext (hv)))
377 { 403 {
378 hes [i++] = he; 404 hes [i++] = he;
… …
442 svtype svt; 468 svtype svt;
443 469
444 SvGETMAGIC (sv); 470 SvGETMAGIC (sv);
445 svt = SvTYPE (sv); 471 svt = SvTYPE (sv);
446 472
473 if (expect_false (SvOBJECT (sv)))
474 {
475 if (SvSTASH (sv) == json_boolean_stash)
476 {
477 if (SvIV (sv))
478 encode_str (enc, "true", 4, 0);
479 else
480 encode_str (enc, "false", 5, 0);
481 }
482 else
483 {
484#if 0
485 if (0 && sv_derived_from (rv, "JSON::Literal"))
486 {
487 // not yet
488 }
489#endif
490 if (enc->json.flags & F_CONV_BLESSED)
491 {
492 // we re-bless the reference to get overload and other niceties right
493 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
494
495 if (to_json)
496 {
497 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
498 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499
500 // calling with G_SCALAR ensures that we always get a 1 reutrn value
501 // check anyways.
502 PUTBACK;
503 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
504 SPAGAIN;
505
506 encode_sv (enc, POPs);
507
508 FREETMPS; LEAVE;
509 }
510 else if (enc->json.flags & F_ALLOW_BLESSED)
511 encode_str (enc, "null", 4, 0);
512 else
513 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
514 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
515 }
516 else if (enc->json.flags & F_ALLOW_BLESSED)
517 encode_str (enc, "null", 4, 0);
518 else
519 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
520 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
521 }
522 }
447 if (svt == SVt_PVHV) 523 else if (svt == SVt_PVHV)
448 encode_hv (enc, (HV *)sv); 524 encode_hv (enc, (HV *)sv);
449 else if (svt == SVt_PVAV) 525 else if (svt == SVt_PVAV)
450 encode_av (enc, (AV *)sv); 526 encode_av (enc, (AV *)sv);
451 else if (svt < SVt_PVAV) 527 else if (svt < SVt_PVAV)
452 { 528 {
453 if (SvNIOK (sv) && SvIV (sv) == 0) 529 STRLEN len = 0;
530 char *pv = svt ? SvPV (sv, len) : 0;
531
532 if (len == 1 && *pv == '1')
533 encode_str (enc, "true", 4, 0);
534 else if (len == 1 && *pv == '0')
454 encode_str (enc, "false", 5, 0); 535 encode_str (enc, "false", 5, 0);
455 else if (SvNIOK (sv) && SvIV (sv) == 1)
456 encode_str (enc, "true", 4, 0);
457 else 536 else
458 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 537 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
459 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 538 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
460 } 539 }
461 else 540 else
… …
476 encode_str (enc, str, len, SvUTF8 (sv)); 555 encode_str (enc, str, len, SvUTF8 (sv));
477 encode_ch (enc, '"'); 556 encode_ch (enc, '"');
478 } 557 }
479 else if (SvNOKp (sv)) 558 else if (SvNOKp (sv))
480 { 559 {
560 // trust that perl will do the right thing w.r.t. JSON syntax.
481 need (enc, NV_DIG + 32); 561 need (enc, NV_DIG + 32);
482 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 562 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
483 enc->cur += strlen (enc->cur); 563 enc->cur += strlen (enc->cur);
484 } 564 }
485 else if (SvIOKp (sv)) 565 else if (SvIOKp (sv))
486 { 566 {
487 need (enc, 64); 567 // we assume we can always read an IV as a UV
568 if (SvUV (sv) & ~(UV)0x7fff)
569 {
570 // large integer, use the (rather slow) snprintf way.
571 need (enc, sizeof (UV) * 3);
488 enc->cur += 572 enc->cur +=
489 SvIsUV(sv) 573 SvIsUV(sv)
490 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 574 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
491 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 575 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
576 }
577 else
578 {
579 // optimise the "small number case"
580 // code will likely be branchless and use only a single multiplication
581 I32 i = SvIV (sv);
582 U32 u;
583 char digit, nz = 0;
584
585 need (enc, 6);
586
587 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
588 u = i < 0 ? -i : i;
589
590 // convert to 4.28 fixed-point representation
591 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
592
593 // now output digit by digit, each time masking out the integer part
594 // and multiplying by 5 while moving the decimal point one to the right,
595 // resulting in a net multiplication by 10.
596 // we always write the digit to memory but conditionally increment
597 // the pointer, to ease the usage of conditional move instructions.
598 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
599 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
600 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
601 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
602 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
603 }
492 } 604 }
493 else if (SvROK (sv)) 605 else if (SvROK (sv))
494 encode_rv (enc, SvRV (sv)); 606 encode_rv (enc, SvRV (sv));
495 else if (!SvOK (sv)) 607 else if (!SvOK (sv))
496 encode_str (enc, "null", 4, 0); 608 encode_str (enc, "null", 4, 0);
… …
498 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 610 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
499 SvPV_nolen (sv), SvFLAGS (sv)); 611 SvPV_nolen (sv), SvFLAGS (sv));
500} 612}
501 613
502static SV * 614static SV *
503encode_json (SV *scalar, U32 flags) 615encode_json (SV *scalar, JSON *json)
504{ 616{
505 enc_t enc; 617 enc_t enc;
506 618
507 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 619 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
508 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 620 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
509 621
510 enc.flags = flags; 622 enc.json = *json;
511 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 623 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
512 enc.cur = SvPVX (enc.sv); 624 enc.cur = SvPVX (enc.sv);
513 enc.end = SvEND (enc.sv); 625 enc.end = SvEND (enc.sv);
514 enc.indent = 0; 626 enc.indent = 0;
515 enc.maxdepth = DEC_DEPTH (flags); 627 enc.maxdepth = DEC_DEPTH (enc.json.flags);
516 628
517 SvPOK_only (enc.sv); 629 SvPOK_only (enc.sv);
518 encode_sv (&enc, scalar); 630 encode_sv (&enc, scalar);
519 631
632 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
633 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
634
520 if (!(flags & (F_ASCII | F_UTF8))) 635 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
521 SvUTF8_on (enc.sv); 636 SvUTF8_on (enc.sv);
522 637
523 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
524
525 if (enc.flags & F_SHRINK) 638 if (enc.json.flags & F_SHRINK)
526 shrink (enc.sv); 639 shrink (enc.sv);
527 640
528 return enc.sv; 641 return enc.sv;
529} 642}
530 643
… …
535typedef struct 648typedef struct
536{ 649{
537 char *cur; // current parser pointer 650 char *cur; // current parser pointer
538 char *end; // end of input string 651 char *end; // end of input string
539 const char *err; // parse error, if != 0 652 const char *err; // parse error, if != 0
540 U32 flags; // F_* 653 JSON json;
541 U32 depth; // recursion depth 654 U32 depth; // recursion depth
542 U32 maxdepth; // recursion depth limit 655 U32 maxdepth; // recursion depth limit
543} dec_t; 656} dec_t;
544 657
545static void 658inline void
546decode_ws (dec_t *dec) 659decode_ws (dec_t *dec)
547{ 660{
548 for (;;) 661 for (;;)
549 { 662 {
550 char ch = *dec->cur; 663 char ch = *dec->cur;
… …
576decode_4hex (dec_t *dec) 689decode_4hex (dec_t *dec)
577{ 690{
578 signed char d1, d2, d3, d4; 691 signed char d1, d2, d3, d4;
579 unsigned char *cur = (unsigned char *)dec->cur; 692 unsigned char *cur = (unsigned char *)dec->cur;
580 693
581 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 694 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
582 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 695 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
583 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 696 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
584 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 697 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
585 698
586 dec->cur += 4; 699 dec->cur += 4;
587 700
588 return ((UV)d1) << 12 701 return ((UV)d1) << 12
589 | ((UV)d2) << 8 702 | ((UV)d2) << 8
… …
597static SV * 710static SV *
598decode_str (dec_t *dec) 711decode_str (dec_t *dec)
599{ 712{
600 SV *sv = 0; 713 SV *sv = 0;
601 int utf8 = 0; 714 int utf8 = 0;
715 char *dec_cur = dec->cur;
602 716
603 do 717 do
604 { 718 {
605 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN]; 719 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
606 char *cur = buf; 720 char *cur = buf;
607 721
608 do 722 do
609 { 723 {
610 unsigned char ch = *(unsigned char *)dec->cur++; 724 unsigned char ch = *(unsigned char *)dec_cur++;
611 725
612 if (ch == '"') 726 if (expect_false (ch == '"'))
613 { 727 {
614 --dec->cur; 728 --dec_cur;
615 break; 729 break;
616 } 730 }
617 else if (ch == '\\') 731 else if (expect_false (ch == '\\'))
618 { 732 {
619 switch (*dec->cur) 733 switch (*dec_cur)
620 { 734 {
621 case '\\': 735 case '\\':
622 case '/': 736 case '/':
623 case '"': *cur++ = *dec->cur++; break; 737 case '"': *cur++ = *dec_cur++; break;
624 738
625 case 'b': ++dec->cur; *cur++ = '\010'; break; 739 case 'b': ++dec_cur; *cur++ = '\010'; break;
626 case 't': ++dec->cur; *cur++ = '\011'; break; 740 case 't': ++dec_cur; *cur++ = '\011'; break;
627 case 'n': ++dec->cur; *cur++ = '\012'; break; 741 case 'n': ++dec_cur; *cur++ = '\012'; break;
628 case 'f': ++dec->cur; *cur++ = '\014'; break; 742 case 'f': ++dec_cur; *cur++ = '\014'; break;
629 case 'r': ++dec->cur; *cur++ = '\015'; break; 743 case 'r': ++dec_cur; *cur++ = '\015'; break;
630 744
631 case 'u': 745 case 'u':
632 { 746 {
633 UV lo, hi; 747 UV lo, hi;
634 ++dec->cur; 748 ++dec_cur;
635 749
750 dec->cur = dec_cur;
636 hi = decode_4hex (dec); 751 hi = decode_4hex (dec);
752 dec_cur = dec->cur;
637 if (hi == (UV)-1) 753 if (hi == (UV)-1)
638 goto fail; 754 goto fail;
639 755
640 // possibly a surrogate pair 756 // possibly a surrogate pair
641 if (hi >= 0xd800) 757 if (hi >= 0xd800)
642 if (hi < 0xdc00) 758 if (hi < 0xdc00)
643 { 759 {
644 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 760 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
645 ERR ("missing low surrogate character in surrogate pair"); 761 ERR ("missing low surrogate character in surrogate pair");
646 762
647 dec->cur += 2; 763 dec_cur += 2;
648 764
765 dec->cur = dec_cur;
649 lo = decode_4hex (dec); 766 lo = decode_4hex (dec);
767 dec_cur = dec->cur;
650 if (lo == (UV)-1) 768 if (lo == (UV)-1)
651 goto fail; 769 goto fail;
652 770
653 if (lo < 0xdc00 || lo >= 0xe000) 771 if (lo < 0xdc00 || lo >= 0xe000)
654 ERR ("surrogate pair expected"); 772 ERR ("surrogate pair expected");
… …
668 *cur++ = hi; 786 *cur++ = hi;
669 } 787 }
670 break; 788 break;
671 789
672 default: 790 default:
673 --dec->cur; 791 --dec_cur;
674 ERR ("illegal backslash escape sequence in string"); 792 ERR ("illegal backslash escape sequence in string");
675 } 793 }
676 } 794 }
677 else if (ch >= 0x20 && ch <= 0x7f) 795 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
678 *cur++ = ch; 796 *cur++ = ch;
679 else if (ch >= 0x80) 797 else if (ch >= 0x80)
680 { 798 {
681 STRLEN clen; 799 STRLEN clen;
682 UV uch; 800 UV uch;
683 801
684 --dec->cur; 802 --dec_cur;
685 803
686 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 804 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
687 if (clen == (STRLEN)-1) 805 if (clen == (STRLEN)-1)
688 ERR ("malformed UTF-8 character in JSON string"); 806 ERR ("malformed UTF-8 character in JSON string");
689 807
690 do 808 do
691 *cur++ = *dec->cur++; 809 *cur++ = *dec_cur++;
692 while (--clen); 810 while (--clen);
693 811
694 utf8 = 1; 812 utf8 = 1;
695 } 813 }
696 else 814 else
697 { 815 {
698 --dec->cur; 816 --dec_cur;
699 817
700 if (!ch) 818 if (!ch)
701 ERR ("unexpected end of string while parsing JSON string"); 819 ERR ("unexpected end of string while parsing JSON string");
702 else 820 else
703 ERR ("invalid character encountered while parsing JSON string"); 821 ERR ("invalid character encountered while parsing JSON string");
… …
716 } 834 }
717 else 835 else
718 sv = newSVpvn (buf, len); 836 sv = newSVpvn (buf, len);
719 } 837 }
720 } 838 }
721 while (*dec->cur != '"'); 839 while (*dec_cur != '"');
722 840
723 ++dec->cur; 841 ++dec_cur;
724 842
725 if (sv) 843 if (sv)
726 { 844 {
727 SvPOK_only (sv); 845 SvPOK_only (sv);
728 *SvEND (sv) = 0; 846 *SvEND (sv) = 0;
… …
731 SvUTF8_on (sv); 849 SvUTF8_on (sv);
732 } 850 }
733 else 851 else
734 sv = newSVpvn ("", 0); 852 sv = newSVpvn ("", 0);
735 853
854 dec->cur = dec_cur;
736 return sv; 855 return sv;
737 856
738fail: 857fail:
858 dec->cur = dec_cur;
739 return 0; 859 return 0;
740} 860}
741 861
742static SV * 862static SV *
743decode_num (dec_t *dec) 863decode_num (dec_t *dec)
… …
801 is_nv = 1; 921 is_nv = 1;
802 } 922 }
803 923
804 if (!is_nv) 924 if (!is_nv)
805 { 925 {
806 UV uv; 926 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
807 int numtype = grok_number (start, dec->cur - start, &uv); 927 if (*start == '-')
808 if (numtype & IS_NUMBER_IN_UV) 928 switch (dec->cur - start)
809 if (numtype & IS_NUMBER_NEG)
810 { 929 {
811 if (uv < (UV)IV_MIN) 930 case 2: return newSViv (-( start [1] - '0' * 1));
812 return newSViv (-(IV)uv); 931 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
932 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
933 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
813 } 934 }
935 else
936 switch (dec->cur - start)
937 {
938 case 1: return newSViv ( start [0] - '0' * 1);
939 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
940 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
941 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
942 }
943
944 {
945 UV uv;
946 int numtype = grok_number (start, dec->cur - start, &uv);
947 if (numtype & IS_NUMBER_IN_UV)
948 if (numtype & IS_NUMBER_NEG)
949 {
950 if (uv < (UV)IV_MIN)
951 return newSViv (-(IV)uv);
952 }
814 else 953 else
815 return newSVuv (uv); 954 return newSVuv (uv);
955
956 // here would likely be the place for bigint support
816 } 957 }
958 }
817 959
960 // if we ever support bigint or bigfloat, this is the place for bigfloat
818 return newSVnv (Atof (start)); 961 return newSVnv (Atof (start));
819 962
820fail: 963fail:
821 return 0; 964 return 0;
822} 965}
… …
866} 1009}
867 1010
868static SV * 1011static SV *
869decode_hv (dec_t *dec) 1012decode_hv (dec_t *dec)
870{ 1013{
1014 SV *sv;
871 HV *hv = newHV (); 1015 HV *hv = newHV ();
872 1016
873 DEC_INC_DEPTH; 1017 DEC_INC_DEPTH;
874 decode_ws (dec); 1018 decode_ws (dec);
875 1019
876 if (*dec->cur == '}') 1020 if (*dec->cur == '}')
877 ++dec->cur; 1021 ++dec->cur;
878 else 1022 else
879 for (;;) 1023 for (;;)
880 { 1024 {
881 SV *key, *value;
882
883 decode_ws (dec); EXPECT_CH ('"'); 1025 decode_ws (dec); EXPECT_CH ('"');
884 1026
885 key = decode_str (dec); 1027 // heuristic: assume that
886 if (!key) 1028 // a) decode_str + hv_store_ent are abysmally slow.
887 goto fail; 1029 // b) most hash keys are short, simple ascii text.
1030 // => try to "fast-match" such strings to avoid
1031 // the overhead of decode_str + hv_store_ent.
1032 {
1033 SV *value;
1034 char *p = dec->cur;
1035 char *e = p + 24; // only try up to 24 bytes
888 1036
889 decode_ws (dec); EXPECT_CH (':'); 1037 for (;;)
890
891 value = decode_sv (dec);
892 if (!value)
893 { 1038 {
1039 // the >= 0x80 is true on most architectures
1040 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1041 {
1042 // slow path, back up and use decode_str
1043 SV *key = decode_str (dec);
1044 if (!key)
1045 goto fail;
1046
1047 decode_ws (dec); EXPECT_CH (':');
1048
1049 value = decode_sv (dec);
1050 if (!value)
1051 {
1052 SvREFCNT_dec (key);
1053 goto fail;
1054 }
1055
1056 hv_store_ent (hv, key, value, 0);
894 SvREFCNT_dec (key); 1057 SvREFCNT_dec (key);
1058
1059 break;
1060 }
1061 else if (*p == '"')
1062 {
1063 // fast path, got a simple key
1064 char *key = dec->cur;
1065 int len = p - key;
1066 dec->cur = p + 1;
1067
1068 decode_ws (dec); EXPECT_CH (':');
1069
1070 value = decode_sv (dec);
1071 if (!value)
895 goto fail; 1072 goto fail;
1073
1074 hv_store (hv, key, len, value, 0);
1075
1076 break;
1077 }
1078
1079 ++p;
896 } 1080 }
897 1081 }
898 hv_store_ent (hv, key, value, 0);
899 SvREFCNT_dec (key);
900 1082
901 decode_ws (dec); 1083 decode_ws (dec);
902 1084
903 if (*dec->cur == '}') 1085 if (*dec->cur == '}')
904 { 1086 {
… …
911 1093
912 ++dec->cur; 1094 ++dec->cur;
913 } 1095 }
914 1096
915 DEC_DEC_DEPTH; 1097 DEC_DEC_DEPTH;
916 return newRV_noinc ((SV *)hv); 1098 sv = newRV_noinc ((SV *)hv);
1099
1100 // check filter callbacks
1101 if (dec->json.flags & F_HOOK)
1102 {
1103 ENTER; SAVETMPS;
1104
1105 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1106 {
1107 int count;
1108
1109 dSP; PUSHMARK (SP);
1110 XPUSHs (sv_2mortal (sv));
1111
1112 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;
1113
1114 if (count == 1)
1115 {
1116 sv = newSVsv (POPs);
1117 goto filter_ok;
1118 }
1119
1120 SvREFCNT_inc (sv);
1121 }
1122
1123 if (dec->json.cb_object)
1124 {
1125 int count;
1126
1127 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
1128 XPUSHs (sv_2mortal (sv));
1129
1130 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1131
1132 if (count == 1)
1133 {
1134 sv = newSVsv (POPs);
1135 goto filter_ok;
1136 }
1137
1138 SvREFCNT_inc (sv);
1139 }
1140
1141filter_ok:
1142 FREETMPS; LEAVE;
1143 }
1144
1145 return sv;
917 1146
918fail: 1147fail:
919 SvREFCNT_dec (hv); 1148 SvREFCNT_dec (hv);
920 DEC_DEC_DEPTH; 1149 DEC_DEC_DEPTH;
921 return 0; 1150 return 0;
… …
923 1152
924static SV * 1153static SV *
925decode_sv (dec_t *dec) 1154decode_sv (dec_t *dec)
926{ 1155{
927 decode_ws (dec); 1156 decode_ws (dec);
1157
1158 // the beauty of JSON: you need exactly one character lookahead
1159 // to parse anything.
928 switch (*dec->cur) 1160 switch (*dec->cur)
929 { 1161 {
930 case '"': ++dec->cur; return decode_str (dec); 1162 case '"': ++dec->cur; return decode_str (dec);
931 case '[': ++dec->cur; return decode_av (dec); 1163 case '[': ++dec->cur; return decode_av (dec);
932 case '{': ++dec->cur; return decode_hv (dec); 1164 case '{': ++dec->cur; return decode_hv (dec);
… …
938 1170
939 case 't': 1171 case 't':
940 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1172 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
941 { 1173 {
942 dec->cur += 4; 1174 dec->cur += 4;
943 return newSViv (1); 1175 return SvREFCNT_inc (json_true);
944 } 1176 }
945 else 1177 else
946 ERR ("'true' expected"); 1178 ERR ("'true' expected");
947 1179
948 break; 1180 break;
949 1181
950 case 'f': 1182 case 'f':
951 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1183 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
952 { 1184 {
953 dec->cur += 5; 1185 dec->cur += 5;
954 return newSViv (0); 1186 return SvREFCNT_inc (json_false);
955 } 1187 }
956 else 1188 else
957 ERR ("'false' expected"); 1189 ERR ("'false' expected");
958 1190
959 break; 1191 break;
… …
977fail: 1209fail:
978 return 0; 1210 return 0;
979} 1211}
980 1212
981static SV * 1213static SV *
982decode_json (SV *string, U32 flags) 1214decode_json (SV *string, JSON *json, UV *offset_return)
983{ 1215{
984 dec_t dec; 1216 dec_t dec;
1217 UV offset;
985 SV *sv; 1218 SV *sv;
986 1219
1220 SvGETMAGIC (string);
987 SvUPGRADE (string, SVt_PV); 1221 SvUPGRADE (string, SVt_PV);
988 1222
1223 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1224 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1225 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1226
989 if (flags & F_UTF8) 1227 if (json->flags & F_UTF8)
990 sv_utf8_downgrade (string, 0); 1228 sv_utf8_downgrade (string, 0);
991 else 1229 else
992 sv_utf8_upgrade (string); 1230 sv_utf8_upgrade (string);
993 1231
994 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1232 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
995 1233
996 dec.flags = flags; 1234 dec.json = *json;
997 dec.cur = SvPVX (string); 1235 dec.cur = SvPVX (string);
998 dec.end = SvEND (string); 1236 dec.end = SvEND (string);
999 dec.err = 0; 1237 dec.err = 0;
1000 dec.depth = 0; 1238 dec.depth = 0;
1001 dec.maxdepth = DEC_DEPTH (dec.flags); 1239 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1002 1240
1241 if (dec.json.cb_object || dec.json.cb_sk_object)
1242 dec.json.flags |= F_HOOK;
1243
1003 *dec.end = 0; // this should basically be a nop, too, but make sure its there 1244 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1004 sv = decode_sv (&dec); 1245 sv = decode_sv (&dec);
1005 1246
1247 if (!(offset_return || !sv))
1248 {
1249 // check for trailing garbage
1250 decode_ws (&dec);
1251
1252 if (*dec.cur)
1253 {
1254 dec.err = "garbage after JSON object";
1255 SvREFCNT_dec (sv);
1256 sv = 0;
1257 }
1258 }
1259
1260 if (offset_return || !sv)
1261 {
1262 offset = dec.json.flags & F_UTF8
1263 ? dec.cur - SvPVX (string)
1264 : utf8_distance (dec.cur, SvPVX (string));
1265
1266 if (offset_return)
1267 *offset_return = offset;
1268 }
1269
1006 if (!sv) 1270 if (!sv)
1007 { 1271 {
1008 IV offset = dec.flags & F_UTF8
1009 ? dec.cur - SvPVX (string)
1010 : utf8_distance (dec.cur, SvPVX (string));
1011 SV *uni = sv_newmortal (); 1272 SV *uni = sv_newmortal ();
1012 1273
1013 // horrible hack to silence warning inside pv_uni_display 1274 // horrible hack to silence warning inside pv_uni_display
1014 COP cop = *PL_curcop; 1275 COP cop = *PL_curcop;
1015 cop.cop_warnings = pWARN_NONE; 1276 cop.cop_warnings = pWARN_NONE;
… …
1025 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1286 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1026 } 1287 }
1027 1288
1028 sv = sv_2mortal (sv); 1289 sv = sv_2mortal (sv);
1029 1290
1030 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1291 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1031 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1292 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1032 1293
1033 return sv; 1294 return sv;
1034} 1295}
1035 1296
… …
1039MODULE = JSON::XS PACKAGE = JSON::XS 1300MODULE = JSON::XS PACKAGE = JSON::XS
1040 1301
1041BOOT: 1302BOOT:
1042{ 1303{
1043 int i; 1304 int i;
1044
1045 memset (decode_hexdigit, 0xff, 256);
1046 1305
1047 for (i = 0; i < 256; ++i) 1306 for (i = 0; i < 256; ++i)
1048 decode_hexdigit [i] = 1307 decode_hexdigit [i] =
1049 i >= '0' && i <= '9' ? i - '0' 1308 i >= '0' && i <= '9' ? i - '0'
1050 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1309 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1051 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1310 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1052 : -1; 1311 : -1;
1053 1312
1054 json_stash = gv_stashpv ("JSON::XS", 1); 1313 json_stash = gv_stashpv ("JSON::XS" , 1);
1314 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1315
1316 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1317 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1055} 1318}
1056 1319
1057PROTOTYPES: DISABLE 1320PROTOTYPES: DISABLE
1058 1321
1059SV *new (char *dummy) 1322void new (char *klass)
1060 CODE: 1323 PPCODE:
1061 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1324{
1062 OUTPUT: 1325 SV *pv = NEWSV (0, sizeof (JSON));
1063 RETVAL 1326 SvPOK_only (pv);
1327 Zero (SvPVX (pv), 1, JSON);
1328 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1329 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1330}
1064 1331
1065SV *ascii (SV *self, int enable = 1) 1332void ascii (JSON *self, int enable = 1)
1066 ALIAS: 1333 ALIAS:
1067 ascii = F_ASCII 1334 ascii = F_ASCII
1335 latin1 = F_LATIN1
1068 utf8 = F_UTF8 1336 utf8 = F_UTF8
1069 indent = F_INDENT 1337 indent = F_INDENT
1070 canonical = F_CANONICAL 1338 canonical = F_CANONICAL
1071 space_before = F_SPACE_BEFORE 1339 space_before = F_SPACE_BEFORE
1072 space_after = F_SPACE_AFTER 1340 space_after = F_SPACE_AFTER
1073 pretty = F_PRETTY 1341 pretty = F_PRETTY
1074 allow_nonref = F_ALLOW_NONREF 1342 allow_nonref = F_ALLOW_NONREF
1075 shrink = F_SHRINK 1343 shrink = F_SHRINK
1344 allow_blessed = F_ALLOW_BLESSED
1345 convert_blessed = F_CONV_BLESSED
1076 CODE: 1346 PPCODE:
1077{ 1347{
1078 UV *uv = SvJSON (self);
1079 if (enable) 1348 if (enable)
1080 *uv |= ix; 1349 self->flags |= ix;
1081 else 1350 else
1082 *uv &= ~ix; 1351 self->flags &= ~ix;
1083 1352
1084 RETVAL = newSVsv (self); 1353 XPUSHs (ST (0));
1085} 1354}
1086 OUTPUT:
1087 RETVAL
1088 1355
1089SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1356void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1090 CODE: 1357 PPCODE:
1091{ 1358{
1092 UV *uv = SvJSON (self);
1093 UV log2 = 0; 1359 UV log2 = 0;
1094 1360
1095 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1361 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1096 1362
1097 while ((1UL << log2) < max_depth) 1363 while ((1UL << log2) < max_depth)
1098 ++log2; 1364 ++log2;
1099 1365
1100 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1366 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1101 1367
1102 RETVAL = newSVsv (self); 1368 XPUSHs (ST (0));
1103} 1369}
1104 OUTPUT:
1105 RETVAL
1106 1370
1107void encode (SV *self, SV *scalar) 1371void max_size (JSON *self, UV max_size = 0)
1108 PPCODE: 1372 PPCODE:
1109 XPUSHs (encode_json (scalar, *SvJSON (self))); 1373{
1374 UV log2 = 0;
1110 1375
1111void decode (SV *self, SV *jsonstr) 1376 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1377 if (max_size == 1) max_size = 2;
1378
1379 while ((1UL << log2) < max_size)
1380 ++log2;
1381
1382 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1383
1384 XPUSHs (ST (0));
1385}
1386
1387void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1388 ALIAS:
1389 filter_json_single_key_object = 1
1112 PPCODE: 1390 PPCODE:
1391{
1392 SV **svp;
1393
1394 if (!SvOK (cb))
1395 cb = 0;
1396 else
1397 cb = newSVsv (cb);
1398
1399 switch (ix)
1400 {
1401 case 0: svp = &self->cb_object ; break;
1402 case 1: svp = &self->cb_sk_object; break;
1403 }
1404
1405 if (*svp)
1406 SvREFCNT_dec (*svp);
1407
1408 *svp = cb;
1409
1410 XPUSHs (ST (0));
1411}
1412
1413void encode (JSON *self, SV *scalar)
1414 PPCODE:
1415 XPUSHs (encode_json (scalar, self));
1416
1417void decode (JSON *self, SV *jsonstr)
1418 PPCODE:
1113 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1419 XPUSHs (decode_json (jsonstr, self, 0));
1420
1421void decode_prefix (JSON *self, SV *jsonstr)
1422 PPCODE:
1423{
1424 UV offset;
1425 EXTEND (SP, 2);
1426 PUSHs (decode_json (jsonstr, self, &offset));
1427 PUSHs (sv_2mortal (newSVuv (offset)));
1428}
1114 1429
1115PROTOTYPES: ENABLE 1430PROTOTYPES: ENABLE
1116 1431
1117void to_json (SV *scalar) 1432void to_json (SV *scalar)
1118 ALIAS:
1119 objToJson = 0
1120 PPCODE: 1433 PPCODE:
1434{
1435 JSON json = { F_DEFAULT | F_UTF8 };
1121 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1436 XPUSHs (encode_json (scalar, &json));
1437}
1122 1438
1123void from_json (SV *jsonstr) 1439void from_json (SV *jsonstr)
1124 ALIAS:
1125 jsonToObj = 0
1126 PPCODE: 1440 PPCODE:
1441{
1442 JSON json = { F_DEFAULT | F_UTF8 };
1127 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8)); 1443 XPUSHs (decode_json (jsonstr, &json, 0));
1444}
1128 1445

Diff Legend

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