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.52 by root, Mon Jul 2 02:57:11 2007 UTC vs.
Revision 1.137 by root, Sun Feb 24 04:21:05 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines