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.108 by root, Tue Aug 17 23:27:36 2010 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
260 } 306 }
261 307
262 // this relies greatly on the quality of the pow () 308 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good 309 // implementation of the platform, but a good
264 // implementation is hard to beat. 310 // implementation is hard to beat.
311 // (IEEE 754 conformant ones are required to be exact)
265 if (postdp) *expo -= eaccum; 312 if (postdp) *expo -= eaccum;
266 *accum += uaccum * Perl_pow (10., *expo); 313 *accum += uaccum * Perl_pow (10., *expo);
267 *expo += eaccum; 314 *expo += eaccum;
268} 315}
269 316
283 // a recursion depth of ten gives us >>500 bits 330 // a recursion depth of ten gives us >>500 bits
284 json_atof_scan1 (s, &accum, &expo, 0, 10); 331 json_atof_scan1 (s, &accum, &expo, 0, 10);
285 332
286 return neg ? -accum : accum; 333 return neg ? -accum : accum;
287} 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
288///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
289// encoder 379// encoder
290 380
291// structure used for encoding JSON 381// structure used for encoding JSON
292typedef struct 382typedef struct
300} enc_t; 390} enc_t;
301 391
302INLINE void 392INLINE void
303need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
304{ 394{
305 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
306 { 396 {
307 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
308 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
309 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
310 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
311 } 401 }
312} 402}
313 403
314INLINE void 404INLINE void
315encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
331 421
332 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
333 { 423 {
334 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
335 { 425 {
336 need (enc, len += 1); 426 need (enc, len + 1);
337 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
338 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
339 } 429 }
340 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
341 { 431 {
342 need (enc, len += 1); 432 need (enc, len + 1);
343 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
344 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
345 } 435 }
346 else 436 else
347 *enc->cur++ = ch; 437 *enc->cur++ = ch;
350 } 440 }
351 else 441 else
352 { 442 {
353 switch (ch) 443 switch (ch)
354 { 444 {
355 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;
356 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;
357 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;
358 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;
359 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;
360 450
361 default: 451 default:
362 { 452 {
363 STRLEN clen; 453 STRLEN clen;
364 UV uch; 454 UV uch;
380 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
381 { 471 {
382 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
383 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);
384 474
385 need (enc, len += 11); 475 need (enc, len + 11);
386 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
387 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
388 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
389 enc->cur += 12; 479 enc->cur += 12;
390 } 480 }
391 else 481 else
392 { 482 {
393 need (enc, len += 5); 483 need (enc, len + 5);
394 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
395 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
396 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
397 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
398 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
406 *enc->cur++ = uch; 496 *enc->cur++ = uch;
407 str += clen; 497 str += clen;
408 } 498 }
409 else if (is_utf8) 499 else if (is_utf8)
410 { 500 {
411 need (enc, len += clen); 501 need (enc, len + clen);
412 do 502 do
413 { 503 {
414 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
415 } 505 }
416 while (--clen); 506 while (--clen);
417 } 507 }
418 else 508 else
419 { 509 {
420 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
421 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
422 ++str; 512 ++str;
423 } 513 }
424 } 514 }
425 } 515 }
479 569
480 if (enc->indent >= enc->json.max_depth) 570 if (enc->indent >= enc->json.max_depth)
481 croak (ERR_NESTING_EXCEEDED); 571 croak (ERR_NESTING_EXCEEDED);
482 572
483 encode_ch (enc, '['); 573 encode_ch (enc, '[');
484 574
485 if (len >= 0) 575 if (len >= 0)
486 { 576 {
487 encode_nl (enc); ++enc->indent; 577 encode_nl (enc); ++enc->indent;
488 578
489 for (i = 0; i <= len; ++i) 579 for (i = 0; i <= len; ++i)
501 encode_comma (enc); 591 encode_comma (enc);
502 } 592 }
503 593
504 encode_nl (enc); --enc->indent; encode_indent (enc); 594 encode_nl (enc); --enc->indent; encode_indent (enc);
505 } 595 }
506 596
507 encode_ch (enc, ']'); 597 encode_ch (enc, ']');
508} 598}
509 599
510static void 600static void
511encode_hk (enc_t *enc, HE *he) 601encode_hk (enc_t *enc, HE *he)
515 if (HeKLEN (he) == HEf_SVKEY) 605 if (HeKLEN (he) == HEf_SVKEY)
516 { 606 {
517 SV *sv = HeSVKEY (he); 607 SV *sv = HeSVKEY (he);
518 STRLEN len; 608 STRLEN len;
519 char *str; 609 char *str;
520 610
521 SvGETMAGIC (sv); 611 SvGETMAGIC (sv);
522 str = SvPV (sv, len); 612 str = SvPV (sv, len);
523 613
524 encode_str (enc, str, len, SvUTF8 (sv)); 614 encode_str (enc, str, len, SvUTF8 (sv));
525 } 615 }
591 } 681 }
592 682
593 if (count) 683 if (count)
594 { 684 {
595 int i, fast = 1; 685 int i, fast = 1;
596#if defined(__BORLANDC__) || defined(_MSC_VER) 686 HE *hes_stack [STACK_HES];
597 HE **hes = _alloca (count * sizeof (HE)); 687 HE **hes = hes_stack;
598#else 688
599 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 689 // allocate larger arrays on the heap
600#endif 690 if (count > STACK_HES)
691 {
692 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
693 hes = (HE **)SvPVX (sv);
694 }
601 695
602 i = 0; 696 i = 0;
603 while ((he = hv_iternext (hv))) 697 while ((he = hv_iternext (hv)))
604 { 698 {
605 hes [i++] = he; 699 hes [i++] = he;
674// encode objects, arrays and special \0=false and \1=true values. 768// encode objects, arrays and special \0=false and \1=true values.
675static void 769static void
676encode_rv (enc_t *enc, SV *sv) 770encode_rv (enc_t *enc, SV *sv)
677{ 771{
678 svtype svt; 772 svtype svt;
773 GV *method;
679 774
680 SvGETMAGIC (sv); 775 SvGETMAGIC (sv);
681 svt = SvTYPE (sv); 776 svt = SvTYPE (sv);
682 777
683 if (expect_false (SvOBJECT (sv))) 778 if (expect_false (SvOBJECT (sv)))
684 { 779 {
685 HV *stash = !JSON_SLOW || json_boolean_stash 780 HV *stash = SvSTASH (sv);
686 ? json_boolean_stash
687 : gv_stashpv ("JSON::XS::Boolean", 1);
688 781
689 if (SvSTASH (sv) == stash) 782 if (stash == bool_stash)
690 { 783 {
691 if (SvIV (sv))
692 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
693 else
694 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
695 } 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);
696 else 859 else
697 {
698#if 0
699 if (0 && sv_derived_from (rv, "JSON::Literal"))
700 {
701 // not yet
702 }
703#endif
704 if (enc->json.flags & F_CONV_BLESSED)
705 {
706 // we re-bless the reference to get overload and other niceties right
707 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
708
709 if (to_json)
710 {
711 dSP;
712
713 ENTER; SAVETMPS; PUSHMARK (SP);
714 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
715
716 // calling with G_SCALAR ensures that we always get a 1 return value
717 PUTBACK;
718 call_sv ((SV *)GvCV (to_json), G_SCALAR);
719 SPAGAIN;
720
721 // catch this surprisingly common error
722 if (SvROK (TOPs) && SvRV (TOPs) == sv)
723 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
724
725 sv = POPs;
726 PUTBACK;
727
728 encode_sv (enc, sv);
729
730 FREETMPS; LEAVE;
731 }
732 else if (enc->json.flags & F_ALLOW_BLESSED)
733 encode_str (enc, "null", 4, 0);
734 else
735 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
736 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
737 }
738 else if (enc->json.flags & F_ALLOW_BLESSED)
739 encode_str (enc, "null", 4, 0);
740 else
741 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)",
742 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 861 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
743 }
744 } 862 }
745 else if (svt == SVt_PVHV) 863 else if (svt == SVt_PVHV)
746 encode_hv (enc, (HV *)sv); 864 encode_hv (enc, (HV *)sv);
747 else if (svt == SVt_PVAV) 865 else if (svt == SVt_PVAV)
748 encode_av (enc, (AV *)sv); 866 encode_av (enc, (AV *)sv);
749 else if (svt < SVt_PVAV) 867 else if (svt < SVt_PVAV)
750 { 868 {
751 STRLEN len = 0; 869 int bool_type = ref_bool_type (sv);
752 char *pv = svt ? SvPV (sv, len) : 0;
753 870
754 if (len == 1 && *pv == '1') 871 if (bool_type == 1)
755 encode_str (enc, "true", 4, 0); 872 encode_str (enc, "true", 4, 0);
756 else if (len == 1 && *pv == '0') 873 else if (bool_type == 0)
757 encode_str (enc, "false", 5, 0); 874 encode_str (enc, "false", 5, 0);
758 else if (enc->json.flags & F_ALLOW_UNKNOWN) 875 else if (enc->json.flags & F_ALLOW_UNKNOWN)
759 encode_str (enc, "null", 4, 0); 876 encode_str (enc, "null", 4, 0);
760 else 877 else
761 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",
824 } 941 }
825 else 942 else
826 { 943 {
827 // large integer, use the (rather slow) snprintf way. 944 // large integer, use the (rather slow) snprintf way.
828 need (enc, IVUV_MAXCHARS); 945 need (enc, IVUV_MAXCHARS);
829 enc->cur += 946 enc->cur +=
830 SvIsUV(sv) 947 SvIsUV(sv)
831 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 948 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 949 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833 } 950 }
834 } 951 }
835 else if (SvROK (sv)) 952 else if (SvROK (sv))
836 encode_rv (enc, SvRV (sv)); 953 encode_rv (enc, SvRV (sv));
837 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 954 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
838 encode_str (enc, "null", 4, 0); 955 encode_str (enc, "null", 4, 0);
839 else 956 else
840 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",
841 SvPV_nolen (sv), SvFLAGS (sv)); 958 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
842} 959}
843 960
844static SV * 961static SV *
845encode_json (SV *scalar, JSON *json) 962encode_json (SV *scalar, JSON *json)
846{ 963{
847 enc_t enc; 964 enc_t enc;
848 965
849 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 966 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
850 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)");
851 968
852 enc.json = *json; 969 enc.json = *json;
853 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 970 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
854 enc.cur = SvPVX (enc.sv); 971 enc.cur = SvPVX (enc.sv);
1061 *cur++ = *dec_cur++; 1178 *cur++ = *dec_cur++;
1062 while (--clen); 1179 while (--clen);
1063 1180
1064 utf8 = 1; 1181 utf8 = 1;
1065 } 1182 }
1183 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1184 *cur++ = ch;
1066 else 1185 else
1067 { 1186 {
1068 --dec_cur; 1187 --dec_cur;
1069 1188
1070 if (!ch) 1189 if (!ch)
1080 1199
1081 if (sv) 1200 if (sv)
1082 { 1201 {
1083 STRLEN cur = SvCUR (sv); 1202 STRLEN cur = SvCUR (sv);
1084 1203
1085 if (SvLEN (sv) <= cur + len) 1204 if (SvLEN (sv) - cur <= len)
1086 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1205 json_sv_grow (sv, cur, len);
1087 1206
1088 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1207 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1089 SvCUR_set (sv, SvCUR (sv) + len); 1208 SvCUR_set (sv, SvCUR (sv) + len);
1090 } 1209 }
1091 else 1210 else
1258 if (*dec->cur == ']') 1377 if (*dec->cur == ']')
1259 { 1378 {
1260 ++dec->cur; 1379 ++dec->cur;
1261 break; 1380 break;
1262 } 1381 }
1263 1382
1264 if (*dec->cur != ',') 1383 if (*dec->cur != ',')
1265 ERR (", or ] expected while parsing array"); 1384 ERR (", or ] expected while parsing array");
1266 1385
1267 ++dec->cur; 1386 ++dec->cur;
1268 1387
1392 1511
1393 hv_iterinit (hv); 1512 hv_iterinit (hv);
1394 he = hv_iternext (hv); 1513 he = hv_iternext (hv);
1395 hv_iterinit (hv); 1514 hv_iterinit (hv);
1396 1515
1397 // the next line creates a mortal sv each time its called. 1516 // the next line creates a mortal sv each time it's called.
1398 // might want to optimise this for common cases. 1517 // might want to optimise this for common cases.
1399 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);
1400 1519
1401 if (cb) 1520 if (cb)
1402 { 1521 {
1403 dSP; 1522 dSP;
1404 int count; 1523 int count;
1405 1524
1406 ENTER; SAVETMPS; PUSHMARK (SP); 1525 ENTER; SAVETMPS;
1526 PUSHMARK (SP);
1407 XPUSHs (HeVAL (he)); 1527 XPUSHs (HeVAL (he));
1408 sv_2mortal (sv); 1528 sv_2mortal (sv);
1409 1529
1410 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1530 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1411 1531
1413 { 1533 {
1414 sv = newSVsv (POPs); 1534 sv = newSVsv (POPs);
1415 FREETMPS; LEAVE; 1535 FREETMPS; LEAVE;
1416 return sv; 1536 return sv;
1417 } 1537 }
1538 else if (count)
1539 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1418 1540
1419 SvREFCNT_inc (sv); 1541 SvREFCNT_inc (sv);
1420 FREETMPS; LEAVE; 1542 FREETMPS; LEAVE;
1421 } 1543 }
1422 } 1544 }
1424 if (dec->json.cb_object) 1546 if (dec->json.cb_object)
1425 { 1547 {
1426 dSP; 1548 dSP;
1427 int count; 1549 int count;
1428 1550
1429 ENTER; SAVETMPS; PUSHMARK (SP); 1551 ENTER; SAVETMPS;
1552 PUSHMARK (SP);
1430 XPUSHs (sv_2mortal (sv)); 1553 XPUSHs (sv_2mortal (sv));
1431 1554
1432 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1555 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1433 1556
1434 if (count == 1) 1557 if (count == 1)
1435 { 1558 {
1436 sv = newSVsv (POPs); 1559 sv = newSVsv (POPs);
1437 FREETMPS; LEAVE; 1560 FREETMPS; LEAVE;
1438 return sv; 1561 return sv;
1439 } 1562 }
1563 else if (count)
1564 croak ("filter_json_object callbacks must not return more than one scalar");
1440 1565
1441 SvREFCNT_inc (sv); 1566 SvREFCNT_inc (sv);
1442 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1443 } 1568 }
1444 } 1569 }
1450 DEC_DEC_DEPTH; 1575 DEC_DEC_DEPTH;
1451 return 0; 1576 return 0;
1452} 1577}
1453 1578
1454static 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 *
1455decode_sv (dec_t *dec) 1663decode_sv (dec_t *dec)
1456{ 1664{
1457 // the beauty of JSON: you need exactly one character lookahead 1665 // the beauty of JSON: you need exactly one character lookahead
1458 // to parse everything. 1666 // to parse everything.
1459 switch (*dec->cur) 1667 switch (*dec->cur)
1460 { 1668 {
1461 case '"': ++dec->cur; return decode_str (dec); 1669 case '"': ++dec->cur; return decode_str (dec);
1462 case '[': ++dec->cur; return decode_av (dec); 1670 case '[': ++dec->cur; return decode_av (dec);
1463 case '{': ++dec->cur; return decode_hv (dec); 1671 case '{': ++dec->cur; return decode_hv (dec);
1672 case '(': return decode_tag (dec);
1464 1673
1465 case '-': 1674 case '-':
1466 case '0': case '1': case '2': case '3': case '4': 1675 case '0': case '1': case '2': case '3': case '4':
1467 case '5': case '6': case '7': case '8': case '9': 1676 case '5': case '6': case '7': case '8': case '9':
1468 return decode_num (dec); 1677 return decode_num (dec);
1469 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
1470 case 't': 1694 case 't':
1471 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1695 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1472 { 1696 {
1473 dec->cur += 4; 1697 dec->cur += 4;
1474#if JSON_SLOW 1698
1475 json_true = get_bool ("JSON::XS::true"); 1699 if (expect_false (!dec->json.v_true))
1476#endif 1700 dec->json.v_true = GET_BOOL (true);
1701
1477 return newSVsv (json_true); 1702 return newSVsv (dec->json.v_true);
1478 } 1703 }
1479 else 1704 else
1480 ERR ("'true' expected"); 1705 ERR ("'true' expected");
1481
1482 break;
1483
1484 case 'f':
1485 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1486 {
1487 dec->cur += 5;
1488#if JSON_SLOW
1489 json_false = get_bool ("JSON::XS::false");
1490#endif
1491 return newSVsv (json_false);
1492 }
1493 else
1494 ERR ("'false' expected");
1495 1706
1496 break; 1707 break;
1497 1708
1498 case 'n': 1709 case 'n':
1499 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1710 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
1505 ERR ("'null' expected"); 1716 ERR ("'null' expected");
1506 1717
1507 break; 1718 break;
1508 1719
1509 default: 1720 default:
1510 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1721 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1511 break; 1722 break;
1512 } 1723 }
1513 1724
1514fail: 1725fail:
1515 return 0; 1726 return 0;
1516} 1727}
1517 1728
1518static SV * 1729static SV *
1519decode_json (SV *string, JSON *json, char **offset_return) 1730decode_json (SV *string, JSON *json, STRLEN *offset_return)
1520{ 1731{
1521 dec_t dec; 1732 dec_t dec;
1522 SV *sv; 1733 SV *sv;
1523 1734
1524 /* work around bugs in 5.10 where manipulating magic values 1735 /* work around bugs in 5.10 where manipulating magic values
1525 * will perl ignore the magic in subsequent accesses 1736 * makes perl ignore the magic in subsequent accesses.
1737 * also make a copy of non-PV values, to get them into a clean
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.
1526 */ 1742 */
1527 /*SvGETMAGIC (string);*/ 1743 /*SvGETMAGIC (string);*/
1528 if (SvMAGICAL (string)) 1744 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1529 string = sv_2mortal (newSVsv (string)); 1745 string = sv_2mortal (newSVsv (string));
1530 1746
1531 SvUPGRADE (string, SVt_PV); 1747 SvUPGRADE (string, SVt_PV);
1532 1748
1533 /* 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
1572 1788
1573 decode_ws (&dec); 1789 decode_ws (&dec);
1574 sv = decode_sv (&dec); 1790 sv = decode_sv (&dec);
1575 1791
1576 if (offset_return) 1792 if (offset_return)
1577 *offset_return = dec.cur; 1793 *offset_return = dec.cur - SvPVX (string);
1578 1794 else if (sv)
1579 if (!(offset_return || !sv))
1580 { 1795 {
1581 // check for trailing garbage 1796 // check for trailing garbage
1582 decode_ws (&dec); 1797 decode_ws (&dec);
1583 1798
1584 if (*dec.cur) 1799 if (*dec.cur)
1602 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);
1603 LEAVE; 1818 LEAVE;
1604 1819
1605 croak ("%s, at character offset %d (before \"%s\")", 1820 croak ("%s, at character offset %d (before \"%s\")",
1606 dec.err, 1821 dec.err,
1607 ptr_to_index (string, dec.cur), 1822 (int)ptr_to_index (string, dec.cur),
1608 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1823 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1609 } 1824 }
1610 1825
1611 sv = sv_2mortal (sv); 1826 sv = sv_2mortal (sv);
1612 1827
1613 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1828 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1614 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)");
1615 1830
1616 return sv; 1831 return sv;
1617} 1832}
1618 1833
1740 self->incr_mode = INCR_M_STR; 1955 self->incr_mode = INCR_M_STR;
1741 goto incr_m_str; 1956 goto incr_m_str;
1742 1957
1743 case '[': 1958 case '[':
1744 case '{': 1959 case '{':
1960 case '(':
1745 if (++self->incr_nest > self->max_depth) 1961 if (++self->incr_nest > self->max_depth)
1746 croak (ERR_NESTING_EXCEEDED); 1962 croak (ERR_NESTING_EXCEEDED);
1747 break; 1963 break;
1748 1964
1749 case ']': 1965 case ']':
1750 case '}': 1966 case '}':
1751 if (--self->incr_nest <= 0) 1967 if (--self->incr_nest <= 0)
1752 goto interrupt; 1968 goto interrupt;
1969 break;
1970
1971 case ')':
1972 --self->incr_nest;
1753 break; 1973 break;
1754 1974
1755 case '#': 1975 case '#':
1756 self->incr_mode = INCR_M_C1; 1976 self->incr_mode = INCR_M_C1;
1757 goto incr_m_c; 1977 goto incr_m_c;
1783 i >= '0' && i <= '9' ? i - '0' 2003 i >= '0' && i <= '9' ? i - '0'
1784 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2004 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1785 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2005 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1786 : -1; 2006 : -1;
1787 2007
1788 json_stash = gv_stashpv ("JSON::XS" , 1); 2008 json_stash = gv_stashpv ("JSON::XS" , 1);
1789 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2009 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1790
1791 json_true = get_bool ("JSON::XS::true");
1792 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);
1793 2015
1794 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 */
1795} 2017}
1796 2018
1797PROTOTYPES: DISABLE 2019PROTOTYPES: DISABLE
1798 2020
1799void CLONE (...) 2021void CLONE (...)
1800 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.
1801 json_stash = 0; 2026 json_stash = 0;
1802 json_boolean_stash = 0; 2027 bool_stash = 0;
2028 bool_false = 0;
2029 bool_true = 0;
1803 2030
1804void new (char *klass) 2031void new (char *klass)
1805 PPCODE: 2032 PPCODE:
1806{ 2033{
1807 SV *pv = NEWSV (0, sizeof (JSON)); 2034 SV *pv = NEWSV (0, sizeof (JSON));
1808 SvPOK_only (pv); 2035 SvPOK_only (pv);
1809 json_init ((JSON *)SvPVX (pv)); 2036 json_init ((JSON *)SvPVX (pv));
1810 XPUSHs (sv_2mortal (sv_bless ( 2037 XPUSHs (sv_2mortal (sv_bless (
1811 newRV_noinc (pv), 2038 newRV_noinc (pv),
1812 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2039 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1813 ))); 2040 )));
1814} 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 }
1815 2057
1816void ascii (JSON *self, int enable = 1) 2058void ascii (JSON *self, int enable = 1)
1817 ALIAS: 2059 ALIAS:
1818 ascii = F_ASCII 2060 ascii = F_ASCII
1819 latin1 = F_LATIN1 2061 latin1 = F_LATIN1
1827 shrink = F_SHRINK 2069 shrink = F_SHRINK
1828 allow_blessed = F_ALLOW_BLESSED 2070 allow_blessed = F_ALLOW_BLESSED
1829 convert_blessed = F_CONV_BLESSED 2071 convert_blessed = F_CONV_BLESSED
1830 relaxed = F_RELAXED 2072 relaxed = F_RELAXED
1831 allow_unknown = F_ALLOW_UNKNOWN 2073 allow_unknown = F_ALLOW_UNKNOWN
2074 allow_tags = F_ALLOW_TAGS
1832 PPCODE: 2075 PPCODE:
1833{ 2076{
1834 if (enable) 2077 if (enable)
1835 self->flags |= ix; 2078 self->flags |= ix;
1836 else 2079 else
1852 get_shrink = F_SHRINK 2095 get_shrink = F_SHRINK
1853 get_allow_blessed = F_ALLOW_BLESSED 2096 get_allow_blessed = F_ALLOW_BLESSED
1854 get_convert_blessed = F_CONV_BLESSED 2097 get_convert_blessed = F_CONV_BLESSED
1855 get_relaxed = F_RELAXED 2098 get_relaxed = F_RELAXED
1856 get_allow_unknown = F_ALLOW_UNKNOWN 2099 get_allow_unknown = F_ALLOW_UNKNOWN
2100 get_allow_tags = F_ALLOW_TAGS
1857 PPCODE: 2101 PPCODE:
1858 XPUSHs (boolSV (self->flags & ix)); 2102 XPUSHs (boolSV (self->flags & ix));
1859 2103
1860void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2104void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1861 PPCODE: 2105 PPCODE:
1889} 2133}
1890 2134
1891void 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)
1892 PPCODE: 2136 PPCODE:
1893{ 2137{
1894 if (!self->cb_sk_object) 2138 if (!self->cb_sk_object)
1895 self->cb_sk_object = newHV (); 2139 self->cb_sk_object = newHV ();
1896 2140
1897 if (SvOK (cb)) 2141 if (SvOK (cb))
1898 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2142 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1899 else 2143 else
1910 XPUSHs (ST (0)); 2154 XPUSHs (ST (0));
1911} 2155}
1912 2156
1913void encode (JSON *self, SV *scalar) 2157void encode (JSON *self, SV *scalar)
1914 PPCODE: 2158 PPCODE:
1915 XPUSHs (encode_json (scalar, self)); 2159 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2160 XPUSHs (scalar);
1916 2161
1917void decode (JSON *self, SV *jsonstr) 2162void decode (JSON *self, SV *jsonstr)
1918 PPCODE: 2163 PPCODE:
1919 XPUSHs (decode_json (jsonstr, self, 0)); 2164 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2165 XPUSHs (jsonstr);
1920 2166
1921void decode_prefix (JSON *self, SV *jsonstr) 2167void decode_prefix (JSON *self, SV *jsonstr)
1922 PPCODE: 2168 PPCODE:
1923{ 2169{
1924 char *offset; 2170 SV *sv;
2171 STRLEN offset;
2172 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1925 EXTEND (SP, 2); 2173 EXTEND (SP, 2);
1926 PUSHs (decode_json (jsonstr, self, &offset)); 2174 PUSHs (sv);
1927 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2175 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1928} 2176}
1929 2177
1930void incr_parse (JSON *self, SV *jsonstr = 0) 2178void incr_parse (JSON *self, SV *jsonstr = 0)
1931 PPCODE: 2179 PPCODE:
1932{ 2180{
1966 { 2214 {
1967 STRLEN len; 2215 STRLEN len;
1968 const char *str = SvPV (jsonstr, len); 2216 const char *str = SvPV (jsonstr, len);
1969 STRLEN cur = SvCUR (self->incr_text); 2217 STRLEN cur = SvCUR (self->incr_text);
1970 2218
1971 if (SvLEN (self->incr_text) <= cur + len) 2219 if (SvLEN (self->incr_text) - cur <= len)
1972 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2220 json_sv_grow (self->incr_text, cur, len);
1973 2221
1974 Move (str, SvEND (self->incr_text), len, char); 2222 Move (str, SvEND (self->incr_text), len, char);
1975 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2223 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1976 *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
1977 } 2225 }
1978 } 2226 }
1979 2227
1980 if (GIMME_V != G_VOID) 2228 if (GIMME_V != G_VOID)
1981 do 2229 do
1982 { 2230 {
2231 SV *sv;
1983 char *offset; 2232 STRLEN offset;
1984 2233
1985 if (!INCR_DONE (self)) 2234 if (!INCR_DONE (self))
1986 { 2235 {
1987 incr_parse (self); 2236 incr_parse (self);
1988 2237
1989 if (self->incr_pos > self->max_size && self->max_size) 2238 if (self->incr_pos > self->max_size && self->max_size)
1990 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2239 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1991 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2240 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1992 2241
1993 if (!INCR_DONE (self)) 2242 if (!INCR_DONE (self))
2243 {
2244 // as an optimisation, do not accumulate white space in the incr buffer
2245 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2246 {
2247 self->incr_pos = 0;
2248 SvCUR_set (self->incr_text, 0);
2249 }
2250
1994 break; 2251 break;
2252 }
1995 } 2253 }
1996 2254
1997 XPUSHs (decode_json (self->incr_text, self, &offset)); 2255 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2256 XPUSHs (sv);
1998 2257
1999 self->incr_pos -= offset - SvPVX (self->incr_text); 2258 self->incr_pos -= offset;
2000 self->incr_nest = 0; 2259 self->incr_nest = 0;
2001 self->incr_mode = 0; 2260 self->incr_mode = 0;
2002 2261
2003 sv_chop (self->incr_text, offset); 2262 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2004 } 2263 }
2005 while (GIMME_V == G_ARRAY); 2264 while (GIMME_V == G_ARRAY);
2006} 2265}
2007 2266
2008SV *incr_text (JSON *self) 2267SV *incr_text (JSON *self)
2039 self->incr_mode = 0; 2298 self->incr_mode = 0;
2040} 2299}
2041 2300
2042void DESTROY (JSON *self) 2301void DESTROY (JSON *self)
2043 CODE: 2302 CODE:
2303 SvREFCNT_dec (self->v_false);
2304 SvREFCNT_dec (self->v_true);
2044 SvREFCNT_dec (self->cb_sk_object); 2305 SvREFCNT_dec (self->cb_sk_object);
2045 SvREFCNT_dec (self->cb_object); 2306 SvREFCNT_dec (self->cb_object);
2046 SvREFCNT_dec (self->incr_text); 2307 SvREFCNT_dec (self->incr_text);
2047 2308
2048PROTOTYPES: ENABLE 2309PROTOTYPES: ENABLE
2049 2310
2050void encode_json (SV *scalar) 2311void encode_json (SV *scalar)
2051 ALIAS:
2052 to_json_ = 0
2053 encode_json = F_UTF8
2054 PPCODE: 2312 PPCODE:
2055{ 2313{
2056 JSON json; 2314 JSON json;
2057 json_init (&json); 2315 json_init (&json);
2058 json.flags |= ix; 2316 json.flags |= F_UTF8;
2059 XPUSHs (encode_json (scalar, &json)); 2317 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2318 XPUSHs (scalar);
2060} 2319}
2061 2320
2062void decode_json (SV *jsonstr) 2321void decode_json (SV *jsonstr)
2063 ALIAS:
2064 from_json_ = 0
2065 decode_json = F_UTF8
2066 PPCODE: 2322 PPCODE:
2067{ 2323{
2068 JSON json; 2324 JSON json;
2069 json_init (&json); 2325 json_init (&json);
2070 json.flags |= ix; 2326 json.flags |= F_UTF8;
2071 XPUSHs (decode_json (jsonstr, &json, 0)); 2327 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2328 XPUSHs (jsonstr);
2072} 2329}
2073 2330

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines