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.97 by root, Fri Jul 3 09:38:30 2009 UTC vs.
Revision 1.135 by root, Thu Nov 15 20:49:12 2018 UTC

6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
13# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
14#endif 15#endif
15 16
16// some old perls do not have this, try to make it work, no 17// some old perls do not have this, try to make it work, no
17// guarentees, though. if it breaks, you get to keep the pieces. 18// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 19#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 20# define UTF8_MAXBYTES 13
20#endif 21#endif
21 22
23// compatibility with perl <5.18
24#ifndef HvNAMELEN_get
25# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
26#endif
27#ifndef HvNAMELEN
28# define HvNAMELEN(hv) HvNAMELEN_get (hv)
29#endif
30#ifndef HvNAMEUTF8
31# define HvNAMEUTF8(hv) 0
32#endif
33
34// three extra for rounding, sign, and end of string
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2) 35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
23 36
24#define F_ASCII 0x00000001UL 37#define F_ASCII 0x00000001UL
25#define F_LATIN1 0x00000002UL 38#define F_LATIN1 0x00000002UL
26#define F_UTF8 0x00000004UL 39#define F_UTF8 0x00000004UL
27#define F_INDENT 0x00000008UL 40#define F_INDENT 0x00000008UL
32#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
33#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
34#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
35#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
36#define F_ALLOW_UNKNOWN 0x00002000UL 49#define F_ALLOW_UNKNOWN 0x00002000UL
50#define F_ALLOW_TAGS 0x00004000UL
37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
38 52
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40 54
41#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
42#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
43 57
44#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 58#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
59
60#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
45 61
46#define SB do { 62#define SB do {
47#define SE } while (0) 63#define SE } while (0)
48 64
49#if __GNUC__ >= 3 65#if __GNUC__ >= 3
62 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
63 79
64#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)" 80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
65 81
66#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
67# define JSON_SLOW 1
68# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
85# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
69#else 86#else
70# define JSON_SLOW 0
71# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
72#endif 90#endif
73 91
74static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
75static SV *json_true, *json_false; 93#define STACK_HES 64
94
95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
96static SV *bool_false, *bool_true;
97static SV *sv_json;
76 98
77enum { 99enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0 100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string 101 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash 102 INCR_M_BS, // inside backslash
103 INCR_M_C0, // inside comment in initial whitespace sequence
104 INCR_M_C1, // inside comment in other places
81 INCR_M_JSON // outside anything, count nesting 105 INCR_M_JSON // outside anything, count nesting
82}; 106};
83 107
84#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON) 108#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
85 109
94 // for the incremental parser 118 // for the incremental parser
95 SV *incr_text; // the source text so far 119 SV *incr_text; // the source text so far
96 STRLEN incr_pos; // the current offset into the text 120 STRLEN incr_pos; // the current offset into the text
97 int incr_nest; // {[]}-nesting level 121 int incr_nest; // {[]}-nesting level
98 unsigned char incr_mode; 122 unsigned char incr_mode;
123
124 SV *v_false, *v_true;
99} JSON; 125} JSON;
100 126
101INLINE void 127INLINE void
102json_init (JSON *json) 128json_init (JSON *json)
103{ 129{
104 Zero (json, 1, JSON); 130 static const JSON init = { F_ALLOW_NONREF, 512 };
105 json->max_depth = 512; 131
132 *json = init;
106} 133}
107 134
108///////////////////////////////////////////////////////////////////////////// 135/////////////////////////////////////////////////////////////////////////////
109// utility functions 136// utility functions
110 137
132 SvPV_renew (sv, SvCUR (sv) + 1); 159 SvPV_renew (sv, SvCUR (sv) + 1);
133#endif 160#endif
134 } 161 }
135} 162}
136 163
164/* adds two STRLENs together, slow, and with paranoia */
165STRLEN
166strlen_sum (STRLEN l1, STRLEN l2)
167{
168 size_t sum = l1 + l2;
169
170 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
171 croak ("JSON::XS: string size overflow");
172
173 return sum;
174}
175
176/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
177static char *
178json_sv_grow (SV *sv, size_t len1, size_t len2)
179{
180 len1 = strlen_sum (len1, len2);
181 len1 = strlen_sum (len1, len1 >> 1);
182
183 if (len1 > 4096 - 24)
184 len1 = (len1 | 4095) - 24;
185
186 return SvGROW (sv, len1);
187}
188
137// decode an utf-8 character and return it, or (UV)-1 in 189// decode a utf-8 character and return it, or (UV)-1 in
138// case of an error. 190// case of an error.
139// we special-case "safe" characters from U+80 .. U+7FF, 191// we special-case "safe" characters from U+80 .. U+7FF,
140// but use the very good perl function to parse anything else. 192// but use the very good perl function to parse anything else.
141// note that we never call this function for a ascii codepoints 193// note that we never call this function for a ascii codepoints
142INLINE UV 194INLINE UV
185 ? utf8_distance (offset, SvPVX (sv)) 237 ? utf8_distance (offset, SvPVX (sv))
186 : offset - SvPVX (sv); 238 : offset - SvPVX (sv);
187} 239}
188 240
189///////////////////////////////////////////////////////////////////////////// 241/////////////////////////////////////////////////////////////////////////////
242// fp hell
243
244// scan a group of digits, and a trailing exponent
245static void
246json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
247{
248 UV uaccum = 0;
249 int eaccum = 0;
250
251 // if we recurse too deep, skip all remaining digits
252 // to avoid a stack overflow attack
253 if (expect_false (--maxdepth <= 0))
254 while (((U8)*s - '0') < 10)
255 ++s;
256
257 for (;;)
258 {
259 U8 dig = (U8)*s - '0';
260
261 if (expect_false (dig >= 10))
262 {
263 if (dig == (U8)((U8)'.' - (U8)'0'))
264 {
265 ++s;
266 json_atof_scan1 (s, accum, expo, 1, maxdepth);
267 }
268 else if ((dig | ' ') == 'e' - '0')
269 {
270 int exp2 = 0;
271 int neg = 0;
272
273 ++s;
274
275 if (*s == '-')
276 {
277 ++s;
278 neg = 1;
279 }
280 else if (*s == '+')
281 ++s;
282
283 while ((dig = (U8)*s - '0') < 10)
284 exp2 = exp2 * 10 + *s++ - '0';
285
286 *expo += neg ? -exp2 : exp2;
287 }
288
289 break;
290 }
291
292 ++s;
293
294 uaccum = uaccum * 10 + dig;
295 ++eaccum;
296
297 // if we have too many digits, then recurse for more
298 // we actually do this for rather few digits
299 if (uaccum >= (UV_MAX - 9) / 10)
300 {
301 if (postdp) *expo -= eaccum;
302 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
303 if (postdp) *expo += eaccum;
304
305 break;
306 }
307 }
308
309 // this relies greatly on the quality of the pow ()
310 // implementation of the platform, but a good
311 // implementation is hard to beat.
312 // (IEEE 754 conformant ones are required to be exact)
313 if (postdp) *expo -= eaccum;
314 *accum += uaccum * Perl_pow (10., *expo);
315 *expo += eaccum;
316}
317
318static NV
319json_atof (const char *s)
320{
321 NV accum = 0.;
322 int expo = 0;
323 int neg = 0;
324
325 if (*s == '-')
326 {
327 ++s;
328 neg = 1;
329 }
330
331 // a recursion depth of ten gives us >>500 bits
332 json_atof_scan1 (s, &accum, &expo, 0, 10);
333
334 return neg ? -accum : accum;
335}
336
337// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
338static int
339ref_bool_type (SV *sv)
340{
341 svtype svt = SvTYPE (sv);
342
343 if (svt < SVt_PVAV)
344 {
345 STRLEN len = 0;
346 char *pv = svt ? SvPV (sv, len) : 0;
347
348 if (len == 1)
349 if (*pv == '1')
350 return 1;
351 else if (*pv == '0')
352 return 0;
353 }
354
355 return -1;
356}
357
358// returns whether scalar is not a reference in the sense of allow_nonref
359static int
360json_nonref (SV *scalar)
361{
362 if (!SvROK (scalar))
363 return 1;
364
365 scalar = SvRV (scalar);
366
367 if (SvTYPE (scalar) >= SVt_PVMG)
368 {
369 if (SvSTASH (scalar) == bool_stash)
370 return 1;
371
372 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
373 return 1;
374 }
375
376 return 0;
377}
378
379/////////////////////////////////////////////////////////////////////////////
190// encoder 380// encoder
191 381
192// structure used for encoding JSON 382// structure used for encoding JSON
193typedef struct 383typedef struct
194{ 384{
201} enc_t; 391} enc_t;
202 392
203INLINE void 393INLINE void
204need (enc_t *enc, STRLEN len) 394need (enc_t *enc, STRLEN len)
205{ 395{
206 if (expect_false (enc->cur + len >= enc->end)) 396 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
207 { 397 {
208 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 398 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
209 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 399 char *buf = json_sv_grow (enc->sv, cur, len);
210 enc->cur = SvPVX (enc->sv) + cur; 400 enc->cur = buf + cur;
211 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 401 enc->end = buf + SvLEN (enc->sv) - 1;
212 } 402 }
213} 403}
214 404
215INLINE void 405INLINE void
216encode_ch (enc_t *enc, char ch) 406encode_ch (enc_t *enc, char ch)
232 422
233 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 423 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
234 { 424 {
235 if (expect_false (ch == '"')) // but with slow exceptions 425 if (expect_false (ch == '"')) // but with slow exceptions
236 { 426 {
237 need (enc, len += 1); 427 need (enc, len + 1);
238 *enc->cur++ = '\\'; 428 *enc->cur++ = '\\';
239 *enc->cur++ = '"'; 429 *enc->cur++ = '"';
240 } 430 }
241 else if (expect_false (ch == '\\')) 431 else if (expect_false (ch == '\\'))
242 { 432 {
243 need (enc, len += 1); 433 need (enc, len + 1);
244 *enc->cur++ = '\\'; 434 *enc->cur++ = '\\';
245 *enc->cur++ = '\\'; 435 *enc->cur++ = '\\';
246 } 436 }
247 else 437 else
248 *enc->cur++ = ch; 438 *enc->cur++ = ch;
251 } 441 }
252 else 442 else
253 { 443 {
254 switch (ch) 444 switch (ch)
255 { 445 {
256 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 446 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
257 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 447 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
258 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 448 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
259 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 449 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
260 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 450 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
261 451
262 default: 452 default:
263 { 453 {
264 STRLEN clen; 454 STRLEN clen;
265 UV uch; 455 UV uch;
281 if (uch >= 0x10000UL) 471 if (uch >= 0x10000UL)
282 { 472 {
283 if (uch >= 0x110000UL) 473 if (uch >= 0x110000UL)
284 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 474 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
285 475
286 need (enc, len += 11); 476 need (enc, len + 11);
287 sprintf (enc->cur, "\\u%04x\\u%04x", 477 sprintf (enc->cur, "\\u%04x\\u%04x",
288 (int)((uch - 0x10000) / 0x400 + 0xD800), 478 (int)((uch - 0x10000) / 0x400 + 0xD800),
289 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 479 (int)((uch - 0x10000) % 0x400 + 0xDC00));
290 enc->cur += 12; 480 enc->cur += 12;
291 } 481 }
292 else 482 else
293 { 483 {
294 need (enc, len += 5); 484 need (enc, len + 5);
295 *enc->cur++ = '\\'; 485 *enc->cur++ = '\\';
296 *enc->cur++ = 'u'; 486 *enc->cur++ = 'u';
297 *enc->cur++ = PL_hexdigit [ uch >> 12 ]; 487 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
298 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15]; 488 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
299 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15]; 489 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
307 *enc->cur++ = uch; 497 *enc->cur++ = uch;
308 str += clen; 498 str += clen;
309 } 499 }
310 else if (is_utf8) 500 else if (is_utf8)
311 { 501 {
312 need (enc, len += clen); 502 need (enc, len + clen);
313 do 503 do
314 { 504 {
315 *enc->cur++ = *str++; 505 *enc->cur++ = *str++;
316 } 506 }
317 while (--clen); 507 while (--clen);
318 } 508 }
319 else 509 else
320 { 510 {
321 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 511 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
322 enc->cur = encode_utf8 (enc->cur, uch); 512 enc->cur = encode_utf8 (enc->cur, uch);
323 ++str; 513 ++str;
324 } 514 }
325 } 515 }
326 } 516 }
380 570
381 if (enc->indent >= enc->json.max_depth) 571 if (enc->indent >= enc->json.max_depth)
382 croak (ERR_NESTING_EXCEEDED); 572 croak (ERR_NESTING_EXCEEDED);
383 573
384 encode_ch (enc, '['); 574 encode_ch (enc, '[');
385 575
386 if (len >= 0) 576 if (len >= 0)
387 { 577 {
388 encode_nl (enc); ++enc->indent; 578 encode_nl (enc); ++enc->indent;
389 579
390 for (i = 0; i <= len; ++i) 580 for (i = 0; i <= len; ++i)
402 encode_comma (enc); 592 encode_comma (enc);
403 } 593 }
404 594
405 encode_nl (enc); --enc->indent; encode_indent (enc); 595 encode_nl (enc); --enc->indent; encode_indent (enc);
406 } 596 }
407 597
408 encode_ch (enc, ']'); 598 encode_ch (enc, ']');
409} 599}
410 600
411static void 601static void
412encode_hk (enc_t *enc, HE *he) 602encode_hk (enc_t *enc, HE *he)
416 if (HeKLEN (he) == HEf_SVKEY) 606 if (HeKLEN (he) == HEf_SVKEY)
417 { 607 {
418 SV *sv = HeSVKEY (he); 608 SV *sv = HeSVKEY (he);
419 STRLEN len; 609 STRLEN len;
420 char *str; 610 char *str;
421 611
422 SvGETMAGIC (sv); 612 SvGETMAGIC (sv);
423 str = SvPV (sv, len); 613 str = SvPV (sv, len);
424 614
425 encode_str (enc, str, len, SvUTF8 (sv)); 615 encode_str (enc, str, len, SvUTF8 (sv));
426 } 616 }
471 661
472 // for canonical output we have to sort by keys first 662 // for canonical output we have to sort by keys first
473 // actually, this is mostly due to the stupid so-called 663 // actually, this is mostly due to the stupid so-called
474 // security workaround added somewhere in 5.8.x 664 // security workaround added somewhere in 5.8.x
475 // that randomises hash orderings 665 // that randomises hash orderings
476 if (enc->json.flags & F_CANONICAL) 666 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
477 { 667 {
478 int count = hv_iterinit (hv); 668 int count = hv_iterinit (hv);
479 669
480 if (SvMAGICAL (hv)) 670 if (SvMAGICAL (hv))
481 { 671 {
492 } 682 }
493 683
494 if (count) 684 if (count)
495 { 685 {
496 int i, fast = 1; 686 int i, fast = 1;
497#if defined(__BORLANDC__) || defined(_MSC_VER) 687 HE *hes_stack [STACK_HES];
498 HE **hes = _alloca (count * sizeof (HE)); 688 HE **hes = hes_stack;
499#else 689
500 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 690 // allocate larger arrays on the heap
501#endif 691 if (count > STACK_HES)
692 {
693 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
694 hes = (HE **)SvPVX (sv);
695 }
502 696
503 i = 0; 697 i = 0;
504 while ((he = hv_iternext (hv))) 698 while ((he = hv_iternext (hv)))
505 { 699 {
506 hes [i++] = he; 700 hes [i++] = he;
575// encode objects, arrays and special \0=false and \1=true values. 769// encode objects, arrays and special \0=false and \1=true values.
576static void 770static void
577encode_rv (enc_t *enc, SV *sv) 771encode_rv (enc_t *enc, SV *sv)
578{ 772{
579 svtype svt; 773 svtype svt;
774 GV *method;
580 775
581 SvGETMAGIC (sv); 776 SvGETMAGIC (sv);
582 svt = SvTYPE (sv); 777 svt = SvTYPE (sv);
583 778
584 if (expect_false (SvOBJECT (sv))) 779 if (expect_false (SvOBJECT (sv)))
585 { 780 {
586 HV *stash = !JSON_SLOW || json_boolean_stash 781 HV *stash = SvSTASH (sv);
587 ? json_boolean_stash
588 : gv_stashpv ("JSON::XS::Boolean", 1);
589 782
590 if (SvSTASH (sv) == stash) 783 if (stash == bool_stash)
591 { 784 {
592 if (SvIV (sv))
593 encode_str (enc, "true", 4, 0); 785 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
594 else
595 encode_str (enc, "false", 5, 0); 786 else encode_str (enc, "false", 5, 0);
596 } 787 }
788 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
789 {
790 int count;
791 dSP;
792
793 ENTER; SAVETMPS;
794 PUSHMARK (SP);
795 EXTEND (SP, 2);
796 // we re-bless the reference to get overload and other niceties right
797 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
798 PUSHs (sv_json);
799
800 PUTBACK;
801 count = call_sv ((SV *)GvCV (method), G_ARRAY);
802 SPAGAIN;
803
804 // catch this surprisingly common error
805 if (SvROK (TOPs) && SvRV (TOPs) == sv)
806 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
807
808 encode_ch (enc, '(');
809 encode_ch (enc, '"');
810 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
811 encode_ch (enc, '"');
812 encode_ch (enc, ')');
813 encode_ch (enc, '[');
814
815 if (count)
816 {
817 int i;
818
819 for (i = 0; i < count - 1; ++i)
820 {
821 encode_sv (enc, SP[i + 1 - count]);
822 encode_ch (enc, ',');
823 }
824
825 encode_sv (enc, TOPs);
826 SP -= count;
827 }
828
829 encode_ch (enc, ']');
830
831 FREETMPS; LEAVE;
832 }
833 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
834 {
835 dSP;
836
837 ENTER; SAVETMPS;
838 PUSHMARK (SP);
839 // we re-bless the reference to get overload and other niceties right
840 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
841
842 // calling with G_SCALAR ensures that we always get a 1 return value
843 PUTBACK;
844 call_sv ((SV *)GvCV (method), G_SCALAR);
845 SPAGAIN;
846
847 // catch this surprisingly common error
848 if (SvROK (TOPs) && SvRV (TOPs) == sv)
849 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
850
851 sv = POPs;
852 PUTBACK;
853
854 encode_sv (enc, sv);
855
856 FREETMPS; LEAVE;
857 }
858 else if (enc->json.flags & F_ALLOW_BLESSED)
859 encode_str (enc, "null", 4, 0);
597 else 860 else
598 {
599#if 0
600 if (0 && sv_derived_from (rv, "JSON::Literal"))
601 {
602 // not yet
603 }
604#endif
605 if (enc->json.flags & F_CONV_BLESSED)
606 {
607 // we re-bless the reference to get overload and other niceties right
608 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
609
610 if (to_json)
611 {
612 dSP;
613
614 ENTER; SAVETMPS; PUSHMARK (SP);
615 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
616
617 // calling with G_SCALAR ensures that we always get a 1 return value
618 PUTBACK;
619 call_sv ((SV *)GvCV (to_json), G_SCALAR);
620 SPAGAIN;
621
622 // catch this surprisingly common error
623 if (SvROK (TOPs) && SvRV (TOPs) == sv)
624 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
625
626 sv = POPs;
627 PUTBACK;
628
629 encode_sv (enc, sv);
630
631 FREETMPS; LEAVE;
632 }
633 else if (enc->json.flags & F_ALLOW_BLESSED)
634 encode_str (enc, "null", 4, 0);
635 else
636 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
637 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
638 }
639 else if (enc->json.flags & F_ALLOW_BLESSED)
640 encode_str (enc, "null", 4, 0);
641 else
642 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 861 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
643 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 862 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644 }
645 } 863 }
646 else if (svt == SVt_PVHV) 864 else if (svt == SVt_PVHV)
647 encode_hv (enc, (HV *)sv); 865 encode_hv (enc, (HV *)sv);
648 else if (svt == SVt_PVAV) 866 else if (svt == SVt_PVAV)
649 encode_av (enc, (AV *)sv); 867 encode_av (enc, (AV *)sv);
650 else if (svt < SVt_PVAV) 868 else if (svt < SVt_PVAV)
651 { 869 {
652 STRLEN len = 0; 870 int bool_type = ref_bool_type (sv);
653 char *pv = svt ? SvPV (sv, len) : 0;
654 871
655 if (len == 1 && *pv == '1') 872 if (bool_type == 1)
656 encode_str (enc, "true", 4, 0); 873 encode_str (enc, "true", 4, 0);
657 else if (len == 1 && *pv == '0') 874 else if (bool_type == 0)
658 encode_str (enc, "false", 5, 0); 875 encode_str (enc, "false", 5, 0);
659 else if (enc->json.flags & F_ALLOW_UNKNOWN) 876 else if (enc->json.flags & F_ALLOW_UNKNOWN)
660 encode_str (enc, "null", 4, 0); 877 encode_str (enc, "null", 4, 0);
661 else 878 else
662 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 879 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
725 } 942 }
726 else 943 else
727 { 944 {
728 // large integer, use the (rather slow) snprintf way. 945 // large integer, use the (rather slow) snprintf way.
729 need (enc, IVUV_MAXCHARS); 946 need (enc, IVUV_MAXCHARS);
730 enc->cur += 947 enc->cur +=
731 SvIsUV(sv) 948 SvIsUV(sv)
732 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 949 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
733 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 950 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
734 } 951 }
735 } 952 }
736 else if (SvROK (sv)) 953 else if (SvROK (sv))
737 encode_rv (enc, SvRV (sv)); 954 encode_rv (enc, SvRV (sv));
738 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 955 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
739 encode_str (enc, "null", 4, 0); 956 encode_str (enc, "null", 4, 0);
740 else 957 else
741 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 958 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
742 SvPV_nolen (sv), SvFLAGS (sv)); 959 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
743} 960}
744 961
745static SV * 962static SV *
746encode_json (SV *scalar, JSON *json) 963encode_json (SV *scalar, JSON *json)
747{ 964{
748 enc_t enc; 965 enc_t enc;
749 966
750 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 967 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
751 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 968 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
752 969
753 enc.json = *json; 970 enc.json = *json;
754 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 971 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
755 enc.cur = SvPVX (enc.sv); 972 enc.cur = SvPVX (enc.sv);
759 : enc.json.flags & F_LATIN1 ? 0x000100UL 976 : enc.json.flags & F_LATIN1 ? 0x000100UL
760 : 0x110000UL; 977 : 0x110000UL;
761 978
762 SvPOK_only (enc.sv); 979 SvPOK_only (enc.sv);
763 encode_sv (&enc, scalar); 980 encode_sv (&enc, scalar);
981 encode_nl (&enc);
764 982
765 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 983 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
766 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 984 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
767 985
768 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 986 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
948 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1166 else if (expect_true (ch >= 0x20 && ch < 0x80))
949 *cur++ = ch; 1167 *cur++ = ch;
950 else if (ch >= 0x80) 1168 else if (ch >= 0x80)
951 { 1169 {
952 STRLEN clen; 1170 STRLEN clen;
953 UV uch;
954 1171
955 --dec_cur; 1172 --dec_cur;
956 1173
957 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1174 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
958 if (clen == (STRLEN)-1) 1175 if (clen == (STRLEN)-1)
959 ERR ("malformed UTF-8 character in JSON string"); 1176 ERR ("malformed UTF-8 character in JSON string");
960 1177
961 do 1178 do
962 *cur++ = *dec_cur++; 1179 *cur++ = *dec_cur++;
963 while (--clen); 1180 while (--clen);
964 1181
965 utf8 = 1; 1182 utf8 = 1;
966 } 1183 }
1184 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1185 *cur++ = ch;
967 else 1186 else
968 { 1187 {
969 --dec_cur; 1188 --dec_cur;
970 1189
971 if (!ch) 1190 if (!ch)
981 1200
982 if (sv) 1201 if (sv)
983 { 1202 {
984 STRLEN cur = SvCUR (sv); 1203 STRLEN cur = SvCUR (sv);
985 1204
986 if (SvLEN (sv) <= cur + len) 1205 if (SvLEN (sv) - cur <= len)
987 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 1206 json_sv_grow (sv, cur, len);
988 1207
989 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1208 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
990 SvCUR_set (sv, SvCUR (sv) + len); 1209 SvCUR_set (sv, SvCUR (sv) + len);
991 } 1210 }
992 else 1211 else
1116 } 1335 }
1117 1336
1118 len -= *start == '-' ? 1 : 0; 1337 len -= *start == '-' ? 1 : 0;
1119 1338
1120 // does not fit into IV or UV, try NV 1339 // does not fit into IV or UV, try NV
1121 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1340 if (len <= NV_DIG)
1122 #if defined (LDBL_DIG)
1123 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1124 #endif
1125 )
1126 // fits into NV without loss of precision 1341 // fits into NV without loss of precision
1127 return newSVnv (Atof (start)); 1342 return newSVnv (json_atof (start));
1128 1343
1129 // everything else fails, convert it to a string 1344 // everything else fails, convert it to a string
1130 return newSVpvn (start, dec->cur - start); 1345 return newSVpvn (start, dec->cur - start);
1131 } 1346 }
1132 1347
1133 // loss of precision here 1348 // loss of precision here
1134 return newSVnv (Atof (start)); 1349 return newSVnv (json_atof (start));
1135 1350
1136fail: 1351fail:
1137 return 0; 1352 return 0;
1138} 1353}
1139 1354
1163 if (*dec->cur == ']') 1378 if (*dec->cur == ']')
1164 { 1379 {
1165 ++dec->cur; 1380 ++dec->cur;
1166 break; 1381 break;
1167 } 1382 }
1168 1383
1169 if (*dec->cur != ',') 1384 if (*dec->cur != ',')
1170 ERR (", or ] expected while parsing array"); 1385 ERR (", or ] expected while parsing array");
1171 1386
1172 ++dec->cur; 1387 ++dec->cur;
1173 1388
1297 1512
1298 hv_iterinit (hv); 1513 hv_iterinit (hv);
1299 he = hv_iternext (hv); 1514 he = hv_iternext (hv);
1300 hv_iterinit (hv); 1515 hv_iterinit (hv);
1301 1516
1302 // the next line creates a mortal sv each time its called. 1517 // the next line creates a mortal sv each time it's called.
1303 // might want to optimise this for common cases. 1518 // might want to optimise this for common cases.
1304 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1519 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1305 1520
1306 if (cb) 1521 if (cb)
1307 { 1522 {
1308 dSP; 1523 dSP;
1309 int count; 1524 int count;
1310 1525
1311 ENTER; SAVETMPS; PUSHMARK (SP); 1526 ENTER; SAVETMPS;
1527 PUSHMARK (SP);
1312 XPUSHs (HeVAL (he)); 1528 XPUSHs (HeVAL (he));
1529 sv_2mortal (sv);
1313 1530
1314 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1531 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1315 1532
1316 if (count == 1) 1533 if (count == 1)
1317 { 1534 {
1318 sv = newSVsv (POPs); 1535 sv = newSVsv (POPs);
1319 FREETMPS; LEAVE; 1536 FREETMPS; LEAVE;
1320 return sv; 1537 return sv;
1321 } 1538 }
1539 else if (count)
1540 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1322 1541
1542 SvREFCNT_inc (sv);
1323 FREETMPS; LEAVE; 1543 FREETMPS; LEAVE;
1324 } 1544 }
1325 } 1545 }
1326 1546
1327 if (dec->json.cb_object) 1547 if (dec->json.cb_object)
1328 { 1548 {
1329 dSP; 1549 dSP;
1330 int count; 1550 int count;
1331 1551
1332 ENTER; SAVETMPS; PUSHMARK (SP); 1552 ENTER; SAVETMPS;
1553 PUSHMARK (SP);
1333 XPUSHs (sv_2mortal (sv)); 1554 XPUSHs (sv_2mortal (sv));
1334 1555
1335 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1556 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1336 1557
1337 if (count == 1) 1558 if (count == 1)
1338 { 1559 {
1339 sv = newSVsv (POPs); 1560 sv = newSVsv (POPs);
1340 FREETMPS; LEAVE; 1561 FREETMPS; LEAVE;
1341 return sv; 1562 return sv;
1342 } 1563 }
1564 else if (count)
1565 croak ("filter_json_object callbacks must not return more than one scalar");
1343 1566
1344 SvREFCNT_inc (sv); 1567 SvREFCNT_inc (sv);
1345 FREETMPS; LEAVE; 1568 FREETMPS; LEAVE;
1346 } 1569 }
1347 } 1570 }
1353 DEC_DEC_DEPTH; 1576 DEC_DEC_DEPTH;
1354 return 0; 1577 return 0;
1355} 1578}
1356 1579
1357static SV * 1580static SV *
1581decode_tag (dec_t *dec)
1582{
1583 SV *tag = 0;
1584 SV *val = 0;
1585
1586 if (!(dec->json.flags & F_ALLOW_TAGS))
1587 ERR ("malformed JSON string, neither array, object, number, string or atom");
1588
1589 ++dec->cur;
1590
1591 decode_ws (dec);
1592
1593 tag = decode_sv (dec);
1594 if (!tag)
1595 goto fail;
1596
1597 if (!SvPOK (tag))
1598 ERR ("malformed JSON string, (tag) must be a string");
1599
1600 decode_ws (dec);
1601
1602 if (*dec->cur != ')')
1603 ERR (") expected after tag");
1604
1605 ++dec->cur;
1606
1607 decode_ws (dec);
1608
1609 val = decode_sv (dec);
1610 if (!val)
1611 goto fail;
1612
1613 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1614 ERR ("malformed JSON string, tag value must be an array");
1615
1616 {
1617 AV *av = (AV *)SvRV (val);
1618 int i, len = av_len (av) + 1;
1619 HV *stash = gv_stashsv (tag, 0);
1620 SV *sv;
1621
1622 if (!stash)
1623 ERR ("cannot decode perl-object (package does not exist)");
1624
1625 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1626
1627 if (!method)
1628 ERR ("cannot decode perl-object (package does not have a THAW method)");
1629
1630 dSP;
1631
1632 ENTER; SAVETMPS;
1633 PUSHMARK (SP);
1634 EXTEND (SP, len + 2);
1635 // we re-bless the reference to get overload and other niceties right
1636 PUSHs (tag);
1637 PUSHs (sv_json);
1638
1639 for (i = 0; i < len; ++i)
1640 PUSHs (*av_fetch (av, i, 1));
1641
1642 PUTBACK;
1643 call_sv ((SV *)GvCV (method), G_SCALAR);
1644 SPAGAIN;
1645
1646 SvREFCNT_dec (tag);
1647 SvREFCNT_dec (val);
1648 sv = SvREFCNT_inc (POPs);
1649
1650 PUTBACK;
1651
1652 FREETMPS; LEAVE;
1653
1654 return sv;
1655 }
1656
1657fail:
1658 SvREFCNT_dec (tag);
1659 SvREFCNT_dec (val);
1660 return 0;
1661}
1662
1663static SV *
1358decode_sv (dec_t *dec) 1664decode_sv (dec_t *dec)
1359{ 1665{
1360 // the beauty of JSON: you need exactly one character lookahead 1666 // the beauty of JSON: you need exactly one character lookahead
1361 // to parse everything. 1667 // to parse everything.
1362 switch (*dec->cur) 1668 switch (*dec->cur)
1363 { 1669 {
1364 case '"': ++dec->cur; return decode_str (dec); 1670 case '"': ++dec->cur; return decode_str (dec);
1365 case '[': ++dec->cur; return decode_av (dec); 1671 case '[': ++dec->cur; return decode_av (dec);
1366 case '{': ++dec->cur; return decode_hv (dec); 1672 case '{': ++dec->cur; return decode_hv (dec);
1673 case '(': return decode_tag (dec);
1367 1674
1368 case '-': 1675 case '-':
1369 case '0': case '1': case '2': case '3': case '4': 1676 case '0': case '1': case '2': case '3': case '4':
1370 case '5': case '6': case '7': case '8': case '9': 1677 case '5': case '6': case '7': case '8': case '9':
1371 return decode_num (dec); 1678 return decode_num (dec);
1372 1679
1680 case 'f':
1681 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1682 {
1683 dec->cur += 5;
1684
1685 if (expect_false (!dec->json.v_false))
1686 dec->json.v_false = GET_BOOL (false);
1687
1688 return newSVsv (dec->json.v_false);
1689 }
1690 else
1691 ERR ("'false' expected");
1692
1693 break;
1694
1373 case 't': 1695 case 't':
1374 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1696 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1375 { 1697 {
1376 dec->cur += 4; 1698 dec->cur += 4;
1377#if JSON_SLOW 1699
1378 json_true = get_bool ("JSON::XS::true"); 1700 if (expect_false (!dec->json.v_true))
1379#endif 1701 dec->json.v_true = GET_BOOL (true);
1702
1380 return newSVsv (json_true); 1703 return newSVsv (dec->json.v_true);
1381 } 1704 }
1382 else 1705 else
1383 ERR ("'true' expected"); 1706 ERR ("'true' expected");
1384
1385 break;
1386
1387 case 'f':
1388 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1389 {
1390 dec->cur += 5;
1391#if JSON_SLOW
1392 json_false = get_bool ("JSON::XS::false");
1393#endif
1394 return newSVsv (json_false);
1395 }
1396 else
1397 ERR ("'false' expected");
1398 1707
1399 break; 1708 break;
1400 1709
1401 case 'n': 1710 case 'n':
1402 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1711 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
1408 ERR ("'null' expected"); 1717 ERR ("'null' expected");
1409 1718
1410 break; 1719 break;
1411 1720
1412 default: 1721 default:
1413 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1722 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1414 break; 1723 break;
1415 } 1724 }
1416 1725
1417fail: 1726fail:
1418 return 0; 1727 return 0;
1419} 1728}
1420 1729
1421static SV * 1730static SV *
1422decode_json (SV *string, JSON *json, char **offset_return) 1731decode_json (SV *string, JSON *json, STRLEN *offset_return)
1423{ 1732{
1424 dec_t dec; 1733 dec_t dec;
1425 SV *sv; 1734 SV *sv;
1426 1735
1427 /* work around bugs in 5.10 where manipulating magic values 1736 /* work around bugs in 5.10 where manipulating magic values
1428 * will perl ignore the magic in subsequent accesses 1737 * makes perl ignore the magic in subsequent accesses.
1738 * also make a copy of non-PV values, to get them into a clean
1739 * state (SvPV should do that, but it's buggy, see below).
1740 *
1741 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1742 * as reported by Reini Urban.
1429 */ 1743 */
1430 /*SvGETMAGIC (string);*/ 1744 /*SvGETMAGIC (string);*/
1431 if (SvMAGICAL (string)) 1745 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1432 string = sv_2mortal (newSVsv (string)); 1746 string = sv_2mortal (newSVsv (string));
1433 1747
1434 SvUPGRADE (string, SVt_PV); 1748 SvUPGRADE (string, SVt_PV);
1435 1749
1436 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1750 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1453 if (offset > json->max_size && json->max_size) 1767 if (offset > json->max_size && json->max_size)
1454 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1768 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1455 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1769 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1456 } 1770 }
1457 1771
1458 if (json->flags & F_UTF8) 1772 if (DECODE_WANTS_OCTETS (json))
1459 sv_utf8_downgrade (string, 0); 1773 sv_utf8_downgrade (string, 0);
1460 else 1774 else
1461 sv_utf8_upgrade (string); 1775 sv_utf8_upgrade (string);
1462 1776
1463 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1777 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1475 1789
1476 decode_ws (&dec); 1790 decode_ws (&dec);
1477 sv = decode_sv (&dec); 1791 sv = decode_sv (&dec);
1478 1792
1479 if (offset_return) 1793 if (offset_return)
1480 *offset_return = dec.cur; 1794 *offset_return = dec.cur - SvPVX (string);
1481 1795 else if (sv)
1482 if (!(offset_return || !sv))
1483 { 1796 {
1484 // check for trailing garbage 1797 // check for trailing garbage
1485 decode_ws (&dec); 1798 decode_ws (&dec);
1486 1799
1487 if (*dec.cur) 1800 if (dec.cur != dec.end)
1488 { 1801 {
1489 dec.err = "garbage after JSON object"; 1802 dec.err = "garbage after JSON object";
1490 SvREFCNT_dec (sv); 1803 SvREFCNT_dec (sv);
1491 sv = 0; 1804 sv = 0;
1492 } 1805 }
1505 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1818 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1506 LEAVE; 1819 LEAVE;
1507 1820
1508 croak ("%s, at character offset %d (before \"%s\")", 1821 croak ("%s, at character offset %d (before \"%s\")",
1509 dec.err, 1822 dec.err,
1510 ptr_to_index (string, dec.cur), 1823 (int)ptr_to_index (string, dec.cur),
1511 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1824 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1512 } 1825 }
1513 1826
1514 sv = sv_2mortal (sv); 1827 sv = sv_2mortal (sv);
1515 1828
1516 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1829 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1517 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1830 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1518 1831
1519 return sv; 1832 return sv;
1520} 1833}
1521 1834
1524 1837
1525static void 1838static void
1526incr_parse (JSON *self) 1839incr_parse (JSON *self)
1527{ 1840{
1528 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1841 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1842
1843 // the state machine here is a bit convoluted and could be simplified a lot
1844 // but this would make it slower, so...
1529 1845
1530 for (;;) 1846 for (;;)
1531 { 1847 {
1532 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D 1848 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1533 switch (self->incr_mode) 1849 switch (self->incr_mode)
1534 { 1850 {
1535 // only used for intiial whitespace skipping 1851 // only used for initial whitespace skipping
1536 case INCR_M_WS: 1852 case INCR_M_WS:
1537 for (;;) 1853 for (;;)
1538 { 1854 {
1539 if (*p > 0x20) 1855 if (*p > 0x20)
1540 { 1856 {
1857 if (*p == '#')
1858 {
1859 self->incr_mode = INCR_M_C0;
1860 goto incr_m_c;
1861 }
1862 else
1863 {
1541 self->incr_mode = INCR_M_JSON; 1864 self->incr_mode = INCR_M_JSON;
1542 goto incr_m_json; 1865 goto incr_m_json;
1866 }
1543 } 1867 }
1544 else if (!*p) 1868 else if (!*p)
1545 goto interrupt; 1869 goto interrupt;
1546 1870
1547 ++p; 1871 ++p;
1553 goto interrupt; 1877 goto interrupt;
1554 1878
1555 ++p; 1879 ++p;
1556 self->incr_mode = INCR_M_STR; 1880 self->incr_mode = INCR_M_STR;
1557 goto incr_m_str; 1881 goto incr_m_str;
1882
1883 // inside #-style comments
1884 case INCR_M_C0:
1885 case INCR_M_C1:
1886 incr_m_c:
1887 for (;;)
1888 {
1889 if (*p == '\n')
1890 {
1891 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1892 break;
1893 }
1894 else if (!*p)
1895 goto interrupt;
1896
1897 ++p;
1898 }
1899
1900 break;
1558 1901
1559 // inside a string 1902 // inside a string
1560 case INCR_M_STR: 1903 case INCR_M_STR:
1561 incr_m_str: 1904 incr_m_str:
1562 for (;;) 1905 for (;;)
1613 self->incr_mode = INCR_M_STR; 1956 self->incr_mode = INCR_M_STR;
1614 goto incr_m_str; 1957 goto incr_m_str;
1615 1958
1616 case '[': 1959 case '[':
1617 case '{': 1960 case '{':
1961 case '(':
1618 if (++self->incr_nest > self->max_depth) 1962 if (++self->incr_nest > self->max_depth)
1619 croak (ERR_NESTING_EXCEEDED); 1963 croak (ERR_NESTING_EXCEEDED);
1620 break; 1964 break;
1621 1965
1622 case ']': 1966 case ']':
1623 case '}': 1967 case '}':
1624 if (--self->incr_nest <= 0) 1968 if (--self->incr_nest <= 0)
1625 goto interrupt; 1969 goto interrupt;
1970 break;
1971
1972 case ')':
1973 --self->incr_nest;
1974 break;
1975
1976 case '#':
1977 self->incr_mode = INCR_M_C1;
1978 goto incr_m_c;
1626 } 1979 }
1627 } 1980 }
1628 } 1981 }
1629 1982
1630 modechange: 1983 modechange:
1631 ; 1984 ;
1632 } 1985 }
1633 1986
1634interrupt: 1987interrupt:
1635 self->incr_pos = p - SvPVX (self->incr_text); 1988 self->incr_pos = p - SvPVX (self->incr_text);
1989 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1636 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D 1990 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1637} 1991}
1638 1992
1639///////////////////////////////////////////////////////////////////////////// 1993/////////////////////////////////////////////////////////////////////////////
1640// XS interface functions 1994// XS interface functions
1650 i >= '0' && i <= '9' ? i - '0' 2004 i >= '0' && i <= '9' ? i - '0'
1651 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2005 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1652 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2006 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1653 : -1; 2007 : -1;
1654 2008
1655 json_stash = gv_stashpv ("JSON::XS" , 1); 2009 json_stash = gv_stashpv ("JSON::XS" , 1);
1656 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2010 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1657
1658 json_true = get_bool ("JSON::XS::true");
1659 json_false = get_bool ("JSON::XS::false"); 2011 bool_false = get_bool ("Types::Serialiser::false");
2012 bool_true = get_bool ("Types::Serialiser::true");
2013
2014 sv_json = newSVpv ("JSON", 0);
2015 SvREADONLY_on (sv_json);
2016
2017 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1660} 2018}
1661 2019
1662PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1663 2021
1664void CLONE (...) 2022void CLONE (...)
1665 CODE: 2023 CODE:
2024 // as long as these writes are atomic, the race should not matter
2025 // as existing threads either already use 0, or use the old value,
2026 // which is sitll correct for the initial thread.
1666 json_stash = 0; 2027 json_stash = 0;
1667 json_boolean_stash = 0; 2028 bool_stash = 0;
2029 bool_false = 0;
2030 bool_true = 0;
1668 2031
1669void new (char *klass) 2032void new (char *klass)
1670 PPCODE: 2033 PPCODE:
1671{ 2034{
1672 SV *pv = NEWSV (0, sizeof (JSON)); 2035 SV *pv = NEWSV (0, sizeof (JSON));
1673 SvPOK_only (pv); 2036 SvPOK_only (pv);
1674 json_init ((JSON *)SvPVX (pv)); 2037 json_init ((JSON *)SvPVX (pv));
1675 XPUSHs (sv_2mortal (sv_bless ( 2038 XPUSHs (sv_2mortal (sv_bless (
1676 newRV_noinc (pv), 2039 newRV_noinc (pv),
1677 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2040 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1678 ))); 2041 )));
1679} 2042}
2043
2044void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2045 PPCODE:
2046 self->v_false = newSVsv (v_false);
2047 self->v_true = newSVsv (v_true);
2048 XPUSHs (ST (0));
2049
2050void get_boolean_values (JSON *self)
2051 PPCODE:
2052 if (self->v_false && self->v_true)
2053 {
2054 EXTEND (SP, 2);
2055 PUSHs (self->v_false);
2056 PUSHs (self->v_true);
2057 }
1680 2058
1681void ascii (JSON *self, int enable = 1) 2059void ascii (JSON *self, int enable = 1)
1682 ALIAS: 2060 ALIAS:
1683 ascii = F_ASCII 2061 ascii = F_ASCII
1684 latin1 = F_LATIN1 2062 latin1 = F_LATIN1
1692 shrink = F_SHRINK 2070 shrink = F_SHRINK
1693 allow_blessed = F_ALLOW_BLESSED 2071 allow_blessed = F_ALLOW_BLESSED
1694 convert_blessed = F_CONV_BLESSED 2072 convert_blessed = F_CONV_BLESSED
1695 relaxed = F_RELAXED 2073 relaxed = F_RELAXED
1696 allow_unknown = F_ALLOW_UNKNOWN 2074 allow_unknown = F_ALLOW_UNKNOWN
2075 allow_tags = F_ALLOW_TAGS
1697 PPCODE: 2076 PPCODE:
1698{ 2077{
1699 if (enable) 2078 if (enable)
1700 self->flags |= ix; 2079 self->flags |= ix;
1701 else 2080 else
1717 get_shrink = F_SHRINK 2096 get_shrink = F_SHRINK
1718 get_allow_blessed = F_ALLOW_BLESSED 2097 get_allow_blessed = F_ALLOW_BLESSED
1719 get_convert_blessed = F_CONV_BLESSED 2098 get_convert_blessed = F_CONV_BLESSED
1720 get_relaxed = F_RELAXED 2099 get_relaxed = F_RELAXED
1721 get_allow_unknown = F_ALLOW_UNKNOWN 2100 get_allow_unknown = F_ALLOW_UNKNOWN
2101 get_allow_tags = F_ALLOW_TAGS
1722 PPCODE: 2102 PPCODE:
1723 XPUSHs (boolSV (self->flags & ix)); 2103 XPUSHs (boolSV (self->flags & ix));
1724 2104
1725void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2105void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1726 PPCODE: 2106 PPCODE:
1754} 2134}
1755 2135
1756void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2136void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1757 PPCODE: 2137 PPCODE:
1758{ 2138{
1759 if (!self->cb_sk_object) 2139 if (!self->cb_sk_object)
1760 self->cb_sk_object = newHV (); 2140 self->cb_sk_object = newHV ();
1761 2141
1762 if (SvOK (cb)) 2142 if (SvOK (cb))
1763 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2143 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1764 else 2144 else
1775 XPUSHs (ST (0)); 2155 XPUSHs (ST (0));
1776} 2156}
1777 2157
1778void encode (JSON *self, SV *scalar) 2158void encode (JSON *self, SV *scalar)
1779 PPCODE: 2159 PPCODE:
1780 XPUSHs (encode_json (scalar, self)); 2160 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2161 XPUSHs (scalar);
1781 2162
1782void decode (JSON *self, SV *jsonstr) 2163void decode (JSON *self, SV *jsonstr)
1783 PPCODE: 2164 PPCODE:
1784 XPUSHs (decode_json (jsonstr, self, 0)); 2165 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2166 XPUSHs (jsonstr);
1785 2167
1786void decode_prefix (JSON *self, SV *jsonstr) 2168void decode_prefix (JSON *self, SV *jsonstr)
1787 PPCODE: 2169 PPCODE:
1788{ 2170{
1789 char *offset; 2171 SV *sv;
2172 STRLEN offset;
2173 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1790 EXTEND (SP, 2); 2174 EXTEND (SP, 2);
1791 PUSHs (decode_json (jsonstr, self, &offset)); 2175 PUSHs (sv);
1792 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2176 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1793} 2177}
1794 2178
1795void incr_parse (JSON *self, SV *jsonstr = 0) 2179void incr_parse (JSON *self, SV *jsonstr = 0)
1796 PPCODE: 2180 PPCODE:
1797{ 2181{
1798 if (!self->incr_text) 2182 if (!self->incr_text)
1799 self->incr_text = newSVpvn ("", 0); 2183 self->incr_text = newSVpvn ("", 0);
2184
2185 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2186 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2187 if (DECODE_WANTS_OCTETS (self))
2188 {
2189 if (self->incr_pos)
2190 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2191 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2192
2193 sv_utf8_downgrade (self->incr_text, 0);
2194 }
2195 else
2196 {
2197 sv_utf8_upgrade (self->incr_text);
2198
2199 if (self->incr_pos)
2200 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2201 - (U8 *)SvPVX (self->incr_text);
2202 }
1800 2203
1801 // append data, if any 2204 // append data, if any
1802 if (jsonstr) 2205 if (jsonstr)
1803 { 2206 {
2207 /* make sure both strings have same encoding */
2208 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1804 if (SvUTF8 (jsonstr)) 2209 if (SvUTF8 (jsonstr))
2210 sv_utf8_downgrade (jsonstr, 0);
1805 { 2211 else
1806 if (!SvUTF8 (self->incr_text))
1807 {
1808 /* utf-8-ness differs, need to upgrade */
1809 sv_utf8_upgrade (self->incr_text);
1810
1811 if (self->incr_pos)
1812 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1813 - (U8 *)SvPVX (self->incr_text);
1814 }
1815 }
1816 else if (SvUTF8 (self->incr_text))
1817 sv_utf8_upgrade (jsonstr); 2212 sv_utf8_upgrade (jsonstr);
1818 2213
2214 /* and then just blindly append */
1819 { 2215 {
1820 STRLEN len; 2216 STRLEN len;
1821 const char *str = SvPV (jsonstr, len); 2217 const char *str = SvPV (jsonstr, len);
1822 STRLEN cur = SvCUR (self->incr_text); 2218 STRLEN cur = SvCUR (self->incr_text);
1823 2219
1824 if (SvLEN (self->incr_text) <= cur + len) 2220 if (SvLEN (self->incr_text) - cur <= len)
1825 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 2221 json_sv_grow (self->incr_text, cur, len);
1826 2222
1827 Move (str, SvEND (self->incr_text), len, char); 2223 Move (str, SvEND (self->incr_text), len, char);
1828 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2224 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1829 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there 2225 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1830 } 2226 }
1831 } 2227 }
1832 2228
1833 if (GIMME_V != G_VOID) 2229 if (GIMME_V != G_VOID)
1834 do 2230 do
1835 { 2231 {
2232 SV *sv;
1836 char *offset; 2233 STRLEN offset;
1837 2234
1838 if (!INCR_DONE (self)) 2235 if (!INCR_DONE (self))
1839 { 2236 {
1840 incr_parse (self); 2237 incr_parse (self);
1841 2238
1842 if (self->incr_pos > self->max_size && self->max_size) 2239 if (self->incr_pos > self->max_size && self->max_size)
1843 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2240 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1844 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2241 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1845 2242
1846 if (!INCR_DONE (self)) 2243 if (!INCR_DONE (self))
2244 {
2245 // as an optimisation, do not accumulate white space in the incr buffer
2246 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2247 {
2248 self->incr_pos = 0;
2249 SvCUR_set (self->incr_text, 0);
2250 }
2251
1847 break; 2252 break;
2253 }
1848 } 2254 }
1849 2255
1850 XPUSHs (decode_json (self->incr_text, self, &offset)); 2256 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2257 XPUSHs (sv);
1851 2258
1852 self->incr_pos -= offset - SvPVX (self->incr_text); 2259 self->incr_pos -= offset;
1853 self->incr_nest = 0; 2260 self->incr_nest = 0;
1854 self->incr_mode = 0; 2261 self->incr_mode = 0;
1855 2262
1856 sv_chop (self->incr_text, offset); 2263 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
1857 } 2264 }
1858 while (GIMME_V == G_ARRAY); 2265 while (GIMME_V == G_ARRAY);
1859} 2266}
1860 2267
1861SV *incr_text (JSON *self) 2268SV *incr_text (JSON *self)
1892 self->incr_mode = 0; 2299 self->incr_mode = 0;
1893} 2300}
1894 2301
1895void DESTROY (JSON *self) 2302void DESTROY (JSON *self)
1896 CODE: 2303 CODE:
2304 SvREFCNT_dec (self->v_false);
2305 SvREFCNT_dec (self->v_true);
1897 SvREFCNT_dec (self->cb_sk_object); 2306 SvREFCNT_dec (self->cb_sk_object);
1898 SvREFCNT_dec (self->cb_object); 2307 SvREFCNT_dec (self->cb_object);
1899 SvREFCNT_dec (self->incr_text); 2308 SvREFCNT_dec (self->incr_text);
1900 2309
1901PROTOTYPES: ENABLE 2310PROTOTYPES: ENABLE
1902 2311
1903void encode_json (SV *scalar) 2312void encode_json (SV *scalar)
1904 ALIAS:
1905 to_json_ = 0
1906 encode_json = F_UTF8
1907 PPCODE: 2313 PPCODE:
1908{ 2314{
1909 JSON json; 2315 JSON json;
1910 json_init (&json); 2316 json_init (&json);
1911 json.flags |= ix; 2317 json.flags |= F_UTF8;
1912 XPUSHs (encode_json (scalar, &json)); 2318 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2319 XPUSHs (scalar);
1913} 2320}
1914 2321
1915void decode_json (SV *jsonstr) 2322void decode_json (SV *jsonstr)
1916 ALIAS:
1917 from_json_ = 0
1918 decode_json = F_UTF8
1919 PPCODE: 2323 PPCODE:
1920{ 2324{
1921 JSON json; 2325 JSON json;
1922 json_init (&json); 2326 json_init (&json);
1923 json.flags |= ix; 2327 json.flags |= F_UTF8;
1924 XPUSHs (decode_json (jsonstr, &json, 0)); 2328 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2329 XPUSHs (jsonstr);
1925} 2330}
1926 2331
1927

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines