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

Diff Legend

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