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

Diff Legend

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