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.72 by root, Wed Mar 19 04:08:22 2008 UTC vs.
Revision 1.130 by root, Sat Nov 26 06:09:29 2016 UTC

… …
4 4
5#include <assert.h> 5#include <assert.h>
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 <float.h> 10#include <float.h>
11#include <inttypes.h>
10 12
11#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
12# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
13#endif 15#endif
14 16
15// 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
16// guarentees, though. if it breaks, you get to keep the pieces. 18// guarantees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES 19#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13 20# define UTF8_MAXBYTES 13
19#endif 21#endif
22
23// compatibility with perl <5.18
24#ifndef HvNAMELEN_get
25# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
26#endif
27#ifndef HvNAMELEN
28# define HvNAMELEN(hv) HvNAMELEN_get (hv)
29#endif
30#ifndef HvNAMEUTF8
31# define HvNAMEUTF8(hv) 0
32#endif
33
34// three extra for rounding, sign, and end of string
35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
20 36
21#define F_ASCII 0x00000001UL 37#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 38#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 39#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 40#define F_INDENT 0x00000008UL
… …
28#define F_ALLOW_NONREF 0x00000100UL 44#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
33 49#define F_ALLOW_UNKNOWN 0x00002000UL
34#define F_MAXDEPTH 0xf8000000UL 50#define F_ALLOW_TAGS 0x00004000UL
35#define S_MAXDEPTH 27
36#define F_MAXSIZE 0x01f00000UL
37#define S_MAXSIZE 20
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 52
40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
42
43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
44#define F_DEFAULT (9UL << S_MAXDEPTH)
45 54
46#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 32 // initial scalar size to be allocated
47#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
48 57
49#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)
50 61
51#define SB do { 62#define SB do {
52#define SE } while (0) 63#define SE } while (0)
53 64
54#if __GNUC__ >= 3 65#if __GNUC__ >= 3
… …
64 75
65#define IN_RANGE_INC(type,val,beg,end) \ 76#define IN_RANGE_INC(type,val,beg,end) \
66 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 77 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
67 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
68 79
80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
81
69#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
70# define JSON_SLOW 1 83# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 84# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
85# define BOOL_STASH (bool_stash ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
72#else 86#else
73# define JSON_SLOW 0 87# define JSON_SLOW 0
74# define JSON_STASH json_stash 88# define JSON_STASH json_stash
89# define BOOL_STASH bool_stash
75#endif 90#endif
76 91
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
78static SV *json_true, *json_false; 93#define STACK_HES 64
94
95static HV *json_stash, *bool_stash; // JSON::XS::, Types::Serialiser::Boolean::
96static SV *bool_true, *bool_false, *sv_json;
97
98enum {
99 INCR_M_WS = 0, // initial whitespace skipping, must be 0
100 INCR_M_STR, // inside string
101 INCR_M_BS, // inside backslash
102 INCR_M_C0, // inside comment in initial whitespace sequence
103 INCR_M_C1, // inside comment in other places
104 INCR_M_JSON // outside anything, count nesting
105};
106
107#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
79 108
80typedef struct { 109typedef struct {
81 U32 flags; 110 U32 flags;
111 U32 max_depth;
112 STRLEN max_size;
113
82 SV *cb_object; 114 SV *cb_object;
83 HV *cb_sk_object; 115 HV *cb_sk_object;
116
117 // for the incremental parser
118 SV *incr_text; // the source text so far
119 STRLEN incr_pos; // the current offset into the text
120 int incr_nest; // {[]}-nesting level
121 unsigned char incr_mode;
84} JSON; 122} JSON;
123
124INLINE void
125json_init (JSON *json)
126{
127 Zero (json, 1, JSON);
128 json->max_depth = 512;
129}
85 130
86///////////////////////////////////////////////////////////////////////////// 131/////////////////////////////////////////////////////////////////////////////
87// utility functions 132// utility functions
88 133
134INLINE SV *
135get_bool (const char *name)
136{
137 SV *sv = get_sv (name, 1);
138
139 SvREADONLY_on (sv);
140 SvREADONLY_on (SvRV (sv));
141
142 return sv;
143}
144
89INLINE void 145INLINE void
90shrink (SV *sv) 146shrink (SV *sv)
91{ 147{
92 sv_utf8_downgrade (sv, 1); 148 sv_utf8_downgrade (sv, 1);
149
93 if (SvLEN (sv) > SvCUR (sv) + 1) 150 if (SvLEN (sv) > SvCUR (sv) + 1)
94 { 151 {
95#ifdef SvPV_shrink_to_cur 152#ifdef SvPV_shrink_to_cur
96 SvPV_shrink_to_cur (sv); 153 SvPV_shrink_to_cur (sv);
97#elif defined (SvPV_renew) 154#elif defined (SvPV_renew)
… …
123// this function takes advantage of this fact, although current gccs 180// this function takes advantage of this fact, although current gccs
124// seem to optimise the check for >= 0x80 away anyways 181// seem to optimise the check for >= 0x80 away anyways
125INLINE unsigned char * 182INLINE unsigned char *
126encode_utf8 (unsigned char *s, UV ch) 183encode_utf8 (unsigned char *s, UV ch)
127{ 184{
128 if (ch <= 0x7FF) 185 if (expect_false (ch < 0x000080))
129 { 186 *s++ = ch;
130 *s++ = (ch >> 6) | 0xc0; 187 else if (expect_true (ch < 0x000800))
131 *s++ = (ch & 0x3f) | 0x80; 188 *s++ = 0xc0 | ( ch >> 6),
132 } 189 *s++ = 0x80 | ( ch & 0x3f);
133 else 190 else if ( ch < 0x010000)
134 s = uvuni_to_utf8_flags (s, ch, 0); 191 *s++ = 0xe0 | ( ch >> 12),
192 *s++ = 0x80 | ((ch >> 6) & 0x3f),
193 *s++ = 0x80 | ( ch & 0x3f);
194 else if ( ch < 0x110000)
195 *s++ = 0xf0 | ( ch >> 18),
196 *s++ = 0x80 | ((ch >> 12) & 0x3f),
197 *s++ = 0x80 | ((ch >> 6) & 0x3f),
198 *s++ = 0x80 | ( ch & 0x3f);
135 199
136 return s; 200 return s;
201}
202
203// convert offset pointer to character index, sv must be string
204static STRLEN
205ptr_to_index (SV *sv, char *offset)
206{
207 return SvUTF8 (sv)
208 ? utf8_distance (offset, SvPVX (sv))
209 : offset - SvPVX (sv);
210}
211
212/////////////////////////////////////////////////////////////////////////////
213// fp hell
214
215// scan a group of digits, and a trailing exponent
216static void
217json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
218{
219 UV uaccum = 0;
220 int eaccum = 0;
221
222 // if we recurse too deep, skip all remaining digits
223 // to avoid a stack overflow attack
224 if (expect_false (--maxdepth <= 0))
225 while (((U8)*s - '0') < 10)
226 ++s;
227
228 for (;;)
229 {
230 U8 dig = (U8)*s - '0';
231
232 if (expect_false (dig >= 10))
233 {
234 if (dig == (U8)((U8)'.' - (U8)'0'))
235 {
236 ++s;
237 json_atof_scan1 (s, accum, expo, 1, maxdepth);
238 }
239 else if ((dig | ' ') == 'e' - '0')
240 {
241 int exp2 = 0;
242 int neg = 0;
243
244 ++s;
245
246 if (*s == '-')
247 {
248 ++s;
249 neg = 1;
250 }
251 else if (*s == '+')
252 ++s;
253
254 while ((dig = (U8)*s - '0') < 10)
255 exp2 = exp2 * 10 + *s++ - '0';
256
257 *expo += neg ? -exp2 : exp2;
258 }
259
260 break;
261 }
262
263 ++s;
264
265 uaccum = uaccum * 10 + dig;
266 ++eaccum;
267
268 // if we have too many digits, then recurse for more
269 // we actually do this for rather few digits
270 if (uaccum >= (UV_MAX - 9) / 10)
271 {
272 if (postdp) *expo -= eaccum;
273 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
274 if (postdp) *expo += eaccum;
275
276 break;
277 }
278 }
279
280 // this relies greatly on the quality of the pow ()
281 // implementation of the platform, but a good
282 // implementation is hard to beat.
283 // (IEEE 754 conformant ones are required to be exact)
284 if (postdp) *expo -= eaccum;
285 *accum += uaccum * Perl_pow (10., *expo);
286 *expo += eaccum;
287}
288
289static NV
290json_atof (const char *s)
291{
292 NV accum = 0.;
293 int expo = 0;
294 int neg = 0;
295
296 if (*s == '-')
297 {
298 ++s;
299 neg = 1;
300 }
301
302 // a recursion depth of ten gives us >>500 bits
303 json_atof_scan1 (s, &accum, &expo, 0, 10);
304
305 return neg ? -accum : accum;
306}
307
308// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
309static int
310ref_bool_type (SV *sv)
311{
312 svtype svt = SvTYPE (sv);
313
314 if (svt < SVt_PVAV)
315 {
316 STRLEN len = 0;
317 char *pv = svt ? SvPV (sv, len) : 0;
318
319 if (len == 1)
320 if (*pv == '1')
321 return 1;
322 else if (*pv == '0')
323 return 0;
324 }
325
326 return -1;
327}
328
329// returns whether scalar is not a reference in the sense of allow_nonref
330static int
331json_nonref (SV *scalar)
332{
333 if (!SvROK (scalar))
334 return 1;
335
336 scalar = SvRV (scalar);
337
338 if (SvTYPE (scalar) >= SVt_PVMG)
339 {
340 if (SvSTASH (scalar) == bool_stash)
341 return 1;
342
343 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
344 return 1;
345 }
346
347 return 0;
137} 348}
138 349
139///////////////////////////////////////////////////////////////////////////// 350/////////////////////////////////////////////////////////////////////////////
140// encoder 351// encoder
141 352
… …
145 char *cur; // SvPVX (sv) + current output position 356 char *cur; // SvPVX (sv) + current output position
146 char *end; // SvEND (sv) 357 char *end; // SvEND (sv)
147 SV *sv; // result scalar 358 SV *sv; // result scalar
148 JSON json; 359 JSON json;
149 U32 indent; // indentation level 360 U32 indent; // indentation level
150 U32 maxdepth; // max. indentation/recursion level
151 UV limit; // escape character values >= this value when encoding 361 UV limit; // escape character values >= this value when encoding
152} enc_t; 362} enc_t;
153 363
154INLINE void 364INLINE void
155need (enc_t *enc, STRLEN len) 365need (enc_t *enc, STRLEN len)
156{ 366{
157 if (expect_false (enc->cur + len >= enc->end)) 367 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
158 { 368 {
159 STRLEN cur = enc->cur - SvPVX (enc->sv); 369 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
160 SvGROW (enc->sv, cur + len + 1); 370 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
161 enc->cur = SvPVX (enc->sv) + cur; 371 enc->cur = SvPVX (enc->sv) + cur;
162 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 372 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
163 } 373 }
164} 374}
165 375
… …
227 clen = 1; 437 clen = 1;
228 } 438 }
229 439
230 if (uch < 0x80/*0x20*/ || uch >= enc->limit) 440 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
231 { 441 {
232 if (uch > 0xFFFFUL) 442 if (uch >= 0x10000UL)
233 { 443 {
234 if (uch > 0x10FFFFUL) 444 if (uch >= 0x110000UL)
235 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 445 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
236 446
237 need (enc, len += 11); 447 need (enc, len += 11);
238 sprintf (enc->cur, "\\u%04x\\u%04x", 448 sprintf (enc->cur, "\\u%04x\\u%04x",
239 (int)((uch - 0x10000) / 0x400 + 0xD800), 449 (int)((uch - 0x10000) / 0x400 + 0xD800),
240 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 450 (int)((uch - 0x10000) % 0x400 + 0xDC00));
241 enc->cur += 12; 451 enc->cur += 12;
242 } 452 }
243 else 453 else
244 { 454 {
245 static char hexdigit [16] = "0123456789abcdef";
246 need (enc, len += 5); 455 need (enc, len += 5);
247 *enc->cur++ = '\\'; 456 *enc->cur++ = '\\';
248 *enc->cur++ = 'u'; 457 *enc->cur++ = 'u';
249 *enc->cur++ = hexdigit [ uch >> 12 ]; 458 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
250 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 459 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
251 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 460 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
252 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 461 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
253 } 462 }
254 463
255 str += clen; 464 str += clen;
256 } 465 }
257 else if (enc->json.flags & F_LATIN1) 466 else if (enc->json.flags & F_LATIN1)
… …
328static void 537static void
329encode_av (enc_t *enc, AV *av) 538encode_av (enc_t *enc, AV *av)
330{ 539{
331 int i, len = av_len (av); 540 int i, len = av_len (av);
332 541
333 if (enc->indent >= enc->maxdepth) 542 if (enc->indent >= enc->json.max_depth)
334 croak ("data structure too deep (hit recursion limit)"); 543 croak (ERR_NESTING_EXCEEDED);
335 544
336 encode_ch (enc, '['); 545 encode_ch (enc, '[');
337 546
338 if (len >= 0) 547 if (len >= 0)
339 { 548 {
340 encode_nl (enc); ++enc->indent; 549 encode_nl (enc); ++enc->indent;
341 550
342 for (i = 0; i <= len; ++i) 551 for (i = 0; i <= len; ++i)
… …
354 encode_comma (enc); 563 encode_comma (enc);
355 } 564 }
356 565
357 encode_nl (enc); --enc->indent; encode_indent (enc); 566 encode_nl (enc); --enc->indent; encode_indent (enc);
358 } 567 }
359 568
360 encode_ch (enc, ']'); 569 encode_ch (enc, ']');
361} 570}
362 571
363static void 572static void
364encode_hk (enc_t *enc, HE *he) 573encode_hk (enc_t *enc, HE *he)
… …
368 if (HeKLEN (he) == HEf_SVKEY) 577 if (HeKLEN (he) == HEf_SVKEY)
369 { 578 {
370 SV *sv = HeSVKEY (he); 579 SV *sv = HeSVKEY (he);
371 STRLEN len; 580 STRLEN len;
372 char *str; 581 char *str;
373 582
374 SvGETMAGIC (sv); 583 SvGETMAGIC (sv);
375 str = SvPV (sv, len); 584 str = SvPV (sv, len);
376 585
377 encode_str (enc, str, len, SvUTF8 (sv)); 586 encode_str (enc, str, len, SvUTF8 (sv));
378 } 587 }
… …
413 622
414static void 623static void
415encode_hv (enc_t *enc, HV *hv) 624encode_hv (enc_t *enc, HV *hv)
416{ 625{
417 HE *he; 626 HE *he;
418 int count;
419 627
420 if (enc->indent >= enc->maxdepth) 628 if (enc->indent >= enc->json.max_depth)
421 croak ("data structure too deep (hit recursion limit)"); 629 croak (ERR_NESTING_EXCEEDED);
422 630
423 encode_ch (enc, '{'); 631 encode_ch (enc, '{');
424 632
425 // for canonical output we have to sort by keys first 633 // for canonical output we have to sort by keys first
426 // actually, this is mostly due to the stupid so-called 634 // actually, this is mostly due to the stupid so-called
427 // security workaround added somewhere in 5.8.x. 635 // security workaround added somewhere in 5.8.x
428 // that randomises hash orderings 636 // that randomises hash orderings
429 if (enc->json.flags & F_CANONICAL) 637 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
430 { 638 {
431 int count = hv_iterinit (hv); 639 int count = hv_iterinit (hv);
432 640
433 if (SvMAGICAL (hv)) 641 if (SvMAGICAL (hv))
434 { 642 {
… …
445 } 653 }
446 654
447 if (count) 655 if (count)
448 { 656 {
449 int i, fast = 1; 657 int i, fast = 1;
450#if defined(__BORLANDC__) || defined(_MSC_VER) 658 HE *hes_stack [STACK_HES];
451 HE **hes = _alloca (count * sizeof (HE)); 659 HE **hes = hes_stack;
452#else 660
453 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 661 // allocate larger arrays on the heap
454#endif 662 if (count > STACK_HES)
663 {
664 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
665 hes = (HE **)SvPVX (sv);
666 }
455 667
456 i = 0; 668 i = 0;
457 while ((he = hv_iternext (hv))) 669 while ((he = hv_iternext (hv)))
458 { 670 {
459 hes [i++] = he; 671 hes [i++] = he;
… …
528// encode objects, arrays and special \0=false and \1=true values. 740// encode objects, arrays and special \0=false and \1=true values.
529static void 741static void
530encode_rv (enc_t *enc, SV *sv) 742encode_rv (enc_t *enc, SV *sv)
531{ 743{
532 svtype svt; 744 svtype svt;
745 GV *method;
533 746
534 SvGETMAGIC (sv); 747 SvGETMAGIC (sv);
535 svt = SvTYPE (sv); 748 svt = SvTYPE (sv);
536 749
537 if (expect_false (SvOBJECT (sv))) 750 if (expect_false (SvOBJECT (sv)))
538 { 751 {
539 HV *stash = !JSON_SLOW || json_boolean_stash 752 HV *stash = SvSTASH (sv);
540 ? json_boolean_stash
541 : gv_stashpv ("JSON::XS::Boolean", 1);
542 753
543 if (SvSTASH (sv) == stash) 754 if (stash == bool_stash)
544 { 755 {
545 if (SvIV (sv)) 756 if (SvIV (sv))
546 encode_str (enc, "true", 4, 0); 757 encode_str (enc, "true", 4, 0);
547 else 758 else
548 encode_str (enc, "false", 5, 0); 759 encode_str (enc, "false", 5, 0);
549 } 760 }
761 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
762 {
763 int count;
764 dSP;
765
766 ENTER; SAVETMPS;
767 SAVESTACK_POS ();
768 PUSHMARK (SP);
769 EXTEND (SP, 2);
770 // we re-bless the reference to get overload and other niceties right
771 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
772 PUSHs (sv_json);
773
774 PUTBACK;
775 count = call_sv ((SV *)GvCV (method), G_ARRAY);
776 SPAGAIN;
777
778 // catch this surprisingly common error
779 if (SvROK (TOPs) && SvRV (TOPs) == sv)
780 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
781
782 encode_ch (enc, '(');
783 encode_ch (enc, '"');
784 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
785 encode_ch (enc, '"');
786 encode_ch (enc, ')');
787 encode_ch (enc, '[');
788
789 while (count)
790 {
791 encode_sv (enc, SP[1 - count--]);
792
793 if (count)
794 encode_ch (enc, ',');
795 }
796
797 encode_ch (enc, ']');
798
799 FREETMPS; LEAVE;
800 }
801 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
802 {
803 dSP;
804
805 ENTER; SAVETMPS;
806 PUSHMARK (SP);
807 // we re-bless the reference to get overload and other niceties right
808 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
809
810 // calling with G_SCALAR ensures that we always get a 1 return value
811 PUTBACK;
812 call_sv ((SV *)GvCV (method), G_SCALAR);
813 SPAGAIN;
814
815 // catch this surprisingly common error
816 if (SvROK (TOPs) && SvRV (TOPs) == sv)
817 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
818
819 sv = POPs;
820 PUTBACK;
821
822 encode_sv (enc, sv);
823
824 FREETMPS; LEAVE;
825 }
826 else if (enc->json.flags & F_ALLOW_BLESSED)
827 encode_str (enc, "null", 4, 0);
550 else 828 else
551 {
552#if 0
553 if (0 && sv_derived_from (rv, "JSON::Literal"))
554 {
555 // not yet
556 }
557#endif
558 if (enc->json.flags & F_CONV_BLESSED)
559 {
560 // we re-bless the reference to get overload and other niceties right
561 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
562
563 if (to_json)
564 {
565 dSP;
566
567 ENTER; SAVETMPS; PUSHMARK (SP);
568 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
569
570 // calling with G_SCALAR ensures that we always get a 1 return value
571 PUTBACK;
572 call_sv ((SV *)GvCV (to_json), G_SCALAR);
573 SPAGAIN;
574
575 // catch this surprisingly common error
576 if (SvROK (TOPs) && SvRV (TOPs) == sv)
577 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
578
579 sv = POPs;
580 PUTBACK;
581
582 encode_sv (enc, sv);
583
584 FREETMPS; LEAVE;
585 }
586 else if (enc->json.flags & F_ALLOW_BLESSED)
587 encode_str (enc, "null", 4, 0);
588 else
589 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
590 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
591 }
592 else if (enc->json.flags & F_ALLOW_BLESSED)
593 encode_str (enc, "null", 4, 0);
594 else
595 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 829 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
596 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 830 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
597 }
598 } 831 }
599 else if (svt == SVt_PVHV) 832 else if (svt == SVt_PVHV)
600 encode_hv (enc, (HV *)sv); 833 encode_hv (enc, (HV *)sv);
601 else if (svt == SVt_PVAV) 834 else if (svt == SVt_PVAV)
602 encode_av (enc, (AV *)sv); 835 encode_av (enc, (AV *)sv);
603 else if (svt < SVt_PVAV) 836 else if (svt < SVt_PVAV)
604 { 837 {
605 STRLEN len = 0; 838 int bool_type = ref_bool_type (sv);
606 char *pv = svt ? SvPV (sv, len) : 0;
607 839
608 if (len == 1 && *pv == '1') 840 if (bool_type == 1)
609 encode_str (enc, "true", 4, 0); 841 encode_str (enc, "true", 4, 0);
610 else if (len == 1 && *pv == '0') 842 else if (bool_type == 0)
611 encode_str (enc, "false", 5, 0); 843 encode_str (enc, "false", 5, 0);
844 else if (enc->json.flags & F_ALLOW_UNKNOWN)
845 encode_str (enc, "null", 4, 0);
612 else 846 else
613 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 847 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
614 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 848 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
615 } 849 }
850 else if (enc->json.flags & F_ALLOW_UNKNOWN)
851 encode_str (enc, "null", 4, 0);
616 else 852 else
617 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 853 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
618 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 854 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
619} 855}
620 856
… …
638 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 874 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
639 enc->cur += strlen (enc->cur); 875 enc->cur += strlen (enc->cur);
640 } 876 }
641 else if (SvIOKp (sv)) 877 else if (SvIOKp (sv))
642 { 878 {
643 // we assume we can always read an IV as a UV 879 // we assume we can always read an IV as a UV and vice versa
644 if (SvUV (sv) & ~(UV)0x7fff) 880 // we assume two's complement
645 { 881 // we assume no aliasing issues in the union
646 // large integer, use the (rather slow) snprintf way. 882 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
647 need (enc, sizeof (UV) * 3); 883 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
648 enc->cur +=
649 SvIsUV(sv)
650 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
651 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
652 }
653 else
654 { 884 {
655 // optimise the "small number case" 885 // optimise the "small number case"
656 // code will likely be branchless and use only a single multiplication 886 // code will likely be branchless and use only a single multiplication
887 // works for numbers up to 59074
657 I32 i = SvIV (sv); 888 I32 i = SvIVX (sv);
658 U32 u; 889 U32 u;
659 char digit, nz = 0; 890 char digit, nz = 0;
660 891
661 need (enc, 6); 892 need (enc, 6);
662 893
… …
668 899
669 // now output digit by digit, each time masking out the integer part 900 // now output digit by digit, each time masking out the integer part
670 // and multiplying by 5 while moving the decimal point one to the right, 901 // and multiplying by 5 while moving the decimal point one to the right,
671 // resulting in a net multiplication by 10. 902 // resulting in a net multiplication by 10.
672 // we always write the digit to memory but conditionally increment 903 // we always write the digit to memory but conditionally increment
673 // the pointer, to ease the usage of conditional move instructions. 904 // the pointer, to enable the use of conditional move instructions.
674 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 905 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
675 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 906 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
676 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 907 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
677 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 908 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
678 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 909 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
679 } 910 }
911 else
912 {
913 // large integer, use the (rather slow) snprintf way.
914 need (enc, IVUV_MAXCHARS);
915 enc->cur +=
916 SvIsUV(sv)
917 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
918 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
919 }
680 } 920 }
681 else if (SvROK (sv)) 921 else if (SvROK (sv))
682 encode_rv (enc, SvRV (sv)); 922 encode_rv (enc, SvRV (sv));
683 else if (!SvOK (sv)) 923 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
684 encode_str (enc, "null", 4, 0); 924 encode_str (enc, "null", 4, 0);
685 else 925 else
686 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 926 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
687 SvPV_nolen (sv), SvFLAGS (sv)); 927 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
688} 928}
689 929
690static SV * 930static SV *
691encode_json (SV *scalar, JSON *json) 931encode_json (SV *scalar, JSON *json)
692{ 932{
693 enc_t enc; 933 enc_t enc;
694 934
695 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 935 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
696 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 936 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
697 937
698 enc.json = *json; 938 enc.json = *json;
699 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 939 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
700 enc.cur = SvPVX (enc.sv); 940 enc.cur = SvPVX (enc.sv);
701 enc.end = SvEND (enc.sv); 941 enc.end = SvEND (enc.sv);
702 enc.indent = 0; 942 enc.indent = 0;
703 enc.maxdepth = DEC_DEPTH (enc.json.flags);
704 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 943 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
705 : enc.json.flags & F_LATIN1 ? 0x000100UL 944 : enc.json.flags & F_LATIN1 ? 0x000100UL
706 : 0x10FFFFUL; 945 : 0x110000UL;
707 946
708 SvPOK_only (enc.sv); 947 SvPOK_only (enc.sv);
709 encode_sv (&enc, scalar); 948 encode_sv (&enc, scalar);
949 encode_nl (&enc);
710 950
711 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 951 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
712 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 952 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
713 953
714 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 954 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
775 if (*dec->cur != ch) \ 1015 if (*dec->cur != ch) \
776 ERR (# ch " expected"); \ 1016 ERR (# ch " expected"); \
777 ++dec->cur; \ 1017 ++dec->cur; \
778 SE 1018 SE
779 1019
780#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 1020#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
781#define DEC_DEC_DEPTH --dec->depth 1021#define DEC_DEC_DEPTH --dec->depth
782 1022
783static SV *decode_sv (dec_t *dec); 1023static SV *decode_sv (dec_t *dec);
784 1024
785static signed char decode_hexdigit[256]; 1025static signed char decode_hexdigit[256];
… …
889 default: 1129 default:
890 --dec_cur; 1130 --dec_cur;
891 ERR ("illegal backslash escape sequence in string"); 1131 ERR ("illegal backslash escape sequence in string");
892 } 1132 }
893 } 1133 }
894 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1134 else if (expect_true (ch >= 0x20 && ch < 0x80))
895 *cur++ = ch; 1135 *cur++ = ch;
896 else if (ch >= 0x80) 1136 else if (ch >= 0x80)
897 { 1137 {
898 STRLEN clen; 1138 STRLEN clen;
899 UV uch;
900 1139
901 --dec_cur; 1140 --dec_cur;
902 1141
903 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1142 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
904 if (clen == (STRLEN)-1) 1143 if (clen == (STRLEN)-1)
905 ERR ("malformed UTF-8 character in JSON string"); 1144 ERR ("malformed UTF-8 character in JSON string");
906 1145
907 do 1146 do
908 *cur++ = *dec_cur++; 1147 *cur++ = *dec_cur++;
909 while (--clen); 1148 while (--clen);
910 1149
911 utf8 = 1; 1150 utf8 = 1;
912 } 1151 }
1152 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1153 *cur++ = ch;
913 else 1154 else
914 { 1155 {
915 --dec_cur; 1156 --dec_cur;
916 1157
917 if (!ch) 1158 if (!ch)
… …
925 { 1166 {
926 STRLEN len = cur - buf; 1167 STRLEN len = cur - buf;
927 1168
928 if (sv) 1169 if (sv)
929 { 1170 {
930 SvGROW (sv, SvCUR (sv) + len + 1); 1171 STRLEN cur = SvCUR (sv);
1172
1173 if (SvLEN (sv) <= cur + len)
1174 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1175
931 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1176 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
932 SvCUR_set (sv, SvCUR (sv) + len); 1177 SvCUR_set (sv, SvCUR (sv) + len);
933 } 1178 }
934 else 1179 else
935 sv = newSVpvn (buf, len); 1180 sv = newSVpvn (buf, len);
… …
1026 1271
1027 // special case the rather common 1..5-digit-int case 1272 // special case the rather common 1..5-digit-int case
1028 if (*start == '-') 1273 if (*start == '-')
1029 switch (len) 1274 switch (len)
1030 { 1275 {
1031 case 2: return newSViv (-( start [1] - '0' * 1)); 1276 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1032 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1277 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1033 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1278 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1034 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1279 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1035 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1280 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1036 } 1281 }
1037 else 1282 else
1038 switch (len) 1283 switch (len)
1039 { 1284 {
1040 case 1: return newSViv ( start [0] - '0' * 1); 1285 case 1: return newSViv ( start [0] - '0' * 1);
1041 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1286 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1042 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1287 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1043 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1288 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1044 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1289 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1045 } 1290 }
1046 1291
1047 { 1292 {
1048 UV uv; 1293 UV uv;
1049 int numtype = grok_number (start, len, &uv); 1294 int numtype = grok_number (start, len, &uv);
… …
1058 } 1303 }
1059 1304
1060 len -= *start == '-' ? 1 : 0; 1305 len -= *start == '-' ? 1 : 0;
1061 1306
1062 // does not fit into IV or UV, try NV 1307 // does not fit into IV or UV, try NV
1063 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1308 if (len <= NV_DIG)
1064 #if defined (LDBL_DIG)
1065 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1066 #endif
1067 )
1068 // fits into NV without loss of precision 1309 // fits into NV without loss of precision
1069 return newSVnv (Atof (start)); 1310 return newSVnv (json_atof (start));
1070 1311
1071 // everything else fails, convert it to a string 1312 // everything else fails, convert it to a string
1072 return newSVpvn (start, dec->cur - start); 1313 return newSVpvn (start, dec->cur - start);
1073 } 1314 }
1074 1315
1075 // loss of precision here 1316 // loss of precision here
1076 return newSVnv (Atof (start)); 1317 return newSVnv (json_atof (start));
1077 1318
1078fail: 1319fail:
1079 return 0; 1320 return 0;
1080} 1321}
1081 1322
… …
1105 if (*dec->cur == ']') 1346 if (*dec->cur == ']')
1106 { 1347 {
1107 ++dec->cur; 1348 ++dec->cur;
1108 break; 1349 break;
1109 } 1350 }
1110 1351
1111 if (*dec->cur != ',') 1352 if (*dec->cur != ',')
1112 ERR (", or ] expected while parsing array"); 1353 ERR (", or ] expected while parsing array");
1113 1354
1114 ++dec->cur; 1355 ++dec->cur;
1115 1356
… …
1157 char *p = dec->cur; 1398 char *p = dec->cur;
1158 char *e = p + 24; // only try up to 24 bytes 1399 char *e = p + 24; // only try up to 24 bytes
1159 1400
1160 for (;;) 1401 for (;;)
1161 { 1402 {
1162 // the >= 0x80 is true on most architectures 1403 // the >= 0x80 is false on most architectures
1163 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1404 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1164 { 1405 {
1165 // slow path, back up and use decode_str 1406 // slow path, back up and use decode_str
1166 SV *key = decode_str (dec); 1407 SV *key = decode_str (dec);
1167 if (!key) 1408 if (!key)
… …
1239 1480
1240 hv_iterinit (hv); 1481 hv_iterinit (hv);
1241 he = hv_iternext (hv); 1482 he = hv_iternext (hv);
1242 hv_iterinit (hv); 1483 hv_iterinit (hv);
1243 1484
1244 // the next line creates a mortal sv each time its called. 1485 // the next line creates a mortal sv each time it's called.
1245 // might want to optimise this for common cases. 1486 // might want to optimise this for common cases.
1246 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1487 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1247 1488
1248 if (cb) 1489 if (cb)
1249 { 1490 {
1250 dSP; 1491 dSP;
1251 int count; 1492 int count;
1252 1493
1253 ENTER; SAVETMPS; PUSHMARK (SP); 1494 ENTER; SAVETMPS;
1495 SAVESTACK_POS ();
1496 PUSHMARK (SP);
1254 XPUSHs (HeVAL (he)); 1497 XPUSHs (HeVAL (he));
1498 sv_2mortal (sv);
1255 1499
1256 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1500 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1257 1501
1258 if (count == 1) 1502 if (count == 1)
1259 { 1503 {
1260 sv = newSVsv (POPs); 1504 sv = newSVsv (POPs);
1261 FREETMPS; LEAVE; 1505 FREETMPS; LEAVE;
1262 return sv; 1506 return sv;
1263 } 1507 }
1264 1508
1509 SvREFCNT_inc (sv);
1265 FREETMPS; LEAVE; 1510 FREETMPS; LEAVE;
1266 } 1511 }
1267 } 1512 }
1268 1513
1269 if (dec->json.cb_object) 1514 if (dec->json.cb_object)
1270 { 1515 {
1271 dSP; 1516 dSP;
1272 int count; 1517 int count;
1273 1518
1274 ENTER; SAVETMPS; PUSHMARK (SP); 1519 ENTER; SAVETMPS;
1520 SAVESTACK_POS ();
1521 PUSHMARK (SP);
1275 XPUSHs (sv_2mortal (sv)); 1522 XPUSHs (sv_2mortal (sv));
1276 1523
1277 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1524 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1278 1525
1279 if (count == 1) 1526 if (count == 1)
… …
1295 DEC_DEC_DEPTH; 1542 DEC_DEC_DEPTH;
1296 return 0; 1543 return 0;
1297} 1544}
1298 1545
1299static SV * 1546static SV *
1547decode_tag (dec_t *dec)
1548{
1549 SV *tag = 0;
1550 SV *val = 0;
1551
1552 if (!(dec->json.flags & F_ALLOW_TAGS))
1553 ERR ("malformed JSON string, neither array, object, number, string or atom");
1554
1555 ++dec->cur;
1556
1557 decode_ws (dec);
1558
1559 tag = decode_sv (dec);
1560 if (!tag)
1561 goto fail;
1562
1563 if (!SvPOK (tag))
1564 ERR ("malformed JSON string, (tag) must be a string");
1565
1566 decode_ws (dec);
1567
1568 if (*dec->cur != ')')
1569 ERR (") expected after tag");
1570
1571 ++dec->cur;
1572
1573 decode_ws (dec);
1574
1575 val = decode_sv (dec);
1576 if (!val)
1577 goto fail;
1578
1579 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1580 ERR ("malformed JSON string, tag value must be an array");
1581
1582 {
1583 AV *av = (AV *)SvRV (val);
1584 int i, len = av_len (av) + 1;
1585 HV *stash = gv_stashsv (tag, 0);
1586 SV *sv;
1587
1588 if (!stash)
1589 ERR ("cannot decode perl-object (package does not exist)");
1590
1591 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1592
1593 if (!method)
1594 ERR ("cannot decode perl-object (package does not have a THAW method)");
1595
1596 dSP;
1597
1598 ENTER; SAVETMPS;
1599 PUSHMARK (SP);
1600 EXTEND (SP, len + 2);
1601 // we re-bless the reference to get overload and other niceties right
1602 PUSHs (tag);
1603 PUSHs (sv_json);
1604
1605 for (i = 0; i < len; ++i)
1606 PUSHs (*av_fetch (av, i, 1));
1607
1608 PUTBACK;
1609 call_sv ((SV *)GvCV (method), G_SCALAR);
1610 SPAGAIN;
1611
1612 SvREFCNT_dec (tag);
1613 SvREFCNT_dec (val);
1614 sv = SvREFCNT_inc (POPs);
1615
1616 PUTBACK;
1617
1618 FREETMPS; LEAVE;
1619
1620 return sv;
1621 }
1622
1623fail:
1624 SvREFCNT_dec (tag);
1625 SvREFCNT_dec (val);
1626 return 0;
1627}
1628
1629static SV *
1300decode_sv (dec_t *dec) 1630decode_sv (dec_t *dec)
1301{ 1631{
1302 // the beauty of JSON: you need exactly one character lookahead 1632 // the beauty of JSON: you need exactly one character lookahead
1303 // to parse anything. 1633 // to parse everything.
1304 switch (*dec->cur) 1634 switch (*dec->cur)
1305 { 1635 {
1306 case '"': ++dec->cur; return decode_str (dec); 1636 case '"': ++dec->cur; return decode_str (dec);
1307 case '[': ++dec->cur; return decode_av (dec); 1637 case '[': ++dec->cur; return decode_av (dec);
1308 case '{': ++dec->cur; return decode_hv (dec); 1638 case '{': ++dec->cur; return decode_hv (dec);
1639 case '(': return decode_tag (dec);
1309 1640
1310 case '-': 1641 case '-':
1311 case '0': case '1': case '2': case '3': case '4': 1642 case '0': case '1': case '2': case '3': case '4':
1312 case '5': case '6': case '7': case '8': case '9': 1643 case '5': case '6': case '7': case '8': case '9':
1313 return decode_num (dec); 1644 return decode_num (dec);
… …
1315 case 't': 1646 case 't':
1316 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1647 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1317 { 1648 {
1318 dec->cur += 4; 1649 dec->cur += 4;
1319#if JSON_SLOW 1650#if JSON_SLOW
1320 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1651 bool_true = get_bool ("Types::Serialiser::true");
1321#endif 1652#endif
1322 return SvREFCNT_inc (json_true); 1653 return newSVsv (bool_true);
1323 } 1654 }
1324 else 1655 else
1325 ERR ("'true' expected"); 1656 ERR ("'true' expected");
1326 1657
1327 break; 1658 break;
… …
1329 case 'f': 1660 case 'f':
1330 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1661 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1331 { 1662 {
1332 dec->cur += 5; 1663 dec->cur += 5;
1333#if JSON_SLOW 1664#if JSON_SLOW
1334 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1665 bool_false = get_bool ("Types::Serialiser::false");
1335#endif 1666#endif
1336 return SvREFCNT_inc (json_false); 1667 return newSVsv (bool_false);
1337 } 1668 }
1338 else 1669 else
1339 ERR ("'false' expected"); 1670 ERR ("'false' expected");
1340 1671
1341 break; 1672 break;
… …
1350 ERR ("'null' expected"); 1681 ERR ("'null' expected");
1351 1682
1352 break; 1683 break;
1353 1684
1354 default: 1685 default:
1355 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1686 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1356 break; 1687 break;
1357 } 1688 }
1358 1689
1359fail: 1690fail:
1360 return 0; 1691 return 0;
1361} 1692}
1362 1693
1363static SV * 1694static SV *
1364decode_json (SV *string, JSON *json, UV *offset_return) 1695decode_json (SV *string, JSON *json, STRLEN *offset_return)
1365{ 1696{
1366 dec_t dec; 1697 dec_t dec;
1367 UV offset;
1368 SV *sv; 1698 SV *sv;
1369 1699
1700 /* work around bugs in 5.10 where manipulating magic values
1701 * makes perl ignore the magic in subsequent accesses.
1702 * also make a copy of non-PV values, to get them into a clean
1703 * state (SvPV should do that, but it's buggy, see below).
1704 *
1705 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1706 * as reported by Reini Urban.
1707 */
1370 SvGETMAGIC (string); 1708 /*SvGETMAGIC (string);*/
1709 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1710 string = sv_2mortal (newSVsv (string));
1711
1371 SvUPGRADE (string, SVt_PV); 1712 SvUPGRADE (string, SVt_PV);
1372 1713
1373 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1714 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1715 * assertion with -DDEBUGGING, although SvCUR is documented to
1716 * return the xpv_cur field which certainly exists after upgrading.
1717 * according to nicholas clark, calling SvPOK fixes this.
1718 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1719 * and hope for the best.
1720 * Damnit, SvPV_nolen still trips over yet another assertion. This
1721 * assertion business is seriously broken, try yet another workaround
1722 * for the broken -DDEBUGGING.
1723 */
1724 {
1725#ifdef DEBUGGING
1726 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1727#else
1728 STRLEN offset = SvCUR (string);
1729#endif
1730
1731 if (offset > json->max_size && json->max_size)
1374 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1732 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1375 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1733 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1734 }
1376 1735
1377 if (json->flags & F_UTF8) 1736 if (DECODE_WANTS_OCTETS (json))
1378 sv_utf8_downgrade (string, 0); 1737 sv_utf8_downgrade (string, 0);
1379 else 1738 else
1380 sv_utf8_upgrade (string); 1739 sv_utf8_upgrade (string);
1381 1740
1382 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1741 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1383 1742
1384 dec.json = *json; 1743 dec.json = *json;
1385 dec.cur = SvPVX (string); 1744 dec.cur = SvPVX (string);
1386 dec.end = SvEND (string); 1745 dec.end = SvEND (string);
1387 dec.err = 0; 1746 dec.err = 0;
1388 dec.depth = 0; 1747 dec.depth = 0;
1389 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1390 1748
1391 if (dec.json.cb_object || dec.json.cb_sk_object) 1749 if (dec.json.cb_object || dec.json.cb_sk_object)
1392 dec.json.flags |= F_HOOK; 1750 dec.json.flags |= F_HOOK;
1393 1751
1394 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1752 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1395 1753
1396 decode_ws (&dec); 1754 decode_ws (&dec);
1397 sv = decode_sv (&dec); 1755 sv = decode_sv (&dec);
1398 1756
1399 if (!(offset_return || !sv)) 1757 if (offset_return)
1758 *offset_return = dec.cur - SvPVX (string);
1759 else if (sv)
1400 { 1760 {
1401 // check for trailing garbage 1761 // check for trailing garbage
1402 decode_ws (&dec); 1762 decode_ws (&dec);
1403 1763
1404 if (*dec.cur) 1764 if (*dec.cur)
1405 { 1765 {
1406 dec.err = "garbage after JSON object"; 1766 dec.err = "garbage after JSON object";
1407 SvREFCNT_dec (sv); 1767 SvREFCNT_dec (sv);
1408 sv = 0; 1768 sv = 0;
1409 } 1769 }
1410 }
1411
1412 if (offset_return || !sv)
1413 {
1414 offset = dec.json.flags & F_UTF8
1415 ? dec.cur - SvPVX (string)
1416 : utf8_distance (dec.cur, SvPVX (string));
1417
1418 if (offset_return)
1419 *offset_return = offset;
1420 } 1770 }
1421 1771
1422 if (!sv) 1772 if (!sv)
1423 { 1773 {
1424 SV *uni = sv_newmortal (); 1774 SV *uni = sv_newmortal ();
… …
1430 SAVEVPTR (PL_curcop); 1780 SAVEVPTR (PL_curcop);
1431 PL_curcop = &cop; 1781 PL_curcop = &cop;
1432 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1782 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1433 LEAVE; 1783 LEAVE;
1434 1784
1435 croak ("%s, at character offset %d [\"%s\"]", 1785 croak ("%s, at character offset %d (before \"%s\")",
1436 dec.err, 1786 dec.err,
1437 (int)offset, 1787 (int)ptr_to_index (string, dec.cur),
1438 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1788 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1439 } 1789 }
1440 1790
1441 sv = sv_2mortal (sv); 1791 sv = sv_2mortal (sv);
1442 1792
1443 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1793 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1444 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1794 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1445 1795
1446 return sv; 1796 return sv;
1797}
1798
1799/////////////////////////////////////////////////////////////////////////////
1800// incremental parser
1801
1802static void
1803incr_parse (JSON *self)
1804{
1805 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1806
1807 // the state machine here is a bit convoluted and could be simplified a lot
1808 // but this would make it slower, so...
1809
1810 for (;;)
1811 {
1812 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1813 switch (self->incr_mode)
1814 {
1815 // only used for initial whitespace skipping
1816 case INCR_M_WS:
1817 for (;;)
1818 {
1819 if (*p > 0x20)
1820 {
1821 if (*p == '#')
1822 {
1823 self->incr_mode = INCR_M_C0;
1824 goto incr_m_c;
1825 }
1826 else
1827 {
1828 self->incr_mode = INCR_M_JSON;
1829 goto incr_m_json;
1830 }
1831 }
1832 else if (!*p)
1833 goto interrupt;
1834
1835 ++p;
1836 }
1837
1838 // skip a single char inside a string (for \\-processing)
1839 case INCR_M_BS:
1840 if (!*p)
1841 goto interrupt;
1842
1843 ++p;
1844 self->incr_mode = INCR_M_STR;
1845 goto incr_m_str;
1846
1847 // inside #-style comments
1848 case INCR_M_C0:
1849 case INCR_M_C1:
1850 incr_m_c:
1851 for (;;)
1852 {
1853 if (*p == '\n')
1854 {
1855 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1856 break;
1857 }
1858 else if (!*p)
1859 goto interrupt;
1860
1861 ++p;
1862 }
1863
1864 break;
1865
1866 // inside a string
1867 case INCR_M_STR:
1868 incr_m_str:
1869 for (;;)
1870 {
1871 if (*p == '"')
1872 {
1873 ++p;
1874 self->incr_mode = INCR_M_JSON;
1875
1876 if (!self->incr_nest)
1877 goto interrupt;
1878
1879 goto incr_m_json;
1880 }
1881 else if (*p == '\\')
1882 {
1883 ++p; // "virtually" consumes character after \
1884
1885 if (!*p) // if at end of string we have to switch modes
1886 {
1887 self->incr_mode = INCR_M_BS;
1888 goto interrupt;
1889 }
1890 }
1891 else if (!*p)
1892 goto interrupt;
1893
1894 ++p;
1895 }
1896
1897 // after initial ws, outside string
1898 case INCR_M_JSON:
1899 incr_m_json:
1900 for (;;)
1901 {
1902 switch (*p++)
1903 {
1904 case 0:
1905 --p;
1906 goto interrupt;
1907
1908 case 0x09:
1909 case 0x0a:
1910 case 0x0d:
1911 case 0x20:
1912 if (!self->incr_nest)
1913 {
1914 --p; // do not eat the whitespace, let the next round do it
1915 goto interrupt;
1916 }
1917 break;
1918
1919 case '"':
1920 self->incr_mode = INCR_M_STR;
1921 goto incr_m_str;
1922
1923 case '[':
1924 case '{':
1925 case '(':
1926 if (++self->incr_nest > self->max_depth)
1927 croak (ERR_NESTING_EXCEEDED);
1928 break;
1929
1930 case ']':
1931 case '}':
1932 if (--self->incr_nest <= 0)
1933 goto interrupt;
1934 break;
1935
1936 case ')':
1937 --self->incr_nest;
1938 break;
1939
1940 case '#':
1941 self->incr_mode = INCR_M_C1;
1942 goto incr_m_c;
1943 }
1944 }
1945 }
1946
1947 modechange:
1948 ;
1949 }
1950
1951interrupt:
1952 self->incr_pos = p - SvPVX (self->incr_text);
1953 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1954 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1447} 1955}
1448 1956
1449///////////////////////////////////////////////////////////////////////////// 1957/////////////////////////////////////////////////////////////////////////////
1450// XS interface functions 1958// XS interface functions
1451 1959
… …
1460 i >= '0' && i <= '9' ? i - '0' 1968 i >= '0' && i <= '9' ? i - '0'
1461 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1969 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1462 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1970 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1463 : -1; 1971 : -1;
1464 1972
1465 json_stash = gv_stashpv ("JSON::XS" , 1); 1973 json_stash = gv_stashpv ("JSON::XS" , 1);
1466 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1974 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1975 bool_true = get_bool ("Types::Serialiser::true");
1976 bool_false = get_bool ("Types::Serialiser::false");
1467 1977
1468 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1978 sv_json = newSVpv ("JSON", 0);
1469 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1979 SvREADONLY_on (sv_json);
1980
1981 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1470} 1982}
1471 1983
1472PROTOTYPES: DISABLE 1984PROTOTYPES: DISABLE
1473 1985
1474void CLONE (...) 1986void CLONE (...)
1475 CODE: 1987 CODE:
1476 json_stash = 0; 1988 json_stash = 0;
1477 json_boolean_stash = 0; 1989 bool_stash = 0;
1478 1990
1479void new (char *klass) 1991void new (char *klass)
1480 PPCODE: 1992 PPCODE:
1481{ 1993{
1482 SV *pv = NEWSV (0, sizeof (JSON)); 1994 SV *pv = NEWSV (0, sizeof (JSON));
1483 SvPOK_only (pv); 1995 SvPOK_only (pv);
1484 Zero (SvPVX (pv), 1, JSON); 1996 json_init ((JSON *)SvPVX (pv));
1485 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1486 XPUSHs (sv_2mortal (sv_bless ( 1997 XPUSHs (sv_2mortal (sv_bless (
1487 newRV_noinc (pv), 1998 newRV_noinc (pv),
1488 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1999 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1489 ))); 2000 )));
1490} 2001}
… …
1502 allow_nonref = F_ALLOW_NONREF 2013 allow_nonref = F_ALLOW_NONREF
1503 shrink = F_SHRINK 2014 shrink = F_SHRINK
1504 allow_blessed = F_ALLOW_BLESSED 2015 allow_blessed = F_ALLOW_BLESSED
1505 convert_blessed = F_CONV_BLESSED 2016 convert_blessed = F_CONV_BLESSED
1506 relaxed = F_RELAXED 2017 relaxed = F_RELAXED
2018 allow_unknown = F_ALLOW_UNKNOWN
2019 allow_tags = F_ALLOW_TAGS
1507 PPCODE: 2020 PPCODE:
1508{ 2021{
1509 if (enable) 2022 if (enable)
1510 self->flags |= ix; 2023 self->flags |= ix;
1511 else 2024 else
… …
1526 get_allow_nonref = F_ALLOW_NONREF 2039 get_allow_nonref = F_ALLOW_NONREF
1527 get_shrink = F_SHRINK 2040 get_shrink = F_SHRINK
1528 get_allow_blessed = F_ALLOW_BLESSED 2041 get_allow_blessed = F_ALLOW_BLESSED
1529 get_convert_blessed = F_CONV_BLESSED 2042 get_convert_blessed = F_CONV_BLESSED
1530 get_relaxed = F_RELAXED 2043 get_relaxed = F_RELAXED
2044 get_allow_unknown = F_ALLOW_UNKNOWN
2045 get_allow_tags = F_ALLOW_TAGS
1531 PPCODE: 2046 PPCODE:
1532 XPUSHs (boolSV (self->flags & ix)); 2047 XPUSHs (boolSV (self->flags & ix));
1533 2048
1534void max_depth (JSON *self, UV max_depth = 0x80000000UL) 2049void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1535 PPCODE: 2050 PPCODE:
1536{ 2051 self->max_depth = max_depth;
1537 UV log2 = 0;
1538
1539 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1540
1541 while ((1UL << log2) < max_depth)
1542 ++log2;
1543
1544 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1545
1546 XPUSHs (ST (0)); 2052 XPUSHs (ST (0));
1547}
1548 2053
1549U32 get_max_depth (JSON *self) 2054U32 get_max_depth (JSON *self)
1550 CODE: 2055 CODE:
1551 RETVAL = DEC_DEPTH (self->flags); 2056 RETVAL = self->max_depth;
1552 OUTPUT: 2057 OUTPUT:
1553 RETVAL 2058 RETVAL
1554 2059
1555void max_size (JSON *self, UV max_size = 0) 2060void max_size (JSON *self, U32 max_size = 0)
1556 PPCODE: 2061 PPCODE:
1557{ 2062 self->max_size = max_size;
1558 UV log2 = 0;
1559
1560 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1561 if (max_size == 1) max_size = 2;
1562
1563 while ((1UL << log2) < max_size)
1564 ++log2;
1565
1566 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1567
1568 XPUSHs (ST (0)); 2063 XPUSHs (ST (0));
1569}
1570 2064
1571int get_max_size (JSON *self) 2065int get_max_size (JSON *self)
1572 CODE: 2066 CODE:
1573 RETVAL = DEC_SIZE (self->flags); 2067 RETVAL = self->max_size;
1574 OUTPUT: 2068 OUTPUT:
1575 RETVAL 2069 RETVAL
1576 2070
1577void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2071void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1578 PPCODE: 2072 PPCODE:
… …
1584} 2078}
1585 2079
1586void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2080void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1587 PPCODE: 2081 PPCODE:
1588{ 2082{
1589 if (!self->cb_sk_object) 2083 if (!self->cb_sk_object)
1590 self->cb_sk_object = newHV (); 2084 self->cb_sk_object = newHV ();
1591 2085
1592 if (SvOK (cb)) 2086 if (SvOK (cb))
1593 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2087 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1594 else 2088 else
… …
1605 XPUSHs (ST (0)); 2099 XPUSHs (ST (0));
1606} 2100}
1607 2101
1608void encode (JSON *self, SV *scalar) 2102void encode (JSON *self, SV *scalar)
1609 PPCODE: 2103 PPCODE:
1610 XPUSHs (encode_json (scalar, self)); 2104 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2105 XPUSHs (scalar);
1611 2106
1612void decode (JSON *self, SV *jsonstr) 2107void decode (JSON *self, SV *jsonstr)
1613 PPCODE: 2108 PPCODE:
1614 XPUSHs (decode_json (jsonstr, self, 0)); 2109 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2110 XPUSHs (jsonstr);
1615 2111
1616void decode_prefix (JSON *self, SV *jsonstr) 2112void decode_prefix (JSON *self, SV *jsonstr)
1617 PPCODE: 2113 PPCODE:
1618{ 2114{
1619 UV offset; 2115 SV *sv;
2116 STRLEN offset;
2117 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1620 EXTEND (SP, 2); 2118 EXTEND (SP, 2);
1621 PUSHs (decode_json (jsonstr, self, &offset)); 2119 PUSHs (sv);
1622 PUSHs (sv_2mortal (newSVuv (offset))); 2120 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2121}
2122
2123void incr_parse (JSON *self, SV *jsonstr = 0)
2124 PPCODE:
2125{
2126 if (!self->incr_text)
2127 self->incr_text = newSVpvn ("", 0);
2128
2129 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2130 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2131 if (DECODE_WANTS_OCTETS (self))
2132 {
2133 if (self->incr_pos)
2134 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2135 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2136
2137 sv_utf8_downgrade (self->incr_text, 0);
2138 }
2139 else
2140 {
2141 sv_utf8_upgrade (self->incr_text);
2142
2143 if (self->incr_pos)
2144 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2145 - (U8 *)SvPVX (self->incr_text);
2146 }
2147
2148 // append data, if any
2149 if (jsonstr)
2150 {
2151 /* make sure both strings have same encoding */
2152 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2153 if (SvUTF8 (jsonstr))
2154 sv_utf8_downgrade (jsonstr, 0);
2155 else
2156 sv_utf8_upgrade (jsonstr);
2157
2158 /* and then just blindly append */
2159 {
2160 STRLEN len;
2161 const char *str = SvPV (jsonstr, len);
2162 STRLEN cur = SvCUR (self->incr_text);
2163
2164 if (SvLEN (self->incr_text) <= cur + len)
2165 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2166
2167 Move (str, SvEND (self->incr_text), len, char);
2168 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2169 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2170 }
2171 }
2172
2173 if (GIMME_V != G_VOID)
2174 do
2175 {
2176 SV *sv;
2177 STRLEN offset;
2178
2179 if (!INCR_DONE (self))
2180 {
2181 incr_parse (self);
2182
2183 if (self->incr_pos > self->max_size && self->max_size)
2184 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2185 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2186
2187 if (!INCR_DONE (self))
2188 {
2189 // as an optimisation, do not accumulate white space in the incr buffer
2190 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2191 {
2192 self->incr_pos = 0;
2193 SvCUR_set (self->incr_text, 0);
2194 }
2195
2196 break;
2197 }
2198 }
2199
2200 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2201 XPUSHs (sv);
2202
2203 self->incr_pos -= offset;
2204 self->incr_nest = 0;
2205 self->incr_mode = 0;
2206
2207 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2208 }
2209 while (GIMME_V == G_ARRAY);
2210}
2211
2212SV *incr_text (JSON *self)
2213 ATTRS: lvalue
2214 CODE:
2215{
2216 if (self->incr_pos)
2217 croak ("incr_text can not be called when the incremental parser already started parsing");
2218
2219 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2220}
2221 OUTPUT:
2222 RETVAL
2223
2224void incr_skip (JSON *self)
2225 CODE:
2226{
2227 if (self->incr_pos)
2228 {
2229 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2230 self->incr_pos = 0;
2231 self->incr_nest = 0;
2232 self->incr_mode = 0;
2233 }
2234}
2235
2236void incr_reset (JSON *self)
2237 CODE:
2238{
2239 SvREFCNT_dec (self->incr_text);
2240 self->incr_text = 0;
2241 self->incr_pos = 0;
2242 self->incr_nest = 0;
2243 self->incr_mode = 0;
1623} 2244}
1624 2245
1625void DESTROY (JSON *self) 2246void DESTROY (JSON *self)
1626 CODE: 2247 CODE:
1627 SvREFCNT_dec (self->cb_sk_object); 2248 SvREFCNT_dec (self->cb_sk_object);
1628 SvREFCNT_dec (self->cb_object); 2249 SvREFCNT_dec (self->cb_object);
2250 SvREFCNT_dec (self->incr_text);
1629 2251
1630PROTOTYPES: ENABLE 2252PROTOTYPES: ENABLE
1631 2253
1632void encode_json (SV *scalar) 2254void encode_json (SV *scalar)
1633 PPCODE: 2255 PPCODE:
1634{ 2256{
1635 JSON json = { F_DEFAULT | F_UTF8 }; 2257 JSON json;
1636 XPUSHs (encode_json (scalar, &json)); 2258 json_init (&json);
2259 json.flags |= F_UTF8;
2260 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2261 XPUSHs (scalar);
1637} 2262}
1638 2263
1639void decode_json (SV *jsonstr) 2264void decode_json (SV *jsonstr)
1640 PPCODE: 2265 PPCODE:
1641{ 2266{
1642 JSON json = { F_DEFAULT | F_UTF8 }; 2267 JSON json;
1643 XPUSHs (decode_json (jsonstr, &json, 0)); 2268 json_init (&json);
2269 json.flags |= F_UTF8;
2270 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2271 XPUSHs (jsonstr);
1644} 2272}
1645 2273

Diff Legend

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