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.30 by root, Wed May 9 16:10:37 2007 UTC vs.
Revision 1.49 by root, Sun Jul 1 23:40:07 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
15#define F_LATIN1 0x00000002UL 21#define F_LATIN1 0x00000002UL
16#define F_UTF8 0x00000004UL 22#define F_UTF8 0x00000004UL
17#define F_INDENT 0x00000008UL 23#define F_INDENT 0x00000008UL
18#define F_CANONICAL 0x00000010UL 24#define F_CANONICAL 0x00000010UL
19#define F_SPACE_BEFORE 0x00000020UL 25#define F_SPACE_BEFORE 0x00000020UL
20#define F_SPACE_AFTER 0x00000040UL 26#define F_SPACE_AFTER 0x00000040UL
21#define F_ALLOW_NONREF 0x00000100UL 27#define F_ALLOW_NONREF 0x00000100UL
22#define F_SHRINK 0x00000200UL 28#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL
23#define F_MAXDEPTH 0xf8000000UL 31#define F_MAXDEPTH 0xf8000000UL
24#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
25 36
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27 38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
30 39
31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
32#define F_DEFAULT (9UL << S_MAXDEPTH) 41#define F_DEFAULT (9UL << S_MAXDEPTH)
33 42
34#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
35#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
36 45
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) - 1; 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 || (enc->flags & F_LATIN1 && uch > 0xFF)) 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 }
210 else if (enc->flags & F_LATIN1) 226 else if (enc->json.flags & F_LATIN1)
211 { 227 {
212 *enc->cur++ = uch; 228 *enc->cur++ = uch;
213 str += clen; 229 str += clen;
214 } 230 }
215 else if (is_utf8) 231 else if (is_utf8)
… …
233 249
234 --len; 250 --len;
235 } 251 }
236} 252}
237 253
238static void 254inline void
239encode_indent (enc_t *enc) 255encode_indent (enc_t *enc)
240{ 256{
241 if (enc->flags & F_INDENT) 257 if (enc->json.flags & F_INDENT)
242 { 258 {
243 int spaces = enc->indent * INDENT_STEP; 259 int spaces = enc->indent * INDENT_STEP;
244 260
245 need (enc, spaces); 261 need (enc, spaces);
246 memset (enc->cur, ' ', spaces); 262 memset (enc->cur, ' ', spaces);
247 enc->cur += spaces; 263 enc->cur += spaces;
248 } 264 }
249} 265}
250 266
251static void 267inline void
252encode_space (enc_t *enc) 268encode_space (enc_t *enc)
253{ 269{
254 need (enc, 1); 270 need (enc, 1);
255 encode_ch (enc, ' '); 271 encode_ch (enc, ' ');
256} 272}
257 273
258static void 274inline void
259encode_nl (enc_t *enc) 275encode_nl (enc_t *enc)
260{ 276{
261 if (enc->flags & F_INDENT) 277 if (enc->json.flags & F_INDENT)
262 { 278 {
263 need (enc, 1); 279 need (enc, 1);
264 encode_ch (enc, '\n'); 280 encode_ch (enc, '\n');
265 } 281 }
266} 282}
267 283
268static void 284inline void
269encode_comma (enc_t *enc) 285encode_comma (enc_t *enc)
270{ 286{
271 encode_ch (enc, ','); 287 encode_ch (enc, ',');
272 288
273 if (enc->flags & F_INDENT) 289 if (enc->json.flags & F_INDENT)
274 encode_nl (enc); 290 encode_nl (enc);
275 else if (enc->flags & F_SPACE_AFTER) 291 else if (enc->json.flags & F_SPACE_AFTER)
276 encode_space (enc); 292 encode_space (enc);
277} 293}
278 294
279static void encode_sv (enc_t *enc, SV *sv); 295static void encode_sv (enc_t *enc, SV *sv);
280 296
… …
323 else 339 else
324 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 340 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
325 341
326 encode_ch (enc, '"'); 342 encode_ch (enc, '"');
327 343
328 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 344 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
329 encode_ch (enc, ':'); 345 encode_ch (enc, ':');
330 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 346 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
331 encode_sv (enc, HeVAL (he)); 347 encode_sv (enc, HeVAL (he));
332} 348}
333 349
334// compare hash entries, used when all keys are bytestrings 350// compare hash entries, used when all keys are bytestrings
335static int 351static int
… …
370 { 386 {
371 // for canonical output we have to sort by keys first 387 // for canonical output we have to sort by keys first
372 // actually, this is mostly due to the stupid so-called 388 // actually, this is mostly due to the stupid so-called
373 // security workaround added somewhere in 5.8.x. 389 // security workaround added somewhere in 5.8.x.
374 // that randomises hash orderings 390 // that randomises hash orderings
375 if (enc->flags & F_CANONICAL) 391 if (enc->json.flags & F_CANONICAL)
376 { 392 {
377 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
378 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
379 400
380 i = 0; 401 i = 0;
381 while ((he = hv_iternext (hv))) 402 while ((he = hv_iternext (hv)))
382 { 403 {
383 hes [i++] = he; 404 hes [i++] = he;
… …
447 svtype svt; 468 svtype svt;
448 469
449 SvGETMAGIC (sv); 470 SvGETMAGIC (sv);
450 svt = SvTYPE (sv); 471 svt = SvTYPE (sv);
451 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 }
452 if (svt == SVt_PVHV) 523 else if (svt == SVt_PVHV)
453 encode_hv (enc, (HV *)sv); 524 encode_hv (enc, (HV *)sv);
454 else if (svt == SVt_PVAV) 525 else if (svt == SVt_PVAV)
455 encode_av (enc, (AV *)sv); 526 encode_av (enc, (AV *)sv);
456 else if (svt < SVt_PVAV) 527 else if (svt < SVt_PVAV)
457 { 528 {
… …
481 encode_str (enc, str, len, SvUTF8 (sv)); 552 encode_str (enc, str, len, SvUTF8 (sv));
482 encode_ch (enc, '"'); 553 encode_ch (enc, '"');
483 } 554 }
484 else if (SvNOKp (sv)) 555 else if (SvNOKp (sv))
485 { 556 {
557 // trust that perl will do the right thing w.r.t. JSON syntax.
486 need (enc, NV_DIG + 32); 558 need (enc, NV_DIG + 32);
487 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 559 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
488 enc->cur += strlen (enc->cur); 560 enc->cur += strlen (enc->cur);
489 } 561 }
490 else if (SvIOKp (sv)) 562 else if (SvIOKp (sv))
491 { 563 {
492 need (enc, 64); 564 // we assume we can always read an IV as a UV
565 if (SvUV (sv) & ~(UV)0x7fff)
566 {
567 // large integer, use the (rather slow) snprintf way.
568 need (enc, sizeof (UV) * 3);
493 enc->cur += 569 enc->cur +=
494 SvIsUV(sv) 570 SvIsUV(sv)
495 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 571 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
496 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 572 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
573 }
574 else
575 {
576 // optimise the "small number case"
577 // code will likely be branchless and use only a single multiplication
578 I32 i = SvIV (sv);
579 U32 u;
580 char digit, nz = 0;
581
582 need (enc, 6);
583
584 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
585 u = i < 0 ? -i : i;
586
587 // convert to 4.28 fixed-point representation
588 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
589
590 // now output digit by digit, each time masking out the integer part
591 // and multiplying by 5 while moving the decimal point one to the right,
592 // resulting in a net multiplication by 10.
593 // we always write the digit to memory but conditionally increment
594 // the pointer, to ease the usage of conditional move instructions.
595 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
596 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
597 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
598 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
599 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
600 }
497 } 601 }
498 else if (SvROK (sv)) 602 else if (SvROK (sv))
499 encode_rv (enc, SvRV (sv)); 603 encode_rv (enc, SvRV (sv));
500 else if (!SvOK (sv)) 604 else if (!SvOK (sv))
501 encode_str (enc, "null", 4, 0); 605 encode_str (enc, "null", 4, 0);
… …
503 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 607 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
504 SvPV_nolen (sv), SvFLAGS (sv)); 608 SvPV_nolen (sv), SvFLAGS (sv));
505} 609}
506 610
507static SV * 611static SV *
508encode_json (SV *scalar, U32 flags) 612encode_json (SV *scalar, JSON *json)
509{ 613{
510 enc_t enc; 614 enc_t enc;
511 615
512 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 616 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
513 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 617 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
514 618
515 enc.flags = flags; 619 enc.json = *json;
516 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 620 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
517 enc.cur = SvPVX (enc.sv); 621 enc.cur = SvPVX (enc.sv);
518 enc.end = SvEND (enc.sv); 622 enc.end = SvEND (enc.sv);
519 enc.indent = 0; 623 enc.indent = 0;
520 enc.maxdepth = DEC_DEPTH (flags); 624 enc.maxdepth = DEC_DEPTH (enc.json.flags);
521 625
522 SvPOK_only (enc.sv); 626 SvPOK_only (enc.sv);
523 encode_sv (&enc, scalar); 627 encode_sv (&enc, scalar);
524 628
525 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 629 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
526 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 630 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
527 631
528 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 632 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
529 SvUTF8_on (enc.sv); 633 SvUTF8_on (enc.sv);
530 634
531 if (enc.flags & F_SHRINK) 635 if (enc.json.flags & F_SHRINK)
532 shrink (enc.sv); 636 shrink (enc.sv);
533 637
534 return enc.sv; 638 return enc.sv;
535} 639}
536 640
… …
541typedef struct 645typedef struct
542{ 646{
543 char *cur; // current parser pointer 647 char *cur; // current parser pointer
544 char *end; // end of input string 648 char *end; // end of input string
545 const char *err; // parse error, if != 0 649 const char *err; // parse error, if != 0
546 U32 flags; // F_* 650 JSON json;
547 U32 depth; // recursion depth 651 U32 depth; // recursion depth
548 U32 maxdepth; // recursion depth limit 652 U32 maxdepth; // recursion depth limit
549} dec_t; 653} dec_t;
550 654
551static void 655inline void
552decode_ws (dec_t *dec) 656decode_ws (dec_t *dec)
553{ 657{
554 for (;;) 658 for (;;)
555 { 659 {
556 char ch = *dec->cur; 660 char ch = *dec->cur;
… …
582decode_4hex (dec_t *dec) 686decode_4hex (dec_t *dec)
583{ 687{
584 signed char d1, d2, d3, d4; 688 signed char d1, d2, d3, d4;
585 unsigned char *cur = (unsigned char *)dec->cur; 689 unsigned char *cur = (unsigned char *)dec->cur;
586 690
587 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 691 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
588 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 692 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
589 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 693 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
590 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 694 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
591 695
592 dec->cur += 4; 696 dec->cur += 4;
593 697
594 return ((UV)d1) << 12 698 return ((UV)d1) << 12
595 | ((UV)d2) << 8 699 | ((UV)d2) << 8
… …
603static SV * 707static SV *
604decode_str (dec_t *dec) 708decode_str (dec_t *dec)
605{ 709{
606 SV *sv = 0; 710 SV *sv = 0;
607 int utf8 = 0; 711 int utf8 = 0;
712 char *dec_cur = dec->cur;
608 713
609 do 714 do
610 { 715 {
611 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 716 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
612 char *cur = buf; 717 char *cur = buf;
613 718
614 do 719 do
615 { 720 {
616 unsigned char ch = *(unsigned char *)dec->cur++; 721 unsigned char ch = *(unsigned char *)dec_cur++;
617 722
618 if (ch == '"') 723 if (expect_false (ch == '"'))
619 { 724 {
620 --dec->cur; 725 --dec_cur;
621 break; 726 break;
622 } 727 }
623 else if (ch == '\\') 728 else if (expect_false (ch == '\\'))
624 { 729 {
625 switch (*dec->cur) 730 switch (*dec_cur)
626 { 731 {
627 case '\\': 732 case '\\':
628 case '/': 733 case '/':
629 case '"': *cur++ = *dec->cur++; break; 734 case '"': *cur++ = *dec_cur++; break;
630 735
631 case 'b': ++dec->cur; *cur++ = '\010'; break; 736 case 'b': ++dec_cur; *cur++ = '\010'; break;
632 case 't': ++dec->cur; *cur++ = '\011'; break; 737 case 't': ++dec_cur; *cur++ = '\011'; break;
633 case 'n': ++dec->cur; *cur++ = '\012'; break; 738 case 'n': ++dec_cur; *cur++ = '\012'; break;
634 case 'f': ++dec->cur; *cur++ = '\014'; break; 739 case 'f': ++dec_cur; *cur++ = '\014'; break;
635 case 'r': ++dec->cur; *cur++ = '\015'; break; 740 case 'r': ++dec_cur; *cur++ = '\015'; break;
636 741
637 case 'u': 742 case 'u':
638 { 743 {
639 UV lo, hi; 744 UV lo, hi;
640 ++dec->cur; 745 ++dec_cur;
641 746
747 dec->cur = dec_cur;
642 hi = decode_4hex (dec); 748 hi = decode_4hex (dec);
749 dec_cur = dec->cur;
643 if (hi == (UV)-1) 750 if (hi == (UV)-1)
644 goto fail; 751 goto fail;
645 752
646 // possibly a surrogate pair 753 // possibly a surrogate pair
647 if (hi >= 0xd800) 754 if (hi >= 0xd800)
648 if (hi < 0xdc00) 755 if (hi < 0xdc00)
649 { 756 {
650 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 757 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
651 ERR ("missing low surrogate character in surrogate pair"); 758 ERR ("missing low surrogate character in surrogate pair");
652 759
653 dec->cur += 2; 760 dec_cur += 2;
654 761
762 dec->cur = dec_cur;
655 lo = decode_4hex (dec); 763 lo = decode_4hex (dec);
764 dec_cur = dec->cur;
656 if (lo == (UV)-1) 765 if (lo == (UV)-1)
657 goto fail; 766 goto fail;
658 767
659 if (lo < 0xdc00 || lo >= 0xe000) 768 if (lo < 0xdc00 || lo >= 0xe000)
660 ERR ("surrogate pair expected"); 769 ERR ("surrogate pair expected");
… …
674 *cur++ = hi; 783 *cur++ = hi;
675 } 784 }
676 break; 785 break;
677 786
678 default: 787 default:
679 --dec->cur; 788 --dec_cur;
680 ERR ("illegal backslash escape sequence in string"); 789 ERR ("illegal backslash escape sequence in string");
681 } 790 }
682 } 791 }
683 else if (ch >= 0x20 && ch <= 0x7f) 792 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
684 *cur++ = ch; 793 *cur++ = ch;
685 else if (ch >= 0x80) 794 else if (ch >= 0x80)
686 { 795 {
687 STRLEN clen; 796 STRLEN clen;
688 UV uch; 797 UV uch;
689 798
690 --dec->cur; 799 --dec_cur;
691 800
692 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 801 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
693 if (clen == (STRLEN)-1) 802 if (clen == (STRLEN)-1)
694 ERR ("malformed UTF-8 character in JSON string"); 803 ERR ("malformed UTF-8 character in JSON string");
695 804
696 do 805 do
697 *cur++ = *dec->cur++; 806 *cur++ = *dec_cur++;
698 while (--clen); 807 while (--clen);
699 808
700 utf8 = 1; 809 utf8 = 1;
701 } 810 }
702 else 811 else
703 { 812 {
704 --dec->cur; 813 --dec_cur;
705 814
706 if (!ch) 815 if (!ch)
707 ERR ("unexpected end of string while parsing JSON string"); 816 ERR ("unexpected end of string while parsing JSON string");
708 else 817 else
709 ERR ("invalid character encountered while parsing JSON string"); 818 ERR ("invalid character encountered while parsing JSON string");
… …
722 } 831 }
723 else 832 else
724 sv = newSVpvn (buf, len); 833 sv = newSVpvn (buf, len);
725 } 834 }
726 } 835 }
727 while (*dec->cur != '"'); 836 while (*dec_cur != '"');
728 837
729 ++dec->cur; 838 ++dec_cur;
730 839
731 if (sv) 840 if (sv)
732 { 841 {
733 SvPOK_only (sv); 842 SvPOK_only (sv);
734 *SvEND (sv) = 0; 843 *SvEND (sv) = 0;
… …
737 SvUTF8_on (sv); 846 SvUTF8_on (sv);
738 } 847 }
739 else 848 else
740 sv = newSVpvn ("", 0); 849 sv = newSVpvn ("", 0);
741 850
851 dec->cur = dec_cur;
742 return sv; 852 return sv;
743 853
744fail: 854fail:
855 dec->cur = dec_cur;
745 return 0; 856 return 0;
746} 857}
747 858
748static SV * 859static SV *
749decode_num (dec_t *dec) 860decode_num (dec_t *dec)
… …
807 is_nv = 1; 918 is_nv = 1;
808 } 919 }
809 920
810 if (!is_nv) 921 if (!is_nv)
811 { 922 {
812 UV uv; 923 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
813 int numtype = grok_number (start, dec->cur - start, &uv); 924 if (*start == '-')
814 if (numtype & IS_NUMBER_IN_UV) 925 switch (dec->cur - start)
815 if (numtype & IS_NUMBER_NEG)
816 { 926 {
817 if (uv < (UV)IV_MIN) 927 case 2: return newSViv (-( start [1] - '0' * 1));
818 return newSViv (-(IV)uv); 928 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
929 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
930 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
819 } 931 }
932 else
933 switch (dec->cur - start)
934 {
935 case 1: return newSViv ( start [0] - '0' * 1);
936 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
937 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
938 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
939 }
940
941 {
942 UV uv;
943 int numtype = grok_number (start, dec->cur - start, &uv);
944 if (numtype & IS_NUMBER_IN_UV)
945 if (numtype & IS_NUMBER_NEG)
946 {
947 if (uv < (UV)IV_MIN)
948 return newSViv (-(IV)uv);
949 }
820 else 950 else
821 return newSVuv (uv); 951 return newSVuv (uv);
952
953 // here would likely be the place for bigint support
822 } 954 }
955 }
823 956
957 // if we ever support bigint or bigfloat, this is the place for bigfloat
824 return newSVnv (Atof (start)); 958 return newSVnv (Atof (start));
825 959
826fail: 960fail:
827 return 0; 961 return 0;
828} 962}
… …
872} 1006}
873 1007
874static SV * 1008static SV *
875decode_hv (dec_t *dec) 1009decode_hv (dec_t *dec)
876{ 1010{
1011 SV *sv;
877 HV *hv = newHV (); 1012 HV *hv = newHV ();
878 1013
879 DEC_INC_DEPTH; 1014 DEC_INC_DEPTH;
880 decode_ws (dec); 1015 decode_ws (dec);
881 1016
882 if (*dec->cur == '}') 1017 if (*dec->cur == '}')
883 ++dec->cur; 1018 ++dec->cur;
884 else 1019 else
885 for (;;) 1020 for (;;)
886 { 1021 {
887 SV *key, *value;
888
889 decode_ws (dec); EXPECT_CH ('"'); 1022 decode_ws (dec); EXPECT_CH ('"');
890 1023
891 key = decode_str (dec); 1024 // heuristic: assume that
892 if (!key) 1025 // a) decode_str + hv_store_ent are abysmally slow.
893 goto fail; 1026 // b) most hash keys are short, simple ascii text.
1027 // => try to "fast-match" such strings to avoid
1028 // the overhead of decode_str + hv_store_ent.
1029 {
1030 SV *value;
1031 char *p = dec->cur;
1032 char *e = p + 24; // only try up to 24 bytes
894 1033
895 decode_ws (dec); EXPECT_CH (':'); 1034 for (;;)
896
897 value = decode_sv (dec);
898 if (!value)
899 { 1035 {
1036 // the >= 0x80 is true on most architectures
1037 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1038 {
1039 // slow path, back up and use decode_str
1040 SV *key = decode_str (dec);
1041 if (!key)
1042 goto fail;
1043
1044 decode_ws (dec); EXPECT_CH (':');
1045
1046 value = decode_sv (dec);
1047 if (!value)
1048 {
1049 SvREFCNT_dec (key);
1050 goto fail;
1051 }
1052
1053 hv_store_ent (hv, key, value, 0);
900 SvREFCNT_dec (key); 1054 SvREFCNT_dec (key);
1055
1056 break;
1057 }
1058 else if (*p == '"')
1059 {
1060 // fast path, got a simple key
1061 char *key = dec->cur;
1062 int len = p - key;
1063 dec->cur = p + 1;
1064
1065 decode_ws (dec); EXPECT_CH (':');
1066
1067 value = decode_sv (dec);
1068 if (!value)
901 goto fail; 1069 goto fail;
1070
1071 hv_store (hv, key, len, value, 0);
1072
1073 break;
1074 }
1075
1076 ++p;
902 } 1077 }
903 1078 }
904 hv_store_ent (hv, key, value, 0);
905 SvREFCNT_dec (key);
906 1079
907 decode_ws (dec); 1080 decode_ws (dec);
908 1081
909 if (*dec->cur == '}') 1082 if (*dec->cur == '}')
910 { 1083 {
… …
917 1090
918 ++dec->cur; 1091 ++dec->cur;
919 } 1092 }
920 1093
921 DEC_DEC_DEPTH; 1094 DEC_DEC_DEPTH;
1095 sv = newRV_noinc ((SV *)hv);
1096
1097 // check filter callbacks
1098 if (dec->json.flags & F_HOOK)
1099 {
1100 ENTER; SAVETMPS;
1101
1102 if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103 {
1104 int count;
1105
1106 dSP; PUSHMARK (SP);
1107 XPUSHs (sv_2mortal (sv));
1108
1109 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN;
1110
1111 if (count == 1)
1112 sv = newSVsv (POPs);
1113 else
1114 SvREFCNT_inc (sv);
1115 }
1116
1117 if (dec->json.cb_object)
1118 {
1119 int count;
1120
1121 dSP; ENTER; SAVETMPS; PUSHMARK (SP);
1122 XPUSHs (sv_2mortal (sv));
1123
1124 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125
1126 if (count == 1)
1127 sv = newSVsv (POPs);
1128 else
1129 SvREFCNT_inc (sv);
1130 }
1131
1132 FREETMPS; LEAVE;
1133 }
1134
922 return newRV_noinc ((SV *)hv); 1135 return newRV_noinc ((SV *)hv);
923 1136
924fail: 1137fail:
925 SvREFCNT_dec (hv); 1138 SvREFCNT_dec (hv);
926 DEC_DEC_DEPTH; 1139 DEC_DEC_DEPTH;
… …
929 1142
930static SV * 1143static SV *
931decode_sv (dec_t *dec) 1144decode_sv (dec_t *dec)
932{ 1145{
933 decode_ws (dec); 1146 decode_ws (dec);
1147
1148 // the beauty of JSON: you need exactly one character lookahead
1149 // to parse anything.
934 switch (*dec->cur) 1150 switch (*dec->cur)
935 { 1151 {
936 case '"': ++dec->cur; return decode_str (dec); 1152 case '"': ++dec->cur; return decode_str (dec);
937 case '[': ++dec->cur; return decode_av (dec); 1153 case '[': ++dec->cur; return decode_av (dec);
938 case '{': ++dec->cur; return decode_hv (dec); 1154 case '{': ++dec->cur; return decode_hv (dec);
… …
944 1160
945 case 't': 1161 case 't':
946 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1162 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
947 { 1163 {
948 dec->cur += 4; 1164 dec->cur += 4;
949 return newSViv (1); 1165 return SvREFCNT_inc (json_true);
950 } 1166 }
951 else 1167 else
952 ERR ("'true' expected"); 1168 ERR ("'true' expected");
953 1169
954 break; 1170 break;
955 1171
956 case 'f': 1172 case 'f':
957 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1173 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
958 { 1174 {
959 dec->cur += 5; 1175 dec->cur += 5;
960 return newSViv (0); 1176 return SvREFCNT_inc (json_false);
961 } 1177 }
962 else 1178 else
963 ERR ("'false' expected"); 1179 ERR ("'false' expected");
964 1180
965 break; 1181 break;
… …
983fail: 1199fail:
984 return 0; 1200 return 0;
985} 1201}
986 1202
987static SV * 1203static SV *
988decode_json (SV *string, U32 flags) 1204decode_json (SV *string, JSON *json, UV *offset_return)
989{ 1205{
990 dec_t dec; 1206 dec_t dec;
1207 UV offset;
991 SV *sv; 1208 SV *sv;
992 1209
993 SvGETMAGIC (string); 1210 SvGETMAGIC (string);
994 SvUPGRADE (string, SVt_PV); 1211 SvUPGRADE (string, SVt_PV);
995 1212
1213 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1214 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1215 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1216
996 if (flags & F_UTF8) 1217 if (json->flags & F_UTF8)
997 sv_utf8_downgrade (string, 0); 1218 sv_utf8_downgrade (string, 0);
998 else 1219 else
999 sv_utf8_upgrade (string); 1220 sv_utf8_upgrade (string);
1000 1221
1001 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1222 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1002 1223
1003 dec.flags = flags; 1224 dec.json = *json;
1004 dec.cur = SvPVX (string); 1225 dec.cur = SvPVX (string);
1005 dec.end = SvEND (string); 1226 dec.end = SvEND (string);
1006 dec.err = 0; 1227 dec.err = 0;
1007 dec.depth = 0; 1228 dec.depth = 0;
1008 dec.maxdepth = DEC_DEPTH (dec.flags); 1229 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1009 1230
1231 if (dec.json.cb_object || dec.json.cb_sk_object)
1232 dec.json.flags |= F_HOOK;
1233
1010 *dec.end = 0; // this should basically be a nop, too, but make sure its there 1234 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1011 sv = decode_sv (&dec); 1235 sv = decode_sv (&dec);
1012 1236
1237 if (!(offset_return || !sv))
1238 {
1239 // check for trailing garbage
1240 decode_ws (&dec);
1241
1242 if (*dec.cur)
1243 {
1244 dec.err = "garbage after JSON object";
1245 SvREFCNT_dec (sv);
1246 sv = 0;
1247 }
1248 }
1249
1250 if (offset_return || !sv)
1251 {
1252 offset = dec.json.flags & F_UTF8
1253 ? dec.cur - SvPVX (string)
1254 : utf8_distance (dec.cur, SvPVX (string));
1255
1256 if (offset_return)
1257 *offset_return = offset;
1258 }
1259
1013 if (!sv) 1260 if (!sv)
1014 { 1261 {
1015 IV offset = dec.flags & F_UTF8
1016 ? dec.cur - SvPVX (string)
1017 : utf8_distance (dec.cur, SvPVX (string));
1018 SV *uni = sv_newmortal (); 1262 SV *uni = sv_newmortal ();
1019 1263
1020 // horrible hack to silence warning inside pv_uni_display 1264 // horrible hack to silence warning inside pv_uni_display
1021 COP cop = *PL_curcop; 1265 COP cop = *PL_curcop;
1022 cop.cop_warnings = pWARN_NONE; 1266 cop.cop_warnings = pWARN_NONE;
… …
1032 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1276 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1033 } 1277 }
1034 1278
1035 sv = sv_2mortal (sv); 1279 sv = sv_2mortal (sv);
1036 1280
1037 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1281 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1038 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1282 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1039 1283
1040 return sv; 1284 return sv;
1041} 1285}
1042 1286
… …
1046MODULE = JSON::XS PACKAGE = JSON::XS 1290MODULE = JSON::XS PACKAGE = JSON::XS
1047 1291
1048BOOT: 1292BOOT:
1049{ 1293{
1050 int i; 1294 int i;
1051
1052 memset (decode_hexdigit, 0xff, 256);
1053 1295
1054 for (i = 0; i < 256; ++i) 1296 for (i = 0; i < 256; ++i)
1055 decode_hexdigit [i] = 1297 decode_hexdigit [i] =
1056 i >= '0' && i <= '9' ? i - '0' 1298 i >= '0' && i <= '9' ? i - '0'
1057 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1299 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1058 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1300 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1059 : -1; 1301 : -1;
1060 1302
1061 json_stash = gv_stashpv ("JSON::XS", 1); 1303 json_stash = gv_stashpv ("JSON::XS" , 1);
1304 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1305
1306 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1307 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1062} 1308}
1063 1309
1064PROTOTYPES: DISABLE 1310PROTOTYPES: DISABLE
1065 1311
1066SV *new (char *dummy) 1312void new (char *klass)
1067 CODE: 1313 PPCODE:
1068 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1314{
1069 OUTPUT: 1315 SV *pv = NEWSV (0, sizeof (JSON));
1070 RETVAL 1316 SvPOK_only (pv);
1317 Zero (SvPVX (pv), 1, JSON);
1318 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1319 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1320}
1071 1321
1072SV *ascii (SV *self, int enable = 1) 1322void ascii (JSON *self, int enable = 1)
1073 ALIAS: 1323 ALIAS:
1074 ascii = F_ASCII 1324 ascii = F_ASCII
1075 latin1 = F_LATIN1 1325 latin1 = F_LATIN1
1076 utf8 = F_UTF8 1326 utf8 = F_UTF8
1077 indent = F_INDENT 1327 indent = F_INDENT
1078 canonical = F_CANONICAL 1328 canonical = F_CANONICAL
1079 space_before = F_SPACE_BEFORE 1329 space_before = F_SPACE_BEFORE
1080 space_after = F_SPACE_AFTER 1330 space_after = F_SPACE_AFTER
1081 pretty = F_PRETTY 1331 pretty = F_PRETTY
1082 allow_nonref = F_ALLOW_NONREF 1332 allow_nonref = F_ALLOW_NONREF
1083 shrink = F_SHRINK 1333 shrink = F_SHRINK
1334 allow_blessed = F_ALLOW_BLESSED
1335 convert_blessed = F_CONV_BLESSED
1084 CODE: 1336 PPCODE:
1085{ 1337{
1086 UV *uv = SvJSON (self);
1087 if (enable) 1338 if (enable)
1088 *uv |= ix; 1339 self->flags |= ix;
1089 else 1340 else
1090 *uv &= ~ix; 1341 self->flags &= ~ix;
1091 1342
1092 RETVAL = newSVsv (self); 1343 XPUSHs (ST (0));
1093} 1344}
1094 OUTPUT:
1095 RETVAL
1096 1345
1097SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1346void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1098 CODE: 1347 PPCODE:
1099{ 1348{
1100 UV *uv = SvJSON (self);
1101 UV log2 = 0; 1349 UV log2 = 0;
1102 1350
1103 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1351 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1104 1352
1105 while ((1UL << log2) < max_depth) 1353 while ((1UL << log2) < max_depth)
1106 ++log2; 1354 ++log2;
1107 1355
1108 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1356 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1109 1357
1110 RETVAL = newSVsv (self); 1358 XPUSHs (ST (0));
1111} 1359}
1112 OUTPUT:
1113 RETVAL
1114 1360
1115void encode (SV *self, SV *scalar) 1361void max_size (JSON *self, UV max_size = 0)
1116 PPCODE: 1362 PPCODE:
1117 XPUSHs (encode_json (scalar, *SvJSON (self))); 1363{
1364 UV log2 = 0;
1118 1365
1119void decode (SV *self, SV *jsonstr) 1366 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1367 if (max_size == 1) max_size = 2;
1368
1369 while ((1UL << log2) < max_size)
1370 ++log2;
1371
1372 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1373
1374 XPUSHs (ST (0));
1375}
1376
1377void filter_json_objects (JSON *self, SV *cb = &PL_sv_undef)
1378 ALIAS:
1379 filter_sk_json_objects = 1
1120 PPCODE: 1380 PPCODE:
1381{
1382 if (!SvOK (cb))
1383 cb = 0;
1384
1385 switch (ix)
1386 {
1387 case 0: self->cb_object = cb; break;
1388 case 1: self->cb_sk_object = cb; break;
1389 }
1390
1391 XPUSHs (ST (0));
1392}
1393
1394void encode (JSON *self, SV *scalar)
1395 PPCODE:
1396 XPUSHs (encode_json (scalar, self));
1397
1398void decode (JSON *self, SV *jsonstr)
1399 PPCODE:
1121 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1400 XPUSHs (decode_json (jsonstr, self, 0));
1401
1402void decode_prefix (JSON *self, SV *jsonstr)
1403 PPCODE:
1404{
1405 UV offset;
1406 EXTEND (SP, 2);
1407 PUSHs (decode_json (jsonstr, self, &offset));
1408 PUSHs (sv_2mortal (newSVuv (offset)));
1409}
1122 1410
1123PROTOTYPES: ENABLE 1411PROTOTYPES: ENABLE
1124 1412
1125void to_json (SV *scalar) 1413void to_json (SV *scalar)
1126 ALIAS:
1127 objToJson = 0
1128 PPCODE: 1414 PPCODE:
1415{
1416 JSON json = { F_DEFAULT | F_UTF8 };
1129 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1417 XPUSHs (encode_json (scalar, &json));
1418}
1130 1419
1131void from_json (SV *jsonstr) 1420void from_json (SV *jsonstr)
1132 ALIAS:
1133 jsonToObj = 0
1134 PPCODE: 1421 PPCODE:
1422{
1423 JSON json = { F_DEFAULT | F_UTF8 };
1135 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8)); 1424 XPUSHs (decode_json (jsonstr, &json, 0));
1425}
1136 1426

Diff Legend

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