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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines