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.111 by root, Wed Jul 27 15:53:40 2011 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
284 // a recursion depth of ten gives us >>500 bits 330 // a recursion depth of ten gives us >>500 bits
285 json_atof_scan1 (s, &accum, &expo, 0, 10); 331 json_atof_scan1 (s, &accum, &expo, 0, 10);
286 332
287 return neg ? -accum : accum; 333 return neg ? -accum : accum;
288} 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
289///////////////////////////////////////////////////////////////////////////// 378/////////////////////////////////////////////////////////////////////////////
290// encoder 379// encoder
291 380
292// structure used for encoding JSON 381// structure used for encoding JSON
293typedef struct 382typedef struct
301} enc_t; 390} enc_t;
302 391
303INLINE void 392INLINE void
304need (enc_t *enc, STRLEN len) 393need (enc_t *enc, STRLEN len)
305{ 394{
306 if (expect_false (enc->cur + len >= enc->end)) 395 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
307 { 396 {
308 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 397 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
309 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 398 char *buf = json_sv_grow (enc->sv, cur, len);
310 enc->cur = SvPVX (enc->sv) + cur; 399 enc->cur = buf + cur;
311 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 400 enc->end = buf + SvLEN (enc->sv) - 1;
312 } 401 }
313} 402}
314 403
315INLINE void 404INLINE void
316encode_ch (enc_t *enc, char ch) 405encode_ch (enc_t *enc, char ch)
332 421
333 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 422 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
334 { 423 {
335 if (expect_false (ch == '"')) // but with slow exceptions 424 if (expect_false (ch == '"')) // but with slow exceptions
336 { 425 {
337 need (enc, len += 1); 426 need (enc, len + 1);
338 *enc->cur++ = '\\'; 427 *enc->cur++ = '\\';
339 *enc->cur++ = '"'; 428 *enc->cur++ = '"';
340 } 429 }
341 else if (expect_false (ch == '\\')) 430 else if (expect_false (ch == '\\'))
342 { 431 {
343 need (enc, len += 1); 432 need (enc, len + 1);
344 *enc->cur++ = '\\'; 433 *enc->cur++ = '\\';
345 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
346 } 435 }
347 else 436 else
348 *enc->cur++ = ch; 437 *enc->cur++ = ch;
351 } 440 }
352 else 441 else
353 { 442 {
354 switch (ch) 443 switch (ch)
355 { 444 {
356 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;
357 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;
358 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;
359 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;
360 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;
361 450
362 default: 451 default:
363 { 452 {
364 STRLEN clen; 453 STRLEN clen;
365 UV uch; 454 UV uch;
381 if (uch >= 0x10000UL) 470 if (uch >= 0x10000UL)
382 { 471 {
383 if (uch >= 0x110000UL) 472 if (uch >= 0x110000UL)
384 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);
385 474
386 need (enc, len += 11); 475 need (enc, len + 11);
387 sprintf (enc->cur, "\\u%04x\\u%04x", 476 sprintf (enc->cur, "\\u%04x\\u%04x",
388 (int)((uch - 0x10000) / 0x400 + 0xD800), 477 (int)((uch - 0x10000) / 0x400 + 0xD800),
389 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 478 (int)((uch - 0x10000) % 0x400 + 0xDC00));
390 enc->cur += 12; 479 enc->cur += 12;
391 } 480 }
392 else 481 else
393 { 482 {
394 need (enc, len += 5); 483 need (enc, len + 5);
395 *enc->cur++ = '\\'; 484 *enc->cur++ = '\\';
396 *enc->cur++ = 'u'; 485 *enc->cur++ = 'u';
397 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 486 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
398 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 487 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
399 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
407 *enc->cur++ = uch; 496 *enc->cur++ = uch;
408 str += clen; 497 str += clen;
409 } 498 }
410 else if (is_utf8) 499 else if (is_utf8)
411 { 500 {
412 need (enc, len += clen); 501 need (enc, len + clen);
413 do 502 do
414 { 503 {
415 *enc->cur++ = *str++; 504 *enc->cur++ = *str++;
416 } 505 }
417 while (--clen); 506 while (--clen);
418 } 507 }
419 else 508 else
420 { 509 {
421 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
422 enc->cur = encode_utf8 (enc->cur, uch); 511 enc->cur = encode_utf8 (enc->cur, uch);
423 ++str; 512 ++str;
424 } 513 }
425 } 514 }
426 } 515 }
480 569
481 if (enc->indent >= enc->json.max_depth) 570 if (enc->indent >= enc->json.max_depth)
482 croak (ERR_NESTING_EXCEEDED); 571 croak (ERR_NESTING_EXCEEDED);
483 572
484 encode_ch (enc, '['); 573 encode_ch (enc, '[');
485 574
486 if (len >= 0) 575 if (len >= 0)
487 { 576 {
488 encode_nl (enc); ++enc->indent; 577 encode_nl (enc); ++enc->indent;
489 578
490 for (i = 0; i <= len; ++i) 579 for (i = 0; i <= len; ++i)
502 encode_comma (enc); 591 encode_comma (enc);
503 } 592 }
504 593
505 encode_nl (enc); --enc->indent; encode_indent (enc); 594 encode_nl (enc); --enc->indent; encode_indent (enc);
506 } 595 }
507 596
508 encode_ch (enc, ']'); 597 encode_ch (enc, ']');
509} 598}
510 599
511static void 600static void
512encode_hk (enc_t *enc, HE *he) 601encode_hk (enc_t *enc, HE *he)
516 if (HeKLEN (he) == HEf_SVKEY) 605 if (HeKLEN (he) == HEf_SVKEY)
517 { 606 {
518 SV *sv = HeSVKEY (he); 607 SV *sv = HeSVKEY (he);
519 STRLEN len; 608 STRLEN len;
520 char *str; 609 char *str;
521 610
522 SvGETMAGIC (sv); 611 SvGETMAGIC (sv);
523 str = SvPV (sv, len); 612 str = SvPV (sv, len);
524 613
525 encode_str (enc, str, len, SvUTF8 (sv)); 614 encode_str (enc, str, len, SvUTF8 (sv));
526 } 615 }
592 } 681 }
593 682
594 if (count) 683 if (count)
595 { 684 {
596 int i, fast = 1; 685 int i, fast = 1;
597#if defined(__BORLANDC__) || defined(_MSC_VER) 686 HE *hes_stack [STACK_HES];
598 HE **hes = _alloca (count * sizeof (HE)); 687 HE **hes = hes_stack;
599#else 688
600 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 689 // allocate larger arrays on the heap
601#endif 690 if (count > STACK_HES)
691 {
692 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
693 hes = (HE **)SvPVX (sv);
694 }
602 695
603 i = 0; 696 i = 0;
604 while ((he = hv_iternext (hv))) 697 while ((he = hv_iternext (hv)))
605 { 698 {
606 hes [i++] = he; 699 hes [i++] = he;
675// encode objects, arrays and special \0=false and \1=true values. 768// encode objects, arrays and special \0=false and \1=true values.
676static void 769static void
677encode_rv (enc_t *enc, SV *sv) 770encode_rv (enc_t *enc, SV *sv)
678{ 771{
679 svtype svt; 772 svtype svt;
773 GV *method;
680 774
681 SvGETMAGIC (sv); 775 SvGETMAGIC (sv);
682 svt = SvTYPE (sv); 776 svt = SvTYPE (sv);
683 777
684 if (expect_false (SvOBJECT (sv))) 778 if (expect_false (SvOBJECT (sv)))
685 { 779 {
686 HV *stash = !JSON_SLOW || json_boolean_stash 780 HV *stash = SvSTASH (sv);
687 ? json_boolean_stash
688 : gv_stashpv ("JSON::XS::Boolean", 1);
689 781
690 if (SvSTASH (sv) == stash) 782 if (stash == bool_stash)
691 { 783 {
692 if (SvIV (sv))
693 encode_str (enc, "true", 4, 0); 784 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
694 else
695 encode_str (enc, "false", 5, 0); 785 else encode_str (enc, "false", 5, 0);
696 } 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);
697 else 854 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", 855 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)))); 856 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
744 }
745 } 857 }
746 else if (svt == SVt_PVHV) 858 else if (svt == SVt_PVHV)
747 encode_hv (enc, (HV *)sv); 859 encode_hv (enc, (HV *)sv);
748 else if (svt == SVt_PVAV) 860 else if (svt == SVt_PVAV)
749 encode_av (enc, (AV *)sv); 861 encode_av (enc, (AV *)sv);
750 else if (svt < SVt_PVAV) 862 else if (svt < SVt_PVAV)
751 { 863 {
752 STRLEN len = 0; 864 int bool_type = ref_bool_type (sv);
753 char *pv = svt ? SvPV (sv, len) : 0;
754 865
755 if (len == 1 && *pv == '1') 866 if (bool_type == 1)
756 encode_str (enc, "true", 4, 0); 867 encode_str (enc, "true", 4, 0);
757 else if (len == 1 && *pv == '0') 868 else if (bool_type == 0)
758 encode_str (enc, "false", 5, 0); 869 encode_str (enc, "false", 5, 0);
759 else if (enc->json.flags & F_ALLOW_UNKNOWN) 870 else if (enc->json.flags & F_ALLOW_UNKNOWN)
760 encode_str (enc, "null", 4, 0); 871 encode_str (enc, "null", 4, 0);
761 else 872 else
762 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",
825 } 936 }
826 else 937 else
827 { 938 {
828 // large integer, use the (rather slow) snprintf way. 939 // large integer, use the (rather slow) snprintf way.
829 need (enc, IVUV_MAXCHARS); 940 need (enc, IVUV_MAXCHARS);
830 enc->cur += 941 enc->cur +=
831 SvIsUV(sv) 942 SvIsUV(sv)
832 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 943 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
833 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 944 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
834 } 945 }
835 } 946 }
836 else if (SvROK (sv)) 947 else if (SvROK (sv))
837 encode_rv (enc, SvRV (sv)); 948 encode_rv (enc, SvRV (sv));
838 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 949 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
839 encode_str (enc, "null", 4, 0); 950 encode_str (enc, "null", 4, 0);
840 else 951 else
841 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",
842 SvPV_nolen (sv), SvFLAGS (sv)); 953 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
843} 954}
844 955
845static SV * 956static SV *
846encode_json (SV *scalar, JSON *json) 957encode_json (SV *scalar, JSON *json)
847{ 958{
848 enc_t enc; 959 enc_t enc;
849 960
850 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 961 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)"); 962 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
852 963
853 enc.json = *json; 964 enc.json = *json;
854 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 965 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
855 enc.cur = SvPVX (enc.sv); 966 enc.cur = SvPVX (enc.sv);
1062 *cur++ = *dec_cur++; 1173 *cur++ = *dec_cur++;
1063 while (--clen); 1174 while (--clen);
1064 1175
1065 utf8 = 1; 1176 utf8 = 1;
1066 } 1177 }
1178 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1179 *cur++ = ch;
1067 else 1180 else
1068 { 1181 {
1069 --dec_cur; 1182 --dec_cur;
1070 1183
1071 if (!ch) 1184 if (!ch)
1081 1194
1082 if (sv) 1195 if (sv)
1083 { 1196 {
1084 STRLEN cur = SvCUR (sv); 1197 STRLEN cur = SvCUR (sv);
1085 1198
1086 if (SvLEN (sv) <= cur + len) 1199 if (SvLEN (sv) - cur <= len)
1087 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1200 json_sv_grow (sv, cur, len);
1088 1201
1089 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1202 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
1090 SvCUR_set (sv, SvCUR (sv) + len); 1203 SvCUR_set (sv, SvCUR (sv) + len);
1091 } 1204 }
1092 else 1205 else
1259 if (*dec->cur == ']') 1372 if (*dec->cur == ']')
1260 { 1373 {
1261 ++dec->cur; 1374 ++dec->cur;
1262 break; 1375 break;
1263 } 1376 }
1264 1377
1265 if (*dec->cur != ',') 1378 if (*dec->cur != ',')
1266 ERR (", or ] expected while parsing array"); 1379 ERR (", or ] expected while parsing array");
1267 1380
1268 ++dec->cur; 1381 ++dec->cur;
1269 1382
1393 1506
1394 hv_iterinit (hv); 1507 hv_iterinit (hv);
1395 he = hv_iternext (hv); 1508 he = hv_iternext (hv);
1396 hv_iterinit (hv); 1509 hv_iterinit (hv);
1397 1510
1398 // the next line creates a mortal sv each time its called. 1511 // the next line creates a mortal sv each time it's called.
1399 // might want to optimise this for common cases. 1512 // might want to optimise this for common cases.
1400 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);
1401 1514
1402 if (cb) 1515 if (cb)
1403 { 1516 {
1404 dSP; 1517 dSP;
1405 int count; 1518 int count;
1406 1519
1407 ENTER; SAVETMPS; PUSHMARK (SP); 1520 ENTER; SAVETMPS;
1521 SAVESTACK_POS ();
1522 PUSHMARK (SP);
1408 XPUSHs (HeVAL (he)); 1523 XPUSHs (HeVAL (he));
1409 sv_2mortal (sv); 1524 sv_2mortal (sv);
1410 1525
1411 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1526 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1412 1527
1425 if (dec->json.cb_object) 1540 if (dec->json.cb_object)
1426 { 1541 {
1427 dSP; 1542 dSP;
1428 int count; 1543 int count;
1429 1544
1430 ENTER; SAVETMPS; PUSHMARK (SP); 1545 ENTER; SAVETMPS;
1546 SAVESTACK_POS ();
1547 PUSHMARK (SP);
1431 XPUSHs (sv_2mortal (sv)); 1548 XPUSHs (sv_2mortal (sv));
1432 1549
1433 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1550 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1434 1551
1435 if (count == 1) 1552 if (count == 1)
1451 DEC_DEC_DEPTH; 1568 DEC_DEC_DEPTH;
1452 return 0; 1569 return 0;
1453} 1570}
1454 1571
1455static 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 *
1456decode_sv (dec_t *dec) 1656decode_sv (dec_t *dec)
1457{ 1657{
1458 // the beauty of JSON: you need exactly one character lookahead 1658 // the beauty of JSON: you need exactly one character lookahead
1459 // to parse everything. 1659 // to parse everything.
1460 switch (*dec->cur) 1660 switch (*dec->cur)
1461 { 1661 {
1462 case '"': ++dec->cur; return decode_str (dec); 1662 case '"': ++dec->cur; return decode_str (dec);
1463 case '[': ++dec->cur; return decode_av (dec); 1663 case '[': ++dec->cur; return decode_av (dec);
1464 case '{': ++dec->cur; return decode_hv (dec); 1664 case '{': ++dec->cur; return decode_hv (dec);
1665 case '(': return decode_tag (dec);
1465 1666
1466 case '-': 1667 case '-':
1467 case '0': case '1': case '2': case '3': case '4': 1668 case '0': case '1': case '2': case '3': case '4':
1468 case '5': case '6': case '7': case '8': case '9': 1669 case '5': case '6': case '7': case '8': case '9':
1469 return decode_num (dec); 1670 return decode_num (dec);
1470 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
1471 case 't': 1687 case 't':
1472 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1688 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1473 { 1689 {
1474 dec->cur += 4; 1690 dec->cur += 4;
1475#if JSON_SLOW 1691
1476 json_true = get_bool ("JSON::XS::true"); 1692 if (expect_false (!dec->json.v_true))
1477#endif 1693 dec->json.v_true = GET_BOOL (true);
1694
1478 return newSVsv (json_true); 1695 return newSVsv (dec->json.v_true);
1479 } 1696 }
1480 else 1697 else
1481 ERR ("'true' expected"); 1698 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 1699
1497 break; 1700 break;
1498 1701
1499 case 'n': 1702 case 'n':
1500 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1703 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
1506 ERR ("'null' expected"); 1709 ERR ("'null' expected");
1507 1710
1508 break; 1711 break;
1509 1712
1510 default: 1713 default:
1511 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1714 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1512 break; 1715 break;
1513 } 1716 }
1514 1717
1515fail: 1718fail:
1516 return 0; 1719 return 0;
1517} 1720}
1518 1721
1519static SV * 1722static SV *
1520decode_json (SV *string, JSON *json, char **offset_return) 1723decode_json (SV *string, JSON *json, STRLEN *offset_return)
1521{ 1724{
1522 dec_t dec; 1725 dec_t dec;
1523 SV *sv; 1726 SV *sv;
1524 1727
1525 /* work around bugs in 5.10 where manipulating magic values 1728 /* work around bugs in 5.10 where manipulating magic values
1526 * will perl ignore the magic in subsequent accesses. 1729 * makes perl ignore the magic in subsequent accesses.
1527 * also make a copy of non-PV values, to get them into a clean 1730 * 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). 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.
1529 */ 1735 */
1530 /*SvGETMAGIC (string);*/ 1736 /*SvGETMAGIC (string);*/
1531 if (SvMAGICAL (string) || !SvPOK (string)) 1737 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1532 string = sv_2mortal (newSVsv (string)); 1738 string = sv_2mortal (newSVsv (string));
1533 1739
1534 SvUPGRADE (string, SVt_PV); 1740 SvUPGRADE (string, SVt_PV);
1535 1741
1536 /* 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
1575 1781
1576 decode_ws (&dec); 1782 decode_ws (&dec);
1577 sv = decode_sv (&dec); 1783 sv = decode_sv (&dec);
1578 1784
1579 if (offset_return) 1785 if (offset_return)
1580 *offset_return = dec.cur; 1786 *offset_return = dec.cur - SvPVX (string);
1581 1787 else if (sv)
1582 if (!(offset_return || !sv))
1583 { 1788 {
1584 // check for trailing garbage 1789 // check for trailing garbage
1585 decode_ws (&dec); 1790 decode_ws (&dec);
1586 1791
1587 if (*dec.cur) 1792 if (*dec.cur)
1605 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);
1606 LEAVE; 1811 LEAVE;
1607 1812
1608 croak ("%s, at character offset %d (before \"%s\")", 1813 croak ("%s, at character offset %d (before \"%s\")",
1609 dec.err, 1814 dec.err,
1610 ptr_to_index (string, dec.cur), 1815 (int)ptr_to_index (string, dec.cur),
1611 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1816 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1612 } 1817 }
1613 1818
1614 sv = sv_2mortal (sv); 1819 sv = sv_2mortal (sv);
1615 1820
1616 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1821 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)"); 1822 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1618 1823
1619 return sv; 1824 return sv;
1620} 1825}
1621 1826
1743 self->incr_mode = INCR_M_STR; 1948 self->incr_mode = INCR_M_STR;
1744 goto incr_m_str; 1949 goto incr_m_str;
1745 1950
1746 case '[': 1951 case '[':
1747 case '{': 1952 case '{':
1953 case '(':
1748 if (++self->incr_nest > self->max_depth) 1954 if (++self->incr_nest > self->max_depth)
1749 croak (ERR_NESTING_EXCEEDED); 1955 croak (ERR_NESTING_EXCEEDED);
1750 break; 1956 break;
1751 1957
1752 case ']': 1958 case ']':
1753 case '}': 1959 case '}':
1754 if (--self->incr_nest <= 0) 1960 if (--self->incr_nest <= 0)
1755 goto interrupt; 1961 goto interrupt;
1962 break;
1963
1964 case ')':
1965 --self->incr_nest;
1756 break; 1966 break;
1757 1967
1758 case '#': 1968 case '#':
1759 self->incr_mode = INCR_M_C1; 1969 self->incr_mode = INCR_M_C1;
1760 goto incr_m_c; 1970 goto incr_m_c;
1786 i >= '0' && i <= '9' ? i - '0' 1996 i >= '0' && i <= '9' ? i - '0'
1787 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1997 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1788 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1998 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1789 : -1; 1999 : -1;
1790 2000
1791 json_stash = gv_stashpv ("JSON::XS" , 1); 2001 json_stash = gv_stashpv ("JSON::XS" , 1);
1792 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2002 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"); 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);
1796 2008
1797 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 */
1798} 2010}
1799 2011
1800PROTOTYPES: DISABLE 2012PROTOTYPES: DISABLE
1801 2013
1802void CLONE (...) 2014void CLONE (...)
1803 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.
1804 json_stash = 0; 2019 json_stash = 0;
1805 json_boolean_stash = 0; 2020 bool_stash = 0;
2021 bool_false = 0;
2022 bool_true = 0;
1806 2023
1807void new (char *klass) 2024void new (char *klass)
1808 PPCODE: 2025 PPCODE:
1809{ 2026{
1810 SV *pv = NEWSV (0, sizeof (JSON)); 2027 SV *pv = NEWSV (0, sizeof (JSON));
1811 SvPOK_only (pv); 2028 SvPOK_only (pv);
1812 json_init ((JSON *)SvPVX (pv)); 2029 json_init ((JSON *)SvPVX (pv));
1813 XPUSHs (sv_2mortal (sv_bless ( 2030 XPUSHs (sv_2mortal (sv_bless (
1814 newRV_noinc (pv), 2031 newRV_noinc (pv),
1815 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2032 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1816 ))); 2033 )));
1817} 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 }
1818 2050
1819void ascii (JSON *self, int enable = 1) 2051void ascii (JSON *self, int enable = 1)
1820 ALIAS: 2052 ALIAS:
1821 ascii = F_ASCII 2053 ascii = F_ASCII
1822 latin1 = F_LATIN1 2054 latin1 = F_LATIN1
1830 shrink = F_SHRINK 2062 shrink = F_SHRINK
1831 allow_blessed = F_ALLOW_BLESSED 2063 allow_blessed = F_ALLOW_BLESSED
1832 convert_blessed = F_CONV_BLESSED 2064 convert_blessed = F_CONV_BLESSED
1833 relaxed = F_RELAXED 2065 relaxed = F_RELAXED
1834 allow_unknown = F_ALLOW_UNKNOWN 2066 allow_unknown = F_ALLOW_UNKNOWN
2067 allow_tags = F_ALLOW_TAGS
1835 PPCODE: 2068 PPCODE:
1836{ 2069{
1837 if (enable) 2070 if (enable)
1838 self->flags |= ix; 2071 self->flags |= ix;
1839 else 2072 else
1855 get_shrink = F_SHRINK 2088 get_shrink = F_SHRINK
1856 get_allow_blessed = F_ALLOW_BLESSED 2089 get_allow_blessed = F_ALLOW_BLESSED
1857 get_convert_blessed = F_CONV_BLESSED 2090 get_convert_blessed = F_CONV_BLESSED
1858 get_relaxed = F_RELAXED 2091 get_relaxed = F_RELAXED
1859 get_allow_unknown = F_ALLOW_UNKNOWN 2092 get_allow_unknown = F_ALLOW_UNKNOWN
2093 get_allow_tags = F_ALLOW_TAGS
1860 PPCODE: 2094 PPCODE:
1861 XPUSHs (boolSV (self->flags & ix)); 2095 XPUSHs (boolSV (self->flags & ix));
1862 2096
1863void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2097void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1864 PPCODE: 2098 PPCODE:
1892} 2126}
1893 2127
1894void 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)
1895 PPCODE: 2129 PPCODE:
1896{ 2130{
1897 if (!self->cb_sk_object) 2131 if (!self->cb_sk_object)
1898 self->cb_sk_object = newHV (); 2132 self->cb_sk_object = newHV ();
1899 2133
1900 if (SvOK (cb)) 2134 if (SvOK (cb))
1901 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2135 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1902 else 2136 else
1913 XPUSHs (ST (0)); 2147 XPUSHs (ST (0));
1914} 2148}
1915 2149
1916void encode (JSON *self, SV *scalar) 2150void encode (JSON *self, SV *scalar)
1917 PPCODE: 2151 PPCODE:
1918 XPUSHs (encode_json (scalar, self)); 2152 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2153 XPUSHs (scalar);
1919 2154
1920void decode (JSON *self, SV *jsonstr) 2155void decode (JSON *self, SV *jsonstr)
1921 PPCODE: 2156 PPCODE:
1922 XPUSHs (decode_json (jsonstr, self, 0)); 2157 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2158 XPUSHs (jsonstr);
1923 2159
1924void decode_prefix (JSON *self, SV *jsonstr) 2160void decode_prefix (JSON *self, SV *jsonstr)
1925 PPCODE: 2161 PPCODE:
1926{ 2162{
1927 char *offset; 2163 SV *sv;
2164 STRLEN offset;
2165 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1928 EXTEND (SP, 2); 2166 EXTEND (SP, 2);
1929 PUSHs (decode_json (jsonstr, self, &offset)); 2167 PUSHs (sv);
1930 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2168 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1931} 2169}
1932 2170
1933void incr_parse (JSON *self, SV *jsonstr = 0) 2171void incr_parse (JSON *self, SV *jsonstr = 0)
1934 PPCODE: 2172 PPCODE:
1935{ 2173{
1969 { 2207 {
1970 STRLEN len; 2208 STRLEN len;
1971 const char *str = SvPV (jsonstr, len); 2209 const char *str = SvPV (jsonstr, len);
1972 STRLEN cur = SvCUR (self->incr_text); 2210 STRLEN cur = SvCUR (self->incr_text);
1973 2211
1974 if (SvLEN (self->incr_text) <= cur + len) 2212 if (SvLEN (self->incr_text) - cur <= len)
1975 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2213 json_sv_grow (self->incr_text, cur, len);
1976 2214
1977 Move (str, SvEND (self->incr_text), len, char); 2215 Move (str, SvEND (self->incr_text), len, char);
1978 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2216 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 2217 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1980 } 2218 }
1981 } 2219 }
1982 2220
1983 if (GIMME_V != G_VOID) 2221 if (GIMME_V != G_VOID)
1984 do 2222 do
1985 { 2223 {
2224 SV *sv;
1986 char *offset; 2225 STRLEN offset;
1987 2226
1988 if (!INCR_DONE (self)) 2227 if (!INCR_DONE (self))
1989 { 2228 {
1990 incr_parse (self); 2229 incr_parse (self);
1991 2230
1994 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2233 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1995 2234
1996 if (!INCR_DONE (self)) 2235 if (!INCR_DONE (self))
1997 { 2236 {
1998 // as an optimisation, do not accumulate white space in the incr buffer 2237 // as an optimisation, do not accumulate white space in the incr buffer
1999 if (self->incr_mode == INCR_M_WS) 2238 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2239 {
2240 self->incr_pos = 0;
2000 SvCUR_set (self->incr_text, 0); 2241 SvCUR_set (self->incr_text, 0);
2242 }
2001 2243
2002 break; 2244 break;
2003 } 2245 }
2004 } 2246 }
2005 2247
2006 XPUSHs (decode_json (self->incr_text, self, &offset)); 2248 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2249 XPUSHs (sv);
2007 2250
2008 self->incr_pos -= offset - SvPVX (self->incr_text); 2251 self->incr_pos -= offset;
2009 self->incr_nest = 0; 2252 self->incr_nest = 0;
2010 self->incr_mode = 0; 2253 self->incr_mode = 0;
2011 2254
2012 sv_chop (self->incr_text, offset); 2255 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2013 } 2256 }
2014 while (GIMME_V == G_ARRAY); 2257 while (GIMME_V == G_ARRAY);
2015} 2258}
2016 2259
2017SV *incr_text (JSON *self) 2260SV *incr_text (JSON *self)
2048 self->incr_mode = 0; 2291 self->incr_mode = 0;
2049} 2292}
2050 2293
2051void DESTROY (JSON *self) 2294void DESTROY (JSON *self)
2052 CODE: 2295 CODE:
2296 SvREFCNT_dec (self->v_false);
2297 SvREFCNT_dec (self->v_true);
2053 SvREFCNT_dec (self->cb_sk_object); 2298 SvREFCNT_dec (self->cb_sk_object);
2054 SvREFCNT_dec (self->cb_object); 2299 SvREFCNT_dec (self->cb_object);
2055 SvREFCNT_dec (self->incr_text); 2300 SvREFCNT_dec (self->incr_text);
2056 2301
2057PROTOTYPES: ENABLE 2302PROTOTYPES: ENABLE
2058 2303
2059void encode_json (SV *scalar) 2304void encode_json (SV *scalar)
2060 ALIAS:
2061 to_json_ = 0
2062 encode_json = F_UTF8
2063 PPCODE: 2305 PPCODE:
2064{ 2306{
2065 JSON json; 2307 JSON json;
2066 json_init (&json); 2308 json_init (&json);
2067 json.flags |= ix; 2309 json.flags |= F_UTF8;
2068 XPUSHs (encode_json (scalar, &json)); 2310 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2311 XPUSHs (scalar);
2069} 2312}
2070 2313
2071void decode_json (SV *jsonstr) 2314void decode_json (SV *jsonstr)
2072 ALIAS:
2073 from_json_ = 0
2074 decode_json = F_UTF8
2075 PPCODE: 2315 PPCODE:
2076{ 2316{
2077 JSON json; 2317 JSON json;
2078 json_init (&json); 2318 json_init (&json);
2079 json.flags |= ix; 2319 json.flags |= F_UTF8;
2080 XPUSHs (decode_json (jsonstr, &json, 0)); 2320 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2321 XPUSHs (jsonstr);
2081} 2322}
2082 2323

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines