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.77 by root, Tue Mar 25 06:37:38 2008 UTC vs.
Revision 1.130 by root, Sat Nov 26 06:09:29 2016 UTC

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

Diff Legend

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