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.37 by root, Wed Jun 6 17:49:01 2007 UTC vs.
Revision 1.51 by root, Mon Jul 2 00:48:18 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines