ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/JSON-XS/XS.xs
(Generate patch)

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

Diff Legend

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