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.111 by root, Wed Jul 27 15:53:40 2011 UTC vs.
Revision 1.134 by root, Thu Nov 15 20:13:03 2018 UTC

6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 15#endif
15 16
16// some old perls do not have this, try to make it work, no 17// some old perls do not have this, try to make it work, no
17// guarantees, though. if it breaks, you get to keep the pieces. 18// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 19#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 20# define UTF8_MAXBYTES 13
21#endif
22
23// compatibility with perl <5.18
24#ifndef HvNAMELEN_get
25# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
26#endif
27#ifndef HvNAMELEN
28# define HvNAMELEN(hv) HvNAMELEN_get (hv)
29#endif
30#ifndef HvNAMEUTF8
31# define HvNAMEUTF8(hv) 0
20#endif 32#endif
21 33
22// three extra for rounding, sign, and end of string 34// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) 35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24 36
33#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 49#define F_ALLOW_UNKNOWN 0x00002000UL
50#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 52
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 54
42#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
44 57
45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 58#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
46 59
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8) 60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
65 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
66 79
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68 81
69#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
70# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
85# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
72#else 86#else
73# define JSON_SLOW 0
74# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
75#endif 90#endif
76 91
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
78static SV *json_true, *json_false; 93#define STACK_HES 64
94
95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
96static SV *bool_false, *bool_true;
97static SV *sv_json;
79 98
80enum { 99enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string 101 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash 102 INCR_M_BS, // inside backslash
99 // for the incremental parser 118 // for the incremental parser
100 SV *incr_text; // the source text so far 119 SV *incr_text; // the source text so far
101 STRLEN incr_pos; // the current offset into the text 120 STRLEN incr_pos; // the current offset into the text
102 int incr_nest; // {[]}-nesting level 121 int incr_nest; // {[]}-nesting level
103 unsigned char incr_mode; 122 unsigned char incr_mode;
123
124 SV *v_false, *v_true;
104} JSON; 125} JSON;
105 126
106INLINE void 127INLINE void
107json_init (JSON *json) 128json_init (JSON *json)
108{ 129{
137 SvPV_renew (sv, SvCUR (sv) + 1); 158 SvPV_renew (sv, SvCUR (sv) + 1);
138#endif 159#endif
139 } 160 }
140} 161}
141 162
163/* adds two STRLENs together, slow, and with paranoia */
164STRLEN
165strlen_sum (STRLEN l1, STRLEN l2)
166{
167 size_t sum = l1 + l2;
168
169 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
170 croak ("JSON::XS: string size overflow");
171
172 return sum;
173}
174
175/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
176static char *
177json_sv_grow (SV *sv, size_t len1, size_t len2)
178{
179 len1 = strlen_sum (len1, len2);
180 len1 = strlen_sum (len1, len1 >> 1);
181
182 if (len1 > 4096 - 24)
183 len1 = (len1 | 4095) - 24;
184
185 return SvGROW (sv, len1);
186}
187
142// decode an utf-8 character and return it, or (UV)-1 in 188// decode a utf-8 character and return it, or (UV)-1 in
143// case of an error. 189// case of an error.
144// we special-case "safe" characters from U+80 .. U+7FF, 190// we special-case "safe" characters from U+80 .. U+7FF,
145// but use the very good perl function to parse anything else. 191// but use the very good perl function to parse anything else.
146// note that we never call this function for a ascii codepoints 192// note that we never call this function for a ascii codepoints
147INLINE UV 193INLINE UV
284 // a recursion depth of ten gives us >>500 bits 330 // a recursion depth of ten gives us >>500 bits
285 json_atof_scan1 (s, &accum, &expo, 0, 10); 331 json_atof_scan1 (s, &accum, &expo, 0, 10);
286 332
287 return neg ? -accum : accum; 333 return neg ? -accum : accum;
288} 334}
335
336// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
337static int
338ref_bool_type (SV *sv)
339{
340 svtype svt = SvTYPE (sv);
341
342 if (svt < SVt_PVAV)
343 {
344 STRLEN len = 0;
345 char *pv = svt ? SvPV (sv, len) : 0;
346
347 if (len == 1)
348 if (*pv == '1')
349 return 1;
350 else if (*pv == '0')
351 return 0;
352 }
353
354 return -1;
355}
356
357// returns whether scalar is not a reference in the sense of allow_nonref
358static int
359json_nonref (SV *scalar)
360{
361 if (!SvROK (scalar))
362 return 1;
363
364 scalar = SvRV (scalar);
365
366 if (SvTYPE (scalar) >= SVt_PVMG)
367 {
368 if (SvSTASH (scalar) == bool_stash)
369 return 1;
370
371 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
372 return 1;
373 }
374
375 return 0;
376}
377
289///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
290// encoder 379// encoder
291 380
292// structure used for encoding JSON 381// structure used for encoding JSON
293typedef struct 382typedef struct
301} enc_t; 390} enc_t;
302 391
303INLINE void 392INLINE void
304need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
305{ 394{
306 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
307 { 396 {
308 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
309 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
310 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
311 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
312 } 401 }
313} 402}
314 403
315INLINE void 404INLINE void
316encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
332 421
333 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
334 { 423 {
335 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
336 { 425 {
337 need (enc, len += 1); 426 need (enc, len + 1);
338 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
339 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
340 } 429 }
341 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
342 { 431 {
343 need (enc, len += 1); 432 need (enc, len + 1);
344 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
345 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
346 } 435 }
347 else 436 else
348 *enc->cur++ = ch; 437 *enc->cur++ = ch;
351 } 440 }
352 else 441 else
353 { 442 {
354 switch (ch) 443 switch (ch)
355 { 444 {
356 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 445 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
357 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 446 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
358 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 447 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
359 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 448 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
360 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 449 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
361 450
362 default: 451 default:
363 { 452 {
364 STRLEN clen; 453 STRLEN clen;
365 UV uch; 454 UV uch;
381 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
382 { 471 {
383 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
384 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 473 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
385 474
386 need (enc, len += 11); 475 need (enc, len + 11);
387 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
388 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
389 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
390 enc->cur += 12; 479 enc->cur += 12;
391 } 480 }
392 else 481 else
393 { 482 {
394 need (enc, len += 5); 483 need (enc, len + 5);
395 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
396 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
397 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
398 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
399 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
407 *enc->cur++ = uch; 496 *enc->cur++ = uch;
408 str += clen; 497 str += clen;
409 } 498 }
410 else if (is_utf8) 499 else if (is_utf8)
411 { 500 {
412 need (enc, len += clen); 501 need (enc, len + clen);
413 do 502 do
414 { 503 {
415 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
416 } 505 }
417 while (--clen); 506 while (--clen);
418 } 507 }
419 else 508 else
420 { 509 {
421 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 510 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
422 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
423 ++str; 512 ++str;
424 } 513 }
425 } 514 }
426 } 515 }
480 569
481 if (enc->indent >= enc->json.max_depth) 570 if (enc->indent >= enc->json.max_depth)
482 croak (ERR_NESTING_EXCEEDED); 571 croak (ERR_NESTING_EXCEEDED);
483 572
484 encode_ch (enc, '['); 573 encode_ch (enc, '[');
485 574
486 if (len >= 0) 575 if (len >= 0)
487 { 576 {
488 encode_nl (enc); ++enc->indent; 577 encode_nl (enc); ++enc->indent;
489 578
490 for (i = 0; i <= len; ++i) 579 for (i = 0; i <= len; ++i)
502 encode_comma (enc); 591 encode_comma (enc);
503 } 592 }
504 593
505 encode_nl (enc); --enc->indent; encode_indent (enc); 594 encode_nl (enc); --enc->indent; encode_indent (enc);
506 } 595 }
507 596
508 encode_ch (enc, ']'); 597 encode_ch (enc, ']');
509} 598}
510 599
511static void 600static void
512encode_hk (enc_t *enc, HE *he) 601encode_hk (enc_t *enc, HE *he)
516 if (HeKLEN (he) == HEf_SVKEY) 605 if (HeKLEN (he) == HEf_SVKEY)
517 { 606 {
518 SV *sv = HeSVKEY (he); 607 SV *sv = HeSVKEY (he);
519 STRLEN len; 608 STRLEN len;
520 char *str; 609 char *str;
521 610
522 SvGETMAGIC (sv); 611 SvGETMAGIC (sv);
523 str = SvPV (sv, len); 612 str = SvPV (sv, len);
524 613
525 encode_str (enc, str, len, SvUTF8 (sv)); 614 encode_str (enc, str, len, SvUTF8 (sv));
526 } 615 }
592 } 681 }
593 682
594 if (count) 683 if (count)
595 { 684 {
596 int i, fast = 1; 685 int i, fast = 1;
597#if defined(__BORLANDC__) || defined(_MSC_VER) 686 HE *hes_stack [STACK_HES];
598 HE **hes = _alloca (count * sizeof (HE)); 687 HE **hes = hes_stack;
599#else 688
600 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 689 // allocate larger arrays on the heap
601#endif 690 if (count > STACK_HES)
691 {
692 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
693 hes = (HE **)SvPVX (sv);
694 }
602 695
603 i = 0; 696 i = 0;
604 while ((he = hv_iternext (hv))) 697 while ((he = hv_iternext (hv)))
605 { 698 {
606 hes [i++] = he; 699 hes [i++] = he;
675// encode objects, arrays and special \0=false and \1=true values. 768// encode objects, arrays and special \0=false and \1=true values.
676static void 769static void
677encode_rv (enc_t *enc, SV *sv) 770encode_rv (enc_t *enc, SV *sv)
678{ 771{
679 svtype svt; 772 svtype svt;
773 GV *method;
680 774
681 SvGETMAGIC (sv); 775 SvGETMAGIC (sv);
682 svt = SvTYPE (sv); 776 svt = SvTYPE (sv);
683 777
684 if (expect_false (SvOBJECT (sv))) 778 if (expect_false (SvOBJECT (sv)))
685 { 779 {
686 HV *stash = !JSON_SLOW || json_boolean_stash 780 HV *stash = SvSTASH (sv);
687 ? json_boolean_stash
688 : gv_stashpv ("JSON::XS::Boolean", 1);
689 781
690 if (SvSTASH (sv) == stash) 782 if (stash == bool_stash)
691 { 783 {
692 if (SvIV (sv))
693 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
694 else
695 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
696 } 786 }
787 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
788 {
789 int count;
790 dSP;
791
792 ENTER; SAVETMPS;
793 PUSHMARK (SP);
794 EXTEND (SP, 2);
795 // we re-bless the reference to get overload and other niceties right
796 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
797 PUSHs (sv_json);
798
799 PUTBACK;
800 count = call_sv ((SV *)GvCV (method), G_ARRAY);
801 SPAGAIN;
802
803 // catch this surprisingly common error
804 if (SvROK (TOPs) && SvRV (TOPs) == sv)
805 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
806
807 encode_ch (enc, '(');
808 encode_ch (enc, '"');
809 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
810 encode_ch (enc, '"');
811 encode_ch (enc, ')');
812 encode_ch (enc, '[');
813
814 if (count)
815 {
816 int i;
817
818 for (i = 0; i < count - 1; ++i)
819 {
820 encode_sv (enc, SP[i + 1 - count]);
821 encode_ch (enc, ',');
822 }
823
824 encode_sv (enc, TOPs);
825 SP -= count;
826 }
827
828 encode_ch (enc, ']');
829
830 FREETMPS; LEAVE;
831 }
832 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
833 {
834 dSP;
835
836 ENTER; SAVETMPS;
837 PUSHMARK (SP);
838 // we re-bless the reference to get overload and other niceties right
839 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
840
841 // calling with G_SCALAR ensures that we always get a 1 return value
842 PUTBACK;
843 call_sv ((SV *)GvCV (method), G_SCALAR);
844 SPAGAIN;
845
846 // catch this surprisingly common error
847 if (SvROK (TOPs) && SvRV (TOPs) == sv)
848 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
849
850 sv = POPs;
851 PUTBACK;
852
853 encode_sv (enc, sv);
854
855 FREETMPS; LEAVE;
856 }
857 else if (enc->json.flags & F_ALLOW_BLESSED)
858 encode_str (enc, "null", 4, 0);
697 else 859 else
698 {
699#if 0
700 if (0 && sv_derived_from (rv, "JSON::Literal"))
701 {
702 // not yet
703 }
704#endif
705 if (enc->json.flags & F_CONV_BLESSED)
706 {
707 // we re-bless the reference to get overload and other niceties right
708 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
709
710 if (to_json)
711 {
712 dSP;
713
714 ENTER; SAVETMPS; PUSHMARK (SP);
715 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
716
717 // calling with G_SCALAR ensures that we always get a 1 return value
718 PUTBACK;
719 call_sv ((SV *)GvCV (to_json), G_SCALAR);
720 SPAGAIN;
721
722 // catch this surprisingly common error
723 if (SvROK (TOPs) && SvRV (TOPs) == sv)
724 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
725
726 sv = POPs;
727 PUTBACK;
728
729 encode_sv (enc, sv);
730
731 FREETMPS; LEAVE;
732 }
733 else if (enc->json.flags & F_ALLOW_BLESSED)
734 encode_str (enc, "null", 4, 0);
735 else
736 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
737 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
738 }
739 else if (enc->json.flags & F_ALLOW_BLESSED)
740 encode_str (enc, "null", 4, 0);
741 else
742 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 860 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
743 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 861 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744 }
745 } 862 }
746 else if (svt == SVt_PVHV) 863 else if (svt == SVt_PVHV)
747 encode_hv (enc, (HV *)sv); 864 encode_hv (enc, (HV *)sv);
748 else if (svt == SVt_PVAV) 865 else if (svt == SVt_PVAV)
749 encode_av (enc, (AV *)sv); 866 encode_av (enc, (AV *)sv);
750 else if (svt < SVt_PVAV) 867 else if (svt < SVt_PVAV)
751 { 868 {
752 STRLEN len = 0; 869 int bool_type = ref_bool_type (sv);
753 char *pv = svt ? SvPV (sv, len) : 0;
754 870
755 if (len == 1 && *pv == '1') 871 if (bool_type == 1)
756 encode_str (enc, "true", 4, 0); 872 encode_str (enc, "true", 4, 0);
757 else if (len == 1 && *pv == '0') 873 else if (bool_type == 0)
758 encode_str (enc, "false", 5, 0); 874 encode_str (enc, "false", 5, 0);
759 else if (enc->json.flags & F_ALLOW_UNKNOWN) 875 else if (enc->json.flags & F_ALLOW_UNKNOWN)
760 encode_str (enc, "null", 4, 0); 876 encode_str (enc, "null", 4, 0);
761 else 877 else
762 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 878 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
825 } 941 }
826 else 942 else
827 { 943 {
828 // large integer, use the (rather slow) snprintf way. 944 // large integer, use the (rather slow) snprintf way.
829 need (enc, IVUV_MAXCHARS); 945 need (enc, IVUV_MAXCHARS);
830 enc->cur += 946 enc->cur +=
831 SvIsUV(sv) 947 SvIsUV(sv)
832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 948 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 949 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834 } 950 }
835 } 951 }
836 else if (SvROK (sv)) 952 else if (SvROK (sv))
837 encode_rv (enc, SvRV (sv)); 953 encode_rv (enc, SvRV (sv));
838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 954 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
839 encode_str (enc, "null", 4, 0); 955 encode_str (enc, "null", 4, 0);
840 else 956 else
841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 957 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842 SvPV_nolen (sv), SvFLAGS (sv)); 958 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843} 959}
844 960
845static SV * 961static SV *
846encode_json (SV *scalar, JSON *json) 962encode_json (SV *scalar, JSON *json)
847{ 963{
848 enc_t enc; 964 enc_t enc;
849 965
850 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 966 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
851 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 967 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
852 968
853 enc.json = *json; 969 enc.json = *json;
854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 970 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
855 enc.cur = SvPVX (enc.sv); 971 enc.cur = SvPVX (enc.sv);
1062 *cur++ = *dec_cur++; 1178 *cur++ = *dec_cur++;
1063 while (--clen); 1179 while (--clen);
1064 1180
1065 utf8 = 1; 1181 utf8 = 1;
1066 } 1182 }
1183 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1184 *cur++ = ch;
1067 else 1185 else
1068 { 1186 {
1069 --dec_cur; 1187 --dec_cur;
1070 1188
1071 if (!ch) 1189 if (!ch)
1081 1199
1082 if (sv) 1200 if (sv)
1083 { 1201 {
1084 STRLEN cur = SvCUR (sv); 1202 STRLEN cur = SvCUR (sv);
1085 1203
1086 if (SvLEN (sv) <= cur + len) 1204 if (SvLEN (sv) - cur <= len)
1087 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1205 json_sv_grow (sv, cur, len);
1088 1206
1089 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1207 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1090 SvCUR_set (sv, SvCUR (sv) + len); 1208 SvCUR_set (sv, SvCUR (sv) + len);
1091 } 1209 }
1092 else 1210 else
1259 if (*dec->cur == ']') 1377 if (*dec->cur == ']')
1260 { 1378 {
1261 ++dec->cur; 1379 ++dec->cur;
1262 break; 1380 break;
1263 } 1381 }
1264 1382
1265 if (*dec->cur != ',') 1383 if (*dec->cur != ',')
1266 ERR (", or ] expected while parsing array"); 1384 ERR (", or ] expected while parsing array");
1267 1385
1268 ++dec->cur; 1386 ++dec->cur;
1269 1387
1393 1511
1394 hv_iterinit (hv); 1512 hv_iterinit (hv);
1395 he = hv_iternext (hv); 1513 he = hv_iternext (hv);
1396 hv_iterinit (hv); 1514 hv_iterinit (hv);
1397 1515
1398 // the next line creates a mortal sv each time its called. 1516 // the next line creates a mortal sv each time it's called.
1399 // might want to optimise this for common cases. 1517 // might want to optimise this for common cases.
1400 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1518 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1401 1519
1402 if (cb) 1520 if (cb)
1403 { 1521 {
1404 dSP; 1522 dSP;
1405 int count; 1523 int count;
1406 1524
1407 ENTER; SAVETMPS; PUSHMARK (SP); 1525 ENTER; SAVETMPS;
1526 PUSHMARK (SP);
1408 XPUSHs (HeVAL (he)); 1527 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv); 1528 sv_2mortal (sv);
1410 1529
1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1530 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1412 1531
1414 { 1533 {
1415 sv = newSVsv (POPs); 1534 sv = newSVsv (POPs);
1416 FREETMPS; LEAVE; 1535 FREETMPS; LEAVE;
1417 return sv; 1536 return sv;
1418 } 1537 }
1538 else if (count)
1539 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1419 1540
1420 SvREFCNT_inc (sv); 1541 SvREFCNT_inc (sv);
1421 FREETMPS; LEAVE; 1542 FREETMPS; LEAVE;
1422 } 1543 }
1423 } 1544 }
1425 if (dec->json.cb_object) 1546 if (dec->json.cb_object)
1426 { 1547 {
1427 dSP; 1548 dSP;
1428 int count; 1549 int count;
1429 1550
1430 ENTER; SAVETMPS; PUSHMARK (SP); 1551 ENTER; SAVETMPS;
1552 PUSHMARK (SP);
1431 XPUSHs (sv_2mortal (sv)); 1553 XPUSHs (sv_2mortal (sv));
1432 1554
1433 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1555 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1434 1556
1435 if (count == 1) 1557 if (count == 1)
1436 { 1558 {
1437 sv = newSVsv (POPs); 1559 sv = newSVsv (POPs);
1438 FREETMPS; LEAVE; 1560 FREETMPS; LEAVE;
1439 return sv; 1561 return sv;
1440 } 1562 }
1563 else if (count)
1564 croak ("filter_json_object callbacks must not return more than one scalar");
1441 1565
1442 SvREFCNT_inc (sv); 1566 SvREFCNT_inc (sv);
1443 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1444 } 1568 }
1445 } 1569 }
1451 DEC_DEC_DEPTH; 1575 DEC_DEC_DEPTH;
1452 return 0; 1576 return 0;
1453} 1577}
1454 1578
1455static SV * 1579static SV *
1580decode_tag (dec_t *dec)
1581{
1582 SV *tag = 0;
1583 SV *val = 0;
1584
1585 if (!(dec->json.flags & F_ALLOW_TAGS))
1586 ERR ("malformed JSON string, neither array, object, number, string or atom");
1587
1588 ++dec->cur;
1589
1590 decode_ws (dec);
1591
1592 tag = decode_sv (dec);
1593 if (!tag)
1594 goto fail;
1595
1596 if (!SvPOK (tag))
1597 ERR ("malformed JSON string, (tag) must be a string");
1598
1599 decode_ws (dec);
1600
1601 if (*dec->cur != ')')
1602 ERR (") expected after tag");
1603
1604 ++dec->cur;
1605
1606 decode_ws (dec);
1607
1608 val = decode_sv (dec);
1609 if (!val)
1610 goto fail;
1611
1612 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1613 ERR ("malformed JSON string, tag value must be an array");
1614
1615 {
1616 AV *av = (AV *)SvRV (val);
1617 int i, len = av_len (av) + 1;
1618 HV *stash = gv_stashsv (tag, 0);
1619 SV *sv;
1620
1621 if (!stash)
1622 ERR ("cannot decode perl-object (package does not exist)");
1623
1624 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1625
1626 if (!method)
1627 ERR ("cannot decode perl-object (package does not have a THAW method)");
1628
1629 dSP;
1630
1631 ENTER; SAVETMPS;
1632 PUSHMARK (SP);
1633 EXTEND (SP, len + 2);
1634 // we re-bless the reference to get overload and other niceties right
1635 PUSHs (tag);
1636 PUSHs (sv_json);
1637
1638 for (i = 0; i < len; ++i)
1639 PUSHs (*av_fetch (av, i, 1));
1640
1641 PUTBACK;
1642 call_sv ((SV *)GvCV (method), G_SCALAR);
1643 SPAGAIN;
1644
1645 SvREFCNT_dec (tag);
1646 SvREFCNT_dec (val);
1647 sv = SvREFCNT_inc (POPs);
1648
1649 PUTBACK;
1650
1651 FREETMPS; LEAVE;
1652
1653 return sv;
1654 }
1655
1656fail:
1657 SvREFCNT_dec (tag);
1658 SvREFCNT_dec (val);
1659 return 0;
1660}
1661
1662static SV *
1456decode_sv (dec_t *dec) 1663decode_sv (dec_t *dec)
1457{ 1664{
1458 // the beauty of JSON: you need exactly one character lookahead 1665 // the beauty of JSON: you need exactly one character lookahead
1459 // to parse everything. 1666 // to parse everything.
1460 switch (*dec->cur) 1667 switch (*dec->cur)
1461 { 1668 {
1462 case '"': ++dec->cur; return decode_str (dec); 1669 case '"': ++dec->cur; return decode_str (dec);
1463 case '[': ++dec->cur; return decode_av (dec); 1670 case '[': ++dec->cur; return decode_av (dec);
1464 case '{': ++dec->cur; return decode_hv (dec); 1671 case '{': ++dec->cur; return decode_hv (dec);
1672 case '(': return decode_tag (dec);
1465 1673
1466 case '-': 1674 case '-':
1467 case '0': case '1': case '2': case '3': case '4': 1675 case '0': case '1': case '2': case '3': case '4':
1468 case '5': case '6': case '7': case '8': case '9': 1676 case '5': case '6': case '7': case '8': case '9':
1469 return decode_num (dec); 1677 return decode_num (dec);
1470 1678
1679 case 'f':
1680 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1681 {
1682 dec->cur += 5;
1683
1684 if (expect_false (!dec->json.v_false))
1685 dec->json.v_false = GET_BOOL (false);
1686
1687 return newSVsv (dec->json.v_false);
1688 }
1689 else
1690 ERR ("'false' expected");
1691
1692 break;
1693
1471 case 't': 1694 case 't':
1472 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1695 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473 { 1696 {
1474 dec->cur += 4; 1697 dec->cur += 4;
1475#if JSON_SLOW 1698
1476 json_true = get_bool ("JSON::XS::true"); 1699 if (expect_false (!dec->json.v_true))
1477#endif 1700 dec->json.v_true = GET_BOOL (true);
1701
1478 return newSVsv (json_true); 1702 return newSVsv (dec->json.v_true);
1479 } 1703 }
1480 else 1704 else
1481 ERR ("'true' expected"); 1705 ERR ("'true' expected");
1482
1483 break;
1484
1485 case 'f':
1486 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1487 {
1488 dec->cur += 5;
1489#if JSON_SLOW
1490 json_false = get_bool ("JSON::XS::false");
1491#endif
1492 return newSVsv (json_false);
1493 }
1494 else
1495 ERR ("'false' expected");
1496 1706
1497 break; 1707 break;
1498 1708
1499 case 'n': 1709 case 'n':
1500 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1710 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
1506 ERR ("'null' expected"); 1716 ERR ("'null' expected");
1507 1717
1508 break; 1718 break;
1509 1719
1510 default: 1720 default:
1511 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1721 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512 break; 1722 break;
1513 } 1723 }
1514 1724
1515fail: 1725fail:
1516 return 0; 1726 return 0;
1517} 1727}
1518 1728
1519static SV * 1729static SV *
1520decode_json (SV *string, JSON *json, char **offset_return) 1730decode_json (SV *string, JSON *json, STRLEN *offset_return)
1521{ 1731{
1522 dec_t dec; 1732 dec_t dec;
1523 SV *sv; 1733 SV *sv;
1524 1734
1525 /* work around bugs in 5.10 where manipulating magic values 1735 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses. 1736 * makes perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean 1737 * also make a copy of non-PV values, to get them into a clean
1528 * state (SvPV should do that, but it's buggy, see below). 1738 * state (SvPV should do that, but it's buggy, see below).
1739 *
1740 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1741 * as reported by Reini Urban.
1529 */ 1742 */
1530 /*SvGETMAGIC (string);*/ 1743 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string)) 1744 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1532 string = sv_2mortal (newSVsv (string)); 1745 string = sv_2mortal (newSVsv (string));
1533 1746
1534 SvUPGRADE (string, SVt_PV); 1747 SvUPGRADE (string, SVt_PV);
1535 1748
1536 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1749 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1575 1788
1576 decode_ws (&dec); 1789 decode_ws (&dec);
1577 sv = decode_sv (&dec); 1790 sv = decode_sv (&dec);
1578 1791
1579 if (offset_return) 1792 if (offset_return)
1580 *offset_return = dec.cur; 1793 *offset_return = dec.cur - SvPVX (string);
1581 1794 else if (sv)
1582 if (!(offset_return || !sv))
1583 { 1795 {
1584 // check for trailing garbage 1796 // check for trailing garbage
1585 decode_ws (&dec); 1797 decode_ws (&dec);
1586 1798
1587 if (*dec.cur) 1799 if (*dec.cur)
1605 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1817 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1606 LEAVE; 1818 LEAVE;
1607 1819
1608 croak ("%s, at character offset %d (before \"%s\")", 1820 croak ("%s, at character offset %d (before \"%s\")",
1609 dec.err, 1821 dec.err,
1610 ptr_to_index (string, dec.cur), 1822 (int)ptr_to_index (string, dec.cur),
1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1823 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612 } 1824 }
1613 1825
1614 sv = sv_2mortal (sv); 1826 sv = sv_2mortal (sv);
1615 1827
1616 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1828 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1617 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1829 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1618 1830
1619 return sv; 1831 return sv;
1620} 1832}
1621 1833
1743 self->incr_mode = INCR_M_STR; 1955 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str; 1956 goto incr_m_str;
1745 1957
1746 case '[': 1958 case '[':
1747 case '{': 1959 case '{':
1960 case '(':
1748 if (++self->incr_nest > self->max_depth) 1961 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED); 1962 croak (ERR_NESTING_EXCEEDED);
1750 break; 1963 break;
1751 1964
1752 case ']': 1965 case ']':
1753 case '}': 1966 case '}':
1754 if (--self->incr_nest <= 0) 1967 if (--self->incr_nest <= 0)
1755 goto interrupt; 1968 goto interrupt;
1969 break;
1970
1971 case ')':
1972 --self->incr_nest;
1756 break; 1973 break;
1757 1974
1758 case '#': 1975 case '#':
1759 self->incr_mode = INCR_M_C1; 1976 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c; 1977 goto incr_m_c;
1786 i >= '0' && i <= '9' ? i - '0' 2003 i >= '0' && i <= '9' ? i - '0'
1787 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2004 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1788 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2005 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1789 : -1; 2006 : -1;
1790 2007
1791 json_stash = gv_stashpv ("JSON::XS" , 1); 2008 json_stash = gv_stashpv ("JSON::XS" , 1);
1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2009 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1793
1794 json_true = get_bool ("JSON::XS::true");
1795 json_false = get_bool ("JSON::XS::false"); 2010 bool_false = get_bool ("Types::Serialiser::false");
2011 bool_true = get_bool ("Types::Serialiser::true");
2012
2013 sv_json = newSVpv ("JSON", 0);
2014 SvREADONLY_on (sv_json);
1796 2015
1797 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2016 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798} 2017}
1799 2018
1800PROTOTYPES: DISABLE 2019PROTOTYPES: DISABLE
1801 2020
1802void CLONE (...) 2021void CLONE (...)
1803 CODE: 2022 CODE:
2023 // as long as these writes are atomic, the race should not matter
2024 // as existing threads either already use 0, or use the old value,
2025 // which is sitll correct for the initial thread.
1804 json_stash = 0; 2026 json_stash = 0;
1805 json_boolean_stash = 0; 2027 bool_stash = 0;
2028 bool_false = 0;
2029 bool_true = 0;
1806 2030
1807void new (char *klass) 2031void new (char *klass)
1808 PPCODE: 2032 PPCODE:
1809{ 2033{
1810 SV *pv = NEWSV (0, sizeof (JSON)); 2034 SV *pv = NEWSV (0, sizeof (JSON));
1811 SvPOK_only (pv); 2035 SvPOK_only (pv);
1812 json_init ((JSON *)SvPVX (pv)); 2036 json_init ((JSON *)SvPVX (pv));
1813 XPUSHs (sv_2mortal (sv_bless ( 2037 XPUSHs (sv_2mortal (sv_bless (
1814 newRV_noinc (pv), 2038 newRV_noinc (pv),
1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2039 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1816 ))); 2040 )));
1817} 2041}
2042
2043void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2044 PPCODE:
2045 self->v_false = newSVsv (v_false);
2046 self->v_true = newSVsv (v_true);
2047 XPUSHs (ST (0));
2048
2049void get_boolean_values (JSON *self)
2050 PPCODE:
2051 if (self->v_false && self->v_true)
2052 {
2053 EXTEND (SP, 2);
2054 PUSHs (self->v_false);
2055 PUSHs (self->v_true);
2056 }
1818 2057
1819void ascii (JSON *self, int enable = 1) 2058void ascii (JSON *self, int enable = 1)
1820 ALIAS: 2059 ALIAS:
1821 ascii = F_ASCII 2060 ascii = F_ASCII
1822 latin1 = F_LATIN1 2061 latin1 = F_LATIN1
1830 shrink = F_SHRINK 2069 shrink = F_SHRINK
1831 allow_blessed = F_ALLOW_BLESSED 2070 allow_blessed = F_ALLOW_BLESSED
1832 convert_blessed = F_CONV_BLESSED 2071 convert_blessed = F_CONV_BLESSED
1833 relaxed = F_RELAXED 2072 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN 2073 allow_unknown = F_ALLOW_UNKNOWN
2074 allow_tags = F_ALLOW_TAGS
1835 PPCODE: 2075 PPCODE:
1836{ 2076{
1837 if (enable) 2077 if (enable)
1838 self->flags |= ix; 2078 self->flags |= ix;
1839 else 2079 else
1855 get_shrink = F_SHRINK 2095 get_shrink = F_SHRINK
1856 get_allow_blessed = F_ALLOW_BLESSED 2096 get_allow_blessed = F_ALLOW_BLESSED
1857 get_convert_blessed = F_CONV_BLESSED 2097 get_convert_blessed = F_CONV_BLESSED
1858 get_relaxed = F_RELAXED 2098 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN 2099 get_allow_unknown = F_ALLOW_UNKNOWN
2100 get_allow_tags = F_ALLOW_TAGS
1860 PPCODE: 2101 PPCODE:
1861 XPUSHs (boolSV (self->flags & ix)); 2102 XPUSHs (boolSV (self->flags & ix));
1862 2103
1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2104void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864 PPCODE: 2105 PPCODE:
1892} 2133}
1893 2134
1894void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2135void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1895 PPCODE: 2136 PPCODE:
1896{ 2137{
1897 if (!self->cb_sk_object) 2138 if (!self->cb_sk_object)
1898 self->cb_sk_object = newHV (); 2139 self->cb_sk_object = newHV ();
1899 2140
1900 if (SvOK (cb)) 2141 if (SvOK (cb))
1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2142 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902 else 2143 else
1913 XPUSHs (ST (0)); 2154 XPUSHs (ST (0));
1914} 2155}
1915 2156
1916void encode (JSON *self, SV *scalar) 2157void encode (JSON *self, SV *scalar)
1917 PPCODE: 2158 PPCODE:
1918 XPUSHs (encode_json (scalar, self)); 2159 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2160 XPUSHs (scalar);
1919 2161
1920void decode (JSON *self, SV *jsonstr) 2162void decode (JSON *self, SV *jsonstr)
1921 PPCODE: 2163 PPCODE:
1922 XPUSHs (decode_json (jsonstr, self, 0)); 2164 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2165 XPUSHs (jsonstr);
1923 2166
1924void decode_prefix (JSON *self, SV *jsonstr) 2167void decode_prefix (JSON *self, SV *jsonstr)
1925 PPCODE: 2168 PPCODE:
1926{ 2169{
1927 char *offset; 2170 SV *sv;
2171 STRLEN offset;
2172 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928 EXTEND (SP, 2); 2173 EXTEND (SP, 2);
1929 PUSHs (decode_json (jsonstr, self, &offset)); 2174 PUSHs (sv);
1930 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2175 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1931} 2176}
1932 2177
1933void incr_parse (JSON *self, SV *jsonstr = 0) 2178void incr_parse (JSON *self, SV *jsonstr = 0)
1934 PPCODE: 2179 PPCODE:
1935{ 2180{
1969 { 2214 {
1970 STRLEN len; 2215 STRLEN len;
1971 const char *str = SvPV (jsonstr, len); 2216 const char *str = SvPV (jsonstr, len);
1972 STRLEN cur = SvCUR (self->incr_text); 2217 STRLEN cur = SvCUR (self->incr_text);
1973 2218
1974 if (SvLEN (self->incr_text) <= cur + len) 2219 if (SvLEN (self->incr_text) - cur <= len)
1975 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2220 json_sv_grow (self->incr_text, cur, len);
1976 2221
1977 Move (str, SvEND (self->incr_text), len, char); 2222 Move (str, SvEND (self->incr_text), len, char);
1978 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2223 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1979 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2224 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1980 } 2225 }
1981 } 2226 }
1982 2227
1983 if (GIMME_V != G_VOID) 2228 if (GIMME_V != G_VOID)
1984 do 2229 do
1985 { 2230 {
2231 SV *sv;
1986 char *offset; 2232 STRLEN offset;
1987 2233
1988 if (!INCR_DONE (self)) 2234 if (!INCR_DONE (self))
1989 { 2235 {
1990 incr_parse (self); 2236 incr_parse (self);
1991 2237
1994 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2240 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1995 2241
1996 if (!INCR_DONE (self)) 2242 if (!INCR_DONE (self))
1997 { 2243 {
1998 // as an optimisation, do not accumulate white space in the incr buffer 2244 // as an optimisation, do not accumulate white space in the incr buffer
1999 if (self->incr_mode == INCR_M_WS) 2245 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2246 {
2247 self->incr_pos = 0;
2000 SvCUR_set (self->incr_text, 0); 2248 SvCUR_set (self->incr_text, 0);
2249 }
2001 2250
2002 break; 2251 break;
2003 } 2252 }
2004 } 2253 }
2005 2254
2006 XPUSHs (decode_json (self->incr_text, self, &offset)); 2255 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2256 XPUSHs (sv);
2007 2257
2008 self->incr_pos -= offset - SvPVX (self->incr_text); 2258 self->incr_pos -= offset;
2009 self->incr_nest = 0; 2259 self->incr_nest = 0;
2010 self->incr_mode = 0; 2260 self->incr_mode = 0;
2011 2261
2012 sv_chop (self->incr_text, offset); 2262 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2013 } 2263 }
2014 while (GIMME_V == G_ARRAY); 2264 while (GIMME_V == G_ARRAY);
2015} 2265}
2016 2266
2017SV *incr_text (JSON *self) 2267SV *incr_text (JSON *self)
2048 self->incr_mode = 0; 2298 self->incr_mode = 0;
2049} 2299}
2050 2300
2051void DESTROY (JSON *self) 2301void DESTROY (JSON *self)
2052 CODE: 2302 CODE:
2303 SvREFCNT_dec (self->v_false);
2304 SvREFCNT_dec (self->v_true);
2053 SvREFCNT_dec (self->cb_sk_object); 2305 SvREFCNT_dec (self->cb_sk_object);
2054 SvREFCNT_dec (self->cb_object); 2306 SvREFCNT_dec (self->cb_object);
2055 SvREFCNT_dec (self->incr_text); 2307 SvREFCNT_dec (self->incr_text);
2056 2308
2057PROTOTYPES: ENABLE 2309PROTOTYPES: ENABLE
2058 2310
2059void encode_json (SV *scalar) 2311void encode_json (SV *scalar)
2060 ALIAS:
2061 to_json_ = 0
2062 encode_json = F_UTF8
2063 PPCODE: 2312 PPCODE:
2064{ 2313{
2065 JSON json; 2314 JSON json;
2066 json_init (&json); 2315 json_init (&json);
2067 json.flags |= ix; 2316 json.flags |= F_UTF8;
2068 XPUSHs (encode_json (scalar, &json)); 2317 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2318 XPUSHs (scalar);
2069} 2319}
2070 2320
2071void decode_json (SV *jsonstr) 2321void decode_json (SV *jsonstr)
2072 ALIAS:
2073 from_json_ = 0
2074 decode_json = F_UTF8
2075 PPCODE: 2322 PPCODE:
2076{ 2323{
2077 JSON json; 2324 JSON json;
2078 json_init (&json); 2325 json_init (&json);
2079 json.flags |= ix; 2326 json.flags |= F_UTF8;
2080 XPUSHs (decode_json (jsonstr, &json, 0)); 2327 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2328 XPUSHs (jsonstr);
2081} 2329}
2082 2330

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines