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.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.85 by root, Sat Apr 5 18:15:46 2008 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>
9 11
10#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 14#endif
13 15
14// 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
15// guarentees, though. if it breaks, you get to keep the pieces. 17// guarentees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
18#endif 20#endif
21
22#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
19 23
20#define F_ASCII 0x00000001UL 24#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL 25#define F_LATIN1 0x00000002UL
22#define F_UTF8 0x00000004UL 26#define F_UTF8 0x00000004UL
23#define F_INDENT 0x00000008UL 27#define F_INDENT 0x00000008UL
… …
25#define F_SPACE_BEFORE 0x00000020UL 29#define F_SPACE_BEFORE 0x00000020UL
26#define F_SPACE_AFTER 0x00000040UL 30#define F_SPACE_AFTER 0x00000040UL
27#define F_ALLOW_NONREF 0x00000100UL 31#define F_ALLOW_NONREF 0x00000100UL
28#define F_SHRINK 0x00000200UL 32#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL 33#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL // NYI 34#define F_CONV_BLESSED 0x00000800UL
31#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 35#define F_RELAXED 0x00001000UL
34#define S_MAXSIZE 20 36#define F_ALLOW_UNKNOWN 0x00002000UL
35 37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38 38
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40#define F_DEFAULT (9UL << S_MAXDEPTH)
41 40
42#define INIT_SIZE 32 // initial scalar size to be allocated 41#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 42#define INDENT_STEP 3 // spaces per indentation level
44 43
45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 44#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
46 45
47#define SB do { 46#define SB do {
48#define SE } while (0) 47#define SE } while (0)
49 48
50#if __GNUC__ >= 3 49#if __GNUC__ >= 3
51# define expect(expr,value) __builtin_expect ((expr),(value)) 50# define expect(expr,value) __builtin_expect ((expr), (value))
52# define inline inline 51# define INLINE static inline
53#else 52#else
54# define expect(expr,value) (expr) 53# define expect(expr,value) (expr)
55# define inline static 54# define INLINE static
56#endif 55#endif
57 56
58#define expect_false(expr) expect ((expr) != 0, 0) 57#define expect_false(expr) expect ((expr) != 0, 0)
59#define expect_true(expr) expect ((expr) != 0, 1) 58#define expect_true(expr) expect ((expr) != 0, 1)
60 59
60#define IN_RANGE_INC(type,val,beg,end) \
61 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
62 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
63
64#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
65
66#ifdef USE_ITHREADS
67# define JSON_SLOW 1
68# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
69#else
70# define JSON_SLOW 0
71# define JSON_STASH json_stash
72#endif
73
61static HV *json_stash, *json_boolean_stash; // JSON::XS:: 74static HV *json_stash, *json_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false; 75static SV *json_true, *json_false;
63 76
77enum {
78 INCR_M_WS = 0, // initial whitespace skipping, must be 0
79 INCR_M_STR, // inside string
80 INCR_M_BS, // inside backslash
81 INCR_M_JSON // outside anything, count nesting
82};
83
84#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)
85
64typedef struct json { 86typedef struct {
65 U32 flags; 87 U32 flags;
88 U32 max_depth;
89 STRLEN max_size;
90
91 SV *cb_object;
92 HV *cb_sk_object;
93
94 // for the incremental parser
95 SV *incr_text; // the source text so far
96 STRLEN incr_pos; // the current offset into the text
97 unsigned char incr_nest; // {[]}-nesting level
98 unsigned char incr_mode;
66} JSON__XS; 99} JSON;
100
101INLINE void
102json_init (JSON *json)
103{
104 Zero (json, 1, JSON);
105 json->max_depth = 512;
106}
67 107
68///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
69// utility functions 109// utility functions
70 110
71static UV * 111INLINE SV *
72SvJSON (SV *sv) 112get_bool (const char *name)
73{ 113{
74 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash)) 114 SV *sv = get_sv (name, 1);
75 croak ("object is not of type JSON::XS");
76 115
77 return &SvUVX (SvRV (sv)); 116 SvREADONLY_on (sv);
78} 117 SvREADONLY_on (SvRV (sv));
79 118
80static void 119 return sv;
120}
121
122INLINE void
81shrink (SV *sv) 123shrink (SV *sv)
82{ 124{
83 sv_utf8_downgrade (sv, 1); 125 sv_utf8_downgrade (sv, 1);
84 if (SvLEN (sv) > SvCUR (sv) + 1) 126 if (SvLEN (sv) > SvCUR (sv) + 1)
85 { 127 {
… …
94// decode an utf-8 character and return it, or (UV)-1 in 136// decode an utf-8 character and return it, or (UV)-1 in
95// case of an error. 137// case of an error.
96// we special-case "safe" characters from U+80 .. U+7FF, 138// we special-case "safe" characters from U+80 .. U+7FF,
97// but use the very good perl function to parse anything else. 139// but use the very good perl function to parse anything else.
98// note that we never call this function for a ascii codepoints 140// note that we never call this function for a ascii codepoints
99inline UV 141INLINE UV
100decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 142decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
101{ 143{
102 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 144 if (expect_true (len >= 2
103 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 145 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
104 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 146 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
105 { 147 {
106 *clen = 2; 148 *clen = 2;
107 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 149 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
108 } 150 }
109 else 151 else
110 { 152 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
111 *clen = (STRLEN)-1; 153}
112 return (UV)-1; 154
113 } 155// likewise for encoding, also never called for ascii codepoints
156// this function takes advantage of this fact, although current gccs
157// seem to optimise the check for >= 0x80 away anyways
158INLINE unsigned char *
159encode_utf8 (unsigned char *s, UV ch)
160{
161 if (expect_false (ch < 0x000080))
162 *s++ = ch;
163 else if (expect_true (ch < 0x000800))
164 *s++ = 0xc0 | ( ch >> 6),
165 *s++ = 0x80 | ( ch & 0x3f);
166 else if ( ch < 0x010000)
167 *s++ = 0xe0 | ( ch >> 12),
168 *s++ = 0x80 | ((ch >> 6) & 0x3f),
169 *s++ = 0x80 | ( ch & 0x3f);
170 else if ( ch < 0x110000)
171 *s++ = 0xf0 | ( ch >> 18),
172 *s++ = 0x80 | ((ch >> 12) & 0x3f),
173 *s++ = 0x80 | ((ch >> 6) & 0x3f),
174 *s++ = 0x80 | ( ch & 0x3f);
175
176 return s;
114} 177}
115 178
116///////////////////////////////////////////////////////////////////////////// 179/////////////////////////////////////////////////////////////////////////////
117// encoder 180// encoder
118 181
… …
120typedef struct 183typedef struct
121{ 184{
122 char *cur; // SvPVX (sv) + current output position 185 char *cur; // SvPVX (sv) + current output position
123 char *end; // SvEND (sv) 186 char *end; // SvEND (sv)
124 SV *sv; // result scalar 187 SV *sv; // result scalar
125 struct json json; 188 JSON json;
126 U32 indent; // indentation level 189 U32 indent; // indentation level
127 U32 maxdepth; // max. indentation/recursion level 190 UV limit; // escape character values >= this value when encoding
128} enc_t; 191} enc_t;
129 192
130inline void 193INLINE void
131need (enc_t *enc, STRLEN len) 194need (enc_t *enc, STRLEN len)
132{ 195{
133 if (expect_false (enc->cur + len >= enc->end)) 196 if (expect_false (enc->cur + len >= enc->end))
134 { 197 {
135 STRLEN cur = enc->cur - SvPVX (enc->sv); 198 STRLEN cur = enc->cur - SvPVX (enc->sv);
… …
137 enc->cur = SvPVX (enc->sv) + cur; 200 enc->cur = SvPVX (enc->sv) + cur;
138 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 201 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
139 } 202 }
140} 203}
141 204
142inline void 205INLINE void
143encode_ch (enc_t *enc, char ch) 206encode_ch (enc_t *enc, char ch)
144{ 207{
145 need (enc, 1); 208 need (enc, 1);
146 *enc->cur++ = ch; 209 *enc->cur++ = ch;
147} 210}
… …
201 { 264 {
202 uch = ch; 265 uch = ch;
203 clen = 1; 266 clen = 1;
204 } 267 }
205 268
206 if (uch > 0x10FFFFUL) 269 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
207 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
208
209 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
210 { 270 {
211 if (uch > 0xFFFFUL) 271 if (uch >= 0x10000UL)
212 { 272 {
273 if (uch >= 0x110000UL)
274 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
275
213 need (enc, len += 11); 276 need (enc, len += 11);
214 sprintf (enc->cur, "\\u%04x\\u%04x", 277 sprintf (enc->cur, "\\u%04x\\u%04x",
215 (int)((uch - 0x10000) / 0x400 + 0xD800), 278 (int)((uch - 0x10000) / 0x400 + 0xD800),
216 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 279 (int)((uch - 0x10000) % 0x400 + 0xDC00));
217 enc->cur += 12; 280 enc->cur += 12;
… …
245 while (--clen); 308 while (--clen);
246 } 309 }
247 else 310 else
248 { 311 {
249 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 312 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
250 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 313 enc->cur = encode_utf8 (enc->cur, uch);
251 ++str; 314 ++str;
252 } 315 }
253 } 316 }
254 } 317 }
255 } 318 }
256 319
257 --len; 320 --len;
258 } 321 }
259} 322}
260 323
261inline void 324INLINE void
262encode_indent (enc_t *enc) 325encode_indent (enc_t *enc)
263{ 326{
264 if (enc->json.flags & F_INDENT) 327 if (enc->json.flags & F_INDENT)
265 { 328 {
266 int spaces = enc->indent * INDENT_STEP; 329 int spaces = enc->indent * INDENT_STEP;
… …
269 memset (enc->cur, ' ', spaces); 332 memset (enc->cur, ' ', spaces);
270 enc->cur += spaces; 333 enc->cur += spaces;
271 } 334 }
272} 335}
273 336
274inline void 337INLINE void
275encode_space (enc_t *enc) 338encode_space (enc_t *enc)
276{ 339{
277 need (enc, 1); 340 need (enc, 1);
278 encode_ch (enc, ' '); 341 encode_ch (enc, ' ');
279} 342}
280 343
281inline void 344INLINE void
282encode_nl (enc_t *enc) 345encode_nl (enc_t *enc)
283{ 346{
284 if (enc->json.flags & F_INDENT) 347 if (enc->json.flags & F_INDENT)
285 { 348 {
286 need (enc, 1); 349 need (enc, 1);
287 encode_ch (enc, '\n'); 350 encode_ch (enc, '\n');
288 } 351 }
289} 352}
290 353
291inline void 354INLINE void
292encode_comma (enc_t *enc) 355encode_comma (enc_t *enc)
293{ 356{
294 encode_ch (enc, ','); 357 encode_ch (enc, ',');
295 358
296 if (enc->json.flags & F_INDENT) 359 if (enc->json.flags & F_INDENT)
… …
304static void 367static void
305encode_av (enc_t *enc, AV *av) 368encode_av (enc_t *enc, AV *av)
306{ 369{
307 int i, len = av_len (av); 370 int i, len = av_len (av);
308 371
309 if (enc->indent >= enc->maxdepth) 372 if (enc->indent >= enc->json.max_depth)
310 croak ("data structure too deep (hit recursion limit)"); 373 croak (ERR_NESTING_EXCEEDED);
311 374
312 encode_ch (enc, '['); encode_nl (enc); 375 encode_ch (enc, '[');
313 ++enc->indent; 376
377 if (len >= 0)
378 {
379 encode_nl (enc); ++enc->indent;
314 380
315 for (i = 0; i <= len; ++i) 381 for (i = 0; i <= len; ++i)
316 { 382 {
383 SV **svp = av_fetch (av, i, 0);
384
317 encode_indent (enc); 385 encode_indent (enc);
318 encode_sv (enc, *av_fetch (av, i, 0));
319 386
387 if (svp)
388 encode_sv (enc, *svp);
389 else
390 encode_str (enc, "null", 4, 0);
391
320 if (i < len) 392 if (i < len)
321 encode_comma (enc); 393 encode_comma (enc);
322 } 394 }
323 395
396 encode_nl (enc); --enc->indent; encode_indent (enc);
397 }
398
324 encode_nl (enc); 399 encode_ch (enc, ']');
325
326 --enc->indent;
327 encode_indent (enc); encode_ch (enc, ']');
328} 400}
329 401
330static void 402static void
331encode_he (enc_t *enc, HE *he) 403encode_hk (enc_t *enc, HE *he)
332{ 404{
333 encode_ch (enc, '"'); 405 encode_ch (enc, '"');
334 406
335 if (HeKLEN (he) == HEf_SVKEY) 407 if (HeKLEN (he) == HEf_SVKEY)
336 { 408 {
… …
349 encode_ch (enc, '"'); 421 encode_ch (enc, '"');
350 422
351 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 423 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
352 encode_ch (enc, ':'); 424 encode_ch (enc, ':');
353 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 425 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
354 encode_sv (enc, HeVAL (he));
355} 426}
356 427
357// compare hash entries, used when all keys are bytestrings 428// compare hash entries, used when all keys are bytestrings
358static int 429static int
359he_cmp_fast (const void *a_, const void *b_) 430he_cmp_fast (const void *a_, const void *b_)
… …
364 HE *b = *(HE **)b_; 435 HE *b = *(HE **)b_;
365 436
366 STRLEN la = HeKLEN (a); 437 STRLEN la = HeKLEN (a);
367 STRLEN lb = HeKLEN (b); 438 STRLEN lb = HeKLEN (b);
368 439
369 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 440 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
370 cmp = la - lb; 441 cmp = lb - la;
371 442
372 return cmp; 443 return cmp;
373} 444}
374 445
375// compare hash entries, used when some keys are sv's or utf-x 446// compare hash entries, used when some keys are sv's or utf-x
376static int 447static int
377he_cmp_slow (const void *a, const void *b) 448he_cmp_slow (const void *a, const void *b)
378{ 449{
379 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 450 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
380} 451}
381 452
382static void 453static void
383encode_hv (enc_t *enc, HV *hv) 454encode_hv (enc_t *enc, HV *hv)
384{ 455{
385 int count, i; 456 HE *he;
386 457
387 if (enc->indent >= enc->maxdepth) 458 if (enc->indent >= enc->json.max_depth)
388 croak ("data structure too deep (hit recursion limit)"); 459 croak (ERR_NESTING_EXCEEDED);
389 460
390 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 461 encode_ch (enc, '{');
391 462
392 if ((count = hv_iterinit (hv)))
393 {
394 // for canonical output we have to sort by keys first 463 // for canonical output we have to sort by keys first
395 // actually, this is mostly due to the stupid so-called 464 // actually, this is mostly due to the stupid so-called
396 // security workaround added somewhere in 5.8.x. 465 // security workaround added somewhere in 5.8.x.
397 // that randomises hash orderings 466 // that randomises hash orderings
398 if (enc->json.flags & F_CANONICAL) 467 if (enc->json.flags & F_CANONICAL)
468 {
469 int count = hv_iterinit (hv);
470
471 if (SvMAGICAL (hv))
399 { 472 {
473 // need to count by iterating. could improve by dynamically building the vector below
474 // but I don't care for the speed of this special case.
475 // note also that we will run into undefined behaviour when the two iterations
476 // do not result in the same count, something I might care for in some later release.
477
478 count = 0;
479 while (hv_iternext (hv))
480 ++count;
481
482 hv_iterinit (hv);
483 }
484
485 if (count)
486 {
400 int fast = 1; 487 int i, fast = 1;
401 HE *he;
402#if defined(__BORLANDC__) || defined(_MSC_VER) 488#if defined(__BORLANDC__) || defined(_MSC_VER)
403 HE **hes = _alloca (count * sizeof (HE)); 489 HE **hes = _alloca (count * sizeof (HE));
404#else 490#else
405 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 491 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
406#endif 492#endif
… …
433 519
434 FREETMPS; 520 FREETMPS;
435 LEAVE; 521 LEAVE;
436 } 522 }
437 523
438 for (i = 0; i < count; ++i) 524 encode_nl (enc); ++enc->indent;
525
526 while (count--)
439 { 527 {
440 encode_indent (enc); 528 encode_indent (enc);
529 he = hes [count];
441 encode_he (enc, hes [i]); 530 encode_hk (enc, he);
531 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
442 532
443 if (i < count - 1) 533 if (count)
444 encode_comma (enc); 534 encode_comma (enc);
445 } 535 }
446 536
447 encode_nl (enc); 537 encode_nl (enc); --enc->indent; encode_indent (enc);
448 } 538 }
539 }
449 else 540 else
541 {
542 if (hv_iterinit (hv) || SvMAGICAL (hv))
543 if ((he = hv_iternext (hv)))
450 { 544 {
451 HE *he = hv_iternext (hv); 545 encode_nl (enc); ++enc->indent;
452 546
453 for (;;) 547 for (;;)
454 { 548 {
455 encode_indent (enc); 549 encode_indent (enc);
456 encode_he (enc, he); 550 encode_hk (enc, he);
551 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
457 552
458 if (!(he = hv_iternext (hv))) 553 if (!(he = hv_iternext (hv)))
459 break; 554 break;
460 555
461 encode_comma (enc); 556 encode_comma (enc);
462 } 557 }
463 558
464 encode_nl (enc); 559 encode_nl (enc); --enc->indent; encode_indent (enc);
465 } 560 }
466 } 561 }
467 562
468 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 563 encode_ch (enc, '}');
469} 564}
470 565
471// encode objects, arrays and special \0=false and \1=true values. 566// encode objects, arrays and special \0=false and \1=true values.
472static void 567static void
473encode_rv (enc_t *enc, SV *sv) 568encode_rv (enc_t *enc, SV *sv)
… …
477 SvGETMAGIC (sv); 572 SvGETMAGIC (sv);
478 svt = SvTYPE (sv); 573 svt = SvTYPE (sv);
479 574
480 if (expect_false (SvOBJECT (sv))) 575 if (expect_false (SvOBJECT (sv)))
481 { 576 {
577 HV *stash = !JSON_SLOW || json_boolean_stash
578 ? json_boolean_stash
579 : gv_stashpv ("JSON::XS::Boolean", 1);
580
482 if (SvSTASH (sv) == json_boolean_stash) 581 if (SvSTASH (sv) == stash)
483 { 582 {
484 if (SvIV (sv) == 0) 583 if (SvIV (sv))
584 encode_str (enc, "true", 4, 0);
585 else
485 encode_str (enc, "false", 5, 0); 586 encode_str (enc, "false", 5, 0);
486 else
487 encode_str (enc, "true", 4, 0);
488 } 587 }
489 else 588 else
490 { 589 {
491#if 0 590#if 0
492 if (0 && sv_derived_from (rv, "JSON::Literal")) 591 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
495 } 594 }
496#endif 595#endif
497 if (enc->json.flags & F_CONV_BLESSED) 596 if (enc->json.flags & F_CONV_BLESSED)
498 { 597 {
499 // we re-bless the reference to get overload and other niceties right 598 // we re-bless the reference to get overload and other niceties right
500 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 599 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501 600
502 if (to_json) 601 if (to_json)
503 { 602 {
504 dSP; 603 dSP;
505 ENTER; 604
506 SAVETMPS;
507 PUSHMARK (SP); 605 ENTER; SAVETMPS; PUSHMARK (SP);
508 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 606 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509 607
510 // calling with G_SCALAR ensures that we always get a 1 reutrn value 608 // calling with G_SCALAR ensures that we always get a 1 return value
511 // check anyways.
512 PUTBACK; 609 PUTBACK;
513 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 610 call_sv ((SV *)GvCV (to_json), G_SCALAR);
514 SPAGAIN; 611 SPAGAIN;
515 612
613 // catch this surprisingly common error
614 if (SvROK (TOPs) && SvRV (TOPs) == sv)
615 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
616
617 sv = POPs;
618 PUTBACK;
619
516 encode_sv (enc, POPs); 620 encode_sv (enc, sv);
517 621
518 FREETMPS; 622 FREETMPS; LEAVE;
519 LEAVE;
520 } 623 }
521 else if (enc->json.flags & F_ALLOW_BLESSED) 624 else if (enc->json.flags & F_ALLOW_BLESSED)
522 encode_str (enc, "null", 4, 0); 625 encode_str (enc, "null", 4, 0);
523 else 626 else
524 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", 627 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
… …
535 encode_hv (enc, (HV *)sv); 638 encode_hv (enc, (HV *)sv);
536 else if (svt == SVt_PVAV) 639 else if (svt == SVt_PVAV)
537 encode_av (enc, (AV *)sv); 640 encode_av (enc, (AV *)sv);
538 else if (svt < SVt_PVAV) 641 else if (svt < SVt_PVAV)
539 { 642 {
540 if (SvNIOK (sv) && SvIV (sv) == 0) 643 STRLEN len = 0;
644 char *pv = svt ? SvPV (sv, len) : 0;
645
646 if (len == 1 && *pv == '1')
647 encode_str (enc, "true", 4, 0);
648 else if (len == 1 && *pv == '0')
541 encode_str (enc, "false", 5, 0); 649 encode_str (enc, "false", 5, 0);
542 else if (SvNIOK (sv) && SvIV (sv) == 1) 650 else if (enc->json.flags & F_ALLOW_UNKNOWN)
543 encode_str (enc, "true", 4, 0); 651 encode_str (enc, "null", 4, 0);
544 else 652 else
545 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 653 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
546 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 654 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
547 } 655 }
656 else if (enc->json.flags & F_ALLOW_UNKNOWN)
657 encode_str (enc, "null", 4, 0);
548 else 658 else
549 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 659 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
550 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 660 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
551} 661}
552 662
… …
570 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 680 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
571 enc->cur += strlen (enc->cur); 681 enc->cur += strlen (enc->cur);
572 } 682 }
573 else if (SvIOKp (sv)) 683 else if (SvIOKp (sv))
574 { 684 {
575 // we assume we can always read an IV as a UV 685 // we assume we can always read an IV as a UV and vice versa
576 if (SvUV (sv) & ~(UV)0x7fff) 686 // we assume two's complement
577 { 687 // we assume no aliasing issues in the union
578 // large integer, use the (rather slow) snprintf way. 688 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
579 need (enc, sizeof (UV) * 3); 689 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
580 enc->cur +=
581 SvIsUV(sv)
582 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
583 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
584 }
585 else
586 { 690 {
587 // optimise the "small number case" 691 // optimise the "small number case"
588 // code will likely be branchless and use only a single multiplication 692 // code will likely be branchless and use only a single multiplication
693 // works for numbers up to 59074
589 I32 i = SvIV (sv); 694 I32 i = SvIVX (sv);
590 U32 u; 695 U32 u;
591 char digit, nz = 0; 696 char digit, nz = 0;
592 697
593 need (enc, 6); 698 need (enc, 6);
594 699
… …
600 705
601 // now output digit by digit, each time masking out the integer part 706 // now output digit by digit, each time masking out the integer part
602 // and multiplying by 5 while moving the decimal point one to the right, 707 // and multiplying by 5 while moving the decimal point one to the right,
603 // resulting in a net multiplication by 10. 708 // resulting in a net multiplication by 10.
604 // we always write the digit to memory but conditionally increment 709 // we always write the digit to memory but conditionally increment
605 // the pointer, to ease the usage of conditional move instructions. 710 // the pointer, to enable the use of conditional move instructions.
606 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 711 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
607 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 712 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
608 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 713 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
609 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 714 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
610 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 715 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
611 } 716 }
717 else
718 {
719 // large integer, use the (rather slow) snprintf way.
720 need (enc, IVUV_MAXCHARS);
721 enc->cur +=
722 SvIsUV(sv)
723 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
724 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
725 }
612 } 726 }
613 else if (SvROK (sv)) 727 else if (SvROK (sv))
614 encode_rv (enc, SvRV (sv)); 728 encode_rv (enc, SvRV (sv));
615 else if (!SvOK (sv)) 729 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
616 encode_str (enc, "null", 4, 0); 730 encode_str (enc, "null", 4, 0);
617 else 731 else
618 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 732 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
619 SvPV_nolen (sv), SvFLAGS (sv)); 733 SvPV_nolen (sv), SvFLAGS (sv));
620} 734}
621 735
622static SV * 736static SV *
623encode_json (SV *scalar, struct json *json) 737encode_json (SV *scalar, JSON *json)
624{ 738{
625 enc_t enc; 739 enc_t enc;
626 740
627 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 741 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
628 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 742 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
… …
630 enc.json = *json; 744 enc.json = *json;
631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 745 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
632 enc.cur = SvPVX (enc.sv); 746 enc.cur = SvPVX (enc.sv);
633 enc.end = SvEND (enc.sv); 747 enc.end = SvEND (enc.sv);
634 enc.indent = 0; 748 enc.indent = 0;
635 enc.maxdepth = DEC_DEPTH (enc.json.flags); 749 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
750 : enc.json.flags & F_LATIN1 ? 0x000100UL
751 : 0x110000UL;
636 752
637 SvPOK_only (enc.sv); 753 SvPOK_only (enc.sv);
638 encode_sv (&enc, scalar); 754 encode_sv (&enc, scalar);
639 755
640 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 756 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
… …
656typedef struct 772typedef struct
657{ 773{
658 char *cur; // current parser pointer 774 char *cur; // current parser pointer
659 char *end; // end of input string 775 char *end; // end of input string
660 const char *err; // parse error, if != 0 776 const char *err; // parse error, if != 0
661 struct json json; 777 JSON json;
662 U32 depth; // recursion depth 778 U32 depth; // recursion depth
663 U32 maxdepth; // recursion depth limit 779 U32 maxdepth; // recursion depth limit
664} dec_t; 780} dec_t;
665 781
666inline void 782INLINE void
783decode_comment (dec_t *dec)
784{
785 // only '#'-style comments allowed a.t.m.
786
787 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
788 ++dec->cur;
789}
790
791INLINE void
667decode_ws (dec_t *dec) 792decode_ws (dec_t *dec)
668{ 793{
669 for (;;) 794 for (;;)
670 { 795 {
671 char ch = *dec->cur; 796 char ch = *dec->cur;
672 797
673 if (ch > 0x20 798 if (ch > 0x20)
799 {
800 if (expect_false (ch == '#'))
801 {
802 if (dec->json.flags & F_RELAXED)
803 decode_comment (dec);
804 else
805 break;
806 }
807 else
808 break;
809 }
674 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 810 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
675 break; 811 break; // parse error, but let higher level handle it, gives better error messages
676 812
677 ++dec->cur; 813 ++dec->cur;
678 } 814 }
679} 815}
680 816
… …
684 if (*dec->cur != ch) \ 820 if (*dec->cur != ch) \
685 ERR (# ch " expected"); \ 821 ERR (# ch " expected"); \
686 ++dec->cur; \ 822 ++dec->cur; \
687 SE 823 SE
688 824
689#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 825#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
690#define DEC_DEC_DEPTH --dec->depth 826#define DEC_DEC_DEPTH --dec->depth
691 827
692static SV *decode_sv (dec_t *dec); 828static SV *decode_sv (dec_t *dec);
693 829
694static signed char decode_hexdigit[256]; 830static signed char decode_hexdigit[256];
… …
786 922
787 if (hi >= 0x80) 923 if (hi >= 0x80)
788 { 924 {
789 utf8 = 1; 925 utf8 = 1;
790 926
791 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 927 cur = encode_utf8 (cur, hi);
792 } 928 }
793 else 929 else
794 *cur++ = hi; 930 *cur++ = hi;
795 } 931 }
796 break; 932 break;
… …
798 default: 934 default:
799 --dec_cur; 935 --dec_cur;
800 ERR ("illegal backslash escape sequence in string"); 936 ERR ("illegal backslash escape sequence in string");
801 } 937 }
802 } 938 }
803 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 939 else if (expect_true (ch >= 0x20 && ch < 0x80))
804 *cur++ = ch; 940 *cur++ = ch;
805 else if (ch >= 0x80) 941 else if (ch >= 0x80)
806 { 942 {
807 STRLEN clen; 943 STRLEN clen;
808 UV uch; 944 UV uch;
… …
929 is_nv = 1; 1065 is_nv = 1;
930 } 1066 }
931 1067
932 if (!is_nv) 1068 if (!is_nv)
933 { 1069 {
1070 int len = dec->cur - start;
1071
934 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1072 // special case the rather common 1..5-digit-int case
935 if (*start == '-') 1073 if (*start == '-')
936 switch (dec->cur - start) 1074 switch (len)
937 { 1075 {
938 case 2: return newSViv (-( start [1] - '0' * 1)); 1076 case 2: return newSViv (-( start [1] - '0' * 1));
939 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1077 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
940 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1078 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
941 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1079 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1080 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
942 } 1081 }
943 else 1082 else
944 switch (dec->cur - start) 1083 switch (len)
945 { 1084 {
946 case 1: return newSViv ( start [0] - '0' * 1); 1085 case 1: return newSViv ( start [0] - '0' * 1);
947 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1086 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
948 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1087 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
949 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1088 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1089 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
950 } 1090 }
951 1091
952 { 1092 {
953 UV uv; 1093 UV uv;
954 int numtype = grok_number (start, dec->cur - start, &uv); 1094 int numtype = grok_number (start, len, &uv);
955 if (numtype & IS_NUMBER_IN_UV) 1095 if (numtype & IS_NUMBER_IN_UV)
956 if (numtype & IS_NUMBER_NEG) 1096 if (numtype & IS_NUMBER_NEG)
957 { 1097 {
958 if (uv < (UV)IV_MIN) 1098 if (uv < (UV)IV_MIN)
959 return newSViv (-(IV)uv); 1099 return newSViv (-(IV)uv);
960 } 1100 }
961 else 1101 else
962 return newSVuv (uv); 1102 return newSVuv (uv);
963
964 // here would likely be the place for bigint support
965 } 1103 }
966 }
967 1104
968 // if we ever support bigint or bigfloat, this is the place for bigfloat 1105 len -= *start == '-' ? 1 : 0;
1106
1107 // does not fit into IV or UV, try NV
1108 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1109 #if defined (LDBL_DIG)
1110 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1111 #endif
1112 )
1113 // fits into NV without loss of precision
1114 return newSVnv (Atof (start));
1115
1116 // everything else fails, convert it to a string
1117 return newSVpvn (start, dec->cur - start);
1118 }
1119
1120 // loss of precision here
969 return newSVnv (Atof (start)); 1121 return newSVnv (Atof (start));
970 1122
971fail: 1123fail:
972 return 0; 1124 return 0;
973} 1125}
… …
1003 1155
1004 if (*dec->cur != ',') 1156 if (*dec->cur != ',')
1005 ERR (", or ] expected while parsing array"); 1157 ERR (", or ] expected while parsing array");
1006 1158
1007 ++dec->cur; 1159 ++dec->cur;
1160
1161 decode_ws (dec);
1162
1163 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1164 {
1165 ++dec->cur;
1166 break;
1167 }
1008 } 1168 }
1009 1169
1010 DEC_DEC_DEPTH; 1170 DEC_DEC_DEPTH;
1011 return newRV_noinc ((SV *)av); 1171 return newRV_noinc ((SV *)av);
1012 1172
… …
1017} 1177}
1018 1178
1019static SV * 1179static SV *
1020decode_hv (dec_t *dec) 1180decode_hv (dec_t *dec)
1021{ 1181{
1182 SV *sv;
1022 HV *hv = newHV (); 1183 HV *hv = newHV ();
1023 1184
1024 DEC_INC_DEPTH; 1185 DEC_INC_DEPTH;
1025 decode_ws (dec); 1186 decode_ws (dec);
1026 1187
1027 if (*dec->cur == '}') 1188 if (*dec->cur == '}')
1028 ++dec->cur; 1189 ++dec->cur;
1029 else 1190 else
1030 for (;;) 1191 for (;;)
1031 { 1192 {
1032 decode_ws (dec); EXPECT_CH ('"'); 1193 EXPECT_CH ('"');
1033 1194
1034 // heuristic: assume that 1195 // heuristic: assume that
1035 // a) decode_str + hv_store_ent are abysmally slow. 1196 // a) decode_str + hv_store_ent are abysmally slow.
1036 // b) most hash keys are short, simple ascii text. 1197 // b) most hash keys are short, simple ascii text.
1037 // => try to "fast-match" such strings to avoid 1198 // => try to "fast-match" such strings to avoid
… …
1041 char *p = dec->cur; 1202 char *p = dec->cur;
1042 char *e = p + 24; // only try up to 24 bytes 1203 char *e = p + 24; // only try up to 24 bytes
1043 1204
1044 for (;;) 1205 for (;;)
1045 { 1206 {
1046 // the >= 0x80 is true on most architectures 1207 // the >= 0x80 is false on most architectures
1047 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1208 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1048 { 1209 {
1049 // slow path, back up and use decode_str 1210 // slow path, back up and use decode_str
1050 SV *key = decode_str (dec); 1211 SV *key = decode_str (dec);
1051 if (!key) 1212 if (!key)
1052 goto fail; 1213 goto fail;
1053 1214
1054 decode_ws (dec); EXPECT_CH (':'); 1215 decode_ws (dec); EXPECT_CH (':');
1055 1216
1217 decode_ws (dec);
1056 value = decode_sv (dec); 1218 value = decode_sv (dec);
1057 if (!value) 1219 if (!value)
1058 { 1220 {
1059 SvREFCNT_dec (key); 1221 SvREFCNT_dec (key);
1060 goto fail; 1222 goto fail;
… …
1072 int len = p - key; 1234 int len = p - key;
1073 dec->cur = p + 1; 1235 dec->cur = p + 1;
1074 1236
1075 decode_ws (dec); EXPECT_CH (':'); 1237 decode_ws (dec); EXPECT_CH (':');
1076 1238
1239 decode_ws (dec);
1077 value = decode_sv (dec); 1240 value = decode_sv (dec);
1078 if (!value) 1241 if (!value)
1079 goto fail; 1242 goto fail;
1080 1243
1081 hv_store (hv, key, len, value, 0); 1244 hv_store (hv, key, len, value, 0);
… …
1097 1260
1098 if (*dec->cur != ',') 1261 if (*dec->cur != ',')
1099 ERR (", or } expected while parsing object/hash"); 1262 ERR (", or } expected while parsing object/hash");
1100 1263
1101 ++dec->cur; 1264 ++dec->cur;
1265
1266 decode_ws (dec);
1267
1268 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1269 {
1270 ++dec->cur;
1271 break;
1272 }
1102 } 1273 }
1103 1274
1104 DEC_DEC_DEPTH; 1275 DEC_DEC_DEPTH;
1105 return newRV_noinc ((SV *)hv); 1276 sv = newRV_noinc ((SV *)hv);
1277
1278 // check filter callbacks
1279 if (dec->json.flags & F_HOOK)
1280 {
1281 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1282 {
1283 HE *cb, *he;
1284
1285 hv_iterinit (hv);
1286 he = hv_iternext (hv);
1287 hv_iterinit (hv);
1288
1289 // the next line creates a mortal sv each time its called.
1290 // might want to optimise this for common cases.
1291 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1292
1293 if (cb)
1294 {
1295 dSP;
1296 int count;
1297
1298 ENTER; SAVETMPS; PUSHMARK (SP);
1299 XPUSHs (HeVAL (he));
1300
1301 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1302
1303 if (count == 1)
1304 {
1305 sv = newSVsv (POPs);
1306 FREETMPS; LEAVE;
1307 return sv;
1308 }
1309
1310 FREETMPS; LEAVE;
1311 }
1312 }
1313
1314 if (dec->json.cb_object)
1315 {
1316 dSP;
1317 int count;
1318
1319 ENTER; SAVETMPS; PUSHMARK (SP);
1320 XPUSHs (sv_2mortal (sv));
1321
1322 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1323
1324 if (count == 1)
1325 {
1326 sv = newSVsv (POPs);
1327 FREETMPS; LEAVE;
1328 return sv;
1329 }
1330
1331 SvREFCNT_inc (sv);
1332 FREETMPS; LEAVE;
1333 }
1334 }
1335
1336 return sv;
1106 1337
1107fail: 1338fail:
1108 SvREFCNT_dec (hv); 1339 SvREFCNT_dec (hv);
1109 DEC_DEC_DEPTH; 1340 DEC_DEC_DEPTH;
1110 return 0; 1341 return 0;
1111} 1342}
1112 1343
1113static SV * 1344static SV *
1114decode_sv (dec_t *dec) 1345decode_sv (dec_t *dec)
1115{ 1346{
1116 decode_ws (dec);
1117
1118 // the beauty of JSON: you need exactly one character lookahead 1347 // the beauty of JSON: you need exactly one character lookahead
1119 // to parse anything. 1348 // to parse everything.
1120 switch (*dec->cur) 1349 switch (*dec->cur)
1121 { 1350 {
1122 case '"': ++dec->cur; return decode_str (dec); 1351 case '"': ++dec->cur; return decode_str (dec);
1123 case '[': ++dec->cur; return decode_av (dec); 1352 case '[': ++dec->cur; return decode_av (dec);
1124 case '{': ++dec->cur; return decode_hv (dec); 1353 case '{': ++dec->cur; return decode_hv (dec);
1125 1354
1126 case '-': 1355 case '-':
1127 case '0': case '1': case '2': case '3': case '4': 1356 case '0': case '1': case '2': case '3': case '4':
1128 case '5': case '6': case '7': case '8': case '9': 1357 case '5': case '6': case '7': case '8': case '9':
1129 return decode_num (dec); 1358 return decode_num (dec);
1130 1359
1131 case 't': 1360 case 't':
1132 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1361 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1133 { 1362 {
1134 dec->cur += 4; 1363 dec->cur += 4;
1364#if JSON_SLOW
1365 json_true = get_bool ("JSON::XS::true");
1366#endif
1135 return SvREFCNT_inc (json_true); 1367 return newSVsv (json_true);
1136 } 1368 }
1137 else 1369 else
1138 ERR ("'true' expected"); 1370 ERR ("'true' expected");
1139 1371
1140 break; 1372 break;
1141 1373
1142 case 'f': 1374 case 'f':
1143 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1375 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1144 { 1376 {
1145 dec->cur += 5; 1377 dec->cur += 5;
1378#if JSON_SLOW
1379 json_false = get_bool ("JSON::XS::false");
1380#endif
1146 return SvREFCNT_inc (json_false); 1381 return newSVsv (json_false);
1147 } 1382 }
1148 else 1383 else
1149 ERR ("'false' expected"); 1384 ERR ("'false' expected");
1150 1385
1151 break; 1386 break;
… …
1169fail: 1404fail:
1170 return 0; 1405 return 0;
1171} 1406}
1172 1407
1173static SV * 1408static SV *
1174decode_json (SV *string, struct json *json, UV *offset_return) 1409decode_json (SV *string, JSON *json, STRLEN *offset_return)
1175{ 1410{
1176 dec_t dec; 1411 dec_t dec;
1177 UV offset; 1412 STRLEN offset;
1178 SV *sv; 1413 SV *sv;
1179 1414
1180 SvGETMAGIC (string); 1415 SvGETMAGIC (string);
1181 SvUPGRADE (string, SVt_PV); 1416 SvUPGRADE (string, SVt_PV);
1182 1417
1183 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1418 if (SvCUR (string) > json->max_size && json->max_size)
1184 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1419 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1185 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1420 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1186 1421
1187 if (json->flags & F_UTF8) 1422 if (json->flags & F_UTF8)
1188 sv_utf8_downgrade (string, 0); 1423 sv_utf8_downgrade (string, 0);
1189 else 1424 else
1190 sv_utf8_upgrade (string); 1425 sv_utf8_upgrade (string);
1191 1426
1192 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1427 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1193 1428
1194 dec.json = *json; 1429 dec.json = *json;
1195 dec.cur = SvPVX (string); 1430 dec.cur = SvPVX (string);
1196 dec.end = SvEND (string); 1431 dec.end = SvEND (string);
1197 dec.err = 0; 1432 dec.err = 0;
1198 dec.depth = 0; 1433 dec.depth = 0;
1199 dec.maxdepth = DEC_DEPTH (dec.json.flags); 1434
1435 if (dec.json.cb_object || dec.json.cb_sk_object)
1436 dec.json.flags |= F_HOOK;
1200 1437
1201 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1438 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1439
1440 decode_ws (&dec);
1202 sv = decode_sv (&dec); 1441 sv = decode_sv (&dec);
1203 1442
1204 if (!(offset_return || !sv)) 1443 if (!(offset_return || !sv))
1205 { 1444 {
1206 // check for trailing garbage 1445 // check for trailing garbage
… …
1250 1489
1251 return sv; 1490 return sv;
1252} 1491}
1253 1492
1254///////////////////////////////////////////////////////////////////////////// 1493/////////////////////////////////////////////////////////////////////////////
1494// incremental parser
1495
1496static void
1497incr_parse (JSON *self)
1498{
1499 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1500
1501 for (;;)
1502 {
1503 //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
1504 switch (self->incr_mode)
1505 {
1506 // only used for intiial whitespace skipping
1507 case INCR_M_WS:
1508 for (;;)
1509 {
1510 if (*p > 0x20)
1511 {
1512 self->incr_mode = INCR_M_JSON;
1513 goto incr_m_json;
1514 }
1515 else if (!*p)
1516 goto interrupt;
1517
1518 ++p;
1519 }
1520
1521 // skip a single char inside a string (for \\-processing)
1522 case INCR_M_BS:
1523 if (!*p)
1524 goto interrupt;
1525
1526 ++p;
1527 self->incr_mode = INCR_M_STR;
1528 goto incr_m_str;
1529
1530 // inside a string
1531 case INCR_M_STR:
1532 incr_m_str:
1533 for (;;)
1534 {
1535 if (*p == '"')
1536 {
1537 ++p;
1538 self->incr_mode = INCR_M_JSON;
1539
1540 if (!self->incr_nest)
1541 goto interrupt;
1542
1543 goto incr_m_json;
1544 }
1545 else if (*p == '\\')
1546 {
1547 ++p; // "virtually" consumes character after \
1548
1549 if (!*p) // if at end of string we have to switch modes
1550 {
1551 self->incr_mode = INCR_M_BS;
1552 goto interrupt;
1553 }
1554 }
1555 else if (!*p)
1556 goto interrupt;
1557
1558 ++p;
1559 }
1560
1561 // after initial ws, outside string
1562 case INCR_M_JSON:
1563 incr_m_json:
1564 for (;;)
1565 {
1566 switch (*p++)
1567 {
1568 case 0:
1569 --p;
1570 goto interrupt;
1571
1572 case 0x09:
1573 case 0x0a:
1574 case 0x0d:
1575 case 0x20:
1576 if (!self->incr_nest)
1577 {
1578 --p; // do not eat the whitespace, let the next round do it
1579 goto interrupt;
1580 }
1581 break;
1582
1583 case '"':
1584 self->incr_mode = INCR_M_STR;
1585 goto incr_m_str;
1586
1587 case '[':
1588 case '{':
1589 if (++self->incr_nest > self->max_depth)
1590 croak (ERR_NESTING_EXCEEDED);
1591 break;
1592
1593 case ']':
1594 case '}':
1595 if (!--self->incr_nest)
1596 goto interrupt;
1597 }
1598 }
1599 }
1600
1601 modechange:
1602 ;
1603 }
1604
1605interrupt:
1606 self->incr_pos = p - SvPVX (self->incr_text);
1607 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1608}
1609
1610/////////////////////////////////////////////////////////////////////////////
1255// XS interface functions 1611// XS interface functions
1256 1612
1257MODULE = JSON::XS PACKAGE = JSON::XS 1613MODULE = JSON::XS PACKAGE = JSON::XS
1258 1614
1259BOOT: 1615BOOT:
… …
1268 : -1; 1624 : -1;
1269 1625
1270 json_stash = gv_stashpv ("JSON::XS" , 1); 1626 json_stash = gv_stashpv ("JSON::XS" , 1);
1271 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1627 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1272 1628
1273 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1629 json_true = get_bool ("JSON::XS::true");
1274 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1630 json_false = get_bool ("JSON::XS::false");
1275} 1631}
1276 1632
1277PROTOTYPES: DISABLE 1633PROTOTYPES: DISABLE
1278 1634
1279SV *new (char *dummy) 1635void CLONE (...)
1280 CODE: 1636 CODE:
1281 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1637 json_stash = 0;
1282 OUTPUT: 1638 json_boolean_stash = 0;
1283 RETVAL
1284 1639
1640void new (char *klass)
1641 PPCODE:
1642{
1643 SV *pv = NEWSV (0, sizeof (JSON));
1644 SvPOK_only (pv);
1645 json_init ((JSON *)SvPVX (pv));
1646 XPUSHs (sv_2mortal (sv_bless (
1647 newRV_noinc (pv),
1648 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1649 )));
1650}
1651
1285SV *ascii (SV *self, int enable = 1) 1652void ascii (JSON *self, int enable = 1)
1286 ALIAS: 1653 ALIAS:
1287 ascii = F_ASCII 1654 ascii = F_ASCII
1288 latin1 = F_LATIN1 1655 latin1 = F_LATIN1
1289 utf8 = F_UTF8 1656 utf8 = F_UTF8
1290 indent = F_INDENT 1657 indent = F_INDENT
… …
1294 pretty = F_PRETTY 1661 pretty = F_PRETTY
1295 allow_nonref = F_ALLOW_NONREF 1662 allow_nonref = F_ALLOW_NONREF
1296 shrink = F_SHRINK 1663 shrink = F_SHRINK
1297 allow_blessed = F_ALLOW_BLESSED 1664 allow_blessed = F_ALLOW_BLESSED
1298 convert_blessed = F_CONV_BLESSED 1665 convert_blessed = F_CONV_BLESSED
1666 relaxed = F_RELAXED
1667 allow_unknown = F_ALLOW_UNKNOWN
1668 PPCODE:
1669{
1670 if (enable)
1671 self->flags |= ix;
1672 else
1673 self->flags &= ~ix;
1674
1675 XPUSHs (ST (0));
1676}
1677
1678void get_ascii (JSON *self)
1679 ALIAS:
1680 get_ascii = F_ASCII
1681 get_latin1 = F_LATIN1
1682 get_utf8 = F_UTF8
1683 get_indent = F_INDENT
1684 get_canonical = F_CANONICAL
1685 get_space_before = F_SPACE_BEFORE
1686 get_space_after = F_SPACE_AFTER
1687 get_allow_nonref = F_ALLOW_NONREF
1688 get_shrink = F_SHRINK
1689 get_allow_blessed = F_ALLOW_BLESSED
1690 get_convert_blessed = F_CONV_BLESSED
1691 get_relaxed = F_RELAXED
1692 get_allow_unknown = F_ALLOW_UNKNOWN
1693 PPCODE:
1694 XPUSHs (boolSV (self->flags & ix));
1695
1696void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1697 PPCODE:
1698 self->max_depth = max_depth;
1699 XPUSHs (ST (0));
1700
1701U32 get_max_depth (JSON *self)
1299 CODE: 1702 CODE:
1300{ 1703 RETVAL = self->max_depth;
1301 UV *uv = SvJSON (self);
1302 if (enable)
1303 *uv |= ix;
1304 else
1305 *uv &= ~ix;
1306
1307 RETVAL = newSVsv (self);
1308}
1309 OUTPUT: 1704 OUTPUT:
1310 RETVAL 1705 RETVAL
1311 1706
1312SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1707void max_size (JSON *self, U32 max_size = 0)
1708 PPCODE:
1709 self->max_size = max_size;
1710 XPUSHs (ST (0));
1711
1712int get_max_size (JSON *self)
1313 CODE: 1713 CODE:
1314{ 1714 RETVAL = self->max_size;
1315 UV *uv = SvJSON (self);
1316 UV log2 = 0;
1317
1318 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1319
1320 while ((1UL << log2) < max_depth)
1321 ++log2;
1322
1323 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1324
1325 RETVAL = newSVsv (self);
1326}
1327 OUTPUT: 1715 OUTPUT:
1328 RETVAL 1716 RETVAL
1329 1717
1330SV *max_size (SV *self, UV max_size = 0) 1718void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1719 PPCODE:
1720{
1721 SvREFCNT_dec (self->cb_object);
1722 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1723
1724 XPUSHs (ST (0));
1725}
1726
1727void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1728 PPCODE:
1729{
1730 if (!self->cb_sk_object)
1731 self->cb_sk_object = newHV ();
1732
1733 if (SvOK (cb))
1734 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1735 else
1736 {
1737 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1738
1739 if (!HvKEYS (self->cb_sk_object))
1740 {
1741 SvREFCNT_dec (self->cb_sk_object);
1742 self->cb_sk_object = 0;
1743 }
1744 }
1745
1746 XPUSHs (ST (0));
1747}
1748
1749void encode (JSON *self, SV *scalar)
1750 PPCODE:
1751 XPUSHs (encode_json (scalar, self));
1752
1753void decode (JSON *self, SV *jsonstr)
1754 PPCODE:
1755 XPUSHs (decode_json (jsonstr, self, 0));
1756
1757void decode_prefix (JSON *self, SV *jsonstr)
1758 PPCODE:
1759{
1760 STRLEN offset;
1761 EXTEND (SP, 2);
1762 PUSHs (decode_json (jsonstr, self, &offset));
1763 PUSHs (sv_2mortal (newSVuv (offset)));
1764}
1765
1766void incr_parse (JSON *self, SV *jsonstr = 0)
1767 PPCODE:
1768{
1769 if (!self->incr_text)
1770 self->incr_text = newSVpvn ("", 0);
1771
1772 // append data, if any
1773 if (jsonstr)
1774 {
1775 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
1776 {
1777 /* utf-8-ness differs, need to upgrade */
1778 sv_utf8_upgrade (self->incr_text);
1779
1780 if (self->incr_pos)
1781 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1782 - (U8 *)SvPVX (self->incr_text);
1783 }
1784
1785 {
1786 STRLEN len;
1787 const char *str = SvPV (jsonstr, len);
1788 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
1789 Move (str, SvEND (self->incr_text), len, char);
1790 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1791 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1792 }
1793 }
1794
1795 if (GIMME_V != G_VOID)
1796 do
1797 {
1798 STRLEN offset;
1799
1800 if (!INCR_DONE (self))
1801 {
1802 incr_parse (self);
1803
1804 if (self->incr_pos > self->max_size && self->max_size)
1805 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1806 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1807
1808 if (!INCR_DONE (self))
1809 break;
1810 }
1811
1812 XPUSHs (decode_json (self->incr_text, self, &offset));
1813
1814 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1815 self->incr_pos -= offset;
1816 self->incr_nest = 0;
1817 self->incr_mode = 0;
1818 }
1819 while (GIMME_V == G_ARRAY);
1820}
1821
1822SV *incr_text (JSON *self)
1823 ATTRS: lvalue
1331 CODE: 1824 CODE:
1332{ 1825{
1333 UV *uv = SvJSON (self); 1826 if (self->incr_pos)
1334 UV log2 = 0; 1827 croak ("incr_text can not be called when the incremental parser already started parsing");
1335 1828
1336 if (max_size > 0x80000000UL) max_size = 0x80000000UL; 1829 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1337 if (max_size == 1) max_size = 2;
1338
1339 while ((1UL << log2) < max_size)
1340 ++log2;
1341
1342 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1343
1344 RETVAL = newSVsv (self);
1345} 1830}
1346 OUTPUT: 1831 OUTPUT:
1347 RETVAL 1832 RETVAL
1348 1833
1834void incr_skip (JSON *self)
1835 CODE:
1836{
1837 if (self->incr_pos)
1838 {
1839 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
1840 self->incr_pos = 0;
1841 self->incr_nest = 0;
1842 self->incr_mode = 0;
1843 }
1844}
1845
1846void DESTROY (JSON *self)
1847 CODE:
1848 SvREFCNT_dec (self->cb_sk_object);
1849 SvREFCNT_dec (self->cb_object);
1850 SvREFCNT_dec (self->incr_text);
1851
1852PROTOTYPES: ENABLE
1853
1349void encode (SV *self, SV *scalar) 1854void encode_json (SV *scalar)
1855 ALIAS:
1856 to_json_ = 0
1857 encode_json = F_UTF8
1350 PPCODE: 1858 PPCODE:
1351{ 1859{
1352 struct json json = { *SvJSON (self) }; 1860 JSON json;
1861 json_init (&json);
1862 json.flags |= ix;
1353 XPUSHs (encode_json (scalar, &json)); 1863 XPUSHs (encode_json (scalar, &json));
1354} 1864}
1355 1865
1356void decode (SV *self, SV *jsonstr) 1866void decode_json (SV *jsonstr)
1867 ALIAS:
1868 from_json_ = 0
1869 decode_json = F_UTF8
1357 PPCODE: 1870 PPCODE:
1358{ 1871{
1359 struct json json = { *SvJSON (self) }; 1872 JSON json;
1873 json_init (&json);
1874 json.flags |= ix;
1360 XPUSHs (decode_json (jsonstr, &json, 0)); 1875 XPUSHs (decode_json (jsonstr, &json, 0));
1361} 1876}
1362 1877
1363void decode_prefix (SV *self, SV *jsonstr)
1364 PPCODE:
1365{
1366 UV offset;
1367 struct json json = { *SvJSON (self) };
1368 EXTEND (SP, 2);
1369 PUSHs (decode_json (jsonstr, &json, &offset));
1370 PUSHs (sv_2mortal (newSVuv (offset)));
1371}
1372 1878
1373PROTOTYPES: ENABLE
1374
1375void to_json (SV *scalar)
1376 PPCODE:
1377{
1378 struct json json = { F_DEFAULT | F_UTF8 };
1379 XPUSHs (encode_json (scalar, &json));
1380}
1381
1382void from_json (SV *jsonstr)
1383 PPCODE:
1384{
1385 struct json json = { F_DEFAULT | F_UTF8 };
1386 XPUSHs (decode_json (jsonstr, &json, 0));
1387}
1388

Diff Legend

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