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.35 by root, Wed Jun 6 14:52:49 2007 UTC vs.
Revision 1.55 by root, Mon Jul 23 22:57:40 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
42#if __GNUC__ >= 3 51#if __GNUC__ >= 3
48#endif 57#endif
49 58
50#define expect_false(expr) expect ((expr) != 0, 0) 59#define expect_false(expr) expect ((expr) != 0, 0)
51#define expect_true(expr) expect ((expr) != 0, 1) 60#define expect_true(expr) expect ((expr) != 0, 1)
52 61
53static 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;
68 HV *cb_sk_object;
69} JSON;
54 70
55///////////////////////////////////////////////////////////////////////////// 71/////////////////////////////////////////////////////////////////////////////
56// utility functions 72// utility functions
57 73
58static UV * 74inline void
59SvJSON (SV *sv)
60{
61 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62 croak ("object is not of type JSON::XS");
63
64 return &SvUVX (SvRV (sv));
65}
66
67static void
68shrink (SV *sv) 75shrink (SV *sv)
69{ 76{
70 sv_utf8_downgrade (sv, 1); 77 sv_utf8_downgrade (sv, 1);
71 if (SvLEN (sv) > SvCUR (sv) + 1) 78 if (SvLEN (sv) > SvCUR (sv) + 1)
72 { 79 {
107typedef struct 114typedef struct
108{ 115{
109 char *cur; // SvPVX (sv) + current output position 116 char *cur; // SvPVX (sv) + current output position
110 char *end; // SvEND (sv) 117 char *end; // SvEND (sv)
111 SV *sv; // result scalar 118 SV *sv; // result scalar
112 U32 flags; // F_* 119 JSON json;
113 U32 indent; // indentation level 120 U32 indent; // indentation level
114 U32 maxdepth; // max. indentation/recursion level 121 U32 maxdepth; // max. indentation/recursion level
115} enc_t; 122} enc_t;
116 123
117inline void 124inline void
178 STRLEN clen; 185 STRLEN clen;
179 UV uch; 186 UV uch;
180 187
181 if (is_utf8) 188 if (is_utf8)
182 { 189 {
183 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
184 uch = decode_utf8 (str, end - str, &clen); 190 uch = decode_utf8 (str, end - str, &clen);
185 if (clen == (STRLEN)-1) 191 if (clen == (STRLEN)-1)
186 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 192 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
187 } 193 }
188 else 194 else
192 } 198 }
193 199
194 if (uch > 0x10FFFFUL) 200 if (uch > 0x10FFFFUL)
195 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 201 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
196 202
197 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 203 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
198 { 204 {
199 if (uch > 0xFFFFUL) 205 if (uch > 0xFFFFUL)
200 { 206 {
201 need (enc, len += 11); 207 need (enc, len += 11);
202 sprintf (enc->cur, "\\u%04x\\u%04x", 208 sprintf (enc->cur, "\\u%04x\\u%04x",
216 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 222 *enc->cur++ = hexdigit [(uch >> 0) & 15];
217 } 223 }
218 224
219 str += clen; 225 str += clen;
220 } 226 }
221 else if (enc->flags & F_LATIN1) 227 else if (enc->json.flags & F_LATIN1)
222 { 228 {
223 *enc->cur++ = uch; 229 *enc->cur++ = uch;
224 str += clen; 230 str += clen;
225 } 231 }
226 else if (is_utf8) 232 else if (is_utf8)
247} 253}
248 254
249inline void 255inline void
250encode_indent (enc_t *enc) 256encode_indent (enc_t *enc)
251{ 257{
252 if (enc->flags & F_INDENT) 258 if (enc->json.flags & F_INDENT)
253 { 259 {
254 int spaces = enc->indent * INDENT_STEP; 260 int spaces = enc->indent * INDENT_STEP;
255 261
256 need (enc, spaces); 262 need (enc, spaces);
257 memset (enc->cur, ' ', spaces); 263 memset (enc->cur, ' ', spaces);
267} 273}
268 274
269inline void 275inline void
270encode_nl (enc_t *enc) 276encode_nl (enc_t *enc)
271{ 277{
272 if (enc->flags & F_INDENT) 278 if (enc->json.flags & F_INDENT)
273 { 279 {
274 need (enc, 1); 280 need (enc, 1);
275 encode_ch (enc, '\n'); 281 encode_ch (enc, '\n');
276 } 282 }
277} 283}
279inline void 285inline void
280encode_comma (enc_t *enc) 286encode_comma (enc_t *enc)
281{ 287{
282 encode_ch (enc, ','); 288 encode_ch (enc, ',');
283 289
284 if (enc->flags & F_INDENT) 290 if (enc->json.flags & F_INDENT)
285 encode_nl (enc); 291 encode_nl (enc);
286 else if (enc->flags & F_SPACE_AFTER) 292 else if (enc->json.flags & F_SPACE_AFTER)
287 encode_space (enc); 293 encode_space (enc);
288} 294}
289 295
290static void encode_sv (enc_t *enc, SV *sv); 296static void encode_sv (enc_t *enc, SV *sv);
291 297
300 encode_ch (enc, '['); encode_nl (enc); 306 encode_ch (enc, '['); encode_nl (enc);
301 ++enc->indent; 307 ++enc->indent;
302 308
303 for (i = 0; i <= len; ++i) 309 for (i = 0; i <= len; ++i)
304 { 310 {
311 SV **svp = av_fetch (av, i, 0);
312
305 encode_indent (enc); 313 encode_indent (enc);
306 encode_sv (enc, *av_fetch (av, i, 0)); 314
315 if (svp)
316 encode_sv (enc, *svp);
317 else
318 encode_str (enc, "null", 4, 0);
307 319
308 if (i < len) 320 if (i < len)
309 encode_comma (enc); 321 encode_comma (enc);
310 } 322 }
311 323
334 else 346 else
335 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 347 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
336 348
337 encode_ch (enc, '"'); 349 encode_ch (enc, '"');
338 350
339 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 351 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
340 encode_ch (enc, ':'); 352 encode_ch (enc, ':');
341 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 353 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
342 encode_sv (enc, HeVAL (he)); 354 encode_sv (enc, HeVAL (he));
343} 355}
344 356
345// compare hash entries, used when all keys are bytestrings 357// compare hash entries, used when all keys are bytestrings
346static int 358static int
381 { 393 {
382 // for canonical output we have to sort by keys first 394 // for canonical output we have to sort by keys first
383 // actually, this is mostly due to the stupid so-called 395 // actually, this is mostly due to the stupid so-called
384 // security workaround added somewhere in 5.8.x. 396 // security workaround added somewhere in 5.8.x.
385 // that randomises hash orderings 397 // that randomises hash orderings
386 if (enc->flags & F_CANONICAL) 398 if (enc->json.flags & F_CANONICAL)
387 { 399 {
388 int fast = 1; 400 int fast = 1;
389 HE *he; 401 HE *he;
390#if defined(__BORLANDC__) || defined(_MSC_VER) 402#if defined(__BORLANDC__) || defined(_MSC_VER)
391 HE **hes = _alloca (count * sizeof (HE)); 403 HE **hes = _alloca (count * sizeof (HE));
463 svtype svt; 475 svtype svt;
464 476
465 SvGETMAGIC (sv); 477 SvGETMAGIC (sv);
466 svt = SvTYPE (sv); 478 svt = SvTYPE (sv);
467 479
480 if (expect_false (SvOBJECT (sv)))
481 {
482 if (SvSTASH (sv) == json_boolean_stash)
483 {
484 if (SvIV (sv))
485 encode_str (enc, "true", 4, 0);
486 else
487 encode_str (enc, "false", 5, 0);
488 }
489 else
490 {
491#if 0
492 if (0 && sv_derived_from (rv, "JSON::Literal"))
493 {
494 // not yet
495 }
496#endif
497 if (enc->json.flags & F_CONV_BLESSED)
498 {
499 // we re-bless the reference to get overload and other niceties right
500 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501
502 if (to_json)
503 {
504 int count;
505 dSP;
506
507 ENTER; SAVETMPS; PUSHMARK (SP);
508 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509
510 // calling with G_SCALAR ensures that we always get a 1 return value
511 PUTBACK;
512 call_sv ((SV *)GvCV (to_json), G_SCALAR);
513 SPAGAIN;
514
515 // catch this surprisingly common error
516 if (SvROK (TOPs) && SvRV (TOPs) == sv)
517 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
518
519 sv = POPs;
520 PUTBACK;
521
522 encode_sv (enc, sv);
523
524 FREETMPS; LEAVE;
525 }
526 else if (enc->json.flags & F_ALLOW_BLESSED)
527 encode_str (enc, "null", 4, 0);
528 else
529 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
530 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
531 }
532 else if (enc->json.flags & F_ALLOW_BLESSED)
533 encode_str (enc, "null", 4, 0);
534 else
535 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
536 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
537 }
538 }
468 if (svt == SVt_PVHV) 539 else if (svt == SVt_PVHV)
469 encode_hv (enc, (HV *)sv); 540 encode_hv (enc, (HV *)sv);
470 else if (svt == SVt_PVAV) 541 else if (svt == SVt_PVAV)
471 encode_av (enc, (AV *)sv); 542 encode_av (enc, (AV *)sv);
472 else if (svt < SVt_PVAV) 543 else if (svt < SVt_PVAV)
473 { 544 {
474 if (SvNIOK (sv) && SvIV (sv) == 0) 545 STRLEN len = 0;
546 char *pv = svt ? SvPV (sv, len) : 0;
547
548 if (len == 1 && *pv == '1')
549 encode_str (enc, "true", 4, 0);
550 else if (len == 1 && *pv == '0')
475 encode_str (enc, "false", 5, 0); 551 encode_str (enc, "false", 5, 0);
476 else if (SvNIOK (sv) && SvIV (sv) == 1)
477 encode_str (enc, "true", 4, 0);
478 else 552 else
479 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 553 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
480 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 554 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
481 } 555 }
482 else 556 else
497 encode_str (enc, str, len, SvUTF8 (sv)); 571 encode_str (enc, str, len, SvUTF8 (sv));
498 encode_ch (enc, '"'); 572 encode_ch (enc, '"');
499 } 573 }
500 else if (SvNOKp (sv)) 574 else if (SvNOKp (sv))
501 { 575 {
576 // trust that perl will do the right thing w.r.t. JSON syntax.
502 need (enc, NV_DIG + 32); 577 need (enc, NV_DIG + 32);
503 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 578 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
504 enc->cur += strlen (enc->cur); 579 enc->cur += strlen (enc->cur);
505 } 580 }
506 else if (SvIOKp (sv)) 581 else if (SvIOKp (sv))
507 { 582 {
508 // we assume we can always read an IV as a UV 583 // we assume we can always read an IV as a UV
509 if (SvUV (sv) & ~(UV)0x7fff) 584 if (SvUV (sv) & ~(UV)0x7fff)
510 { 585 {
586 // large integer, use the (rather slow) snprintf way.
511 need (enc, 32); 587 need (enc, sizeof (UV) * 3);
512 enc->cur += 588 enc->cur +=
513 SvIsUV(sv) 589 SvIsUV(sv)
514 ? snprintf (enc->cur, 32, "%"UVuf, (UV)SvUVX (sv)) 590 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
515 : snprintf (enc->cur, 32, "%"IVdf, (IV)SvIVX (sv)); 591 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
516 } 592 }
517 else 593 else
518 { 594 {
519 // optimise the "small number case" 595 // optimise the "small number case"
520 // code will likely be branchless and use only a single multiplication 596 // code will likely be branchless and use only a single multiplication
521 I32 i = SvIV (sv); 597 I32 i = SvIV (sv);
522 U32 u; 598 U32 u;
599 char digit, nz = 0;
523 600
524 need (enc, 6); 601 need (enc, 6);
525 602
526 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0; 603 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
527 u = i < 0 ? -i : i; 604 u = i < 0 ? -i : i;
528 605
529 // convert to 4.28 fixed-point representation 606 // convert to 4.28 fixed-point representation
530 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits 607 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
531 608
532 char digit, nz = 0; 609 // now output digit by digit, each time masking out the integer part
533 610 // and multiplying by 5 while moving the decimal point one to the right,
611 // resulting in a net multiplication by 10.
612 // we always write the digit to memory but conditionally increment
613 // the pointer, to ease the usage of conditional move instructions.
534 digit = u >> 28; *enc->cur = digit + '0'; nz |= digit; enc->cur += nz ? 1 : 0; u = (u & 0xfffffff) * 5; 614 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
535 digit = u >> 27; *enc->cur = digit + '0'; nz |= digit; enc->cur += nz ? 1 : 0; u = (u & 0x7ffffff) * 5; 615 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
536 digit = u >> 26; *enc->cur = digit + '0'; nz |= digit; enc->cur += nz ? 1 : 0; u = (u & 0x3ffffff) * 5; 616 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
537 digit = u >> 25; *enc->cur = digit + '0'; nz |= digit; enc->cur += nz ? 1 : 0; u = (u & 0x1ffffff) * 5; 617 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
538 digit = u >> 24; *enc->cur = digit + '0'; nz |= digit; enc->cur += 1; 618 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
539 } 619 }
540 } 620 }
541 else if (SvROK (sv)) 621 else if (SvROK (sv))
542 encode_rv (enc, SvRV (sv)); 622 encode_rv (enc, SvRV (sv));
543 else if (!SvOK (sv)) 623 else if (!SvOK (sv))
546 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 626 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
547 SvPV_nolen (sv), SvFLAGS (sv)); 627 SvPV_nolen (sv), SvFLAGS (sv));
548} 628}
549 629
550static SV * 630static SV *
551encode_json (SV *scalar, U32 flags) 631encode_json (SV *scalar, JSON *json)
552{ 632{
553 enc_t enc; 633 enc_t enc;
554 634
555 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 635 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
556 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 636 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
557 637
558 enc.flags = flags; 638 enc.json = *json;
559 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 639 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
560 enc.cur = SvPVX (enc.sv); 640 enc.cur = SvPVX (enc.sv);
561 enc.end = SvEND (enc.sv); 641 enc.end = SvEND (enc.sv);
562 enc.indent = 0; 642 enc.indent = 0;
563 enc.maxdepth = DEC_DEPTH (flags); 643 enc.maxdepth = DEC_DEPTH (enc.json.flags);
564 644
565 SvPOK_only (enc.sv); 645 SvPOK_only (enc.sv);
566 encode_sv (&enc, scalar); 646 encode_sv (&enc, scalar);
567 647
568 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 648 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
569 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 649 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
570 650
571 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 651 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
572 SvUTF8_on (enc.sv); 652 SvUTF8_on (enc.sv);
573 653
574 if (enc.flags & F_SHRINK) 654 if (enc.json.flags & F_SHRINK)
575 shrink (enc.sv); 655 shrink (enc.sv);
576 656
577 return enc.sv; 657 return enc.sv;
578} 658}
579 659
584typedef struct 664typedef struct
585{ 665{
586 char *cur; // current parser pointer 666 char *cur; // current parser pointer
587 char *end; // end of input string 667 char *end; // end of input string
588 const char *err; // parse error, if != 0 668 const char *err; // parse error, if != 0
589 U32 flags; // F_* 669 JSON json;
590 U32 depth; // recursion depth 670 U32 depth; // recursion depth
591 U32 maxdepth; // recursion depth limit 671 U32 maxdepth; // recursion depth limit
592} dec_t; 672} dec_t;
593 673
594inline void 674inline void
625decode_4hex (dec_t *dec) 705decode_4hex (dec_t *dec)
626{ 706{
627 signed char d1, d2, d3, d4; 707 signed char d1, d2, d3, d4;
628 unsigned char *cur = (unsigned char *)dec->cur; 708 unsigned char *cur = (unsigned char *)dec->cur;
629 709
630 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("four hexadecimal digits expected"); 710 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
631 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("four hexadecimal digits expected"); 711 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
632 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("four hexadecimal digits expected"); 712 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
633 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("four hexadecimal digits expected"); 713 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
634 714
635 dec->cur += 4; 715 dec->cur += 4;
636 716
637 return ((UV)d1) << 12 717 return ((UV)d1) << 12
638 | ((UV)d2) << 8 718 | ((UV)d2) << 8
646static SV * 726static SV *
647decode_str (dec_t *dec) 727decode_str (dec_t *dec)
648{ 728{
649 SV *sv = 0; 729 SV *sv = 0;
650 int utf8 = 0; 730 int utf8 = 0;
731 char *dec_cur = dec->cur;
651 732
652 do 733 do
653 { 734 {
654 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 735 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
655 char *cur = buf; 736 char *cur = buf;
656 737
657 do 738 do
658 { 739 {
659 unsigned char ch = *(unsigned char *)dec->cur++; 740 unsigned char ch = *(unsigned char *)dec_cur++;
660 741
661 if (expect_false (ch == '"')) 742 if (expect_false (ch == '"'))
662 { 743 {
663 --dec->cur; 744 --dec_cur;
664 break; 745 break;
665 } 746 }
666 else if (expect_false (ch == '\\')) 747 else if (expect_false (ch == '\\'))
667 { 748 {
668 switch (*dec->cur) 749 switch (*dec_cur)
669 { 750 {
670 case '\\': 751 case '\\':
671 case '/': 752 case '/':
672 case '"': *cur++ = *dec->cur++; break; 753 case '"': *cur++ = *dec_cur++; break;
673 754
674 case 'b': ++dec->cur; *cur++ = '\010'; break; 755 case 'b': ++dec_cur; *cur++ = '\010'; break;
675 case 't': ++dec->cur; *cur++ = '\011'; break; 756 case 't': ++dec_cur; *cur++ = '\011'; break;
676 case 'n': ++dec->cur; *cur++ = '\012'; break; 757 case 'n': ++dec_cur; *cur++ = '\012'; break;
677 case 'f': ++dec->cur; *cur++ = '\014'; break; 758 case 'f': ++dec_cur; *cur++ = '\014'; break;
678 case 'r': ++dec->cur; *cur++ = '\015'; break; 759 case 'r': ++dec_cur; *cur++ = '\015'; break;
679 760
680 case 'u': 761 case 'u':
681 { 762 {
682 UV lo, hi; 763 UV lo, hi;
683 ++dec->cur; 764 ++dec_cur;
684 765
766 dec->cur = dec_cur;
685 hi = decode_4hex (dec); 767 hi = decode_4hex (dec);
768 dec_cur = dec->cur;
686 if (hi == (UV)-1) 769 if (hi == (UV)-1)
687 goto fail; 770 goto fail;
688 771
689 // possibly a surrogate pair 772 // possibly a surrogate pair
690 if (hi >= 0xd800) 773 if (hi >= 0xd800)
691 if (hi < 0xdc00) 774 if (hi < 0xdc00)
692 { 775 {
693 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 776 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
694 ERR ("missing low surrogate character in surrogate pair"); 777 ERR ("missing low surrogate character in surrogate pair");
695 778
696 dec->cur += 2; 779 dec_cur += 2;
697 780
781 dec->cur = dec_cur;
698 lo = decode_4hex (dec); 782 lo = decode_4hex (dec);
783 dec_cur = dec->cur;
699 if (lo == (UV)-1) 784 if (lo == (UV)-1)
700 goto fail; 785 goto fail;
701 786
702 if (lo < 0xdc00 || lo >= 0xe000) 787 if (lo < 0xdc00 || lo >= 0xe000)
703 ERR ("surrogate pair expected"); 788 ERR ("surrogate pair expected");
717 *cur++ = hi; 802 *cur++ = hi;
718 } 803 }
719 break; 804 break;
720 805
721 default: 806 default:
722 --dec->cur; 807 --dec_cur;
723 ERR ("illegal backslash escape sequence in string"); 808 ERR ("illegal backslash escape sequence in string");
724 } 809 }
725 } 810 }
726 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 811 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
727 *cur++ = ch; 812 *cur++ = ch;
728 else if (ch >= 0x80) 813 else if (ch >= 0x80)
729 { 814 {
730 STRLEN clen; 815 STRLEN clen;
731 UV uch; 816 UV uch;
732 817
733 --dec->cur; 818 --dec_cur;
734 819
735 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 820 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
736 if (clen == (STRLEN)-1) 821 if (clen == (STRLEN)-1)
737 ERR ("malformed UTF-8 character in JSON string"); 822 ERR ("malformed UTF-8 character in JSON string");
738 823
739 do 824 do
740 *cur++ = *dec->cur++; 825 *cur++ = *dec_cur++;
741 while (--clen); 826 while (--clen);
742 827
743 utf8 = 1; 828 utf8 = 1;
744 } 829 }
745 else 830 else
746 { 831 {
747 --dec->cur; 832 --dec_cur;
748 833
749 if (!ch) 834 if (!ch)
750 ERR ("unexpected end of string while parsing JSON string"); 835 ERR ("unexpected end of string while parsing JSON string");
751 else 836 else
752 ERR ("invalid character encountered while parsing JSON string"); 837 ERR ("invalid character encountered while parsing JSON string");
765 } 850 }
766 else 851 else
767 sv = newSVpvn (buf, len); 852 sv = newSVpvn (buf, len);
768 } 853 }
769 } 854 }
770 while (*dec->cur != '"'); 855 while (*dec_cur != '"');
771 856
772 ++dec->cur; 857 ++dec_cur;
773 858
774 if (sv) 859 if (sv)
775 { 860 {
776 SvPOK_only (sv); 861 SvPOK_only (sv);
777 *SvEND (sv) = 0; 862 *SvEND (sv) = 0;
780 SvUTF8_on (sv); 865 SvUTF8_on (sv);
781 } 866 }
782 else 867 else
783 sv = newSVpvn ("", 0); 868 sv = newSVpvn ("", 0);
784 869
870 dec->cur = dec_cur;
785 return sv; 871 return sv;
786 872
787fail: 873fail:
874 dec->cur = dec_cur;
788 return 0; 875 return 0;
789} 876}
790 877
791static SV * 878static SV *
792decode_num (dec_t *dec) 879decode_num (dec_t *dec)
854 { 941 {
855 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 942 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
856 if (*start == '-') 943 if (*start == '-')
857 switch (dec->cur - start) 944 switch (dec->cur - start)
858 { 945 {
859 case 2: return newSViv (-( start [1] - '0' )); 946 case 2: return newSViv (-( start [1] - '0' * 1));
860 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 947 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
861 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 948 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
862 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 949 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
863 } 950 }
864 else 951 else
865 switch (dec->cur - start) 952 switch (dec->cur - start)
866 { 953 {
867 case 1: return newSViv ( start [0] - '0' ); 954 case 1: return newSViv ( start [0] - '0' * 1);
868 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 955 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
869 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 956 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
870 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 957 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
871 } 958 }
872 959
879 if (uv < (UV)IV_MIN) 966 if (uv < (UV)IV_MIN)
880 return newSViv (-(IV)uv); 967 return newSViv (-(IV)uv);
881 } 968 }
882 else 969 else
883 return newSVuv (uv); 970 return newSVuv (uv);
971
972 // here would likely be the place for bigint support
884 } 973 }
885 } 974 }
886 975
976 // if we ever support bigint or bigfloat, this is the place for bigfloat
887 return newSVnv (Atof (start)); 977 return newSVnv (Atof (start));
888 978
889fail: 979fail:
890 return 0; 980 return 0;
891} 981}
935} 1025}
936 1026
937static SV * 1027static SV *
938decode_hv (dec_t *dec) 1028decode_hv (dec_t *dec)
939{ 1029{
1030 SV *sv;
940 HV *hv = newHV (); 1031 HV *hv = newHV ();
941 1032
942 DEC_INC_DEPTH; 1033 DEC_INC_DEPTH;
943 decode_ws (dec); 1034 decode_ws (dec);
944 1035
945 if (*dec->cur == '}') 1036 if (*dec->cur == '}')
946 ++dec->cur; 1037 ++dec->cur;
947 else 1038 else
948 for (;;) 1039 for (;;)
949 { 1040 {
950 SV *key, *value;
951
952 decode_ws (dec); EXPECT_CH ('"'); 1041 decode_ws (dec); EXPECT_CH ('"');
953 1042
954 key = decode_str (dec); 1043 // heuristic: assume that
955 if (!key) 1044 // a) decode_str + hv_store_ent are abysmally slow.
956 goto fail; 1045 // b) most hash keys are short, simple ascii text.
1046 // => try to "fast-match" such strings to avoid
1047 // the overhead of decode_str + hv_store_ent.
1048 {
1049 SV *value;
1050 char *p = dec->cur;
1051 char *e = p + 24; // only try up to 24 bytes
957 1052
958 decode_ws (dec); EXPECT_CH (':'); 1053 for (;;)
959
960 value = decode_sv (dec);
961 if (!value)
962 { 1054 {
1055 // the >= 0x80 is true on most architectures
1056 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1057 {
1058 // slow path, back up and use decode_str
1059 SV *key = decode_str (dec);
1060 if (!key)
1061 goto fail;
1062
1063 decode_ws (dec); EXPECT_CH (':');
1064
1065 value = decode_sv (dec);
1066 if (!value)
1067 {
1068 SvREFCNT_dec (key);
1069 goto fail;
1070 }
1071
1072 hv_store_ent (hv, key, value, 0);
963 SvREFCNT_dec (key); 1073 SvREFCNT_dec (key);
1074
1075 break;
1076 }
1077 else if (*p == '"')
1078 {
1079 // fast path, got a simple key
1080 char *key = dec->cur;
1081 int len = p - key;
1082 dec->cur = p + 1;
1083
1084 decode_ws (dec); EXPECT_CH (':');
1085
1086 value = decode_sv (dec);
1087 if (!value)
964 goto fail; 1088 goto fail;
1089
1090 hv_store (hv, key, len, value, 0);
1091
1092 break;
1093 }
1094
1095 ++p;
965 } 1096 }
966 1097 }
967 hv_store_ent (hv, key, value, 0);
968 SvREFCNT_dec (key);
969 1098
970 decode_ws (dec); 1099 decode_ws (dec);
971 1100
972 if (*dec->cur == '}') 1101 if (*dec->cur == '}')
973 { 1102 {
980 1109
981 ++dec->cur; 1110 ++dec->cur;
982 } 1111 }
983 1112
984 DEC_DEC_DEPTH; 1113 DEC_DEC_DEPTH;
985 return newRV_noinc ((SV *)hv); 1114 sv = newRV_noinc ((SV *)hv);
1115
1116 // check filter callbacks
1117 if (dec->json.flags & F_HOOK)
1118 {
1119 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1120 {
1121 HE *cb, *he;
1122
1123 hv_iterinit (hv);
1124 he = hv_iternext (hv);
1125 hv_iterinit (hv);
1126
1127 // the next line creates a mortal sv each time its called.
1128 // might want to optimise this for common cases.
1129 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1130
1131 if (cb)
1132 {
1133 dSP;
1134 int count;
1135
1136 ENTER; SAVETMPS; PUSHMARK (SP);
1137 XPUSHs (HeVAL (he));
1138
1139 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1140
1141 if (count == 1)
1142 {
1143 sv = newSVsv (POPs);
1144 FREETMPS; LEAVE;
1145 return sv;
1146 }
1147
1148 FREETMPS; LEAVE;
1149 }
1150 }
1151
1152 if (dec->json.cb_object)
1153 {
1154 dSP;
1155 int count;
1156
1157 ENTER; SAVETMPS; PUSHMARK (SP);
1158 XPUSHs (sv_2mortal (sv));
1159
1160 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1161
1162 if (count == 1)
1163 {
1164 sv = newSVsv (POPs);
1165 FREETMPS; LEAVE;
1166 return sv;
1167 }
1168
1169 SvREFCNT_inc (sv);
1170 FREETMPS; LEAVE;
1171 }
1172 }
1173
1174 return sv;
986 1175
987fail: 1176fail:
988 SvREFCNT_dec (hv); 1177 SvREFCNT_dec (hv);
989 DEC_DEC_DEPTH; 1178 DEC_DEC_DEPTH;
990 return 0; 1179 return 0;
992 1181
993static SV * 1182static SV *
994decode_sv (dec_t *dec) 1183decode_sv (dec_t *dec)
995{ 1184{
996 decode_ws (dec); 1185 decode_ws (dec);
1186
1187 // the beauty of JSON: you need exactly one character lookahead
1188 // to parse anything.
997 switch (*dec->cur) 1189 switch (*dec->cur)
998 { 1190 {
999 case '"': ++dec->cur; return decode_str (dec); 1191 case '"': ++dec->cur; return decode_str (dec);
1000 case '[': ++dec->cur; return decode_av (dec); 1192 case '[': ++dec->cur; return decode_av (dec);
1001 case '{': ++dec->cur; return decode_hv (dec); 1193 case '{': ++dec->cur; return decode_hv (dec);
1007 1199
1008 case 't': 1200 case 't':
1009 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1201 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1010 { 1202 {
1011 dec->cur += 4; 1203 dec->cur += 4;
1012 return newSViv (1); 1204 return SvREFCNT_inc (json_true);
1013 } 1205 }
1014 else 1206 else
1015 ERR ("'true' expected"); 1207 ERR ("'true' expected");
1016 1208
1017 break; 1209 break;
1018 1210
1019 case 'f': 1211 case 'f':
1020 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1212 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1021 { 1213 {
1022 dec->cur += 5; 1214 dec->cur += 5;
1023 return newSViv (0); 1215 return SvREFCNT_inc (json_false);
1024 } 1216 }
1025 else 1217 else
1026 ERR ("'false' expected"); 1218 ERR ("'false' expected");
1027 1219
1028 break; 1220 break;
1046fail: 1238fail:
1047 return 0; 1239 return 0;
1048} 1240}
1049 1241
1050static SV * 1242static SV *
1051decode_json (SV *string, U32 flags, UV *offset_return) 1243decode_json (SV *string, JSON *json, UV *offset_return)
1052{ 1244{
1053 dec_t dec; 1245 dec_t dec;
1054 UV offset; 1246 UV offset;
1055 SV *sv; 1247 SV *sv;
1056 1248
1057 SvGETMAGIC (string); 1249 SvGETMAGIC (string);
1058 SvUPGRADE (string, SVt_PV); 1250 SvUPGRADE (string, SVt_PV);
1059 1251
1252 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1253 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1254 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1255
1060 if (flags & F_UTF8) 1256 if (json->flags & F_UTF8)
1061 sv_utf8_downgrade (string, 0); 1257 sv_utf8_downgrade (string, 0);
1062 else 1258 else
1063 sv_utf8_upgrade (string); 1259 sv_utf8_upgrade (string);
1064 1260
1065 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1261 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1066 1262
1067 dec.flags = flags; 1263 dec.json = *json;
1068 dec.cur = SvPVX (string); 1264 dec.cur = SvPVX (string);
1069 dec.end = SvEND (string); 1265 dec.end = SvEND (string);
1070 dec.err = 0; 1266 dec.err = 0;
1071 dec.depth = 0; 1267 dec.depth = 0;
1072 dec.maxdepth = DEC_DEPTH (dec.flags); 1268 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1269
1270 if (dec.json.cb_object || dec.json.cb_sk_object)
1271 dec.json.flags |= F_HOOK;
1073 1272
1074 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1273 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1075 sv = decode_sv (&dec); 1274 sv = decode_sv (&dec);
1076 1275
1077 if (!(offset_return || !sv)) 1276 if (!(offset_return || !sv))
1087 } 1286 }
1088 } 1287 }
1089 1288
1090 if (offset_return || !sv) 1289 if (offset_return || !sv)
1091 { 1290 {
1092 offset = dec.flags & F_UTF8 1291 offset = dec.json.flags & F_UTF8
1093 ? dec.cur - SvPVX (string) 1292 ? dec.cur - SvPVX (string)
1094 : utf8_distance (dec.cur, SvPVX (string)); 1293 : utf8_distance (dec.cur, SvPVX (string));
1095 1294
1096 if (offset_return) 1295 if (offset_return)
1097 *offset_return = offset; 1296 *offset_return = offset;
1116 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1315 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1117 } 1316 }
1118 1317
1119 sv = sv_2mortal (sv); 1318 sv = sv_2mortal (sv);
1120 1319
1121 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1320 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1122 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1321 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1123 1322
1124 return sv; 1323 return sv;
1125} 1324}
1126 1325
1130MODULE = JSON::XS PACKAGE = JSON::XS 1329MODULE = JSON::XS PACKAGE = JSON::XS
1131 1330
1132BOOT: 1331BOOT:
1133{ 1332{
1134 int i; 1333 int i;
1135
1136 memset (decode_hexdigit, 0xff, 256);
1137 1334
1138 for (i = 0; i < 256; ++i) 1335 for (i = 0; i < 256; ++i)
1139 decode_hexdigit [i] = 1336 decode_hexdigit [i] =
1140 i >= '0' && i <= '9' ? i - '0' 1337 i >= '0' && i <= '9' ? i - '0'
1141 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1338 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1142 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1339 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1143 : -1; 1340 : -1;
1144 1341
1145 json_stash = gv_stashpv ("JSON::XS", 1); 1342 json_stash = gv_stashpv ("JSON::XS" , 1);
1343 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1344
1345 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1346 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1146} 1347}
1147 1348
1148PROTOTYPES: DISABLE 1349PROTOTYPES: DISABLE
1149 1350
1150SV *new (char *dummy) 1351void new (char *klass)
1151 CODE: 1352 PPCODE:
1152 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1353{
1153 OUTPUT: 1354 SV *pv = NEWSV (0, sizeof (JSON));
1154 RETVAL 1355 SvPOK_only (pv);
1356 Zero (SvPVX (pv), 1, JSON);
1357 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1358 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1359}
1155 1360
1156SV *ascii (SV *self, int enable = 1) 1361void ascii (JSON *self, int enable = 1)
1157 ALIAS: 1362 ALIAS:
1158 ascii = F_ASCII 1363 ascii = F_ASCII
1159 latin1 = F_LATIN1 1364 latin1 = F_LATIN1
1160 utf8 = F_UTF8 1365 utf8 = F_UTF8
1161 indent = F_INDENT 1366 indent = F_INDENT
1162 canonical = F_CANONICAL 1367 canonical = F_CANONICAL
1163 space_before = F_SPACE_BEFORE 1368 space_before = F_SPACE_BEFORE
1164 space_after = F_SPACE_AFTER 1369 space_after = F_SPACE_AFTER
1165 pretty = F_PRETTY 1370 pretty = F_PRETTY
1166 allow_nonref = F_ALLOW_NONREF 1371 allow_nonref = F_ALLOW_NONREF
1167 shrink = F_SHRINK 1372 shrink = F_SHRINK
1373 allow_blessed = F_ALLOW_BLESSED
1374 convert_blessed = F_CONV_BLESSED
1168 CODE: 1375 PPCODE:
1169{ 1376{
1170 UV *uv = SvJSON (self);
1171 if (enable) 1377 if (enable)
1172 *uv |= ix; 1378 self->flags |= ix;
1173 else 1379 else
1174 *uv &= ~ix; 1380 self->flags &= ~ix;
1175 1381
1176 RETVAL = newSVsv (self); 1382 XPUSHs (ST (0));
1177} 1383}
1178 OUTPUT:
1179 RETVAL
1180 1384
1181SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1385void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1182 CODE: 1386 PPCODE:
1183{ 1387{
1184 UV *uv = SvJSON (self);
1185 UV log2 = 0; 1388 UV log2 = 0;
1186 1389
1187 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1390 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1188 1391
1189 while ((1UL << log2) < max_depth) 1392 while ((1UL << log2) < max_depth)
1190 ++log2; 1393 ++log2;
1191 1394
1192 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1395 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1193 1396
1194 RETVAL = newSVsv (self); 1397 XPUSHs (ST (0));
1195} 1398}
1196 OUTPUT:
1197 RETVAL
1198 1399
1199void encode (SV *self, SV *scalar) 1400void max_size (JSON *self, UV max_size = 0)
1200 PPCODE: 1401 PPCODE:
1201 XPUSHs (encode_json (scalar, *SvJSON (self))); 1402{
1403 UV log2 = 0;
1202 1404
1203void decode (SV *self, SV *jsonstr) 1405 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1406 if (max_size == 1) max_size = 2;
1407
1408 while ((1UL << log2) < max_size)
1409 ++log2;
1410
1411 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1412
1413 XPUSHs (ST (0));
1414}
1415
1416void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1204 PPCODE: 1417 PPCODE:
1418{
1419 SvREFCNT_dec (self->cb_object);
1420 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1421
1422 XPUSHs (ST (0));
1423}
1424
1425void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1426 PPCODE:
1427{
1428 if (!self->cb_sk_object)
1429 self->cb_sk_object = newHV ();
1430
1431 if (SvOK (cb))
1432 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1433 else
1434 {
1435 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1436
1437 if (!HvKEYS (self->cb_sk_object))
1438 {
1439 SvREFCNT_dec (self->cb_sk_object);
1440 self->cb_sk_object = 0;
1441 }
1442 }
1443
1444 XPUSHs (ST (0));
1445}
1446
1447void encode (JSON *self, SV *scalar)
1448 PPCODE:
1449 XPUSHs (encode_json (scalar, self));
1450
1451void decode (JSON *self, SV *jsonstr)
1452 PPCODE:
1205 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1453 XPUSHs (decode_json (jsonstr, self, 0));
1206 1454
1207void decode_prefix (SV *self, SV *jsonstr) 1455void decode_prefix (JSON *self, SV *jsonstr)
1208 PPCODE: 1456 PPCODE:
1209{ 1457{
1210 UV offset; 1458 UV offset;
1211 EXTEND (SP, 2); 1459 EXTEND (SP, 2);
1212 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1460 PUSHs (decode_json (jsonstr, self, &offset));
1213 PUSHs (sv_2mortal (newSVuv (offset))); 1461 PUSHs (sv_2mortal (newSVuv (offset)));
1214} 1462}
1215 1463
1464void DESTROY (JSON *self)
1465 CODE:
1466 SvREFCNT_dec (self->cb_sk_object);
1467 SvREFCNT_dec (self->cb_object);
1468
1216PROTOTYPES: ENABLE 1469PROTOTYPES: ENABLE
1217 1470
1218void to_json (SV *scalar) 1471void to_json (SV *scalar)
1219 ALIAS:
1220 objToJson = 0
1221 PPCODE: 1472 PPCODE:
1473{
1474 JSON json = { F_DEFAULT | F_UTF8 };
1222 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1475 XPUSHs (encode_json (scalar, &json));
1476}
1223 1477
1224void from_json (SV *jsonstr) 1478void from_json (SV *jsonstr)
1225 ALIAS:
1226 jsonToObj = 0
1227 PPCODE: 1479 PPCODE:
1480{
1481 JSON json = { F_DEFAULT | F_UTF8 };
1228 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1482 XPUSHs (decode_json (jsonstr, &json, 0));
1483}
1229 1484

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines