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.76 by root, Thu Mar 20 00:56:37 2008 UTC vs.
Revision 1.122 by root, Tue Oct 29 15:55:49 2013 UTC

… …
12#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 14#endif
15 15
16// some old perls do not have this, try to make it work, no 16// 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. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif 20#endif
21 21
22// compatibility with perl <5.18
23#ifndef HvNAMELEN_get
24# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
25#endif
26#ifndef HvNAMELEN
27# define HvNAMELEN(hv) HvNAMELEN_get (hv)
28#endif
29#ifndef HvNAMEUTF8
30# define HvNAMEUTF8(hv) 0
31#endif
32
33// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 34#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 35
24#define F_ASCII 0x00000001UL 36#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 37#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 38#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 39#define F_INDENT 0x00000008UL
… …
31#define F_ALLOW_NONREF 0x00000100UL 43#define F_ALLOW_NONREF 0x00000100UL
32#define F_SHRINK 0x00000200UL 44#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 45#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 46#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 47#define F_RELAXED 0x00001000UL
36 48#define F_ALLOW_UNKNOWN 0x00002000UL
37#define F_MAXDEPTH 0xf8000000UL 49#define F_ALLOW_TAGS 0x00004000UL
38#define S_MAXDEPTH 27
39#define F_MAXSIZE 0x01f00000UL
40#define S_MAXSIZE 20
41#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
42 51
43#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
44#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
45
46#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
47#define F_DEFAULT (9UL << S_MAXDEPTH)
48 53
49#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
50#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
51 56
52#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 57#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
58
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
53 60
54#define SB do { 61#define SB do {
55#define SE } while (0) 62#define SE } while (0)
56 63
57#if __GNUC__ >= 3 64#if __GNUC__ >= 3
… …
67 74
68#define IN_RANGE_INC(type,val,beg,end) \ 75#define IN_RANGE_INC(type,val,beg,end) \
69 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 76 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
70 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 77 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
71 78
79#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
80
72#ifdef USE_ITHREADS 81#ifdef USE_ITHREADS
73# define JSON_SLOW 1 82# define JSON_SLOW 1
74# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
75#else 84#else
76# define JSON_SLOW 0 85# define JSON_SLOW 0
77# define JSON_STASH json_stash 86# define JSON_STASH json_stash
78#endif 87#endif
79 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
80static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
81static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
94
95enum {
96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
97 INCR_M_STR, // inside string
98 INCR_M_BS, // inside backslash
99 INCR_M_C0, // inside comment in initial whitespace sequence
100 INCR_M_C1, // inside comment in other places
101 INCR_M_JSON // outside anything, count nesting
102};
103
104#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
82 105
83typedef struct { 106typedef struct {
84 U32 flags; 107 U32 flags;
108 U32 max_depth;
109 STRLEN max_size;
110
85 SV *cb_object; 111 SV *cb_object;
86 HV *cb_sk_object; 112 HV *cb_sk_object;
113
114 // for the incremental parser
115 SV *incr_text; // the source text so far
116 STRLEN incr_pos; // the current offset into the text
117 int incr_nest; // {[]}-nesting level
118 unsigned char incr_mode;
87} JSON; 119} JSON;
120
121INLINE void
122json_init (JSON *json)
123{
124 Zero (json, 1, JSON);
125 json->max_depth = 512;
126}
88 127
89///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
90// utility functions 129// utility functions
91 130
131INLINE SV *
132get_bool (const char *name)
133{
134 SV *sv = get_sv (name, 1);
135
136 SvREADONLY_on (sv);
137 SvREADONLY_on (SvRV (sv));
138
139 return sv;
140}
141
92INLINE void 142INLINE void
93shrink (SV *sv) 143shrink (SV *sv)
94{ 144{
95 sv_utf8_downgrade (sv, 1); 145 sv_utf8_downgrade (sv, 1);
146
96 if (SvLEN (sv) > SvCUR (sv) + 1) 147 if (SvLEN (sv) > SvCUR (sv) + 1)
97 { 148 {
98#ifdef SvPV_shrink_to_cur 149#ifdef SvPV_shrink_to_cur
99 SvPV_shrink_to_cur (sv); 150 SvPV_shrink_to_cur (sv);
100#elif defined (SvPV_renew) 151#elif defined (SvPV_renew)
… …
144 *s++ = 0x80 | ( ch & 0x3f); 195 *s++ = 0x80 | ( ch & 0x3f);
145 196
146 return s; 197 return s;
147} 198}
148 199
200// convert offset pointer to character index, sv must be string
201static STRLEN
202ptr_to_index (SV *sv, char *offset)
203{
204 return SvUTF8 (sv)
205 ? utf8_distance (offset, SvPVX (sv))
206 : offset - SvPVX (sv);
207}
208
209/////////////////////////////////////////////////////////////////////////////
210// fp hell
211
212// scan a group of digits, and a trailing exponent
213static void
214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
215{
216 UV uaccum = 0;
217 int eaccum = 0;
218
219 // if we recurse too deep, skip all remaining digits
220 // to avoid a stack overflow attack
221 if (expect_false (--maxdepth <= 0))
222 while (((U8)*s - '0') < 10)
223 ++s;
224
225 for (;;)
226 {
227 U8 dig = (U8)*s - '0';
228
229 if (expect_false (dig >= 10))
230 {
231 if (dig == (U8)((U8)'.' - (U8)'0'))
232 {
233 ++s;
234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
235 }
236 else if ((dig | ' ') == 'e' - '0')
237 {
238 int exp2 = 0;
239 int neg = 0;
240
241 ++s;
242
243 if (*s == '-')
244 {
245 ++s;
246 neg = 1;
247 }
248 else if (*s == '+')
249 ++s;
250
251 while ((dig = (U8)*s - '0') < 10)
252 exp2 = exp2 * 10 + *s++ - '0';
253
254 *expo += neg ? -exp2 : exp2;
255 }
256
257 break;
258 }
259
260 ++s;
261
262 uaccum = uaccum * 10 + dig;
263 ++eaccum;
264
265 // if we have too many digits, then recurse for more
266 // we actually do this for rather few digits
267 if (uaccum >= (UV_MAX - 9) / 10)
268 {
269 if (postdp) *expo -= eaccum;
270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
271 if (postdp) *expo += eaccum;
272
273 break;
274 }
275 }
276
277 // this relies greatly on the quality of the pow ()
278 // implementation of the platform, but a good
279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
281 if (postdp) *expo -= eaccum;
282 *accum += uaccum * Perl_pow (10., *expo);
283 *expo += eaccum;
284}
285
286static NV
287json_atof (const char *s)
288{
289 NV accum = 0.;
290 int expo = 0;
291 int neg = 0;
292
293 if (*s == '-')
294 {
295 ++s;
296 neg = 1;
297 }
298
299 // a recursion depth of ten gives us >>500 bits
300 json_atof_scan1 (s, &accum, &expo, 0, 10);
301
302 return neg ? -accum : accum;
303}
149///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
150// encoder 305// encoder
151 306
152// structure used for encoding JSON 307// structure used for encoding JSON
153typedef struct 308typedef struct
… …
155 char *cur; // SvPVX (sv) + current output position 310 char *cur; // SvPVX (sv) + current output position
156 char *end; // SvEND (sv) 311 char *end; // SvEND (sv)
157 SV *sv; // result scalar 312 SV *sv; // result scalar
158 JSON json; 313 JSON json;
159 U32 indent; // indentation level 314 U32 indent; // indentation level
160 U32 maxdepth; // max. indentation/recursion level
161 UV limit; // escape character values >= this value when encoding 315 UV limit; // escape character values >= this value when encoding
162} enc_t; 316} enc_t;
163 317
164INLINE void 318INLINE void
165need (enc_t *enc, STRLEN len) 319need (enc_t *enc, STRLEN len)
166{ 320{
167 if (expect_false (enc->cur + len >= enc->end)) 321 if (expect_false (enc->cur + len >= enc->end))
168 { 322 {
169 STRLEN cur = enc->cur - SvPVX (enc->sv); 323 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
170 SvGROW (enc->sv, cur + len + 1); 324 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
171 enc->cur = SvPVX (enc->sv) + cur; 325 enc->cur = SvPVX (enc->sv) + cur;
172 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 326 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
173 } 327 }
174} 328}
175 329
… …
250 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 404 (int)((uch - 0x10000) % 0x400 + 0xDC00));
251 enc->cur += 12; 405 enc->cur += 12;
252 } 406 }
253 else 407 else
254 { 408 {
255 static char hexdigit [16] = "0123456789abcdef";
256 need (enc, len += 5); 409 need (enc, len += 5);
257 *enc->cur++ = '\\'; 410 *enc->cur++ = '\\';
258 *enc->cur++ = 'u'; 411 *enc->cur++ = 'u';
259 *enc->cur++ = hexdigit [ uch >> 12 ]; 412 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
260 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 413 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
261 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 414 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
262 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 415 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
263 } 416 }
264 417
265 str += clen; 418 str += clen;
266 } 419 }
267 else if (enc->json.flags & F_LATIN1) 420 else if (enc->json.flags & F_LATIN1)
… …
338static void 491static void
339encode_av (enc_t *enc, AV *av) 492encode_av (enc_t *enc, AV *av)
340{ 493{
341 int i, len = av_len (av); 494 int i, len = av_len (av);
342 495
343 if (enc->indent >= enc->maxdepth) 496 if (enc->indent >= enc->json.max_depth)
344 croak ("data structure too deep (hit recursion limit)"); 497 croak (ERR_NESTING_EXCEEDED);
345 498
346 encode_ch (enc, '['); 499 encode_ch (enc, '[');
347 500
348 if (len >= 0) 501 if (len >= 0)
349 { 502 {
350 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
351 504
352 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
364 encode_comma (enc); 517 encode_comma (enc);
365 } 518 }
366 519
367 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
368 } 521 }
369 522
370 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
371} 524}
372 525
373static void 526static void
374encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
378 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
379 { 532 {
380 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
381 STRLEN len; 534 STRLEN len;
382 char *str; 535 char *str;
383 536
384 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
385 str = SvPV (sv, len); 538 str = SvPV (sv, len);
386 539
387 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
388 } 541 }
… …
423 576
424static void 577static void
425encode_hv (enc_t *enc, HV *hv) 578encode_hv (enc_t *enc, HV *hv)
426{ 579{
427 HE *he; 580 HE *he;
428 int count;
429 581
430 if (enc->indent >= enc->maxdepth) 582 if (enc->indent >= enc->json.max_depth)
431 croak ("data structure too deep (hit recursion limit)"); 583 croak (ERR_NESTING_EXCEEDED);
432 584
433 encode_ch (enc, '{'); 585 encode_ch (enc, '{');
434 586
435 // for canonical output we have to sort by keys first 587 // for canonical output we have to sort by keys first
436 // actually, this is mostly due to the stupid so-called 588 // actually, this is mostly due to the stupid so-called
437 // security workaround added somewhere in 5.8.x. 589 // security workaround added somewhere in 5.8.x
438 // that randomises hash orderings 590 // that randomises hash orderings
439 if (enc->json.flags & F_CANONICAL) 591 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
440 { 592 {
441 int count = hv_iterinit (hv); 593 int count = hv_iterinit (hv);
442 594
443 if (SvMAGICAL (hv)) 595 if (SvMAGICAL (hv))
444 { 596 {
… …
455 } 607 }
456 608
457 if (count) 609 if (count)
458 { 610 {
459 int i, fast = 1; 611 int i, fast = 1;
460#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
461 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
462#else 614
463 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
464#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
465 621
466 i = 0; 622 i = 0;
467 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
468 { 624 {
469 hes [i++] = he; 625 hes [i++] = he;
… …
538// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
539static void 695static void
540encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
541{ 697{
542 svtype svt; 698 svtype svt;
699 GV *method;
543 700
544 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
545 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
546 703
547 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
548 { 705 {
549 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
550 ? json_boolean_stash 707 ? types_boolean_stash
551 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
552 710
553 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
554 { 712 {
555 if (SvIV (sv)) 713 if (SvIV (sv))
556 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
557 else 715 else
558 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
559 } 717 }
718 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
719 {
720 int count;
721 dSP;
722
723 ENTER; SAVETMPS; PUSHMARK (SP);
724 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json);
728
729 PUTBACK;
730 count = call_sv ((SV *)GvCV (method), G_ARRAY);
731 SPAGAIN;
732
733 // catch this surprisingly common error
734 if (SvROK (TOPs) && SvRV (TOPs) == sv)
735 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
736
737 encode_ch (enc, '(');
738 encode_ch (enc, '"');
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"');
741 encode_ch (enc, ')');
742 encode_ch (enc, '[');
743
744 while (count)
745 {
746 encode_sv (enc, SP[1 - count--]);
747
748 if (count)
749 encode_ch (enc, ',');
750 }
751
752 encode_ch (enc, ']');
753
754 PUTBACK;
755
756 FREETMPS; LEAVE;
757 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 {
760 dSP;
761
762 ENTER; SAVETMPS; PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765
766 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK;
768 call_sv ((SV *)GvCV (method), G_SCALAR);
769 SPAGAIN;
770
771 // catch this surprisingly common error
772 if (SvROK (TOPs) && SvRV (TOPs) == sv)
773 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
774
775 sv = POPs;
776 PUTBACK;
777
778 encode_sv (enc, sv);
779
780 FREETMPS; LEAVE;
781 }
782 else if (enc->json.flags & F_ALLOW_BLESSED)
783 encode_str (enc, "null", 4, 0);
560 else 784 else
561 {
562#if 0
563 if (0 && sv_derived_from (rv, "JSON::Literal"))
564 {
565 // not yet
566 }
567#endif
568 if (enc->json.flags & F_CONV_BLESSED)
569 {
570 // we re-bless the reference to get overload and other niceties right
571 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
572
573 if (to_json)
574 {
575 dSP;
576
577 ENTER; SAVETMPS; PUSHMARK (SP);
578 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
579
580 // calling with G_SCALAR ensures that we always get a 1 return value
581 PUTBACK;
582 call_sv ((SV *)GvCV (to_json), G_SCALAR);
583 SPAGAIN;
584
585 // catch this surprisingly common error
586 if (SvROK (TOPs) && SvRV (TOPs) == sv)
587 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
588
589 sv = POPs;
590 PUTBACK;
591
592 encode_sv (enc, sv);
593
594 FREETMPS; LEAVE;
595 }
596 else if (enc->json.flags & F_ALLOW_BLESSED)
597 encode_str (enc, "null", 4, 0);
598 else
599 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
600 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
601 }
602 else if (enc->json.flags & F_ALLOW_BLESSED)
603 encode_str (enc, "null", 4, 0);
604 else
605 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 785 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
606 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
607 }
608 } 787 }
609 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
610 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
611 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
612 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
617 796
618 if (len == 1 && *pv == '1') 797 if (len == 1 && *pv == '1')
619 encode_str (enc, "true", 4, 0); 798 encode_str (enc, "true", 4, 0);
620 else if (len == 1 && *pv == '0') 799 else if (len == 1 && *pv == '0')
621 encode_str (enc, "false", 5, 0); 800 encode_str (enc, "false", 5, 0);
801 else if (enc->json.flags & F_ALLOW_UNKNOWN)
802 encode_str (enc, "null", 4, 0);
622 else 803 else
623 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 804 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
624 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 805 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
625 } 806 }
807 else if (enc->json.flags & F_ALLOW_UNKNOWN)
808 encode_str (enc, "null", 4, 0);
626 else 809 else
627 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 810 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
628 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 811 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
629} 812}
630 813
… …
684 } 867 }
685 else 868 else
686 { 869 {
687 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
688 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
689 enc->cur += 872 enc->cur +=
690 SvIsUV(sv) 873 SvIsUV(sv)
691 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
692 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
693 } 876 }
694 } 877 }
695 else if (SvROK (sv)) 878 else if (SvROK (sv))
696 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
697 else if (!SvOK (sv)) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
698 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
699 else 882 else
700 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 883 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
701 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
702} 885}
703 886
704static SV * 887static SV *
705encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
706{ 889{
… …
712 enc.json = *json; 895 enc.json = *json;
713 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 896 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
714 enc.cur = SvPVX (enc.sv); 897 enc.cur = SvPVX (enc.sv);
715 enc.end = SvEND (enc.sv); 898 enc.end = SvEND (enc.sv);
716 enc.indent = 0; 899 enc.indent = 0;
717 enc.maxdepth = DEC_DEPTH (enc.json.flags);
718 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 900 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
719 : enc.json.flags & F_LATIN1 ? 0x000100UL 901 : enc.json.flags & F_LATIN1 ? 0x000100UL
720 : 0x110000UL; 902 : 0x110000UL;
721 903
722 SvPOK_only (enc.sv); 904 SvPOK_only (enc.sv);
723 encode_sv (&enc, scalar); 905 encode_sv (&enc, scalar);
906 encode_nl (&enc);
724 907
725 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 908 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
726 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 909 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
727 910
728 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 911 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
789 if (*dec->cur != ch) \ 972 if (*dec->cur != ch) \
790 ERR (# ch " expected"); \ 973 ERR (# ch " expected"); \
791 ++dec->cur; \ 974 ++dec->cur; \
792 SE 975 SE
793 976
794#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 977#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
795#define DEC_DEC_DEPTH --dec->depth 978#define DEC_DEC_DEPTH --dec->depth
796 979
797static SV *decode_sv (dec_t *dec); 980static SV *decode_sv (dec_t *dec);
798 981
799static signed char decode_hexdigit[256]; 982static signed char decode_hexdigit[256];
… …
908 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1091 else if (expect_true (ch >= 0x20 && ch < 0x80))
909 *cur++ = ch; 1092 *cur++ = ch;
910 else if (ch >= 0x80) 1093 else if (ch >= 0x80)
911 { 1094 {
912 STRLEN clen; 1095 STRLEN clen;
913 UV uch;
914 1096
915 --dec_cur; 1097 --dec_cur;
916 1098
917 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1099 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
918 if (clen == (STRLEN)-1) 1100 if (clen == (STRLEN)-1)
919 ERR ("malformed UTF-8 character in JSON string"); 1101 ERR ("malformed UTF-8 character in JSON string");
920 1102
921 do 1103 do
922 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
… …
939 { 1121 {
940 STRLEN len = cur - buf; 1122 STRLEN len = cur - buf;
941 1123
942 if (sv) 1124 if (sv)
943 { 1125 {
944 SvGROW (sv, SvCUR (sv) + len + 1); 1126 STRLEN cur = SvCUR (sv);
1127
1128 if (SvLEN (sv) <= cur + len)
1129 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1130
945 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1131 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
946 SvCUR_set (sv, SvCUR (sv) + len); 1132 SvCUR_set (sv, SvCUR (sv) + len);
947 } 1133 }
948 else 1134 else
949 sv = newSVpvn (buf, len); 1135 sv = newSVpvn (buf, len);
… …
1040 1226
1041 // special case the rather common 1..5-digit-int case 1227 // special case the rather common 1..5-digit-int case
1042 if (*start == '-') 1228 if (*start == '-')
1043 switch (len) 1229 switch (len)
1044 { 1230 {
1045 case 2: return newSViv (-( start [1] - '0' * 1)); 1231 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1046 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1232 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1047 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1233 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1048 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1234 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1049 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1235 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1050 } 1236 }
1051 else 1237 else
1052 switch (len) 1238 switch (len)
1053 { 1239 {
1054 case 1: return newSViv ( start [0] - '0' * 1); 1240 case 1: return newSViv ( start [0] - '0' * 1);
1055 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1241 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1056 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1242 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1057 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1243 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1058 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1244 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1059 } 1245 }
1060 1246
1061 { 1247 {
1062 UV uv; 1248 UV uv;
1063 int numtype = grok_number (start, len, &uv); 1249 int numtype = grok_number (start, len, &uv);
… …
1072 } 1258 }
1073 1259
1074 len -= *start == '-' ? 1 : 0; 1260 len -= *start == '-' ? 1 : 0;
1075 1261
1076 // does not fit into IV or UV, try NV 1262 // does not fit into IV or UV, try NV
1077 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1263 if (len <= NV_DIG)
1078 #if defined (LDBL_DIG)
1079 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1080 #endif
1081 )
1082 // fits into NV without loss of precision 1264 // fits into NV without loss of precision
1083 return newSVnv (Atof (start)); 1265 return newSVnv (json_atof (start));
1084 1266
1085 // everything else fails, convert it to a string 1267 // everything else fails, convert it to a string
1086 return newSVpvn (start, dec->cur - start); 1268 return newSVpvn (start, dec->cur - start);
1087 } 1269 }
1088 1270
1089 // loss of precision here 1271 // loss of precision here
1090 return newSVnv (Atof (start)); 1272 return newSVnv (json_atof (start));
1091 1273
1092fail: 1274fail:
1093 return 0; 1275 return 0;
1094} 1276}
1095 1277
… …
1119 if (*dec->cur == ']') 1301 if (*dec->cur == ']')
1120 { 1302 {
1121 ++dec->cur; 1303 ++dec->cur;
1122 break; 1304 break;
1123 } 1305 }
1124 1306
1125 if (*dec->cur != ',') 1307 if (*dec->cur != ',')
1126 ERR (", or ] expected while parsing array"); 1308 ERR (", or ] expected while parsing array");
1127 1309
1128 ++dec->cur; 1310 ++dec->cur;
1129 1311
… …
1171 char *p = dec->cur; 1353 char *p = dec->cur;
1172 char *e = p + 24; // only try up to 24 bytes 1354 char *e = p + 24; // only try up to 24 bytes
1173 1355
1174 for (;;) 1356 for (;;)
1175 { 1357 {
1176 // the >= 0x80 is true on most architectures 1358 // the >= 0x80 is false on most architectures
1177 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1359 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1178 { 1360 {
1179 // slow path, back up and use decode_str 1361 // slow path, back up and use decode_str
1180 SV *key = decode_str (dec); 1362 SV *key = decode_str (dec);
1181 if (!key) 1363 if (!key)
… …
1264 dSP; 1446 dSP;
1265 int count; 1447 int count;
1266 1448
1267 ENTER; SAVETMPS; PUSHMARK (SP); 1449 ENTER; SAVETMPS; PUSHMARK (SP);
1268 XPUSHs (HeVAL (he)); 1450 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv);
1269 1452
1270 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1271 1454
1272 if (count == 1) 1455 if (count == 1)
1273 { 1456 {
1274 sv = newSVsv (POPs); 1457 sv = newSVsv (POPs);
1275 FREETMPS; LEAVE; 1458 FREETMPS; LEAVE;
1276 return sv; 1459 return sv;
1277 } 1460 }
1278 1461
1462 SvREFCNT_inc (sv);
1279 FREETMPS; LEAVE; 1463 FREETMPS; LEAVE;
1280 } 1464 }
1281 } 1465 }
1282 1466
1283 if (dec->json.cb_object) 1467 if (dec->json.cb_object)
… …
1309 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1310 return 0; 1494 return 0;
1311} 1495}
1312 1496
1313static SV * 1497static SV *
1498decode_tag (dec_t *dec)
1499{
1500 SV *tag = 0;
1501 SV *val = 0;
1502
1503 if (!(dec->json.flags & F_ALLOW_TAGS))
1504 ERR ("malformed JSON string, neither array, object, number, string or atom");
1505
1506 ++dec->cur;
1507
1508 decode_ws (dec);
1509
1510 tag = decode_sv (dec);
1511 if (!tag)
1512 goto fail;
1513
1514 if (!SvPOK (tag))
1515 ERR ("malformed JSON string, (tag) must be a string");
1516
1517 decode_ws (dec);
1518
1519 if (*dec->cur != ')')
1520 ERR (") expected after tag");
1521
1522 ++dec->cur;
1523
1524 decode_ws (dec);
1525
1526 val = decode_sv (dec);
1527 if (!val)
1528 goto fail;
1529
1530 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1531 ERR ("malformed JSON string, tag value must be an array");
1532
1533 {
1534 AV *av = (AV *)SvRV (val);
1535 int i, len = av_len (av) + 1;
1536 HV *stash = gv_stashsv (tag, 0);
1537 SV *sv;
1538
1539 if (!stash)
1540 ERR ("cannot decode perl-object (package does not exist)");
1541
1542 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1543
1544 if (!method)
1545 ERR ("cannot decode perl-object (package does not have a THAW method)");
1546
1547 dSP;
1548
1549 ENTER; SAVETMPS; PUSHMARK (SP);
1550 EXTEND (SP, len + 2);
1551 // we re-bless the reference to get overload and other niceties right
1552 PUSHs (tag);
1553 PUSHs (sv_json);
1554
1555 for (i = 0; i < len; ++i)
1556 PUSHs (*av_fetch (av, i, 1));
1557
1558 PUTBACK;
1559 call_sv ((SV *)GvCV (method), G_SCALAR);
1560 SPAGAIN;
1561
1562 SvREFCNT_dec (tag);
1563 SvREFCNT_dec (val);
1564 sv = SvREFCNT_inc (POPs);
1565
1566 PUTBACK;
1567
1568 FREETMPS; LEAVE;
1569
1570 return sv;
1571 }
1572
1573fail:
1574 SvREFCNT_dec (tag);
1575 SvREFCNT_dec (val);
1576 return 0;
1577}
1578
1579static SV *
1314decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1315{ 1581{
1316 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1317 // to parse everything. 1583 // to parse everything.
1318 switch (*dec->cur) 1584 switch (*dec->cur)
1319 { 1585 {
1320 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1321 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1322 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1323 1590
1324 case '-': 1591 case '-':
1325 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1326 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1327 return decode_num (dec); 1594 return decode_num (dec);
… …
1329 case 't': 1596 case 't':
1330 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1331 { 1598 {
1332 dec->cur += 4; 1599 dec->cur += 4;
1333#if JSON_SLOW 1600#if JSON_SLOW
1334 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1601 types_true = get_bool ("Types::Serialiser::true");
1335#endif 1602#endif
1336 return SvREFCNT_inc (json_true); 1603 return newSVsv (types_true);
1337 } 1604 }
1338 else 1605 else
1339 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1340 1607
1341 break; 1608 break;
… …
1343 case 'f': 1610 case 'f':
1344 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1345 { 1612 {
1346 dec->cur += 5; 1613 dec->cur += 5;
1347#if JSON_SLOW 1614#if JSON_SLOW
1348 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1615 types_false = get_bool ("Types::Serialiser::false");
1349#endif 1616#endif
1350 return SvREFCNT_inc (json_false); 1617 return newSVsv (types_false);
1351 } 1618 }
1352 else 1619 else
1353 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1354 1621
1355 break; 1622 break;
… …
1364 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1365 1632
1366 break; 1633 break;
1367 1634
1368 default: 1635 default:
1369 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1370 break; 1637 break;
1371 } 1638 }
1372 1639
1373fail: 1640fail:
1374 return 0; 1641 return 0;
1375} 1642}
1376 1643
1377static SV * 1644static SV *
1378decode_json (SV *string, JSON *json, UV *offset_return) 1645decode_json (SV *string, JSON *json, char **offset_return)
1379{ 1646{
1380 dec_t dec; 1647 dec_t dec;
1381 UV offset;
1382 SV *sv; 1648 SV *sv;
1383 1649
1650 /* work around bugs in 5.10 where manipulating magic values
1651 * makes perl ignore the magic in subsequent accesses.
1652 * also make a copy of non-PV values, to get them into a clean
1653 * state (SvPV should do that, but it's buggy, see below).
1654 */
1384 SvGETMAGIC (string); 1655 /*SvGETMAGIC (string);*/
1656 if (SvMAGICAL (string) || !SvPOK (string))
1657 string = sv_2mortal (newSVsv (string));
1658
1385 SvUPGRADE (string, SVt_PV); 1659 SvUPGRADE (string, SVt_PV);
1386 1660
1387 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1661 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1662 * assertion with -DDEBUGGING, although SvCUR is documented to
1663 * return the xpv_cur field which certainly exists after upgrading.
1664 * according to nicholas clark, calling SvPOK fixes this.
1665 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1666 * and hope for the best.
1667 * Damnit, SvPV_nolen still trips over yet another assertion. This
1668 * assertion business is seriously broken, try yet another workaround
1669 * for the broken -DDEBUGGING.
1670 */
1671 {
1672#ifdef DEBUGGING
1673 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1674#else
1675 STRLEN offset = SvCUR (string);
1676#endif
1677
1678 if (offset > json->max_size && json->max_size)
1388 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1679 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1389 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1680 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1681 }
1390 1682
1391 if (json->flags & F_UTF8) 1683 if (DECODE_WANTS_OCTETS (json))
1392 sv_utf8_downgrade (string, 0); 1684 sv_utf8_downgrade (string, 0);
1393 else 1685 else
1394 sv_utf8_upgrade (string); 1686 sv_utf8_upgrade (string);
1395 1687
1396 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1688 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1397 1689
1398 dec.json = *json; 1690 dec.json = *json;
1399 dec.cur = SvPVX (string); 1691 dec.cur = SvPVX (string);
1400 dec.end = SvEND (string); 1692 dec.end = SvEND (string);
1401 dec.err = 0; 1693 dec.err = 0;
1402 dec.depth = 0; 1694 dec.depth = 0;
1403 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1404 1695
1405 if (dec.json.cb_object || dec.json.cb_sk_object) 1696 if (dec.json.cb_object || dec.json.cb_sk_object)
1406 dec.json.flags |= F_HOOK; 1697 dec.json.flags |= F_HOOK;
1407 1698
1408 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1699 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1409 1700
1410 decode_ws (&dec); 1701 decode_ws (&dec);
1411 sv = decode_sv (&dec); 1702 sv = decode_sv (&dec);
1703
1704 if (offset_return)
1705 *offset_return = dec.cur;
1412 1706
1413 if (!(offset_return || !sv)) 1707 if (!(offset_return || !sv))
1414 { 1708 {
1415 // check for trailing garbage 1709 // check for trailing garbage
1416 decode_ws (&dec); 1710 decode_ws (&dec);
… …
1419 { 1713 {
1420 dec.err = "garbage after JSON object"; 1714 dec.err = "garbage after JSON object";
1421 SvREFCNT_dec (sv); 1715 SvREFCNT_dec (sv);
1422 sv = 0; 1716 sv = 0;
1423 } 1717 }
1424 }
1425
1426 if (offset_return || !sv)
1427 {
1428 offset = dec.json.flags & F_UTF8
1429 ? dec.cur - SvPVX (string)
1430 : utf8_distance (dec.cur, SvPVX (string));
1431
1432 if (offset_return)
1433 *offset_return = offset;
1434 } 1718 }
1435 1719
1436 if (!sv) 1720 if (!sv)
1437 { 1721 {
1438 SV *uni = sv_newmortal (); 1722 SV *uni = sv_newmortal ();
… …
1444 SAVEVPTR (PL_curcop); 1728 SAVEVPTR (PL_curcop);
1445 PL_curcop = &cop; 1729 PL_curcop = &cop;
1446 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1730 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1447 LEAVE; 1731 LEAVE;
1448 1732
1449 croak ("%s, at character offset %d [\"%s\"]", 1733 croak ("%s, at character offset %d (before \"%s\")",
1450 dec.err, 1734 dec.err,
1451 (int)offset, 1735 (int)ptr_to_index (string, dec.cur),
1452 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1453 } 1737 }
1454 1738
1455 sv = sv_2mortal (sv); 1739 sv = sv_2mortal (sv);
1456 1740
1457 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1741 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1458 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1742 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1459 1743
1460 return sv; 1744 return sv;
1745}
1746
1747/////////////////////////////////////////////////////////////////////////////
1748// incremental parser
1749
1750static void
1751incr_parse (JSON *self)
1752{
1753 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1754
1755 // the state machine here is a bit convoluted and could be simplified a lot
1756 // but this would make it slower, so...
1757
1758 for (;;)
1759 {
1760 //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
1761 switch (self->incr_mode)
1762 {
1763 // only used for initial whitespace skipping
1764 case INCR_M_WS:
1765 for (;;)
1766 {
1767 if (*p > 0x20)
1768 {
1769 if (*p == '#')
1770 {
1771 self->incr_mode = INCR_M_C0;
1772 goto incr_m_c;
1773 }
1774 else
1775 {
1776 self->incr_mode = INCR_M_JSON;
1777 goto incr_m_json;
1778 }
1779 }
1780 else if (!*p)
1781 goto interrupt;
1782
1783 ++p;
1784 }
1785
1786 // skip a single char inside a string (for \\-processing)
1787 case INCR_M_BS:
1788 if (!*p)
1789 goto interrupt;
1790
1791 ++p;
1792 self->incr_mode = INCR_M_STR;
1793 goto incr_m_str;
1794
1795 // inside #-style comments
1796 case INCR_M_C0:
1797 case INCR_M_C1:
1798 incr_m_c:
1799 for (;;)
1800 {
1801 if (*p == '\n')
1802 {
1803 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1804 break;
1805 }
1806 else if (!*p)
1807 goto interrupt;
1808
1809 ++p;
1810 }
1811
1812 break;
1813
1814 // inside a string
1815 case INCR_M_STR:
1816 incr_m_str:
1817 for (;;)
1818 {
1819 if (*p == '"')
1820 {
1821 ++p;
1822 self->incr_mode = INCR_M_JSON;
1823
1824 if (!self->incr_nest)
1825 goto interrupt;
1826
1827 goto incr_m_json;
1828 }
1829 else if (*p == '\\')
1830 {
1831 ++p; // "virtually" consumes character after \
1832
1833 if (!*p) // if at end of string we have to switch modes
1834 {
1835 self->incr_mode = INCR_M_BS;
1836 goto interrupt;
1837 }
1838 }
1839 else if (!*p)
1840 goto interrupt;
1841
1842 ++p;
1843 }
1844
1845 // after initial ws, outside string
1846 case INCR_M_JSON:
1847 incr_m_json:
1848 for (;;)
1849 {
1850 switch (*p++)
1851 {
1852 case 0:
1853 --p;
1854 goto interrupt;
1855
1856 case 0x09:
1857 case 0x0a:
1858 case 0x0d:
1859 case 0x20:
1860 if (!self->incr_nest)
1861 {
1862 --p; // do not eat the whitespace, let the next round do it
1863 goto interrupt;
1864 }
1865 break;
1866
1867 case '"':
1868 self->incr_mode = INCR_M_STR;
1869 goto incr_m_str;
1870
1871 case '[':
1872 case '{':
1873 case '(':
1874 if (++self->incr_nest > self->max_depth)
1875 croak (ERR_NESTING_EXCEEDED);
1876 break;
1877
1878 case ']':
1879 case '}':
1880 if (--self->incr_nest <= 0)
1881 goto interrupt;
1882 break;
1883
1884 case ')':
1885 --self->incr_nest;
1886 break;
1887
1888 case '#':
1889 self->incr_mode = INCR_M_C1;
1890 goto incr_m_c;
1891 }
1892 }
1893 }
1894
1895 modechange:
1896 ;
1897 }
1898
1899interrupt:
1900 self->incr_pos = p - SvPVX (self->incr_text);
1901 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1902 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1461} 1903}
1462 1904
1463///////////////////////////////////////////////////////////////////////////// 1905/////////////////////////////////////////////////////////////////////////////
1464// XS interface functions 1906// XS interface functions
1465 1907
… …
1474 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1475 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1476 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1477 : -1; 1919 : -1;
1478 1920
1479 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1480 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1481 1923
1482 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1924 types_true = get_bool ("Types::Serialiser::true");
1483 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1925 types_false = get_bool ("Types::Serialiser::false");
1926
1927 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json);
1929
1930 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1484} 1931}
1485 1932
1486PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1487 1934
1488void CLONE (...) 1935void CLONE (...)
1489 CODE: 1936 CODE:
1490 json_stash = 0; 1937 json_stash = 0;
1491 json_boolean_stash = 0; 1938 types_boolean_stash = 0;
1492 1939
1493void new (char *klass) 1940void new (char *klass)
1494 PPCODE: 1941 PPCODE:
1495{ 1942{
1496 SV *pv = NEWSV (0, sizeof (JSON)); 1943 SV *pv = NEWSV (0, sizeof (JSON));
1497 SvPOK_only (pv); 1944 SvPOK_only (pv);
1498 Zero (SvPVX (pv), 1, JSON); 1945 json_init ((JSON *)SvPVX (pv));
1499 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1500 XPUSHs (sv_2mortal (sv_bless ( 1946 XPUSHs (sv_2mortal (sv_bless (
1501 newRV_noinc (pv), 1947 newRV_noinc (pv),
1502 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1503 ))); 1949 )));
1504} 1950}
… …
1516 allow_nonref = F_ALLOW_NONREF 1962 allow_nonref = F_ALLOW_NONREF
1517 shrink = F_SHRINK 1963 shrink = F_SHRINK
1518 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1519 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1520 relaxed = F_RELAXED 1966 relaxed = F_RELAXED
1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1521 PPCODE: 1969 PPCODE:
1522{ 1970{
1523 if (enable) 1971 if (enable)
1524 self->flags |= ix; 1972 self->flags |= ix;
1525 else 1973 else
… …
1540 get_allow_nonref = F_ALLOW_NONREF 1988 get_allow_nonref = F_ALLOW_NONREF
1541 get_shrink = F_SHRINK 1989 get_shrink = F_SHRINK
1542 get_allow_blessed = F_ALLOW_BLESSED 1990 get_allow_blessed = F_ALLOW_BLESSED
1543 get_convert_blessed = F_CONV_BLESSED 1991 get_convert_blessed = F_CONV_BLESSED
1544 get_relaxed = F_RELAXED 1992 get_relaxed = F_RELAXED
1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1545 PPCODE: 1995 PPCODE:
1546 XPUSHs (boolSV (self->flags & ix)); 1996 XPUSHs (boolSV (self->flags & ix));
1547 1997
1548void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1549 PPCODE: 1999 PPCODE:
1550{ 2000 self->max_depth = max_depth;
1551 UV log2 = 0;
1552
1553 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1554
1555 while ((1UL << log2) < max_depth)
1556 ++log2;
1557
1558 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1559
1560 XPUSHs (ST (0)); 2001 XPUSHs (ST (0));
1561}
1562 2002
1563U32 get_max_depth (JSON *self) 2003U32 get_max_depth (JSON *self)
1564 CODE: 2004 CODE:
1565 RETVAL = DEC_DEPTH (self->flags); 2005 RETVAL = self->max_depth;
1566 OUTPUT: 2006 OUTPUT:
1567 RETVAL 2007 RETVAL
1568 2008
1569void max_size (JSON *self, UV max_size = 0) 2009void max_size (JSON *self, U32 max_size = 0)
1570 PPCODE: 2010 PPCODE:
1571{ 2011 self->max_size = max_size;
1572 UV log2 = 0;
1573
1574 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1575 if (max_size == 1) max_size = 2;
1576
1577 while ((1UL << log2) < max_size)
1578 ++log2;
1579
1580 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1581
1582 XPUSHs (ST (0)); 2012 XPUSHs (ST (0));
1583}
1584 2013
1585int get_max_size (JSON *self) 2014int get_max_size (JSON *self)
1586 CODE: 2015 CODE:
1587 RETVAL = DEC_SIZE (self->flags); 2016 RETVAL = self->max_size;
1588 OUTPUT: 2017 OUTPUT:
1589 RETVAL 2018 RETVAL
1590 2019
1591void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2020void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1592 PPCODE: 2021 PPCODE:
… …
1598} 2027}
1599 2028
1600void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2029void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1601 PPCODE: 2030 PPCODE:
1602{ 2031{
1603 if (!self->cb_sk_object) 2032 if (!self->cb_sk_object)
1604 self->cb_sk_object = newHV (); 2033 self->cb_sk_object = newHV ();
1605 2034
1606 if (SvOK (cb)) 2035 if (SvOK (cb))
1607 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2036 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1608 else 2037 else
… …
1619 XPUSHs (ST (0)); 2048 XPUSHs (ST (0));
1620} 2049}
1621 2050
1622void encode (JSON *self, SV *scalar) 2051void encode (JSON *self, SV *scalar)
1623 PPCODE: 2052 PPCODE:
1624 XPUSHs (encode_json (scalar, self)); 2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2054 XPUSHs (scalar);
1625 2055
1626void decode (JSON *self, SV *jsonstr) 2056void decode (JSON *self, SV *jsonstr)
1627 PPCODE: 2057 PPCODE:
1628 XPUSHs (decode_json (jsonstr, self, 0)); 2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2059 XPUSHs (jsonstr);
1629 2060
1630void decode_prefix (JSON *self, SV *jsonstr) 2061void decode_prefix (JSON *self, SV *jsonstr)
1631 PPCODE: 2062 PPCODE:
1632{ 2063{
1633 UV offset; 2064 SV *sv;
2065 char *offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1634 EXTEND (SP, 2); 2067 EXTEND (SP, 2);
1635 PUSHs (decode_json (jsonstr, self, &offset)); 2068 PUSHs (sv);
1636 PUSHs (sv_2mortal (newSVuv (offset))); 2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
2070}
2071
2072void incr_parse (JSON *self, SV *jsonstr = 0)
2073 PPCODE:
2074{
2075 if (!self->incr_text)
2076 self->incr_text = newSVpvn ("", 0);
2077
2078 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2079 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2080 if (DECODE_WANTS_OCTETS (self))
2081 {
2082 if (self->incr_pos)
2083 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2084 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2085
2086 sv_utf8_downgrade (self->incr_text, 0);
2087 }
2088 else
2089 {
2090 sv_utf8_upgrade (self->incr_text);
2091
2092 if (self->incr_pos)
2093 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2094 - (U8 *)SvPVX (self->incr_text);
2095 }
2096
2097 // append data, if any
2098 if (jsonstr)
2099 {
2100 /* make sure both strings have same encoding */
2101 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2102 if (SvUTF8 (jsonstr))
2103 sv_utf8_downgrade (jsonstr, 0);
2104 else
2105 sv_utf8_upgrade (jsonstr);
2106
2107 /* and then just blindly append */
2108 {
2109 STRLEN len;
2110 const char *str = SvPV (jsonstr, len);
2111 STRLEN cur = SvCUR (self->incr_text);
2112
2113 if (SvLEN (self->incr_text) <= cur + len)
2114 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2115
2116 Move (str, SvEND (self->incr_text), len, char);
2117 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2118 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2119 }
2120 }
2121
2122 if (GIMME_V != G_VOID)
2123 do
2124 {
2125 SV *sv;
2126 char *offset;
2127
2128 if (!INCR_DONE (self))
2129 {
2130 incr_parse (self);
2131
2132 if (self->incr_pos > self->max_size && self->max_size)
2133 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2134 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2135
2136 if (!INCR_DONE (self))
2137 {
2138 // as an optimisation, do not accumulate white space in the incr buffer
2139 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2140 {
2141 self->incr_pos = 0;
2142 SvCUR_set (self->incr_text, 0);
2143 }
2144
2145 break;
2146 }
2147 }
2148
2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv);
2151
2152 self->incr_pos -= offset - SvPVX (self->incr_text);
2153 self->incr_nest = 0;
2154 self->incr_mode = 0;
2155
2156 sv_chop (self->incr_text, offset);
2157 }
2158 while (GIMME_V == G_ARRAY);
2159}
2160
2161SV *incr_text (JSON *self)
2162 ATTRS: lvalue
2163 CODE:
2164{
2165 if (self->incr_pos)
2166 croak ("incr_text can not be called when the incremental parser already started parsing");
2167
2168 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2169}
2170 OUTPUT:
2171 RETVAL
2172
2173void incr_skip (JSON *self)
2174 CODE:
2175{
2176 if (self->incr_pos)
2177 {
2178 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2179 self->incr_pos = 0;
2180 self->incr_nest = 0;
2181 self->incr_mode = 0;
2182 }
2183}
2184
2185void incr_reset (JSON *self)
2186 CODE:
2187{
2188 SvREFCNT_dec (self->incr_text);
2189 self->incr_text = 0;
2190 self->incr_pos = 0;
2191 self->incr_nest = 0;
2192 self->incr_mode = 0;
1637} 2193}
1638 2194
1639void DESTROY (JSON *self) 2195void DESTROY (JSON *self)
1640 CODE: 2196 CODE:
1641 SvREFCNT_dec (self->cb_sk_object); 2197 SvREFCNT_dec (self->cb_sk_object);
1642 SvREFCNT_dec (self->cb_object); 2198 SvREFCNT_dec (self->cb_object);
2199 SvREFCNT_dec (self->incr_text);
1643 2200
1644PROTOTYPES: ENABLE 2201PROTOTYPES: ENABLE
1645 2202
1646void encode_json (SV *scalar) 2203void encode_json (SV *scalar)
1647 ALIAS:
1648 to_json_ = 0
1649 encode_json = F_UTF8
1650 PPCODE: 2204 PPCODE:
1651{ 2205{
1652 JSON json = { F_DEFAULT | ix }; 2206 JSON json;
1653 XPUSHs (encode_json (scalar, &json)); 2207 json_init (&json);
2208 json.flags |= F_UTF8;
2209 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2210 XPUSHs (scalar);
1654} 2211}
1655 2212
1656void decode_json (SV *jsonstr) 2213void decode_json (SV *jsonstr)
1657 ALIAS:
1658 from_json_ = 0
1659 decode_json = F_UTF8
1660 PPCODE: 2214 PPCODE:
1661{ 2215{
1662 JSON json = { F_DEFAULT | ix }; 2216 JSON json;
1663 XPUSHs (decode_json (jsonstr, &json, 0)); 2217 json_init (&json);
2218 json.flags |= F_UTF8;
2219 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2220 XPUSHs (jsonstr);
1664} 2221}
1665 2222

Diff Legend

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