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.58 by root, Mon Aug 13 16:06:25 2007 UTC vs.
Revision 1.108 by root, Tue Aug 17 23:27:36 2010 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>
10 11
11#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
12# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
13#endif 14#endif
14 15
15// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
16// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
19#endif 20#endif
21
22// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
20 24
21#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
27#define F_SPACE_AFTER 0x00000040UL 31#define F_SPACE_AFTER 0x00000040UL
28#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
32#define F_MAXDEPTH 0xf8000000UL
33#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL 36#define F_RELAXED 0x00001000UL
35#define S_MAXSIZE 20 37#define F_ALLOW_UNKNOWN 0x00002000UL
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
37 39
38#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
39#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
40
41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
42#define F_DEFAULT (9UL << S_MAXDEPTH)
43 41
44#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
45#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
46 44
47#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
48 46
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
48
49#define SB do { 49#define SB do {
50#define SE } while (0) 50#define SE } while (0)
51 51
52#if __GNUC__ >= 3 52#if __GNUC__ >= 3
53# define expect(expr,value) __builtin_expect ((expr),(value)) 53# define expect(expr,value) __builtin_expect ((expr), (value))
54# define inline inline 54# define INLINE static inline
55#else 55#else
56# define expect(expr,value) (expr) 56# define expect(expr,value) (expr)
57# define inline static 57# define INLINE static
58#endif 58#endif
59 59
60#define expect_false(expr) expect ((expr) != 0, 0) 60#define expect_false(expr) expect ((expr) != 0, 0)
61#define expect_true(expr) expect ((expr) != 0, 1) 61#define expect_true(expr) expect ((expr) != 0, 1)
62 62
63#define IN_RANGE_INC(type,val,beg,end) \
64 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
65 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
66
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68
63#ifdef USE_ITHREADS 69#ifdef USE_ITHREADS
64# define JSON_SLOW 1 70# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
65#else 72#else
66# define JSON_SLOW 0 73# define JSON_SLOW 0
74# define JSON_STASH json_stash
67#endif 75#endif
68 76
69static HV *json_stash, *json_boolean_stash; // JSON::XS:: 77static HV *json_stash, *json_boolean_stash; // JSON::XS::
70static SV *json_true, *json_false; 78static SV *json_true, *json_false;
71 79
80enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash
84 INCR_M_C0, // inside comment in initial whitespace sequence
85 INCR_M_C1, // inside comment in other places
86 INCR_M_JSON // outside anything, count nesting
87};
88
89#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
90
72typedef struct { 91typedef struct {
73 U32 flags; 92 U32 flags;
93 U32 max_depth;
94 STRLEN max_size;
95
74 SV *cb_object; 96 SV *cb_object;
75 HV *cb_sk_object; 97 HV *cb_sk_object;
98
99 // for the incremental parser
100 SV *incr_text; // the source text so far
101 STRLEN incr_pos; // the current offset into the text
102 int incr_nest; // {[]}-nesting level
103 unsigned char incr_mode;
76} JSON; 104} JSON;
105
106INLINE void
107json_init (JSON *json)
108{
109 Zero (json, 1, JSON);
110 json->max_depth = 512;
111}
77 112
78///////////////////////////////////////////////////////////////////////////// 113/////////////////////////////////////////////////////////////////////////////
79// utility functions 114// utility functions
80 115
81inline void 116INLINE SV *
117get_bool (const char *name)
118{
119 SV *sv = get_sv (name, 1);
120
121 SvREADONLY_on (sv);
122 SvREADONLY_on (SvRV (sv));
123
124 return sv;
125}
126
127INLINE void
82shrink (SV *sv) 128shrink (SV *sv)
83{ 129{
84 sv_utf8_downgrade (sv, 1); 130 sv_utf8_downgrade (sv, 1);
131
85 if (SvLEN (sv) > SvCUR (sv) + 1) 132 if (SvLEN (sv) > SvCUR (sv) + 1)
86 { 133 {
87#ifdef SvPV_shrink_to_cur 134#ifdef SvPV_shrink_to_cur
88 SvPV_shrink_to_cur (sv); 135 SvPV_shrink_to_cur (sv);
89#elif defined (SvPV_renew) 136#elif defined (SvPV_renew)
… …
95// decode an utf-8 character and return it, or (UV)-1 in 142// decode an utf-8 character and return it, or (UV)-1 in
96// case of an error. 143// case of an error.
97// we special-case "safe" characters from U+80 .. U+7FF, 144// we special-case "safe" characters from U+80 .. U+7FF,
98// but use the very good perl function to parse anything else. 145// but use the very good perl function to parse anything else.
99// note that we never call this function for a ascii codepoints 146// note that we never call this function for a ascii codepoints
100inline UV 147INLINE UV
101decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 148decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
102{ 149{
103 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 150 if (expect_true (len >= 2
104 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 151 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
105 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 152 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
106 { 153 {
107 *clen = 2; 154 *clen = 2;
108 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 155 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
109 } 156 }
110 else 157 else
111 { 158 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
112 *clen = (STRLEN)-1; 159}
113 return (UV)-1; 160
161// likewise for encoding, also never called for ascii codepoints
162// this function takes advantage of this fact, although current gccs
163// seem to optimise the check for >= 0x80 away anyways
164INLINE unsigned char *
165encode_utf8 (unsigned char *s, UV ch)
166{
167 if (expect_false (ch < 0x000080))
168 *s++ = ch;
169 else if (expect_true (ch < 0x000800))
170 *s++ = 0xc0 | ( ch >> 6),
171 *s++ = 0x80 | ( ch & 0x3f);
172 else if ( ch < 0x010000)
173 *s++ = 0xe0 | ( ch >> 12),
174 *s++ = 0x80 | ((ch >> 6) & 0x3f),
175 *s++ = 0x80 | ( ch & 0x3f);
176 else if ( ch < 0x110000)
177 *s++ = 0xf0 | ( ch >> 18),
178 *s++ = 0x80 | ((ch >> 12) & 0x3f),
179 *s++ = 0x80 | ((ch >> 6) & 0x3f),
180 *s++ = 0x80 | ( ch & 0x3f);
181
182 return s;
183}
184
185// convert offset pointer to character index, sv must be string
186static STRLEN
187ptr_to_index (SV *sv, char *offset)
188{
189 return SvUTF8 (sv)
190 ? utf8_distance (offset, SvPVX (sv))
191 : offset - SvPVX (sv);
192}
193
194/////////////////////////////////////////////////////////////////////////////
195// fp hell
196
197// scan a group of digits, and a trailing exponent
198static void
199json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
200{
201 UV uaccum = 0;
202 int eaccum = 0;
203
204 // if we recurse too deep, skip all remaining digits
205 // to avoid a stack overflow attack
206 if (expect_false (--maxdepth <= 0))
207 while (((U8)*s - '0') < 10)
208 ++s;
209
210 for (;;)
114 } 211 {
115} 212 U8 dig = (U8)*s - '0';
116 213
214 if (expect_false (dig >= 10))
215 {
216 if (dig == (U8)((U8)'.' - (U8)'0'))
217 {
218 ++s;
219 json_atof_scan1 (s, accum, expo, 1, maxdepth);
220 }
221 else if ((dig | ' ') == 'e' - '0')
222 {
223 int exp2 = 0;
224 int neg = 0;
225
226 ++s;
227
228 if (*s == '-')
229 {
230 ++s;
231 neg = 1;
232 }
233 else if (*s == '+')
234 ++s;
235
236 while ((dig = (U8)*s - '0') < 10)
237 exp2 = exp2 * 10 + *s++ - '0';
238
239 *expo += neg ? -exp2 : exp2;
240 }
241
242 break;
243 }
244
245 ++s;
246
247 uaccum = uaccum * 10 + dig;
248 ++eaccum;
249
250 // if we have too many digits, then recurse for more
251 // we actually do this for rather few digits
252 if (uaccum >= (UV_MAX - 9) / 10)
253 {
254 if (postdp) *expo -= eaccum;
255 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
256 if (postdp) *expo += eaccum;
257
258 break;
259 }
260 }
261
262 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good
264 // implementation is hard to beat.
265 if (postdp) *expo -= eaccum;
266 *accum += uaccum * Perl_pow (10., *expo);
267 *expo += eaccum;
268}
269
270static NV
271json_atof (const char *s)
272{
273 NV accum = 0.;
274 int expo = 0;
275 int neg = 0;
276
277 if (*s == '-')
278 {
279 ++s;
280 neg = 1;
281 }
282
283 // a recursion depth of ten gives us >>500 bits
284 json_atof_scan1 (s, &accum, &expo, 0, 10);
285
286 return neg ? -accum : accum;
287}
117///////////////////////////////////////////////////////////////////////////// 288/////////////////////////////////////////////////////////////////////////////
118// encoder 289// encoder
119 290
120// structure used for encoding JSON 291// structure used for encoding JSON
121typedef struct 292typedef struct
… …
123 char *cur; // SvPVX (sv) + current output position 294 char *cur; // SvPVX (sv) + current output position
124 char *end; // SvEND (sv) 295 char *end; // SvEND (sv)
125 SV *sv; // result scalar 296 SV *sv; // result scalar
126 JSON json; 297 JSON json;
127 U32 indent; // indentation level 298 U32 indent; // indentation level
128 U32 maxdepth; // max. indentation/recursion level 299 UV limit; // escape character values >= this value when encoding
129} enc_t; 300} enc_t;
130 301
131inline void 302INLINE void
132need (enc_t *enc, STRLEN len) 303need (enc_t *enc, STRLEN len)
133{ 304{
134 if (expect_false (enc->cur + len >= enc->end)) 305 if (expect_false (enc->cur + len >= enc->end))
135 { 306 {
136 STRLEN cur = enc->cur - SvPVX (enc->sv); 307 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
137 SvGROW (enc->sv, cur + len + 1); 308 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
138 enc->cur = SvPVX (enc->sv) + cur; 309 enc->cur = SvPVX (enc->sv) + cur;
139 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 310 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
140 } 311 }
141} 312}
142 313
143inline void 314INLINE void
144encode_ch (enc_t *enc, char ch) 315encode_ch (enc_t *enc, char ch)
145{ 316{
146 need (enc, 1); 317 need (enc, 1);
147 *enc->cur++ = ch; 318 *enc->cur++ = ch;
148} 319}
… …
202 { 373 {
203 uch = ch; 374 uch = ch;
204 clen = 1; 375 clen = 1;
205 } 376 }
206 377
207 if (uch > 0x10FFFFUL) 378 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
208 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
209
210 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
211 { 379 {
212 if (uch > 0xFFFFUL) 380 if (uch >= 0x10000UL)
213 { 381 {
382 if (uch >= 0x110000UL)
383 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
384
214 need (enc, len += 11); 385 need (enc, len += 11);
215 sprintf (enc->cur, "\\u%04x\\u%04x", 386 sprintf (enc->cur, "\\u%04x\\u%04x",
216 (int)((uch - 0x10000) / 0x400 + 0xD800), 387 (int)((uch - 0x10000) / 0x400 + 0xD800),
217 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 388 (int)((uch - 0x10000) % 0x400 + 0xDC00));
218 enc->cur += 12; 389 enc->cur += 12;
219 } 390 }
220 else 391 else
221 { 392 {
222 static char hexdigit [16] = "0123456789abcdef";
223 need (enc, len += 5); 393 need (enc, len += 5);
224 *enc->cur++ = '\\'; 394 *enc->cur++ = '\\';
225 *enc->cur++ = 'u'; 395 *enc->cur++ = 'u';
226 *enc->cur++ = hexdigit [ uch >> 12 ]; 396 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
227 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 397 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
228 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 398 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
229 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 399 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
230 } 400 }
231 401
232 str += clen; 402 str += clen;
233 } 403 }
234 else if (enc->json.flags & F_LATIN1) 404 else if (enc->json.flags & F_LATIN1)
… …
246 while (--clen); 416 while (--clen);
247 } 417 }
248 else 418 else
249 { 419 {
250 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 420 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
251 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 421 enc->cur = encode_utf8 (enc->cur, uch);
252 ++str; 422 ++str;
253 } 423 }
254 } 424 }
255 } 425 }
256 } 426 }
257 427
258 --len; 428 --len;
259 } 429 }
260} 430}
261 431
262inline void 432INLINE void
263encode_indent (enc_t *enc) 433encode_indent (enc_t *enc)
264{ 434{
265 if (enc->json.flags & F_INDENT) 435 if (enc->json.flags & F_INDENT)
266 { 436 {
267 int spaces = enc->indent * INDENT_STEP; 437 int spaces = enc->indent * INDENT_STEP;
… …
270 memset (enc->cur, ' ', spaces); 440 memset (enc->cur, ' ', spaces);
271 enc->cur += spaces; 441 enc->cur += spaces;
272 } 442 }
273} 443}
274 444
275inline void 445INLINE void
276encode_space (enc_t *enc) 446encode_space (enc_t *enc)
277{ 447{
278 need (enc, 1); 448 need (enc, 1);
279 encode_ch (enc, ' '); 449 encode_ch (enc, ' ');
280} 450}
281 451
282inline void 452INLINE void
283encode_nl (enc_t *enc) 453encode_nl (enc_t *enc)
284{ 454{
285 if (enc->json.flags & F_INDENT) 455 if (enc->json.flags & F_INDENT)
286 { 456 {
287 need (enc, 1); 457 need (enc, 1);
288 encode_ch (enc, '\n'); 458 encode_ch (enc, '\n');
289 } 459 }
290} 460}
291 461
292inline void 462INLINE void
293encode_comma (enc_t *enc) 463encode_comma (enc_t *enc)
294{ 464{
295 encode_ch (enc, ','); 465 encode_ch (enc, ',');
296 466
297 if (enc->json.flags & F_INDENT) 467 if (enc->json.flags & F_INDENT)
… …
305static void 475static void
306encode_av (enc_t *enc, AV *av) 476encode_av (enc_t *enc, AV *av)
307{ 477{
308 int i, len = av_len (av); 478 int i, len = av_len (av);
309 479
310 if (enc->indent >= enc->maxdepth) 480 if (enc->indent >= enc->json.max_depth)
311 croak ("data structure too deep (hit recursion limit)"); 481 croak (ERR_NESTING_EXCEEDED);
312 482
313 encode_ch (enc, '['); encode_nl (enc); 483 encode_ch (enc, '[');
314 ++enc->indent; 484
485 if (len >= 0)
486 {
487 encode_nl (enc); ++enc->indent;
315 488
316 for (i = 0; i <= len; ++i) 489 for (i = 0; i <= len; ++i)
317 { 490 {
318 SV **svp = av_fetch (av, i, 0); 491 SV **svp = av_fetch (av, i, 0);
319 492
320 encode_indent (enc); 493 encode_indent (enc);
321 494
322 if (svp) 495 if (svp)
323 encode_sv (enc, *svp); 496 encode_sv (enc, *svp);
324 else 497 else
325 encode_str (enc, "null", 4, 0); 498 encode_str (enc, "null", 4, 0);
326 499
327 if (i < len) 500 if (i < len)
328 encode_comma (enc); 501 encode_comma (enc);
329 } 502 }
330 503
504 encode_nl (enc); --enc->indent; encode_indent (enc);
505 }
506
331 encode_nl (enc); 507 encode_ch (enc, ']');
332
333 --enc->indent;
334 encode_indent (enc); encode_ch (enc, ']');
335} 508}
336 509
337static void 510static void
338encode_he (enc_t *enc, HE *he) 511encode_hk (enc_t *enc, HE *he)
339{ 512{
340 encode_ch (enc, '"'); 513 encode_ch (enc, '"');
341 514
342 if (HeKLEN (he) == HEf_SVKEY) 515 if (HeKLEN (he) == HEf_SVKEY)
343 { 516 {
… …
356 encode_ch (enc, '"'); 529 encode_ch (enc, '"');
357 530
358 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 531 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
359 encode_ch (enc, ':'); 532 encode_ch (enc, ':');
360 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 533 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
361 encode_sv (enc, HeVAL (he));
362} 534}
363 535
364// compare hash entries, used when all keys are bytestrings 536// compare hash entries, used when all keys are bytestrings
365static int 537static int
366he_cmp_fast (const void *a_, const void *b_) 538he_cmp_fast (const void *a_, const void *b_)
… …
371 HE *b = *(HE **)b_; 543 HE *b = *(HE **)b_;
372 544
373 STRLEN la = HeKLEN (a); 545 STRLEN la = HeKLEN (a);
374 STRLEN lb = HeKLEN (b); 546 STRLEN lb = HeKLEN (b);
375 547
376 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 548 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
377 cmp = la - lb; 549 cmp = lb - la;
378 550
379 return cmp; 551 return cmp;
380} 552}
381 553
382// compare hash entries, used when some keys are sv's or utf-x 554// compare hash entries, used when some keys are sv's or utf-x
383static int 555static int
384he_cmp_slow (const void *a, const void *b) 556he_cmp_slow (const void *a, const void *b)
385{ 557{
386 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 558 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
387} 559}
388 560
389static void 561static void
390encode_hv (enc_t *enc, HV *hv) 562encode_hv (enc_t *enc, HV *hv)
391{ 563{
392 int count, i; 564 HE *he;
393 565
394 if (enc->indent >= enc->maxdepth) 566 if (enc->indent >= enc->json.max_depth)
395 croak ("data structure too deep (hit recursion limit)"); 567 croak (ERR_NESTING_EXCEEDED);
396 568
397 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 569 encode_ch (enc, '{');
398 570
399 if ((count = hv_iterinit (hv)))
400 {
401 // for canonical output we have to sort by keys first 571 // for canonical output we have to sort by keys first
402 // actually, this is mostly due to the stupid so-called 572 // actually, this is mostly due to the stupid so-called
403 // security workaround added somewhere in 5.8.x. 573 // security workaround added somewhere in 5.8.x
404 // that randomises hash orderings 574 // that randomises hash orderings
405 if (enc->json.flags & F_CANONICAL) 575 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
576 {
577 int count = hv_iterinit (hv);
578
579 if (SvMAGICAL (hv))
406 { 580 {
581 // need to count by iterating. could improve by dynamically building the vector below
582 // but I don't care for the speed of this special case.
583 // note also that we will run into undefined behaviour when the two iterations
584 // do not result in the same count, something I might care for in some later release.
585
586 count = 0;
587 while (hv_iternext (hv))
588 ++count;
589
590 hv_iterinit (hv);
591 }
592
593 if (count)
594 {
407 int fast = 1; 595 int i, fast = 1;
408 HE *he;
409#if defined(__BORLANDC__) || defined(_MSC_VER) 596#if defined(__BORLANDC__) || defined(_MSC_VER)
410 HE **hes = _alloca (count * sizeof (HE)); 597 HE **hes = _alloca (count * sizeof (HE));
411#else 598#else
412 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 599 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
413#endif 600#endif
… …
440 627
441 FREETMPS; 628 FREETMPS;
442 LEAVE; 629 LEAVE;
443 } 630 }
444 631
445 for (i = 0; i < count; ++i) 632 encode_nl (enc); ++enc->indent;
633
634 while (count--)
446 { 635 {
447 encode_indent (enc); 636 encode_indent (enc);
637 he = hes [count];
448 encode_he (enc, hes [i]); 638 encode_hk (enc, he);
639 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
449 640
450 if (i < count - 1) 641 if (count)
451 encode_comma (enc); 642 encode_comma (enc);
452 } 643 }
453 644
454 encode_nl (enc); 645 encode_nl (enc); --enc->indent; encode_indent (enc);
455 } 646 }
647 }
456 else 648 else
649 {
650 if (hv_iterinit (hv) || SvMAGICAL (hv))
651 if ((he = hv_iternext (hv)))
457 { 652 {
458 HE *he = hv_iternext (hv); 653 encode_nl (enc); ++enc->indent;
459 654
460 for (;;) 655 for (;;)
461 { 656 {
462 encode_indent (enc); 657 encode_indent (enc);
463 encode_he (enc, he); 658 encode_hk (enc, he);
659 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
464 660
465 if (!(he = hv_iternext (hv))) 661 if (!(he = hv_iternext (hv)))
466 break; 662 break;
467 663
468 encode_comma (enc); 664 encode_comma (enc);
469 } 665 }
470 666
471 encode_nl (enc); 667 encode_nl (enc); --enc->indent; encode_indent (enc);
472 } 668 }
473 } 669 }
474 670
475 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 671 encode_ch (enc, '}');
476} 672}
477 673
478// encode objects, arrays and special \0=false and \1=true values. 674// encode objects, arrays and special \0=false and \1=true values.
479static void 675static void
480encode_rv (enc_t *enc, SV *sv) 676encode_rv (enc_t *enc, SV *sv)
… …
557 753
558 if (len == 1 && *pv == '1') 754 if (len == 1 && *pv == '1')
559 encode_str (enc, "true", 4, 0); 755 encode_str (enc, "true", 4, 0);
560 else if (len == 1 && *pv == '0') 756 else if (len == 1 && *pv == '0')
561 encode_str (enc, "false", 5, 0); 757 encode_str (enc, "false", 5, 0);
758 else if (enc->json.flags & F_ALLOW_UNKNOWN)
759 encode_str (enc, "null", 4, 0);
562 else 760 else
563 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 761 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
564 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 762 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
565 } 763 }
764 else if (enc->json.flags & F_ALLOW_UNKNOWN)
765 encode_str (enc, "null", 4, 0);
566 else 766 else
567 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 767 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
568 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 768 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
569} 769}
570 770
… …
588 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 788 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
589 enc->cur += strlen (enc->cur); 789 enc->cur += strlen (enc->cur);
590 } 790 }
591 else if (SvIOKp (sv)) 791 else if (SvIOKp (sv))
592 { 792 {
593 // we assume we can always read an IV as a UV 793 // we assume we can always read an IV as a UV and vice versa
594 if (SvUV (sv) & ~(UV)0x7fff) 794 // we assume two's complement
595 { 795 // we assume no aliasing issues in the union
596 // large integer, use the (rather slow) snprintf way. 796 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
597 need (enc, sizeof (UV) * 3); 797 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
598 enc->cur +=
599 SvIsUV(sv)
600 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
601 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
602 }
603 else
604 { 798 {
605 // optimise the "small number case" 799 // optimise the "small number case"
606 // code will likely be branchless and use only a single multiplication 800 // code will likely be branchless and use only a single multiplication
801 // works for numbers up to 59074
607 I32 i = SvIV (sv); 802 I32 i = SvIVX (sv);
608 U32 u; 803 U32 u;
609 char digit, nz = 0; 804 char digit, nz = 0;
610 805
611 need (enc, 6); 806 need (enc, 6);
612 807
… …
618 813
619 // now output digit by digit, each time masking out the integer part 814 // now output digit by digit, each time masking out the integer part
620 // and multiplying by 5 while moving the decimal point one to the right, 815 // and multiplying by 5 while moving the decimal point one to the right,
621 // resulting in a net multiplication by 10. 816 // resulting in a net multiplication by 10.
622 // we always write the digit to memory but conditionally increment 817 // we always write the digit to memory but conditionally increment
623 // the pointer, to ease the usage of conditional move instructions. 818 // the pointer, to enable the use of conditional move instructions.
624 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 819 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
625 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 820 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
626 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 821 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
627 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 822 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
628 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 823 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
629 } 824 }
825 else
826 {
827 // large integer, use the (rather slow) snprintf way.
828 need (enc, IVUV_MAXCHARS);
829 enc->cur +=
830 SvIsUV(sv)
831 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833 }
630 } 834 }
631 else if (SvROK (sv)) 835 else if (SvROK (sv))
632 encode_rv (enc, SvRV (sv)); 836 encode_rv (enc, SvRV (sv));
633 else if (!SvOK (sv)) 837 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
634 encode_str (enc, "null", 4, 0); 838 encode_str (enc, "null", 4, 0);
635 else 839 else
636 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 840 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
637 SvPV_nolen (sv), SvFLAGS (sv)); 841 SvPV_nolen (sv), SvFLAGS (sv));
638} 842}
… …
648 enc.json = *json; 852 enc.json = *json;
649 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 853 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
650 enc.cur = SvPVX (enc.sv); 854 enc.cur = SvPVX (enc.sv);
651 enc.end = SvEND (enc.sv); 855 enc.end = SvEND (enc.sv);
652 enc.indent = 0; 856 enc.indent = 0;
653 enc.maxdepth = DEC_DEPTH (enc.json.flags); 857 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
858 : enc.json.flags & F_LATIN1 ? 0x000100UL
859 : 0x110000UL;
654 860
655 SvPOK_only (enc.sv); 861 SvPOK_only (enc.sv);
656 encode_sv (&enc, scalar); 862 encode_sv (&enc, scalar);
863 encode_nl (&enc);
657 864
658 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 865 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
659 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 866 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
660 867
661 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 868 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
679 JSON json; 886 JSON json;
680 U32 depth; // recursion depth 887 U32 depth; // recursion depth
681 U32 maxdepth; // recursion depth limit 888 U32 maxdepth; // recursion depth limit
682} dec_t; 889} dec_t;
683 890
684inline void 891INLINE void
892decode_comment (dec_t *dec)
893{
894 // only '#'-style comments allowed a.t.m.
895
896 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
897 ++dec->cur;
898}
899
900INLINE void
685decode_ws (dec_t *dec) 901decode_ws (dec_t *dec)
686{ 902{
687 for (;;) 903 for (;;)
688 { 904 {
689 char ch = *dec->cur; 905 char ch = *dec->cur;
690 906
691 if (ch > 0x20 907 if (ch > 0x20)
908 {
909 if (expect_false (ch == '#'))
910 {
911 if (dec->json.flags & F_RELAXED)
912 decode_comment (dec);
913 else
914 break;
915 }
916 else
917 break;
918 }
692 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 919 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
693 break; 920 break; // parse error, but let higher level handle it, gives better error messages
694 921
695 ++dec->cur; 922 ++dec->cur;
696 } 923 }
697} 924}
698 925
… …
702 if (*dec->cur != ch) \ 929 if (*dec->cur != ch) \
703 ERR (# ch " expected"); \ 930 ERR (# ch " expected"); \
704 ++dec->cur; \ 931 ++dec->cur; \
705 SE 932 SE
706 933
707#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 934#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
708#define DEC_DEC_DEPTH --dec->depth 935#define DEC_DEC_DEPTH --dec->depth
709 936
710static SV *decode_sv (dec_t *dec); 937static SV *decode_sv (dec_t *dec);
711 938
712static signed char decode_hexdigit[256]; 939static signed char decode_hexdigit[256];
… …
804 1031
805 if (hi >= 0x80) 1032 if (hi >= 0x80)
806 { 1033 {
807 utf8 = 1; 1034 utf8 = 1;
808 1035
809 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 1036 cur = encode_utf8 (cur, hi);
810 } 1037 }
811 else 1038 else
812 *cur++ = hi; 1039 *cur++ = hi;
813 } 1040 }
814 break; 1041 break;
… …
816 default: 1043 default:
817 --dec_cur; 1044 --dec_cur;
818 ERR ("illegal backslash escape sequence in string"); 1045 ERR ("illegal backslash escape sequence in string");
819 } 1046 }
820 } 1047 }
821 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1048 else if (expect_true (ch >= 0x20 && ch < 0x80))
822 *cur++ = ch; 1049 *cur++ = ch;
823 else if (ch >= 0x80) 1050 else if (ch >= 0x80)
824 { 1051 {
825 STRLEN clen; 1052 STRLEN clen;
826 UV uch;
827 1053
828 --dec_cur; 1054 --dec_cur;
829 1055
830 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1056 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
831 if (clen == (STRLEN)-1) 1057 if (clen == (STRLEN)-1)
832 ERR ("malformed UTF-8 character in JSON string"); 1058 ERR ("malformed UTF-8 character in JSON string");
833 1059
834 do 1060 do
835 *cur++ = *dec_cur++; 1061 *cur++ = *dec_cur++;
… …
852 { 1078 {
853 STRLEN len = cur - buf; 1079 STRLEN len = cur - buf;
854 1080
855 if (sv) 1081 if (sv)
856 { 1082 {
857 SvGROW (sv, SvCUR (sv) + len + 1); 1083 STRLEN cur = SvCUR (sv);
1084
1085 if (SvLEN (sv) <= cur + len)
1086 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1087
858 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1088 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
859 SvCUR_set (sv, SvCUR (sv) + len); 1089 SvCUR_set (sv, SvCUR (sv) + len);
860 } 1090 }
861 else 1091 else
862 sv = newSVpvn (buf, len); 1092 sv = newSVpvn (buf, len);
… …
949 1179
950 if (!is_nv) 1180 if (!is_nv)
951 { 1181 {
952 int len = dec->cur - start; 1182 int len = dec->cur - start;
953 1183
954 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1184 // special case the rather common 1..5-digit-int case
955 if (*start == '-') 1185 if (*start == '-')
956 switch (len) 1186 switch (len)
957 { 1187 {
958 case 2: return newSViv (-( start [1] - '0' * 1)); 1188 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
959 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1189 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
960 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1190 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
961 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1191 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1192 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
962 } 1193 }
963 else 1194 else
964 switch (len) 1195 switch (len)
965 { 1196 {
966 case 1: return newSViv ( start [0] - '0' * 1); 1197 case 1: return newSViv ( start [0] - '0' * 1);
967 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1198 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
968 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1199 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
969 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1200 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1201 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
970 } 1202 }
971 1203
972 { 1204 {
973 UV uv; 1205 UV uv;
974 int numtype = grok_number (start, len, &uv); 1206 int numtype = grok_number (start, len, &uv);
… …
983 } 1215 }
984 1216
985 len -= *start == '-' ? 1 : 0; 1217 len -= *start == '-' ? 1 : 0;
986 1218
987 // does not fit into IV or UV, try NV 1219 // does not fit into IV or UV, try NV
988 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1220 if (len <= NV_DIG)
989 #if defined (LDBL_DIG)
990 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
991 #endif
992 )
993 // fits into NV without loss of precision 1221 // fits into NV without loss of precision
994 return newSVnv (Atof (start)); 1222 return newSVnv (json_atof (start));
995 1223
996 // everything else fails, convert it to a string 1224 // everything else fails, convert it to a string
997 return newSVpvn (start, dec->cur - start); 1225 return newSVpvn (start, dec->cur - start);
998 } 1226 }
999 1227
1000 // loss of precision here 1228 // loss of precision here
1001 return newSVnv (Atof (start)); 1229 return newSVnv (json_atof (start));
1002 1230
1003fail: 1231fail:
1004 return 0; 1232 return 0;
1005} 1233}
1006 1234
… …
1035 1263
1036 if (*dec->cur != ',') 1264 if (*dec->cur != ',')
1037 ERR (", or ] expected while parsing array"); 1265 ERR (", or ] expected while parsing array");
1038 1266
1039 ++dec->cur; 1267 ++dec->cur;
1268
1269 decode_ws (dec);
1270
1271 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1272 {
1273 ++dec->cur;
1274 break;
1275 }
1040 } 1276 }
1041 1277
1042 DEC_DEC_DEPTH; 1278 DEC_DEC_DEPTH;
1043 return newRV_noinc ((SV *)av); 1279 return newRV_noinc ((SV *)av);
1044 1280
… …
1060 if (*dec->cur == '}') 1296 if (*dec->cur == '}')
1061 ++dec->cur; 1297 ++dec->cur;
1062 else 1298 else
1063 for (;;) 1299 for (;;)
1064 { 1300 {
1065 decode_ws (dec); EXPECT_CH ('"'); 1301 EXPECT_CH ('"');
1066 1302
1067 // heuristic: assume that 1303 // heuristic: assume that
1068 // a) decode_str + hv_store_ent are abysmally slow. 1304 // a) decode_str + hv_store_ent are abysmally slow.
1069 // b) most hash keys are short, simple ascii text. 1305 // b) most hash keys are short, simple ascii text.
1070 // => try to "fast-match" such strings to avoid 1306 // => try to "fast-match" such strings to avoid
… …
1074 char *p = dec->cur; 1310 char *p = dec->cur;
1075 char *e = p + 24; // only try up to 24 bytes 1311 char *e = p + 24; // only try up to 24 bytes
1076 1312
1077 for (;;) 1313 for (;;)
1078 { 1314 {
1079 // the >= 0x80 is true on most architectures 1315 // the >= 0x80 is false on most architectures
1080 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1316 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1081 { 1317 {
1082 // slow path, back up and use decode_str 1318 // slow path, back up and use decode_str
1083 SV *key = decode_str (dec); 1319 SV *key = decode_str (dec);
1084 if (!key) 1320 if (!key)
1085 goto fail; 1321 goto fail;
1086 1322
1087 decode_ws (dec); EXPECT_CH (':'); 1323 decode_ws (dec); EXPECT_CH (':');
1088 1324
1325 decode_ws (dec);
1089 value = decode_sv (dec); 1326 value = decode_sv (dec);
1090 if (!value) 1327 if (!value)
1091 { 1328 {
1092 SvREFCNT_dec (key); 1329 SvREFCNT_dec (key);
1093 goto fail; 1330 goto fail;
… …
1105 int len = p - key; 1342 int len = p - key;
1106 dec->cur = p + 1; 1343 dec->cur = p + 1;
1107 1344
1108 decode_ws (dec); EXPECT_CH (':'); 1345 decode_ws (dec); EXPECT_CH (':');
1109 1346
1347 decode_ws (dec);
1110 value = decode_sv (dec); 1348 value = decode_sv (dec);
1111 if (!value) 1349 if (!value)
1112 goto fail; 1350 goto fail;
1113 1351
1114 hv_store (hv, key, len, value, 0); 1352 hv_store (hv, key, len, value, 0);
… …
1130 1368
1131 if (*dec->cur != ',') 1369 if (*dec->cur != ',')
1132 ERR (", or } expected while parsing object/hash"); 1370 ERR (", or } expected while parsing object/hash");
1133 1371
1134 ++dec->cur; 1372 ++dec->cur;
1373
1374 decode_ws (dec);
1375
1376 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1377 {
1378 ++dec->cur;
1379 break;
1380 }
1135 } 1381 }
1136 1382
1137 DEC_DEC_DEPTH; 1383 DEC_DEC_DEPTH;
1138 sv = newRV_noinc ((SV *)hv); 1384 sv = newRV_noinc ((SV *)hv);
1139 1385
… …
1157 dSP; 1403 dSP;
1158 int count; 1404 int count;
1159 1405
1160 ENTER; SAVETMPS; PUSHMARK (SP); 1406 ENTER; SAVETMPS; PUSHMARK (SP);
1161 XPUSHs (HeVAL (he)); 1407 XPUSHs (HeVAL (he));
1408 sv_2mortal (sv);
1162 1409
1163 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1410 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1164 1411
1165 if (count == 1) 1412 if (count == 1)
1166 { 1413 {
1167 sv = newSVsv (POPs); 1414 sv = newSVsv (POPs);
1168 FREETMPS; LEAVE; 1415 FREETMPS; LEAVE;
1169 return sv; 1416 return sv;
1170 } 1417 }
1171 1418
1419 SvREFCNT_inc (sv);
1172 FREETMPS; LEAVE; 1420 FREETMPS; LEAVE;
1173 } 1421 }
1174 } 1422 }
1175 1423
1176 if (dec->json.cb_object) 1424 if (dec->json.cb_object)
… …
1204} 1452}
1205 1453
1206static SV * 1454static SV *
1207decode_sv (dec_t *dec) 1455decode_sv (dec_t *dec)
1208{ 1456{
1209 decode_ws (dec);
1210
1211 // the beauty of JSON: you need exactly one character lookahead 1457 // the beauty of JSON: you need exactly one character lookahead
1212 // to parse anything. 1458 // to parse everything.
1213 switch (*dec->cur) 1459 switch (*dec->cur)
1214 { 1460 {
1215 case '"': ++dec->cur; return decode_str (dec); 1461 case '"': ++dec->cur; return decode_str (dec);
1216 case '[': ++dec->cur; return decode_av (dec); 1462 case '[': ++dec->cur; return decode_av (dec);
1217 case '{': ++dec->cur; return decode_hv (dec); 1463 case '{': ++dec->cur; return decode_hv (dec);
1218 1464
1219 case '-': 1465 case '-':
1220 case '0': case '1': case '2': case '3': case '4': 1466 case '0': case '1': case '2': case '3': case '4':
1221 case '5': case '6': case '7': case '8': case '9': 1467 case '5': case '6': case '7': case '8': case '9':
1222 return decode_num (dec); 1468 return decode_num (dec);
1223 1469
1224 case 't': 1470 case 't':
1225 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1471 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1226 { 1472 {
1227 dec->cur += 4; 1473 dec->cur += 4;
1474#if JSON_SLOW
1475 json_true = get_bool ("JSON::XS::true");
1476#endif
1228 return SvREFCNT_inc (json_true); 1477 return newSVsv (json_true);
1229 } 1478 }
1230 else 1479 else
1231 ERR ("'true' expected"); 1480 ERR ("'true' expected");
1232 1481
1233 break; 1482 break;
1234 1483
1235 case 'f': 1484 case 'f':
1236 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1485 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1237 { 1486 {
1238 dec->cur += 5; 1487 dec->cur += 5;
1488#if JSON_SLOW
1489 json_false = get_bool ("JSON::XS::false");
1490#endif
1239 return SvREFCNT_inc (json_false); 1491 return newSVsv (json_false);
1240 } 1492 }
1241 else 1493 else
1242 ERR ("'false' expected"); 1494 ERR ("'false' expected");
1243 1495
1244 break; 1496 break;
… …
1262fail: 1514fail:
1263 return 0; 1515 return 0;
1264} 1516}
1265 1517
1266static SV * 1518static SV *
1267decode_json (SV *string, JSON *json, UV *offset_return) 1519decode_json (SV *string, JSON *json, char **offset_return)
1268{ 1520{
1269 dec_t dec; 1521 dec_t dec;
1270 UV offset;
1271 SV *sv; 1522 SV *sv;
1272 1523
1524 /* work around bugs in 5.10 where manipulating magic values
1525 * will perl ignore the magic in subsequent accesses
1526 */
1273 SvGETMAGIC (string); 1527 /*SvGETMAGIC (string);*/
1528 if (SvMAGICAL (string))
1529 string = sv_2mortal (newSVsv (string));
1530
1274 SvUPGRADE (string, SVt_PV); 1531 SvUPGRADE (string, SVt_PV);
1275 1532
1276 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1533 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1534 * assertion with -DDEBUGGING, although SvCUR is documented to
1535 * return the xpv_cur field which certainly exists after upgrading.
1536 * according to nicholas clark, calling SvPOK fixes this.
1537 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1538 * and hope for the best.
1539 * Damnit, SvPV_nolen still trips over yet another assertion. This
1540 * assertion business is seriously broken, try yet another workaround
1541 * for the broken -DDEBUGGING.
1542 */
1543 {
1544#ifdef DEBUGGING
1545 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1546#else
1547 STRLEN offset = SvCUR (string);
1548#endif
1549
1550 if (offset > json->max_size && json->max_size)
1277 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1551 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1278 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1552 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1553 }
1279 1554
1280 if (json->flags & F_UTF8) 1555 if (DECODE_WANTS_OCTETS (json))
1281 sv_utf8_downgrade (string, 0); 1556 sv_utf8_downgrade (string, 0);
1282 else 1557 else
1283 sv_utf8_upgrade (string); 1558 sv_utf8_upgrade (string);
1284 1559
1285 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1560 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1286 1561
1287 dec.json = *json; 1562 dec.json = *json;
1288 dec.cur = SvPVX (string); 1563 dec.cur = SvPVX (string);
1289 dec.end = SvEND (string); 1564 dec.end = SvEND (string);
1290 dec.err = 0; 1565 dec.err = 0;
1291 dec.depth = 0; 1566 dec.depth = 0;
1292 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1293 1567
1294 if (dec.json.cb_object || dec.json.cb_sk_object) 1568 if (dec.json.cb_object || dec.json.cb_sk_object)
1295 dec.json.flags |= F_HOOK; 1569 dec.json.flags |= F_HOOK;
1296 1570
1297 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1571 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1572
1573 decode_ws (&dec);
1298 sv = decode_sv (&dec); 1574 sv = decode_sv (&dec);
1575
1576 if (offset_return)
1577 *offset_return = dec.cur;
1299 1578
1300 if (!(offset_return || !sv)) 1579 if (!(offset_return || !sv))
1301 { 1580 {
1302 // check for trailing garbage 1581 // check for trailing garbage
1303 decode_ws (&dec); 1582 decode_ws (&dec);
… …
1306 { 1585 {
1307 dec.err = "garbage after JSON object"; 1586 dec.err = "garbage after JSON object";
1308 SvREFCNT_dec (sv); 1587 SvREFCNT_dec (sv);
1309 sv = 0; 1588 sv = 0;
1310 } 1589 }
1311 }
1312
1313 if (offset_return || !sv)
1314 {
1315 offset = dec.json.flags & F_UTF8
1316 ? dec.cur - SvPVX (string)
1317 : utf8_distance (dec.cur, SvPVX (string));
1318
1319 if (offset_return)
1320 *offset_return = offset;
1321 } 1590 }
1322 1591
1323 if (!sv) 1592 if (!sv)
1324 { 1593 {
1325 SV *uni = sv_newmortal (); 1594 SV *uni = sv_newmortal ();
… …
1331 SAVEVPTR (PL_curcop); 1600 SAVEVPTR (PL_curcop);
1332 PL_curcop = &cop; 1601 PL_curcop = &cop;
1333 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1602 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1334 LEAVE; 1603 LEAVE;
1335 1604
1336 croak ("%s, at character offset %d [\"%s\"]", 1605 croak ("%s, at character offset %d (before \"%s\")",
1337 dec.err, 1606 dec.err,
1338 (int)offset, 1607 ptr_to_index (string, dec.cur),
1339 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1608 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1340 } 1609 }
1341 1610
1342 sv = sv_2mortal (sv); 1611 sv = sv_2mortal (sv);
1343 1612
1344 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1613 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1345 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1614 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1346 1615
1347 return sv; 1616 return sv;
1617}
1618
1619/////////////////////////////////////////////////////////////////////////////
1620// incremental parser
1621
1622static void
1623incr_parse (JSON *self)
1624{
1625 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1626
1627 // the state machine here is a bit convoluted and could be simplified a lot
1628 // but this would make it slower, so...
1629
1630 for (;;)
1631 {
1632 //printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
1633 switch (self->incr_mode)
1634 {
1635 // only used for initial whitespace skipping
1636 case INCR_M_WS:
1637 for (;;)
1638 {
1639 if (*p > 0x20)
1640 {
1641 if (*p == '#')
1642 {
1643 self->incr_mode = INCR_M_C0;
1644 goto incr_m_c;
1645 }
1646 else
1647 {
1648 self->incr_mode = INCR_M_JSON;
1649 goto incr_m_json;
1650 }
1651 }
1652 else if (!*p)
1653 goto interrupt;
1654
1655 ++p;
1656 }
1657
1658 // skip a single char inside a string (for \\-processing)
1659 case INCR_M_BS:
1660 if (!*p)
1661 goto interrupt;
1662
1663 ++p;
1664 self->incr_mode = INCR_M_STR;
1665 goto incr_m_str;
1666
1667 // inside #-style comments
1668 case INCR_M_C0:
1669 case INCR_M_C1:
1670 incr_m_c:
1671 for (;;)
1672 {
1673 if (*p == '\n')
1674 {
1675 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1676 break;
1677 }
1678 else if (!*p)
1679 goto interrupt;
1680
1681 ++p;
1682 }
1683
1684 break;
1685
1686 // inside a string
1687 case INCR_M_STR:
1688 incr_m_str:
1689 for (;;)
1690 {
1691 if (*p == '"')
1692 {
1693 ++p;
1694 self->incr_mode = INCR_M_JSON;
1695
1696 if (!self->incr_nest)
1697 goto interrupt;
1698
1699 goto incr_m_json;
1700 }
1701 else if (*p == '\\')
1702 {
1703 ++p; // "virtually" consumes character after \
1704
1705 if (!*p) // if at end of string we have to switch modes
1706 {
1707 self->incr_mode = INCR_M_BS;
1708 goto interrupt;
1709 }
1710 }
1711 else if (!*p)
1712 goto interrupt;
1713
1714 ++p;
1715 }
1716
1717 // after initial ws, outside string
1718 case INCR_M_JSON:
1719 incr_m_json:
1720 for (;;)
1721 {
1722 switch (*p++)
1723 {
1724 case 0:
1725 --p;
1726 goto interrupt;
1727
1728 case 0x09:
1729 case 0x0a:
1730 case 0x0d:
1731 case 0x20:
1732 if (!self->incr_nest)
1733 {
1734 --p; // do not eat the whitespace, let the next round do it
1735 goto interrupt;
1736 }
1737 break;
1738
1739 case '"':
1740 self->incr_mode = INCR_M_STR;
1741 goto incr_m_str;
1742
1743 case '[':
1744 case '{':
1745 if (++self->incr_nest > self->max_depth)
1746 croak (ERR_NESTING_EXCEEDED);
1747 break;
1748
1749 case ']':
1750 case '}':
1751 if (--self->incr_nest <= 0)
1752 goto interrupt;
1753 break;
1754
1755 case '#':
1756 self->incr_mode = INCR_M_C1;
1757 goto incr_m_c;
1758 }
1759 }
1760 }
1761
1762 modechange:
1763 ;
1764 }
1765
1766interrupt:
1767 self->incr_pos = p - SvPVX (self->incr_text);
1768 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1769 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1348} 1770}
1349 1771
1350///////////////////////////////////////////////////////////////////////////// 1772/////////////////////////////////////////////////////////////////////////////
1351// XS interface functions 1773// XS interface functions
1352 1774
… …
1364 : -1; 1786 : -1;
1365 1787
1366 json_stash = gv_stashpv ("JSON::XS" , 1); 1788 json_stash = gv_stashpv ("JSON::XS" , 1);
1367 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1789 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1368 1790
1369 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1791 json_true = get_bool ("JSON::XS::true");
1370 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1792 json_false = get_bool ("JSON::XS::false");
1793
1794 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1371} 1795}
1372 1796
1373PROTOTYPES: DISABLE 1797PROTOTYPES: DISABLE
1374 1798
1375void CLONE (...) 1799void CLONE (...)
… …
1378 json_boolean_stash = 0; 1802 json_boolean_stash = 0;
1379 1803
1380void new (char *klass) 1804void new (char *klass)
1381 PPCODE: 1805 PPCODE:
1382{ 1806{
1383 HV *stash = !JSON_SLOW || json_stash
1384 ? json_stash
1385 : gv_stashpv ("JSON::XS", 1);
1386 SV *pv = NEWSV (0, sizeof (JSON)); 1807 SV *pv = NEWSV (0, sizeof (JSON));
1387 SvPOK_only (pv); 1808 SvPOK_only (pv);
1388 Zero (SvPVX (pv), 1, JSON); 1809 json_init ((JSON *)SvPVX (pv));
1389 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1810 XPUSHs (sv_2mortal (sv_bless (
1390 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), stash))); 1811 newRV_noinc (pv),
1812 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1813 )));
1391} 1814}
1392 1815
1393void ascii (JSON *self, int enable = 1) 1816void ascii (JSON *self, int enable = 1)
1394 ALIAS: 1817 ALIAS:
1395 ascii = F_ASCII 1818 ascii = F_ASCII
… …
1402 pretty = F_PRETTY 1825 pretty = F_PRETTY
1403 allow_nonref = F_ALLOW_NONREF 1826 allow_nonref = F_ALLOW_NONREF
1404 shrink = F_SHRINK 1827 shrink = F_SHRINK
1405 allow_blessed = F_ALLOW_BLESSED 1828 allow_blessed = F_ALLOW_BLESSED
1406 convert_blessed = F_CONV_BLESSED 1829 convert_blessed = F_CONV_BLESSED
1830 relaxed = F_RELAXED
1831 allow_unknown = F_ALLOW_UNKNOWN
1407 PPCODE: 1832 PPCODE:
1408{ 1833{
1409 if (enable) 1834 if (enable)
1410 self->flags |= ix; 1835 self->flags |= ix;
1411 else 1836 else
1412 self->flags &= ~ix; 1837 self->flags &= ~ix;
1413 1838
1414 XPUSHs (ST (0)); 1839 XPUSHs (ST (0));
1415} 1840}
1416 1841
1417void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1842void get_ascii (JSON *self)
1843 ALIAS:
1844 get_ascii = F_ASCII
1845 get_latin1 = F_LATIN1
1846 get_utf8 = F_UTF8
1847 get_indent = F_INDENT
1848 get_canonical = F_CANONICAL
1849 get_space_before = F_SPACE_BEFORE
1850 get_space_after = F_SPACE_AFTER
1851 get_allow_nonref = F_ALLOW_NONREF
1852 get_shrink = F_SHRINK
1853 get_allow_blessed = F_ALLOW_BLESSED
1854 get_convert_blessed = F_CONV_BLESSED
1855 get_relaxed = F_RELAXED
1856 get_allow_unknown = F_ALLOW_UNKNOWN
1418 PPCODE: 1857 PPCODE:
1419{ 1858 XPUSHs (boolSV (self->flags & ix));
1420 UV log2 = 0;
1421 1859
1422 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1860void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1423 1861 PPCODE:
1424 while ((1UL << log2) < max_depth) 1862 self->max_depth = max_depth;
1425 ++log2;
1426
1427 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1428
1429 XPUSHs (ST (0)); 1863 XPUSHs (ST (0));
1430}
1431 1864
1865U32 get_max_depth (JSON *self)
1866 CODE:
1867 RETVAL = self->max_depth;
1868 OUTPUT:
1869 RETVAL
1870
1432void max_size (JSON *self, UV max_size = 0) 1871void max_size (JSON *self, U32 max_size = 0)
1433 PPCODE: 1872 PPCODE:
1434{ 1873 self->max_size = max_size;
1435 UV log2 = 0;
1436
1437 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1438 if (max_size == 1) max_size = 2;
1439
1440 while ((1UL << log2) < max_size)
1441 ++log2;
1442
1443 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1444
1445 XPUSHs (ST (0)); 1874 XPUSHs (ST (0));
1446} 1875
1876int get_max_size (JSON *self)
1877 CODE:
1878 RETVAL = self->max_size;
1879 OUTPUT:
1880 RETVAL
1447 1881
1448void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1882void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1449 PPCODE: 1883 PPCODE:
1450{ 1884{
1451 SvREFCNT_dec (self->cb_object); 1885 SvREFCNT_dec (self->cb_object);
… …
1485 XPUSHs (decode_json (jsonstr, self, 0)); 1919 XPUSHs (decode_json (jsonstr, self, 0));
1486 1920
1487void decode_prefix (JSON *self, SV *jsonstr) 1921void decode_prefix (JSON *self, SV *jsonstr)
1488 PPCODE: 1922 PPCODE:
1489{ 1923{
1490 UV offset; 1924 char *offset;
1491 EXTEND (SP, 2); 1925 EXTEND (SP, 2);
1492 PUSHs (decode_json (jsonstr, self, &offset)); 1926 PUSHs (decode_json (jsonstr, self, &offset));
1493 PUSHs (sv_2mortal (newSVuv (offset))); 1927 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1928}
1929
1930void incr_parse (JSON *self, SV *jsonstr = 0)
1931 PPCODE:
1932{
1933 if (!self->incr_text)
1934 self->incr_text = newSVpvn ("", 0);
1935
1936 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1937 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1938 if (DECODE_WANTS_OCTETS (self))
1939 {
1940 if (self->incr_pos)
1941 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1942 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1943
1944 sv_utf8_downgrade (self->incr_text, 0);
1945 }
1946 else
1947 {
1948 sv_utf8_upgrade (self->incr_text);
1949
1950 if (self->incr_pos)
1951 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1952 - (U8 *)SvPVX (self->incr_text);
1953 }
1954
1955 // append data, if any
1956 if (jsonstr)
1957 {
1958 /* make sure both strings have same encoding */
1959 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1960 if (SvUTF8 (jsonstr))
1961 sv_utf8_downgrade (jsonstr, 0);
1962 else
1963 sv_utf8_upgrade (jsonstr);
1964
1965 /* and then just blindly append */
1966 {
1967 STRLEN len;
1968 const char *str = SvPV (jsonstr, len);
1969 STRLEN cur = SvCUR (self->incr_text);
1970
1971 if (SvLEN (self->incr_text) <= cur + len)
1972 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1973
1974 Move (str, SvEND (self->incr_text), len, char);
1975 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1976 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1977 }
1978 }
1979
1980 if (GIMME_V != G_VOID)
1981 do
1982 {
1983 char *offset;
1984
1985 if (!INCR_DONE (self))
1986 {
1987 incr_parse (self);
1988
1989 if (self->incr_pos > self->max_size && self->max_size)
1990 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1991 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1992
1993 if (!INCR_DONE (self))
1994 break;
1995 }
1996
1997 XPUSHs (decode_json (self->incr_text, self, &offset));
1998
1999 self->incr_pos -= offset - SvPVX (self->incr_text);
2000 self->incr_nest = 0;
2001 self->incr_mode = 0;
2002
2003 sv_chop (self->incr_text, offset);
2004 }
2005 while (GIMME_V == G_ARRAY);
2006}
2007
2008SV *incr_text (JSON *self)
2009 ATTRS: lvalue
2010 CODE:
2011{
2012 if (self->incr_pos)
2013 croak ("incr_text can not be called when the incremental parser already started parsing");
2014
2015 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2016}
2017 OUTPUT:
2018 RETVAL
2019
2020void incr_skip (JSON *self)
2021 CODE:
2022{
2023 if (self->incr_pos)
2024 {
2025 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2026 self->incr_pos = 0;
2027 self->incr_nest = 0;
2028 self->incr_mode = 0;
2029 }
2030}
2031
2032void incr_reset (JSON *self)
2033 CODE:
2034{
2035 SvREFCNT_dec (self->incr_text);
2036 self->incr_text = 0;
2037 self->incr_pos = 0;
2038 self->incr_nest = 0;
2039 self->incr_mode = 0;
1494} 2040}
1495 2041
1496void DESTROY (JSON *self) 2042void DESTROY (JSON *self)
1497 CODE: 2043 CODE:
1498 SvREFCNT_dec (self->cb_sk_object); 2044 SvREFCNT_dec (self->cb_sk_object);
1499 SvREFCNT_dec (self->cb_object); 2045 SvREFCNT_dec (self->cb_object);
2046 SvREFCNT_dec (self->incr_text);
1500 2047
1501PROTOTYPES: ENABLE 2048PROTOTYPES: ENABLE
1502 2049
1503void to_json (SV *scalar) 2050void encode_json (SV *scalar)
2051 ALIAS:
2052 to_json_ = 0
2053 encode_json = F_UTF8
1504 PPCODE: 2054 PPCODE:
1505{ 2055{
1506 JSON json = { F_DEFAULT | F_UTF8 }; 2056 JSON json;
2057 json_init (&json);
2058 json.flags |= ix;
1507 XPUSHs (encode_json (scalar, &json)); 2059 XPUSHs (encode_json (scalar, &json));
1508} 2060}
1509 2061
1510void from_json (SV *jsonstr) 2062void decode_json (SV *jsonstr)
2063 ALIAS:
2064 from_json_ = 0
2065 decode_json = F_UTF8
1511 PPCODE: 2066 PPCODE:
1512{ 2067{
1513 JSON json = { F_DEFAULT | F_UTF8 }; 2068 JSON json;
2069 json_init (&json);
2070 json.flags |= ix;
1514 XPUSHs (decode_json (jsonstr, &json, 0)); 2071 XPUSHs (decode_json (jsonstr, &json, 0));
1515} 2072}
1516 2073

Diff Legend

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