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.21 by root, Thu Mar 29 02:45:49 2007 UTC vs.
Revision 1.50 by root, Mon Jul 2 00:29:38 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"
8 9
10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif
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
9#define F_ASCII 0x00000001UL 20#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002UL 22#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004UL 23#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008UL 24#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010UL 25#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020UL 26#define F_SPACE_AFTER 0x00000040UL
15#define F_ALLOW_NONREF 0x00000080UL 27#define F_ALLOW_NONREF 0x00000100UL
16#define F_SHRINK 0x00000100UL 28#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL
17#define F_MAXDEPTH 0xf8000000UL 31#define F_MAXDEPTH 0xf8000000UL
18#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
19 36
20#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
21 38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
22// F_SELFCONVERT? <=> to_json/toJson
23// F_BLESSED? <=> { $__class__$ => }
24 39
25#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
26#define F_DEFAULT (12UL << S_MAXDEPTH) 41#define F_DEFAULT (9UL << S_MAXDEPTH)
27 42
28#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
29#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
30 45
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 46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
33 47
34#define SB do { 48#define SB do {
35#define SE } while (0) 49#define SE } while (0)
36 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
37static 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;
38 69
39///////////////////////////////////////////////////////////////////////////// 70/////////////////////////////////////////////////////////////////////////////
40// utility functions 71// utility functions
41 72
42static UV * 73inline void
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) 74shrink (SV *sv)
53{ 75{
54 sv_utf8_downgrade (sv, 1); 76 sv_utf8_downgrade (sv, 1);
55 if (SvLEN (sv) > SvCUR (sv) + 1) 77 if (SvLEN (sv) > SvCUR (sv) + 1)
56 { 78 {
… …
65// 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
66// case of an error. 88// case of an error.
67// we special-case "safe" characters from U+80 .. U+7FF, 89// we special-case "safe" characters from U+80 .. U+7FF,
68// but use the very good perl function to parse anything else. 90// but use the very good perl function to parse anything else.
69// note that we never call this function for a ascii codepoints 91// note that we never call this function for a ascii codepoints
70static UV 92inline UV
71decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 93decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
72{ 94{
73 if (s[0] > 0xdf || s[0] < 0xc2) 95 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
74 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 96 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
75 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 97 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
76 { 98 {
77 *clen = 2; 99 *clen = 2;
78 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 100 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
79 } 101 }
80 else 102 else
103 {
104 *clen = (STRLEN)-1;
81 return (UV)-1; 105 return (UV)-1;
106 }
82} 107}
83 108
84///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
85// encoder 110// encoder
86 111
… …
88typedef struct 113typedef struct
89{ 114{
90 char *cur; // SvPVX (sv) + current output position 115 char *cur; // SvPVX (sv) + current output position
91 char *end; // SvEND (sv) 116 char *end; // SvEND (sv)
92 SV *sv; // result scalar 117 SV *sv; // result scalar
93 U32 flags; // F_* 118 JSON json;
94 U32 indent; // indentation level 119 U32 indent; // indentation level
95 U32 maxdepth; // max. indentation/recursion level 120 U32 maxdepth; // max. indentation/recursion level
96} enc_t; 121} enc_t;
97 122
98static void 123inline void
99need (enc_t *enc, STRLEN len) 124need (enc_t *enc, STRLEN len)
100{ 125{
101 if (enc->cur + len >= enc->end) 126 if (expect_false (enc->cur + len >= enc->end))
102 { 127 {
103 STRLEN cur = enc->cur - SvPVX (enc->sv); 128 STRLEN cur = enc->cur - SvPVX (enc->sv);
104 SvGROW (enc->sv, cur + len + 1); 129 SvGROW (enc->sv, cur + len + 1);
105 enc->cur = SvPVX (enc->sv) + cur; 130 enc->cur = SvPVX (enc->sv) + cur;
106 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 131 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
107 } 132 }
108} 133}
109 134
110static void 135inline void
111encode_ch (enc_t *enc, char ch) 136encode_ch (enc_t *enc, char ch)
112{ 137{
113 need (enc, 1); 138 need (enc, 1);
114 *enc->cur++ = ch; 139 *enc->cur++ = ch;
115} 140}
… …
123 148
124 while (str < end) 149 while (str < end)
125 { 150 {
126 unsigned char ch = *(unsigned char *)str; 151 unsigned char ch = *(unsigned char *)str;
127 152
128 if (ch >= 0x20 && ch < 0x80) // most common case 153 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
129 { 154 {
130 if (ch == '"') // but with slow exceptions 155 if (expect_false (ch == '"')) // but with slow exceptions
131 { 156 {
132 need (enc, len += 1); 157 need (enc, len += 1);
133 *enc->cur++ = '\\'; 158 *enc->cur++ = '\\';
134 *enc->cur++ = '"'; 159 *enc->cur++ = '"';
135 } 160 }
136 else if (ch == '\\') 161 else if (expect_false (ch == '\\'))
137 { 162 {
138 need (enc, len += 1); 163 need (enc, len += 1);
139 *enc->cur++ = '\\'; 164 *enc->cur++ = '\\';
140 *enc->cur++ = '\\'; 165 *enc->cur++ = '\\';
141 } 166 }
… …
159 STRLEN clen; 184 STRLEN clen;
160 UV uch; 185 UV uch;
161 186
162 if (is_utf8) 187 if (is_utf8)
163 { 188 {
164 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
165 uch = decode_utf8 (str, end - str, &clen); 189 uch = decode_utf8 (str, end - str, &clen);
166 if (clen == (STRLEN)-1) 190 if (clen == (STRLEN)-1)
167 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);
168 } 192 }
169 else 193 else
… …
173 } 197 }
174 198
175 if (uch > 0x10FFFFUL) 199 if (uch > 0x10FFFFUL)
176 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);
177 201
178 if (uch < 0x80 || enc->flags & F_ASCII) 202 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
179 { 203 {
180 if (uch > 0xFFFFUL) 204 if (uch > 0xFFFFUL)
181 { 205 {
182 need (enc, len += 11); 206 need (enc, len += 11);
183 sprintf (enc->cur, "\\u%04x\\u%04x", 207 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
197 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 221 *enc->cur++ = hexdigit [(uch >> 0) & 15];
198 } 222 }
199 223
200 str += clen; 224 str += clen;
201 } 225 }
226 else if (enc->json.flags & F_LATIN1)
227 {
228 *enc->cur++ = uch;
229 str += clen;
230 }
202 else if (is_utf8) 231 else if (is_utf8)
203 { 232 {
204 need (enc, len += clen); 233 need (enc, len += clen);
205 do 234 do
206 { 235 {
… …
208 } 237 }
209 while (--clen); 238 while (--clen);
210 } 239 }
211 else 240 else
212 { 241 {
213 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
214 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 243 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
215 ++str; 244 ++str;
216 } 245 }
217 } 246 }
218 } 247 }
… …
220 249
221 --len; 250 --len;
222 } 251 }
223} 252}
224 253
225static void 254inline void
226encode_indent (enc_t *enc) 255encode_indent (enc_t *enc)
227{ 256{
228 if (enc->flags & F_INDENT) 257 if (enc->json.flags & F_INDENT)
229 { 258 {
230 int spaces = enc->indent * INDENT_STEP; 259 int spaces = enc->indent * INDENT_STEP;
231 260
232 need (enc, spaces); 261 need (enc, spaces);
233 memset (enc->cur, ' ', spaces); 262 memset (enc->cur, ' ', spaces);
234 enc->cur += spaces; 263 enc->cur += spaces;
235 } 264 }
236} 265}
237 266
238static void 267inline void
239encode_space (enc_t *enc) 268encode_space (enc_t *enc)
240{ 269{
241 need (enc, 1); 270 need (enc, 1);
242 encode_ch (enc, ' '); 271 encode_ch (enc, ' ');
243} 272}
244 273
245static void 274inline void
246encode_nl (enc_t *enc) 275encode_nl (enc_t *enc)
247{ 276{
248 if (enc->flags & F_INDENT) 277 if (enc->json.flags & F_INDENT)
249 { 278 {
250 need (enc, 1); 279 need (enc, 1);
251 encode_ch (enc, '\n'); 280 encode_ch (enc, '\n');
252 } 281 }
253} 282}
254 283
255static void 284inline void
256encode_comma (enc_t *enc) 285encode_comma (enc_t *enc)
257{ 286{
258 encode_ch (enc, ','); 287 encode_ch (enc, ',');
259 288
260 if (enc->flags & F_INDENT) 289 if (enc->json.flags & F_INDENT)
261 encode_nl (enc); 290 encode_nl (enc);
262 else if (enc->flags & F_SPACE_AFTER) 291 else if (enc->json.flags & F_SPACE_AFTER)
263 encode_space (enc); 292 encode_space (enc);
264} 293}
265 294
266static void encode_sv (enc_t *enc, SV *sv); 295static void encode_sv (enc_t *enc, SV *sv);
267 296
… …
310 else 339 else
311 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 340 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
312 341
313 encode_ch (enc, '"'); 342 encode_ch (enc, '"');
314 343
315 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 344 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
316 encode_ch (enc, ':'); 345 encode_ch (enc, ':');
317 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 346 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
318 encode_sv (enc, HeVAL (he)); 347 encode_sv (enc, HeVAL (he));
319} 348}
320 349
321// compare hash entries, used when all keys are bytestrings 350// compare hash entries, used when all keys are bytestrings
322static int 351static int
… …
357 { 386 {
358 // for canonical output we have to sort by keys first 387 // for canonical output we have to sort by keys first
359 // actually, this is mostly due to the stupid so-called 388 // actually, this is mostly due to the stupid so-called
360 // security workaround added somewhere in 5.8.x. 389 // security workaround added somewhere in 5.8.x.
361 // that randomises hash orderings 390 // that randomises hash orderings
362 if (enc->flags & F_CANONICAL) 391 if (enc->json.flags & F_CANONICAL)
363 { 392 {
364 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
365 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
366 400
367 i = 0; 401 i = 0;
368 while ((he = hv_iternext (hv))) 402 while ((he = hv_iternext (hv)))
369 { 403 {
370 hes [i++] = he; 404 hes [i++] = he;
… …
405 439
406 encode_nl (enc); 440 encode_nl (enc);
407 } 441 }
408 else 442 else
409 { 443 {
410 SV *sv;
411 HE *he = hv_iternext (hv); 444 HE *he = hv_iternext (hv);
412 445
413 for (;;) 446 for (;;)
414 { 447 {
415 encode_indent (enc); 448 encode_indent (enc);
… …
430 463
431// encode objects, arrays and special \0=false and \1=true values. 464// encode objects, arrays and special \0=false and \1=true values.
432static void 465static void
433encode_rv (enc_t *enc, SV *sv) 466encode_rv (enc_t *enc, SV *sv)
434{ 467{
468 svtype svt;
469
435 SvGETMAGIC (sv); 470 SvGETMAGIC (sv);
436
437 svtype svt = SvTYPE (sv); 471 svt = SvTYPE (sv);
438 472
473 if (expect_false (SvOBJECT (sv)))
474 {
475 if (SvSTASH (sv) == json_boolean_stash)
476 {
477 if (SvIV (sv) == 0)
478 encode_str (enc, "false", 5, 0);
479 else
480 encode_str (enc, "true", 4, 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 }
439 if (svt == SVt_PVHV) 523 else if (svt == SVt_PVHV)
440 encode_hv (enc, (HV *)sv); 524 encode_hv (enc, (HV *)sv);
441 else if (svt == SVt_PVAV) 525 else if (svt == SVt_PVAV)
442 encode_av (enc, (AV *)sv); 526 encode_av (enc, (AV *)sv);
443 else if (svt < SVt_PVAV) 527 else if (svt < SVt_PVAV)
444 { 528 {
445 if (SvNIOK (sv) && SvIV (sv) == 0) 529 STRLEN len = 0;
530 char *pv = svt ? SvPV (sv, len) : 0;
531
532 if (len == 1 && *pv == '0')
446 encode_str (enc, "false", 5, 0); 533 encode_str (enc, "false", 5, 0);
447 else if (SvNIOK (sv) && SvIV (sv) == 1) 534 else if (len == 1 && *pv == '1')
448 encode_str (enc, "true", 4, 0); 535 encode_str (enc, "true", 4, 0);
449 else 536 else
450 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",
451 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 538 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
452 } 539 }
… …
468 encode_str (enc, str, len, SvUTF8 (sv)); 555 encode_str (enc, str, len, SvUTF8 (sv));
469 encode_ch (enc, '"'); 556 encode_ch (enc, '"');
470 } 557 }
471 else if (SvNOKp (sv)) 558 else if (SvNOKp (sv))
472 { 559 {
560 // trust that perl will do the right thing w.r.t. JSON syntax.
473 need (enc, NV_DIG + 32); 561 need (enc, NV_DIG + 32);
474 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 562 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
475 enc->cur += strlen (enc->cur); 563 enc->cur += strlen (enc->cur);
476 } 564 }
477 else if (SvIOKp (sv)) 565 else if (SvIOKp (sv))
478 { 566 {
479 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);
480 enc->cur += 572 enc->cur +=
481 SvIsUV(sv) 573 SvIsUV(sv)
482 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 574 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
483 : 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 }
484 } 604 }
485 else if (SvROK (sv)) 605 else if (SvROK (sv))
486 encode_rv (enc, SvRV (sv)); 606 encode_rv (enc, SvRV (sv));
487 else if (!SvOK (sv)) 607 else if (!SvOK (sv))
488 encode_str (enc, "null", 4, 0); 608 encode_str (enc, "null", 4, 0);
… …
490 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",
491 SvPV_nolen (sv), SvFLAGS (sv)); 611 SvPV_nolen (sv), SvFLAGS (sv));
492} 612}
493 613
494static SV * 614static SV *
495encode_json (SV *scalar, U32 flags) 615encode_json (SV *scalar, JSON *json)
496{ 616{
617 enc_t enc;
618
497 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 619 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
498 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)");
499 621
500 enc_t enc; 622 enc.json = *json;
501 enc.flags = flags;
502 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 623 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
503 enc.cur = SvPVX (enc.sv); 624 enc.cur = SvPVX (enc.sv);
504 enc.end = SvEND (enc.sv); 625 enc.end = SvEND (enc.sv);
505 enc.indent = 0; 626 enc.indent = 0;
506 enc.maxdepth = DEC_DEPTH (flags); 627 enc.maxdepth = DEC_DEPTH (enc.json.flags);
507 628
508 SvPOK_only (enc.sv); 629 SvPOK_only (enc.sv);
509 encode_sv (&enc, scalar); 630 encode_sv (&enc, scalar);
510 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
511 if (!(flags & (F_ASCII | F_UTF8))) 635 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
512 SvUTF8_on (enc.sv); 636 SvUTF8_on (enc.sv);
513 637
514 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
515
516 if (enc.flags & F_SHRINK) 638 if (enc.json.flags & F_SHRINK)
517 shrink (enc.sv); 639 shrink (enc.sv);
518 640
519 return enc.sv; 641 return enc.sv;
520} 642}
521 643
… …
526typedef struct 648typedef struct
527{ 649{
528 char *cur; // current parser pointer 650 char *cur; // current parser pointer
529 char *end; // end of input string 651 char *end; // end of input string
530 const char *err; // parse error, if != 0 652 const char *err; // parse error, if != 0
531 U32 flags; // F_* 653 JSON json;
532 U32 depth; // recursion depth 654 U32 depth; // recursion depth
533 U32 maxdepth; // recursion depth limit 655 U32 maxdepth; // recursion depth limit
534} dec_t; 656} dec_t;
535 657
536static void 658inline void
537decode_ws (dec_t *dec) 659decode_ws (dec_t *dec)
538{ 660{
539 for (;;) 661 for (;;)
540 { 662 {
541 char ch = *dec->cur; 663 char ch = *dec->cur;
… …
567decode_4hex (dec_t *dec) 689decode_4hex (dec_t *dec)
568{ 690{
569 signed char d1, d2, d3, d4; 691 signed char d1, d2, d3, d4;
570 unsigned char *cur = (unsigned char *)dec->cur; 692 unsigned char *cur = (unsigned char *)dec->cur;
571 693
572 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");
573 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");
574 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");
575 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");
576 698
577 dec->cur += 4; 699 dec->cur += 4;
578 700
579 return ((UV)d1) << 12 701 return ((UV)d1) << 12
580 | ((UV)d2) << 8 702 | ((UV)d2) << 8
… …
588static SV * 710static SV *
589decode_str (dec_t *dec) 711decode_str (dec_t *dec)
590{ 712{
591 SV *sv = 0; 713 SV *sv = 0;
592 int utf8 = 0; 714 int utf8 = 0;
715 char *dec_cur = dec->cur;
593 716
594 do 717 do
595 { 718 {
596 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN]; 719 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
597 char *cur = buf; 720 char *cur = buf;
598 721
599 do 722 do
600 { 723 {
601 unsigned char ch = *(unsigned char *)dec->cur++; 724 unsigned char ch = *(unsigned char *)dec_cur++;
602 725
603 if (ch == '"') 726 if (expect_false (ch == '"'))
604 { 727 {
605 --dec->cur; 728 --dec_cur;
606 break; 729 break;
607 } 730 }
608 else if (ch == '\\') 731 else if (expect_false (ch == '\\'))
609 { 732 {
610 switch (*dec->cur) 733 switch (*dec_cur)
611 { 734 {
612 case '\\': 735 case '\\':
613 case '/': 736 case '/':
614 case '"': *cur++ = *dec->cur++; break; 737 case '"': *cur++ = *dec_cur++; break;
615 738
616 case 'b': ++dec->cur; *cur++ = '\010'; break; 739 case 'b': ++dec_cur; *cur++ = '\010'; break;
617 case 't': ++dec->cur; *cur++ = '\011'; break; 740 case 't': ++dec_cur; *cur++ = '\011'; break;
618 case 'n': ++dec->cur; *cur++ = '\012'; break; 741 case 'n': ++dec_cur; *cur++ = '\012'; break;
619 case 'f': ++dec->cur; *cur++ = '\014'; break; 742 case 'f': ++dec_cur; *cur++ = '\014'; break;
620 case 'r': ++dec->cur; *cur++ = '\015'; break; 743 case 'r': ++dec_cur; *cur++ = '\015'; break;
621 744
622 case 'u': 745 case 'u':
623 { 746 {
624 UV lo, hi; 747 UV lo, hi;
625 ++dec->cur; 748 ++dec_cur;
626 749
750 dec->cur = dec_cur;
627 hi = decode_4hex (dec); 751 hi = decode_4hex (dec);
752 dec_cur = dec->cur;
628 if (hi == (UV)-1) 753 if (hi == (UV)-1)
629 goto fail; 754 goto fail;
630 755
631 // possibly a surrogate pair 756 // possibly a surrogate pair
632 if (hi >= 0xd800) 757 if (hi >= 0xd800)
633 if (hi < 0xdc00) 758 if (hi < 0xdc00)
634 { 759 {
635 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 760 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
636 ERR ("missing low surrogate character in surrogate pair"); 761 ERR ("missing low surrogate character in surrogate pair");
637 762
638 dec->cur += 2; 763 dec_cur += 2;
639 764
765 dec->cur = dec_cur;
640 lo = decode_4hex (dec); 766 lo = decode_4hex (dec);
767 dec_cur = dec->cur;
641 if (lo == (UV)-1) 768 if (lo == (UV)-1)
642 goto fail; 769 goto fail;
643 770
644 if (lo < 0xdc00 || lo >= 0xe000) 771 if (lo < 0xdc00 || lo >= 0xe000)
645 ERR ("surrogate pair expected"); 772 ERR ("surrogate pair expected");
… …
659 *cur++ = hi; 786 *cur++ = hi;
660 } 787 }
661 break; 788 break;
662 789
663 default: 790 default:
664 --dec->cur; 791 --dec_cur;
665 ERR ("illegal backslash escape sequence in string"); 792 ERR ("illegal backslash escape sequence in string");
666 } 793 }
667 } 794 }
668 else if (ch >= 0x20 && ch <= 0x7f) 795 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
669 *cur++ = ch; 796 *cur++ = ch;
670 else if (ch >= 0x80) 797 else if (ch >= 0x80)
671 { 798 {
672 --dec->cur;
673
674 STRLEN clen; 799 STRLEN clen;
800 UV uch;
801
802 --dec_cur;
803
675 UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 804 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
676 if (clen == (STRLEN)-1) 805 if (clen == (STRLEN)-1)
677 ERR ("malformed UTF-8 character in JSON string"); 806 ERR ("malformed UTF-8 character in JSON string");
678 807
679 do 808 do
680 {
681 *cur++ = *dec->cur++; 809 *cur++ = *dec_cur++;
682 }
683 while (--clen); 810 while (--clen);
684 811
685 utf8 = 1; 812 utf8 = 1;
686 } 813 }
687 else if (!ch)
688 ERR ("unexpected end of string while parsing json string");
689 else 814 else
815 {
816 --dec_cur;
817
818 if (!ch)
819 ERR ("unexpected end of string while parsing JSON string");
820 else
690 ERR ("invalid character encountered"); 821 ERR ("invalid character encountered while parsing JSON string");
691 822 }
692 } 823 }
693 while (cur < buf + SHORT_STRING_LEN); 824 while (cur < buf + SHORT_STRING_LEN);
694 825
826 {
695 STRLEN len = cur - buf; 827 STRLEN len = cur - buf;
696 828
697 if (sv) 829 if (sv)
698 { 830 {
699 SvGROW (sv, SvCUR (sv) + len + 1); 831 SvGROW (sv, SvCUR (sv) + len + 1);
700 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 832 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
701 SvCUR_set (sv, SvCUR (sv) + len); 833 SvCUR_set (sv, SvCUR (sv) + len);
702 } 834 }
703 else 835 else
704 sv = newSVpvn (buf, len); 836 sv = newSVpvn (buf, len);
705 } 837 }
838 }
706 while (*dec->cur != '"'); 839 while (*dec_cur != '"');
707 840
708 ++dec->cur; 841 ++dec_cur;
709 842
710 if (sv) 843 if (sv)
711 { 844 {
712 SvPOK_only (sv); 845 SvPOK_only (sv);
713 *SvEND (sv) = 0; 846 *SvEND (sv) = 0;
… …
716 SvUTF8_on (sv); 849 SvUTF8_on (sv);
717 } 850 }
718 else 851 else
719 sv = newSVpvn ("", 0); 852 sv = newSVpvn ("", 0);
720 853
854 dec->cur = dec_cur;
721 return sv; 855 return sv;
722 856
723fail: 857fail:
858 dec->cur = dec_cur;
724 return 0; 859 return 0;
725} 860}
726 861
727static SV * 862static SV *
728decode_num (dec_t *dec) 863decode_num (dec_t *dec)
… …
786 is_nv = 1; 921 is_nv = 1;
787 } 922 }
788 923
789 if (!is_nv) 924 if (!is_nv)
790 { 925 {
791 UV uv; 926 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
792 int numtype = grok_number (start, dec->cur - start, &uv); 927 if (*start == '-')
793 if (numtype & IS_NUMBER_IN_UV) 928 switch (dec->cur - start)
794 if (numtype & IS_NUMBER_NEG)
795 { 929 {
796 if (uv < (UV)IV_MIN) 930 case 2: return newSViv (-( start [1] - '0' * 1));
797 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));
798 } 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 }
799 else 953 else
800 return newSVuv (uv); 954 return newSVuv (uv);
955
956 // here would likely be the place for bigint support
801 } 957 }
958 }
802 959
960 // if we ever support bigint or bigfloat, this is the place for bigfloat
803 return newSVnv (Atof (start)); 961 return newSVnv (Atof (start));
804 962
805fail: 963fail:
806 return 0; 964 return 0;
807} 965}
… …
851} 1009}
852 1010
853static SV * 1011static SV *
854decode_hv (dec_t *dec) 1012decode_hv (dec_t *dec)
855{ 1013{
1014 SV *sv;
856 HV *hv = newHV (); 1015 HV *hv = newHV ();
857 1016
858 DEC_INC_DEPTH; 1017 DEC_INC_DEPTH;
859 decode_ws (dec); 1018 decode_ws (dec);
860 1019
861 if (*dec->cur == '}') 1020 if (*dec->cur == '}')
862 ++dec->cur; 1021 ++dec->cur;
863 else 1022 else
864 for (;;) 1023 for (;;)
865 { 1024 {
866 SV *key, *value;
867
868 decode_ws (dec); EXPECT_CH ('"'); 1025 decode_ws (dec); EXPECT_CH ('"');
869 1026
870 key = decode_str (dec); 1027 // heuristic: assume that
871 if (!key) 1028 // a) decode_str + hv_store_ent are abysmally slow.
872 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
873 1036
874 decode_ws (dec); EXPECT_CH (':'); 1037 for (;;)
875
876 value = decode_sv (dec);
877 if (!value)
878 { 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);
879 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)
880 goto fail; 1072 goto fail;
1073
1074 hv_store (hv, key, len, value, 0);
1075
1076 break;
1077 }
1078
1079 ++p;
881 } 1080 }
882 1081 }
883 hv_store_ent (hv, key, value, 0);
884 SvREFCNT_dec (key);
885 1082
886 decode_ws (dec); 1083 decode_ws (dec);
887 1084
888 if (*dec->cur == '}') 1085 if (*dec->cur == '}')
889 { 1086 {
… …
896 1093
897 ++dec->cur; 1094 ++dec->cur;
898 } 1095 }
899 1096
900 DEC_DEC_DEPTH; 1097 DEC_DEC_DEPTH;
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 (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
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 sv = newSVsv (POPs);
1116 else
1117 SvREFCNT_inc (sv);
1118 }
1119
1120 if (dec->json.cb_object)
1121 {
1122 int count;
1123
1124 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
1125 XPUSHs (sv_2mortal (sv));
1126
1127 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1128
1129 if (count == 1)
1130 sv = newSVsv (POPs);
1131 else
1132 SvREFCNT_inc (sv);
1133 }
1134
1135 FREETMPS; LEAVE;
1136 }
1137
901 return newRV_noinc ((SV *)hv); 1138 return newRV_noinc ((SV *)hv);
902 1139
903fail: 1140fail:
904 SvREFCNT_dec (hv); 1141 SvREFCNT_dec (hv);
905 DEC_DEC_DEPTH; 1142 DEC_DEC_DEPTH;
… …
908 1145
909static SV * 1146static SV *
910decode_sv (dec_t *dec) 1147decode_sv (dec_t *dec)
911{ 1148{
912 decode_ws (dec); 1149 decode_ws (dec);
1150
1151 // the beauty of JSON: you need exactly one character lookahead
1152 // to parse anything.
913 switch (*dec->cur) 1153 switch (*dec->cur)
914 { 1154 {
915 case '"': ++dec->cur; return decode_str (dec); 1155 case '"': ++dec->cur; return decode_str (dec);
916 case '[': ++dec->cur; return decode_av (dec); 1156 case '[': ++dec->cur; return decode_av (dec);
917 case '{': ++dec->cur; return decode_hv (dec); 1157 case '{': ++dec->cur; return decode_hv (dec);
… …
923 1163
924 case 't': 1164 case 't':
925 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1165 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
926 { 1166 {
927 dec->cur += 4; 1167 dec->cur += 4;
928 return newSViv (1); 1168 return SvREFCNT_inc (json_true);
929 } 1169 }
930 else 1170 else
931 ERR ("'true' expected"); 1171 ERR ("'true' expected");
932 1172
933 break; 1173 break;
934 1174
935 case 'f': 1175 case 'f':
936 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1176 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
937 { 1177 {
938 dec->cur += 5; 1178 dec->cur += 5;
939 return newSViv (0); 1179 return SvREFCNT_inc (json_false);
940 } 1180 }
941 else 1181 else
942 ERR ("'false' expected"); 1182 ERR ("'false' expected");
943 1183
944 break; 1184 break;
… …
953 ERR ("'null' expected"); 1193 ERR ("'null' expected");
954 1194
955 break; 1195 break;
956 1196
957 default: 1197 default:
958 ERR ("malformed json string, neither array, object, number, string or atom"); 1198 ERR ("malformed JSON string, neither array, object, number, string or atom");
959 break; 1199 break;
960 } 1200 }
961 1201
962fail: 1202fail:
963 return 0; 1203 return 0;
964} 1204}
965 1205
966static SV * 1206static SV *
967decode_json (SV *string, U32 flags) 1207decode_json (SV *string, JSON *json, UV *offset_return)
968{ 1208{
1209 dec_t dec;
1210 UV offset;
969 SV *sv; 1211 SV *sv;
970 1212
1213 SvGETMAGIC (string);
1214 SvUPGRADE (string, SVt_PV);
1215
1216 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1217 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1218 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1219
971 if (flags & F_UTF8) 1220 if (json->flags & F_UTF8)
972 sv_utf8_downgrade (string, 0); 1221 sv_utf8_downgrade (string, 0);
973 else 1222 else
974 sv_utf8_upgrade (string); 1223 sv_utf8_upgrade (string);
975 1224
976 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1225 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
977 1226
978 dec_t dec; 1227 dec.json = *json;
979 dec.flags = flags;
980 dec.cur = SvPVX (string); 1228 dec.cur = SvPVX (string);
981 dec.end = SvEND (string); 1229 dec.end = SvEND (string);
982 dec.err = 0; 1230 dec.err = 0;
983 dec.depth = 0; 1231 dec.depth = 0;
984 dec.maxdepth = DEC_DEPTH (dec.flags); 1232 dec.maxdepth = DEC_DEPTH (dec.json.flags);
985 1233
1234 if (dec.json.cb_object || dec.json.cb_sk_object)
1235 dec.json.flags |= F_HOOK;
1236
986 *dec.end = 0; // this should basically be a nop, too, but make sure its there 1237 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
987 sv = decode_sv (&dec); 1238 sv = decode_sv (&dec);
988 1239
1240 if (!(offset_return || !sv))
1241 {
1242 // check for trailing garbage
1243 decode_ws (&dec);
1244
1245 if (*dec.cur)
1246 {
1247 dec.err = "garbage after JSON object";
1248 SvREFCNT_dec (sv);
1249 sv = 0;
1250 }
1251 }
1252
1253 if (offset_return || !sv)
1254 {
1255 offset = dec.json.flags & F_UTF8
1256 ? dec.cur - SvPVX (string)
1257 : utf8_distance (dec.cur, SvPVX (string));
1258
1259 if (offset_return)
1260 *offset_return = offset;
1261 }
1262
989 if (!sv) 1263 if (!sv)
990 { 1264 {
991 IV offset = dec.flags & F_UTF8
992 ? dec.cur - SvPVX (string)
993 : utf8_distance (dec.cur, SvPVX (string));
994 SV *uni = sv_newmortal (); 1265 SV *uni = sv_newmortal ();
995 1266
996 // horrible hack to silence warning inside pv_uni_display 1267 // horrible hack to silence warning inside pv_uni_display
997 COP cop = *PL_curcop; 1268 COP cop = *PL_curcop;
998 cop.cop_warnings = pWARN_NONE; 1269 cop.cop_warnings = pWARN_NONE;
… …
1000 SAVEVPTR (PL_curcop); 1271 SAVEVPTR (PL_curcop);
1001 PL_curcop = &cop; 1272 PL_curcop = &cop;
1002 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1273 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1003 LEAVE; 1274 LEAVE;
1004 1275
1005 croak ("%s, at character offset %d (%s)", 1276 croak ("%s, at character offset %d [\"%s\"]",
1006 dec.err, 1277 dec.err,
1007 (int)offset, 1278 (int)offset,
1008 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1279 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1009 } 1280 }
1010 1281
1011 sv = sv_2mortal (sv); 1282 sv = sv_2mortal (sv);
1012 1283
1013 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1284 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1014 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1285 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1015 1286
1016 return sv; 1287 return sv;
1017} 1288}
1018 1289
… …
1022MODULE = JSON::XS PACKAGE = JSON::XS 1293MODULE = JSON::XS PACKAGE = JSON::XS
1023 1294
1024BOOT: 1295BOOT:
1025{ 1296{
1026 int i; 1297 int i;
1027
1028 memset (decode_hexdigit, 0xff, 256);
1029 1298
1030 for (i = 0; i < 256; ++i) 1299 for (i = 0; i < 256; ++i)
1031 decode_hexdigit [i] = 1300 decode_hexdigit [i] =
1032 i >= '0' && i <= '9' ? i - '0' 1301 i >= '0' && i <= '9' ? i - '0'
1033 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1302 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1034 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1303 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1035 : -1; 1304 : -1;
1036 1305
1037 json_stash = gv_stashpv ("JSON::XS", 1); 1306 json_stash = gv_stashpv ("JSON::XS" , 1);
1307 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1308
1309 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1310 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1038} 1311}
1039 1312
1040PROTOTYPES: DISABLE 1313PROTOTYPES: DISABLE
1041 1314
1042SV *new (char *dummy) 1315void new (char *klass)
1043 CODE: 1316 PPCODE:
1044 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1317{
1045 OUTPUT: 1318 SV *pv = NEWSV (0, sizeof (JSON));
1046 RETVAL 1319 SvPOK_only (pv);
1320 Zero (SvPVX (pv), 1, JSON);
1321 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1322 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1323}
1047 1324
1048SV *ascii (SV *self, int enable = 1) 1325void ascii (JSON *self, int enable = 1)
1049 ALIAS: 1326 ALIAS:
1050 ascii = F_ASCII 1327 ascii = F_ASCII
1328 latin1 = F_LATIN1
1051 utf8 = F_UTF8 1329 utf8 = F_UTF8
1052 indent = F_INDENT 1330 indent = F_INDENT
1053 canonical = F_CANONICAL 1331 canonical = F_CANONICAL
1054 space_before = F_SPACE_BEFORE 1332 space_before = F_SPACE_BEFORE
1055 space_after = F_SPACE_AFTER 1333 space_after = F_SPACE_AFTER
1056 pretty = F_PRETTY 1334 pretty = F_PRETTY
1057 allow_nonref = F_ALLOW_NONREF 1335 allow_nonref = F_ALLOW_NONREF
1058 shrink = F_SHRINK 1336 shrink = F_SHRINK
1337 allow_blessed = F_ALLOW_BLESSED
1338 convert_blessed = F_CONV_BLESSED
1059 CODE: 1339 PPCODE:
1060{ 1340{
1061 UV *uv = SvJSON (self);
1062 if (enable) 1341 if (enable)
1063 *uv |= ix; 1342 self->flags |= ix;
1064 else 1343 else
1065 *uv &= ~ix; 1344 self->flags &= ~ix;
1066 1345
1067 RETVAL = newSVsv (self); 1346 XPUSHs (ST (0));
1068} 1347}
1069 OUTPUT:
1070 RETVAL
1071 1348
1072SV *max_depth (SV *self, int max_depth = 0x80000000UL) 1349void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1073 CODE: 1350 PPCODE:
1074{ 1351{
1075 UV *uv = SvJSON (self);
1076 UV log2 = 0; 1352 UV log2 = 0;
1077 1353
1078 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1354 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1079 1355
1080 while ((1UL << log2) < max_depth) 1356 while ((1UL << log2) < max_depth)
1081 ++log2; 1357 ++log2;
1082 1358
1083 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1359 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1084 1360
1085 RETVAL = newSVsv (self); 1361 XPUSHs (ST (0));
1086} 1362}
1087 OUTPUT:
1088 RETVAL
1089 1363
1090void encode (SV *self, SV *scalar) 1364void max_size (JSON *self, UV max_size = 0)
1091 PPCODE: 1365 PPCODE:
1092 XPUSHs (encode_json (scalar, *SvJSON (self))); 1366{
1367 UV log2 = 0;
1093 1368
1094void decode (SV *self, SV *jsonstr) 1369 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1370 if (max_size == 1) max_size = 2;
1371
1372 while ((1UL << log2) < max_size)
1373 ++log2;
1374
1375 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1376
1377 XPUSHs (ST (0));
1378}
1379
1380void filter_json_objects (JSON *self, SV *cb = &PL_sv_undef)
1381 ALIAS:
1382 filter_sk_json_objects = 1
1095 PPCODE: 1383 PPCODE:
1384{
1385 if (!SvOK (cb))
1386 cb = 0;
1387
1388 switch (ix)
1389 {
1390 case 0: self->cb_object = cb; break;
1391 case 1: self->cb_sk_object = cb; break;
1392 }
1393
1394 XPUSHs (ST (0));
1395}
1396
1397void encode (JSON *self, SV *scalar)
1398 PPCODE:
1399 XPUSHs (encode_json (scalar, self));
1400
1401void decode (JSON *self, SV *jsonstr)
1402 PPCODE:
1096 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1403 XPUSHs (decode_json (jsonstr, self, 0));
1404
1405void decode_prefix (JSON *self, SV *jsonstr)
1406 PPCODE:
1407{
1408 UV offset;
1409 EXTEND (SP, 2);
1410 PUSHs (decode_json (jsonstr, self, &offset));
1411 PUSHs (sv_2mortal (newSVuv (offset)));
1412}
1097 1413
1098PROTOTYPES: ENABLE 1414PROTOTYPES: ENABLE
1099 1415
1100void to_json (SV *scalar) 1416void to_json (SV *scalar)
1101 ALIAS:
1102 objToJson = 0
1103 PPCODE: 1417 PPCODE:
1418{
1419 JSON json = { F_DEFAULT | F_UTF8 };
1104 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1420 XPUSHs (encode_json (scalar, &json));
1421}
1105 1422
1106void from_json (SV *jsonstr) 1423void from_json (SV *jsonstr)
1107 ALIAS:
1108 jsonToObj = 0
1109 PPCODE: 1424 PPCODE:
1425{
1426 JSON json = { F_DEFAULT | F_UTF8 };
1110 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8)); 1427 XPUSHs (decode_json (jsonstr, &json, 0));
1428}
1111 1429

Diff Legend

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