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.98 by root, Fri Jul 17 14:33:45 2009 UTC vs.
Revision 1.130 by root, Sat Nov 26 06:09:29 2016 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// guarentees, 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
20#endif 21#endif
21 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
32#endif
33
34// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 36
24#define F_ASCII 0x00000001UL 37#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 38#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 39#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 40#define F_INDENT 0x00000008UL
… …
32#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
36#define F_ALLOW_UNKNOWN 0x00002000UL 49#define F_ALLOW_UNKNOWN 0x00002000UL
50#define F_ALLOW_TAGS 0x00004000UL
37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
38 52
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40 54
41#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 32 // initial scalar size to be allocated
42#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
43 57
44#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
59
60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
45 61
46#define SB do { 62#define SB do {
47#define SE } while (0) 63#define SE } while (0)
48 64
49#if __GNUC__ >= 3 65#if __GNUC__ >= 3
… …
64#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?)"
65 81
66#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
67# define JSON_SLOW 1 83# define JSON_SLOW 1
68# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 84# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
85# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
69#else 86#else
70# define JSON_SLOW 0 87# define JSON_SLOW 0
71# define JSON_STASH json_stash 88# define JSON_STASH json_stash
89# define BOOL_STASH bool_stash
72#endif 90#endif
73 91
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
75static 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_true, *bool_false, *sv_json;
76 97
77enum { 98enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 99 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 100 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 101 INCR_M_BS, // inside backslash
102 INCR_M_C0, // inside comment in initial whitespace sequence
103 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 104 INCR_M_JSON // outside anything, count nesting
82}; 105};
83 106
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 107#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 108
… …
185 ? utf8_distance (offset, SvPVX (sv)) 208 ? utf8_distance (offset, SvPVX (sv))
186 : offset - SvPVX (sv); 209 : offset - SvPVX (sv);
187} 210}
188 211
189///////////////////////////////////////////////////////////////////////////// 212/////////////////////////////////////////////////////////////////////////////
213// fp hell
214
215// scan a group of digits, and a trailing exponent
216static void
217json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
218{
219 UV uaccum = 0;
220 int eaccum = 0;
221
222 // if we recurse too deep, skip all remaining digits
223 // to avoid a stack overflow attack
224 if (expect_false (--maxdepth <= 0))
225 while (((U8)*s - '0') < 10)
226 ++s;
227
228 for (;;)
229 {
230 U8 dig = (U8)*s - '0';
231
232 if (expect_false (dig >= 10))
233 {
234 if (dig == (U8)((U8)'.' - (U8)'0'))
235 {
236 ++s;
237 json_atof_scan1 (s, accum, expo, 1, maxdepth);
238 }
239 else if ((dig | ' ') == 'e' - '0')
240 {
241 int exp2 = 0;
242 int neg = 0;
243
244 ++s;
245
246 if (*s == '-')
247 {
248 ++s;
249 neg = 1;
250 }
251 else if (*s == '+')
252 ++s;
253
254 while ((dig = (U8)*s - '0') < 10)
255 exp2 = exp2 * 10 + *s++ - '0';
256
257 *expo += neg ? -exp2 : exp2;
258 }
259
260 break;
261 }
262
263 ++s;
264
265 uaccum = uaccum * 10 + dig;
266 ++eaccum;
267
268 // if we have too many digits, then recurse for more
269 // we actually do this for rather few digits
270 if (uaccum >= (UV_MAX - 9) / 10)
271 {
272 if (postdp) *expo -= eaccum;
273 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
274 if (postdp) *expo += eaccum;
275
276 break;
277 }
278 }
279
280 // this relies greatly on the quality of the pow ()
281 // implementation of the platform, but a good
282 // implementation is hard to beat.
283 // (IEEE 754 conformant ones are required to be exact)
284 if (postdp) *expo -= eaccum;
285 *accum += uaccum * Perl_pow (10., *expo);
286 *expo += eaccum;
287}
288
289static NV
290json_atof (const char *s)
291{
292 NV accum = 0.;
293 int expo = 0;
294 int neg = 0;
295
296 if (*s == '-')
297 {
298 ++s;
299 neg = 1;
300 }
301
302 // a recursion depth of ten gives us >>500 bits
303 json_atof_scan1 (s, &accum, &expo, 0, 10);
304
305 return neg ? -accum : accum;
306}
307
308// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
309static int
310ref_bool_type (SV *sv)
311{
312 svtype svt = SvTYPE (sv);
313
314 if (svt < SVt_PVAV)
315 {
316 STRLEN len = 0;
317 char *pv = svt ? SvPV (sv, len) : 0;
318
319 if (len == 1)
320 if (*pv == '1')
321 return 1;
322 else if (*pv == '0')
323 return 0;
324 }
325
326 return -1;
327}
328
329// returns whether scalar is not a reference in the sense of allow_nonref
330static int
331json_nonref (SV *scalar)
332{
333 if (!SvROK (scalar))
334 return 1;
335
336 scalar = SvRV (scalar);
337
338 if (SvTYPE (scalar) >= SVt_PVMG)
339 {
340 if (SvSTASH (scalar) == bool_stash)
341 return 1;
342
343 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
344 return 1;
345 }
346
347 return 0;
348}
349
350/////////////////////////////////////////////////////////////////////////////
190// encoder 351// encoder
191 352
192// structure used for encoding JSON 353// structure used for encoding JSON
193typedef struct 354typedef struct
194{ 355{
… …
201} enc_t; 362} enc_t;
202 363
203INLINE void 364INLINE void
204need (enc_t *enc, STRLEN len) 365need (enc_t *enc, STRLEN len)
205{ 366{
206 if (expect_false (enc->cur + len >= enc->end)) 367 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
207 { 368 {
208 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 369 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
209 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 370 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
210 enc->cur = SvPVX (enc->sv) + cur; 371 enc->cur = SvPVX (enc->sv) + cur;
211 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 372 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
380 541
381 if (enc->indent >= enc->json.max_depth) 542 if (enc->indent >= enc->json.max_depth)
382 croak (ERR_NESTING_EXCEEDED); 543 croak (ERR_NESTING_EXCEEDED);
383 544
384 encode_ch (enc, '['); 545 encode_ch (enc, '[');
385 546
386 if (len >= 0) 547 if (len >= 0)
387 { 548 {
388 encode_nl (enc); ++enc->indent; 549 encode_nl (enc); ++enc->indent;
389 550
390 for (i = 0; i <= len; ++i) 551 for (i = 0; i <= len; ++i)
… …
402 encode_comma (enc); 563 encode_comma (enc);
403 } 564 }
404 565
405 encode_nl (enc); --enc->indent; encode_indent (enc); 566 encode_nl (enc); --enc->indent; encode_indent (enc);
406 } 567 }
407 568
408 encode_ch (enc, ']'); 569 encode_ch (enc, ']');
409} 570}
410 571
411static void 572static void
412encode_hk (enc_t *enc, HE *he) 573encode_hk (enc_t *enc, HE *he)
… …
416 if (HeKLEN (he) == HEf_SVKEY) 577 if (HeKLEN (he) == HEf_SVKEY)
417 { 578 {
418 SV *sv = HeSVKEY (he); 579 SV *sv = HeSVKEY (he);
419 STRLEN len; 580 STRLEN len;
420 char *str; 581 char *str;
421 582
422 SvGETMAGIC (sv); 583 SvGETMAGIC (sv);
423 str = SvPV (sv, len); 584 str = SvPV (sv, len);
424 585
425 encode_str (enc, str, len, SvUTF8 (sv)); 586 encode_str (enc, str, len, SvUTF8 (sv));
426 } 587 }
… …
492 } 653 }
493 654
494 if (count) 655 if (count)
495 { 656 {
496 int i, fast = 1; 657 int i, fast = 1;
497#if defined(__BORLANDC__) || defined(_MSC_VER) 658 HE *hes_stack [STACK_HES];
498 HE **hes = _alloca (count * sizeof (HE)); 659 HE **hes = hes_stack;
499#else 660
500 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 661 // allocate larger arrays on the heap
501#endif 662 if (count > STACK_HES)
663 {
664 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
665 hes = (HE **)SvPVX (sv);
666 }
502 667
503 i = 0; 668 i = 0;
504 while ((he = hv_iternext (hv))) 669 while ((he = hv_iternext (hv)))
505 { 670 {
506 hes [i++] = he; 671 hes [i++] = he;
… …
575// encode objects, arrays and special \0=false and \1=true values. 740// encode objects, arrays and special \0=false and \1=true values.
576static void 741static void
577encode_rv (enc_t *enc, SV *sv) 742encode_rv (enc_t *enc, SV *sv)
578{ 743{
579 svtype svt; 744 svtype svt;
745 GV *method;
580 746
581 SvGETMAGIC (sv); 747 SvGETMAGIC (sv);
582 svt = SvTYPE (sv); 748 svt = SvTYPE (sv);
583 749
584 if (expect_false (SvOBJECT (sv))) 750 if (expect_false (SvOBJECT (sv)))
585 { 751 {
586 HV *stash = !JSON_SLOW || json_boolean_stash 752 HV *stash = SvSTASH (sv);
587 ? json_boolean_stash
588 : gv_stashpv ("JSON::XS::Boolean", 1);
589 753
590 if (SvSTASH (sv) == stash) 754 if (stash == bool_stash)
591 { 755 {
592 if (SvIV (sv)) 756 if (SvIV (sv))
593 encode_str (enc, "true", 4, 0); 757 encode_str (enc, "true", 4, 0);
594 else 758 else
595 encode_str (enc, "false", 5, 0); 759 encode_str (enc, "false", 5, 0);
596 } 760 }
761 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
762 {
763 int count;
764 dSP;
765
766 ENTER; SAVETMPS;
767 SAVESTACK_POS ();
768 PUSHMARK (SP);
769 EXTEND (SP, 2);
770 // we re-bless the reference to get overload and other niceties right
771 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
772 PUSHs (sv_json);
773
774 PUTBACK;
775 count = call_sv ((SV *)GvCV (method), G_ARRAY);
776 SPAGAIN;
777
778 // catch this surprisingly common error
779 if (SvROK (TOPs) && SvRV (TOPs) == sv)
780 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
781
782 encode_ch (enc, '(');
783 encode_ch (enc, '"');
784 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
785 encode_ch (enc, '"');
786 encode_ch (enc, ')');
787 encode_ch (enc, '[');
788
789 while (count)
790 {
791 encode_sv (enc, SP[1 - count--]);
792
793 if (count)
794 encode_ch (enc, ',');
795 }
796
797 encode_ch (enc, ']');
798
799 FREETMPS; LEAVE;
800 }
801 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
802 {
803 dSP;
804
805 ENTER; SAVETMPS;
806 PUSHMARK (SP);
807 // we re-bless the reference to get overload and other niceties right
808 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
809
810 // calling with G_SCALAR ensures that we always get a 1 return value
811 PUTBACK;
812 call_sv ((SV *)GvCV (method), G_SCALAR);
813 SPAGAIN;
814
815 // catch this surprisingly common error
816 if (SvROK (TOPs) && SvRV (TOPs) == sv)
817 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
818
819 sv = POPs;
820 PUTBACK;
821
822 encode_sv (enc, sv);
823
824 FREETMPS; LEAVE;
825 }
826 else if (enc->json.flags & F_ALLOW_BLESSED)
827 encode_str (enc, "null", 4, 0);
597 else 828 else
598 {
599#if 0
600 if (0 && sv_derived_from (rv, "JSON::Literal"))
601 {
602 // not yet
603 }
604#endif
605 if (enc->json.flags & F_CONV_BLESSED)
606 {
607 // we re-bless the reference to get overload and other niceties right
608 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
609
610 if (to_json)
611 {
612 dSP;
613
614 ENTER; SAVETMPS; PUSHMARK (SP);
615 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
616
617 // calling with G_SCALAR ensures that we always get a 1 return value
618 PUTBACK;
619 call_sv ((SV *)GvCV (to_json), G_SCALAR);
620 SPAGAIN;
621
622 // catch this surprisingly common error
623 if (SvROK (TOPs) && SvRV (TOPs) == sv)
624 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
625
626 sv = POPs;
627 PUTBACK;
628
629 encode_sv (enc, sv);
630
631 FREETMPS; LEAVE;
632 }
633 else if (enc->json.flags & F_ALLOW_BLESSED)
634 encode_str (enc, "null", 4, 0);
635 else
636 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
637 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
638 }
639 else if (enc->json.flags & F_ALLOW_BLESSED)
640 encode_str (enc, "null", 4, 0);
641 else
642 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 829 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
643 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 830 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644 }
645 } 831 }
646 else if (svt == SVt_PVHV) 832 else if (svt == SVt_PVHV)
647 encode_hv (enc, (HV *)sv); 833 encode_hv (enc, (HV *)sv);
648 else if (svt == SVt_PVAV) 834 else if (svt == SVt_PVAV)
649 encode_av (enc, (AV *)sv); 835 encode_av (enc, (AV *)sv);
650 else if (svt < SVt_PVAV) 836 else if (svt < SVt_PVAV)
651 { 837 {
652 STRLEN len = 0; 838 int bool_type = ref_bool_type (sv);
653 char *pv = svt ? SvPV (sv, len) : 0;
654 839
655 if (len == 1 && *pv == '1') 840 if (bool_type == 1)
656 encode_str (enc, "true", 4, 0); 841 encode_str (enc, "true", 4, 0);
657 else if (len == 1 && *pv == '0') 842 else if (bool_type == 0)
658 encode_str (enc, "false", 5, 0); 843 encode_str (enc, "false", 5, 0);
659 else if (enc->json.flags & F_ALLOW_UNKNOWN) 844 else if (enc->json.flags & F_ALLOW_UNKNOWN)
660 encode_str (enc, "null", 4, 0); 845 encode_str (enc, "null", 4, 0);
661 else 846 else
662 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 847 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
… …
725 } 910 }
726 else 911 else
727 { 912 {
728 // large integer, use the (rather slow) snprintf way. 913 // large integer, use the (rather slow) snprintf way.
729 need (enc, IVUV_MAXCHARS); 914 need (enc, IVUV_MAXCHARS);
730 enc->cur += 915 enc->cur +=
731 SvIsUV(sv) 916 SvIsUV(sv)
732 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 917 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
733 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 918 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
734 } 919 }
735 } 920 }
736 else if (SvROK (sv)) 921 else if (SvROK (sv))
737 encode_rv (enc, SvRV (sv)); 922 encode_rv (enc, SvRV (sv));
738 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 923 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
739 encode_str (enc, "null", 4, 0); 924 encode_str (enc, "null", 4, 0);
740 else 925 else
741 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 926 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
742 SvPV_nolen (sv), SvFLAGS (sv)); 927 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
743} 928}
744 929
745static SV * 930static SV *
746encode_json (SV *scalar, JSON *json) 931encode_json (SV *scalar, JSON *json)
747{ 932{
748 enc_t enc; 933 enc_t enc;
749 934
750 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 935 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
751 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 936 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
752 937
753 enc.json = *json; 938 enc.json = *json;
754 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 939 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
755 enc.cur = SvPVX (enc.sv); 940 enc.cur = SvPVX (enc.sv);
… …
759 : enc.json.flags & F_LATIN1 ? 0x000100UL 944 : enc.json.flags & F_LATIN1 ? 0x000100UL
760 : 0x110000UL; 945 : 0x110000UL;
761 946
762 SvPOK_only (enc.sv); 947 SvPOK_only (enc.sv);
763 encode_sv (&enc, scalar); 948 encode_sv (&enc, scalar);
949 encode_nl (&enc);
764 950
765 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 951 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
766 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 952 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
767 953
768 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 954 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
948 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1134 else if (expect_true (ch >= 0x20 && ch < 0x80))
949 *cur++ = ch; 1135 *cur++ = ch;
950 else if (ch >= 0x80) 1136 else if (ch >= 0x80)
951 { 1137 {
952 STRLEN clen; 1138 STRLEN clen;
953 UV uch;
954 1139
955 --dec_cur; 1140 --dec_cur;
956 1141
957 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1142 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
958 if (clen == (STRLEN)-1) 1143 if (clen == (STRLEN)-1)
959 ERR ("malformed UTF-8 character in JSON string"); 1144 ERR ("malformed UTF-8 character in JSON string");
960 1145
961 do 1146 do
962 *cur++ = *dec_cur++; 1147 *cur++ = *dec_cur++;
963 while (--clen); 1148 while (--clen);
964 1149
965 utf8 = 1; 1150 utf8 = 1;
966 } 1151 }
1152 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1153 *cur++ = ch;
967 else 1154 else
968 { 1155 {
969 --dec_cur; 1156 --dec_cur;
970 1157
971 if (!ch) 1158 if (!ch)
… …
1116 } 1303 }
1117 1304
1118 len -= *start == '-' ? 1 : 0; 1305 len -= *start == '-' ? 1 : 0;
1119 1306
1120 // does not fit into IV or UV, try NV 1307 // does not fit into IV or UV, try NV
1121 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1308 if (len <= NV_DIG)
1122 #if defined (LDBL_DIG)
1123 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1124 #endif
1125 )
1126 // fits into NV without loss of precision 1309 // fits into NV without loss of precision
1127 return newSVnv (Atof (start)); 1310 return newSVnv (json_atof (start));
1128 1311
1129 // everything else fails, convert it to a string 1312 // everything else fails, convert it to a string
1130 return newSVpvn (start, dec->cur - start); 1313 return newSVpvn (start, dec->cur - start);
1131 } 1314 }
1132 1315
1133 // loss of precision here 1316 // loss of precision here
1134 return newSVnv (Atof (start)); 1317 return newSVnv (json_atof (start));
1135 1318
1136fail: 1319fail:
1137 return 0; 1320 return 0;
1138} 1321}
1139 1322
… …
1163 if (*dec->cur == ']') 1346 if (*dec->cur == ']')
1164 { 1347 {
1165 ++dec->cur; 1348 ++dec->cur;
1166 break; 1349 break;
1167 } 1350 }
1168 1351
1169 if (*dec->cur != ',') 1352 if (*dec->cur != ',')
1170 ERR (", or ] expected while parsing array"); 1353 ERR (", or ] expected while parsing array");
1171 1354
1172 ++dec->cur; 1355 ++dec->cur;
1173 1356
… …
1297 1480
1298 hv_iterinit (hv); 1481 hv_iterinit (hv);
1299 he = hv_iternext (hv); 1482 he = hv_iternext (hv);
1300 hv_iterinit (hv); 1483 hv_iterinit (hv);
1301 1484
1302 // the next line creates a mortal sv each time its called. 1485 // the next line creates a mortal sv each time it's called.
1303 // might want to optimise this for common cases. 1486 // might want to optimise this for common cases.
1304 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1487 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1305 1488
1306 if (cb) 1489 if (cb)
1307 { 1490 {
1308 dSP; 1491 dSP;
1309 int count; 1492 int count;
1310 1493
1311 ENTER; SAVETMPS; PUSHMARK (SP); 1494 ENTER; SAVETMPS;
1495 SAVESTACK_POS ();
1496 PUSHMARK (SP);
1312 XPUSHs (HeVAL (he)); 1497 XPUSHs (HeVAL (he));
1498 sv_2mortal (sv);
1313 1499
1314 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1500 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1315 1501
1316 if (count == 1) 1502 if (count == 1)
1317 { 1503 {
1318 sv = newSVsv (POPs); 1504 sv = newSVsv (POPs);
1319 FREETMPS; LEAVE; 1505 FREETMPS; LEAVE;
1320 return sv; 1506 return sv;
1321 } 1507 }
1322 1508
1509 SvREFCNT_inc (sv);
1323 FREETMPS; LEAVE; 1510 FREETMPS; LEAVE;
1324 } 1511 }
1325 } 1512 }
1326 1513
1327 if (dec->json.cb_object) 1514 if (dec->json.cb_object)
1328 { 1515 {
1329 dSP; 1516 dSP;
1330 int count; 1517 int count;
1331 1518
1332 ENTER; SAVETMPS; PUSHMARK (SP); 1519 ENTER; SAVETMPS;
1520 SAVESTACK_POS ();
1521 PUSHMARK (SP);
1333 XPUSHs (sv_2mortal (sv)); 1522 XPUSHs (sv_2mortal (sv));
1334 1523
1335 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1524 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1336 1525
1337 if (count == 1) 1526 if (count == 1)
… …
1353 DEC_DEC_DEPTH; 1542 DEC_DEC_DEPTH;
1354 return 0; 1543 return 0;
1355} 1544}
1356 1545
1357static SV * 1546static SV *
1547decode_tag (dec_t *dec)
1548{
1549 SV *tag = 0;
1550 SV *val = 0;
1551
1552 if (!(dec->json.flags & F_ALLOW_TAGS))
1553 ERR ("malformed JSON string, neither array, object, number, string or atom");
1554
1555 ++dec->cur;
1556
1557 decode_ws (dec);
1558
1559 tag = decode_sv (dec);
1560 if (!tag)
1561 goto fail;
1562
1563 if (!SvPOK (tag))
1564 ERR ("malformed JSON string, (tag) must be a string");
1565
1566 decode_ws (dec);
1567
1568 if (*dec->cur != ')')
1569 ERR (") expected after tag");
1570
1571 ++dec->cur;
1572
1573 decode_ws (dec);
1574
1575 val = decode_sv (dec);
1576 if (!val)
1577 goto fail;
1578
1579 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1580 ERR ("malformed JSON string, tag value must be an array");
1581
1582 {
1583 AV *av = (AV *)SvRV (val);
1584 int i, len = av_len (av) + 1;
1585 HV *stash = gv_stashsv (tag, 0);
1586 SV *sv;
1587
1588 if (!stash)
1589 ERR ("cannot decode perl-object (package does not exist)");
1590
1591 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1592
1593 if (!method)
1594 ERR ("cannot decode perl-object (package does not have a THAW method)");
1595
1596 dSP;
1597
1598 ENTER; SAVETMPS;
1599 PUSHMARK (SP);
1600 EXTEND (SP, len + 2);
1601 // we re-bless the reference to get overload and other niceties right
1602 PUSHs (tag);
1603 PUSHs (sv_json);
1604
1605 for (i = 0; i < len; ++i)
1606 PUSHs (*av_fetch (av, i, 1));
1607
1608 PUTBACK;
1609 call_sv ((SV *)GvCV (method), G_SCALAR);
1610 SPAGAIN;
1611
1612 SvREFCNT_dec (tag);
1613 SvREFCNT_dec (val);
1614 sv = SvREFCNT_inc (POPs);
1615
1616 PUTBACK;
1617
1618 FREETMPS; LEAVE;
1619
1620 return sv;
1621 }
1622
1623fail:
1624 SvREFCNT_dec (tag);
1625 SvREFCNT_dec (val);
1626 return 0;
1627}
1628
1629static SV *
1358decode_sv (dec_t *dec) 1630decode_sv (dec_t *dec)
1359{ 1631{
1360 // the beauty of JSON: you need exactly one character lookahead 1632 // the beauty of JSON: you need exactly one character lookahead
1361 // to parse everything. 1633 // to parse everything.
1362 switch (*dec->cur) 1634 switch (*dec->cur)
1363 { 1635 {
1364 case '"': ++dec->cur; return decode_str (dec); 1636 case '"': ++dec->cur; return decode_str (dec);
1365 case '[': ++dec->cur; return decode_av (dec); 1637 case '[': ++dec->cur; return decode_av (dec);
1366 case '{': ++dec->cur; return decode_hv (dec); 1638 case '{': ++dec->cur; return decode_hv (dec);
1639 case '(': return decode_tag (dec);
1367 1640
1368 case '-': 1641 case '-':
1369 case '0': case '1': case '2': case '3': case '4': 1642 case '0': case '1': case '2': case '3': case '4':
1370 case '5': case '6': case '7': case '8': case '9': 1643 case '5': case '6': case '7': case '8': case '9':
1371 return decode_num (dec); 1644 return decode_num (dec);
… …
1373 case 't': 1646 case 't':
1374 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1647 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1375 { 1648 {
1376 dec->cur += 4; 1649 dec->cur += 4;
1377#if JSON_SLOW 1650#if JSON_SLOW
1378 json_true = get_bool ("JSON::XS::true"); 1651 bool_true = get_bool ("Types::Serialiser::true");
1379#endif 1652#endif
1380 return newSVsv (json_true); 1653 return newSVsv (bool_true);
1381 } 1654 }
1382 else 1655 else
1383 ERR ("'true' expected"); 1656 ERR ("'true' expected");
1384 1657
1385 break; 1658 break;
… …
1387 case 'f': 1660 case 'f':
1388 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1661 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1389 { 1662 {
1390 dec->cur += 5; 1663 dec->cur += 5;
1391#if JSON_SLOW 1664#if JSON_SLOW
1392 json_false = get_bool ("JSON::XS::false"); 1665 bool_false = get_bool ("Types::Serialiser::false");
1393#endif 1666#endif
1394 return newSVsv (json_false); 1667 return newSVsv (bool_false);
1395 } 1668 }
1396 else 1669 else
1397 ERR ("'false' expected"); 1670 ERR ("'false' expected");
1398 1671
1399 break; 1672 break;
… …
1408 ERR ("'null' expected"); 1681 ERR ("'null' expected");
1409 1682
1410 break; 1683 break;
1411 1684
1412 default: 1685 default:
1413 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1686 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1414 break; 1687 break;
1415 } 1688 }
1416 1689
1417fail: 1690fail:
1418 return 0; 1691 return 0;
1419} 1692}
1420 1693
1421static SV * 1694static SV *
1422decode_json (SV *string, JSON *json, char **offset_return) 1695decode_json (SV *string, JSON *json, STRLEN *offset_return)
1423{ 1696{
1424 dec_t dec; 1697 dec_t dec;
1425 SV *sv; 1698 SV *sv;
1426 1699
1427 /* work around bugs in 5.10 where manipulating magic values 1700 /* work around bugs in 5.10 where manipulating magic values
1428 * will perl ignore the magic in subsequent accesses 1701 * makes perl ignore the magic in subsequent accesses.
1702 * also make a copy of non-PV values, to get them into a clean
1703 * state (SvPV should do that, but it's buggy, see below).
1704 *
1705 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1706 * as reported by Reini Urban.
1429 */ 1707 */
1430 /*SvGETMAGIC (string);*/ 1708 /*SvGETMAGIC (string);*/
1431 if (SvMAGICAL (string)) 1709 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1432 string = sv_2mortal (newSVsv (string)); 1710 string = sv_2mortal (newSVsv (string));
1433 1711
1434 SvUPGRADE (string, SVt_PV); 1712 SvUPGRADE (string, SVt_PV);
1435 1713
1436 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1714 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1453 if (offset > json->max_size && json->max_size) 1731 if (offset > json->max_size && json->max_size)
1454 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1732 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1455 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1733 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1456 } 1734 }
1457 1735
1458 if (json->flags & F_UTF8) 1736 if (DECODE_WANTS_OCTETS (json))
1459 sv_utf8_downgrade (string, 0); 1737 sv_utf8_downgrade (string, 0);
1460 else 1738 else
1461 sv_utf8_upgrade (string); 1739 sv_utf8_upgrade (string);
1462 1740
1463 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1741 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1475 1753
1476 decode_ws (&dec); 1754 decode_ws (&dec);
1477 sv = decode_sv (&dec); 1755 sv = decode_sv (&dec);
1478 1756
1479 if (offset_return) 1757 if (offset_return)
1480 *offset_return = dec.cur; 1758 *offset_return = dec.cur - SvPVX (string);
1481 1759 else if (sv)
1482 if (!(offset_return || !sv))
1483 { 1760 {
1484 // check for trailing garbage 1761 // check for trailing garbage
1485 decode_ws (&dec); 1762 decode_ws (&dec);
1486 1763
1487 if (*dec.cur) 1764 if (*dec.cur)
… …
1505 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1782 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1506 LEAVE; 1783 LEAVE;
1507 1784
1508 croak ("%s, at character offset %d (before \"%s\")", 1785 croak ("%s, at character offset %d (before \"%s\")",
1509 dec.err, 1786 dec.err,
1510 ptr_to_index (string, dec.cur), 1787 (int)ptr_to_index (string, dec.cur),
1511 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1788 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1512 } 1789 }
1513 1790
1514 sv = sv_2mortal (sv); 1791 sv = sv_2mortal (sv);
1515 1792
1516 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1793 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1517 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1794 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1518 1795
1519 return sv; 1796 return sv;
1520} 1797}
1521 1798
… …
1524 1801
1525static void 1802static void
1526incr_parse (JSON *self) 1803incr_parse (JSON *self)
1527{ 1804{
1528 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1805 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1806
1807 // the state machine here is a bit convoluted and could be simplified a lot
1808 // but this would make it slower, so...
1529 1809
1530 for (;;) 1810 for (;;)
1531 { 1811 {
1532 //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 1812 //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
1533 switch (self->incr_mode) 1813 switch (self->incr_mode)
1534 { 1814 {
1535 // only used for intiial whitespace skipping 1815 // only used for initial whitespace skipping
1536 case INCR_M_WS: 1816 case INCR_M_WS:
1537 for (;;) 1817 for (;;)
1538 { 1818 {
1539 if (*p > 0x20) 1819 if (*p > 0x20)
1540 { 1820 {
1821 if (*p == '#')
1822 {
1823 self->incr_mode = INCR_M_C0;
1824 goto incr_m_c;
1825 }
1826 else
1827 {
1541 self->incr_mode = INCR_M_JSON; 1828 self->incr_mode = INCR_M_JSON;
1542 goto incr_m_json; 1829 goto incr_m_json;
1830 }
1543 } 1831 }
1544 else if (!*p) 1832 else if (!*p)
1545 goto interrupt; 1833 goto interrupt;
1546 1834
1547 ++p; 1835 ++p;
… …
1553 goto interrupt; 1841 goto interrupt;
1554 1842
1555 ++p; 1843 ++p;
1556 self->incr_mode = INCR_M_STR; 1844 self->incr_mode = INCR_M_STR;
1557 goto incr_m_str; 1845 goto incr_m_str;
1846
1847 // inside #-style comments
1848 case INCR_M_C0:
1849 case INCR_M_C1:
1850 incr_m_c:
1851 for (;;)
1852 {
1853 if (*p == '\n')
1854 {
1855 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1856 break;
1857 }
1858 else if (!*p)
1859 goto interrupt;
1860
1861 ++p;
1862 }
1863
1864 break;
1558 1865
1559 // inside a string 1866 // inside a string
1560 case INCR_M_STR: 1867 case INCR_M_STR:
1561 incr_m_str: 1868 incr_m_str:
1562 for (;;) 1869 for (;;)
… …
1613 self->incr_mode = INCR_M_STR; 1920 self->incr_mode = INCR_M_STR;
1614 goto incr_m_str; 1921 goto incr_m_str;
1615 1922
1616 case '[': 1923 case '[':
1617 case '{': 1924 case '{':
1925 case '(':
1618 if (++self->incr_nest > self->max_depth) 1926 if (++self->incr_nest > self->max_depth)
1619 croak (ERR_NESTING_EXCEEDED); 1927 croak (ERR_NESTING_EXCEEDED);
1620 break; 1928 break;
1621 1929
1622 case ']': 1930 case ']':
1623 case '}': 1931 case '}':
1624 if (--self->incr_nest <= 0) 1932 if (--self->incr_nest <= 0)
1625 goto interrupt; 1933 goto interrupt;
1934 break;
1935
1936 case ')':
1937 --self->incr_nest;
1938 break;
1939
1940 case '#':
1941 self->incr_mode = INCR_M_C1;
1942 goto incr_m_c;
1626 } 1943 }
1627 } 1944 }
1628 } 1945 }
1629 1946
1630 modechange: 1947 modechange:
1631 ; 1948 ;
1632 } 1949 }
1633 1950
1634interrupt: 1951interrupt:
1635 self->incr_pos = p - SvPVX (self->incr_text); 1952 self->incr_pos = p - SvPVX (self->incr_text);
1953 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1636 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1954 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1637} 1955}
1638 1956
1639///////////////////////////////////////////////////////////////////////////// 1957/////////////////////////////////////////////////////////////////////////////
1640// XS interface functions 1958// XS interface functions
… …
1650 i >= '0' && i <= '9' ? i - '0' 1968 i >= '0' && i <= '9' ? i - '0'
1651 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1969 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1652 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1970 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1653 : -1; 1971 : -1;
1654 1972
1655 json_stash = gv_stashpv ("JSON::XS" , 1); 1973 json_stash = gv_stashpv ("JSON::XS" , 1);
1656 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1974 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1657
1658 json_true = get_bool ("JSON::XS::true"); 1975 bool_true = get_bool ("Types::Serialiser::true");
1659 json_false = get_bool ("JSON::XS::false"); 1976 bool_false = get_bool ("Types::Serialiser::false");
1977
1978 sv_json = newSVpv ("JSON", 0);
1979 SvREADONLY_on (sv_json);
1980
1981 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1660} 1982}
1661 1983
1662PROTOTYPES: DISABLE 1984PROTOTYPES: DISABLE
1663 1985
1664void CLONE (...) 1986void CLONE (...)
1665 CODE: 1987 CODE:
1666 json_stash = 0; 1988 json_stash = 0;
1667 json_boolean_stash = 0; 1989 bool_stash = 0;
1668 1990
1669void new (char *klass) 1991void new (char *klass)
1670 PPCODE: 1992 PPCODE:
1671{ 1993{
1672 SV *pv = NEWSV (0, sizeof (JSON)); 1994 SV *pv = NEWSV (0, sizeof (JSON));
1673 SvPOK_only (pv); 1995 SvPOK_only (pv);
1674 json_init ((JSON *)SvPVX (pv)); 1996 json_init ((JSON *)SvPVX (pv));
1675 XPUSHs (sv_2mortal (sv_bless ( 1997 XPUSHs (sv_2mortal (sv_bless (
1676 newRV_noinc (pv), 1998 newRV_noinc (pv),
1677 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1999 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1692 shrink = F_SHRINK 2014 shrink = F_SHRINK
1693 allow_blessed = F_ALLOW_BLESSED 2015 allow_blessed = F_ALLOW_BLESSED
1694 convert_blessed = F_CONV_BLESSED 2016 convert_blessed = F_CONV_BLESSED
1695 relaxed = F_RELAXED 2017 relaxed = F_RELAXED
1696 allow_unknown = F_ALLOW_UNKNOWN 2018 allow_unknown = F_ALLOW_UNKNOWN
2019 allow_tags = F_ALLOW_TAGS
1697 PPCODE: 2020 PPCODE:
1698{ 2021{
1699 if (enable) 2022 if (enable)
1700 self->flags |= ix; 2023 self->flags |= ix;
1701 else 2024 else
… …
1717 get_shrink = F_SHRINK 2040 get_shrink = F_SHRINK
1718 get_allow_blessed = F_ALLOW_BLESSED 2041 get_allow_blessed = F_ALLOW_BLESSED
1719 get_convert_blessed = F_CONV_BLESSED 2042 get_convert_blessed = F_CONV_BLESSED
1720 get_relaxed = F_RELAXED 2043 get_relaxed = F_RELAXED
1721 get_allow_unknown = F_ALLOW_UNKNOWN 2044 get_allow_unknown = F_ALLOW_UNKNOWN
2045 get_allow_tags = F_ALLOW_TAGS
1722 PPCODE: 2046 PPCODE:
1723 XPUSHs (boolSV (self->flags & ix)); 2047 XPUSHs (boolSV (self->flags & ix));
1724 2048
1725void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2049void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1726 PPCODE: 2050 PPCODE:
… …
1754} 2078}
1755 2079
1756void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2080void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1757 PPCODE: 2081 PPCODE:
1758{ 2082{
1759 if (!self->cb_sk_object) 2083 if (!self->cb_sk_object)
1760 self->cb_sk_object = newHV (); 2084 self->cb_sk_object = newHV ();
1761 2085
1762 if (SvOK (cb)) 2086 if (SvOK (cb))
1763 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2087 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1764 else 2088 else
… …
1775 XPUSHs (ST (0)); 2099 XPUSHs (ST (0));
1776} 2100}
1777 2101
1778void encode (JSON *self, SV *scalar) 2102void encode (JSON *self, SV *scalar)
1779 PPCODE: 2103 PPCODE:
1780 XPUSHs (encode_json (scalar, self)); 2104 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2105 XPUSHs (scalar);
1781 2106
1782void decode (JSON *self, SV *jsonstr) 2107void decode (JSON *self, SV *jsonstr)
1783 PPCODE: 2108 PPCODE:
1784 XPUSHs (decode_json (jsonstr, self, 0)); 2109 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2110 XPUSHs (jsonstr);
1785 2111
1786void decode_prefix (JSON *self, SV *jsonstr) 2112void decode_prefix (JSON *self, SV *jsonstr)
1787 PPCODE: 2113 PPCODE:
1788{ 2114{
1789 char *offset; 2115 SV *sv;
2116 STRLEN offset;
2117 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1790 EXTEND (SP, 2); 2118 EXTEND (SP, 2);
1791 PUSHs (decode_json (jsonstr, self, &offset)); 2119 PUSHs (sv);
1792 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2120 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1793} 2121}
1794 2122
1795void incr_parse (JSON *self, SV *jsonstr = 0) 2123void incr_parse (JSON *self, SV *jsonstr = 0)
1796 PPCODE: 2124 PPCODE:
1797{ 2125{
1798 if (!self->incr_text) 2126 if (!self->incr_text)
1799 self->incr_text = newSVpvn ("", 0); 2127 self->incr_text = newSVpvn ("", 0);
2128
2129 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2130 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2131 if (DECODE_WANTS_OCTETS (self))
2132 {
2133 if (self->incr_pos)
2134 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2135 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2136
2137 sv_utf8_downgrade (self->incr_text, 0);
2138 }
2139 else
2140 {
2141 sv_utf8_upgrade (self->incr_text);
2142
2143 if (self->incr_pos)
2144 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2145 - (U8 *)SvPVX (self->incr_text);
2146 }
1800 2147
1801 // append data, if any 2148 // append data, if any
1802 if (jsonstr) 2149 if (jsonstr)
1803 { 2150 {
2151 /* make sure both strings have same encoding */
2152 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1804 if (SvUTF8 (jsonstr)) 2153 if (SvUTF8 (jsonstr))
2154 sv_utf8_downgrade (jsonstr, 0);
1805 { 2155 else
1806 if (!SvUTF8 (self->incr_text))
1807 {
1808 /* utf-8-ness differs, need to upgrade */
1809 sv_utf8_upgrade (self->incr_text);
1810
1811 if (self->incr_pos)
1812 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1813 - (U8 *)SvPVX (self->incr_text);
1814 }
1815 }
1816 else if (SvUTF8 (self->incr_text))
1817 sv_utf8_upgrade (jsonstr); 2156 sv_utf8_upgrade (jsonstr);
1818 2157
2158 /* and then just blindly append */
1819 { 2159 {
1820 STRLEN len; 2160 STRLEN len;
1821 const char *str = SvPV (jsonstr, len); 2161 const char *str = SvPV (jsonstr, len);
1822 STRLEN cur = SvCUR (self->incr_text); 2162 STRLEN cur = SvCUR (self->incr_text);
1823 2163
… …
1831 } 2171 }
1832 2172
1833 if (GIMME_V != G_VOID) 2173 if (GIMME_V != G_VOID)
1834 do 2174 do
1835 { 2175 {
2176 SV *sv;
1836 char *offset; 2177 STRLEN offset;
1837 2178
1838 if (!INCR_DONE (self)) 2179 if (!INCR_DONE (self))
1839 { 2180 {
1840 incr_parse (self); 2181 incr_parse (self);
1841 2182
1842 if (self->incr_pos > self->max_size && self->max_size) 2183 if (self->incr_pos > self->max_size && self->max_size)
1843 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2184 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1844 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2185 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1845 2186
1846 if (!INCR_DONE (self)) 2187 if (!INCR_DONE (self))
2188 {
2189 // as an optimisation, do not accumulate white space in the incr buffer
2190 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2191 {
2192 self->incr_pos = 0;
2193 SvCUR_set (self->incr_text, 0);
2194 }
2195
1847 break; 2196 break;
2197 }
1848 } 2198 }
1849 2199
1850 XPUSHs (decode_json (self->incr_text, self, &offset)); 2200 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2201 XPUSHs (sv);
1851 2202
1852 self->incr_pos -= offset - SvPVX (self->incr_text); 2203 self->incr_pos -= offset;
1853 self->incr_nest = 0; 2204 self->incr_nest = 0;
1854 self->incr_mode = 0; 2205 self->incr_mode = 0;
1855 2206
1856 sv_chop (self->incr_text, offset); 2207 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
1857 } 2208 }
1858 while (GIMME_V == G_ARRAY); 2209 while (GIMME_V == G_ARRAY);
1859} 2210}
1860 2211
1861SV *incr_text (JSON *self) 2212SV *incr_text (JSON *self)
… …
1899 SvREFCNT_dec (self->incr_text); 2250 SvREFCNT_dec (self->incr_text);
1900 2251
1901PROTOTYPES: ENABLE 2252PROTOTYPES: ENABLE
1902 2253
1903void encode_json (SV *scalar) 2254void encode_json (SV *scalar)
1904 ALIAS:
1905 to_json_ = 0
1906 encode_json = F_UTF8
1907 PPCODE: 2255 PPCODE:
1908{ 2256{
1909 JSON json; 2257 JSON json;
1910 json_init (&json); 2258 json_init (&json);
1911 json.flags |= ix; 2259 json.flags |= F_UTF8;
1912 XPUSHs (encode_json (scalar, &json)); 2260 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2261 XPUSHs (scalar);
1913} 2262}
1914 2263
1915void decode_json (SV *jsonstr) 2264void decode_json (SV *jsonstr)
1916 ALIAS:
1917 from_json_ = 0
1918 decode_json = F_UTF8
1919 PPCODE: 2265 PPCODE:
1920{ 2266{
1921 JSON json; 2267 JSON json;
1922 json_init (&json); 2268 json_init (&json);
1923 json.flags |= ix; 2269 json.flags |= F_UTF8;
1924 XPUSHs (decode_json (jsonstr, &json, 0)); 2270 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2271 XPUSHs (jsonstr);
1925} 2272}
1926 2273
1927

Diff Legend

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