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.124 by root, Mon Nov 24 18:42:51 2014 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))
72#else 84#else
73# define JSON_SLOW 0 85# define JSON_SLOW 0
74# define JSON_STASH json_stash 86# define JSON_STASH json_stash
75#endif 87#endif
76 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
78static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
94
95enum {
96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
97 INCR_M_STR, // inside string
98 INCR_M_BS, // inside backslash
99 INCR_M_C0, // inside comment in initial whitespace sequence
100 INCR_M_C1, // inside comment in other places
101 INCR_M_JSON // outside anything, count nesting
102};
103
104#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
79 105
80typedef struct { 106typedef struct {
81 U32 flags; 107 U32 flags;
108 U32 max_depth;
109 STRLEN max_size;
110
82 SV *cb_object; 111 SV *cb_object;
83 HV *cb_sk_object; 112 HV *cb_sk_object;
113
114 // for the incremental parser
115 SV *incr_text; // the source text so far
116 STRLEN incr_pos; // the current offset into the text
117 int incr_nest; // {[]}-nesting level
118 unsigned char incr_mode;
84} JSON; 119} JSON;
120
121INLINE void
122json_init (JSON *json)
123{
124 Zero (json, 1, JSON);
125 json->max_depth = 512;
126}
85 127
86///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
87// utility functions 129// utility functions
88 130
131INLINE SV *
132get_bool (const char *name)
133{
134 SV *sv = get_sv (name, 1);
135
136 SvREADONLY_on (sv);
137 SvREADONLY_on (SvRV (sv));
138
139 return sv;
140}
141
89INLINE void 142INLINE void
90shrink (SV *sv) 143shrink (SV *sv)
91{ 144{
92 sv_utf8_downgrade (sv, 1); 145 sv_utf8_downgrade (sv, 1);
146
93 if (SvLEN (sv) > SvCUR (sv) + 1) 147 if (SvLEN (sv) > SvCUR (sv) + 1)
94 { 148 {
95#ifdef SvPV_shrink_to_cur 149#ifdef SvPV_shrink_to_cur
96 SvPV_shrink_to_cur (sv); 150 SvPV_shrink_to_cur (sv);
97#elif defined (SvPV_renew) 151#elif defined (SvPV_renew)
123// this function takes advantage of this fact, although current gccs 177// this function takes advantage of this fact, although current gccs
124// seem to optimise the check for >= 0x80 away anyways 178// seem to optimise the check for >= 0x80 away anyways
125INLINE unsigned char * 179INLINE unsigned char *
126encode_utf8 (unsigned char *s, UV ch) 180encode_utf8 (unsigned char *s, UV ch)
127{ 181{
128 if (ch <= 0x7FF) 182 if (expect_false (ch < 0x000080))
129 { 183 *s++ = ch;
130 *s++ = (ch >> 6) | 0xc0; 184 else if (expect_true (ch < 0x000800))
131 *s++ = (ch & 0x3f) | 0x80; 185 *s++ = 0xc0 | ( ch >> 6),
132 } 186 *s++ = 0x80 | ( ch & 0x3f);
133 else 187 else if ( ch < 0x010000)
134 s = uvuni_to_utf8_flags (s, ch, 0); 188 *s++ = 0xe0 | ( ch >> 12),
189 *s++ = 0x80 | ((ch >> 6) & 0x3f),
190 *s++ = 0x80 | ( ch & 0x3f);
191 else if ( ch < 0x110000)
192 *s++ = 0xf0 | ( ch >> 18),
193 *s++ = 0x80 | ((ch >> 12) & 0x3f),
194 *s++ = 0x80 | ((ch >> 6) & 0x3f),
195 *s++ = 0x80 | ( ch & 0x3f);
135 196
136 return s; 197 return s;
137} 198}
138 199
200// convert offset pointer to character index, sv must be string
201static STRLEN
202ptr_to_index (SV *sv, char *offset)
203{
204 return SvUTF8 (sv)
205 ? utf8_distance (offset, SvPVX (sv))
206 : offset - SvPVX (sv);
207}
208
209/////////////////////////////////////////////////////////////////////////////
210// fp hell
211
212// scan a group of digits, and a trailing exponent
213static void
214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
215{
216 UV uaccum = 0;
217 int eaccum = 0;
218
219 // if we recurse too deep, skip all remaining digits
220 // to avoid a stack overflow attack
221 if (expect_false (--maxdepth <= 0))
222 while (((U8)*s - '0') < 10)
223 ++s;
224
225 for (;;)
226 {
227 U8 dig = (U8)*s - '0';
228
229 if (expect_false (dig >= 10))
230 {
231 if (dig == (U8)((U8)'.' - (U8)'0'))
232 {
233 ++s;
234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
235 }
236 else if ((dig | ' ') == 'e' - '0')
237 {
238 int exp2 = 0;
239 int neg = 0;
240
241 ++s;
242
243 if (*s == '-')
244 {
245 ++s;
246 neg = 1;
247 }
248 else if (*s == '+')
249 ++s;
250
251 while ((dig = (U8)*s - '0') < 10)
252 exp2 = exp2 * 10 + *s++ - '0';
253
254 *expo += neg ? -exp2 : exp2;
255 }
256
257 break;
258 }
259
260 ++s;
261
262 uaccum = uaccum * 10 + dig;
263 ++eaccum;
264
265 // if we have too many digits, then recurse for more
266 // we actually do this for rather few digits
267 if (uaccum >= (UV_MAX - 9) / 10)
268 {
269 if (postdp) *expo -= eaccum;
270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
271 if (postdp) *expo += eaccum;
272
273 break;
274 }
275 }
276
277 // this relies greatly on the quality of the pow ()
278 // implementation of the platform, but a good
279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
281 if (postdp) *expo -= eaccum;
282 *accum += uaccum * Perl_pow (10., *expo);
283 *expo += eaccum;
284}
285
286static NV
287json_atof (const char *s)
288{
289 NV accum = 0.;
290 int expo = 0;
291 int neg = 0;
292
293 if (*s == '-')
294 {
295 ++s;
296 neg = 1;
297 }
298
299 // a recursion depth of ten gives us >>500 bits
300 json_atof_scan1 (s, &accum, &expo, 0, 10);
301
302 return neg ? -accum : accum;
303}
139///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
140// encoder 305// encoder
141 306
142// structure used for encoding JSON 307// structure used for encoding JSON
143typedef struct 308typedef struct
145 char *cur; // SvPVX (sv) + current output position 310 char *cur; // SvPVX (sv) + current output position
146 char *end; // SvEND (sv) 311 char *end; // SvEND (sv)
147 SV *sv; // result scalar 312 SV *sv; // result scalar
148 JSON json; 313 JSON json;
149 U32 indent; // indentation level 314 U32 indent; // indentation level
150 U32 maxdepth; // max. indentation/recursion level
151 UV limit; // escape character values >= this value when encoding 315 UV limit; // escape character values >= this value when encoding
152} enc_t; 316} enc_t;
153 317
154INLINE void 318INLINE void
155need (enc_t *enc, STRLEN len) 319need (enc_t *enc, STRLEN len)
156{ 320{
157 if (expect_false (enc->cur + len >= enc->end)) 321 if (expect_false (enc->cur + len >= enc->end))
158 { 322 {
159 STRLEN cur = enc->cur - SvPVX (enc->sv); 323 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
160 SvGROW (enc->sv, cur + len + 1); 324 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
161 enc->cur = SvPVX (enc->sv) + cur; 325 enc->cur = SvPVX (enc->sv) + cur;
162 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 326 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
163 } 327 }
164} 328}
165 329
227 clen = 1; 391 clen = 1;
228 } 392 }
229 393
230 if (uch < 0x80/*0x20*/ || uch >= enc->limit) 394 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
231 { 395 {
232 if (uch > 0xFFFFUL) 396 if (uch >= 0x10000UL)
233 { 397 {
234 if (uch > 0x10FFFFUL) 398 if (uch >= 0x110000UL)
235 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 399 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
236 400
237 need (enc, len += 11); 401 need (enc, len += 11);
238 sprintf (enc->cur, "\\u%04x\\u%04x", 402 sprintf (enc->cur, "\\u%04x\\u%04x",
239 (int)((uch - 0x10000) / 0x400 + 0xD800), 403 (int)((uch - 0x10000) / 0x400 + 0xD800),
240 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 404 (int)((uch - 0x10000) % 0x400 + 0xDC00));
241 enc->cur += 12; 405 enc->cur += 12;
242 } 406 }
243 else 407 else
244 { 408 {
245 static char hexdigit [16] = "0123456789abcdef";
246 need (enc, len += 5); 409 need (enc, len += 5);
247 *enc->cur++ = '\\'; 410 *enc->cur++ = '\\';
248 *enc->cur++ = 'u'; 411 *enc->cur++ = 'u';
249 *enc->cur++ = hexdigit [ uch >> 12 ]; 412 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
250 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 413 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
251 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 414 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
252 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 415 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
253 } 416 }
254 417
255 str += clen; 418 str += clen;
256 } 419 }
257 else if (enc->json.flags & F_LATIN1) 420 else if (enc->json.flags & F_LATIN1)
328static void 491static void
329encode_av (enc_t *enc, AV *av) 492encode_av (enc_t *enc, AV *av)
330{ 493{
331 int i, len = av_len (av); 494 int i, len = av_len (av);
332 495
333 if (enc->indent >= enc->maxdepth) 496 if (enc->indent >= enc->json.max_depth)
334 croak ("data structure too deep (hit recursion limit)"); 497 croak (ERR_NESTING_EXCEEDED);
335 498
336 encode_ch (enc, '['); 499 encode_ch (enc, '[');
337 500
338 if (len >= 0) 501 if (len >= 0)
339 { 502 {
340 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
341 504
342 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
354 encode_comma (enc); 517 encode_comma (enc);
355 } 518 }
356 519
357 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
358 } 521 }
359 522
360 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
361} 524}
362 525
363static void 526static void
364encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
368 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
369 { 532 {
370 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
371 STRLEN len; 534 STRLEN len;
372 char *str; 535 char *str;
373 536
374 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
375 str = SvPV (sv, len); 538 str = SvPV (sv, len);
376 539
377 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
378 } 541 }
413 576
414static void 577static void
415encode_hv (enc_t *enc, HV *hv) 578encode_hv (enc_t *enc, HV *hv)
416{ 579{
417 HE *he; 580 HE *he;
418 int count;
419 581
420 if (enc->indent >= enc->maxdepth) 582 if (enc->indent >= enc->json.max_depth)
421 croak ("data structure too deep (hit recursion limit)"); 583 croak (ERR_NESTING_EXCEEDED);
422 584
423 encode_ch (enc, '{'); 585 encode_ch (enc, '{');
424 586
425 // for canonical output we have to sort by keys first 587 // for canonical output we have to sort by keys first
426 // actually, this is mostly due to the stupid so-called 588 // actually, this is mostly due to the stupid so-called
427 // security workaround added somewhere in 5.8.x. 589 // security workaround added somewhere in 5.8.x
428 // that randomises hash orderings 590 // that randomises hash orderings
429 if (enc->json.flags & F_CANONICAL) 591 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
430 { 592 {
431 int count = hv_iterinit (hv); 593 int count = hv_iterinit (hv);
432 594
433 if (SvMAGICAL (hv)) 595 if (SvMAGICAL (hv))
434 { 596 {
445 } 607 }
446 608
447 if (count) 609 if (count)
448 { 610 {
449 int i, fast = 1; 611 int i, fast = 1;
450#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
451 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
452#else 614
453 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
454#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
455 621
456 i = 0; 622 i = 0;
457 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
458 { 624 {
459 hes [i++] = he; 625 hes [i++] = he;
528// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
529static void 695static void
530encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
531{ 697{
532 svtype svt; 698 svtype svt;
699 GV *method;
533 700
534 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
535 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
536 703
537 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
538 { 705 {
539 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
540 ? json_boolean_stash 707 ? types_boolean_stash
541 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
542 710
543 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
544 { 712 {
545 if (SvIV (sv)) 713 if (SvIV (sv))
546 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
547 else 715 else
548 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
549 } 717 }
718 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
719 {
720 int count;
721 dSP;
722
723 ENTER; SAVETMPS; PUSHMARK (SP);
724 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json);
728
729 PUTBACK;
730 count = call_sv ((SV *)GvCV (method), G_ARRAY);
731 SPAGAIN;
732
733 // catch this surprisingly common error
734 if (SvROK (TOPs) && SvRV (TOPs) == sv)
735 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
736
737 encode_ch (enc, '(');
738 encode_ch (enc, '"');
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"');
741 encode_ch (enc, ')');
742 encode_ch (enc, '[');
743
744 while (count)
745 {
746 encode_sv (enc, SP[1 - count--]);
747
748 if (count)
749 encode_ch (enc, ',');
750 }
751
752 encode_ch (enc, ']');
753
754 PUTBACK;
755
756 FREETMPS; LEAVE;
757 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 {
760 dSP;
761
762 ENTER; SAVETMPS; PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765
766 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK;
768 call_sv ((SV *)GvCV (method), G_SCALAR);
769 SPAGAIN;
770
771 // catch this surprisingly common error
772 if (SvROK (TOPs) && SvRV (TOPs) == sv)
773 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
774
775 sv = POPs;
776 PUTBACK;
777
778 encode_sv (enc, sv);
779
780 FREETMPS; LEAVE;
781 }
782 else if (enc->json.flags & F_ALLOW_BLESSED)
783 encode_str (enc, "null", 4, 0);
550 else 784 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", 785 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)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
597 }
598 } 787 }
599 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
600 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
601 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
602 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
607 796
608 if (len == 1 && *pv == '1') 797 if (len == 1 && *pv == '1')
609 encode_str (enc, "true", 4, 0); 798 encode_str (enc, "true", 4, 0);
610 else if (len == 1 && *pv == '0') 799 else if (len == 1 && *pv == '0')
611 encode_str (enc, "false", 5, 0); 800 encode_str (enc, "false", 5, 0);
801 else if (enc->json.flags & F_ALLOW_UNKNOWN)
802 encode_str (enc, "null", 4, 0);
612 else 803 else
613 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 804 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
614 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 805 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
615 } 806 }
807 else if (enc->json.flags & F_ALLOW_UNKNOWN)
808 encode_str (enc, "null", 4, 0);
616 else 809 else
617 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 810 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
618 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 811 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
619} 812}
620 813
638 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 831 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
639 enc->cur += strlen (enc->cur); 832 enc->cur += strlen (enc->cur);
640 } 833 }
641 else if (SvIOKp (sv)) 834 else if (SvIOKp (sv))
642 { 835 {
643 // we assume we can always read an IV as a UV 836 // we assume we can always read an IV as a UV and vice versa
644 if (SvUV (sv) & ~(UV)0x7fff) 837 // we assume two's complement
645 { 838 // we assume no aliasing issues in the union
646 // large integer, use the (rather slow) snprintf way. 839 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
647 need (enc, sizeof (UV) * 3); 840 : 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 { 841 {
655 // optimise the "small number case" 842 // optimise the "small number case"
656 // code will likely be branchless and use only a single multiplication 843 // code will likely be branchless and use only a single multiplication
844 // works for numbers up to 59074
657 I32 i = SvIV (sv); 845 I32 i = SvIVX (sv);
658 U32 u; 846 U32 u;
659 char digit, nz = 0; 847 char digit, nz = 0;
660 848
661 need (enc, 6); 849 need (enc, 6);
662 850
668 856
669 // now output digit by digit, each time masking out the integer part 857 // 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, 858 // and multiplying by 5 while moving the decimal point one to the right,
671 // resulting in a net multiplication by 10. 859 // resulting in a net multiplication by 10.
672 // we always write the digit to memory but conditionally increment 860 // we always write the digit to memory but conditionally increment
673 // the pointer, to ease the usage of conditional move instructions. 861 // 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; 862 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; 863 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; 864 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; 865 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' 866 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
679 } 867 }
868 else
869 {
870 // large integer, use the (rather slow) snprintf way.
871 need (enc, IVUV_MAXCHARS);
872 enc->cur +=
873 SvIsUV(sv)
874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
876 }
680 } 877 }
681 else if (SvROK (sv)) 878 else if (SvROK (sv))
682 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
683 else if (!SvOK (sv)) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
684 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
685 else 882 else
686 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 883 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
687 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
688} 885}
689 886
690static SV * 887static SV *
691encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
692{ 889{
698 enc.json = *json; 895 enc.json = *json;
699 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 896 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
700 enc.cur = SvPVX (enc.sv); 897 enc.cur = SvPVX (enc.sv);
701 enc.end = SvEND (enc.sv); 898 enc.end = SvEND (enc.sv);
702 enc.indent = 0; 899 enc.indent = 0;
703 enc.maxdepth = DEC_DEPTH (enc.json.flags);
704 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 900 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
705 : enc.json.flags & F_LATIN1 ? 0x000100UL 901 : enc.json.flags & F_LATIN1 ? 0x000100UL
706 : 0x10FFFFUL; 902 : 0x110000UL;
707 903
708 SvPOK_only (enc.sv); 904 SvPOK_only (enc.sv);
709 encode_sv (&enc, scalar); 905 encode_sv (&enc, scalar);
906 encode_nl (&enc);
710 907
711 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 908 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
712 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 909 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
713 910
714 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 911 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
775 if (*dec->cur != ch) \ 972 if (*dec->cur != ch) \
776 ERR (# ch " expected"); \ 973 ERR (# ch " expected"); \
777 ++dec->cur; \ 974 ++dec->cur; \
778 SE 975 SE
779 976
780#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 977#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
781#define DEC_DEC_DEPTH --dec->depth 978#define DEC_DEC_DEPTH --dec->depth
782 979
783static SV *decode_sv (dec_t *dec); 980static SV *decode_sv (dec_t *dec);
784 981
785static signed char decode_hexdigit[256]; 982static signed char decode_hexdigit[256];
889 default: 1086 default:
890 --dec_cur; 1087 --dec_cur;
891 ERR ("illegal backslash escape sequence in string"); 1088 ERR ("illegal backslash escape sequence in string");
892 } 1089 }
893 } 1090 }
894 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1091 else if (expect_true (ch >= 0x20 && ch < 0x80))
895 *cur++ = ch; 1092 *cur++ = ch;
896 else if (ch >= 0x80) 1093 else if (ch >= 0x80)
897 { 1094 {
898 STRLEN clen; 1095 STRLEN clen;
899 UV uch;
900 1096
901 --dec_cur; 1097 --dec_cur;
902 1098
903 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1099 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
904 if (clen == (STRLEN)-1) 1100 if (clen == (STRLEN)-1)
905 ERR ("malformed UTF-8 character in JSON string"); 1101 ERR ("malformed UTF-8 character in JSON string");
906 1102
907 do 1103 do
908 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
909 while (--clen); 1105 while (--clen);
910 1106
911 utf8 = 1; 1107 utf8 = 1;
912 } 1108 }
1109 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1110 *cur++ = ch;
913 else 1111 else
914 { 1112 {
915 --dec_cur; 1113 --dec_cur;
916 1114
917 if (!ch) 1115 if (!ch)
925 { 1123 {
926 STRLEN len = cur - buf; 1124 STRLEN len = cur - buf;
927 1125
928 if (sv) 1126 if (sv)
929 { 1127 {
930 SvGROW (sv, SvCUR (sv) + len + 1); 1128 STRLEN cur = SvCUR (sv);
1129
1130 if (SvLEN (sv) <= cur + len)
1131 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1132
931 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1133 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
932 SvCUR_set (sv, SvCUR (sv) + len); 1134 SvCUR_set (sv, SvCUR (sv) + len);
933 } 1135 }
934 else 1136 else
935 sv = newSVpvn (buf, len); 1137 sv = newSVpvn (buf, len);
1026 1228
1027 // special case the rather common 1..5-digit-int case 1229 // special case the rather common 1..5-digit-int case
1028 if (*start == '-') 1230 if (*start == '-')
1029 switch (len) 1231 switch (len)
1030 { 1232 {
1031 case 2: return newSViv (-( start [1] - '0' * 1)); 1233 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1032 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1234 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)); 1235 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)); 1236 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)); 1237 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1036 } 1238 }
1037 else 1239 else
1038 switch (len) 1240 switch (len)
1039 { 1241 {
1040 case 1: return newSViv ( start [0] - '0' * 1); 1242 case 1: return newSViv ( start [0] - '0' * 1);
1041 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1243 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); 1244 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); 1245 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); 1246 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1045 } 1247 }
1046 1248
1047 { 1249 {
1048 UV uv; 1250 UV uv;
1049 int numtype = grok_number (start, len, &uv); 1251 int numtype = grok_number (start, len, &uv);
1058 } 1260 }
1059 1261
1060 len -= *start == '-' ? 1 : 0; 1262 len -= *start == '-' ? 1 : 0;
1061 1263
1062 // does not fit into IV or UV, try NV 1264 // does not fit into IV or UV, try NV
1063 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1265 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 1266 // fits into NV without loss of precision
1069 return newSVnv (Atof (start)); 1267 return newSVnv (json_atof (start));
1070 1268
1071 // everything else fails, convert it to a string 1269 // everything else fails, convert it to a string
1072 return newSVpvn (start, dec->cur - start); 1270 return newSVpvn (start, dec->cur - start);
1073 } 1271 }
1074 1272
1075 // loss of precision here 1273 // loss of precision here
1076 return newSVnv (Atof (start)); 1274 return newSVnv (json_atof (start));
1077 1275
1078fail: 1276fail:
1079 return 0; 1277 return 0;
1080} 1278}
1081 1279
1105 if (*dec->cur == ']') 1303 if (*dec->cur == ']')
1106 { 1304 {
1107 ++dec->cur; 1305 ++dec->cur;
1108 break; 1306 break;
1109 } 1307 }
1110 1308
1111 if (*dec->cur != ',') 1309 if (*dec->cur != ',')
1112 ERR (", or ] expected while parsing array"); 1310 ERR (", or ] expected while parsing array");
1113 1311
1114 ++dec->cur; 1312 ++dec->cur;
1115 1313
1157 char *p = dec->cur; 1355 char *p = dec->cur;
1158 char *e = p + 24; // only try up to 24 bytes 1356 char *e = p + 24; // only try up to 24 bytes
1159 1357
1160 for (;;) 1358 for (;;)
1161 { 1359 {
1162 // the >= 0x80 is true on most architectures 1360 // the >= 0x80 is false on most architectures
1163 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1361 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1164 { 1362 {
1165 // slow path, back up and use decode_str 1363 // slow path, back up and use decode_str
1166 SV *key = decode_str (dec); 1364 SV *key = decode_str (dec);
1167 if (!key) 1365 if (!key)
1250 dSP; 1448 dSP;
1251 int count; 1449 int count;
1252 1450
1253 ENTER; SAVETMPS; PUSHMARK (SP); 1451 ENTER; SAVETMPS; PUSHMARK (SP);
1254 XPUSHs (HeVAL (he)); 1452 XPUSHs (HeVAL (he));
1453 sv_2mortal (sv);
1255 1454
1256 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1455 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1257 1456
1258 if (count == 1) 1457 if (count == 1)
1259 { 1458 {
1260 sv = newSVsv (POPs); 1459 sv = newSVsv (POPs);
1261 FREETMPS; LEAVE; 1460 FREETMPS; LEAVE;
1262 return sv; 1461 return sv;
1263 } 1462 }
1264 1463
1464 SvREFCNT_inc (sv);
1265 FREETMPS; LEAVE; 1465 FREETMPS; LEAVE;
1266 } 1466 }
1267 } 1467 }
1268 1468
1269 if (dec->json.cb_object) 1469 if (dec->json.cb_object)
1295 DEC_DEC_DEPTH; 1495 DEC_DEC_DEPTH;
1296 return 0; 1496 return 0;
1297} 1497}
1298 1498
1299static SV * 1499static SV *
1500decode_tag (dec_t *dec)
1501{
1502 SV *tag = 0;
1503 SV *val = 0;
1504
1505 if (!(dec->json.flags & F_ALLOW_TAGS))
1506 ERR ("malformed JSON string, neither array, object, number, string or atom");
1507
1508 ++dec->cur;
1509
1510 decode_ws (dec);
1511
1512 tag = decode_sv (dec);
1513 if (!tag)
1514 goto fail;
1515
1516 if (!SvPOK (tag))
1517 ERR ("malformed JSON string, (tag) must be a string");
1518
1519 decode_ws (dec);
1520
1521 if (*dec->cur != ')')
1522 ERR (") expected after tag");
1523
1524 ++dec->cur;
1525
1526 decode_ws (dec);
1527
1528 val = decode_sv (dec);
1529 if (!val)
1530 goto fail;
1531
1532 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1533 ERR ("malformed JSON string, tag value must be an array");
1534
1535 {
1536 AV *av = (AV *)SvRV (val);
1537 int i, len = av_len (av) + 1;
1538 HV *stash = gv_stashsv (tag, 0);
1539 SV *sv;
1540
1541 if (!stash)
1542 ERR ("cannot decode perl-object (package does not exist)");
1543
1544 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1545
1546 if (!method)
1547 ERR ("cannot decode perl-object (package does not have a THAW method)");
1548
1549 dSP;
1550
1551 ENTER; SAVETMPS; PUSHMARK (SP);
1552 EXTEND (SP, len + 2);
1553 // we re-bless the reference to get overload and other niceties right
1554 PUSHs (tag);
1555 PUSHs (sv_json);
1556
1557 for (i = 0; i < len; ++i)
1558 PUSHs (*av_fetch (av, i, 1));
1559
1560 PUTBACK;
1561 call_sv ((SV *)GvCV (method), G_SCALAR);
1562 SPAGAIN;
1563
1564 SvREFCNT_dec (tag);
1565 SvREFCNT_dec (val);
1566 sv = SvREFCNT_inc (POPs);
1567
1568 PUTBACK;
1569
1570 FREETMPS; LEAVE;
1571
1572 return sv;
1573 }
1574
1575fail:
1576 SvREFCNT_dec (tag);
1577 SvREFCNT_dec (val);
1578 return 0;
1579}
1580
1581static SV *
1300decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1301{ 1583{
1302 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1303 // to parse everything. 1585 // to parse everything.
1304 switch (*dec->cur) 1586 switch (*dec->cur)
1305 { 1587 {
1306 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1307 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1308 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1309 1592
1310 case '-': 1593 case '-':
1311 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1312 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1313 return decode_num (dec); 1596 return decode_num (dec);
1315 case 't': 1598 case 't':
1316 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1317 { 1600 {
1318 dec->cur += 4; 1601 dec->cur += 4;
1319#if JSON_SLOW 1602#if JSON_SLOW
1320 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1603 types_true = get_bool ("Types::Serialiser::true");
1321#endif 1604#endif
1322 return SvREFCNT_inc (json_true); 1605 return newSVsv (types_true);
1323 } 1606 }
1324 else 1607 else
1325 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1326 1609
1327 break; 1610 break;
1329 case 'f': 1612 case 'f':
1330 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1331 { 1614 {
1332 dec->cur += 5; 1615 dec->cur += 5;
1333#if JSON_SLOW 1616#if JSON_SLOW
1334 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1617 types_false = get_bool ("Types::Serialiser::false");
1335#endif 1618#endif
1336 return SvREFCNT_inc (json_false); 1619 return newSVsv (types_false);
1337 } 1620 }
1338 else 1621 else
1339 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1340 1623
1341 break; 1624 break;
1350 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1351 1634
1352 break; 1635 break;
1353 1636
1354 default: 1637 default:
1355 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1356 break; 1639 break;
1357 } 1640 }
1358 1641
1359fail: 1642fail:
1360 return 0; 1643 return 0;
1361} 1644}
1362 1645
1363static SV * 1646static SV *
1364decode_json (SV *string, JSON *json, UV *offset_return) 1647decode_json (SV *string, JSON *json, char **offset_return)
1365{ 1648{
1366 dec_t dec; 1649 dec_t dec;
1367 UV offset;
1368 SV *sv; 1650 SV *sv;
1369 1651
1652 /* work around bugs in 5.10 where manipulating magic values
1653 * makes perl ignore the magic in subsequent accesses.
1654 * also make a copy of non-PV values, to get them into a clean
1655 * state (SvPV should do that, but it's buggy, see below).
1656 */
1370 SvGETMAGIC (string); 1657 /*SvGETMAGIC (string);*/
1658 if (SvMAGICAL (string) || !SvPOK (string))
1659 string = sv_2mortal (newSVsv (string));
1660
1371 SvUPGRADE (string, SVt_PV); 1661 SvUPGRADE (string, SVt_PV);
1372 1662
1373 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1663 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1664 * assertion with -DDEBUGGING, although SvCUR is documented to
1665 * return the xpv_cur field which certainly exists after upgrading.
1666 * according to nicholas clark, calling SvPOK fixes this.
1667 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1668 * and hope for the best.
1669 * Damnit, SvPV_nolen still trips over yet another assertion. This
1670 * assertion business is seriously broken, try yet another workaround
1671 * for the broken -DDEBUGGING.
1672 */
1673 {
1674#ifdef DEBUGGING
1675 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1676#else
1677 STRLEN offset = SvCUR (string);
1678#endif
1679
1680 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", 1681 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)); 1682 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1683 }
1376 1684
1377 if (json->flags & F_UTF8) 1685 if (DECODE_WANTS_OCTETS (json))
1378 sv_utf8_downgrade (string, 0); 1686 sv_utf8_downgrade (string, 0);
1379 else 1687 else
1380 sv_utf8_upgrade (string); 1688 sv_utf8_upgrade (string);
1381 1689
1382 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1690 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1383 1691
1384 dec.json = *json; 1692 dec.json = *json;
1385 dec.cur = SvPVX (string); 1693 dec.cur = SvPVX (string);
1386 dec.end = SvEND (string); 1694 dec.end = SvEND (string);
1387 dec.err = 0; 1695 dec.err = 0;
1388 dec.depth = 0; 1696 dec.depth = 0;
1389 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1390 1697
1391 if (dec.json.cb_object || dec.json.cb_sk_object) 1698 if (dec.json.cb_object || dec.json.cb_sk_object)
1392 dec.json.flags |= F_HOOK; 1699 dec.json.flags |= F_HOOK;
1393 1700
1394 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1701 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1395 1702
1396 decode_ws (&dec); 1703 decode_ws (&dec);
1397 sv = decode_sv (&dec); 1704 sv = decode_sv (&dec);
1705
1706 if (offset_return)
1707 *offset_return = dec.cur;
1398 1708
1399 if (!(offset_return || !sv)) 1709 if (!(offset_return || !sv))
1400 { 1710 {
1401 // check for trailing garbage 1711 // check for trailing garbage
1402 decode_ws (&dec); 1712 decode_ws (&dec);
1405 { 1715 {
1406 dec.err = "garbage after JSON object"; 1716 dec.err = "garbage after JSON object";
1407 SvREFCNT_dec (sv); 1717 SvREFCNT_dec (sv);
1408 sv = 0; 1718 sv = 0;
1409 } 1719 }
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 } 1720 }
1421 1721
1422 if (!sv) 1722 if (!sv)
1423 { 1723 {
1424 SV *uni = sv_newmortal (); 1724 SV *uni = sv_newmortal ();
1430 SAVEVPTR (PL_curcop); 1730 SAVEVPTR (PL_curcop);
1431 PL_curcop = &cop; 1731 PL_curcop = &cop;
1432 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1732 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1433 LEAVE; 1733 LEAVE;
1434 1734
1435 croak ("%s, at character offset %d [\"%s\"]", 1735 croak ("%s, at character offset %d (before \"%s\")",
1436 dec.err, 1736 dec.err,
1437 (int)offset, 1737 (int)ptr_to_index (string, dec.cur),
1438 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1439 } 1739 }
1440 1740
1441 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1442 1742
1443 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1743 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (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)"); 1744 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1445 1745
1446 return sv; 1746 return sv;
1747}
1748
1749/////////////////////////////////////////////////////////////////////////////
1750// incremental parser
1751
1752static void
1753incr_parse (JSON *self)
1754{
1755 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1756
1757 // the state machine here is a bit convoluted and could be simplified a lot
1758 // but this would make it slower, so...
1759
1760 for (;;)
1761 {
1762 //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
1763 switch (self->incr_mode)
1764 {
1765 // only used for initial whitespace skipping
1766 case INCR_M_WS:
1767 for (;;)
1768 {
1769 if (*p > 0x20)
1770 {
1771 if (*p == '#')
1772 {
1773 self->incr_mode = INCR_M_C0;
1774 goto incr_m_c;
1775 }
1776 else
1777 {
1778 self->incr_mode = INCR_M_JSON;
1779 goto incr_m_json;
1780 }
1781 }
1782 else if (!*p)
1783 goto interrupt;
1784
1785 ++p;
1786 }
1787
1788 // skip a single char inside a string (for \\-processing)
1789 case INCR_M_BS:
1790 if (!*p)
1791 goto interrupt;
1792
1793 ++p;
1794 self->incr_mode = INCR_M_STR;
1795 goto incr_m_str;
1796
1797 // inside #-style comments
1798 case INCR_M_C0:
1799 case INCR_M_C1:
1800 incr_m_c:
1801 for (;;)
1802 {
1803 if (*p == '\n')
1804 {
1805 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1806 break;
1807 }
1808 else if (!*p)
1809 goto interrupt;
1810
1811 ++p;
1812 }
1813
1814 break;
1815
1816 // inside a string
1817 case INCR_M_STR:
1818 incr_m_str:
1819 for (;;)
1820 {
1821 if (*p == '"')
1822 {
1823 ++p;
1824 self->incr_mode = INCR_M_JSON;
1825
1826 if (!self->incr_nest)
1827 goto interrupt;
1828
1829 goto incr_m_json;
1830 }
1831 else if (*p == '\\')
1832 {
1833 ++p; // "virtually" consumes character after \
1834
1835 if (!*p) // if at end of string we have to switch modes
1836 {
1837 self->incr_mode = INCR_M_BS;
1838 goto interrupt;
1839 }
1840 }
1841 else if (!*p)
1842 goto interrupt;
1843
1844 ++p;
1845 }
1846
1847 // after initial ws, outside string
1848 case INCR_M_JSON:
1849 incr_m_json:
1850 for (;;)
1851 {
1852 switch (*p++)
1853 {
1854 case 0:
1855 --p;
1856 goto interrupt;
1857
1858 case 0x09:
1859 case 0x0a:
1860 case 0x0d:
1861 case 0x20:
1862 if (!self->incr_nest)
1863 {
1864 --p; // do not eat the whitespace, let the next round do it
1865 goto interrupt;
1866 }
1867 break;
1868
1869 case '"':
1870 self->incr_mode = INCR_M_STR;
1871 goto incr_m_str;
1872
1873 case '[':
1874 case '{':
1875 case '(':
1876 if (++self->incr_nest > self->max_depth)
1877 croak (ERR_NESTING_EXCEEDED);
1878 break;
1879
1880 case ']':
1881 case '}':
1882 if (--self->incr_nest <= 0)
1883 goto interrupt;
1884 break;
1885
1886 case ')':
1887 --self->incr_nest;
1888 break;
1889
1890 case '#':
1891 self->incr_mode = INCR_M_C1;
1892 goto incr_m_c;
1893 }
1894 }
1895 }
1896
1897 modechange:
1898 ;
1899 }
1900
1901interrupt:
1902 self->incr_pos = p - SvPVX (self->incr_text);
1903 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1904 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1447} 1905}
1448 1906
1449///////////////////////////////////////////////////////////////////////////// 1907/////////////////////////////////////////////////////////////////////////////
1450// XS interface functions 1908// XS interface functions
1451 1909
1460 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1461 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1462 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1463 : -1; 1921 : -1;
1464 1922
1465 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1466 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1467 1925
1468 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1926 types_true = get_bool ("Types::Serialiser::true");
1469 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1927 types_false = get_bool ("Types::Serialiser::false");
1928
1929 sv_json = newSVpv ("JSON", 0);
1930 SvREADONLY_on (sv_json);
1931
1932 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1470} 1933}
1471 1934
1472PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1473 1936
1474void CLONE (...) 1937void CLONE (...)
1475 CODE: 1938 CODE:
1476 json_stash = 0; 1939 json_stash = 0;
1477 json_boolean_stash = 0; 1940 types_boolean_stash = 0;
1478 1941
1479void new (char *klass) 1942void new (char *klass)
1480 PPCODE: 1943 PPCODE:
1481{ 1944{
1482 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1483 SvPOK_only (pv); 1946 SvPOK_only (pv);
1484 Zero (SvPVX (pv), 1, JSON); 1947 json_init ((JSON *)SvPVX (pv));
1485 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1486 XPUSHs (sv_2mortal (sv_bless ( 1948 XPUSHs (sv_2mortal (sv_bless (
1487 newRV_noinc (pv), 1949 newRV_noinc (pv),
1488 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1489 ))); 1951 )));
1490} 1952}
1502 allow_nonref = F_ALLOW_NONREF 1964 allow_nonref = F_ALLOW_NONREF
1503 shrink = F_SHRINK 1965 shrink = F_SHRINK
1504 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1505 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1506 relaxed = F_RELAXED 1968 relaxed = F_RELAXED
1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1507 PPCODE: 1971 PPCODE:
1508{ 1972{
1509 if (enable) 1973 if (enable)
1510 self->flags |= ix; 1974 self->flags |= ix;
1511 else 1975 else
1526 get_allow_nonref = F_ALLOW_NONREF 1990 get_allow_nonref = F_ALLOW_NONREF
1527 get_shrink = F_SHRINK 1991 get_shrink = F_SHRINK
1528 get_allow_blessed = F_ALLOW_BLESSED 1992 get_allow_blessed = F_ALLOW_BLESSED
1529 get_convert_blessed = F_CONV_BLESSED 1993 get_convert_blessed = F_CONV_BLESSED
1530 get_relaxed = F_RELAXED 1994 get_relaxed = F_RELAXED
1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1531 PPCODE: 1997 PPCODE:
1532 XPUSHs (boolSV (self->flags & ix)); 1998 XPUSHs (boolSV (self->flags & ix));
1533 1999
1534void max_depth (JSON *self, UV max_depth = 0x80000000UL) 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1535 PPCODE: 2001 PPCODE:
1536{ 2002 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)); 2003 XPUSHs (ST (0));
1547}
1548 2004
1549U32 get_max_depth (JSON *self) 2005U32 get_max_depth (JSON *self)
1550 CODE: 2006 CODE:
1551 RETVAL = DEC_DEPTH (self->flags); 2007 RETVAL = self->max_depth;
1552 OUTPUT: 2008 OUTPUT:
1553 RETVAL 2009 RETVAL
1554 2010
1555void max_size (JSON *self, UV max_size = 0) 2011void max_size (JSON *self, U32 max_size = 0)
1556 PPCODE: 2012 PPCODE:
1557{ 2013 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)); 2014 XPUSHs (ST (0));
1569}
1570 2015
1571int get_max_size (JSON *self) 2016int get_max_size (JSON *self)
1572 CODE: 2017 CODE:
1573 RETVAL = DEC_SIZE (self->flags); 2018 RETVAL = self->max_size;
1574 OUTPUT: 2019 OUTPUT:
1575 RETVAL 2020 RETVAL
1576 2021
1577void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2022void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1578 PPCODE: 2023 PPCODE:
1584} 2029}
1585 2030
1586void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2031void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1587 PPCODE: 2032 PPCODE:
1588{ 2033{
1589 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1590 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1591 2036
1592 if (SvOK (cb)) 2037 if (SvOK (cb))
1593 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1594 else 2039 else
1605 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1606} 2051}
1607 2052
1608void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1609 PPCODE: 2054 PPCODE:
1610 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1611 2057
1612void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1613 PPCODE: 2059 PPCODE:
1614 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1615 2062
1616void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1617 PPCODE: 2064 PPCODE:
1618{ 2065{
1619 UV offset; 2066 SV *sv;
2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1620 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1621 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1622 PUSHs (sv_2mortal (newSVuv (offset))); 2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
2072}
2073
2074void incr_parse (JSON *self, SV *jsonstr = 0)
2075 PPCODE:
2076{
2077 if (!self->incr_text)
2078 self->incr_text = newSVpvn ("", 0);
2079
2080 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2081 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2082 if (DECODE_WANTS_OCTETS (self))
2083 {
2084 if (self->incr_pos)
2085 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2086 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2087
2088 sv_utf8_downgrade (self->incr_text, 0);
2089 }
2090 else
2091 {
2092 sv_utf8_upgrade (self->incr_text);
2093
2094 if (self->incr_pos)
2095 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2096 - (U8 *)SvPVX (self->incr_text);
2097 }
2098
2099 // append data, if any
2100 if (jsonstr)
2101 {
2102 /* make sure both strings have same encoding */
2103 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2104 if (SvUTF8 (jsonstr))
2105 sv_utf8_downgrade (jsonstr, 0);
2106 else
2107 sv_utf8_upgrade (jsonstr);
2108
2109 /* and then just blindly append */
2110 {
2111 STRLEN len;
2112 const char *str = SvPV (jsonstr, len);
2113 STRLEN cur = SvCUR (self->incr_text);
2114
2115 if (SvLEN (self->incr_text) <= cur + len)
2116 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2117
2118 Move (str, SvEND (self->incr_text), len, char);
2119 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2120 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2121 }
2122 }
2123
2124 if (GIMME_V != G_VOID)
2125 do
2126 {
2127 SV *sv;
2128 char *offset;
2129
2130 if (!INCR_DONE (self))
2131 {
2132 incr_parse (self);
2133
2134 if (self->incr_pos > self->max_size && self->max_size)
2135 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2136 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2137
2138 if (!INCR_DONE (self))
2139 {
2140 // as an optimisation, do not accumulate white space in the incr buffer
2141 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2142 {
2143 self->incr_pos = 0;
2144 SvCUR_set (self->incr_text, 0);
2145 }
2146
2147 break;
2148 }
2149 }
2150
2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv);
2153
2154 self->incr_pos -= offset - SvPVX (self->incr_text);
2155 self->incr_nest = 0;
2156 self->incr_mode = 0;
2157
2158 sv_chop (self->incr_text, offset);
2159 }
2160 while (GIMME_V == G_ARRAY);
2161}
2162
2163SV *incr_text (JSON *self)
2164 ATTRS: lvalue
2165 CODE:
2166{
2167 if (self->incr_pos)
2168 croak ("incr_text can not be called when the incremental parser already started parsing");
2169
2170 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2171}
2172 OUTPUT:
2173 RETVAL
2174
2175void incr_skip (JSON *self)
2176 CODE:
2177{
2178 if (self->incr_pos)
2179 {
2180 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2181 self->incr_pos = 0;
2182 self->incr_nest = 0;
2183 self->incr_mode = 0;
2184 }
2185}
2186
2187void incr_reset (JSON *self)
2188 CODE:
2189{
2190 SvREFCNT_dec (self->incr_text);
2191 self->incr_text = 0;
2192 self->incr_pos = 0;
2193 self->incr_nest = 0;
2194 self->incr_mode = 0;
1623} 2195}
1624 2196
1625void DESTROY (JSON *self) 2197void DESTROY (JSON *self)
1626 CODE: 2198 CODE:
1627 SvREFCNT_dec (self->cb_sk_object); 2199 SvREFCNT_dec (self->cb_sk_object);
1628 SvREFCNT_dec (self->cb_object); 2200 SvREFCNT_dec (self->cb_object);
2201 SvREFCNT_dec (self->incr_text);
1629 2202
1630PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
1631 2204
1632void encode_json (SV *scalar) 2205void encode_json (SV *scalar)
1633 PPCODE: 2206 PPCODE:
1634{ 2207{
1635 JSON json = { F_DEFAULT | F_UTF8 }; 2208 JSON json;
1636 XPUSHs (encode_json (scalar, &json)); 2209 json_init (&json);
2210 json.flags |= F_UTF8;
2211 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2212 XPUSHs (scalar);
1637} 2213}
1638 2214
1639void decode_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
1640 PPCODE: 2216 PPCODE:
1641{ 2217{
1642 JSON json = { F_DEFAULT | F_UTF8 }; 2218 JSON json;
1643 XPUSHs (decode_json (jsonstr, &json, 0)); 2219 json_init (&json);
2220 json.flags |= F_UTF8;
2221 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2222 XPUSHs (jsonstr);
1644} 2223}
1645 2224

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines