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.141 by root, Tue Oct 27 18:05:58 2020 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 */
167static STRLEN
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 PUTBACK;
832
833 encode_ch (enc, ']');
834
835 FREETMPS; LEAVE;
836 }
837 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
838 {
839 dSP;
840
841 ENTER; SAVETMPS;
842 PUSHMARK (SP);
843 // we re-bless the reference to get overload and other niceties right
844 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
845
846 // calling with G_SCALAR ensures that we always get a 1 return value
847 PUTBACK;
848 call_sv ((SV *)GvCV (method), G_SCALAR);
849 SPAGAIN;
850
851 // catch this surprisingly common error
852 if (SvROK (TOPs) && SvRV (TOPs) == sv)
853 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
854
855 sv = POPs;
856 PUTBACK;
857
858 encode_sv (enc, sv);
859
860 FREETMPS; LEAVE;
861 }
862 else if (enc->json.flags & F_ALLOW_BLESSED)
863 encode_str (enc, "null", 4, 0);
697 else 864 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", 865 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)))); 866 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744 }
745 } 867 }
746 else if (svt == SVt_PVHV) 868 else if (svt == SVt_PVHV)
747 encode_hv (enc, (HV *)sv); 869 encode_hv (enc, (HV *)sv);
748 else if (svt == SVt_PVAV) 870 else if (svt == SVt_PVAV)
749 encode_av (enc, (AV *)sv); 871 encode_av (enc, (AV *)sv);
750 else if (svt < SVt_PVAV) 872 else if (svt < SVt_PVAV)
751 { 873 {
752 STRLEN len = 0; 874 int bool_type = ref_bool_type (sv);
753 char *pv = svt ? SvPV (sv, len) : 0;
754 875
755 if (len == 1 && *pv == '1') 876 if (bool_type == 1)
756 encode_str (enc, "true", 4, 0); 877 encode_str (enc, "true", 4, 0);
757 else if (len == 1 && *pv == '0') 878 else if (bool_type == 0)
758 encode_str (enc, "false", 5, 0); 879 encode_str (enc, "false", 5, 0);
759 else if (enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (enc->json.flags & F_ALLOW_UNKNOWN)
760 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
761 else 882 else
762 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 883 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
825 } 946 }
826 else 947 else
827 { 948 {
828 // large integer, use the (rather slow) snprintf way. 949 // large integer, use the (rather slow) snprintf way.
829 need (enc, IVUV_MAXCHARS); 950 need (enc, IVUV_MAXCHARS);
830 enc->cur += 951 enc->cur +=
831 SvIsUV(sv) 952 SvIsUV(sv)
832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 953 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 954 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834 } 955 }
835 } 956 }
836 else if (SvROK (sv)) 957 else if (SvROK (sv))
837 encode_rv (enc, SvRV (sv)); 958 encode_rv (enc, SvRV (sv));
838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 959 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
839 encode_str (enc, "null", 4, 0); 960 encode_str (enc, "null", 4, 0);
840 else 961 else
841 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 962 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
842 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 963 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843} 964}
844 965
845static SV * 966static SV *
846encode_json (SV *scalar, JSON *json) 967encode_json (SV *scalar, JSON *json)
847{ 968{
848 enc_t enc; 969 enc_t enc;
849 970
850 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 971 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)"); 972 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
852 973
853 enc.json = *json; 974 enc.json = *json;
854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 975 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
855 enc.cur = SvPVX (enc.sv); 976 enc.cur = SvPVX (enc.sv);
917 else 1038 else
918 break; 1039 break;
919 } 1040 }
920 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09) 1041 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
921 break; // parse error, but let higher level handle it, gives better error messages 1042 break; // parse error, but let higher level handle it, gives better error messages
922 1043 else
923 ++dec->cur; 1044 ++dec->cur;
924 } 1045 }
925} 1046}
926 1047
927#define ERR(reason) SB dec->err = reason; goto fail; SE 1048#define ERR(reason) SB dec->err = reason; goto fail; SE
928 1049
1062 *cur++ = *dec_cur++; 1183 *cur++ = *dec_cur++;
1063 while (--clen); 1184 while (--clen);
1064 1185
1065 utf8 = 1; 1186 utf8 = 1;
1066 } 1187 }
1188 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1189 *cur++ = ch;
1067 else 1190 else
1068 { 1191 {
1069 --dec_cur; 1192 --dec_cur;
1070 1193
1071 if (!ch) 1194 if (!ch)
1081 1204
1082 if (sv) 1205 if (sv)
1083 { 1206 {
1084 STRLEN cur = SvCUR (sv); 1207 STRLEN cur = SvCUR (sv);
1085 1208
1086 if (SvLEN (sv) <= cur + len) 1209 if (SvLEN (sv) - cur <= len)
1087 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1210 json_sv_grow (sv, cur, len);
1088 1211
1089 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1212 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1090 SvCUR_set (sv, SvCUR (sv) + len); 1213 SvCUR_set (sv, SvCUR (sv) + len);
1091 } 1214 }
1092 else 1215 else
1259 if (*dec->cur == ']') 1382 if (*dec->cur == ']')
1260 { 1383 {
1261 ++dec->cur; 1384 ++dec->cur;
1262 break; 1385 break;
1263 } 1386 }
1264 1387
1265 if (*dec->cur != ',') 1388 if (*dec->cur != ',')
1266 ERR (", or ] expected while parsing array"); 1389 ERR (", or ] expected while parsing array");
1267 1390
1268 ++dec->cur; 1391 ++dec->cur;
1269 1392
1383 1506
1384 DEC_DEC_DEPTH; 1507 DEC_DEC_DEPTH;
1385 sv = newRV_noinc ((SV *)hv); 1508 sv = newRV_noinc ((SV *)hv);
1386 1509
1387 // check filter callbacks 1510 // check filter callbacks
1388 if (dec->json.flags & F_HOOK) 1511 if (expect_false (dec->json.flags & F_HOOK))
1389 { 1512 {
1390 if (dec->json.cb_sk_object && HvKEYS (hv) == 1) 1513 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1391 { 1514 {
1392 HE *cb, *he; 1515 HE *cb, *he;
1393 1516
1394 hv_iterinit (hv); 1517 hv_iterinit (hv);
1395 he = hv_iternext (hv); 1518 he = hv_iternext (hv);
1396 hv_iterinit (hv); 1519 hv_iterinit (hv);
1397 1520
1398 // the next line creates a mortal sv each time its called. 1521 // the next line creates a mortal sv each time it's called.
1399 // might want to optimise this for common cases. 1522 // might want to optimise this for common cases.
1400 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1523 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1401 1524
1402 if (cb) 1525 if (cb)
1403 { 1526 {
1404 dSP; 1527 dSP;
1405 int count; 1528 int count;
1406 1529
1407 ENTER; SAVETMPS; PUSHMARK (SP); 1530 ENTER; SAVETMPS;
1531 PUSHMARK (SP);
1408 XPUSHs (HeVAL (he)); 1532 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv); 1533 sv_2mortal (sv);
1410 1534
1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1535 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1412 1536
1413 if (count == 1) 1537 if (count == 1)
1414 { 1538 {
1415 sv = newSVsv (POPs); 1539 sv = newSVsv (POPs);
1540 PUTBACK;
1416 FREETMPS; LEAVE; 1541 FREETMPS; LEAVE;
1417 return sv; 1542 return sv;
1418 } 1543 }
1544 else if (count)
1545 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1546
1547 PUTBACK;
1419 1548
1420 SvREFCNT_inc (sv); 1549 SvREFCNT_inc (sv);
1550
1421 FREETMPS; LEAVE; 1551 FREETMPS; LEAVE;
1422 } 1552 }
1423 } 1553 }
1424 1554
1425 if (dec->json.cb_object) 1555 if (dec->json.cb_object)
1426 { 1556 {
1427 dSP; 1557 dSP;
1428 int count; 1558 int count;
1429 1559
1430 ENTER; SAVETMPS; PUSHMARK (SP); 1560 ENTER; SAVETMPS;
1561 PUSHMARK (SP);
1431 XPUSHs (sv_2mortal (sv)); 1562 XPUSHs (sv_2mortal (sv));
1432 1563
1433 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1564 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1434 1565
1435 if (count == 1) 1566 if (count == 1)
1436 {
1437 sv = newSVsv (POPs); 1567 sv = newSVsv (POPs);
1438 FREETMPS; LEAVE; 1568 else if (count == 0)
1439 return sv;
1440 }
1441
1442 SvREFCNT_inc (sv); 1569 SvREFCNT_inc (sv);
1570 else
1571 croak ("filter_json_object callbacks must not return more than one scalar");
1572
1573 PUTBACK;
1574
1443 FREETMPS; LEAVE; 1575 FREETMPS; LEAVE;
1444 } 1576 }
1445 } 1577 }
1446 1578
1447 return sv; 1579 return sv;
1451 DEC_DEC_DEPTH; 1583 DEC_DEC_DEPTH;
1452 return 0; 1584 return 0;
1453} 1585}
1454 1586
1455static SV * 1587static SV *
1588decode_tag (dec_t *dec)
1589{
1590 SV *tag = 0;
1591 SV *val = 0;
1592
1593 if (!(dec->json.flags & F_ALLOW_TAGS))
1594 ERR ("malformed JSON string, neither array, object, number, string or atom");
1595
1596 ++dec->cur;
1597
1598 decode_ws (dec);
1599
1600 tag = decode_sv (dec);
1601 if (!tag)
1602 goto fail;
1603
1604 if (!SvPOK (tag))
1605 ERR ("malformed JSON string, (tag) must be a string");
1606
1607 decode_ws (dec);
1608
1609 if (*dec->cur != ')')
1610 ERR (") expected after tag");
1611
1612 ++dec->cur;
1613
1614 decode_ws (dec);
1615
1616 val = decode_sv (dec);
1617 if (!val)
1618 goto fail;
1619
1620 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1621 ERR ("malformed JSON string, tag value must be an array");
1622
1623 {
1624 AV *av = (AV *)SvRV (val);
1625 int i, len = av_len (av) + 1;
1626 HV *stash = gv_stashsv (tag, 0);
1627 SV *sv;
1628
1629 if (!stash)
1630 ERR ("cannot decode perl-object (package does not exist)");
1631
1632 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1633
1634 if (!method)
1635 ERR ("cannot decode perl-object (package does not have a THAW method)");
1636
1637 dSP;
1638
1639 ENTER; SAVETMPS;
1640 PUSHMARK (SP);
1641 EXTEND (SP, len + 2);
1642 // we re-bless the reference to get overload and other niceties right
1643 PUSHs (tag);
1644 PUSHs (sv_json);
1645
1646 for (i = 0; i < len; ++i)
1647 PUSHs (*av_fetch (av, i, 1));
1648
1649 PUTBACK;
1650 call_sv ((SV *)GvCV (method), G_SCALAR);
1651 SPAGAIN;
1652
1653 SvREFCNT_dec (tag);
1654 SvREFCNT_dec (val);
1655 sv = SvREFCNT_inc (POPs);
1656
1657 PUTBACK;
1658
1659 FREETMPS; LEAVE;
1660
1661 return sv;
1662 }
1663
1664fail:
1665 SvREFCNT_dec (tag);
1666 SvREFCNT_dec (val);
1667 return 0;
1668}
1669
1670static SV *
1456decode_sv (dec_t *dec) 1671decode_sv (dec_t *dec)
1457{ 1672{
1458 // the beauty of JSON: you need exactly one character lookahead 1673 // the beauty of JSON: you need exactly one character lookahead
1459 // to parse everything. 1674 // to parse everything.
1460 switch (*dec->cur) 1675 switch (*dec->cur)
1461 { 1676 {
1462 case '"': ++dec->cur; return decode_str (dec); 1677 case '"': ++dec->cur; return decode_str (dec);
1463 case '[': ++dec->cur; return decode_av (dec); 1678 case '[': ++dec->cur; return decode_av (dec);
1464 case '{': ++dec->cur; return decode_hv (dec); 1679 case '{': ++dec->cur; return decode_hv (dec);
1680 case '(': return decode_tag (dec);
1465 1681
1466 case '-': 1682 case '-':
1467 case '0': case '1': case '2': case '3': case '4': 1683 case '0': case '1': case '2': case '3': case '4':
1468 case '5': case '6': case '7': case '8': case '9': 1684 case '5': case '6': case '7': case '8': case '9':
1469 return decode_num (dec); 1685 return decode_num (dec);
1470 1686
1687 case 'f':
1688 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1689 {
1690 dec->cur += 5;
1691
1692 if (expect_false (!dec->json.v_false))
1693 dec->json.v_false = GET_BOOL (false);
1694
1695 return newSVsv (dec->json.v_false);
1696 }
1697 else
1698 ERR ("'false' expected");
1699
1700 break;
1701
1471 case 't': 1702 case 't':
1472 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1703 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473 { 1704 {
1474 dec->cur += 4; 1705 dec->cur += 4;
1475#if JSON_SLOW 1706
1476 json_true = get_bool ("JSON::XS::true"); 1707 if (expect_false (!dec->json.v_true))
1477#endif 1708 dec->json.v_true = GET_BOOL (true);
1709
1478 return newSVsv (json_true); 1710 return newSVsv (dec->json.v_true);
1479 } 1711 }
1480 else 1712 else
1481 ERR ("'true' expected"); 1713 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 1714
1497 break; 1715 break;
1498 1716
1499 case 'n': 1717 case 'n':
1500 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1718 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
1506 ERR ("'null' expected"); 1724 ERR ("'null' expected");
1507 1725
1508 break; 1726 break;
1509 1727
1510 default: 1728 default:
1511 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1729 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512 break; 1730 break;
1513 } 1731 }
1514 1732
1515fail: 1733fail:
1516 return 0; 1734 return 0;
1517} 1735}
1518 1736
1519static SV * 1737static SV *
1520decode_json (SV *string, JSON *json, char **offset_return) 1738decode_json (SV *string, JSON *json, STRLEN *offset_return)
1521{ 1739{
1522 dec_t dec; 1740 dec_t dec;
1523 SV *sv; 1741 SV *sv;
1524 1742
1525 /* work around bugs in 5.10 where manipulating magic values 1743 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses. 1744 * makes perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean 1745 * 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). 1746 * state (SvPV should do that, but it's buggy, see below).
1747 *
1748 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1749 * as reported by Reini Urban.
1529 */ 1750 */
1530 /*SvGETMAGIC (string);*/ 1751 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string)) 1752 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1532 string = sv_2mortal (newSVsv (string)); 1753 string = sv_2mortal (newSVsv (string));
1533 1754
1534 SvUPGRADE (string, SVt_PV); 1755 SvUPGRADE (string, SVt_PV);
1535 1756
1536 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1757 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1575 1796
1576 decode_ws (&dec); 1797 decode_ws (&dec);
1577 sv = decode_sv (&dec); 1798 sv = decode_sv (&dec);
1578 1799
1579 if (offset_return) 1800 if (offset_return)
1580 *offset_return = dec.cur; 1801 *offset_return = dec.cur - SvPVX (string);
1581 1802 else if (sv)
1582 if (!(offset_return || !sv))
1583 { 1803 {
1584 // check for trailing garbage 1804 // check for trailing garbage
1585 decode_ws (&dec); 1805 decode_ws (&dec);
1586 1806
1587 if (*dec.cur) 1807 if (dec.cur != dec.end)
1588 { 1808 {
1589 dec.err = "garbage after JSON object"; 1809 dec.err = "garbage after JSON object";
1590 SvREFCNT_dec (sv); 1810 SvREFCNT_dec (sv);
1591 sv = 0; 1811 sv = 0;
1592 } 1812 }
1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1831 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612 } 1832 }
1613 1833
1614 sv = sv_2mortal (sv); 1834 sv = sv_2mortal (sv);
1615 1835
1616 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1836 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)"); 1837 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1618 1838
1619 return sv; 1839 return sv;
1620} 1840}
1621 1841
1630 // the state machine here is a bit convoluted and could be simplified a lot 1850 // the state machine here is a bit convoluted and could be simplified a lot
1631 // but this would make it slower, so... 1851 // but this would make it slower, so...
1632 1852
1633 for (;;) 1853 for (;;)
1634 { 1854 {
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) 1855 switch (self->incr_mode)
1637 { 1856 {
1857 // reached end of a scalar, see if we are inside a nested structure or not
1858 end_of_scalar:
1859 self->incr_mode = INCR_M_JSON;
1860
1861 if (self->incr_nest) // end of a scalar inside array, object or tag
1862 goto incr_m_json;
1863 else // end of scalar outside structure, json text ends here
1864 goto interrupt;
1865
1638 // only used for initial whitespace skipping 1866 // only used for initial whitespace skipping
1639 case INCR_M_WS: 1867 case INCR_M_WS:
1640 for (;;) 1868 for (;;)
1641 { 1869 {
1642 if (*p > 0x20) 1870 if (*p > 0x20)
1684 ++p; 1912 ++p;
1685 } 1913 }
1686 1914
1687 break; 1915 break;
1688 1916
1917 // inside true/false/null
1918 case INCR_M_TFN:
1919 incr_m_tfn:
1920 for (;;)
1921 switch (*p++)
1922 {
1923 case 'r': case 'u': case 'e': // tRUE, falsE, nUll
1924 case 'a': case 'l': case 's': // fALSe, nuLL
1925 // allowed
1926 break;
1927
1928 default:
1929 --p;
1930 goto end_of_scalar;
1931 }
1932
1933 // inside a number
1934 case INCR_M_NUM:
1935 incr_m_num:
1936 for (;;)
1937 switch (*p++)
1938 {
1939 case 'e': case 'E': case '.': case '+':
1940 case '-':
1941 case '0': case '1': case '2': case '3': case '4':
1942 case '5': case '6': case '7': case '8': case '9':
1943 // allowed
1944 break;
1945
1946 default:
1947 --p;
1948 goto end_of_scalar;
1949 }
1950
1689 // inside a string 1951 // inside a string
1690 case INCR_M_STR: 1952 case INCR_M_STR:
1691 incr_m_str: 1953 incr_m_str:
1692 for (;;) 1954 for (;;)
1693 { 1955 {
1694 if (*p == '"') 1956 if (*p == '"')
1695 { 1957 {
1696 ++p; 1958 ++p;
1697 self->incr_mode = INCR_M_JSON;
1698
1699 if (!self->incr_nest)
1700 goto interrupt;
1701
1702 goto incr_m_json; 1959 goto end_of_scalar;
1703 } 1960 }
1704 else if (*p == '\\') 1961 else if (*p == '\\')
1705 { 1962 {
1706 ++p; // "virtually" consumes character after \ 1963 ++p; // "virtually" consumes character after \
1707 1964
1737 --p; // do not eat the whitespace, let the next round do it 1994 --p; // do not eat the whitespace, let the next round do it
1738 goto interrupt; 1995 goto interrupt;
1739 } 1996 }
1740 break; 1997 break;
1741 1998
1999 // the following three blocks handle scalars. this makes the parser
2000 // more strict than required inside arrays or objects, and could
2001 // be moved to a special case on the toplevel (except strings)
2002 case 't':
2003 case 'f':
2004 case 'n':
2005 self->incr_mode = INCR_M_TFN;
2006 goto incr_m_tfn;
2007
2008 case '-':
2009 case '0': case '1': case '2': case '3': case '4':
2010 case '5': case '6': case '7': case '8': case '9':
2011 self->incr_mode = INCR_M_NUM;
2012 goto incr_m_num;
2013
1742 case '"': 2014 case '"':
1743 self->incr_mode = INCR_M_STR; 2015 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str; 2016 goto incr_m_str;
1745 2017
1746 case '[': 2018 case '[':
1747 case '{': 2019 case '{':
2020 case '(':
1748 if (++self->incr_nest > self->max_depth) 2021 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED); 2022 croak (ERR_NESTING_EXCEEDED);
1750 break; 2023 break;
1751 2024
1752 case ']': 2025 case ']':
1753 case '}': 2026 case '}':
1754 if (--self->incr_nest <= 0) 2027 if (--self->incr_nest <= 0)
1755 goto interrupt; 2028 goto interrupt;
2029 break;
2030
2031 case ')':
2032 --self->incr_nest;
1756 break; 2033 break;
1757 2034
1758 case '#': 2035 case '#':
1759 self->incr_mode = INCR_M_C1; 2036 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c; 2037 goto incr_m_c;
1786 i >= '0' && i <= '9' ? i - '0' 2063 i >= '0' && i <= '9' ? i - '0'
1787 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2064 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1788 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2065 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1789 : -1; 2066 : -1;
1790 2067
1791 json_stash = gv_stashpv ("JSON::XS" , 1); 2068 json_stash = gv_stashpv ("JSON::XS" , 1);
1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2069 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"); 2070 bool_false = get_bool ("Types::Serialiser::false");
2071 bool_true = get_bool ("Types::Serialiser::true");
2072
2073 sv_json = newSVpv ("JSON", 0);
2074 SvREADONLY_on (sv_json);
1796 2075
1797 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2076 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1798} 2077}
1799 2078
1800PROTOTYPES: DISABLE 2079PROTOTYPES: DISABLE
1801 2080
1802void CLONE (...) 2081void CLONE (...)
1803 CODE: 2082 CODE:
2083 // as long as these writes are atomic, the race should not matter
2084 // as existing threads either already use 0, or use the old value,
2085 // which is sitll correct for the initial thread.
1804 json_stash = 0; 2086 json_stash = 0;
1805 json_boolean_stash = 0; 2087 bool_stash = 0;
2088 bool_false = 0;
2089 bool_true = 0;
1806 2090
1807void new (char *klass) 2091void new (char *klass)
1808 PPCODE: 2092 PPCODE:
1809{ 2093{
1810 SV *pv = NEWSV (0, sizeof (JSON)); 2094 SV *pv = NEWSV (0, sizeof (JSON));
1811 SvPOK_only (pv); 2095 SvPOK_only (pv);
1812 json_init ((JSON *)SvPVX (pv)); 2096 json_init ((JSON *)SvPVX (pv));
1813 XPUSHs (sv_2mortal (sv_bless ( 2097 XPUSHs (sv_2mortal (sv_bless (
1814 newRV_noinc (pv), 2098 newRV_noinc (pv),
1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2099 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1816 ))); 2100 )));
1817} 2101}
2102
2103void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2104 PPCODE:
2105 self->v_false = newSVsv (v_false);
2106 self->v_true = newSVsv (v_true);
2107 XPUSHs (ST (0));
2108
2109void get_boolean_values (JSON *self)
2110 PPCODE:
2111 if (self->v_false && self->v_true)
2112 {
2113 EXTEND (SP, 2);
2114 PUSHs (self->v_false);
2115 PUSHs (self->v_true);
2116 }
1818 2117
1819void ascii (JSON *self, int enable = 1) 2118void ascii (JSON *self, int enable = 1)
1820 ALIAS: 2119 ALIAS:
1821 ascii = F_ASCII 2120 ascii = F_ASCII
1822 latin1 = F_LATIN1 2121 latin1 = F_LATIN1
1830 shrink = F_SHRINK 2129 shrink = F_SHRINK
1831 allow_blessed = F_ALLOW_BLESSED 2130 allow_blessed = F_ALLOW_BLESSED
1832 convert_blessed = F_CONV_BLESSED 2131 convert_blessed = F_CONV_BLESSED
1833 relaxed = F_RELAXED 2132 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN 2133 allow_unknown = F_ALLOW_UNKNOWN
2134 allow_tags = F_ALLOW_TAGS
1835 PPCODE: 2135 PPCODE:
1836{ 2136{
1837 if (enable) 2137 if (enable)
1838 self->flags |= ix; 2138 self->flags |= ix;
1839 else 2139 else
1855 get_shrink = F_SHRINK 2155 get_shrink = F_SHRINK
1856 get_allow_blessed = F_ALLOW_BLESSED 2156 get_allow_blessed = F_ALLOW_BLESSED
1857 get_convert_blessed = F_CONV_BLESSED 2157 get_convert_blessed = F_CONV_BLESSED
1858 get_relaxed = F_RELAXED 2158 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN 2159 get_allow_unknown = F_ALLOW_UNKNOWN
2160 get_allow_tags = F_ALLOW_TAGS
1860 PPCODE: 2161 PPCODE:
1861 XPUSHs (boolSV (self->flags & ix)); 2162 XPUSHs (boolSV (self->flags & ix));
1862 2163
1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2164void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864 PPCODE: 2165 PPCODE:
1892} 2193}
1893 2194
1894void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2195void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1895 PPCODE: 2196 PPCODE:
1896{ 2197{
1897 if (!self->cb_sk_object) 2198 if (!self->cb_sk_object)
1898 self->cb_sk_object = newHV (); 2199 self->cb_sk_object = newHV ();
1899 2200
1900 if (SvOK (cb)) 2201 if (SvOK (cb))
1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2202 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902 else 2203 else
1913 XPUSHs (ST (0)); 2214 XPUSHs (ST (0));
1914} 2215}
1915 2216
1916void encode (JSON *self, SV *scalar) 2217void encode (JSON *self, SV *scalar)
1917 PPCODE: 2218 PPCODE:
1918 XPUSHs (encode_json (scalar, self)); 2219 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2220 XPUSHs (scalar);
1919 2221
1920void decode (JSON *self, SV *jsonstr) 2222void decode (JSON *self, SV *jsonstr)
1921 PPCODE: 2223 PPCODE:
1922 XPUSHs (decode_json (jsonstr, self, 0)); 2224 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2225 XPUSHs (jsonstr);
1923 2226
1924void decode_prefix (JSON *self, SV *jsonstr) 2227void decode_prefix (JSON *self, SV *jsonstr)
1925 PPCODE: 2228 PPCODE:
1926{ 2229{
1927 char *offset; 2230 SV *sv;
2231 STRLEN offset;
2232 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928 EXTEND (SP, 2); 2233 EXTEND (SP, 2);
1929 PUSHs (decode_json (jsonstr, self, &offset)); 2234 PUSHs (sv);
1930 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2235 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1931} 2236}
1932 2237
1933void incr_parse (JSON *self, SV *jsonstr = 0) 2238void incr_parse (JSON *self, SV *jsonstr = 0)
1934 PPCODE: 2239 PPCODE:
1935{ 2240{
1969 { 2274 {
1970 STRLEN len; 2275 STRLEN len;
1971 const char *str = SvPV (jsonstr, len); 2276 const char *str = SvPV (jsonstr, len);
1972 STRLEN cur = SvCUR (self->incr_text); 2277 STRLEN cur = SvCUR (self->incr_text);
1973 2278
1974 if (SvLEN (self->incr_text) <= cur + len) 2279 if (SvLEN (self->incr_text) - cur <= len)
1975 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2280 json_sv_grow (self->incr_text, cur, len);
1976 2281
1977 Move (str, SvEND (self->incr_text), len, char); 2282 Move (str, SvEND (self->incr_text), len, char);
1978 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2283 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 2284 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1980 } 2285 }
1981 } 2286 }
1982 2287
1983 if (GIMME_V != G_VOID) 2288 if (GIMME_V != G_VOID)
1984 do 2289 do
1985 { 2290 {
2291 SV *sv;
1986 char *offset; 2292 STRLEN offset;
1987 2293
1988 if (!INCR_DONE (self)) 2294 if (!INCR_DONE (self))
1989 { 2295 {
1990 incr_parse (self); 2296 incr_parse (self);
1991 2297
2004 2310
2005 break; 2311 break;
2006 } 2312 }
2007 } 2313 }
2008 2314
2009 XPUSHs (decode_json (self->incr_text, self, &offset)); 2315 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2316 XPUSHs (sv);
2010 2317
2011 self->incr_pos -= offset - SvPVX (self->incr_text); 2318 self->incr_pos -= offset;
2012 self->incr_nest = 0; 2319 self->incr_nest = 0;
2013 self->incr_mode = 0; 2320 self->incr_mode = 0;
2014 2321
2015 sv_chop (self->incr_text, offset); 2322 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2016 } 2323 }
2017 while (GIMME_V == G_ARRAY); 2324 while (GIMME_V == G_ARRAY);
2018} 2325}
2019 2326
2020SV *incr_text (JSON *self) 2327SV *incr_text (JSON *self)
2051 self->incr_mode = 0; 2358 self->incr_mode = 0;
2052} 2359}
2053 2360
2054void DESTROY (JSON *self) 2361void DESTROY (JSON *self)
2055 CODE: 2362 CODE:
2363 SvREFCNT_dec (self->v_false);
2364 SvREFCNT_dec (self->v_true);
2056 SvREFCNT_dec (self->cb_sk_object); 2365 SvREFCNT_dec (self->cb_sk_object);
2057 SvREFCNT_dec (self->cb_object); 2366 SvREFCNT_dec (self->cb_object);
2058 SvREFCNT_dec (self->incr_text); 2367 SvREFCNT_dec (self->incr_text);
2059 2368
2060PROTOTYPES: ENABLE 2369PROTOTYPES: ENABLE
2061 2370
2062void encode_json (SV *scalar) 2371void encode_json (SV *scalar)
2063 ALIAS:
2064 to_json_ = 0
2065 encode_json = F_UTF8
2066 PPCODE: 2372 PPCODE:
2067{ 2373{
2068 JSON json; 2374 JSON json;
2069 json_init (&json); 2375 json_init (&json);
2070 json.flags |= ix; 2376 json.flags |= F_UTF8;
2071 XPUSHs (encode_json (scalar, &json)); 2377 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2378 XPUSHs (scalar);
2072} 2379}
2073 2380
2074void decode_json (SV *jsonstr) 2381void decode_json (SV *jsonstr)
2075 ALIAS:
2076 from_json_ = 0
2077 decode_json = F_UTF8
2078 PPCODE: 2382 PPCODE:
2079{ 2383{
2080 JSON json; 2384 JSON json;
2081 json_init (&json); 2385 json_init (&json);
2082 json.flags |= ix; 2386 json.flags |= F_UTF8;
2083 XPUSHs (decode_json (jsonstr, &json, 0)); 2387 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2388 XPUSHs (jsonstr);
2084} 2389}
2085 2390

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines