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.132 by root, Tue Sep 5 13:07:09 2017 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)
116 SvPV_renew (sv, SvCUR (sv) + 1); 155 SvPV_renew (sv, SvCUR (sv) + 1);
117#endif 156#endif
118 } 157 }
119} 158}
120 159
160/* adds two STRLENs together, slow, and with paranoia */
161STRLEN
162strlen_sum (STRLEN l1, STRLEN l2)
163{
164 size_t sum = l1 + l2;
165
166 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
167 croak ("JSON::XS: string size overflow");
168
169 return sum;
170}
171
172/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
173static char *
174json_sv_grow (SV *sv, size_t len1, size_t len2)
175{
176 len1 = strlen_sum (len1, len2);
177 len1 = strlen_sum (len1, len1 >> 1);
178
179 if (len1 > 4096 - 24)
180 len1 = (len1 | 4095) - 24;
181
182 return SvGROW (sv, len1);
183}
184
121// decode an utf-8 character and return it, or (UV)-1 in 185// decode a utf-8 character and return it, or (UV)-1 in
122// case of an error. 186// case of an error.
123// we special-case "safe" characters from U+80 .. U+7FF, 187// we special-case "safe" characters from U+80 .. U+7FF,
124// but use the very good perl function to parse anything else. 188// but use the very good perl function to parse anything else.
125// note that we never call this function for a ascii codepoints 189// note that we never call this function for a ascii codepoints
126INLINE UV 190INLINE UV
… …
159 *s++ = 0x80 | ( ch & 0x3f); 223 *s++ = 0x80 | ( ch & 0x3f);
160 224
161 return s; 225 return s;
162} 226}
163 227
228// convert offset pointer to character index, sv must be string
229static STRLEN
230ptr_to_index (SV *sv, char *offset)
231{
232 return SvUTF8 (sv)
233 ? utf8_distance (offset, SvPVX (sv))
234 : offset - SvPVX (sv);
235}
236
237/////////////////////////////////////////////////////////////////////////////
238// fp hell
239
240// scan a group of digits, and a trailing exponent
241static void
242json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
243{
244 UV uaccum = 0;
245 int eaccum = 0;
246
247 // if we recurse too deep, skip all remaining digits
248 // to avoid a stack overflow attack
249 if (expect_false (--maxdepth <= 0))
250 while (((U8)*s - '0') < 10)
251 ++s;
252
253 for (;;)
254 {
255 U8 dig = (U8)*s - '0';
256
257 if (expect_false (dig >= 10))
258 {
259 if (dig == (U8)((U8)'.' - (U8)'0'))
260 {
261 ++s;
262 json_atof_scan1 (s, accum, expo, 1, maxdepth);
263 }
264 else if ((dig | ' ') == 'e' - '0')
265 {
266 int exp2 = 0;
267 int neg = 0;
268
269 ++s;
270
271 if (*s == '-')
272 {
273 ++s;
274 neg = 1;
275 }
276 else if (*s == '+')
277 ++s;
278
279 while ((dig = (U8)*s - '0') < 10)
280 exp2 = exp2 * 10 + *s++ - '0';
281
282 *expo += neg ? -exp2 : exp2;
283 }
284
285 break;
286 }
287
288 ++s;
289
290 uaccum = uaccum * 10 + dig;
291 ++eaccum;
292
293 // if we have too many digits, then recurse for more
294 // we actually do this for rather few digits
295 if (uaccum >= (UV_MAX - 9) / 10)
296 {
297 if (postdp) *expo -= eaccum;
298 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
299 if (postdp) *expo += eaccum;
300
301 break;
302 }
303 }
304
305 // this relies greatly on the quality of the pow ()
306 // implementation of the platform, but a good
307 // implementation is hard to beat.
308 // (IEEE 754 conformant ones are required to be exact)
309 if (postdp) *expo -= eaccum;
310 *accum += uaccum * Perl_pow (10., *expo);
311 *expo += eaccum;
312}
313
314static NV
315json_atof (const char *s)
316{
317 NV accum = 0.;
318 int expo = 0;
319 int neg = 0;
320
321 if (*s == '-')
322 {
323 ++s;
324 neg = 1;
325 }
326
327 // a recursion depth of ten gives us >>500 bits
328 json_atof_scan1 (s, &accum, &expo, 0, 10);
329
330 return neg ? -accum : accum;
331}
332
333// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
334static int
335ref_bool_type (SV *sv)
336{
337 svtype svt = SvTYPE (sv);
338
339 if (svt < SVt_PVAV)
340 {
341 STRLEN len = 0;
342 char *pv = svt ? SvPV (sv, len) : 0;
343
344 if (len == 1)
345 if (*pv == '1')
346 return 1;
347 else if (*pv == '0')
348 return 0;
349 }
350
351 return -1;
352}
353
354// returns whether scalar is not a reference in the sense of allow_nonref
355static int
356json_nonref (SV *scalar)
357{
358 if (!SvROK (scalar))
359 return 1;
360
361 scalar = SvRV (scalar);
362
363 if (SvTYPE (scalar) >= SVt_PVMG)
364 {
365 if (SvSTASH (scalar) == bool_stash)
366 return 1;
367
368 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
369 return 1;
370 }
371
372 return 0;
373}
374
164///////////////////////////////////////////////////////////////////////////// 375/////////////////////////////////////////////////////////////////////////////
165// encoder 376// encoder
166 377
167// structure used for encoding JSON 378// structure used for encoding JSON
168typedef struct 379typedef struct
… …
170 char *cur; // SvPVX (sv) + current output position 381 char *cur; // SvPVX (sv) + current output position
171 char *end; // SvEND (sv) 382 char *end; // SvEND (sv)
172 SV *sv; // result scalar 383 SV *sv; // result scalar
173 JSON json; 384 JSON json;
174 U32 indent; // indentation level 385 U32 indent; // indentation level
175 U32 maxdepth; // max. indentation/recursion level
176 UV limit; // escape character values >= this value when encoding 386 UV limit; // escape character values >= this value when encoding
177} enc_t; 387} enc_t;
178 388
179INLINE void 389INLINE void
180need (enc_t *enc, STRLEN len) 390need (enc_t *enc, STRLEN len)
181{ 391{
182 if (expect_false (enc->cur + len >= enc->end)) 392 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
183 { 393 {
184 STRLEN cur = enc->cur - SvPVX (enc->sv); 394 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
185 SvGROW (enc->sv, cur + len + 1); 395 char *buf = json_sv_grow (enc->sv, cur, len);
186 enc->cur = SvPVX (enc->sv) + cur; 396 enc->cur = buf + cur;
187 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 397 enc->end = buf + SvLEN (enc->sv) - 1;
188 } 398 }
189} 399}
190 400
191INLINE void 401INLINE void
192encode_ch (enc_t *enc, char ch) 402encode_ch (enc_t *enc, char ch)
… …
208 418
209 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 419 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
210 { 420 {
211 if (expect_false (ch == '"')) // but with slow exceptions 421 if (expect_false (ch == '"')) // but with slow exceptions
212 { 422 {
213 need (enc, len += 1); 423 need (enc, len + 1);
214 *enc->cur++ = '\\'; 424 *enc->cur++ = '\\';
215 *enc->cur++ = '"'; 425 *enc->cur++ = '"';
216 } 426 }
217 else if (expect_false (ch == '\\')) 427 else if (expect_false (ch == '\\'))
218 { 428 {
219 need (enc, len += 1); 429 need (enc, len + 1);
220 *enc->cur++ = '\\'; 430 *enc->cur++ = '\\';
221 *enc->cur++ = '\\'; 431 *enc->cur++ = '\\';
222 } 432 }
223 else 433 else
224 *enc->cur++ = ch; 434 *enc->cur++ = ch;
… …
227 } 437 }
228 else 438 else
229 { 439 {
230 switch (ch) 440 switch (ch)
231 { 441 {
232 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 442 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
233 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 443 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
234 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 444 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
235 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 445 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
236 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 446 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
237 447
238 default: 448 default:
239 { 449 {
240 STRLEN clen; 450 STRLEN clen;
241 UV uch; 451 UV uch;
… …
257 if (uch >= 0x10000UL) 467 if (uch >= 0x10000UL)
258 { 468 {
259 if (uch >= 0x110000UL) 469 if (uch >= 0x110000UL)
260 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 470 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
261 471
262 need (enc, len += 11); 472 need (enc, len + 11);
263 sprintf (enc->cur, "\\u%04x\\u%04x", 473 sprintf (enc->cur, "\\u%04x\\u%04x",
264 (int)((uch - 0x10000) / 0x400 + 0xD800), 474 (int)((uch - 0x10000) / 0x400 + 0xD800),
265 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 475 (int)((uch - 0x10000) % 0x400 + 0xDC00));
266 enc->cur += 12; 476 enc->cur += 12;
267 } 477 }
268 else 478 else
269 { 479 {
270 static char hexdigit [16] = "0123456789abcdef";
271 need (enc, len += 5); 480 need (enc, len + 5);
272 *enc->cur++ = '\\'; 481 *enc->cur++ = '\\';
273 *enc->cur++ = 'u'; 482 *enc->cur++ = 'u';
274 *enc->cur++ = hexdigit [ uch >> 12 ]; 483 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
275 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 484 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
276 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 485 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
277 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 486 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
278 } 487 }
279 488
280 str += clen; 489 str += clen;
281 } 490 }
282 else if (enc->json.flags & F_LATIN1) 491 else if (enc->json.flags & F_LATIN1)
… …
284 *enc->cur++ = uch; 493 *enc->cur++ = uch;
285 str += clen; 494 str += clen;
286 } 495 }
287 else if (is_utf8) 496 else if (is_utf8)
288 { 497 {
289 need (enc, len += clen); 498 need (enc, len + clen);
290 do 499 do
291 { 500 {
292 *enc->cur++ = *str++; 501 *enc->cur++ = *str++;
293 } 502 }
294 while (--clen); 503 while (--clen);
295 } 504 }
296 else 505 else
297 { 506 {
298 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 507 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
299 enc->cur = encode_utf8 (enc->cur, uch); 508 enc->cur = encode_utf8 (enc->cur, uch);
300 ++str; 509 ++str;
301 } 510 }
302 } 511 }
303 } 512 }
… …
353static void 562static void
354encode_av (enc_t *enc, AV *av) 563encode_av (enc_t *enc, AV *av)
355{ 564{
356 int i, len = av_len (av); 565 int i, len = av_len (av);
357 566
358 if (enc->indent >= enc->maxdepth) 567 if (enc->indent >= enc->json.max_depth)
359 croak ("data structure too deep (hit recursion limit)"); 568 croak (ERR_NESTING_EXCEEDED);
360 569
361 encode_ch (enc, '['); 570 encode_ch (enc, '[');
362 571
363 if (len >= 0) 572 if (len >= 0)
364 { 573 {
365 encode_nl (enc); ++enc->indent; 574 encode_nl (enc); ++enc->indent;
366 575
367 for (i = 0; i <= len; ++i) 576 for (i = 0; i <= len; ++i)
… …
379 encode_comma (enc); 588 encode_comma (enc);
380 } 589 }
381 590
382 encode_nl (enc); --enc->indent; encode_indent (enc); 591 encode_nl (enc); --enc->indent; encode_indent (enc);
383 } 592 }
384 593
385 encode_ch (enc, ']'); 594 encode_ch (enc, ']');
386} 595}
387 596
388static void 597static void
389encode_hk (enc_t *enc, HE *he) 598encode_hk (enc_t *enc, HE *he)
… …
393 if (HeKLEN (he) == HEf_SVKEY) 602 if (HeKLEN (he) == HEf_SVKEY)
394 { 603 {
395 SV *sv = HeSVKEY (he); 604 SV *sv = HeSVKEY (he);
396 STRLEN len; 605 STRLEN len;
397 char *str; 606 char *str;
398 607
399 SvGETMAGIC (sv); 608 SvGETMAGIC (sv);
400 str = SvPV (sv, len); 609 str = SvPV (sv, len);
401 610
402 encode_str (enc, str, len, SvUTF8 (sv)); 611 encode_str (enc, str, len, SvUTF8 (sv));
403 } 612 }
… …
438 647
439static void 648static void
440encode_hv (enc_t *enc, HV *hv) 649encode_hv (enc_t *enc, HV *hv)
441{ 650{
442 HE *he; 651 HE *he;
443 int count;
444 652
445 if (enc->indent >= enc->maxdepth) 653 if (enc->indent >= enc->json.max_depth)
446 croak ("data structure too deep (hit recursion limit)"); 654 croak (ERR_NESTING_EXCEEDED);
447 655
448 encode_ch (enc, '{'); 656 encode_ch (enc, '{');
449 657
450 // for canonical output we have to sort by keys first 658 // for canonical output we have to sort by keys first
451 // actually, this is mostly due to the stupid so-called 659 // actually, this is mostly due to the stupid so-called
452 // security workaround added somewhere in 5.8.x. 660 // security workaround added somewhere in 5.8.x
453 // that randomises hash orderings 661 // that randomises hash orderings
454 if (enc->json.flags & F_CANONICAL) 662 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
455 { 663 {
456 int count = hv_iterinit (hv); 664 int count = hv_iterinit (hv);
457 665
458 if (SvMAGICAL (hv)) 666 if (SvMAGICAL (hv))
459 { 667 {
… …
470 } 678 }
471 679
472 if (count) 680 if (count)
473 { 681 {
474 int i, fast = 1; 682 int i, fast = 1;
475#if defined(__BORLANDC__) || defined(_MSC_VER) 683 HE *hes_stack [STACK_HES];
476 HE **hes = _alloca (count * sizeof (HE)); 684 HE **hes = hes_stack;
477#else 685
478 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 686 // allocate larger arrays on the heap
479#endif 687 if (count > STACK_HES)
688 {
689 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
690 hes = (HE **)SvPVX (sv);
691 }
480 692
481 i = 0; 693 i = 0;
482 while ((he = hv_iternext (hv))) 694 while ((he = hv_iternext (hv)))
483 { 695 {
484 hes [i++] = he; 696 hes [i++] = he;
… …
553// encode objects, arrays and special \0=false and \1=true values. 765// encode objects, arrays and special \0=false and \1=true values.
554static void 766static void
555encode_rv (enc_t *enc, SV *sv) 767encode_rv (enc_t *enc, SV *sv)
556{ 768{
557 svtype svt; 769 svtype svt;
770 GV *method;
558 771
559 SvGETMAGIC (sv); 772 SvGETMAGIC (sv);
560 svt = SvTYPE (sv); 773 svt = SvTYPE (sv);
561 774
562 if (expect_false (SvOBJECT (sv))) 775 if (expect_false (SvOBJECT (sv)))
563 { 776 {
564 HV *stash = !JSON_SLOW || json_boolean_stash 777 HV *stash = SvSTASH (sv);
565 ? json_boolean_stash
566 : gv_stashpv ("JSON::XS::Boolean", 1);
567 778
568 if (SvSTASH (sv) == stash) 779 if (stash == bool_stash)
569 { 780 {
570 if (SvIV (sv)) 781 if (SvIV (sv))
571 encode_str (enc, "true", 4, 0); 782 encode_str (enc, "true", 4, 0);
572 else 783 else
573 encode_str (enc, "false", 5, 0); 784 encode_str (enc, "false", 5, 0);
574 } 785 }
786 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
787 {
788 int count;
789 dSP;
790
791 ENTER; SAVETMPS;
792 SAVESTACK_POS ();
793 PUSHMARK (SP);
794 EXTEND (SP, 2);
795 // we re-bless the reference to get overload and other niceties right
796 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
797 PUSHs (sv_json);
798
799 PUTBACK;
800 count = call_sv ((SV *)GvCV (method), G_ARRAY);
801 SPAGAIN;
802
803 // catch this surprisingly common error
804 if (SvROK (TOPs) && SvRV (TOPs) == sv)
805 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
806
807 encode_ch (enc, '(');
808 encode_ch (enc, '"');
809 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
810 encode_ch (enc, '"');
811 encode_ch (enc, ')');
812 encode_ch (enc, '[');
813
814 while (count)
815 {
816 encode_sv (enc, SP[1 - count--]);
817
818 if (count)
819 encode_ch (enc, ',');
820 }
821
822 encode_ch (enc, ']');
823
824 FREETMPS; LEAVE;
825 }
826 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
827 {
828 dSP;
829
830 ENTER; SAVETMPS;
831 PUSHMARK (SP);
832 // we re-bless the reference to get overload and other niceties right
833 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
834
835 // calling with G_SCALAR ensures that we always get a 1 return value
836 PUTBACK;
837 call_sv ((SV *)GvCV (method), G_SCALAR);
838 SPAGAIN;
839
840 // catch this surprisingly common error
841 if (SvROK (TOPs) && SvRV (TOPs) == sv)
842 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
843
844 sv = POPs;
845 PUTBACK;
846
847 encode_sv (enc, sv);
848
849 FREETMPS; LEAVE;
850 }
851 else if (enc->json.flags & F_ALLOW_BLESSED)
852 encode_str (enc, "null", 4, 0);
575 else 853 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", 854 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)))); 855 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
622 }
623 } 856 }
624 else if (svt == SVt_PVHV) 857 else if (svt == SVt_PVHV)
625 encode_hv (enc, (HV *)sv); 858 encode_hv (enc, (HV *)sv);
626 else if (svt == SVt_PVAV) 859 else if (svt == SVt_PVAV)
627 encode_av (enc, (AV *)sv); 860 encode_av (enc, (AV *)sv);
628 else if (svt < SVt_PVAV) 861 else if (svt < SVt_PVAV)
629 { 862 {
630 STRLEN len = 0; 863 int bool_type = ref_bool_type (sv);
631 char *pv = svt ? SvPV (sv, len) : 0;
632 864
633 if (len == 1 && *pv == '1') 865 if (bool_type == 1)
634 encode_str (enc, "true", 4, 0); 866 encode_str (enc, "true", 4, 0);
635 else if (len == 1 && *pv == '0') 867 else if (bool_type == 0)
636 encode_str (enc, "false", 5, 0); 868 encode_str (enc, "false", 5, 0);
869 else if (enc->json.flags & F_ALLOW_UNKNOWN)
870 encode_str (enc, "null", 4, 0);
637 else 871 else
638 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 872 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
639 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 873 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
640 } 874 }
875 else if (enc->json.flags & F_ALLOW_UNKNOWN)
876 encode_str (enc, "null", 4, 0);
641 else 877 else
642 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 878 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
643 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 879 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
644} 880}
645 881
… …
699 } 935 }
700 else 936 else
701 { 937 {
702 // large integer, use the (rather slow) snprintf way. 938 // large integer, use the (rather slow) snprintf way.
703 need (enc, IVUV_MAXCHARS); 939 need (enc, IVUV_MAXCHARS);
704 enc->cur += 940 enc->cur +=
705 SvIsUV(sv) 941 SvIsUV(sv)
706 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 942 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
707 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 943 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
708 } 944 }
709 } 945 }
710 else if (SvROK (sv)) 946 else if (SvROK (sv))
711 encode_rv (enc, SvRV (sv)); 947 encode_rv (enc, SvRV (sv));
712 else if (!SvOK (sv)) 948 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
713 encode_str (enc, "null", 4, 0); 949 encode_str (enc, "null", 4, 0);
714 else 950 else
715 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 951 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
716 SvPV_nolen (sv), SvFLAGS (sv)); 952 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
717} 953}
718 954
719static SV * 955static SV *
720encode_json (SV *scalar, JSON *json) 956encode_json (SV *scalar, JSON *json)
721{ 957{
722 enc_t enc; 958 enc_t enc;
723 959
724 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 960 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)"); 961 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
726 962
727 enc.json = *json; 963 enc.json = *json;
728 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 964 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
729 enc.cur = SvPVX (enc.sv); 965 enc.cur = SvPVX (enc.sv);
730 enc.end = SvEND (enc.sv); 966 enc.end = SvEND (enc.sv);
731 enc.indent = 0; 967 enc.indent = 0;
732 enc.maxdepth = DEC_DEPTH (enc.json.flags);
733 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 968 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
734 : enc.json.flags & F_LATIN1 ? 0x000100UL 969 : enc.json.flags & F_LATIN1 ? 0x000100UL
735 : 0x110000UL; 970 : 0x110000UL;
736 971
737 SvPOK_only (enc.sv); 972 SvPOK_only (enc.sv);
738 encode_sv (&enc, scalar); 973 encode_sv (&enc, scalar);
974 encode_nl (&enc);
739 975
740 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 976 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
741 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 977 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
742 978
743 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 979 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
804 if (*dec->cur != ch) \ 1040 if (*dec->cur != ch) \
805 ERR (# ch " expected"); \ 1041 ERR (# ch " expected"); \
806 ++dec->cur; \ 1042 ++dec->cur; \
807 SE 1043 SE
808 1044
809#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 1045#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
810#define DEC_DEC_DEPTH --dec->depth 1046#define DEC_DEC_DEPTH --dec->depth
811 1047
812static SV *decode_sv (dec_t *dec); 1048static SV *decode_sv (dec_t *dec);
813 1049
814static signed char decode_hexdigit[256]; 1050static signed char decode_hexdigit[256];
… …
923 else if (expect_true (ch >= 0x20 && ch < 0x80)) 1159 else if (expect_true (ch >= 0x20 && ch < 0x80))
924 *cur++ = ch; 1160 *cur++ = ch;
925 else if (ch >= 0x80) 1161 else if (ch >= 0x80)
926 { 1162 {
927 STRLEN clen; 1163 STRLEN clen;
928 UV uch;
929 1164
930 --dec_cur; 1165 --dec_cur;
931 1166
932 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1167 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
933 if (clen == (STRLEN)-1) 1168 if (clen == (STRLEN)-1)
934 ERR ("malformed UTF-8 character in JSON string"); 1169 ERR ("malformed UTF-8 character in JSON string");
935 1170
936 do 1171 do
937 *cur++ = *dec_cur++; 1172 *cur++ = *dec_cur++;
938 while (--clen); 1173 while (--clen);
939 1174
940 utf8 = 1; 1175 utf8 = 1;
941 } 1176 }
1177 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1178 *cur++ = ch;
942 else 1179 else
943 { 1180 {
944 --dec_cur; 1181 --dec_cur;
945 1182
946 if (!ch) 1183 if (!ch)
… …
954 { 1191 {
955 STRLEN len = cur - buf; 1192 STRLEN len = cur - buf;
956 1193
957 if (sv) 1194 if (sv)
958 { 1195 {
959 SvGROW (sv, SvCUR (sv) + len + 1); 1196 STRLEN cur = SvCUR (sv);
1197
1198 if (SvLEN (sv) - cur <= len)
1199 json_sv_grow (sv, cur, len);
1200
960 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1201 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
961 SvCUR_set (sv, SvCUR (sv) + len); 1202 SvCUR_set (sv, SvCUR (sv) + len);
962 } 1203 }
963 else 1204 else
964 sv = newSVpvn (buf, len); 1205 sv = newSVpvn (buf, len);
… …
1055 1296
1056 // special case the rather common 1..5-digit-int case 1297 // special case the rather common 1..5-digit-int case
1057 if (*start == '-') 1298 if (*start == '-')
1058 switch (len) 1299 switch (len)
1059 { 1300 {
1060 case 2: return newSViv (-( start [1] - '0' * 1)); 1301 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1061 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1302 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)); 1303 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)); 1304 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)); 1305 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1065 } 1306 }
1066 else 1307 else
1067 switch (len) 1308 switch (len)
1068 { 1309 {
1069 case 1: return newSViv ( start [0] - '0' * 1); 1310 case 1: return newSViv ( start [0] - '0' * 1);
1070 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1311 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); 1312 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); 1313 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); 1314 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1074 } 1315 }
1075 1316
1076 { 1317 {
1077 UV uv; 1318 UV uv;
1078 int numtype = grok_number (start, len, &uv); 1319 int numtype = grok_number (start, len, &uv);
… …
1087 } 1328 }
1088 1329
1089 len -= *start == '-' ? 1 : 0; 1330 len -= *start == '-' ? 1 : 0;
1090 1331
1091 // does not fit into IV or UV, try NV 1332 // does not fit into IV or UV, try NV
1092 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1333 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 1334 // fits into NV without loss of precision
1098 return newSVnv (Atof (start)); 1335 return newSVnv (json_atof (start));
1099 1336
1100 // everything else fails, convert it to a string 1337 // everything else fails, convert it to a string
1101 return newSVpvn (start, dec->cur - start); 1338 return newSVpvn (start, dec->cur - start);
1102 } 1339 }
1103 1340
1104 // loss of precision here 1341 // loss of precision here
1105 return newSVnv (Atof (start)); 1342 return newSVnv (json_atof (start));
1106 1343
1107fail: 1344fail:
1108 return 0; 1345 return 0;
1109} 1346}
1110 1347
… …
1134 if (*dec->cur == ']') 1371 if (*dec->cur == ']')
1135 { 1372 {
1136 ++dec->cur; 1373 ++dec->cur;
1137 break; 1374 break;
1138 } 1375 }
1139 1376
1140 if (*dec->cur != ',') 1377 if (*dec->cur != ',')
1141 ERR (", or ] expected while parsing array"); 1378 ERR (", or ] expected while parsing array");
1142 1379
1143 ++dec->cur; 1380 ++dec->cur;
1144 1381
… …
1268 1505
1269 hv_iterinit (hv); 1506 hv_iterinit (hv);
1270 he = hv_iternext (hv); 1507 he = hv_iternext (hv);
1271 hv_iterinit (hv); 1508 hv_iterinit (hv);
1272 1509
1273 // the next line creates a mortal sv each time its called. 1510 // the next line creates a mortal sv each time it's called.
1274 // might want to optimise this for common cases. 1511 // might want to optimise this for common cases.
1275 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1512 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1276 1513
1277 if (cb) 1514 if (cb)
1278 { 1515 {
1279 dSP; 1516 dSP;
1280 int count; 1517 int count;
1281 1518
1282 ENTER; SAVETMPS; PUSHMARK (SP); 1519 ENTER; SAVETMPS;
1520 SAVESTACK_POS ();
1521 PUSHMARK (SP);
1283 XPUSHs (HeVAL (he)); 1522 XPUSHs (HeVAL (he));
1523 sv_2mortal (sv);
1284 1524
1285 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1525 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1286 1526
1287 if (count == 1) 1527 if (count == 1)
1288 { 1528 {
1289 sv = newSVsv (POPs); 1529 sv = newSVsv (POPs);
1290 FREETMPS; LEAVE; 1530 FREETMPS; LEAVE;
1291 return sv; 1531 return sv;
1292 } 1532 }
1293 1533
1534 SvREFCNT_inc (sv);
1294 FREETMPS; LEAVE; 1535 FREETMPS; LEAVE;
1295 } 1536 }
1296 } 1537 }
1297 1538
1298 if (dec->json.cb_object) 1539 if (dec->json.cb_object)
1299 { 1540 {
1300 dSP; 1541 dSP;
1301 int count; 1542 int count;
1302 1543
1303 ENTER; SAVETMPS; PUSHMARK (SP); 1544 ENTER; SAVETMPS;
1545 SAVESTACK_POS ();
1546 PUSHMARK (SP);
1304 XPUSHs (sv_2mortal (sv)); 1547 XPUSHs (sv_2mortal (sv));
1305 1548
1306 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1549 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1307 1550
1308 if (count == 1) 1551 if (count == 1)
… …
1324 DEC_DEC_DEPTH; 1567 DEC_DEC_DEPTH;
1325 return 0; 1568 return 0;
1326} 1569}
1327 1570
1328static SV * 1571static SV *
1572decode_tag (dec_t *dec)
1573{
1574 SV *tag = 0;
1575 SV *val = 0;
1576
1577 if (!(dec->json.flags & F_ALLOW_TAGS))
1578 ERR ("malformed JSON string, neither array, object, number, string or atom");
1579
1580 ++dec->cur;
1581
1582 decode_ws (dec);
1583
1584 tag = decode_sv (dec);
1585 if (!tag)
1586 goto fail;
1587
1588 if (!SvPOK (tag))
1589 ERR ("malformed JSON string, (tag) must be a string");
1590
1591 decode_ws (dec);
1592
1593 if (*dec->cur != ')')
1594 ERR (") expected after tag");
1595
1596 ++dec->cur;
1597
1598 decode_ws (dec);
1599
1600 val = decode_sv (dec);
1601 if (!val)
1602 goto fail;
1603
1604 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1605 ERR ("malformed JSON string, tag value must be an array");
1606
1607 {
1608 AV *av = (AV *)SvRV (val);
1609 int i, len = av_len (av) + 1;
1610 HV *stash = gv_stashsv (tag, 0);
1611 SV *sv;
1612
1613 if (!stash)
1614 ERR ("cannot decode perl-object (package does not exist)");
1615
1616 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1617
1618 if (!method)
1619 ERR ("cannot decode perl-object (package does not have a THAW method)");
1620
1621 dSP;
1622
1623 ENTER; SAVETMPS;
1624 PUSHMARK (SP);
1625 EXTEND (SP, len + 2);
1626 // we re-bless the reference to get overload and other niceties right
1627 PUSHs (tag);
1628 PUSHs (sv_json);
1629
1630 for (i = 0; i < len; ++i)
1631 PUSHs (*av_fetch (av, i, 1));
1632
1633 PUTBACK;
1634 call_sv ((SV *)GvCV (method), G_SCALAR);
1635 SPAGAIN;
1636
1637 SvREFCNT_dec (tag);
1638 SvREFCNT_dec (val);
1639 sv = SvREFCNT_inc (POPs);
1640
1641 PUTBACK;
1642
1643 FREETMPS; LEAVE;
1644
1645 return sv;
1646 }
1647
1648fail:
1649 SvREFCNT_dec (tag);
1650 SvREFCNT_dec (val);
1651 return 0;
1652}
1653
1654static SV *
1329decode_sv (dec_t *dec) 1655decode_sv (dec_t *dec)
1330{ 1656{
1331 // the beauty of JSON: you need exactly one character lookahead 1657 // the beauty of JSON: you need exactly one character lookahead
1332 // to parse everything. 1658 // to parse everything.
1333 switch (*dec->cur) 1659 switch (*dec->cur)
1334 { 1660 {
1335 case '"': ++dec->cur; return decode_str (dec); 1661 case '"': ++dec->cur; return decode_str (dec);
1336 case '[': ++dec->cur; return decode_av (dec); 1662 case '[': ++dec->cur; return decode_av (dec);
1337 case '{': ++dec->cur; return decode_hv (dec); 1663 case '{': ++dec->cur; return decode_hv (dec);
1664 case '(': return decode_tag (dec);
1338 1665
1339 case '-': 1666 case '-':
1340 case '0': case '1': case '2': case '3': case '4': 1667 case '0': case '1': case '2': case '3': case '4':
1341 case '5': case '6': case '7': case '8': case '9': 1668 case '5': case '6': case '7': case '8': case '9':
1342 return decode_num (dec); 1669 return decode_num (dec);
… …
1344 case 't': 1671 case 't':
1345 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1672 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1346 { 1673 {
1347 dec->cur += 4; 1674 dec->cur += 4;
1348#if JSON_SLOW 1675#if JSON_SLOW
1349 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1676 bool_true = get_bool ("Types::Serialiser::true");
1350#endif 1677#endif
1351 return SvREFCNT_inc (json_true); 1678 return newSVsv (bool_true);
1352 } 1679 }
1353 else 1680 else
1354 ERR ("'true' expected"); 1681 ERR ("'true' expected");
1355 1682
1356 break; 1683 break;
… …
1358 case 'f': 1685 case 'f':
1359 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1686 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1360 { 1687 {
1361 dec->cur += 5; 1688 dec->cur += 5;
1362#if JSON_SLOW 1689#if JSON_SLOW
1363 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1690 bool_false = get_bool ("Types::Serialiser::false");
1364#endif 1691#endif
1365 return SvREFCNT_inc (json_false); 1692 return newSVsv (bool_false);
1366 } 1693 }
1367 else 1694 else
1368 ERR ("'false' expected"); 1695 ERR ("'false' expected");
1369 1696
1370 break; 1697 break;
… …
1379 ERR ("'null' expected"); 1706 ERR ("'null' expected");
1380 1707
1381 break; 1708 break;
1382 1709
1383 default: 1710 default:
1384 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1711 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1385 break; 1712 break;
1386 } 1713 }
1387 1714
1388fail: 1715fail:
1389 return 0; 1716 return 0;
… …
1391 1718
1392static SV * 1719static SV *
1393decode_json (SV *string, JSON *json, STRLEN *offset_return) 1720decode_json (SV *string, JSON *json, STRLEN *offset_return)
1394{ 1721{
1395 dec_t dec; 1722 dec_t dec;
1396 STRLEN offset;
1397 SV *sv; 1723 SV *sv;
1398 1724
1725 /* work around bugs in 5.10 where manipulating magic values
1726 * makes perl ignore the magic in subsequent accesses.
1727 * also make a copy of non-PV values, to get them into a clean
1728 * state (SvPV should do that, but it's buggy, see below).
1729 *
1730 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1731 * as reported by Reini Urban.
1732 */
1399 SvGETMAGIC (string); 1733 /*SvGETMAGIC (string);*/
1734 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1735 string = sv_2mortal (newSVsv (string));
1736
1400 SvUPGRADE (string, SVt_PV); 1737 SvUPGRADE (string, SVt_PV);
1401 1738
1402 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1739 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1740 * assertion with -DDEBUGGING, although SvCUR is documented to
1741 * return the xpv_cur field which certainly exists after upgrading.
1742 * according to nicholas clark, calling SvPOK fixes this.
1743 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1744 * and hope for the best.
1745 * Damnit, SvPV_nolen still trips over yet another assertion. This
1746 * assertion business is seriously broken, try yet another workaround
1747 * for the broken -DDEBUGGING.
1748 */
1749 {
1750#ifdef DEBUGGING
1751 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1752#else
1753 STRLEN offset = SvCUR (string);
1754#endif
1755
1756 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", 1757 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)); 1758 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1759 }
1405 1760
1406 if (json->flags & F_UTF8) 1761 if (DECODE_WANTS_OCTETS (json))
1407 sv_utf8_downgrade (string, 0); 1762 sv_utf8_downgrade (string, 0);
1408 else 1763 else
1409 sv_utf8_upgrade (string); 1764 sv_utf8_upgrade (string);
1410 1765
1411 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1766 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1412 1767
1413 dec.json = *json; 1768 dec.json = *json;
1414 dec.cur = SvPVX (string); 1769 dec.cur = SvPVX (string);
1415 dec.end = SvEND (string); 1770 dec.end = SvEND (string);
1416 dec.err = 0; 1771 dec.err = 0;
1417 dec.depth = 0; 1772 dec.depth = 0;
1418 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1419 1773
1420 if (dec.json.cb_object || dec.json.cb_sk_object) 1774 if (dec.json.cb_object || dec.json.cb_sk_object)
1421 dec.json.flags |= F_HOOK; 1775 dec.json.flags |= F_HOOK;
1422 1776
1423 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1777 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1424 1778
1425 decode_ws (&dec); 1779 decode_ws (&dec);
1426 sv = decode_sv (&dec); 1780 sv = decode_sv (&dec);
1427 1781
1428 if (!(offset_return || !sv)) 1782 if (offset_return)
1783 *offset_return = dec.cur - SvPVX (string);
1784 else if (sv)
1429 { 1785 {
1430 // check for trailing garbage 1786 // check for trailing garbage
1431 decode_ws (&dec); 1787 decode_ws (&dec);
1432 1788
1433 if (*dec.cur) 1789 if (*dec.cur)
1434 { 1790 {
1435 dec.err = "garbage after JSON object"; 1791 dec.err = "garbage after JSON object";
1436 SvREFCNT_dec (sv); 1792 SvREFCNT_dec (sv);
1437 sv = 0; 1793 sv = 0;
1438 } 1794 }
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 } 1795 }
1450 1796
1451 if (!sv) 1797 if (!sv)
1452 { 1798 {
1453 SV *uni = sv_newmortal (); 1799 SV *uni = sv_newmortal ();
… …
1459 SAVEVPTR (PL_curcop); 1805 SAVEVPTR (PL_curcop);
1460 PL_curcop = &cop; 1806 PL_curcop = &cop;
1461 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1807 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1462 LEAVE; 1808 LEAVE;
1463 1809
1464 croak ("%s, at character offset %d [\"%s\"]", 1810 croak ("%s, at character offset %d (before \"%s\")",
1465 dec.err, 1811 dec.err,
1466 (int)offset, 1812 (int)ptr_to_index (string, dec.cur),
1467 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1813 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1468 } 1814 }
1469 1815
1470 sv = sv_2mortal (sv); 1816 sv = sv_2mortal (sv);
1471 1817
1472 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1818 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)"); 1819 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1474 1820
1475 return sv; 1821 return sv;
1476} 1822}
1477 1823
… …
1480 1826
1481static void 1827static void
1482incr_parse (JSON *self) 1828incr_parse (JSON *self)
1483{ 1829{
1484 const char *p = SvPVX (self->incr_text) + self->incr_pos; 1830 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1831
1832 // the state machine here is a bit convoluted and could be simplified a lot
1833 // but this would make it slower, so...
1485 1834
1486 for (;;) 1835 for (;;)
1487 { 1836 {
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 1837 //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) 1838 switch (self->incr_mode)
1490 { 1839 {
1491 // only used for intiial whitespace skipping 1840 // only used for initial whitespace skipping
1492 case INCR_M_WS: 1841 case INCR_M_WS:
1493 for (;;) 1842 for (;;)
1494 { 1843 {
1495 if (*p > 0x20) 1844 if (*p > 0x20)
1496 { 1845 {
1846 if (*p == '#')
1847 {
1848 self->incr_mode = INCR_M_C0;
1849 goto incr_m_c;
1850 }
1851 else
1852 {
1497 self->incr_mode = INCR_M_JSON; 1853 self->incr_mode = INCR_M_JSON;
1498 goto incr_m_json; 1854 goto incr_m_json;
1855 }
1499 } 1856 }
1500 else if (!*p) 1857 else if (!*p)
1501 goto interrupt; 1858 goto interrupt;
1502 1859
1503 ++p; 1860 ++p;
… …
1509 goto interrupt; 1866 goto interrupt;
1510 1867
1511 ++p; 1868 ++p;
1512 self->incr_mode = INCR_M_STR; 1869 self->incr_mode = INCR_M_STR;
1513 goto incr_m_str; 1870 goto incr_m_str;
1871
1872 // inside #-style comments
1873 case INCR_M_C0:
1874 case INCR_M_C1:
1875 incr_m_c:
1876 for (;;)
1877 {
1878 if (*p == '\n')
1879 {
1880 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1881 break;
1882 }
1883 else if (!*p)
1884 goto interrupt;
1885
1886 ++p;
1887 }
1888
1889 break;
1514 1890
1515 // inside a string 1891 // inside a string
1516 case INCR_M_STR: 1892 case INCR_M_STR:
1517 incr_m_str: 1893 incr_m_str:
1518 for (;;) 1894 for (;;)
… …
1569 self->incr_mode = INCR_M_STR; 1945 self->incr_mode = INCR_M_STR;
1570 goto incr_m_str; 1946 goto incr_m_str;
1571 1947
1572 case '[': 1948 case '[':
1573 case '{': 1949 case '{':
1950 case '(':
1574 ++self->incr_nest; 1951 if (++self->incr_nest > self->max_depth)
1952 croak (ERR_NESTING_EXCEEDED);
1575 break; 1953 break;
1576 1954
1577 case ']': 1955 case ']':
1578 case '}': 1956 case '}':
1579 if (!--self->incr_nest) 1957 if (--self->incr_nest <= 0)
1580 goto interrupt; 1958 goto interrupt;
1959 break;
1960
1961 case ')':
1962 --self->incr_nest;
1963 break;
1964
1965 case '#':
1966 self->incr_mode = INCR_M_C1;
1967 goto incr_m_c;
1581 } 1968 }
1582 } 1969 }
1583 } 1970 }
1584 1971
1585 modechange: 1972 modechange:
1586 ; 1973 ;
1587 } 1974 }
1588 1975
1589interrupt: 1976interrupt:
1590 self->incr_pos = p - SvPVX (self->incr_text); 1977 self->incr_pos = p - SvPVX (self->incr_text);
1978 //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 1979 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1592} 1980}
1593 1981
1594///////////////////////////////////////////////////////////////////////////// 1982/////////////////////////////////////////////////////////////////////////////
1595// XS interface functions 1983// XS interface functions
… …
1605 i >= '0' && i <= '9' ? i - '0' 1993 i >= '0' && i <= '9' ? i - '0'
1606 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1994 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1607 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1995 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1608 : -1; 1996 : -1;
1609 1997
1610 json_stash = gv_stashpv ("JSON::XS" , 1); 1998 json_stash = gv_stashpv ("JSON::XS" , 1);
1611 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1999 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
2000 bool_true = get_bool ("Types::Serialiser::true");
2001 bool_false = get_bool ("Types::Serialiser::false");
1612 2002
1613 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 2003 sv_json = newSVpv ("JSON", 0);
1614 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 2004 SvREADONLY_on (sv_json);
2005
2006 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1615} 2007}
1616 2008
1617PROTOTYPES: DISABLE 2009PROTOTYPES: DISABLE
1618 2010
1619void CLONE (...) 2011void CLONE (...)
1620 CODE: 2012 CODE:
1621 json_stash = 0; 2013 json_stash = 0;
1622 json_boolean_stash = 0; 2014 bool_stash = 0;
1623 2015
1624void new (char *klass) 2016void new (char *klass)
1625 PPCODE: 2017 PPCODE:
1626{ 2018{
1627 SV *pv = NEWSV (0, sizeof (JSON)); 2019 SV *pv = NEWSV (0, sizeof (JSON));
1628 SvPOK_only (pv); 2020 SvPOK_only (pv);
1629 Zero (SvPVX (pv), 1, JSON); 2021 json_init ((JSON *)SvPVX (pv));
1630 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1631 XPUSHs (sv_2mortal (sv_bless ( 2022 XPUSHs (sv_2mortal (sv_bless (
1632 newRV_noinc (pv), 2023 newRV_noinc (pv),
1633 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2024 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1634 ))); 2025 )));
1635} 2026}
… …
1647 allow_nonref = F_ALLOW_NONREF 2038 allow_nonref = F_ALLOW_NONREF
1648 shrink = F_SHRINK 2039 shrink = F_SHRINK
1649 allow_blessed = F_ALLOW_BLESSED 2040 allow_blessed = F_ALLOW_BLESSED
1650 convert_blessed = F_CONV_BLESSED 2041 convert_blessed = F_CONV_BLESSED
1651 relaxed = F_RELAXED 2042 relaxed = F_RELAXED
2043 allow_unknown = F_ALLOW_UNKNOWN
2044 allow_tags = F_ALLOW_TAGS
1652 PPCODE: 2045 PPCODE:
1653{ 2046{
1654 if (enable) 2047 if (enable)
1655 self->flags |= ix; 2048 self->flags |= ix;
1656 else 2049 else
… …
1671 get_allow_nonref = F_ALLOW_NONREF 2064 get_allow_nonref = F_ALLOW_NONREF
1672 get_shrink = F_SHRINK 2065 get_shrink = F_SHRINK
1673 get_allow_blessed = F_ALLOW_BLESSED 2066 get_allow_blessed = F_ALLOW_BLESSED
1674 get_convert_blessed = F_CONV_BLESSED 2067 get_convert_blessed = F_CONV_BLESSED
1675 get_relaxed = F_RELAXED 2068 get_relaxed = F_RELAXED
2069 get_allow_unknown = F_ALLOW_UNKNOWN
2070 get_allow_tags = F_ALLOW_TAGS
1676 PPCODE: 2071 PPCODE:
1677 XPUSHs (boolSV (self->flags & ix)); 2072 XPUSHs (boolSV (self->flags & ix));
1678 2073
1679void max_depth (JSON *self, UV max_depth = 0x80000000UL) 2074void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1680 PPCODE: 2075 PPCODE:
1681{ 2076 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)); 2077 XPUSHs (ST (0));
1692}
1693 2078
1694U32 get_max_depth (JSON *self) 2079U32 get_max_depth (JSON *self)
1695 CODE: 2080 CODE:
1696 RETVAL = DEC_DEPTH (self->flags); 2081 RETVAL = self->max_depth;
1697 OUTPUT: 2082 OUTPUT:
1698 RETVAL 2083 RETVAL
1699 2084
1700void max_size (JSON *self, UV max_size = 0) 2085void max_size (JSON *self, U32 max_size = 0)
1701 PPCODE: 2086 PPCODE:
1702{ 2087 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)); 2088 XPUSHs (ST (0));
1714}
1715 2089
1716int get_max_size (JSON *self) 2090int get_max_size (JSON *self)
1717 CODE: 2091 CODE:
1718 RETVAL = DEC_SIZE (self->flags); 2092 RETVAL = self->max_size;
1719 OUTPUT: 2093 OUTPUT:
1720 RETVAL 2094 RETVAL
1721 2095
1722void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2096void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1723 PPCODE: 2097 PPCODE:
… …
1729} 2103}
1730 2104
1731void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2105void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1732 PPCODE: 2106 PPCODE:
1733{ 2107{
1734 if (!self->cb_sk_object) 2108 if (!self->cb_sk_object)
1735 self->cb_sk_object = newHV (); 2109 self->cb_sk_object = newHV ();
1736 2110
1737 if (SvOK (cb)) 2111 if (SvOK (cb))
1738 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2112 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1739 else 2113 else
… …
1750 XPUSHs (ST (0)); 2124 XPUSHs (ST (0));
1751} 2125}
1752 2126
1753void encode (JSON *self, SV *scalar) 2127void encode (JSON *self, SV *scalar)
1754 PPCODE: 2128 PPCODE:
1755 XPUSHs (encode_json (scalar, self)); 2129 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2130 XPUSHs (scalar);
1756 2131
1757void decode (JSON *self, SV *jsonstr) 2132void decode (JSON *self, SV *jsonstr)
1758 PPCODE: 2133 PPCODE:
1759 XPUSHs (decode_json (jsonstr, self, 0)); 2134 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2135 XPUSHs (jsonstr);
1760 2136
1761void decode_prefix (JSON *self, SV *jsonstr) 2137void decode_prefix (JSON *self, SV *jsonstr)
1762 PPCODE: 2138 PPCODE:
1763{ 2139{
2140 SV *sv;
1764 STRLEN offset; 2141 STRLEN offset;
2142 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1765 EXTEND (SP, 2); 2143 EXTEND (SP, 2);
1766 PUSHs (decode_json (jsonstr, self, &offset)); 2144 PUSHs (sv);
1767 PUSHs (sv_2mortal (newSVuv (offset))); 2145 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
1768} 2146}
1769 2147
1770void incr_parse (JSON *self, SV *jsonstr = 0) 2148void incr_parse (JSON *self, SV *jsonstr = 0)
1771 PPCODE: 2149 PPCODE:
1772{ 2150{
1773 if (!self->incr_text) 2151 if (!self->incr_text)
1774 self->incr_text = newSVpvn ("", 0); 2152 self->incr_text = newSVpvn ("", 0);
2153
2154 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2155 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2156 if (DECODE_WANTS_OCTETS (self))
2157 {
2158 if (self->incr_pos)
2159 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2160 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2161
2162 sv_utf8_downgrade (self->incr_text, 0);
2163 }
2164 else
2165 {
2166 sv_utf8_upgrade (self->incr_text);
2167
2168 if (self->incr_pos)
2169 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2170 - (U8 *)SvPVX (self->incr_text);
2171 }
1775 2172
1776 // append data, if any 2173 // append data, if any
1777 if (jsonstr) 2174 if (jsonstr)
1778 { 2175 {
2176 /* make sure both strings have same encoding */
1779 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text)) 2177 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2178 if (SvUTF8 (jsonstr))
2179 sv_utf8_downgrade (jsonstr, 0);
1780 { 2180 else
1781 /* utf-8-ness differs, need to upgrade */
1782 sv_utf8_upgrade (self->incr_text); 2181 sv_utf8_upgrade (jsonstr);
1783 2182
1784 if (self->incr_pos) 2183 /* 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 { 2184 {
1790 STRLEN len; 2185 STRLEN len;
1791 const char *str = SvPV (jsonstr, len); 2186 const char *str = SvPV (jsonstr, len);
1792 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1); 2187 STRLEN cur = SvCUR (self->incr_text);
2188
2189 if (SvLEN (self->incr_text) - cur <= len)
2190 json_sv_grow (self->incr_text, cur, len);
2191
1793 Move (str, SvEND (self->incr_text), len, char); 2192 Move (str, SvEND (self->incr_text), len, char);
1794 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len); 2193 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 2194 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1796 } 2195 }
1797 } 2196 }
1798 2197
1799 if (GIMME_V != G_VOID) 2198 if (GIMME_V != G_VOID)
1800 do 2199 do
1801 { 2200 {
2201 SV *sv;
1802 STRLEN offset; 2202 STRLEN offset;
1803 2203
1804 incr_parse (self);
1805
1806 if (!INCR_DONE (self)) 2204 if (!INCR_DONE (self))
2205 {
2206 incr_parse (self);
2207
2208 if (self->incr_pos > self->max_size && self->max_size)
2209 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2210 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2211
2212 if (!INCR_DONE (self))
2213 {
2214 // as an optimisation, do not accumulate white space in the incr buffer
2215 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2216 {
2217 self->incr_pos = 0;
2218 SvCUR_set (self->incr_text, 0);
2219 }
2220
1807 break; 2221 break;
2222 }
2223 }
1808 2224
1809 XPUSHs (decode_json (self->incr_text, self, &offset)); 2225 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2226 XPUSHs (sv);
1810 2227
1811 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1812 self->incr_pos -= offset; 2228 self->incr_pos -= offset;
1813 self->incr_nest = 0; 2229 self->incr_nest = 0;
1814 self->incr_mode = 0; 2230 self->incr_mode = 0;
2231
2232 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
1815 } 2233 }
1816 while (GIMME_V == G_ARRAY); 2234 while (GIMME_V == G_ARRAY);
1817} 2235}
1818 2236
1819SV *incr_text (JSON *self) 2237SV *incr_text (JSON *self)
1820 ATTRS: lvalue 2238 ATTRS: lvalue
1821 CODE: 2239 CODE:
1822{ 2240{
1823 if (self->incr_pos) 2241 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 2242 croak ("incr_text can not be called when the incremental parser already started parsing");
1825 2243
1826 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef; 2244 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1827} 2245}
1828 OUTPUT: 2246 OUTPUT:
1829 RETVAL 2247 RETVAL
2248
2249void incr_skip (JSON *self)
2250 CODE:
2251{
2252 if (self->incr_pos)
2253 {
2254 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2255 self->incr_pos = 0;
2256 self->incr_nest = 0;
2257 self->incr_mode = 0;
2258 }
2259}
2260
2261void incr_reset (JSON *self)
2262 CODE:
2263{
2264 SvREFCNT_dec (self->incr_text);
2265 self->incr_text = 0;
2266 self->incr_pos = 0;
2267 self->incr_nest = 0;
2268 self->incr_mode = 0;
2269}
1830 2270
1831void DESTROY (JSON *self) 2271void DESTROY (JSON *self)
1832 CODE: 2272 CODE:
1833 SvREFCNT_dec (self->cb_sk_object); 2273 SvREFCNT_dec (self->cb_sk_object);
1834 SvREFCNT_dec (self->cb_object); 2274 SvREFCNT_dec (self->cb_object);
1835 SvREFCNT_dec (self->incr_text); 2275 SvREFCNT_dec (self->incr_text);
1836 2276
1837PROTOTYPES: ENABLE 2277PROTOTYPES: ENABLE
1838 2278
1839void encode_json (SV *scalar) 2279void encode_json (SV *scalar)
1840 ALIAS:
1841 to_json_ = 0
1842 encode_json = F_UTF8
1843 PPCODE: 2280 PPCODE:
1844{ 2281{
1845 JSON json = { F_DEFAULT | ix }; 2282 JSON json;
1846 XPUSHs (encode_json (scalar, &json)); 2283 json_init (&json);
2284 json.flags |= F_UTF8;
2285 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2286 XPUSHs (scalar);
1847} 2287}
1848 2288
1849void decode_json (SV *jsonstr) 2289void decode_json (SV *jsonstr)
1850 ALIAS:
1851 from_json_ = 0
1852 decode_json = F_UTF8
1853 PPCODE: 2290 PPCODE:
1854{ 2291{
1855 JSON json = { F_DEFAULT | ix }; 2292 JSON json;
1856 XPUSHs (decode_json (jsonstr, &json, 0)); 2293 json_init (&json);
2294 json.flags |= F_UTF8;
2295 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2296 XPUSHs (jsonstr);
1857} 2297}
1858 2298
1859

Diff Legend

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