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

Comparing JSON-XS/XS.xs (file contents):
Revision 1.72 by root, Wed Mar 19 04:08:22 2008 UTC vs.
Revision 1.143 by root, Mon Jun 21 01:04:30 2021 UTC

… …
4 4
5#include <assert.h> 5#include <assert.h>
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h>
9#include <float.h> 10#include <float.h>
11#include <inttypes.h>
10 12
11#if defined(__BORLANDC__) || defined(_MSC_VER) 13#if defined(__BORLANDC__) || defined(_MSC_VER)
12# define snprintf _snprintf // C compilers have this in stdio.h 14# define snprintf _snprintf // C compilers have this in stdio.h
13#endif 15#endif
14 16
15// 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
16// guarentees, though. if it breaks, you get to keep the pieces. 18// guarantees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES 19#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13 20# define UTF8_MAXBYTES 13
19#endif 21#endif
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
35#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
20 36
21#define F_ASCII 0x00000001UL 37#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 38#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 39#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 40#define F_INDENT 0x00000008UL
… …
28#define F_ALLOW_NONREF 0x00000100UL 44#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 45#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 46#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 47#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL 48#define F_RELAXED 0x00001000UL
33 49#define F_ALLOW_UNKNOWN 0x00002000UL
34#define F_MAXDEPTH 0xf8000000UL 50#define F_ALLOW_TAGS 0x00004000UL
35#define S_MAXDEPTH 27
36#define F_MAXSIZE 0x01f00000UL
37#define S_MAXSIZE 20
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 51#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 52
40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
42
43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 53#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
44#define F_DEFAULT (9UL << S_MAXDEPTH)
45 54
46#define INIT_SIZE 32 // initial scalar size to be allocated 55#define INIT_SIZE 64 // initial scalar size to be allocated
47#define INDENT_STEP 3 // spaces per indentation level 56#define INDENT_STEP 3 // spaces per indentation level
48 57
49#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)
50 61
51#define SB do { 62#define SB do {
52#define SE } while (0) 63#define SE } while (0)
53 64
54#if __GNUC__ >= 3 65#if __GNUC__ >= 3
… …
64 75
65#define IN_RANGE_INC(type,val,beg,end) \ 76#define IN_RANGE_INC(type,val,beg,end) \
66 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ 77 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
67 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) 78 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
68 79
80#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
81
69#ifdef USE_ITHREADS 82#ifdef USE_ITHREADS
70# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 83# define JSON_STASH (expect_true (json_stash) ? json_stash : gv_stashpv ("JSON::XS", 1))
84# define BOOL_STASH (expect_true (bool_stash) ? bool_stash : gv_stashpv ("Types::Serialiser::Boolean", 1))
85# define GET_BOOL(value) (expect_true (bool_ ## value) ? bool_ ## value : get_bool ("Types::Serialiser::" # value))
72#else 86#else
73# define JSON_SLOW 0
74# define JSON_STASH json_stash 87# define JSON_STASH json_stash
88# define BOOL_STASH bool_stash
89# define GET_BOOL(value) bool_ ## value
75#endif 90#endif
76 91
77static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92// the amount of HEs to allocate on the stack, when sorting keys
78static 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_false, *bool_true;
97static SV *sv_json;
98
99enum {
100 INCR_M_WS = 0, // initial whitespace skipping, must be 0
101 INCR_M_TFN, // inside true/false/null
102 INCR_M_NUM, // inside number
103 INCR_M_STR, // inside string
104 INCR_M_BS, // inside backslash
105 INCR_M_C0, // inside comment in initial whitespace sequence
106 INCR_M_C1, // inside comment in other places
107 INCR_M_JSON // outside anything, count nesting
108};
109
110#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
79 111
80typedef struct { 112typedef struct {
81 U32 flags; 113 U32 flags;
114 U32 max_depth;
115 STRLEN max_size;
116
82 SV *cb_object; 117 SV *cb_object;
83 HV *cb_sk_object; 118 HV *cb_sk_object;
119
120 // for the incremental parser
121 SV *incr_text; // the source text so far
122 STRLEN incr_pos; // the current offset into the text
123 int incr_nest; // {[]}-nesting level
124 unsigned char incr_mode;
125
126 SV *v_false, *v_true;
84} JSON; 127} JSON;
128
129INLINE void
130json_init (JSON *json)
131{
132 static const JSON init = { F_ALLOW_NONREF, 512 };
133
134 *json = init;
135}
85 136
86///////////////////////////////////////////////////////////////////////////// 137/////////////////////////////////////////////////////////////////////////////
87// utility functions 138// utility functions
88 139
140INLINE SV *
141get_bool (const char *name)
142{
143 SV *sv = get_sv (name, 1);
144
145 SvREADONLY_on (sv);
146 SvREADONLY_on (SvRV (sv));
147
148 return sv;
149}
150
89INLINE void 151INLINE void
90shrink (SV *sv) 152shrink (SV *sv)
91{ 153{
92 sv_utf8_downgrade (sv, 1); 154 sv_utf8_downgrade (sv, 1);
155
93 if (SvLEN (sv) > SvCUR (sv) + 1) 156 if (SvLEN (sv) > SvCUR (sv) + 1)
94 { 157 {
95#ifdef SvPV_shrink_to_cur 158#ifdef SvPV_shrink_to_cur
96 SvPV_shrink_to_cur (sv); 159 SvPV_shrink_to_cur (sv);
97#elif defined (SvPV_renew) 160#elif defined (SvPV_renew)
98 SvPV_renew (sv, SvCUR (sv) + 1); 161 SvPV_renew (sv, SvCUR (sv) + 1);
99#endif 162#endif
100 } 163 }
101} 164}
102 165
166/* adds two STRLENs together, slow, and with paranoia */
167static STRLEN
168strlen_sum (STRLEN l1, STRLEN l2)
169{
170 size_t sum = l1 + l2;
171
172 if (sum < (size_t)l2 || sum != (size_t)(STRLEN)sum)
173 croak ("JSON::XS: string size overflow");
174
175 return sum;
176}
177
178/* similar to SvGROW, but somewhat safer and guarantees exponential realloc strategy */
179static char *
180json_sv_grow (SV *sv, size_t len1, size_t len2)
181{
182 len1 = strlen_sum (len1, len2);
183 len1 = strlen_sum (len1, len1 >> 1);
184
185 if (len1 > 4096 - 24)
186 len1 = (len1 | 4095) - 24;
187
188 return SvGROW (sv, len1);
189}
190
103// decode an utf-8 character and return it, or (UV)-1 in 191// decode a utf-8 character and return it, or (UV)-1 in
104// case of an error. 192// case of an error.
105// we special-case "safe" characters from U+80 .. U+7FF, 193// we special-case "safe" characters from U+80 .. U+7FF,
106// but use the very good perl function to parse anything else. 194// but use the very good perl function to parse anything else.
107// note that we never call this function for a ascii codepoints 195// note that we never call this function for a ascii codepoints
108INLINE UV 196INLINE UV
… …
123// this function takes advantage of this fact, although current gccs 211// this function takes advantage of this fact, although current gccs
124// seem to optimise the check for >= 0x80 away anyways 212// seem to optimise the check for >= 0x80 away anyways
125INLINE unsigned char * 213INLINE unsigned char *
126encode_utf8 (unsigned char *s, UV ch) 214encode_utf8 (unsigned char *s, UV ch)
127{ 215{
128 if (ch <= 0x7FF) 216 if (expect_false (ch < 0x000080))
129 { 217 *s++ = ch;
130 *s++ = (ch >> 6) | 0xc0; 218 else if (expect_true (ch < 0x000800))
131 *s++ = (ch & 0x3f) | 0x80; 219 *s++ = 0xc0 | ( ch >> 6),
132 } 220 *s++ = 0x80 | ( ch & 0x3f);
133 else 221 else if ( ch < 0x010000)
134 s = uvuni_to_utf8_flags (s, ch, 0); 222 *s++ = 0xe0 | ( ch >> 12),
223 *s++ = 0x80 | ((ch >> 6) & 0x3f),
224 *s++ = 0x80 | ( ch & 0x3f);
225 else if ( ch < 0x110000)
226 *s++ = 0xf0 | ( ch >> 18),
227 *s++ = 0x80 | ((ch >> 12) & 0x3f),
228 *s++ = 0x80 | ((ch >> 6) & 0x3f),
229 *s++ = 0x80 | ( ch & 0x3f);
135 230
136 return s; 231 return s;
232}
233
234// convert offset pointer to character index, sv must be string
235static STRLEN
236ptr_to_index (SV *sv, char *offset)
237{
238 return SvUTF8 (sv)
239 ? utf8_distance (offset, SvPVX (sv))
240 : offset - SvPVX (sv);
241}
242
243/////////////////////////////////////////////////////////////////////////////
244// fp hell
245
246// scan a group of digits, and a trailing exponent
247static void
248json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
249{
250 UV uaccum = 0;
251 int eaccum = 0;
252
253 // if we recurse too deep, skip all remaining digits
254 // to avoid a stack overflow attack
255 if (expect_false (--maxdepth <= 0))
256 while (((U8)*s - '0') < 10)
257 ++s;
258
259 for (;;)
260 {
261 U8 dig = (U8)*s - '0';
262
263 if (expect_false (dig >= 10))
264 {
265 if (dig == (U8)((U8)'.' - (U8)'0'))
266 {
267 ++s;
268 json_atof_scan1 (s, accum, expo, 1, maxdepth);
269 }
270 else if ((dig | ' ') == 'e' - '0')
271 {
272 int exp2 = 0;
273 int neg = 0;
274
275 ++s;
276
277 if (*s == '-')
278 {
279 ++s;
280 neg = 1;
281 }
282 else if (*s == '+')
283 ++s;
284
285 while ((dig = (U8)*s - '0') < 10)
286 exp2 = exp2 * 10 + *s++ - '0';
287
288 *expo += neg ? -exp2 : exp2;
289 }
290
291 break;
292 }
293
294 ++s;
295
296 uaccum = uaccum * 10 + dig;
297 ++eaccum;
298
299 // if we have too many digits, then recurse for more
300 // we actually do this for rather few digits
301 if (uaccum >= (UV_MAX - 9) / 10)
302 {
303 if (postdp) *expo -= eaccum;
304 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
305 if (postdp) *expo += eaccum;
306
307 break;
308 }
309 }
310
311 // this relies greatly on the quality of the pow ()
312 // implementation of the platform, but a good
313 // implementation is hard to beat.
314 // (IEEE 754 conformant ones are required to be exact)
315 if (postdp) *expo -= eaccum;
316 *accum += uaccum * Perl_pow (10., *expo);
317 *expo += eaccum;
318}
319
320static NV
321json_atof (const char *s)
322{
323 NV accum = 0.;
324 int expo = 0;
325 int neg = 0;
326
327 if (*s == '-')
328 {
329 ++s;
330 neg = 1;
331 }
332
333 // a recursion depth of ten gives us >>500 bits
334 json_atof_scan1 (s, &accum, &expo, 0, 10);
335
336 return neg ? -accum : accum;
337}
338
339// target of scalar reference is bool? -1 == nope, 0 == false, 1 == true
340static int
341ref_bool_type (SV *sv)
342{
343 svtype svt = SvTYPE (sv);
344
345 if (svt < SVt_PVAV)
346 {
347 STRLEN len = 0;
348 char *pv = svt ? SvPV (sv, len) : 0;
349
350 if (len == 1)
351 if (*pv == '1')
352 return 1;
353 else if (*pv == '0')
354 return 0;
355 }
356
357 return -1;
358}
359
360// returns whether scalar is not a reference in the sense of allow_nonref
361static int
362json_nonref (SV *scalar)
363{
364 if (!SvROK (scalar))
365 return 1;
366
367 scalar = SvRV (scalar);
368
369 if (SvTYPE (scalar) >= SVt_PVMG)
370 {
371 if (SvSTASH (scalar) == bool_stash)
372 return 1;
373
374 if (!SvOBJECT (scalar) && ref_bool_type (scalar) >= 0)
375 return 1;
376 }
377
378 return 0;
137} 379}
138 380
139///////////////////////////////////////////////////////////////////////////// 381/////////////////////////////////////////////////////////////////////////////
140// encoder 382// encoder
141 383
… …
145 char *cur; // SvPVX (sv) + current output position 387 char *cur; // SvPVX (sv) + current output position
146 char *end; // SvEND (sv) 388 char *end; // SvEND (sv)
147 SV *sv; // result scalar 389 SV *sv; // result scalar
148 JSON json; 390 JSON json;
149 U32 indent; // indentation level 391 U32 indent; // indentation level
150 U32 maxdepth; // max. indentation/recursion level
151 UV limit; // escape character values >= this value when encoding 392 UV limit; // escape character values >= this value when encoding
152} enc_t; 393} enc_t;
153 394
154INLINE void 395INLINE void
155need (enc_t *enc, STRLEN len) 396need (enc_t *enc, STRLEN len)
156{ 397{
157 if (expect_false (enc->cur + len >= enc->end)) 398 if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
158 { 399 {
159 STRLEN cur = enc->cur - SvPVX (enc->sv); 400 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
160 SvGROW (enc->sv, cur + len + 1); 401 char *buf = json_sv_grow (enc->sv, cur, len);
161 enc->cur = SvPVX (enc->sv) + cur; 402 enc->cur = buf + cur;
162 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 403 enc->end = buf + SvLEN (enc->sv) - 1;
163 } 404 }
164} 405}
165 406
166INLINE void 407INLINE void
167encode_ch (enc_t *enc, char ch) 408encode_ch (enc_t *enc, char ch)
… …
183 424
184 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case 425 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
185 { 426 {
186 if (expect_false (ch == '"')) // but with slow exceptions 427 if (expect_false (ch == '"')) // but with slow exceptions
187 { 428 {
188 need (enc, len += 1); 429 need (enc, len + 1);
189 *enc->cur++ = '\\'; 430 *enc->cur++ = '\\';
190 *enc->cur++ = '"'; 431 *enc->cur++ = '"';
191 } 432 }
192 else if (expect_false (ch == '\\')) 433 else if (expect_false (ch == '\\'))
193 { 434 {
194 need (enc, len += 1); 435 need (enc, len + 1);
195 *enc->cur++ = '\\'; 436 *enc->cur++ = '\\';
196 *enc->cur++ = '\\'; 437 *enc->cur++ = '\\';
197 } 438 }
198 else 439 else
199 *enc->cur++ = ch; 440 *enc->cur++ = ch;
… …
202 } 443 }
203 else 444 else
204 { 445 {
205 switch (ch) 446 switch (ch)
206 { 447 {
207 case '\010': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break; 448 case '\010': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'b'; ++str; break;
208 case '\011': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break; 449 case '\011': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 't'; ++str; break;
209 case '\012': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break; 450 case '\012': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'n'; ++str; break;
210 case '\014': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break; 451 case '\014': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'f'; ++str; break;
211 case '\015': need (enc, len += 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break; 452 case '\015': need (enc, len + 1); *enc->cur++ = '\\'; *enc->cur++ = 'r'; ++str; break;
212 453
213 default: 454 default:
214 { 455 {
215 STRLEN clen; 456 STRLEN clen;
216 UV uch; 457 UV uch;
… …
227 clen = 1; 468 clen = 1;
228 } 469 }
229 470
230 if (uch < 0x80/*0x20*/ || uch >= enc->limit) 471 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
231 { 472 {
232 if (uch > 0xFFFFUL) 473 if (uch >= 0x10000UL)
233 { 474 {
234 if (uch > 0x10FFFFUL) 475 if (uch >= 0x110000UL)
235 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 476 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
236 477
237 need (enc, len += 11); 478 need (enc, len + 11);
238 sprintf (enc->cur, "\\u%04x\\u%04x", 479 sprintf (enc->cur, "\\u%04x\\u%04x",
239 (int)((uch - 0x10000) / 0x400 + 0xD800), 480 (int)((uch - 0x10000) / 0x400 + 0xD800),
240 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 481 (int)((uch - 0x10000) % 0x400 + 0xDC00));
241 enc->cur += 12; 482 enc->cur += 12;
242 } 483 }
243 else 484 else
244 { 485 {
245 static char hexdigit [16] = "0123456789abcdef";
246 need (enc, len += 5); 486 need (enc, len + 5);
247 *enc->cur++ = '\\'; 487 *enc->cur++ = '\\';
248 *enc->cur++ = 'u'; 488 *enc->cur++ = 'u';
249 *enc->cur++ = hexdigit [ uch >> 12 ]; 489 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
250 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 490 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
251 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 491 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
252 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 492 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
253 } 493 }
254 494
255 str += clen; 495 str += clen;
256 } 496 }
257 else if (enc->json.flags & F_LATIN1) 497 else if (enc->json.flags & F_LATIN1)
… …
259 *enc->cur++ = uch; 499 *enc->cur++ = uch;
260 str += clen; 500 str += clen;
261 } 501 }
262 else if (is_utf8) 502 else if (is_utf8)
263 { 503 {
264 need (enc, len += clen); 504 need (enc, len + clen);
265 do 505 do
266 { 506 {
267 *enc->cur++ = *str++; 507 *enc->cur++ = *str++;
268 } 508 }
269 while (--clen); 509 while (--clen);
270 } 510 }
271 else 511 else
272 { 512 {
273 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 513 need (enc, len + UTF8_MAXBYTES - 1); // never more than 11 bytes needed
274 enc->cur = encode_utf8 (enc->cur, uch); 514 enc->cur = encode_utf8 (enc->cur, uch);
275 ++str; 515 ++str;
276 } 516 }
277 } 517 }
278 } 518 }
… …
328static void 568static void
329encode_av (enc_t *enc, AV *av) 569encode_av (enc_t *enc, AV *av)
330{ 570{
331 int i, len = av_len (av); 571 int i, len = av_len (av);
332 572
333 if (enc->indent >= enc->maxdepth) 573 if (enc->indent >= enc->json.max_depth)
334 croak ("data structure too deep (hit recursion limit)"); 574 croak (ERR_NESTING_EXCEEDED);
335 575
336 encode_ch (enc, '['); 576 encode_ch (enc, '[');
337 577
338 if (len >= 0) 578 if (len >= 0)
339 { 579 {
340 encode_nl (enc); ++enc->indent; 580 encode_nl (enc); ++enc->indent;
341 581
342 for (i = 0; i <= len; ++i) 582 for (i = 0; i <= len; ++i)
… …
354 encode_comma (enc); 594 encode_comma (enc);
355 } 595 }
356 596
357 encode_nl (enc); --enc->indent; encode_indent (enc); 597 encode_nl (enc); --enc->indent; encode_indent (enc);
358 } 598 }
359 599
360 encode_ch (enc, ']'); 600 encode_ch (enc, ']');
361} 601}
362 602
363static void 603static void
364encode_hk (enc_t *enc, HE *he) 604encode_hk (enc_t *enc, HE *he)
… …
368 if (HeKLEN (he) == HEf_SVKEY) 608 if (HeKLEN (he) == HEf_SVKEY)
369 { 609 {
370 SV *sv = HeSVKEY (he); 610 SV *sv = HeSVKEY (he);
371 STRLEN len; 611 STRLEN len;
372 char *str; 612 char *str;
373 613
374 SvGETMAGIC (sv); 614 SvGETMAGIC (sv);
375 str = SvPV (sv, len); 615 str = SvPV (sv, len);
376 616
377 encode_str (enc, str, len, SvUTF8 (sv)); 617 encode_str (enc, str, len, SvUTF8 (sv));
378 } 618 }
… …
413 653
414static void 654static void
415encode_hv (enc_t *enc, HV *hv) 655encode_hv (enc_t *enc, HV *hv)
416{ 656{
417 HE *he; 657 HE *he;
418 int count;
419 658
420 if (enc->indent >= enc->maxdepth) 659 if (enc->indent >= enc->json.max_depth)
421 croak ("data structure too deep (hit recursion limit)"); 660 croak (ERR_NESTING_EXCEEDED);
422 661
423 encode_ch (enc, '{'); 662 encode_ch (enc, '{');
424 663
425 // for canonical output we have to sort by keys first 664 // for canonical output we have to sort by keys first
426 // actually, this is mostly due to the stupid so-called 665 // actually, this is mostly due to the stupid so-called
427 // security workaround added somewhere in 5.8.x. 666 // security workaround added somewhere in 5.8.x
428 // that randomises hash orderings 667 // that randomises hash orderings
429 if (enc->json.flags & F_CANONICAL) 668 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
430 { 669 {
431 int count = hv_iterinit (hv); 670 int count = hv_iterinit (hv);
432 671
433 if (SvMAGICAL (hv)) 672 if (SvMAGICAL (hv))
434 { 673 {
… …
445 } 684 }
446 685
447 if (count) 686 if (count)
448 { 687 {
449 int i, fast = 1; 688 int i, fast = 1;
450#if defined(__BORLANDC__) || defined(_MSC_VER) 689 HE *hes_stack [STACK_HES];
451 HE **hes = _alloca (count * sizeof (HE)); 690 HE **hes = hes_stack;
452#else 691
453 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 692 // allocate larger arrays on the heap
454#endif 693 if (count > STACK_HES)
694 {
695 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
696 hes = (HE **)SvPVX (sv);
697 }
455 698
456 i = 0; 699 i = 0;
457 while ((he = hv_iternext (hv))) 700 while ((he = hv_iternext (hv)))
458 { 701 {
459 hes [i++] = he; 702 hes [i++] = he;
… …
528// encode objects, arrays and special \0=false and \1=true values. 771// encode objects, arrays and special \0=false and \1=true values.
529static void 772static void
530encode_rv (enc_t *enc, SV *sv) 773encode_rv (enc_t *enc, SV *sv)
531{ 774{
532 svtype svt; 775 svtype svt;
776 GV *method;
533 777
534 SvGETMAGIC (sv); 778 SvGETMAGIC (sv);
535 svt = SvTYPE (sv); 779 svt = SvTYPE (sv);
536 780
537 if (expect_false (SvOBJECT (sv))) 781 if (expect_false (SvOBJECT (sv)))
538 { 782 {
539 HV *stash = !JSON_SLOW || json_boolean_stash 783 HV *stash = SvSTASH (sv);
540 ? json_boolean_stash
541 : gv_stashpv ("JSON::XS::Boolean", 1);
542 784
543 if (SvSTASH (sv) == stash) 785 if (stash == bool_stash)
544 { 786 {
545 if (SvIV (sv))
546 encode_str (enc, "true", 4, 0); 787 if (SvIV (sv)) encode_str (enc, "true" , 4, 0);
547 else
548 encode_str (enc, "false", 5, 0); 788 else encode_str (enc, "false", 5, 0);
549 } 789 }
790 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
791 {
792 int count;
793 dSP;
794
795 ENTER; SAVETMPS;
796 PUSHMARK (SP);
797 EXTEND (SP, 2);
798 // we re-bless the reference to get overload and other niceties right
799 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
800 PUSHs (sv_json);
801
802 PUTBACK;
803 count = call_sv ((SV *)GvCV (method), G_ARRAY);
804 SPAGAIN;
805
806 // catch this surprisingly common error
807 if (SvROK (TOPs) && SvRV (TOPs) == sv)
808 croak ("%s::FREEZE method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
809
810 encode_ch (enc, '(');
811 encode_ch (enc, '"');
812 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
813 encode_ch (enc, '"');
814 encode_ch (enc, ')');
815 encode_ch (enc, '[');
816
817 if (count)
818 {
819 int i;
820
821 for (i = 0; i < count - 1; ++i)
822 {
823 encode_sv (enc, SP[i + 1 - count]);
824 encode_ch (enc, ',');
825 }
826
827 encode_sv (enc, TOPs);
828 SP -= count;
829 }
830
831 PUTBACK;
832
833 encode_ch (enc, ']');
834
835 FREETMPS; LEAVE;
836 }
837 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
838 {
839 dSP;
840
841 ENTER; SAVETMPS;
842 PUSHMARK (SP);
843 // we re-bless the reference to get overload and other niceties right
844 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
845
846 // calling with G_SCALAR ensures that we always get a 1 return value
847 PUTBACK;
848 call_sv ((SV *)GvCV (method), G_SCALAR);
849 SPAGAIN;
850
851 // catch this surprisingly common error
852 if (SvROK (TOPs) && SvRV (TOPs) == sv)
853 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
854
855 sv = POPs;
856 PUTBACK;
857
858 encode_sv (enc, sv);
859
860 FREETMPS; LEAVE;
861 }
862 else if (enc->json.flags & F_ALLOW_BLESSED)
863 encode_str (enc, "null", 4, 0);
550 else 864 else
551 {
552#if 0
553 if (0 && sv_derived_from (rv, "JSON::Literal"))
554 {
555 // not yet
556 }
557#endif
558 if (enc->json.flags & F_CONV_BLESSED)
559 {
560 // we re-bless the reference to get overload and other niceties right
561 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
562
563 if (to_json)
564 {
565 dSP;
566
567 ENTER; SAVETMPS; PUSHMARK (SP);
568 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
569
570 // calling with G_SCALAR ensures that we always get a 1 return value
571 PUTBACK;
572 call_sv ((SV *)GvCV (to_json), G_SCALAR);
573 SPAGAIN;
574
575 // catch this surprisingly common error
576 if (SvROK (TOPs) && SvRV (TOPs) == sv)
577 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
578
579 sv = POPs;
580 PUTBACK;
581
582 encode_sv (enc, sv);
583
584 FREETMPS; LEAVE;
585 }
586 else if (enc->json.flags & F_ALLOW_BLESSED)
587 encode_str (enc, "null", 4, 0);
588 else
589 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
590 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
591 }
592 else if (enc->json.flags & F_ALLOW_BLESSED)
593 encode_str (enc, "null", 4, 0);
594 else
595 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 865 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
596 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 866 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
597 }
598 } 867 }
599 else if (svt == SVt_PVHV) 868 else if (svt == SVt_PVHV)
600 encode_hv (enc, (HV *)sv); 869 encode_hv (enc, (HV *)sv);
601 else if (svt == SVt_PVAV) 870 else if (svt == SVt_PVAV)
602 encode_av (enc, (AV *)sv); 871 encode_av (enc, (AV *)sv);
603 else if (svt < SVt_PVAV) 872 else if (svt < SVt_PVAV)
604 { 873 {
605 STRLEN len = 0; 874 int bool_type = ref_bool_type (sv);
606 char *pv = svt ? SvPV (sv, len) : 0;
607 875
608 if (len == 1 && *pv == '1') 876 if (bool_type == 1)
609 encode_str (enc, "true", 4, 0); 877 encode_str (enc, "true", 4, 0);
610 else if (len == 1 && *pv == '0') 878 else if (bool_type == 0)
611 encode_str (enc, "false", 5, 0); 879 encode_str (enc, "false", 5, 0);
880 else if (enc->json.flags & F_ALLOW_UNKNOWN)
881 encode_str (enc, "null", 4, 0);
612 else 882 else
613 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 883 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
614 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 884 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
615 } 885 }
886 else if (enc->json.flags & F_ALLOW_UNKNOWN)
887 encode_str (enc, "null", 4, 0);
616 else 888 else
617 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 889 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
618 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 890 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
619} 891}
620 892
… …
638 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 910 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
639 enc->cur += strlen (enc->cur); 911 enc->cur += strlen (enc->cur);
640 } 912 }
641 else if (SvIOKp (sv)) 913 else if (SvIOKp (sv))
642 { 914 {
643 // we assume we can always read an IV as a UV 915 // we assume we can always read an IV as a UV and vice versa
644 if (SvUV (sv) & ~(UV)0x7fff) 916 // we assume two's complement
645 { 917 // we assume no aliasing issues in the union
646 // large integer, use the (rather slow) snprintf way. 918 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
647 need (enc, sizeof (UV) * 3); 919 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
648 enc->cur +=
649 SvIsUV(sv)
650 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
651 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
652 }
653 else
654 { 920 {
655 // optimise the "small number case" 921 // optimise the "small number case"
656 // code will likely be branchless and use only a single multiplication 922 // code will likely be branchless and use only a single multiplication
923 // 4.28 works for numbers up to 59074
657 I32 i = SvIV (sv); 924 I32 i = SvIVX (sv);
658 U32 u; 925 U32 u;
659 char digit, nz = 0; 926 char digit, nz = 0;
660 927
661 need (enc, 6); 928 need (enc, 6);
662 929
… …
668 935
669 // now output digit by digit, each time masking out the integer part 936 // now output digit by digit, each time masking out the integer part
670 // and multiplying by 5 while moving the decimal point one to the right, 937 // and multiplying by 5 while moving the decimal point one to the right,
671 // resulting in a net multiplication by 10. 938 // resulting in a net multiplication by 10.
672 // we always write the digit to memory but conditionally increment 939 // we always write the digit to memory but conditionally increment
673 // the pointer, to ease the usage of conditional move instructions. 940 // the pointer, to enable the use of conditional move instructions.
674 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 941 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
675 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 942 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
676 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 943 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
677 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 944 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
678 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 945 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
679 } 946 }
947 else
948 {
949 // large integer, use the (rather slow) snprintf way.
950 need (enc, IVUV_MAXCHARS);
951 enc->cur +=
952 SvIsUV(sv)
953 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
954 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
955 }
680 } 956 }
681 else if (SvROK (sv)) 957 else if (SvROK (sv))
682 encode_rv (enc, SvRV (sv)); 958 encode_rv (enc, SvRV (sv));
683 else if (!SvOK (sv)) 959 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
684 encode_str (enc, "null", 4, 0); 960 encode_str (enc, "null", 4, 0);
685 else 961 else
686 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 962 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
687 SvPV_nolen (sv), SvFLAGS (sv)); 963 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
688} 964}
689 965
690static SV * 966static SV *
691encode_json (SV *scalar, JSON *json) 967encode_json (SV *scalar, JSON *json)
692{ 968{
693 enc_t enc; 969 enc_t enc;
694 970
695 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 971 if (!(json->flags & F_ALLOW_NONREF) && json_nonref (scalar))
696 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 972 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
697 973
698 enc.json = *json; 974 enc.json = *json;
699 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 975 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
700 enc.cur = SvPVX (enc.sv); 976 enc.cur = SvPVX (enc.sv);
701 enc.end = SvEND (enc.sv); 977 enc.end = SvEND (enc.sv);
702 enc.indent = 0; 978 enc.indent = 0;
703 enc.maxdepth = DEC_DEPTH (enc.json.flags);
704 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL 979 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
705 : enc.json.flags & F_LATIN1 ? 0x000100UL 980 : enc.json.flags & F_LATIN1 ? 0x000100UL
706 : 0x10FFFFUL; 981 : 0x110000UL;
707 982
708 SvPOK_only (enc.sv); 983 SvPOK_only (enc.sv);
709 encode_sv (&enc, scalar); 984 encode_sv (&enc, scalar);
985 encode_nl (&enc);
710 986
711 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 987 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
712 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 988 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
713 989
714 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 990 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
762 else 1038 else
763 break; 1039 break;
764 } 1040 }
765 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09) 1041 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
766 break; // parse error, but let higher level handle it, gives better error messages 1042 break; // parse error, but let higher level handle it, gives better error messages
767 1043 else
768 ++dec->cur; 1044 ++dec->cur;
769 } 1045 }
770} 1046}
771 1047
772#define ERR(reason) SB dec->err = reason; goto fail; SE 1048#define ERR(reason) SB dec->err = reason; goto fail; SE
773 1049
… …
775 if (*dec->cur != ch) \ 1051 if (*dec->cur != ch) \
776 ERR (# ch " expected"); \ 1052 ERR (# ch " expected"); \
777 ++dec->cur; \ 1053 ++dec->cur; \
778 SE 1054 SE
779 1055
780#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 1056#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
781#define DEC_DEC_DEPTH --dec->depth 1057#define DEC_DEC_DEPTH --dec->depth
782 1058
783static SV *decode_sv (dec_t *dec); 1059static SV *decode_sv (dec_t *dec);
784 1060
785static signed char decode_hexdigit[256]; 1061static signed char decode_hexdigit[256];
… …
889 default: 1165 default:
890 --dec_cur; 1166 --dec_cur;
891 ERR ("illegal backslash escape sequence in string"); 1167 ERR ("illegal backslash escape sequence in string");
892 } 1168 }
893 } 1169 }
894 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1170 else if (expect_true (ch >= 0x20 && ch < 0x80))
895 *cur++ = ch; 1171 *cur++ = ch;
896 else if (ch >= 0x80) 1172 else if (ch >= 0x80)
897 { 1173 {
898 STRLEN clen; 1174 STRLEN clen;
899 UV uch;
900 1175
901 --dec_cur; 1176 --dec_cur;
902 1177
903 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1178 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
904 if (clen == (STRLEN)-1) 1179 if (clen == (STRLEN)-1)
905 ERR ("malformed UTF-8 character in JSON string"); 1180 ERR ("malformed UTF-8 character in JSON string");
906 1181
907 do 1182 do
908 *cur++ = *dec_cur++; 1183 *cur++ = *dec_cur++;
909 while (--clen); 1184 while (--clen);
910 1185
911 utf8 = 1; 1186 utf8 = 1;
912 } 1187 }
1188 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1189 *cur++ = ch;
913 else 1190 else
914 { 1191 {
915 --dec_cur; 1192 --dec_cur;
916 1193
917 if (!ch) 1194 if (!ch)
… …
925 { 1202 {
926 STRLEN len = cur - buf; 1203 STRLEN len = cur - buf;
927 1204
928 if (sv) 1205 if (sv)
929 { 1206 {
930 SvGROW (sv, SvCUR (sv) + len + 1); 1207 STRLEN cur = SvCUR (sv);
1208
1209 if (SvLEN (sv) - cur <= len)
1210 json_sv_grow (sv, cur, len);
1211
931 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1212 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
932 SvCUR_set (sv, SvCUR (sv) + len); 1213 SvCUR_set (sv, SvCUR (sv) + len);
933 } 1214 }
934 else 1215 else
935 sv = newSVpvn (buf, len); 1216 sv = newSVpvn (buf, len);
… …
1026 1307
1027 // special case the rather common 1..5-digit-int case 1308 // special case the rather common 1..5-digit-int case
1028 if (*start == '-') 1309 if (*start == '-')
1029 switch (len) 1310 switch (len)
1030 { 1311 {
1031 case 2: return newSViv (-( start [1] - '0' * 1)); 1312 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1032 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1313 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1033 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1314 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
1034 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1315 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1035 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1316 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1036 } 1317 }
1037 else 1318 else
1038 switch (len) 1319 switch (len)
1039 { 1320 {
1040 case 1: return newSViv ( start [0] - '0' * 1); 1321 case 1: return newSViv ( start [0] - '0' * 1);
1041 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1322 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1042 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1323 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
1043 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1324 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1044 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1325 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1045 } 1326 }
1046 1327
1047 { 1328 {
1048 UV uv; 1329 UV uv;
1049 int numtype = grok_number (start, len, &uv); 1330 int numtype = grok_number (start, len, &uv);
… …
1058 } 1339 }
1059 1340
1060 len -= *start == '-' ? 1 : 0; 1341 len -= *start == '-' ? 1 : 0;
1061 1342
1062 // does not fit into IV or UV, try NV 1343 // does not fit into IV or UV, try NV
1063 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1344 if (len <= NV_DIG)
1064 #if defined (LDBL_DIG)
1065 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1066 #endif
1067 )
1068 // fits into NV without loss of precision 1345 // fits into NV without loss of precision
1069 return newSVnv (Atof (start)); 1346 return newSVnv (json_atof (start));
1070 1347
1071 // everything else fails, convert it to a string 1348 // everything else fails, convert it to a string
1072 return newSVpvn (start, dec->cur - start); 1349 return newSVpvn (start, dec->cur - start);
1073 } 1350 }
1074 1351
1075 // loss of precision here 1352 // loss of precision here
1076 return newSVnv (Atof (start)); 1353 return newSVnv (json_atof (start));
1077 1354
1078fail: 1355fail:
1079 return 0; 1356 return 0;
1080} 1357}
1081 1358
… …
1105 if (*dec->cur == ']') 1382 if (*dec->cur == ']')
1106 { 1383 {
1107 ++dec->cur; 1384 ++dec->cur;
1108 break; 1385 break;
1109 } 1386 }
1110 1387
1111 if (*dec->cur != ',') 1388 if (*dec->cur != ',')
1112 ERR (", or ] expected while parsing array"); 1389 ERR (", or ] expected while parsing array");
1113 1390
1114 ++dec->cur; 1391 ++dec->cur;
1115 1392
… …
1157 char *p = dec->cur; 1434 char *p = dec->cur;
1158 char *e = p + 24; // only try up to 24 bytes 1435 char *e = p + 24; // only try up to 24 bytes
1159 1436
1160 for (;;) 1437 for (;;)
1161 { 1438 {
1162 // the >= 0x80 is true on most architectures 1439 // the >= 0x80 is false on most architectures
1163 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1440 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1164 { 1441 {
1165 // slow path, back up and use decode_str 1442 // slow path, back up and use decode_str
1166 SV *key = decode_str (dec); 1443 SV *key = decode_str (dec);
1167 if (!key) 1444 if (!key)
… …
1229 1506
1230 DEC_DEC_DEPTH; 1507 DEC_DEC_DEPTH;
1231 sv = newRV_noinc ((SV *)hv); 1508 sv = newRV_noinc ((SV *)hv);
1232 1509
1233 // check filter callbacks 1510 // check filter callbacks
1234 if (dec->json.flags & F_HOOK) 1511 if (expect_false (dec->json.flags & F_HOOK))
1235 { 1512 {
1236 if (dec->json.cb_sk_object && HvKEYS (hv) == 1) 1513 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1237 { 1514 {
1238 HE *cb, *he; 1515 HE *cb, *he;
1239 1516
1240 hv_iterinit (hv); 1517 hv_iterinit (hv);
1241 he = hv_iternext (hv); 1518 he = hv_iternext (hv);
1242 hv_iterinit (hv); 1519 hv_iterinit (hv);
1243 1520
1244 // the next line creates a mortal sv each time its called. 1521 // the next line creates a mortal sv each time it's called.
1245 // might want to optimise this for common cases. 1522 // might want to optimise this for common cases.
1246 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0); 1523 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1247 1524
1248 if (cb) 1525 if (cb)
1249 { 1526 {
1250 dSP; 1527 dSP;
1251 int count; 1528 int count;
1252 1529
1253 ENTER; SAVETMPS; PUSHMARK (SP); 1530 ENTER; SAVETMPS;
1531 PUSHMARK (SP);
1254 XPUSHs (HeVAL (he)); 1532 XPUSHs (HeVAL (he));
1533 sv_2mortal (sv);
1255 1534
1256 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1535 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1257 1536
1258 if (count == 1) 1537 if (count == 1)
1259 { 1538 {
1260 sv = newSVsv (POPs); 1539 sv = newSVsv (POPs);
1540 PUTBACK;
1261 FREETMPS; LEAVE; 1541 FREETMPS; LEAVE;
1262 return sv; 1542 return sv;
1263 } 1543 }
1544 else if (count)
1545 croak ("filter_json_single_key_object callbacks must not return more than one scalar");
1546
1547 PUTBACK;
1548
1549 SvREFCNT_inc (sv);
1264 1550
1265 FREETMPS; LEAVE; 1551 FREETMPS; LEAVE;
1266 } 1552 }
1267 } 1553 }
1268 1554
1269 if (dec->json.cb_object) 1555 if (dec->json.cb_object)
1270 { 1556 {
1271 dSP; 1557 dSP;
1272 int count; 1558 int count;
1273 1559
1274 ENTER; SAVETMPS; PUSHMARK (SP); 1560 ENTER; SAVETMPS;
1561 PUSHMARK (SP);
1275 XPUSHs (sv_2mortal (sv)); 1562 XPUSHs (sv_2mortal (sv));
1276 1563
1277 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1564 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1278 1565
1279 if (count == 1) 1566 if (count == 1)
1280 {
1281 sv = newSVsv (POPs); 1567 sv = newSVsv (POPs);
1282 FREETMPS; LEAVE; 1568 else if (count == 0)
1283 return sv;
1284 }
1285
1286 SvREFCNT_inc (sv); 1569 SvREFCNT_inc (sv);
1570 else
1571 croak ("filter_json_object callbacks must not return more than one scalar");
1572
1573 PUTBACK;
1574
1287 FREETMPS; LEAVE; 1575 FREETMPS; LEAVE;
1288 } 1576 }
1289 } 1577 }
1290 1578
1291 return sv; 1579 return sv;
… …
1295 DEC_DEC_DEPTH; 1583 DEC_DEC_DEPTH;
1296 return 0; 1584 return 0;
1297} 1585}
1298 1586
1299static SV * 1587static SV *
1588decode_tag (dec_t *dec)
1589{
1590 SV *tag = 0;
1591 SV *val = 0;
1592
1593 if (!(dec->json.flags & F_ALLOW_TAGS))
1594 ERR ("malformed JSON string, neither array, object, number, string or atom");
1595
1596 ++dec->cur;
1597
1598 decode_ws (dec);
1599
1600 tag = decode_sv (dec);
1601 if (!tag)
1602 goto fail;
1603
1604 if (!SvPOK (tag))
1605 ERR ("malformed JSON string, (tag) must be a string");
1606
1607 decode_ws (dec);
1608
1609 if (*dec->cur != ')')
1610 ERR (") expected after tag");
1611
1612 ++dec->cur;
1613
1614 decode_ws (dec);
1615
1616 val = decode_sv (dec);
1617 if (!val)
1618 goto fail;
1619
1620 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1621 ERR ("malformed JSON string, tag value must be an array");
1622
1623 {
1624 AV *av = (AV *)SvRV (val);
1625 int i, len = av_len (av) + 1;
1626 HV *stash = gv_stashsv (tag, 0);
1627 SV *sv;
1628
1629 if (!stash)
1630 ERR ("cannot decode perl-object (package does not exist)");
1631
1632 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1633
1634 if (!method)
1635 ERR ("cannot decode perl-object (package does not have a THAW method)");
1636
1637 dSP;
1638
1639 ENTER; SAVETMPS;
1640 PUSHMARK (SP);
1641 EXTEND (SP, len + 2);
1642 // we re-bless the reference to get overload and other niceties right
1643 PUSHs (tag);
1644 PUSHs (sv_json);
1645
1646 for (i = 0; i < len; ++i)
1647 PUSHs (*av_fetch (av, i, 1));
1648
1649 PUTBACK;
1650 call_sv ((SV *)GvCV (method), G_SCALAR);
1651 SPAGAIN;
1652
1653 SvREFCNT_dec (tag);
1654 SvREFCNT_dec (val);
1655 sv = SvREFCNT_inc (POPs);
1656
1657 PUTBACK;
1658
1659 FREETMPS; LEAVE;
1660
1661 return sv;
1662 }
1663
1664fail:
1665 SvREFCNT_dec (tag);
1666 SvREFCNT_dec (val);
1667 return 0;
1668}
1669
1670static SV *
1300decode_sv (dec_t *dec) 1671decode_sv (dec_t *dec)
1301{ 1672{
1302 // the beauty of JSON: you need exactly one character lookahead 1673 // the beauty of JSON: you need exactly one character lookahead
1303 // to parse anything. 1674 // to parse everything.
1304 switch (*dec->cur) 1675 switch (*dec->cur)
1305 { 1676 {
1306 case '"': ++dec->cur; return decode_str (dec); 1677 case '"': ++dec->cur; return decode_str (dec);
1307 case '[': ++dec->cur; return decode_av (dec); 1678 case '[': ++dec->cur; return decode_av (dec);
1308 case '{': ++dec->cur; return decode_hv (dec); 1679 case '{': ++dec->cur; return decode_hv (dec);
1680 case '(': return decode_tag (dec);
1309 1681
1310 case '-': 1682 case '-':
1311 case '0': case '1': case '2': case '3': case '4': 1683 case '0': case '1': case '2': case '3': case '4':
1312 case '5': case '6': case '7': case '8': case '9': 1684 case '5': case '6': case '7': case '8': case '9':
1313 return decode_num (dec); 1685 return decode_num (dec);
1314 1686
1687 case 'f':
1688 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1689 {
1690 dec->cur += 5;
1691
1692 if (expect_false (!dec->json.v_false))
1693 dec->json.v_false = GET_BOOL (false);
1694
1695 return newSVsv (dec->json.v_false);
1696 }
1697 else
1698 ERR ("'false' expected");
1699
1700 break;
1701
1315 case 't': 1702 case 't':
1316 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1703 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1317 { 1704 {
1318 dec->cur += 4; 1705 dec->cur += 4;
1319#if JSON_SLOW 1706
1320 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1707 if (expect_false (!dec->json.v_true))
1321#endif 1708 dec->json.v_true = GET_BOOL (true);
1322 return SvREFCNT_inc (json_true); 1709
1710 return newSVsv (dec->json.v_true);
1323 } 1711 }
1324 else 1712 else
1325 ERR ("'true' expected"); 1713 ERR ("'true' expected");
1326
1327 break;
1328
1329 case 'f':
1330 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1331 {
1332 dec->cur += 5;
1333#if JSON_SLOW
1334 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1335#endif
1336 return SvREFCNT_inc (json_false);
1337 }
1338 else
1339 ERR ("'false' expected");
1340 1714
1341 break; 1715 break;
1342 1716
1343 case 'n': 1717 case 'n':
1344 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) 1718 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
… …
1350 ERR ("'null' expected"); 1724 ERR ("'null' expected");
1351 1725
1352 break; 1726 break;
1353 1727
1354 default: 1728 default:
1355 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1729 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1356 break; 1730 break;
1357 } 1731 }
1358 1732
1359fail: 1733fail:
1360 return 0; 1734 return 0;
1361} 1735}
1362 1736
1363static SV * 1737static SV *
1364decode_json (SV *string, JSON *json, UV *offset_return) 1738decode_json (SV *string, JSON *json, STRLEN *offset_return)
1365{ 1739{
1366 dec_t dec; 1740 dec_t dec;
1367 UV offset;
1368 SV *sv; 1741 SV *sv;
1369 1742
1743 /* work around bugs in 5.10 where manipulating magic values
1744 * makes perl ignore the magic in subsequent accesses.
1745 * also make a copy of non-PV values, to get them into a clean
1746 * state (SvPV should do that, but it's buggy, see below).
1747 *
1748 * SvIsCOW_shared_hash works around a bug in perl (possibly 5.16),
1749 * as reported by Reini Urban.
1750 */
1370 SvGETMAGIC (string); 1751 /*SvGETMAGIC (string);*/
1752 if (SvMAGICAL (string) || !SvPOK (string) || SvIsCOW_shared_hash (string))
1753 string = sv_2mortal (newSVsv (string));
1754
1371 SvUPGRADE (string, SVt_PV); 1755 SvUPGRADE (string, SVt_PV);
1372 1756
1373 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1757 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1758 * assertion with -DDEBUGGING, although SvCUR is documented to
1759 * return the xpv_cur field which certainly exists after upgrading.
1760 * according to nicholas clark, calling SvPOK fixes this.
1761 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1762 * and hope for the best.
1763 * Damnit, SvPV_nolen still trips over yet another assertion. This
1764 * assertion business is seriously broken, try yet another workaround
1765 * for the broken -DDEBUGGING.
1766 */
1767 {
1768#ifdef DEBUGGING
1769 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1770#else
1771 STRLEN offset = SvCUR (string);
1772#endif
1773
1774 if (offset > json->max_size && json->max_size)
1374 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1775 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1375 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1776 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1777 }
1376 1778
1377 if (json->flags & F_UTF8) 1779 if (DECODE_WANTS_OCTETS (json))
1378 sv_utf8_downgrade (string, 0); 1780 sv_utf8_downgrade (string, 0);
1379 else 1781 else
1380 sv_utf8_upgrade (string); 1782 sv_utf8_upgrade (string);
1381 1783
1382 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1784 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1383 1785
1384 dec.json = *json; 1786 dec.json = *json;
1385 dec.cur = SvPVX (string); 1787 dec.cur = SvPVX (string);
1386 dec.end = SvEND (string); 1788 dec.end = SvEND (string);
1387 dec.err = 0; 1789 dec.err = 0;
1388 dec.depth = 0; 1790 dec.depth = 0;
1389 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1390 1791
1391 if (dec.json.cb_object || dec.json.cb_sk_object) 1792 if (dec.json.cb_object || dec.json.cb_sk_object)
1392 dec.json.flags |= F_HOOK; 1793 dec.json.flags |= F_HOOK;
1393 1794
1394 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1795 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1395 1796
1396 decode_ws (&dec); 1797 decode_ws (&dec);
1397 sv = decode_sv (&dec); 1798 sv = decode_sv (&dec);
1398 1799
1399 if (!(offset_return || !sv)) 1800 if (offset_return)
1801 *offset_return = dec.cur - SvPVX (string);
1802 else if (sv)
1400 { 1803 {
1401 // check for trailing garbage 1804 // check for trailing garbage
1402 decode_ws (&dec); 1805 decode_ws (&dec);
1403 1806
1404 if (*dec.cur) 1807 if (dec.cur != dec.end)
1405 { 1808 {
1406 dec.err = "garbage after JSON object"; 1809 dec.err = "garbage after JSON object";
1407 SvREFCNT_dec (sv); 1810 SvREFCNT_dec (sv);
1408 sv = 0; 1811 sv = 0;
1409 } 1812 }
1410 }
1411
1412 if (offset_return || !sv)
1413 {
1414 offset = dec.json.flags & F_UTF8
1415 ? dec.cur - SvPVX (string)
1416 : utf8_distance (dec.cur, SvPVX (string));
1417
1418 if (offset_return)
1419 *offset_return = offset;
1420 } 1813 }
1421 1814
1422 if (!sv) 1815 if (!sv)
1423 { 1816 {
1424 SV *uni = sv_newmortal (); 1817 SV *uni = sv_newmortal ();
… …
1430 SAVEVPTR (PL_curcop); 1823 SAVEVPTR (PL_curcop);
1431 PL_curcop = &cop; 1824 PL_curcop = &cop;
1432 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1825 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1433 LEAVE; 1826 LEAVE;
1434 1827
1435 croak ("%s, at character offset %d [\"%s\"]", 1828 croak ("%s, at character offset %d (before \"%s\")",
1436 dec.err, 1829 dec.err,
1437 (int)offset, 1830 (int)ptr_to_index (string, dec.cur),
1438 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1831 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1439 } 1832 }
1440 1833
1441 sv = sv_2mortal (sv); 1834 sv = sv_2mortal (sv);
1442 1835
1443 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1836 if (!(dec.json.flags & F_ALLOW_NONREF) && json_nonref (sv))
1444 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1837 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1445 1838
1446 return sv; 1839 return sv;
1840}
1841
1842/////////////////////////////////////////////////////////////////////////////
1843// incremental parser
1844
1845static void
1846incr_parse (JSON *self)
1847{
1848 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1849
1850 // the state machine here is a bit convoluted and could be simplified a lot
1851 // but this would make it slower, so...
1852
1853 for (;;)
1854 {
1855 switch (self->incr_mode)
1856 {
1857 // reached end of a scalar, see if we are inside a nested structure or not
1858 end_of_scalar:
1859 self->incr_mode = INCR_M_JSON;
1860
1861 if (self->incr_nest) // end of a scalar inside array, object or tag
1862 goto incr_m_json;
1863 else // end of scalar outside structure, json text ends here
1864 goto interrupt;
1865
1866 // only used for initial whitespace skipping
1867 case INCR_M_WS:
1868 for (;;)
1869 {
1870 if (*p > 0x20)
1871 {
1872 if (*p == '#')
1873 {
1874 self->incr_mode = INCR_M_C0;
1875 goto incr_m_c;
1876 }
1877 else
1878 {
1879 self->incr_mode = INCR_M_JSON;
1880 goto incr_m_json;
1881 }
1882 }
1883 else if (!*p)
1884 goto interrupt;
1885
1886 ++p;
1887 }
1888
1889 // skip a single char inside a string (for \\-processing)
1890 case INCR_M_BS:
1891 if (!*p)
1892 goto interrupt;
1893
1894 ++p;
1895 self->incr_mode = INCR_M_STR;
1896 goto incr_m_str;
1897
1898 // inside #-style comments
1899 case INCR_M_C0:
1900 case INCR_M_C1:
1901 incr_m_c:
1902 for (;;)
1903 {
1904 if (*p == '\n')
1905 {
1906 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1907 break;
1908 }
1909 else if (!*p)
1910 goto interrupt;
1911
1912 ++p;
1913 }
1914
1915 break;
1916
1917 // inside true/false/null
1918 case INCR_M_TFN:
1919 incr_m_tfn:
1920 for (;;)
1921 switch (*p++)
1922 {
1923 case 'r': case 'u': case 'e': // tRUE, falsE, nUll
1924 case 'a': case 'l': case 's': // fALSe, nuLL
1925 // allowed
1926 break;
1927
1928 default:
1929 --p;
1930 goto end_of_scalar;
1931 }
1932
1933 // inside a number
1934 case INCR_M_NUM:
1935 incr_m_num:
1936 for (;;)
1937 switch (*p++)
1938 {
1939 case 'e': case 'E': case '.': case '+':
1940 case '-':
1941 case '0': case '1': case '2': case '3': case '4':
1942 case '5': case '6': case '7': case '8': case '9':
1943 // allowed
1944 break;
1945
1946 default:
1947 --p;
1948 goto end_of_scalar;
1949 }
1950
1951 // inside a string
1952 case INCR_M_STR:
1953 incr_m_str:
1954 for (;;)
1955 {
1956 if (*p == '"')
1957 {
1958 ++p;
1959 goto end_of_scalar;
1960 }
1961 else if (*p == '\\')
1962 {
1963 ++p; // "virtually" consumes character after \
1964
1965 if (!*p) // if at end of string we have to switch modes
1966 {
1967 self->incr_mode = INCR_M_BS;
1968 goto interrupt;
1969 }
1970 }
1971 else if (!*p)
1972 goto interrupt;
1973
1974 ++p;
1975 }
1976
1977 // after initial ws, outside string
1978 case INCR_M_JSON:
1979 incr_m_json:
1980 for (;;)
1981 {
1982 switch (*p++)
1983 {
1984 case 0:
1985 --p;
1986 goto interrupt;
1987
1988 case 0x09:
1989 case 0x0a:
1990 case 0x0d:
1991 case 0x20:
1992 if (!self->incr_nest)
1993 {
1994 --p; // do not eat the whitespace, let the next round do it
1995 goto interrupt;
1996 }
1997 break;
1998
1999 // the following three blocks handle scalars. this makes the parser
2000 // more strict than required inside arrays or objects, and could
2001 // be moved to a special case on the toplevel (except strings)
2002 case 't':
2003 case 'f':
2004 case 'n':
2005 self->incr_mode = INCR_M_TFN;
2006 goto incr_m_tfn;
2007
2008 case '-':
2009 case '0': case '1': case '2': case '3': case '4':
2010 case '5': case '6': case '7': case '8': case '9':
2011 self->incr_mode = INCR_M_NUM;
2012 goto incr_m_num;
2013
2014 case '"':
2015 self->incr_mode = INCR_M_STR;
2016 goto incr_m_str;
2017
2018 case '[':
2019 case '{':
2020 case '(':
2021 if (++self->incr_nest > self->max_depth)
2022 croak (ERR_NESTING_EXCEEDED);
2023 break;
2024
2025 case ']':
2026 case '}':
2027 if (--self->incr_nest <= 0)
2028 goto interrupt;
2029 break;
2030
2031 case ')':
2032 --self->incr_nest;
2033 break;
2034
2035 case '#':
2036 self->incr_mode = INCR_M_C1;
2037 goto incr_m_c;
2038 }
2039 }
2040 }
2041
2042 modechange:
2043 ;
2044 }
2045
2046interrupt:
2047 self->incr_pos = p - SvPVX (self->incr_text);
2048 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
2049 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1447} 2050}
1448 2051
1449///////////////////////////////////////////////////////////////////////////// 2052/////////////////////////////////////////////////////////////////////////////
1450// XS interface functions 2053// XS interface functions
1451 2054
… …
1460 i >= '0' && i <= '9' ? i - '0' 2063 i >= '0' && i <= '9' ? i - '0'
1461 : i >= 'a' && i <= 'f' ? i - 'a' + 10 2064 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1462 : i >= 'A' && i <= 'F' ? i - 'A' + 10 2065 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1463 : -1; 2066 : -1;
1464 2067
1465 json_stash = gv_stashpv ("JSON::XS" , 1); 2068 json_stash = gv_stashpv ("JSON::XS" , 1);
1466 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 2069 bool_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
2070 bool_false = get_bool ("Types::Serialiser::false");
2071 bool_true = get_bool ("Types::Serialiser::true");
1467 2072
1468 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 2073 sv_json = newSVpv ("JSON", 0);
1469 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 2074 SvREADONLY_on (sv_json);
2075
2076 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1470} 2077}
1471 2078
1472PROTOTYPES: DISABLE 2079PROTOTYPES: DISABLE
1473 2080
1474void CLONE (...) 2081void CLONE (...)
1475 CODE: 2082 CODE:
2083 // as long as these writes are atomic, the race should not matter
2084 // as existing threads either already use 0, or use the old value,
2085 // which is sitll correct for the initial thread.
1476 json_stash = 0; 2086 json_stash = 0;
1477 json_boolean_stash = 0; 2087 bool_stash = 0;
2088 bool_false = 0;
2089 bool_true = 0;
1478 2090
1479void new (char *klass) 2091void new (char *klass)
1480 PPCODE: 2092 PPCODE:
1481{ 2093{
1482 SV *pv = NEWSV (0, sizeof (JSON)); 2094 SV *pv = NEWSV (0, sizeof (JSON));
1483 SvPOK_only (pv); 2095 SvPOK_only (pv);
1484 Zero (SvPVX (pv), 1, JSON); 2096 json_init ((JSON *)SvPVX (pv));
1485 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1486 XPUSHs (sv_2mortal (sv_bless ( 2097 XPUSHs (sv_2mortal (sv_bless (
1487 newRV_noinc (pv), 2098 newRV_noinc (pv),
1488 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 2099 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1489 ))); 2100 )));
1490} 2101}
2102
2103void boolean_values (JSON *self, SV *v_false = 0, SV *v_true = 0)
2104 PPCODE:
2105 self->v_false = newSVsv (v_false);
2106 self->v_true = newSVsv (v_true);
2107 XPUSHs (ST (0));
2108
2109void get_boolean_values (JSON *self)
2110 PPCODE:
2111 if (self->v_false && self->v_true)
2112 {
2113 EXTEND (SP, 2);
2114 PUSHs (self->v_false);
2115 PUSHs (self->v_true);
2116 }
1491 2117
1492void ascii (JSON *self, int enable = 1) 2118void ascii (JSON *self, int enable = 1)
1493 ALIAS: 2119 ALIAS:
1494 ascii = F_ASCII 2120 ascii = F_ASCII
1495 latin1 = F_LATIN1 2121 latin1 = F_LATIN1
… …
1502 allow_nonref = F_ALLOW_NONREF 2128 allow_nonref = F_ALLOW_NONREF
1503 shrink = F_SHRINK 2129 shrink = F_SHRINK
1504 allow_blessed = F_ALLOW_BLESSED 2130 allow_blessed = F_ALLOW_BLESSED
1505 convert_blessed = F_CONV_BLESSED 2131 convert_blessed = F_CONV_BLESSED
1506 relaxed = F_RELAXED 2132 relaxed = F_RELAXED
2133 allow_unknown = F_ALLOW_UNKNOWN
2134 allow_tags = F_ALLOW_TAGS
1507 PPCODE: 2135 PPCODE:
1508{ 2136{
1509 if (enable) 2137 if (enable)
1510 self->flags |= ix; 2138 self->flags |= ix;
1511 else 2139 else
… …
1526 get_allow_nonref = F_ALLOW_NONREF 2154 get_allow_nonref = F_ALLOW_NONREF
1527 get_shrink = F_SHRINK 2155 get_shrink = F_SHRINK
1528 get_allow_blessed = F_ALLOW_BLESSED 2156 get_allow_blessed = F_ALLOW_BLESSED
1529 get_convert_blessed = F_CONV_BLESSED 2157 get_convert_blessed = F_CONV_BLESSED
1530 get_relaxed = F_RELAXED 2158 get_relaxed = F_RELAXED
2159 get_allow_unknown = F_ALLOW_UNKNOWN
2160 get_allow_tags = F_ALLOW_TAGS
1531 PPCODE: 2161 PPCODE:
1532 XPUSHs (boolSV (self->flags & ix)); 2162 XPUSHs (boolSV (self->flags & ix));
1533 2163
1534void max_depth (JSON *self, UV max_depth = 0x80000000UL) 2164void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1535 PPCODE: 2165 PPCODE:
1536{ 2166 self->max_depth = max_depth;
1537 UV log2 = 0;
1538
1539 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1540
1541 while ((1UL << log2) < max_depth)
1542 ++log2;
1543
1544 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1545
1546 XPUSHs (ST (0)); 2167 XPUSHs (ST (0));
1547}
1548 2168
1549U32 get_max_depth (JSON *self) 2169U32 get_max_depth (JSON *self)
1550 CODE: 2170 CODE:
1551 RETVAL = DEC_DEPTH (self->flags); 2171 RETVAL = self->max_depth;
1552 OUTPUT: 2172 OUTPUT:
1553 RETVAL 2173 RETVAL
1554 2174
1555void max_size (JSON *self, UV max_size = 0) 2175void max_size (JSON *self, U32 max_size = 0)
1556 PPCODE: 2176 PPCODE:
1557{ 2177 self->max_size = max_size;
1558 UV log2 = 0;
1559
1560 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1561 if (max_size == 1) max_size = 2;
1562
1563 while ((1UL << log2) < max_size)
1564 ++log2;
1565
1566 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1567
1568 XPUSHs (ST (0)); 2178 XPUSHs (ST (0));
1569}
1570 2179
1571int get_max_size (JSON *self) 2180int get_max_size (JSON *self)
1572 CODE: 2181 CODE:
1573 RETVAL = DEC_SIZE (self->flags); 2182 RETVAL = self->max_size;
1574 OUTPUT: 2183 OUTPUT:
1575 RETVAL 2184 RETVAL
1576 2185
1577void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2186void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1578 PPCODE: 2187 PPCODE:
… …
1584} 2193}
1585 2194
1586void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2195void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1587 PPCODE: 2196 PPCODE:
1588{ 2197{
1589 if (!self->cb_sk_object) 2198 if (!self->cb_sk_object)
1590 self->cb_sk_object = newHV (); 2199 self->cb_sk_object = newHV ();
1591 2200
1592 if (SvOK (cb)) 2201 if (SvOK (cb))
1593 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2202 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1594 else 2203 else
… …
1605 XPUSHs (ST (0)); 2214 XPUSHs (ST (0));
1606} 2215}
1607 2216
1608void encode (JSON *self, SV *scalar) 2217void encode (JSON *self, SV *scalar)
1609 PPCODE: 2218 PPCODE:
1610 XPUSHs (encode_json (scalar, self)); 2219 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2220 XPUSHs (scalar);
1611 2221
1612void decode (JSON *self, SV *jsonstr) 2222void decode (JSON *self, SV *jsonstr)
1613 PPCODE: 2223 PPCODE:
1614 XPUSHs (decode_json (jsonstr, self, 0)); 2224 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2225 XPUSHs (jsonstr);
1615 2226
1616void decode_prefix (JSON *self, SV *jsonstr) 2227void decode_prefix (JSON *self, SV *jsonstr)
1617 PPCODE: 2228 PPCODE:
1618{ 2229{
1619 UV offset; 2230 SV *sv;
2231 STRLEN offset;
2232 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1620 EXTEND (SP, 2); 2233 EXTEND (SP, 2);
1621 PUSHs (decode_json (jsonstr, self, &offset)); 2234 PUSHs (sv);
1622 PUSHs (sv_2mortal (newSVuv (offset))); 2235 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
2236}
2237
2238void incr_parse (JSON *self, SV *jsonstr = 0)
2239 PPCODE:
2240{
2241 if (!self->incr_text)
2242 self->incr_text = newSVpvn ("", 0);
2243
2244 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2245 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2246 if (DECODE_WANTS_OCTETS (self))
2247 {
2248 if (self->incr_pos)
2249 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2250 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2251
2252 sv_utf8_downgrade (self->incr_text, 0);
2253 }
2254 else
2255 {
2256 sv_utf8_upgrade (self->incr_text);
2257
2258 if (self->incr_pos)
2259 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2260 - (U8 *)SvPVX (self->incr_text);
2261 }
2262
2263 // append data, if any
2264 if (jsonstr)
2265 {
2266 /* make sure both strings have same encoding */
2267 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2268 if (SvUTF8 (jsonstr))
2269 sv_utf8_downgrade (jsonstr, 0);
2270 else
2271 sv_utf8_upgrade (jsonstr);
2272
2273 /* and then just blindly append */
2274 {
2275 STRLEN len;
2276 const char *str = SvPV (jsonstr, len);
2277 STRLEN cur = SvCUR (self->incr_text);
2278
2279 if (SvLEN (self->incr_text) - cur <= len)
2280 json_sv_grow (self->incr_text, cur, len);
2281
2282 Move (str, SvEND (self->incr_text), len, char);
2283 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2284 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2285 }
2286 }
2287
2288 if (GIMME_V != G_VOID)
2289 do
2290 {
2291 SV *sv;
2292 STRLEN offset;
2293
2294 if (!INCR_DONE (self))
2295 {
2296 incr_parse (self);
2297
2298 if (self->incr_pos > self->max_size && self->max_size)
2299 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2300 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2301
2302 if (!INCR_DONE (self))
2303 {
2304 // as an optimisation, do not accumulate white space in the incr buffer
2305 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2306 {
2307 self->incr_pos = 0;
2308 SvCUR_set (self->incr_text, 0);
2309 }
2310
2311 break;
2312 }
2313 }
2314
2315 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2316 XPUSHs (sv);
2317
2318 self->incr_pos -= offset;
2319 self->incr_nest = 0;
2320 self->incr_mode = 0;
2321
2322 sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
2323 }
2324 while (GIMME_V == G_ARRAY);
2325}
2326
2327SV *incr_text (JSON *self)
2328 ATTRS: lvalue
2329 CODE:
2330{
2331 if (self->incr_pos)
2332 croak ("incr_text can not be called when the incremental parser already started parsing");
2333
2334 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2335}
2336 OUTPUT:
2337 RETVAL
2338
2339void incr_skip (JSON *self)
2340 CODE:
2341{
2342 if (self->incr_pos)
2343 {
2344 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2345 self->incr_pos = 0;
2346 self->incr_nest = 0;
2347 self->incr_mode = 0;
2348 }
2349}
2350
2351void incr_reset (JSON *self)
2352 CODE:
2353{
2354 SvREFCNT_dec (self->incr_text);
2355 self->incr_text = 0;
2356 self->incr_pos = 0;
2357 self->incr_nest = 0;
2358 self->incr_mode = 0;
1623} 2359}
1624 2360
1625void DESTROY (JSON *self) 2361void DESTROY (JSON *self)
1626 CODE: 2362 CODE:
2363 SvREFCNT_dec (self->v_false);
2364 SvREFCNT_dec (self->v_true);
1627 SvREFCNT_dec (self->cb_sk_object); 2365 SvREFCNT_dec (self->cb_sk_object);
1628 SvREFCNT_dec (self->cb_object); 2366 SvREFCNT_dec (self->cb_object);
2367 SvREFCNT_dec (self->incr_text);
1629 2368
1630PROTOTYPES: ENABLE 2369PROTOTYPES: ENABLE
1631 2370
1632void encode_json (SV *scalar) 2371void encode_json (SV *scalar)
1633 PPCODE: 2372 PPCODE:
1634{ 2373{
1635 JSON json = { F_DEFAULT | F_UTF8 }; 2374 JSON json;
1636 XPUSHs (encode_json (scalar, &json)); 2375 json_init (&json);
2376 json.flags |= F_UTF8;
2377 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2378 XPUSHs (scalar);
1637} 2379}
1638 2380
1639void decode_json (SV *jsonstr) 2381void decode_json (SV *jsonstr)
1640 PPCODE: 2382 PPCODE:
1641{ 2383{
1642 JSON json = { F_DEFAULT | F_UTF8 }; 2384 JSON json;
1643 XPUSHs (decode_json (jsonstr, &json, 0)); 2385 json_init (&json);
2386 json.flags |= F_UTF8;
2387 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2388 XPUSHs (jsonstr);
1644} 2389}
1645 2390

Diff Legend

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