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.113 by root, Thu Aug 11 21:37:41 2011 UTC vs.
Revision 1.137 by root, Sun Feb 24 04:21:05 2019 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
101 INCR_M_TFN, // inside true/false/null
102 INCR_M_NUM, // inside number
82 INCR_M_STR, // inside string 103 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash 104 INCR_M_BS, // inside backslash
84 INCR_M_C0, // inside comment in initial whitespace sequence 105 INCR_M_C0, // inside comment in initial whitespace sequence
85 INCR_M_C1, // inside comment in other places 106 INCR_M_C1, // inside comment in other places
86 INCR_M_JSON // outside anything, count nesting 107 INCR_M_JSON // outside anything, count nesting
99 // for the incremental parser 120 // for the incremental parser
100 SV *incr_text; // the source text so far 121 SV *incr_text; // the source text so far
101 STRLEN incr_pos; // the current offset into the text 122 STRLEN incr_pos; // the current offset into the text
102 int incr_nest; // {[]}-nesting level 123 int incr_nest; // {[]}-nesting level
103 unsigned char incr_mode; 124 unsigned char incr_mode;
125
126 SV *v_false, *v_true;
104} JSON; 127} JSON;
105 128
106INLINE void 129INLINE void
107json_init (JSON *json) 130json_init (JSON *json)
108{ 131{
109 Zero (json, 1, JSON); 132 static const JSON init = { F_ALLOW_NONREF, 512 };
110 json->max_depth = 512; 133
134 *json = init;
111} 135}
112 136
113///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
114// utility functions 138// utility functions
115 139
137 SvPV_renew (sv, SvCUR (sv) + 1); 161 SvPV_renew (sv, SvCUR (sv) + 1);
138#endif 162#endif
139 } 163 }
140} 164}
141 165
166/* adds two STRLENs together, slow, and with paranoia */
167STRLEN
168strlen_sum (STRLEN l1, STRLEN l2)
169{
170 size_t sum = l1 + l2;
171
172 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
173 croak ("JSON::XS: string size overflow");
174
175 return sum;
176}
177
178/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
179static char *
180json_sv_grow (SV *sv, size_t len1, size_t len2)
181{
182 len1 = strlen_sum (len1, len2);
183 len1 = strlen_sum (len1, len1 >> 1);
184
185 if (len1 > 4096 - 24)
186 len1 = (len1 | 4095) - 24;
187
188 return SvGROW (sv, len1);
189}
190
142// decode an utf-8 character and return it, or (UV)-1 in 191// decode a utf-8 character and return it, or (UV)-1 in
143// case of an error. 192// case of an error.
144// we special-case "safe" characters from U+80 .. U+7FF, 193// we special-case "safe" characters from U+80 .. U+7FF,
145// but use the very good perl function to parse anything else. 194// but use the very good perl function to parse anything else.
146// note that we never call this function for a ascii codepoints 195// note that we never call this function for a ascii codepoints
147INLINE UV 196INLINE UV
284 // a recursion depth of ten gives us >>500 bits 333 // a recursion depth of ten gives us >>500 bits
285 json_atof_scan1 (s, &accum, &expo, 0, 10); 334 json_atof_scan1 (s, &accum, &expo, 0, 10);
286 335
287 return neg ? -accum : accum; 336 return neg ? -accum : accum;
288} 337}
338
339// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
340static int
341ref_bool_type (SV *sv)
342{
343 svtype svt = SvTYPE (sv);
344
345 if (svt < SVt_PVAV)
346 {
347 STRLEN len = 0;
348 char *pv = svt ? SvPV (sv, len) : 0;
349
350 if (len == 1)
351 if (*pv == '1')
352 return 1;
353 else if (*pv == '0')
354 return 0;
355 }
356
357 return -1;
358}
359
360// returns whether scalar is not a reference in the sense of allow_nonref
361static int
362json_nonref (SV *scalar)
363{
364 if (!SvROK (scalar))
365 return 1;
366
367 scalar = SvRV (scalar);
368
369 if (SvTYPE (scalar) >= SVt_PVMG)
370 {
371 if (SvSTASH (scalar) == bool_stash)
372 return 1;
373
374 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
375 return 1;
376 }
377
378 return 0;
379}
380
289///////////////////////////////////////////////////////////////////////////// 381/////////////////////////////////////////////////////////////////////////////
290// encoder 382// encoder
291 383
292// structure used for encoding JSON 384// structure used for encoding JSON
293typedef struct 385typedef struct
301} enc_t; 393} enc_t;
302 394
303INLINE void 395INLINE void
304need (enc_t *enc, STRLEN len) 396need (enc_t *enc, STRLEN len)
305{ 397{
306 if (expect_false (enc->cur + len >= enc->end)) 398 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
307 { 399 {
308 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 400 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
309 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 401 char *buf = json_sv_grow (enc->sv, cur, len);
310 enc->cur = SvPVX (enc->sv) + cur; 402 enc->cur = buf + cur;
311 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 403 enc->end = buf + SvLEN (enc->sv) - 1;
312 } 404 }
313} 405}
314 406
315INLINE void 407INLINE void
316encode_ch (enc_t *enc, char ch) 408encode_ch (enc_t *enc, char ch)
332 424
333 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 425 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
334 { 426 {
335 if (expect_false (ch == '"')) // but with slow exceptions 427 if (expect_false (ch == '"')) // but with slow exceptions
336 { 428 {
337 need (enc, len += 1); 429 need (enc, len + 1);
338 *enc->cur++ = '\\'; 430 *enc->cur++ = '\\';
339 *enc->cur++ = '"'; 431 *enc->cur++ = '"';
340 } 432 }
341 else if (expect_false (ch == '\\')) 433 else if (expect_false (ch == '\\'))
342 { 434 {
343 need (enc, len += 1); 435 need (enc, len + 1);
344 *enc->cur++ = '\\'; 436 *enc->cur++ = '\\';
345 *enc->cur++ = '\\'; 437 *enc->cur++ = '\\';
346 } 438 }
347 else 439 else
348 *enc->cur++ = ch; 440 *enc->cur++ = ch;
351 } 443 }
352 else 444 else
353 { 445 {
354 switch (ch) 446 switch (ch)
355 { 447 {
356 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 448 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; 449 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; 450 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; 451 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; 452 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
361 453
362 default: 454 default:
363 { 455 {
364 STRLEN clen; 456 STRLEN clen;
365 UV uch; 457 UV uch;
381 if (uch >= 0x10000UL) 473 if (uch >= 0x10000UL)
382 { 474 {
383 if (uch >= 0x110000UL) 475 if (uch >= 0x110000UL)
384 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 476 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
385 477
386 need (enc, len += 11); 478 need (enc, len + 11);
387 sprintf (enc->cur, "\\u%04x\\u%04x", 479 sprintf (enc->cur, "\\u%04x\\u%04x",
388 (int)((uch - 0x10000) / 0x400 + 0xD800), 480 (int)((uch - 0x10000) / 0x400 + 0xD800),
389 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 481 (int)((uch - 0x10000) % 0x400 + 0xDC00));
390 enc->cur += 12; 482 enc->cur += 12;
391 } 483 }
392 else 484 else
393 { 485 {
394 need (enc, len += 5); 486 need (enc, len + 5);
395 *enc->cur++ = '\\'; 487 *enc->cur++ = '\\';
396 *enc->cur++ = 'u'; 488 *enc->cur++ = 'u';
397 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 489 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
398 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 490 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
399 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 491 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
407 *enc->cur++ = uch; 499 *enc->cur++ = uch;
408 str += clen; 500 str += clen;
409 } 501 }
410 else if (is_utf8) 502 else if (is_utf8)
411 { 503 {
412 need (enc, len += clen); 504 need (enc, len + clen);
413 do 505 do
414 { 506 {
415 *enc->cur++ = *str++; 507 *enc->cur++ = *str++;
416 } 508 }
417 while (--clen); 509 while (--clen);
418 } 510 }
419 else 511 else
420 { 512 {
421 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 513 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
422 enc->cur = encode_utf8 (enc->cur, uch); 514 enc->cur = encode_utf8 (enc->cur, uch);
423 ++str; 515 ++str;
424 } 516 }
425 } 517 }
426 } 518 }
480 572
481 if (enc->indent >= enc->json.max_depth) 573 if (enc->indent >= enc->json.max_depth)
482 croak (ERR_NESTING_EXCEEDED); 574 croak (ERR_NESTING_EXCEEDED);
483 575
484 encode_ch (enc, '['); 576 encode_ch (enc, '[');
485 577
486 if (len >= 0) 578 if (len >= 0)
487 { 579 {
488 encode_nl (enc); ++enc->indent; 580 encode_nl (enc); ++enc->indent;
489 581
490 for (i = 0; i <= len; ++i) 582 for (i = 0; i <= len; ++i)
502 encode_comma (enc); 594 encode_comma (enc);
503 } 595 }
504 596
505 encode_nl (enc); --enc->indent; encode_indent (enc); 597 encode_nl (enc); --enc->indent; encode_indent (enc);
506 } 598 }
507 599
508 encode_ch (enc, ']'); 600 encode_ch (enc, ']');
509} 601}
510 602
511static void 603static void
512encode_hk (enc_t *enc, HE *he) 604encode_hk (enc_t *enc, HE *he)
516 if (HeKLEN (he) == HEf_SVKEY) 608 if (HeKLEN (he) == HEf_SVKEY)
517 { 609 {
518 SV *sv = HeSVKEY (he); 610 SV *sv = HeSVKEY (he);
519 STRLEN len; 611 STRLEN len;
520 char *str; 612 char *str;
521 613
522 SvGETMAGIC (sv); 614 SvGETMAGIC (sv);
523 str = SvPV (sv, len); 615 str = SvPV (sv, len);
524 616
525 encode_str (enc, str, len, SvUTF8 (sv)); 617 encode_str (enc, str, len, SvUTF8 (sv));
526 } 618 }
592 } 684 }
593 685
594 if (count) 686 if (count)
595 { 687 {
596 int i, fast = 1; 688 int i, fast = 1;
597#if defined(__BORLANDC__) || defined(_MSC_VER) 689 HE *hes_stack [STACK_HES];
598 HE **hes = _alloca (count * sizeof (HE)); 690 HE **hes = hes_stack;
599#else 691
600 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 692 // allocate larger arrays on the heap
601#endif 693 if (count > STACK_HES)
694 {
695 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
696 hes = (HE **)SvPVX (sv);
697 }
602 698
603 i = 0; 699 i = 0;
604 while ((he = hv_iternext (hv))) 700 while ((he = hv_iternext (hv)))
605 { 701 {
606 hes [i++] = he; 702 hes [i++] = he;
675// encode objects, arrays and special \0=false and \1=true values. 771// encode objects, arrays and special \0=false and \1=true values.
676static void 772static void
677encode_rv (enc_t *enc, SV *sv) 773encode_rv (enc_t *enc, SV *sv)
678{ 774{
679 svtype svt; 775 svtype svt;
776 GV *method;
680 777
681 SvGETMAGIC (sv); 778 SvGETMAGIC (sv);
682 svt = SvTYPE (sv); 779 svt = SvTYPE (sv);
683 780
684 if (expect_false (SvOBJECT (sv))) 781 if (expect_false (SvOBJECT (sv)))
685 { 782 {
686 HV *stash = !JSON_SLOW || json_boolean_stash 783 HV *stash = SvSTASH (sv);
687 ? json_boolean_stash
688 : gv_stashpv ("JSON::XS::Boolean", 1);
689 784
690 if (SvSTASH (sv) == stash) 785 if (stash == bool_stash)
691 { 786 {
692 if (SvIV (sv))
693 encode_str (enc, "true", 4, 0); 787 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
694 else
695 encode_str (enc, "false", 5, 0); 788 else encode_str (enc, "false", 5, 0);
696 } 789 }
790 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
791 {
792 int count;
793 dSP;
794
795 ENTER; SAVETMPS;
796 PUSHMARK (SP);
797 EXTEND (SP, 2);
798 // we re-bless the reference to get overload and other niceties right
799 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
800 PUSHs (sv_json);
801
802 PUTBACK;
803 count = call_sv ((SV *)GvCV (method), G_ARRAY);
804 SPAGAIN;
805
806 // catch this surprisingly common error
807 if (SvROK (TOPs) && SvRV (TOPs) == sv)
808 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
809
810 encode_ch (enc, '(');
811 encode_ch (enc, '"');
812 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
813 encode_ch (enc, '"');
814 encode_ch (enc, ')');
815 encode_ch (enc, '[');
816
817 if (count)
818 {
819 int i;
820
821 for (i = 0; i < count - 1; ++i)
822 {
823 encode_sv (enc, SP[i + 1 - count]);
824 encode_ch (enc, ',');
825 }
826
827 encode_sv (enc, TOPs);
828 SP -= count;
829 }
830
831 encode_ch (enc, ']');
832
833 FREETMPS; LEAVE;
834 }
835 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
836 {
837 dSP;
838
839 ENTER; SAVETMPS;
840 PUSHMARK (SP);
841 // we re-bless the reference to get overload and other niceties right
842 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
843
844 // calling with G_SCALAR ensures that we always get a 1 return value
845 PUTBACK;
846 call_sv ((SV *)GvCV (method), G_SCALAR);
847 SPAGAIN;
848
849 // catch this surprisingly common error
850 if (SvROK (TOPs) && SvRV (TOPs) == sv)
851 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
852
853 sv = POPs;
854 PUTBACK;
855
856 encode_sv (enc, sv);
857
858 FREETMPS; LEAVE;
859 }
860 else if (enc->json.flags & F_ALLOW_BLESSED)
861 encode_str (enc, "null", 4, 0);
697 else 862 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", 863 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)))); 864 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744 }
745 } 865 }
746 else if (svt == SVt_PVHV) 866 else if (svt == SVt_PVHV)
747 encode_hv (enc, (HV *)sv); 867 encode_hv (enc, (HV *)sv);
748 else if (svt == SVt_PVAV) 868 else if (svt == SVt_PVAV)
749 encode_av (enc, (AV *)sv); 869 encode_av (enc, (AV *)sv);
750 else if (svt < SVt_PVAV) 870 else if (svt < SVt_PVAV)
751 { 871 {
752 STRLEN len = 0; 872 int bool_type = ref_bool_type (sv);
753 char *pv = svt ? SvPV (sv, len) : 0;
754 873
755 if (len == 1 && *pv == '1') 874 if (bool_type == 1)
756 encode_str (enc, "true", 4, 0); 875 encode_str (enc, "true", 4, 0);
757 else if (len == 1 && *pv == '0') 876 else if (bool_type == 0)
758 encode_str (enc, "false", 5, 0); 877 encode_str (enc, "false", 5, 0);
759 else if (enc->json.flags & F_ALLOW_UNKNOWN) 878 else if (enc->json.flags & F_ALLOW_UNKNOWN)
760 encode_str (enc, "null", 4, 0); 879 encode_str (enc, "null", 4, 0);
761 else 880 else
762 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 881 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
825 } 944 }
826 else 945 else
827 { 946 {
828 // large integer, use the (rather slow) snprintf way. 947 // large integer, use the (rather slow) snprintf way.
829 need (enc, IVUV_MAXCHARS); 948 need (enc, IVUV_MAXCHARS);
830 enc->cur += 949 enc->cur +=
831 SvIsUV(sv) 950 SvIsUV(sv)
832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 951 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 952 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834 } 953 }
835 } 954 }
836 else if (SvROK (sv)) 955 else if (SvROK (sv))
837 encode_rv (enc, SvRV (sv)); 956 encode_rv (enc, SvRV (sv));
838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 957 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
839 encode_str (enc, "null", 4, 0); 958 encode_str (enc, "null", 4, 0);
840 else 959 else
841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 960 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 961 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843} 962}
844 963
845static SV * 964static SV *
846encode_json (SV *scalar, JSON *json) 965encode_json (SV *scalar, JSON *json)
847{ 966{
848 enc_t enc; 967 enc_t enc;
849 968
850 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 969 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)"); 970 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
852 971
853 enc.json = *json; 972 enc.json = *json;
854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 973 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
855 enc.cur = SvPVX (enc.sv); 974 enc.cur = SvPVX (enc.sv);
1062 *cur++ = *dec_cur++; 1181 *cur++ = *dec_cur++;
1063 while (--clen); 1182 while (--clen);
1064 1183
1065 utf8 = 1; 1184 utf8 = 1;
1066 } 1185 }
1186 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1187 *cur++ = ch;
1067 else 1188 else
1068 { 1189 {
1069 --dec_cur; 1190 --dec_cur;
1070 1191
1071 if (!ch) 1192 if (!ch)
1081 1202
1082 if (sv) 1203 if (sv)
1083 { 1204 {
1084 STRLEN cur = SvCUR (sv); 1205 STRLEN cur = SvCUR (sv);
1085 1206
1086 if (SvLEN (sv) <= cur + len) 1207 if (SvLEN (sv) - cur <= len)
1087 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1208 json_sv_grow (sv, cur, len);
1088 1209
1089 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1210 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1090 SvCUR_set (sv, SvCUR (sv) + len); 1211 SvCUR_set (sv, SvCUR (sv) + len);
1091 } 1212 }
1092 else 1213 else
1259 if (*dec->cur == ']') 1380 if (*dec->cur == ']')
1260 { 1381 {
1261 ++dec->cur; 1382 ++dec->cur;
1262 break; 1383 break;
1263 } 1384 }
1264 1385
1265 if (*dec->cur != ',') 1386 if (*dec->cur != ',')
1266 ERR (", or ] expected while parsing array"); 1387 ERR (", or ] expected while parsing array");
1267 1388
1268 ++dec->cur; 1389 ++dec->cur;
1269 1390
1383 1504
1384 DEC_DEC_DEPTH; 1505 DEC_DEC_DEPTH;
1385 sv = newRV_noinc ((SV *)hv); 1506 sv = newRV_noinc ((SV *)hv);
1386 1507
1387 // check filter callbacks 1508 // check filter callbacks
1388 if (dec->json.flags & F_HOOK) 1509 if (expect_false (dec->json.flags & F_HOOK))
1389 { 1510 {
1390 if (dec->json.cb_sk_object && HvKEYS (hv) == 1) 1511 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1391 { 1512 {
1392 HE *cb, *he; 1513 HE *cb, *he;
1393 1514
1394 hv_iterinit (hv); 1515 hv_iterinit (hv);
1395 he = hv_iternext (hv); 1516 he = hv_iternext (hv);
1396 hv_iterinit (hv); 1517 hv_iterinit (hv);
1397 1518
1398 // the next line creates a mortal sv each time its called. 1519 // the next line creates a mortal sv each time it's called.
1399 // might want to optimise this for common cases. 1520 // might want to optimise this for common cases.
1400 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1521 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1401 1522
1402 if (cb) 1523 if (cb)
1403 { 1524 {
1404 dSP; 1525 dSP;
1405 int count; 1526 int count;
1406 1527
1407 ENTER; SAVETMPS; PUSHMARK (SP); 1528 ENTER; SAVETMPS;
1529 PUSHMARK (SP);
1408 XPUSHs (HeVAL (he)); 1530 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv); 1531 sv_2mortal (sv);
1410 1532
1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1533 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1412 1534
1414 { 1536 {
1415 sv = newSVsv (POPs); 1537 sv = newSVsv (POPs);
1416 FREETMPS; LEAVE; 1538 FREETMPS; LEAVE;
1417 return sv; 1539 return sv;
1418 } 1540 }
1541 else if (count)
1542 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1419 1543
1420 SvREFCNT_inc (sv); 1544 SvREFCNT_inc (sv);
1421 FREETMPS; LEAVE; 1545 FREETMPS; LEAVE;
1422 } 1546 }
1423 } 1547 }
1425 if (dec->json.cb_object) 1549 if (dec->json.cb_object)
1426 { 1550 {
1427 dSP; 1551 dSP;
1428 int count; 1552 int count;
1429 1553
1430 ENTER; SAVETMPS; PUSHMARK (SP); 1554 ENTER; SAVETMPS;
1555 PUSHMARK (SP);
1431 XPUSHs (sv_2mortal (sv)); 1556 XPUSHs (sv_2mortal (sv));
1432 1557
1433 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1558 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1434 1559
1435 if (count == 1) 1560 if (count == 1)
1436 {
1437 sv = newSVsv (POPs); 1561 sv = newSVsv (POPs);
1438 FREETMPS; LEAVE; 1562 else if (count == 0)
1439 return sv;
1440 }
1441
1442 SvREFCNT_inc (sv); 1563 SvREFCNT_inc (sv);
1564 else
1565 croak ("filter_json_object callbacks must not return more than one scalar");
1566
1443 FREETMPS; LEAVE; 1567 FREETMPS; LEAVE;
1444 } 1568 }
1445 } 1569 }
1446 1570
1447 return sv; 1571 return sv;
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 != dec.end)
1588 { 1800 {
1589 dec.err = "garbage after JSON object"; 1801 dec.err = "garbage after JSON object";
1590 SvREFCNT_dec (sv); 1802 SvREFCNT_dec (sv);
1591 sv = 0; 1803 sv = 0;
1592 } 1804 }
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
1630 // the state machine here is a bit convoluted and could be simplified a lot 1842 // the state machine here is a bit convoluted and could be simplified a lot
1631 // but this would make it slower, so... 1843 // but this would make it slower, so...
1632 1844
1633 for (;;) 1845 for (;;)
1634 { 1846 {
1635 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1636 switch (self->incr_mode) 1847 switch (self->incr_mode)
1637 { 1848 {
1849 // reached end of a scalar, see if we are inside a nested structure or not
1850 end_of_scalar:
1851 self->incr_mode = INCR_M_JSON;
1852
1853 if (self->incr_nest) // end of a scalar inside array, object or tag
1854 goto incr_m_json;
1855 else // end of scalar outside structure, json text ends here
1856 goto interrupt;
1857
1638 // only used for initial whitespace skipping 1858 // only used for initial whitespace skipping
1639 case INCR_M_WS: 1859 case INCR_M_WS:
1640 for (;;) 1860 for (;;)
1641 { 1861 {
1642 if (*p > 0x20) 1862 if (*p > 0x20)
1684 ++p; 1904 ++p;
1685 } 1905 }
1686 1906
1687 break; 1907 break;
1688 1908
1909 // inside true/false/null
1910 case INCR_M_TFN:
1911 incr_m_tfn:
1912 for (;;)
1913 switch (*p++)
1914 {
1915 case 'r': case 'u': case 'e': // tRUE, falsE, nUll
1916 case 'a': case 'l': case 's': // fALSe, nuLL
1917 // allowed
1918 break;
1919
1920 default:
1921 --p;
1922 goto end_of_scalar;
1923 }
1924
1925 // inside a number
1926 case INCR_M_NUM:
1927 incr_m_num:
1928 for (;;)
1929 switch (*p++)
1930 {
1931 case 'e': case 'E': case '.': case '+':
1932 case '-':
1933 case '0': case '1': case '2': case '3': case '4':
1934 case '5': case '6': case '7': case '8': case '9':
1935 // allowed
1936 break;
1937
1938 default:
1939 --p;
1940 goto end_of_scalar;
1941 }
1942
1689 // inside a string 1943 // inside a string
1690 case INCR_M_STR: 1944 case INCR_M_STR:
1691 incr_m_str: 1945 incr_m_str:
1692 for (;;) 1946 for (;;)
1693 { 1947 {
1694 if (*p == '"') 1948 if (*p == '"')
1695 { 1949 {
1696 ++p; 1950 ++p;
1697 self->incr_mode = INCR_M_JSON;
1698
1699 if (!self->incr_nest)
1700 goto interrupt;
1701
1702 goto incr_m_json; 1951 goto end_of_scalar;
1703 } 1952 }
1704 else if (*p == '\\') 1953 else if (*p == '\\')
1705 { 1954 {
1706 ++p; // "virtually" consumes character after \ 1955 ++p; // "virtually" consumes character after \
1707 1956
1737 --p; // do not eat the whitespace, let the next round do it 1986 --p; // do not eat the whitespace, let the next round do it
1738 goto interrupt; 1987 goto interrupt;
1739 } 1988 }
1740 break; 1989 break;
1741 1990
1991 // the following three blocks handle scalars. this makes the parser
1992 // more strict than required inside arrays or objects, and could
1993 // be moved to a special case on the toplevel (except strings)
1994 case 't':
1995 case 'f':
1996 case 'n':
1997 self->incr_mode = INCR_M_TFN;
1998 goto incr_m_tfn;
1999
2000 case '-':
2001 case '0': case '1': case '2': case '3': case '4':
2002 case '5': case '6': case '7': case '8': case '9':
2003 self->incr_mode = INCR_M_NUM;
2004 goto incr_m_num;
2005
1742 case '"': 2006 case '"':
1743 self->incr_mode = INCR_M_STR; 2007 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str; 2008 goto incr_m_str;
1745 2009
1746 case '[': 2010 case '[':
1747 case '{': 2011 case '{':
2012 case '(':
1748 if (++self->incr_nest > self->max_depth) 2013 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED); 2014 croak (ERR_NESTING_EXCEEDED);
1750 break; 2015 break;
1751 2016
1752 case ']': 2017 case ']':
1753 case '}': 2018 case '}':
1754 if (--self->incr_nest <= 0) 2019 if (--self->incr_nest <= 0)
1755 goto interrupt; 2020 goto interrupt;
2021 break;
2022
2023 case ')':
2024 --self->incr_nest;
1756 break; 2025 break;
1757 2026
1758 case '#': 2027 case '#':
1759 self->incr_mode = INCR_M_C1; 2028 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c; 2029 goto incr_m_c;
1786 i >= '0' && i <= '9' ? i - '0' 2055 i >= '0' && i <= '9' ? i - '0'
1787 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2056 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1788 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2057 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1789 : -1; 2058 : -1;
1790 2059
1791 json_stash = gv_stashpv ("JSON::XS" , 1); 2060 json_stash = gv_stashpv ("JSON::XS" , 1);
1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2061 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"); 2062 bool_false = get_bool ("Types::Serialiser::false");
2063 bool_true = get_bool ("Types::Serialiser::true");
2064
2065 sv_json = newSVpv ("JSON", 0);
2066 SvREADONLY_on (sv_json);
1796 2067
1797 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2068 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798} 2069}
1799 2070
1800PROTOTYPES: DISABLE 2071PROTOTYPES: DISABLE
1801 2072
1802void CLONE (...) 2073void CLONE (...)
1803 CODE: 2074 CODE:
2075 // as long as these writes are atomic, the race should not matter
2076 // as existing threads either already use 0, or use the old value,
2077 // which is sitll correct for the initial thread.
1804 json_stash = 0; 2078 json_stash = 0;
1805 json_boolean_stash = 0; 2079 bool_stash = 0;
2080 bool_false = 0;
2081 bool_true = 0;
1806 2082
1807void new (char *klass) 2083void new (char *klass)
1808 PPCODE: 2084 PPCODE:
1809{ 2085{
1810 SV *pv = NEWSV (0, sizeof (JSON)); 2086 SV *pv = NEWSV (0, sizeof (JSON));
1811 SvPOK_only (pv); 2087 SvPOK_only (pv);
1812 json_init ((JSON *)SvPVX (pv)); 2088 json_init ((JSON *)SvPVX (pv));
1813 XPUSHs (sv_2mortal (sv_bless ( 2089 XPUSHs (sv_2mortal (sv_bless (
1814 newRV_noinc (pv), 2090 newRV_noinc (pv),
1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2091 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1816 ))); 2092 )));
1817} 2093}
2094
2095void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2096 PPCODE:
2097 self->v_false = newSVsv (v_false);
2098 self->v_true = newSVsv (v_true);
2099 XPUSHs (ST (0));
2100
2101void get_boolean_values (JSON *self)
2102 PPCODE:
2103 if (self->v_false && self->v_true)
2104 {
2105 EXTEND (SP, 2);
2106 PUSHs (self->v_false);
2107 PUSHs (self->v_true);
2108 }
1818 2109
1819void ascii (JSON *self, int enable = 1) 2110void ascii (JSON *self, int enable = 1)
1820 ALIAS: 2111 ALIAS:
1821 ascii = F_ASCII 2112 ascii = F_ASCII
1822 latin1 = F_LATIN1 2113 latin1 = F_LATIN1
1830 shrink = F_SHRINK 2121 shrink = F_SHRINK
1831 allow_blessed = F_ALLOW_BLESSED 2122 allow_blessed = F_ALLOW_BLESSED
1832 convert_blessed = F_CONV_BLESSED 2123 convert_blessed = F_CONV_BLESSED
1833 relaxed = F_RELAXED 2124 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN 2125 allow_unknown = F_ALLOW_UNKNOWN
2126 allow_tags = F_ALLOW_TAGS
1835 PPCODE: 2127 PPCODE:
1836{ 2128{
1837 if (enable) 2129 if (enable)
1838 self->flags |= ix; 2130 self->flags |= ix;
1839 else 2131 else
1855 get_shrink = F_SHRINK 2147 get_shrink = F_SHRINK
1856 get_allow_blessed = F_ALLOW_BLESSED 2148 get_allow_blessed = F_ALLOW_BLESSED
1857 get_convert_blessed = F_CONV_BLESSED 2149 get_convert_blessed = F_CONV_BLESSED
1858 get_relaxed = F_RELAXED 2150 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN 2151 get_allow_unknown = F_ALLOW_UNKNOWN
2152 get_allow_tags = F_ALLOW_TAGS
1860 PPCODE: 2153 PPCODE:
1861 XPUSHs (boolSV (self->flags & ix)); 2154 XPUSHs (boolSV (self->flags & ix));
1862 2155
1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2156void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864 PPCODE: 2157 PPCODE:
1892} 2185}
1893 2186
1894void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2187void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1895 PPCODE: 2188 PPCODE:
1896{ 2189{
1897 if (!self->cb_sk_object) 2190 if (!self->cb_sk_object)
1898 self->cb_sk_object = newHV (); 2191 self->cb_sk_object = newHV ();
1899 2192
1900 if (SvOK (cb)) 2193 if (SvOK (cb))
1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2194 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902 else 2195 else
1913 XPUSHs (ST (0)); 2206 XPUSHs (ST (0));
1914} 2207}
1915 2208
1916void encode (JSON *self, SV *scalar) 2209void encode (JSON *self, SV *scalar)
1917 PPCODE: 2210 PPCODE:
1918 XPUSHs (encode_json (scalar, self)); 2211 PUTBACK; XPUSHs (encode_json (scalar, self));
1919 2212
1920void decode (JSON *self, SV *jsonstr) 2213void decode (JSON *self, SV *jsonstr)
1921 PPCODE: 2214 PPCODE:
1922 XPUSHs (decode_json (jsonstr, self, 0)); 2215 PUTBACK; XPUSHs (decode_json (jsonstr, self, 0));
1923 2216
1924void decode_prefix (JSON *self, SV *jsonstr) 2217void decode_prefix (JSON *self, SV *jsonstr)
1925 PPCODE: 2218 PPCODE:
1926{ 2219{
1927 char *offset; 2220 SV *sv;
2221 STRLEN offset;
2222 PUTBACK; sv = decode_json (jsonstr, self, &offset);
1928 EXTEND (SP, 2); 2223 EXTEND (SP, 2);
1929 PUSHs (decode_json (jsonstr, self, &offset)); 2224 PUSHs (sv);
1930 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2225 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1931} 2226}
1932 2227
1933void incr_parse (JSON *self, SV *jsonstr = 0) 2228void incr_parse (JSON *self, SV *jsonstr = 0)
1934 PPCODE: 2229 PPCODE:
1935{ 2230{
1969 { 2264 {
1970 STRLEN len; 2265 STRLEN len;
1971 const char *str = SvPV (jsonstr, len); 2266 const char *str = SvPV (jsonstr, len);
1972 STRLEN cur = SvCUR (self->incr_text); 2267 STRLEN cur = SvCUR (self->incr_text);
1973 2268
1974 if (SvLEN (self->incr_text) <= cur + len) 2269 if (SvLEN (self->incr_text) - cur <= len)
1975 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2270 json_sv_grow (self->incr_text, cur, len);
1976 2271
1977 Move (str, SvEND (self->incr_text), len, char); 2272 Move (str, SvEND (self->incr_text), len, char);
1978 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2273 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 2274 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1980 } 2275 }
1981 } 2276 }
1982 2277
1983 if (GIMME_V != G_VOID) 2278 if (GIMME_V != G_VOID)
1984 do 2279 do
1985 { 2280 {
2281 SV *sv;
1986 char *offset; 2282 STRLEN offset;
1987 2283
1988 if (!INCR_DONE (self)) 2284 if (!INCR_DONE (self))
1989 { 2285 {
1990 incr_parse (self); 2286 incr_parse (self);
1991 2287
2004 2300
2005 break; 2301 break;
2006 } 2302 }
2007 } 2303 }
2008 2304
2009 XPUSHs (decode_json (self->incr_text, self, &offset)); 2305 PUTBACK; sv = decode_json (self->incr_text, self, &offset);
2306 XPUSHs (sv);
2010 2307
2011 self->incr_pos -= offset - SvPVX (self->incr_text); 2308 self->incr_pos -= offset;
2012 self->incr_nest = 0; 2309 self->incr_nest = 0;
2013 self->incr_mode = 0; 2310 self->incr_mode = 0;
2014 2311
2015 sv_chop (self->incr_text, offset); 2312 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2016 } 2313 }
2017 while (GIMME_V == G_ARRAY); 2314 while (GIMME_V == G_ARRAY);
2018} 2315}
2019 2316
2020SV *incr_text (JSON *self) 2317SV *incr_text (JSON *self)
2051 self->incr_mode = 0; 2348 self->incr_mode = 0;
2052} 2349}
2053 2350
2054void DESTROY (JSON *self) 2351void DESTROY (JSON *self)
2055 CODE: 2352 CODE:
2353 SvREFCNT_dec (self->v_false);
2354 SvREFCNT_dec (self->v_true);
2056 SvREFCNT_dec (self->cb_sk_object); 2355 SvREFCNT_dec (self->cb_sk_object);
2057 SvREFCNT_dec (self->cb_object); 2356 SvREFCNT_dec (self->cb_object);
2058 SvREFCNT_dec (self->incr_text); 2357 SvREFCNT_dec (self->incr_text);
2059 2358
2060PROTOTYPES: ENABLE 2359PROTOTYPES: ENABLE
2061 2360
2062void encode_json (SV *scalar) 2361void encode_json (SV *scalar)
2063 ALIAS:
2064 to_json_ = 0
2065 encode_json = F_UTF8
2066 PPCODE: 2362 PPCODE:
2067{ 2363{
2068 JSON json; 2364 JSON json;
2069 json_init (&json); 2365 json_init (&json);
2070 json.flags |= ix; 2366 json.flags |= F_UTF8;
2071 XPUSHs (encode_json (scalar, &json)); 2367 PUTBACK; XPUSHs (encode_json (scalar, &json));
2072} 2368}
2073 2369
2074void decode_json (SV *jsonstr) 2370void decode_json (SV *jsonstr)
2075 ALIAS:
2076 from_json_ = 0
2077 decode_json = F_UTF8
2078 PPCODE: 2371 PPCODE:
2079{ 2372{
2080 JSON json; 2373 JSON json;
2081 json_init (&json); 2374 json_init (&json);
2082 json.flags |= ix; 2375 json.flags |= F_UTF8;
2083 XPUSHs (decode_json (jsonstr, &json, 0)); 2376 PUTBACK; XPUSHs (decode_json (jsonstr, &json, 0));
2084} 2377}
2085 2378

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines