ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/JSON-XS/XS.xs
(Generate patch)

Comparing JSON-XS/XS.xs (file contents):
Revision 1.108 by root, Tue Aug 17 23:27:36 2010 UTC vs.
Revision 1.139 by root, Wed Mar 6 07:32:06 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
… …
260 } 309 }
261 310
262 // this relies greatly on the quality of the pow () 311 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good 312 // implementation of the platform, but a good
264 // implementation is hard to beat. 313 // implementation is hard to beat.
314 // (IEEE 754 conformant ones are required to be exact)
265 if (postdp) *expo -= eaccum; 315 if (postdp) *expo -= eaccum;
266 *accum += uaccum * Perl_pow (10., *expo); 316 *accum += uaccum * Perl_pow (10., *expo);
267 *expo += eaccum; 317 *expo += eaccum;
268} 318}
269 319
… …
283 // a recursion depth of ten gives us >>500 bits 333 // a recursion depth of ten gives us >>500 bits
284 json_atof_scan1 (s, &accum, &expo, 0, 10); 334 json_atof_scan1 (s, &accum, &expo, 0, 10);
285 335
286 return neg ? -accum : accum; 336 return neg ? -accum : accum;
287} 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
288///////////////////////////////////////////////////////////////////////////// 381/////////////////////////////////////////////////////////////////////////////
289// encoder 382// encoder
290 383
291// structure used for encoding JSON 384// structure used for encoding JSON
292typedef struct 385typedef struct
… …
300} enc_t; 393} enc_t;
301 394
302INLINE void 395INLINE void
303need (enc_t *enc, STRLEN len) 396need (enc_t *enc, STRLEN len)
304{ 397{
305 if (expect_false (enc->cur + len >= enc->end)) 398 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
306 { 399 {
307 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 400 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
308 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 401 char *buf = json_sv_grow (enc->sv, cur, len);
309 enc->cur = SvPVX (enc->sv) + cur; 402 enc->cur = buf + cur;
310 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 403 enc->end = buf + SvLEN (enc->sv) - 1;
311 } 404 }
312} 405}
313 406
314INLINE void 407INLINE void
315encode_ch (enc_t *enc, char ch) 408encode_ch (enc_t *enc, char ch)
… …
331 424
332 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 425 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
333 { 426 {
334 if (expect_false (ch == '"')) // but with slow exceptions 427 if (expect_false (ch == '"')) // but with slow exceptions
335 { 428 {
336 need (enc, len += 1); 429 need (enc, len + 1);
337 *enc->cur++ = '\\'; 430 *enc->cur++ = '\\';
338 *enc->cur++ = '"'; 431 *enc->cur++ = '"';
339 } 432 }
340 else if (expect_false (ch == '\\')) 433 else if (expect_false (ch == '\\'))
341 { 434 {
342 need (enc, len += 1); 435 need (enc, len + 1);
343 *enc->cur++ = '\\'; 436 *enc->cur++ = '\\';
344 *enc->cur++ = '\\'; 437 *enc->cur++ = '\\';
345 } 438 }
346 else 439 else
347 *enc->cur++ = ch; 440 *enc->cur++ = ch;
… …
350 } 443 }
351 else 444 else
352 { 445 {
353 switch (ch) 446 switch (ch)
354 { 447 {
355 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;
356 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;
357 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;
358 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;
359 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;
360 453
361 default: 454 default:
362 { 455 {
363 STRLEN clen; 456 STRLEN clen;
364 UV uch; 457 UV uch;
… …
380 if (uch >= 0x10000UL) 473 if (uch >= 0x10000UL)
381 { 474 {
382 if (uch >= 0x110000UL) 475 if (uch >= 0x110000UL)
383 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);
384 477
385 need (enc, len += 11); 478 need (enc, len + 11);
386 sprintf (enc->cur, "\\u%04x\\u%04x", 479 sprintf (enc->cur, "\\u%04x\\u%04x",
387 (int)((uch - 0x10000) / 0x400 + 0xD800), 480 (int)((uch - 0x10000) / 0x400 + 0xD800),
388 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 481 (int)((uch - 0x10000) % 0x400 + 0xDC00));
389 enc->cur += 12; 482 enc->cur += 12;
390 } 483 }
391 else 484 else
392 { 485 {
393 need (enc, len += 5); 486 need (enc, len + 5);
394 *enc->cur++ = '\\'; 487 *enc->cur++ = '\\';
395 *enc->cur++ = 'u'; 488 *enc->cur++ = 'u';
396 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 489 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
397 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 490 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
398 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 491 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
406 *enc->cur++ = uch; 499 *enc->cur++ = uch;
407 str += clen; 500 str += clen;
408 } 501 }
409 else if (is_utf8) 502 else if (is_utf8)
410 { 503 {
411 need (enc, len += clen); 504 need (enc, len + clen);
412 do 505 do
413 { 506 {
414 *enc->cur++ = *str++; 507 *enc->cur++ = *str++;
415 } 508 }
416 while (--clen); 509 while (--clen);
417 } 510 }
418 else 511 else
419 { 512 {
420 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
421 enc->cur = encode_utf8 (enc->cur, uch); 514 enc->cur = encode_utf8 (enc->cur, uch);
422 ++str; 515 ++str;
423 } 516 }
424 } 517 }
425 } 518 }
… …
479 572
480 if (enc->indent >= enc->json.max_depth) 573 if (enc->indent >= enc->json.max_depth)
481 croak (ERR_NESTING_EXCEEDED); 574 croak (ERR_NESTING_EXCEEDED);
482 575
483 encode_ch (enc, '['); 576 encode_ch (enc, '[');
484 577
485 if (len >= 0) 578 if (len >= 0)
486 { 579 {
487 encode_nl (enc); ++enc->indent; 580 encode_nl (enc); ++enc->indent;
488 581
489 for (i = 0; i <= len; ++i) 582 for (i = 0; i <= len; ++i)
… …
501 encode_comma (enc); 594 encode_comma (enc);
502 } 595 }
503 596
504 encode_nl (enc); --enc->indent; encode_indent (enc); 597 encode_nl (enc); --enc->indent; encode_indent (enc);
505 } 598 }
506 599
507 encode_ch (enc, ']'); 600 encode_ch (enc, ']');
508} 601}
509 602
510static void 603static void
511encode_hk (enc_t *enc, HE *he) 604encode_hk (enc_t *enc, HE *he)
… …
515 if (HeKLEN (he) == HEf_SVKEY) 608 if (HeKLEN (he) == HEf_SVKEY)
516 { 609 {
517 SV *sv = HeSVKEY (he); 610 SV *sv = HeSVKEY (he);
518 STRLEN len; 611 STRLEN len;
519 char *str; 612 char *str;
520 613
521 SvGETMAGIC (sv); 614 SvGETMAGIC (sv);
522 str = SvPV (sv, len); 615 str = SvPV (sv, len);
523 616
524 encode_str (enc, str, len, SvUTF8 (sv)); 617 encode_str (enc, str, len, SvUTF8 (sv));
525 } 618 }
… …
591 } 684 }
592 685
593 if (count) 686 if (count)
594 { 687 {
595 int i, fast = 1; 688 int i, fast = 1;
596#if defined(__BORLANDC__) || defined(_MSC_VER) 689 HE *hes_stack [STACK_HES];
597 HE **hes = _alloca (count * sizeof (HE)); 690 HE **hes = hes_stack;
598#else 691
599 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 692 // allocate larger arrays on the heap
600#endif 693 if (count > STACK_HES)
694 {
695 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
696 hes = (HE **)SvPVX (sv);
697 }
601 698
602 i = 0; 699 i = 0;
603 while ((he = hv_iternext (hv))) 700 while ((he = hv_iternext (hv)))
604 { 701 {
605 hes [i++] = he; 702 hes [i++] = he;
… …
674// encode objects, arrays and special \0=false and \1=true values. 771// encode objects, arrays and special \0=false and \1=true values.
675static void 772static void
676encode_rv (enc_t *enc, SV *sv) 773encode_rv (enc_t *enc, SV *sv)
677{ 774{
678 svtype svt; 775 svtype svt;
776 GV *method;
679 777
680 SvGETMAGIC (sv); 778 SvGETMAGIC (sv);
681 svt = SvTYPE (sv); 779 svt = SvTYPE (sv);
682 780
683 if (expect_false (SvOBJECT (sv))) 781 if (expect_false (SvOBJECT (sv)))
684 { 782 {
685 HV *stash = !JSON_SLOW || json_boolean_stash 783 HV *stash = SvSTASH (sv);
686 ? json_boolean_stash
687 : gv_stashpv ("JSON::XS::Boolean", 1);
688 784
689 if (SvSTASH (sv) == stash) 785 if (stash == bool_stash)
690 { 786 {
691 if (SvIV (sv))
692 encode_str (enc, "true", 4, 0); 787 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
693 else
694 encode_str (enc, "false", 5, 0); 788 else encode_str (enc, "false", 5, 0);
695 } 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);
696 else 864 else
697 {
698#if 0
699 if (0 && sv_derived_from (rv, "JSON::Literal"))
700 {
701 // not yet
702 }
703#endif
704 if (enc->json.flags & F_CONV_BLESSED)
705 {
706 // we re-bless the reference to get overload and other niceties right
707 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
708
709 if (to_json)
710 {
711 dSP;
712
713 ENTER; SAVETMPS; PUSHMARK (SP);
714 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
715
716 // calling with G_SCALAR ensures that we always get a 1 return value
717 PUTBACK;
718 call_sv ((SV *)GvCV (to_json), G_SCALAR);
719 SPAGAIN;
720
721 // catch this surprisingly common error
722 if (SvROK (TOPs) && SvRV (TOPs) == sv)
723 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
724
725 sv = POPs;
726 PUTBACK;
727
728 encode_sv (enc, sv);
729
730 FREETMPS; LEAVE;
731 }
732 else if (enc->json.flags & F_ALLOW_BLESSED)
733 encode_str (enc, "null", 4, 0);
734 else
735 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
736 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
737 }
738 else if (enc->json.flags & F_ALLOW_BLESSED)
739 encode_str (enc, "null", 4, 0);
740 else
741 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 865 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
742 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 866 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
743 }
744 } 867 }
745 else if (svt == SVt_PVHV) 868 else if (svt == SVt_PVHV)
746 encode_hv (enc, (HV *)sv); 869 encode_hv (enc, (HV *)sv);
747 else if (svt == SVt_PVAV) 870 else if (svt == SVt_PVAV)
748 encode_av (enc, (AV *)sv); 871 encode_av (enc, (AV *)sv);
749 else if (svt < SVt_PVAV) 872 else if (svt < SVt_PVAV)
750 { 873 {
751 STRLEN len = 0; 874 int bool_type = ref_bool_type (sv);
752 char *pv = svt ? SvPV (sv, len) : 0;
753 875
754 if (len == 1 && *pv == '1') 876 if (bool_type == 1)
755 encode_str (enc, "true", 4, 0); 877 encode_str (enc, "true", 4, 0);
756 else if (len == 1 && *pv == '0') 878 else if (bool_type == 0)
757 encode_str (enc, "false", 5, 0); 879 encode_str (enc, "false", 5, 0);
758 else if (enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (enc->json.flags & F_ALLOW_UNKNOWN)
759 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
760 else 882 else
761 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",
… …
824 } 946 }
825 else 947 else
826 { 948 {
827 // large integer, use the (rather slow) snprintf way. 949 // large integer, use the (rather slow) snprintf way.
828 need (enc, IVUV_MAXCHARS); 950 need (enc, IVUV_MAXCHARS);
829 enc->cur += 951 enc->cur +=
830 SvIsUV(sv) 952 SvIsUV(sv)
831 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 953 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 954 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833 } 955 }
834 } 956 }
835 else if (SvROK (sv)) 957 else if (SvROK (sv))
836 encode_rv (enc, SvRV (sv)); 958 encode_rv (enc, SvRV (sv));
837 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 959 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
838 encode_str (enc, "null", 4, 0); 960 encode_str (enc, "null", 4, 0);
839 else 961 else
840 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",
841 SvPV_nolen (sv), SvFLAGS (sv)); 963 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
842} 964}
843 965
844static SV * 966static SV *
845encode_json (SV *scalar, JSON *json) 967encode_json (SV *scalar, JSON *json)
846{ 968{
847 enc_t enc; 969 enc_t enc;
848 970
849 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 971 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
850 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 972 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
851 973
852 enc.json = *json; 974 enc.json = *json;
853 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 975 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
854 enc.cur = SvPVX (enc.sv); 976 enc.cur = SvPVX (enc.sv);
… …
1061 *cur++ = *dec_cur++; 1183 *cur++ = *dec_cur++;
1062 while (--clen); 1184 while (--clen);
1063 1185
1064 utf8 = 1; 1186 utf8 = 1;
1065 } 1187 }
1188 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1189 *cur++ = ch;
1066 else 1190 else
1067 { 1191 {
1068 --dec_cur; 1192 --dec_cur;
1069 1193
1070 if (!ch) 1194 if (!ch)
… …
1080 1204
1081 if (sv) 1205 if (sv)
1082 { 1206 {
1083 STRLEN cur = SvCUR (sv); 1207 STRLEN cur = SvCUR (sv);
1084 1208
1085 if (SvLEN (sv) <= cur + len) 1209 if (SvLEN (sv) - cur <= len)
1086 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1210 json_sv_grow (sv, cur, len);
1087 1211
1088 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1212 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1089 SvCUR_set (sv, SvCUR (sv) + len); 1213 SvCUR_set (sv, SvCUR (sv) + len);
1090 } 1214 }
1091 else 1215 else
… …
1258 if (*dec->cur == ']') 1382 if (*dec->cur == ']')
1259 { 1383 {
1260 ++dec->cur; 1384 ++dec->cur;
1261 break; 1385 break;
1262 } 1386 }
1263 1387
1264 if (*dec->cur != ',') 1388 if (*dec->cur != ',')
1265 ERR (", or ] expected while parsing array"); 1389 ERR (", or ] expected while parsing array");
1266 1390
1267 ++dec->cur; 1391 ++dec->cur;
1268 1392
… …
1382 1506
1383 DEC_DEC_DEPTH; 1507 DEC_DEC_DEPTH;
1384 sv = newRV_noinc ((SV *)hv); 1508 sv = newRV_noinc ((SV *)hv);
1385 1509
1386 // check filter callbacks 1510 // check filter callbacks
1387 if (dec->json.flags & F_HOOK) 1511 if (expect_false (dec->json.flags & F_HOOK))
1388 { 1512 {
1389 if (dec->json.cb_sk_object && HvKEYS (hv) == 1) 1513 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1390 { 1514 {
1391 HE *cb, *he; 1515 HE *cb, *he;
1392 1516
1393 hv_iterinit (hv); 1517 hv_iterinit (hv);
1394 he = hv_iternext (hv); 1518 he = hv_iternext (hv);
1395 hv_iterinit (hv); 1519 hv_iterinit (hv);
1396 1520
1397 // the next line creates a mortal sv each time its called. 1521 // the next line creates a mortal sv each time it's called.
1398 // might want to optimise this for common cases. 1522 // might want to optimise this for common cases.
1399 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);
1400 1524
1401 if (cb) 1525 if (cb)
1402 { 1526 {
1403 dSP; 1527 dSP;
1404 int count; 1528 int count;
1405 1529
1406 ENTER; SAVETMPS; PUSHMARK (SP); 1530 ENTER; SAVETMPS;
1531 PUSHMARK (SP);
1407 XPUSHs (HeVAL (he)); 1532 XPUSHs (HeVAL (he));
1408 sv_2mortal (sv); 1533 sv_2mortal (sv);
1409 1534
1410 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1535 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1411 1536
1412 if (count == 1) 1537 if (count == 1)
1413 { 1538 {
1414 sv = newSVsv (POPs); 1539 sv = newSVsv (POPs);
1540 PUTBACK;
1415 FREETMPS; LEAVE; 1541 FREETMPS; LEAVE;
1416 return sv; 1542 return sv;
1417 } 1543 }
1544 else if (count)
1545 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1546
1547 PUTBACK;
1418 1548
1419 SvREFCNT_inc (sv); 1549 SvREFCNT_inc (sv);
1550
1420 FREETMPS; LEAVE; 1551 FREETMPS; LEAVE;
1421 } 1552 }
1422 } 1553 }
1423 1554
1424 if (dec->json.cb_object) 1555 if (dec->json.cb_object)
1425 { 1556 {
1426 dSP; 1557 dSP;
1427 int count; 1558 int count;
1428 1559
1429 ENTER; SAVETMPS; PUSHMARK (SP); 1560 ENTER; SAVETMPS;
1561 PUSHMARK (SP);
1430 XPUSHs (sv_2mortal (sv)); 1562 XPUSHs (sv_2mortal (sv));
1431 1563
1432 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1564 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1433 1565
1434 if (count == 1) 1566 if (count == 1)
1435 {
1436 sv = newSVsv (POPs); 1567 sv = newSVsv (POPs);
1437 FREETMPS; LEAVE; 1568 else if (count == 0)
1438 return sv;
1439 }
1440
1441 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
1442 FREETMPS; LEAVE; 1575 FREETMPS; LEAVE;
1443 } 1576 }
1444 } 1577 }
1445 1578
1446 return sv; 1579 return sv;
… …
1450 DEC_DEC_DEPTH; 1583 DEC_DEC_DEPTH;
1451 return 0; 1584 return 0;
1452} 1585}
1453 1586
1454static 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 *
1455decode_sv (dec_t *dec) 1671decode_sv (dec_t *dec)
1456{ 1672{
1457 // the beauty of JSON: you need exactly one character lookahead 1673 // the beauty of JSON: you need exactly one character lookahead
1458 // to parse everything. 1674 // to parse everything.
1459 switch (*dec->cur) 1675 switch (*dec->cur)
1460 { 1676 {
1461 case '"': ++dec->cur; return decode_str (dec); 1677 case '"': ++dec->cur; return decode_str (dec);
1462 case '[': ++dec->cur; return decode_av (dec); 1678 case '[': ++dec->cur; return decode_av (dec);
1463 case '{': ++dec->cur; return decode_hv (dec); 1679 case '{': ++dec->cur; return decode_hv (dec);
1680 case '(': return decode_tag (dec);
1464 1681
1465 case '-': 1682 case '-':
1466 case '0': case '1': case '2': case '3': case '4': 1683 case '0': case '1': case '2': case '3': case '4':
1467 case '5': case '6': case '7': case '8': case '9': 1684 case '5': case '6': case '7': case '8': case '9':
1468 return decode_num (dec); 1685 return decode_num (dec);
1469 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
1470 case 't': 1702 case 't':
1471 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1703 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1472 { 1704 {
1473 dec->cur += 4; 1705 dec->cur += 4;
1474#if JSON_SLOW 1706
1475 json_true = get_bool ("JSON::XS::true"); 1707 if (expect_false (!dec->json.v_true))
1476#endif 1708 dec->json.v_true = GET_BOOL (true);
1709
1477 return newSVsv (json_true); 1710 return newSVsv (dec->json.v_true);
1478 } 1711 }
1479 else 1712 else
1480 ERR ("'true' expected"); 1713 ERR ("'true' expected");
1481
1482 break;
1483
1484 case 'f':
1485 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1486 {
1487 dec->cur += 5;
1488#if JSON_SLOW
1489 json_false = get_bool ("JSON::XS::false");
1490#endif
1491 return newSVsv (json_false);
1492 }
1493 else
1494 ERR ("'false' expected");
1495 1714
1496 break; 1715 break;
1497 1716
1498 case 'n': 1717 case 'n':
1499 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1718 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1505 ERR ("'null' expected"); 1724 ERR ("'null' expected");
1506 1725
1507 break; 1726 break;
1508 1727
1509 default: 1728 default:
1510 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1729 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1511 break; 1730 break;
1512 } 1731 }
1513 1732
1514fail: 1733fail:
1515 return 0; 1734 return 0;
1516} 1735}
1517 1736
1518static SV * 1737static SV *
1519decode_json (SV *string, JSON *json, char **offset_return) 1738decode_json (SV *string, JSON *json, STRLEN *offset_return)
1520{ 1739{
1521 dec_t dec; 1740 dec_t dec;
1522 SV *sv; 1741 SV *sv;
1523 1742
1524 /* work around bugs in 5.10 where manipulating magic values 1743 /* work around bugs in 5.10 where manipulating magic values
1525 * will perl ignore the magic in subsequent accesses 1744 * makes perl ignore the magic in subsequent accesses.
1745 * also make a copy of non-PV values, to get them into a clean
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.
1526 */ 1750 */
1527 /*SvGETMAGIC (string);*/ 1751 /*SvGETMAGIC (string);*/
1528 if (SvMAGICAL (string)) 1752 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1529 string = sv_2mortal (newSVsv (string)); 1753 string = sv_2mortal (newSVsv (string));
1530 1754
1531 SvUPGRADE (string, SVt_PV); 1755 SvUPGRADE (string, SVt_PV);
1532 1756
1533 /* 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
… …
1572 1796
1573 decode_ws (&dec); 1797 decode_ws (&dec);
1574 sv = decode_sv (&dec); 1798 sv = decode_sv (&dec);
1575 1799
1576 if (offset_return) 1800 if (offset_return)
1577 *offset_return = dec.cur; 1801 *offset_return = dec.cur - SvPVX (string);
1578 1802 else if (sv)
1579 if (!(offset_return || !sv))
1580 { 1803 {
1581 // check for trailing garbage 1804 // check for trailing garbage
1582 decode_ws (&dec); 1805 decode_ws (&dec);
1583 1806
1584 if (*dec.cur) 1807 if (dec.cur != dec.end)
1585 { 1808 {
1586 dec.err = "garbage after JSON object"; 1809 dec.err = "garbage after JSON object";
1587 SvREFCNT_dec (sv); 1810 SvREFCNT_dec (sv);
1588 sv = 0; 1811 sv = 0;
1589 } 1812 }
… …
1602 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1825 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1603 LEAVE; 1826 LEAVE;
1604 1827
1605 croak ("%s, at character offset %d (before \"%s\")", 1828 croak ("%s, at character offset %d (before \"%s\")",
1606 dec.err, 1829 dec.err,
1607 ptr_to_index (string, dec.cur), 1830 (int)ptr_to_index (string, dec.cur),
1608 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1831 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1609 } 1832 }
1610 1833
1611 sv = sv_2mortal (sv); 1834 sv = sv_2mortal (sv);
1612 1835
1613 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1836 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1614 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1837 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1615 1838
1616 return sv; 1839 return sv;
1617} 1840}
1618 1841
… …
1627 // 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
1628 // but this would make it slower, so... 1851 // but this would make it slower, so...
1629 1852
1630 for (;;) 1853 for (;;)
1631 { 1854 {
1632 //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
1633 switch (self->incr_mode) 1855 switch (self->incr_mode)
1634 { 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
1635 // only used for initial whitespace skipping 1866 // only used for initial whitespace skipping
1636 case INCR_M_WS: 1867 case INCR_M_WS:
1637 for (;;) 1868 for (;;)
1638 { 1869 {
1639 if (*p > 0x20) 1870 if (*p > 0x20)
… …
1681 ++p; 1912 ++p;
1682 } 1913 }
1683 1914
1684 break; 1915 break;
1685 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
1686 // inside a string 1951 // inside a string
1687 case INCR_M_STR: 1952 case INCR_M_STR:
1688 incr_m_str: 1953 incr_m_str:
1689 for (;;) 1954 for (;;)
1690 { 1955 {
1691 if (*p == '"') 1956 if (*p == '"')
1692 { 1957 {
1693 ++p; 1958 ++p;
1694 self->incr_mode = INCR_M_JSON;
1695
1696 if (!self->incr_nest)
1697 goto interrupt;
1698
1699 goto incr_m_json; 1959 goto end_of_scalar;
1700 } 1960 }
1701 else if (*p == '\\') 1961 else if (*p == '\\')
1702 { 1962 {
1703 ++p; // "virtually" consumes character after \ 1963 ++p; // "virtually" consumes character after \
1704 1964
… …
1734 --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
1735 goto interrupt; 1995 goto interrupt;
1736 } 1996 }
1737 break; 1997 break;
1738 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
1739 case '"': 2014 case '"':
1740 self->incr_mode = INCR_M_STR; 2015 self->incr_mode = INCR_M_STR;
1741 goto incr_m_str; 2016 goto incr_m_str;
1742 2017
1743 case '[': 2018 case '[':
1744 case '{': 2019 case '{':
2020 case '(':
1745 if (++self->incr_nest > self->max_depth) 2021 if (++self->incr_nest > self->max_depth)
1746 croak (ERR_NESTING_EXCEEDED); 2022 croak (ERR_NESTING_EXCEEDED);
1747 break; 2023 break;
1748 2024
1749 case ']': 2025 case ']':
1750 case '}': 2026 case '}':
1751 if (--self->incr_nest <= 0) 2027 if (--self->incr_nest <= 0)
1752 goto interrupt; 2028 goto interrupt;
2029 break;
2030
2031 case ')':
2032 --self->incr_nest;
1753 break; 2033 break;
1754 2034
1755 case '#': 2035 case '#':
1756 self->incr_mode = INCR_M_C1; 2036 self->incr_mode = INCR_M_C1;
1757 goto incr_m_c; 2037 goto incr_m_c;
… …
1783 i >= '0' && i <= '9' ? i - '0' 2063 i >= '0' && i <= '9' ? i - '0'
1784 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2064 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1785 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2065 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1786 : -1; 2066 : -1;
1787 2067
1788 json_stash = gv_stashpv ("JSON::XS" , 1); 2068 json_stash = gv_stashpv ("JSON::XS" , 1);
1789 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2069 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1790
1791 json_true = get_bool ("JSON::XS::true");
1792 json_false = get_bool ("JSON::XS::false"); 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);
1793 2075
1794 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 */
1795} 2077}
1796 2078
1797PROTOTYPES: DISABLE 2079PROTOTYPES: DISABLE
1798 2080
1799void CLONE (...) 2081void CLONE (...)
1800 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.
1801 json_stash = 0; 2086 json_stash = 0;
1802 json_boolean_stash = 0; 2087 bool_stash = 0;
2088 bool_false = 0;
2089 bool_true = 0;
1803 2090
1804void new (char *klass) 2091void new (char *klass)
1805 PPCODE: 2092 PPCODE:
1806{ 2093{
1807 SV *pv = NEWSV (0, sizeof (JSON)); 2094 SV *pv = NEWSV (0, sizeof (JSON));
1808 SvPOK_only (pv); 2095 SvPOK_only (pv);
1809 json_init ((JSON *)SvPVX (pv)); 2096 json_init ((JSON *)SvPVX (pv));
1810 XPUSHs (sv_2mortal (sv_bless ( 2097 XPUSHs (sv_2mortal (sv_bless (
1811 newRV_noinc (pv), 2098 newRV_noinc (pv),
1812 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2099 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1813 ))); 2100 )));
1814} 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 }
1815 2117
1816void ascii (JSON *self, int enable = 1) 2118void ascii (JSON *self, int enable = 1)
1817 ALIAS: 2119 ALIAS:
1818 ascii = F_ASCII 2120 ascii = F_ASCII
1819 latin1 = F_LATIN1 2121 latin1 = F_LATIN1
… …
1827 shrink = F_SHRINK 2129 shrink = F_SHRINK
1828 allow_blessed = F_ALLOW_BLESSED 2130 allow_blessed = F_ALLOW_BLESSED
1829 convert_blessed = F_CONV_BLESSED 2131 convert_blessed = F_CONV_BLESSED
1830 relaxed = F_RELAXED 2132 relaxed = F_RELAXED
1831 allow_unknown = F_ALLOW_UNKNOWN 2133 allow_unknown = F_ALLOW_UNKNOWN
2134 allow_tags = F_ALLOW_TAGS
1832 PPCODE: 2135 PPCODE:
1833{ 2136{
1834 if (enable) 2137 if (enable)
1835 self->flags |= ix; 2138 self->flags |= ix;
1836 else 2139 else
… …
1852 get_shrink = F_SHRINK 2155 get_shrink = F_SHRINK
1853 get_allow_blessed = F_ALLOW_BLESSED 2156 get_allow_blessed = F_ALLOW_BLESSED
1854 get_convert_blessed = F_CONV_BLESSED 2157 get_convert_blessed = F_CONV_BLESSED
1855 get_relaxed = F_RELAXED 2158 get_relaxed = F_RELAXED
1856 get_allow_unknown = F_ALLOW_UNKNOWN 2159 get_allow_unknown = F_ALLOW_UNKNOWN
2160 get_allow_tags = F_ALLOW_TAGS
1857 PPCODE: 2161 PPCODE:
1858 XPUSHs (boolSV (self->flags & ix)); 2162 XPUSHs (boolSV (self->flags & ix));
1859 2163
1860void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2164void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1861 PPCODE: 2165 PPCODE:
… …
1889} 2193}
1890 2194
1891void 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)
1892 PPCODE: 2196 PPCODE:
1893{ 2197{
1894 if (!self->cb_sk_object) 2198 if (!self->cb_sk_object)
1895 self->cb_sk_object = newHV (); 2199 self->cb_sk_object = newHV ();
1896 2200
1897 if (SvOK (cb)) 2201 if (SvOK (cb))
1898 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2202 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1899 else 2203 else
… …
1910 XPUSHs (ST (0)); 2214 XPUSHs (ST (0));
1911} 2215}
1912 2216
1913void encode (JSON *self, SV *scalar) 2217void encode (JSON *self, SV *scalar)
1914 PPCODE: 2218 PPCODE:
1915 XPUSHs (encode_json (scalar, self)); 2219 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2220 XPUSHs (scalar);
1916 2221
1917void decode (JSON *self, SV *jsonstr) 2222void decode (JSON *self, SV *jsonstr)
1918 PPCODE: 2223 PPCODE:
1919 XPUSHs (decode_json (jsonstr, self, 0)); 2224 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2225 XPUSHs (jsonstr);
1920 2226
1921void decode_prefix (JSON *self, SV *jsonstr) 2227void decode_prefix (JSON *self, SV *jsonstr)
1922 PPCODE: 2228 PPCODE:
1923{ 2229{
1924 char *offset; 2230 SV *sv;
2231 STRLEN offset;
2232 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1925 EXTEND (SP, 2); 2233 EXTEND (SP, 2);
1926 PUSHs (decode_json (jsonstr, self, &offset)); 2234 PUSHs (sv);
1927 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2235 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1928} 2236}
1929 2237
1930void incr_parse (JSON *self, SV *jsonstr = 0) 2238void incr_parse (JSON *self, SV *jsonstr = 0)
1931 PPCODE: 2239 PPCODE:
1932{ 2240{
… …
1966 { 2274 {
1967 STRLEN len; 2275 STRLEN len;
1968 const char *str = SvPV (jsonstr, len); 2276 const char *str = SvPV (jsonstr, len);
1969 STRLEN cur = SvCUR (self->incr_text); 2277 STRLEN cur = SvCUR (self->incr_text);
1970 2278
1971 if (SvLEN (self->incr_text) <= cur + len) 2279 if (SvLEN (self->incr_text) - cur <= len)
1972 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2280 json_sv_grow (self->incr_text, cur, len);
1973 2281
1974 Move (str, SvEND (self->incr_text), len, char); 2282 Move (str, SvEND (self->incr_text), len, char);
1975 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2283 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1976 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2284 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1977 } 2285 }
1978 } 2286 }
1979 2287
1980 if (GIMME_V != G_VOID) 2288 if (GIMME_V != G_VOID)
1981 do 2289 do
1982 { 2290 {
2291 SV *sv;
1983 char *offset; 2292 STRLEN offset;
1984 2293
1985 if (!INCR_DONE (self)) 2294 if (!INCR_DONE (self))
1986 { 2295 {
1987 incr_parse (self); 2296 incr_parse (self);
1988 2297
1989 if (self->incr_pos > self->max_size && self->max_size) 2298 if (self->incr_pos > self->max_size && self->max_size)
1990 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2299 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1991 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2300 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1992 2301
1993 if (!INCR_DONE (self)) 2302 if (!INCR_DONE (self))
2303 {
2304 // as an optimisation, do not accumulate white space in the incr buffer
2305 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2306 {
2307 self->incr_pos = 0;
2308 SvCUR_set (self->incr_text, 0);
2309 }
2310
1994 break; 2311 break;
2312 }
1995 } 2313 }
1996 2314
1997 XPUSHs (decode_json (self->incr_text, self, &offset)); 2315 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2316 XPUSHs (sv);
1998 2317
1999 self->incr_pos -= offset - SvPVX (self->incr_text); 2318 self->incr_pos -= offset;
2000 self->incr_nest = 0; 2319 self->incr_nest = 0;
2001 self->incr_mode = 0; 2320 self->incr_mode = 0;
2002 2321
2003 sv_chop (self->incr_text, offset); 2322 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2004 } 2323 }
2005 while (GIMME_V == G_ARRAY); 2324 while (GIMME_V == G_ARRAY);
2006} 2325}
2007 2326
2008SV *incr_text (JSON *self) 2327SV *incr_text (JSON *self)
… …
2039 self->incr_mode = 0; 2358 self->incr_mode = 0;
2040} 2359}
2041 2360
2042void DESTROY (JSON *self) 2361void DESTROY (JSON *self)
2043 CODE: 2362 CODE:
2363 SvREFCNT_dec (self->v_false);
2364 SvREFCNT_dec (self->v_true);
2044 SvREFCNT_dec (self->cb_sk_object); 2365 SvREFCNT_dec (self->cb_sk_object);
2045 SvREFCNT_dec (self->cb_object); 2366 SvREFCNT_dec (self->cb_object);
2046 SvREFCNT_dec (self->incr_text); 2367 SvREFCNT_dec (self->incr_text);
2047 2368
2048PROTOTYPES: ENABLE 2369PROTOTYPES: ENABLE
2049 2370
2050void encode_json (SV *scalar) 2371void encode_json (SV *scalar)
2051 ALIAS:
2052 to_json_ = 0
2053 encode_json = F_UTF8
2054 PPCODE: 2372 PPCODE:
2055{ 2373{
2056 JSON json; 2374 JSON json;
2057 json_init (&json); 2375 json_init (&json);
2058 json.flags |= ix; 2376 json.flags |= F_UTF8;
2059 XPUSHs (encode_json (scalar, &json)); 2377 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2378 XPUSHs (scalar);
2060} 2379}
2061 2380
2062void decode_json (SV *jsonstr) 2381void decode_json (SV *jsonstr)
2063 ALIAS:
2064 from_json_ = 0
2065 decode_json = F_UTF8
2066 PPCODE: 2382 PPCODE:
2067{ 2383{
2068 JSON json; 2384 JSON json;
2069 json_init (&json); 2385 json_init (&json);
2070 json.flags |= ix; 2386 json.flags |= F_UTF8;
2071 XPUSHs (decode_json (jsonstr, &json, 0)); 2387 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2388 XPUSHs (jsonstr);
2072} 2389}
2073 2390

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines