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.133 by root, Tue Aug 28 16:16:17 2018 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 15#endif
15 16
16// some old perls do not have this, try to make it work, no 17// some old perls do not have this, try to make it work, no
17// guarantees, though. if it breaks, you get to keep the pieces. 18// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 19#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 20# define UTF8_MAXBYTES 13
21#endif
22
23// compatibility with perl <5.18
24#ifndef HvNAMELEN_get
25# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
26#endif
27#ifndef HvNAMELEN
28# define HvNAMELEN(hv) HvNAMELEN_get (hv)
29#endif
30#ifndef HvNAMEUTF8
31# define HvNAMEUTF8(hv) 0
20#endif 32#endif
21 33
22// three extra for rounding, sign, and end of string 34// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) 35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24 36
… …
33#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 49#define F_ALLOW_UNKNOWN 0x00002000UL
50#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 52
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 54
42#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 32 // initial scalar size to be allocated
… …
65 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
66 79
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68 81
69#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
70# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
85# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
72#else 86#else
73# define JSON_SLOW 0
74# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
75#endif 90#endif
76 91
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
78static SV *json_true, *json_false; 93#define STACK_HES 64
94
95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
96static SV *bool_false, *bool_true;
97static SV *sv_json;
79 98
80enum { 99enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string 101 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash 102 INCR_M_BS, // inside backslash
… …
99 // for the incremental parser 118 // for the incremental parser
100 SV *incr_text; // the source text so far 119 SV *incr_text; // the source text so far
101 STRLEN incr_pos; // the current offset into the text 120 STRLEN incr_pos; // the current offset into the text
102 int incr_nest; // {[]}-nesting level 121 int incr_nest; // {[]}-nesting level
103 unsigned char incr_mode; 122 unsigned char incr_mode;
123
124 SV *v_false, *v_true;
104} JSON; 125} JSON;
105 126
106INLINE void 127INLINE void
107json_init (JSON *json) 128json_init (JSON *json)
108{ 129{
… …
137 SvPV_renew (sv, SvCUR (sv) + 1); 158 SvPV_renew (sv, SvCUR (sv) + 1);
138#endif 159#endif
139 } 160 }
140} 161}
141 162
163/* adds two STRLENs together, slow, and with paranoia */
164STRLEN
165strlen_sum (STRLEN l1, STRLEN l2)
166{
167 size_t sum = l1 + l2;
168
169 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
170 croak ("JSON::XS: string size overflow");
171
172 return sum;
173}
174
175/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
176static char *
177json_sv_grow (SV *sv, size_t len1, size_t len2)
178{
179 len1 = strlen_sum (len1, len2);
180 len1 = strlen_sum (len1, len1 >> 1);
181
182 if (len1 > 4096 - 24)
183 len1 = (len1 | 4095) - 24;
184
185 return SvGROW (sv, len1);
186}
187
142// decode an utf-8 character and return it, or (UV)-1 in 188// decode a utf-8 character and return it, or (UV)-1 in
143// case of an error. 189// case of an error.
144// we special-case "safe" characters from U+80 .. U+7FF, 190// we special-case "safe" characters from U+80 .. U+7FF,
145// but use the very good perl function to parse anything else. 191// but use the very good perl function to parse anything else.
146// note that we never call this function for a ascii codepoints 192// note that we never call this function for a ascii codepoints
147INLINE UV 193INLINE UV
… …
260 } 306 }
261 307
262 // this relies greatly on the quality of the pow () 308 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good 309 // implementation of the platform, but a good
264 // implementation is hard to beat. 310 // implementation is hard to beat.
311 // (IEEE 754 conformant ones are required to be exact)
265 if (postdp) *expo -= eaccum; 312 if (postdp) *expo -= eaccum;
266 *accum += uaccum * Perl_pow (10., *expo); 313 *accum += uaccum * Perl_pow (10., *expo);
267 *expo += eaccum; 314 *expo += eaccum;
268} 315}
269 316
… …
283 // a recursion depth of ten gives us >>500 bits 330 // a recursion depth of ten gives us >>500 bits
284 json_atof_scan1 (s, &accum, &expo, 0, 10); 331 json_atof_scan1 (s, &accum, &expo, 0, 10);
285 332
286 return neg ? -accum : accum; 333 return neg ? -accum : accum;
287} 334}
335
336// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
337static int
338ref_bool_type (SV *sv)
339{
340 svtype svt = SvTYPE (sv);
341
342 if (svt < SVt_PVAV)
343 {
344 STRLEN len = 0;
345 char *pv = svt ? SvPV (sv, len) : 0;
346
347 if (len == 1)
348 if (*pv == '1')
349 return 1;
350 else if (*pv == '0')
351 return 0;
352 }
353
354 return -1;
355}
356
357// returns whether scalar is not a reference in the sense of allow_nonref
358static int
359json_nonref (SV *scalar)
360{
361 if (!SvROK (scalar))
362 return 1;
363
364 scalar = SvRV (scalar);
365
366 if (SvTYPE (scalar) >= SVt_PVMG)
367 {
368 if (SvSTASH (scalar) == bool_stash)
369 return 1;
370
371 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
372 return 1;
373 }
374
375 return 0;
376}
377
288///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
289// encoder 379// encoder
290 380
291// structure used for encoding JSON 381// structure used for encoding JSON
292typedef struct 382typedef struct
… …
300} enc_t; 390} enc_t;
301 391
302INLINE void 392INLINE void
303need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
304{ 394{
305 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
306 { 396 {
307 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
308 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
309 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
310 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
311 } 401 }
312} 402}
313 403
314INLINE void 404INLINE void
315encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
… …
331 421
332 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
333 { 423 {
334 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
335 { 425 {
336 need (enc, len += 1); 426 need (enc, len + 1);
337 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
338 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
339 } 429 }
340 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
341 { 431 {
342 need (enc, len += 1); 432 need (enc, len + 1);
343 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
344 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
345 } 435 }
346 else 436 else
347 *enc->cur++ = ch; 437 *enc->cur++ = ch;
… …
350 } 440 }
351 else 441 else
352 { 442 {
353 switch (ch) 443 switch (ch)
354 { 444 {
355 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 445 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
356 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 446 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
357 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 447 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
358 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 448 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
359 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 449 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
360 450
361 default: 451 default:
362 { 452 {
363 STRLEN clen; 453 STRLEN clen;
364 UV uch; 454 UV uch;
… …
380 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
381 { 471 {
382 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
383 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 473 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
384 474
385 need (enc, len += 11); 475 need (enc, len + 11);
386 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
387 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
388 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
389 enc->cur += 12; 479 enc->cur += 12;
390 } 480 }
391 else 481 else
392 { 482 {
393 need (enc, len += 5); 483 need (enc, len + 5);
394 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
395 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
396 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
397 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
398 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
… …
406 *enc->cur++ = uch; 496 *enc->cur++ = uch;
407 str += clen; 497 str += clen;
408 } 498 }
409 else if (is_utf8) 499 else if (is_utf8)
410 { 500 {
411 need (enc, len += clen); 501 need (enc, len + clen);
412 do 502 do
413 { 503 {
414 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
415 } 505 }
416 while (--clen); 506 while (--clen);
417 } 507 }
418 else 508 else
419 { 509 {
420 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 510 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
421 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
422 ++str; 512 ++str;
423 } 513 }
424 } 514 }
425 } 515 }
… …
479 569
480 if (enc->indent >= enc->json.max_depth) 570 if (enc->indent >= enc->json.max_depth)
481 croak (ERR_NESTING_EXCEEDED); 571 croak (ERR_NESTING_EXCEEDED);
482 572
483 encode_ch (enc, '['); 573 encode_ch (enc, '[');
484 574
485 if (len >= 0) 575 if (len >= 0)
486 { 576 {
487 encode_nl (enc); ++enc->indent; 577 encode_nl (enc); ++enc->indent;
488 578
489 for (i = 0; i <= len; ++i) 579 for (i = 0; i <= len; ++i)
… …
501 encode_comma (enc); 591 encode_comma (enc);
502 } 592 }
503 593
504 encode_nl (enc); --enc->indent; encode_indent (enc); 594 encode_nl (enc); --enc->indent; encode_indent (enc);
505 } 595 }
506 596
507 encode_ch (enc, ']'); 597 encode_ch (enc, ']');
508} 598}
509 599
510static void 600static void
511encode_hk (enc_t *enc, HE *he) 601encode_hk (enc_t *enc, HE *he)
… …
515 if (HeKLEN (he) == HEf_SVKEY) 605 if (HeKLEN (he) == HEf_SVKEY)
516 { 606 {
517 SV *sv = HeSVKEY (he); 607 SV *sv = HeSVKEY (he);
518 STRLEN len; 608 STRLEN len;
519 char *str; 609 char *str;
520 610
521 SvGETMAGIC (sv); 611 SvGETMAGIC (sv);
522 str = SvPV (sv, len); 612 str = SvPV (sv, len);
523 613
524 encode_str (enc, str, len, SvUTF8 (sv)); 614 encode_str (enc, str, len, SvUTF8 (sv));
525 } 615 }
… …
591 } 681 }
592 682
593 if (count) 683 if (count)
594 { 684 {
595 int i, fast = 1; 685 int i, fast = 1;
596#if defined(__BORLANDC__) || defined(_MSC_VER) 686 HE *hes_stack [STACK_HES];
597 HE **hes = _alloca (count * sizeof (HE)); 687 HE **hes = hes_stack;
598#else 688
599 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 689 // allocate larger arrays on the heap
600#endif 690 if (count > STACK_HES)
691 {
692 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
693 hes = (HE **)SvPVX (sv);
694 }
601 695
602 i = 0; 696 i = 0;
603 while ((he = hv_iternext (hv))) 697 while ((he = hv_iternext (hv)))
604 { 698 {
605 hes [i++] = he; 699 hes [i++] = he;
… …
674// encode objects, arrays and special \0=false and \1=true values. 768// encode objects, arrays and special \0=false and \1=true values.
675static void 769static void
676encode_rv (enc_t *enc, SV *sv) 770encode_rv (enc_t *enc, SV *sv)
677{ 771{
678 svtype svt; 772 svtype svt;
773 GV *method;
679 774
680 SvGETMAGIC (sv); 775 SvGETMAGIC (sv);
681 svt = SvTYPE (sv); 776 svt = SvTYPE (sv);
682 777
683 if (expect_false (SvOBJECT (sv))) 778 if (expect_false (SvOBJECT (sv)))
684 { 779 {
685 HV *stash = !JSON_SLOW || json_boolean_stash 780 HV *stash = SvSTASH (sv);
686 ? json_boolean_stash
687 : gv_stashpv ("JSON::XS::Boolean", 1);
688 781
689 if (SvSTASH (sv) == stash) 782 if (stash == bool_stash)
690 { 783 {
691 if (SvIV (sv))
692 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
693 else
694 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
695 } 786 }
787 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
788 {
789 int count;
790 dSP;
791
792 ENTER; SAVETMPS;
793 SAVESTACK_POS ();
794 PUSHMARK (SP);
795 EXTEND (SP, 2);
796 // we re-bless the reference to get overload and other niceties right
797 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
798 PUSHs (sv_json);
799
800 PUTBACK;
801 count = call_sv ((SV *)GvCV (method), G_ARRAY);
802 SPAGAIN;
803
804 // catch this surprisingly common error
805 if (SvROK (TOPs) && SvRV (TOPs) == sv)
806 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
807
808 encode_ch (enc, '(');
809 encode_ch (enc, '"');
810 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
811 encode_ch (enc, '"');
812 encode_ch (enc, ')');
813 encode_ch (enc, '[');
814
815 while (count)
816 {
817 encode_sv (enc, SP[1 - count--]);
818
819 if (count)
820 encode_ch (enc, ',');
821 }
822
823 encode_ch (enc, ']');
824
825 FREETMPS; LEAVE;
826 }
827 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
828 {
829 dSP;
830
831 ENTER; SAVETMPS;
832 PUSHMARK (SP);
833 // we re-bless the reference to get overload and other niceties right
834 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
835
836 // calling with G_SCALAR ensures that we always get a 1 return value
837 PUTBACK;
838 call_sv ((SV *)GvCV (method), G_SCALAR);
839 SPAGAIN;
840
841 // catch this surprisingly common error
842 if (SvROK (TOPs) && SvRV (TOPs) == sv)
843 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
844
845 sv = POPs;
846 PUTBACK;
847
848 encode_sv (enc, sv);
849
850 FREETMPS; LEAVE;
851 }
852 else if (enc->json.flags & F_ALLOW_BLESSED)
853 encode_str (enc, "null", 4, 0);
696 else 854 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", 855 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)))); 856 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
743 }
744 } 857 }
745 else if (svt == SVt_PVHV) 858 else if (svt == SVt_PVHV)
746 encode_hv (enc, (HV *)sv); 859 encode_hv (enc, (HV *)sv);
747 else if (svt == SVt_PVAV) 860 else if (svt == SVt_PVAV)
748 encode_av (enc, (AV *)sv); 861 encode_av (enc, (AV *)sv);
749 else if (svt < SVt_PVAV) 862 else if (svt < SVt_PVAV)
750 { 863 {
751 STRLEN len = 0; 864 int bool_type = ref_bool_type (sv);
752 char *pv = svt ? SvPV (sv, len) : 0;
753 865
754 if (len == 1 && *pv == '1') 866 if (bool_type == 1)
755 encode_str (enc, "true", 4, 0); 867 encode_str (enc, "true", 4, 0);
756 else if (len == 1 && *pv == '0') 868 else if (bool_type == 0)
757 encode_str (enc, "false", 5, 0); 869 encode_str (enc, "false", 5, 0);
758 else if (enc->json.flags & F_ALLOW_UNKNOWN) 870 else if (enc->json.flags & F_ALLOW_UNKNOWN)
759 encode_str (enc, "null", 4, 0); 871 encode_str (enc, "null", 4, 0);
760 else 872 else
761 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 873 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
824 } 936 }
825 else 937 else
826 { 938 {
827 // large integer, use the (rather slow) snprintf way. 939 // large integer, use the (rather slow) snprintf way.
828 need (enc, IVUV_MAXCHARS); 940 need (enc, IVUV_MAXCHARS);
829 enc->cur += 941 enc->cur +=
830 SvIsUV(sv) 942 SvIsUV(sv)
831 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 943 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 944 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833 } 945 }
834 } 946 }
835 else if (SvROK (sv)) 947 else if (SvROK (sv))
836 encode_rv (enc, SvRV (sv)); 948 encode_rv (enc, SvRV (sv));
837 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 949 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
838 encode_str (enc, "null", 4, 0); 950 encode_str (enc, "null", 4, 0);
839 else 951 else
840 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 952 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
841 SvPV_nolen (sv), SvFLAGS (sv)); 953 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
842} 954}
843 955
844static SV * 956static SV *
845encode_json (SV *scalar, JSON *json) 957encode_json (SV *scalar, JSON *json)
846{ 958{
847 enc_t enc; 959 enc_t enc;
848 960
849 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 961 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)"); 962 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
851 963
852 enc.json = *json; 964 enc.json = *json;
853 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 965 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
854 enc.cur = SvPVX (enc.sv); 966 enc.cur = SvPVX (enc.sv);
… …
1061 *cur++ = *dec_cur++; 1173 *cur++ = *dec_cur++;
1062 while (--clen); 1174 while (--clen);
1063 1175
1064 utf8 = 1; 1176 utf8 = 1;
1065 } 1177 }
1178 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1179 *cur++ = ch;
1066 else 1180 else
1067 { 1181 {
1068 --dec_cur; 1182 --dec_cur;
1069 1183
1070 if (!ch) 1184 if (!ch)
… …
1080 1194
1081 if (sv) 1195 if (sv)
1082 { 1196 {
1083 STRLEN cur = SvCUR (sv); 1197 STRLEN cur = SvCUR (sv);
1084 1198
1085 if (SvLEN (sv) <= cur + len) 1199 if (SvLEN (sv) - cur <= len)
1086 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1200 json_sv_grow (sv, cur, len);
1087 1201
1088 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1202 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1089 SvCUR_set (sv, SvCUR (sv) + len); 1203 SvCUR_set (sv, SvCUR (sv) + len);
1090 } 1204 }
1091 else 1205 else
… …
1258 if (*dec->cur == ']') 1372 if (*dec->cur == ']')
1259 { 1373 {
1260 ++dec->cur; 1374 ++dec->cur;
1261 break; 1375 break;
1262 } 1376 }
1263 1377
1264 if (*dec->cur != ',') 1378 if (*dec->cur != ',')
1265 ERR (", or ] expected while parsing array"); 1379 ERR (", or ] expected while parsing array");
1266 1380
1267 ++dec->cur; 1381 ++dec->cur;
1268 1382
… …
1392 1506
1393 hv_iterinit (hv); 1507 hv_iterinit (hv);
1394 he = hv_iternext (hv); 1508 he = hv_iternext (hv);
1395 hv_iterinit (hv); 1509 hv_iterinit (hv);
1396 1510
1397 // the next line creates a mortal sv each time its called. 1511 // the next line creates a mortal sv each time it's called.
1398 // might want to optimise this for common cases. 1512 // might want to optimise this for common cases.
1399 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1513 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1400 1514
1401 if (cb) 1515 if (cb)
1402 { 1516 {
1403 dSP; 1517 dSP;
1404 int count; 1518 int count;
1405 1519
1406 ENTER; SAVETMPS; PUSHMARK (SP); 1520 ENTER; SAVETMPS;
1521 SAVESTACK_POS ();
1522 PUSHMARK (SP);
1407 XPUSHs (HeVAL (he)); 1523 XPUSHs (HeVAL (he));
1408 sv_2mortal (sv); 1524 sv_2mortal (sv);
1409 1525
1410 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1526 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1411 1527
… …
1424 if (dec->json.cb_object) 1540 if (dec->json.cb_object)
1425 { 1541 {
1426 dSP; 1542 dSP;
1427 int count; 1543 int count;
1428 1544
1429 ENTER; SAVETMPS; PUSHMARK (SP); 1545 ENTER; SAVETMPS;
1546 SAVESTACK_POS ();
1547 PUSHMARK (SP);
1430 XPUSHs (sv_2mortal (sv)); 1548 XPUSHs (sv_2mortal (sv));
1431 1549
1432 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1550 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1433 1551
1434 if (count == 1) 1552 if (count == 1)
… …
1450 DEC_DEC_DEPTH; 1568 DEC_DEC_DEPTH;
1451 return 0; 1569 return 0;
1452} 1570}
1453 1571
1454static SV * 1572static SV *
1573decode_tag (dec_t *dec)
1574{
1575 SV *tag = 0;
1576 SV *val = 0;
1577
1578 if (!(dec->json.flags & F_ALLOW_TAGS))
1579 ERR ("malformed JSON string, neither array, object, number, string or atom");
1580
1581 ++dec->cur;
1582
1583 decode_ws (dec);
1584
1585 tag = decode_sv (dec);
1586 if (!tag)
1587 goto fail;
1588
1589 if (!SvPOK (tag))
1590 ERR ("malformed JSON string, (tag) must be a string");
1591
1592 decode_ws (dec);
1593
1594 if (*dec->cur != ')')
1595 ERR (") expected after tag");
1596
1597 ++dec->cur;
1598
1599 decode_ws (dec);
1600
1601 val = decode_sv (dec);
1602 if (!val)
1603 goto fail;
1604
1605 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1606 ERR ("malformed JSON string, tag value must be an array");
1607
1608 {
1609 AV *av = (AV *)SvRV (val);
1610 int i, len = av_len (av) + 1;
1611 HV *stash = gv_stashsv (tag, 0);
1612 SV *sv;
1613
1614 if (!stash)
1615 ERR ("cannot decode perl-object (package does not exist)");
1616
1617 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1618
1619 if (!method)
1620 ERR ("cannot decode perl-object (package does not have a THAW method)");
1621
1622 dSP;
1623
1624 ENTER; SAVETMPS;
1625 PUSHMARK (SP);
1626 EXTEND (SP, len + 2);
1627 // we re-bless the reference to get overload and other niceties right
1628 PUSHs (tag);
1629 PUSHs (sv_json);
1630
1631 for (i = 0; i < len; ++i)
1632 PUSHs (*av_fetch (av, i, 1));
1633
1634 PUTBACK;
1635 call_sv ((SV *)GvCV (method), G_SCALAR);
1636 SPAGAIN;
1637
1638 SvREFCNT_dec (tag);
1639 SvREFCNT_dec (val);
1640 sv = SvREFCNT_inc (POPs);
1641
1642 PUTBACK;
1643
1644 FREETMPS; LEAVE;
1645
1646 return sv;
1647 }
1648
1649fail:
1650 SvREFCNT_dec (tag);
1651 SvREFCNT_dec (val);
1652 return 0;
1653}
1654
1655static SV *
1455decode_sv (dec_t *dec) 1656decode_sv (dec_t *dec)
1456{ 1657{
1457 // the beauty of JSON: you need exactly one character lookahead 1658 // the beauty of JSON: you need exactly one character lookahead
1458 // to parse everything. 1659 // to parse everything.
1459 switch (*dec->cur) 1660 switch (*dec->cur)
1460 { 1661 {
1461 case '"': ++dec->cur; return decode_str (dec); 1662 case '"': ++dec->cur; return decode_str (dec);
1462 case '[': ++dec->cur; return decode_av (dec); 1663 case '[': ++dec->cur; return decode_av (dec);
1463 case '{': ++dec->cur; return decode_hv (dec); 1664 case '{': ++dec->cur; return decode_hv (dec);
1665 case '(': return decode_tag (dec);
1464 1666
1465 case '-': 1667 case '-':
1466 case '0': case '1': case '2': case '3': case '4': 1668 case '0': case '1': case '2': case '3': case '4':
1467 case '5': case '6': case '7': case '8': case '9': 1669 case '5': case '6': case '7': case '8': case '9':
1468 return decode_num (dec); 1670 return decode_num (dec);
1469 1671
1672 case 'f':
1673 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1674 {
1675 dec->cur += 5;
1676
1677 if (expect_false (!dec->json.v_false))
1678 dec->json.v_false = GET_BOOL (false);
1679
1680 return newSVsv (dec->json.v_false);
1681 }
1682 else
1683 ERR ("'false' expected");
1684
1685 break;
1686
1470 case 't': 1687 case 't':
1471 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1688 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1472 { 1689 {
1473 dec->cur += 4; 1690 dec->cur += 4;
1474#if JSON_SLOW 1691
1475 json_true = get_bool ("JSON::XS::true"); 1692 if (expect_false (!dec->json.v_true))
1476#endif 1693 dec->json.v_true = GET_BOOL (true);
1694
1477 return newSVsv (json_true); 1695 return newSVsv (dec->json.v_true);
1478 } 1696 }
1479 else 1697 else
1480 ERR ("'true' expected"); 1698 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 1699
1496 break; 1700 break;
1497 1701
1498 case 'n': 1702 case 'n':
1499 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1703 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1505 ERR ("'null' expected"); 1709 ERR ("'null' expected");
1506 1710
1507 break; 1711 break;
1508 1712
1509 default: 1713 default:
1510 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1714 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1511 break; 1715 break;
1512 } 1716 }
1513 1717
1514fail: 1718fail:
1515 return 0; 1719 return 0;
1516} 1720}
1517 1721
1518static SV * 1722static SV *
1519decode_json (SV *string, JSON *json, char **offset_return) 1723decode_json (SV *string, JSON *json, STRLEN *offset_return)
1520{ 1724{
1521 dec_t dec; 1725 dec_t dec;
1522 SV *sv; 1726 SV *sv;
1523 1727
1524 /* work around bugs in 5.10 where manipulating magic values 1728 /* work around bugs in 5.10 where manipulating magic values
1525 * will perl ignore the magic in subsequent accesses 1729 * makes perl ignore the magic in subsequent accesses.
1730 * also make a copy of non-PV values, to get them into a clean
1731 * state (SvPV should do that, but it's buggy, see below).
1732 *
1733 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1734 * as reported by Reini Urban.
1526 */ 1735 */
1527 /*SvGETMAGIC (string);*/ 1736 /*SvGETMAGIC (string);*/
1528 if (SvMAGICAL (string)) 1737 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1529 string = sv_2mortal (newSVsv (string)); 1738 string = sv_2mortal (newSVsv (string));
1530 1739
1531 SvUPGRADE (string, SVt_PV); 1740 SvUPGRADE (string, SVt_PV);
1532 1741
1533 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1742 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1572 1781
1573 decode_ws (&dec); 1782 decode_ws (&dec);
1574 sv = decode_sv (&dec); 1783 sv = decode_sv (&dec);
1575 1784
1576 if (offset_return) 1785 if (offset_return)
1577 *offset_return = dec.cur; 1786 *offset_return = dec.cur - SvPVX (string);
1578 1787 else if (sv)
1579 if (!(offset_return || !sv))
1580 { 1788 {
1581 // check for trailing garbage 1789 // check for trailing garbage
1582 decode_ws (&dec); 1790 decode_ws (&dec);
1583 1791
1584 if (*dec.cur) 1792 if (*dec.cur)
… …
1602 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1810 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1603 LEAVE; 1811 LEAVE;
1604 1812
1605 croak ("%s, at character offset %d (before \"%s\")", 1813 croak ("%s, at character offset %d (before \"%s\")",
1606 dec.err, 1814 dec.err,
1607 ptr_to_index (string, dec.cur), 1815 (int)ptr_to_index (string, dec.cur),
1608 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1816 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1609 } 1817 }
1610 1818
1611 sv = sv_2mortal (sv); 1819 sv = sv_2mortal (sv);
1612 1820
1613 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1821 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)"); 1822 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1615 1823
1616 return sv; 1824 return sv;
1617} 1825}
1618 1826
… …
1740 self->incr_mode = INCR_M_STR; 1948 self->incr_mode = INCR_M_STR;
1741 goto incr_m_str; 1949 goto incr_m_str;
1742 1950
1743 case '[': 1951 case '[':
1744 case '{': 1952 case '{':
1953 case '(':
1745 if (++self->incr_nest > self->max_depth) 1954 if (++self->incr_nest > self->max_depth)
1746 croak (ERR_NESTING_EXCEEDED); 1955 croak (ERR_NESTING_EXCEEDED);
1747 break; 1956 break;
1748 1957
1749 case ']': 1958 case ']':
1750 case '}': 1959 case '}':
1751 if (--self->incr_nest <= 0) 1960 if (--self->incr_nest <= 0)
1752 goto interrupt; 1961 goto interrupt;
1962 break;
1963
1964 case ')':
1965 --self->incr_nest;
1753 break; 1966 break;
1754 1967
1755 case '#': 1968 case '#':
1756 self->incr_mode = INCR_M_C1; 1969 self->incr_mode = INCR_M_C1;
1757 goto incr_m_c; 1970 goto incr_m_c;
… …
1783 i >= '0' && i <= '9' ? i - '0' 1996 i >= '0' && i <= '9' ? i - '0'
1784 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1997 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1785 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1998 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1786 : -1; 1999 : -1;
1787 2000
1788 json_stash = gv_stashpv ("JSON::XS" , 1); 2001 json_stash = gv_stashpv ("JSON::XS" , 1);
1789 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2002 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"); 2003 bool_false = get_bool ("Types::Serialiser::false");
2004 bool_true = get_bool ("Types::Serialiser::true");
2005
2006 sv_json = newSVpv ("JSON", 0);
2007 SvREADONLY_on (sv_json);
1793 2008
1794 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 2009 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1795} 2010}
1796 2011
1797PROTOTYPES: DISABLE 2012PROTOTYPES: DISABLE
1798 2013
1799void CLONE (...) 2014void CLONE (...)
1800 CODE: 2015 CODE:
2016 // as long as these writes are atomic, the race should not matter
2017 // as existing threads either already use 0, or use the old value,
2018 // which is sitll correct for the initial thread.
1801 json_stash = 0; 2019 json_stash = 0;
1802 json_boolean_stash = 0; 2020 bool_stash = 0;
2021 bool_false = 0;
2022 bool_true = 0;
1803 2023
1804void new (char *klass) 2024void new (char *klass)
1805 PPCODE: 2025 PPCODE:
1806{ 2026{
1807 SV *pv = NEWSV (0, sizeof (JSON)); 2027 SV *pv = NEWSV (0, sizeof (JSON));
1808 SvPOK_only (pv); 2028 SvPOK_only (pv);
1809 json_init ((JSON *)SvPVX (pv)); 2029 json_init ((JSON *)SvPVX (pv));
1810 XPUSHs (sv_2mortal (sv_bless ( 2030 XPUSHs (sv_2mortal (sv_bless (
1811 newRV_noinc (pv), 2031 newRV_noinc (pv),
1812 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2032 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1813 ))); 2033 )));
1814} 2034}
2035
2036void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2037 PPCODE:
2038 self->v_false = newSVsv (v_false);
2039 self->v_true = newSVsv (v_true);
2040 XPUSHs (ST (0));
2041
2042void get_boolean_values (JSON *self)
2043 PPCODE:
2044 if (self->v_false && self->v_true)
2045 {
2046 EXTEND (SP, 2);
2047 PUSHs (self->v_false);
2048 PUSHs (self->v_true);
2049 }
1815 2050
1816void ascii (JSON *self, int enable = 1) 2051void ascii (JSON *self, int enable = 1)
1817 ALIAS: 2052 ALIAS:
1818 ascii = F_ASCII 2053 ascii = F_ASCII
1819 latin1 = F_LATIN1 2054 latin1 = F_LATIN1
… …
1827 shrink = F_SHRINK 2062 shrink = F_SHRINK
1828 allow_blessed = F_ALLOW_BLESSED 2063 allow_blessed = F_ALLOW_BLESSED
1829 convert_blessed = F_CONV_BLESSED 2064 convert_blessed = F_CONV_BLESSED
1830 relaxed = F_RELAXED 2065 relaxed = F_RELAXED
1831 allow_unknown = F_ALLOW_UNKNOWN 2066 allow_unknown = F_ALLOW_UNKNOWN
2067 allow_tags = F_ALLOW_TAGS
1832 PPCODE: 2068 PPCODE:
1833{ 2069{
1834 if (enable) 2070 if (enable)
1835 self->flags |= ix; 2071 self->flags |= ix;
1836 else 2072 else
… …
1852 get_shrink = F_SHRINK 2088 get_shrink = F_SHRINK
1853 get_allow_blessed = F_ALLOW_BLESSED 2089 get_allow_blessed = F_ALLOW_BLESSED
1854 get_convert_blessed = F_CONV_BLESSED 2090 get_convert_blessed = F_CONV_BLESSED
1855 get_relaxed = F_RELAXED 2091 get_relaxed = F_RELAXED
1856 get_allow_unknown = F_ALLOW_UNKNOWN 2092 get_allow_unknown = F_ALLOW_UNKNOWN
2093 get_allow_tags = F_ALLOW_TAGS
1857 PPCODE: 2094 PPCODE:
1858 XPUSHs (boolSV (self->flags & ix)); 2095 XPUSHs (boolSV (self->flags & ix));
1859 2096
1860void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2097void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1861 PPCODE: 2098 PPCODE:
… …
1889} 2126}
1890 2127
1891void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2128void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1892 PPCODE: 2129 PPCODE:
1893{ 2130{
1894 if (!self->cb_sk_object) 2131 if (!self->cb_sk_object)
1895 self->cb_sk_object = newHV (); 2132 self->cb_sk_object = newHV ();
1896 2133
1897 if (SvOK (cb)) 2134 if (SvOK (cb))
1898 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2135 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1899 else 2136 else
… …
1910 XPUSHs (ST (0)); 2147 XPUSHs (ST (0));
1911} 2148}
1912 2149
1913void encode (JSON *self, SV *scalar) 2150void encode (JSON *self, SV *scalar)
1914 PPCODE: 2151 PPCODE:
1915 XPUSHs (encode_json (scalar, self)); 2152 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2153 XPUSHs (scalar);
1916 2154
1917void decode (JSON *self, SV *jsonstr) 2155void decode (JSON *self, SV *jsonstr)
1918 PPCODE: 2156 PPCODE:
1919 XPUSHs (decode_json (jsonstr, self, 0)); 2157 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2158 XPUSHs (jsonstr);
1920 2159
1921void decode_prefix (JSON *self, SV *jsonstr) 2160void decode_prefix (JSON *self, SV *jsonstr)
1922 PPCODE: 2161 PPCODE:
1923{ 2162{
1924 char *offset; 2163 SV *sv;
2164 STRLEN offset;
2165 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1925 EXTEND (SP, 2); 2166 EXTEND (SP, 2);
1926 PUSHs (decode_json (jsonstr, self, &offset)); 2167 PUSHs (sv);
1927 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2168 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1928} 2169}
1929 2170
1930void incr_parse (JSON *self, SV *jsonstr = 0) 2171void incr_parse (JSON *self, SV *jsonstr = 0)
1931 PPCODE: 2172 PPCODE:
1932{ 2173{
… …
1966 { 2207 {
1967 STRLEN len; 2208 STRLEN len;
1968 const char *str = SvPV (jsonstr, len); 2209 const char *str = SvPV (jsonstr, len);
1969 STRLEN cur = SvCUR (self->incr_text); 2210 STRLEN cur = SvCUR (self->incr_text);
1970 2211
1971 if (SvLEN (self->incr_text) <= cur + len) 2212 if (SvLEN (self->incr_text) - cur <= len)
1972 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2213 json_sv_grow (self->incr_text, cur, len);
1973 2214
1974 Move (str, SvEND (self->incr_text), len, char); 2215 Move (str, SvEND (self->incr_text), len, char);
1975 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2216 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 2217 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1977 } 2218 }
1978 } 2219 }
1979 2220
1980 if (GIMME_V != G_VOID) 2221 if (GIMME_V != G_VOID)
1981 do 2222 do
1982 { 2223 {
2224 SV *sv;
1983 char *offset; 2225 STRLEN offset;
1984 2226
1985 if (!INCR_DONE (self)) 2227 if (!INCR_DONE (self))
1986 { 2228 {
1987 incr_parse (self); 2229 incr_parse (self);
1988 2230
1989 if (self->incr_pos > self->max_size && self->max_size) 2231 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", 2232 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); 2233 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1992 2234
1993 if (!INCR_DONE (self)) 2235 if (!INCR_DONE (self))
2236 {
2237 // as an optimisation, do not accumulate white space in the incr buffer
2238 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2239 {
2240 self->incr_pos = 0;
2241 SvCUR_set (self->incr_text, 0);
2242 }
2243
1994 break; 2244 break;
2245 }
1995 } 2246 }
1996 2247
1997 XPUSHs (decode_json (self->incr_text, self, &offset)); 2248 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2249 XPUSHs (sv);
1998 2250
1999 self->incr_pos -= offset - SvPVX (self->incr_text); 2251 self->incr_pos -= offset;
2000 self->incr_nest = 0; 2252 self->incr_nest = 0;
2001 self->incr_mode = 0; 2253 self->incr_mode = 0;
2002 2254
2003 sv_chop (self->incr_text, offset); 2255 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2004 } 2256 }
2005 while (GIMME_V == G_ARRAY); 2257 while (GIMME_V == G_ARRAY);
2006} 2258}
2007 2259
2008SV *incr_text (JSON *self) 2260SV *incr_text (JSON *self)
… …
2039 self->incr_mode = 0; 2291 self->incr_mode = 0;
2040} 2292}
2041 2293
2042void DESTROY (JSON *self) 2294void DESTROY (JSON *self)
2043 CODE: 2295 CODE:
2296 SvREFCNT_dec (self->v_false);
2297 SvREFCNT_dec (self->v_true);
2044 SvREFCNT_dec (self->cb_sk_object); 2298 SvREFCNT_dec (self->cb_sk_object);
2045 SvREFCNT_dec (self->cb_object); 2299 SvREFCNT_dec (self->cb_object);
2046 SvREFCNT_dec (self->incr_text); 2300 SvREFCNT_dec (self->incr_text);
2047 2301
2048PROTOTYPES: ENABLE 2302PROTOTYPES: ENABLE
2049 2303
2050void encode_json (SV *scalar) 2304void encode_json (SV *scalar)
2051 ALIAS:
2052 to_json_ = 0
2053 encode_json = F_UTF8
2054 PPCODE: 2305 PPCODE:
2055{ 2306{
2056 JSON json; 2307 JSON json;
2057 json_init (&json); 2308 json_init (&json);
2058 json.flags |= ix; 2309 json.flags |= F_UTF8;
2059 XPUSHs (encode_json (scalar, &json)); 2310 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2311 XPUSHs (scalar);
2060} 2312}
2061 2313
2062void decode_json (SV *jsonstr) 2314void decode_json (SV *jsonstr)
2063 ALIAS:
2064 from_json_ = 0
2065 decode_json = F_UTF8
2066 PPCODE: 2315 PPCODE:
2067{ 2316{
2068 JSON json; 2317 JSON json;
2069 json_init (&json); 2318 json_init (&json);
2070 json.flags |= ix; 2319 json.flags |= F_UTF8;
2071 XPUSHs (decode_json (jsonstr, &json, 0)); 2320 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2321 XPUSHs (jsonstr);
2072} 2322}
2073 2323

Diff Legend

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