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.80 by root, Wed Mar 26 01:32:53 2008 UTC vs.
Revision 1.127 by root, Fri Feb 26 21:46:45 2016 UTC

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

Diff Legend

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