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.60 by root, Mon Aug 13 16:19:13 2007 UTC vs.
Revision 1.87 by root, Tue Jun 3 06:43:45 2008 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
… …
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// guarentees, 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#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
20 23
21#define F_ASCII 0x00000001UL 24#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 25#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 26#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 27#define F_INDENT 0x00000008UL
… …
27#define F_SPACE_AFTER 0x00000040UL 30#define F_SPACE_AFTER 0x00000040UL
28#define F_ALLOW_NONREF 0x00000100UL 31#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 32#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 33#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 34#define F_CONV_BLESSED 0x00000800UL
32#define F_MAXDEPTH 0xf8000000UL
33#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL 35#define F_RELAXED 0x00001000UL
35#define S_MAXSIZE 20 36#define F_ALLOW_UNKNOWN 0x00002000UL
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
37 38
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 39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
42#define F_DEFAULT (9UL << S_MAXDEPTH)
43 40
44#define INIT_SIZE 32 // initial scalar size to be allocated 41#define INIT_SIZE 32 // initial scalar size to be allocated
45#define INDENT_STEP 3 // spaces per indentation level 42#define INDENT_STEP 3 // spaces per indentation level
46 43
47#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
48 45
49#define SB do { 46#define SB do {
50#define SE } while (0) 47#define SE } while (0)
51 48
52#if __GNUC__ >= 3 49#if __GNUC__ >= 3
53# define expect(expr,value) __builtin_expect ((expr),(value)) 50# define expect(expr,value) __builtin_expect ((expr), (value))
54# define inline inline 51# define INLINE static inline
55#else 52#else
56# define expect(expr,value) (expr) 53# define expect(expr,value) (expr)
57# define inline static 54# define INLINE static
58#endif 55#endif
59 56
60#define expect_false(expr) expect ((expr) != 0, 0) 57#define expect_false(expr) expect ((expr) != 0, 0)
61#define expect_true(expr) expect ((expr) != 0, 1) 58#define expect_true(expr) expect ((expr) != 0, 1)
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?)"
62 65
63#ifdef USE_ITHREADS 66#ifdef USE_ITHREADS
64# define JSON_SLOW 1 67# define JSON_SLOW 1
65# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 68# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
66#else 69#else
… …
69#endif 72#endif
70 73
71static HV *json_stash, *json_boolean_stash; // JSON::XS:: 74static HV *json_stash, *json_boolean_stash; // JSON::XS::
72static SV *json_true, *json_false; 75static SV *json_true, *json_false;
73 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
74typedef struct { 86typedef struct {
75 U32 flags; 87 U32 flags;
88 U32 max_depth;
89 STRLEN max_size;
90
76 SV *cb_object; 91 SV *cb_object;
77 HV *cb_sk_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;
78} JSON; 99} JSON;
100
101INLINE void
102json_init (JSON *json)
103{
104 Zero (json, 1, JSON);
105 json->max_depth = 512;
106}
79 107
80///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
81// utility functions 109// utility functions
82 110
83inline void 111INLINE SV *
112get_bool (const char *name)
113{
114 SV *sv = get_sv (name, 1);
115
116 SvREADONLY_on (sv);
117 SvREADONLY_on (SvRV (sv));
118
119 return sv;
120}
121
122INLINE void
84shrink (SV *sv) 123shrink (SV *sv)
85{ 124{
86 sv_utf8_downgrade (sv, 1); 125 sv_utf8_downgrade (sv, 1);
126
87 if (SvLEN (sv) > SvCUR (sv) + 1) 127 if (SvLEN (sv) > SvCUR (sv) + 1)
88 { 128 {
89#ifdef SvPV_shrink_to_cur 129#ifdef SvPV_shrink_to_cur
90 SvPV_shrink_to_cur (sv); 130 SvPV_shrink_to_cur (sv);
91#elif defined (SvPV_renew) 131#elif defined (SvPV_renew)
… …
97// decode an utf-8 character and return it, or (UV)-1 in 137// decode an utf-8 character and return it, or (UV)-1 in
98// case of an error. 138// case of an error.
99// we special-case "safe" characters from U+80 .. U+7FF, 139// we special-case "safe" characters from U+80 .. U+7FF,
100// but use the very good perl function to parse anything else. 140// but use the very good perl function to parse anything else.
101// note that we never call this function for a ascii codepoints 141// note that we never call this function for a ascii codepoints
102inline UV 142INLINE UV
103decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 143decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
104{ 144{
105 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 145 if (expect_true (len >= 2
106 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 146 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
107 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 147 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
108 { 148 {
109 *clen = 2; 149 *clen = 2;
110 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 150 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
111 } 151 }
112 else 152 else
113 { 153 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
114 *clen = (STRLEN)-1; 154}
115 return (UV)-1; 155
116 } 156// likewise for encoding, also never called for ascii codepoints
157// this function takes advantage of this fact, although current gccs
158// seem to optimise the check for >= 0x80 away anyways
159INLINE unsigned char *
160encode_utf8 (unsigned char *s, UV ch)
161{
162 if (expect_false (ch < 0x000080))
163 *s++ = ch;
164 else if (expect_true (ch < 0x000800))
165 *s++ = 0xc0 | ( ch >> 6),
166 *s++ = 0x80 | ( ch & 0x3f);
167 else if ( ch < 0x010000)
168 *s++ = 0xe0 | ( ch >> 12),
169 *s++ = 0x80 | ((ch >> 6) & 0x3f),
170 *s++ = 0x80 | ( ch & 0x3f);
171 else if ( ch < 0x110000)
172 *s++ = 0xf0 | ( ch >> 18),
173 *s++ = 0x80 | ((ch >> 12) & 0x3f),
174 *s++ = 0x80 | ((ch >> 6) & 0x3f),
175 *s++ = 0x80 | ( ch & 0x3f);
176
177 return s;
117} 178}
118 179
119///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
120// encoder 181// encoder
121 182
… …
125 char *cur; // SvPVX (sv) + current output position 186 char *cur; // SvPVX (sv) + current output position
126 char *end; // SvEND (sv) 187 char *end; // SvEND (sv)
127 SV *sv; // result scalar 188 SV *sv; // result scalar
128 JSON json; 189 JSON json;
129 U32 indent; // indentation level 190 U32 indent; // indentation level
130 U32 maxdepth; // max. indentation/recursion level 191 UV limit; // escape character values >= this value when encoding
131} enc_t; 192} enc_t;
132 193
133inline void 194INLINE void
134need (enc_t *enc, STRLEN len) 195need (enc_t *enc, STRLEN len)
135{ 196{
136 if (expect_false (enc->cur + len >= enc->end)) 197 if (expect_false (enc->cur + len >= enc->end))
137 { 198 {
138 STRLEN cur = enc->cur - SvPVX (enc->sv); 199 STRLEN cur = enc->cur - SvPVX (enc->sv);
… …
140 enc->cur = SvPVX (enc->sv) + cur; 201 enc->cur = SvPVX (enc->sv) + cur;
141 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 202 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
142 } 203 }
143} 204}
144 205
145inline void 206INLINE void
146encode_ch (enc_t *enc, char ch) 207encode_ch (enc_t *enc, char ch)
147{ 208{
148 need (enc, 1); 209 need (enc, 1);
149 *enc->cur++ = ch; 210 *enc->cur++ = ch;
150} 211}
… …
204 { 265 {
205 uch = ch; 266 uch = ch;
206 clen = 1; 267 clen = 1;
207 } 268 }
208 269
209 if (uch > 0x10FFFFUL) 270 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
210 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
211
212 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
213 { 271 {
214 if (uch > 0xFFFFUL) 272 if (uch >= 0x10000UL)
215 { 273 {
274 if (uch >= 0x110000UL)
275 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
276
216 need (enc, len += 11); 277 need (enc, len += 11);
217 sprintf (enc->cur, "\\u%04x\\u%04x", 278 sprintf (enc->cur, "\\u%04x\\u%04x",
218 (int)((uch - 0x10000) / 0x400 + 0xD800), 279 (int)((uch - 0x10000) / 0x400 + 0xD800),
219 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 280 (int)((uch - 0x10000) % 0x400 + 0xDC00));
220 enc->cur += 12; 281 enc->cur += 12;
… …
248 while (--clen); 309 while (--clen);
249 } 310 }
250 else 311 else
251 { 312 {
252 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 313 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
253 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 314 enc->cur = encode_utf8 (enc->cur, uch);
254 ++str; 315 ++str;
255 } 316 }
256 } 317 }
257 } 318 }
258 } 319 }
259 320
260 --len; 321 --len;
261 } 322 }
262} 323}
263 324
264inline void 325INLINE void
265encode_indent (enc_t *enc) 326encode_indent (enc_t *enc)
266{ 327{
267 if (enc->json.flags & F_INDENT) 328 if (enc->json.flags & F_INDENT)
268 { 329 {
269 int spaces = enc->indent * INDENT_STEP; 330 int spaces = enc->indent * INDENT_STEP;
… …
272 memset (enc->cur, ' ', spaces); 333 memset (enc->cur, ' ', spaces);
273 enc->cur += spaces; 334 enc->cur += spaces;
274 } 335 }
275} 336}
276 337
277inline void 338INLINE void
278encode_space (enc_t *enc) 339encode_space (enc_t *enc)
279{ 340{
280 need (enc, 1); 341 need (enc, 1);
281 encode_ch (enc, ' '); 342 encode_ch (enc, ' ');
282} 343}
283 344
284inline void 345INLINE void
285encode_nl (enc_t *enc) 346encode_nl (enc_t *enc)
286{ 347{
287 if (enc->json.flags & F_INDENT) 348 if (enc->json.flags & F_INDENT)
288 { 349 {
289 need (enc, 1); 350 need (enc, 1);
290 encode_ch (enc, '\n'); 351 encode_ch (enc, '\n');
291 } 352 }
292} 353}
293 354
294inline void 355INLINE void
295encode_comma (enc_t *enc) 356encode_comma (enc_t *enc)
296{ 357{
297 encode_ch (enc, ','); 358 encode_ch (enc, ',');
298 359
299 if (enc->json.flags & F_INDENT) 360 if (enc->json.flags & F_INDENT)
… …
307static void 368static void
308encode_av (enc_t *enc, AV *av) 369encode_av (enc_t *enc, AV *av)
309{ 370{
310 int i, len = av_len (av); 371 int i, len = av_len (av);
311 372
312 if (enc->indent >= enc->maxdepth) 373 if (enc->indent >= enc->json.max_depth)
313 croak ("data structure too deep (hit recursion limit)"); 374 croak (ERR_NESTING_EXCEEDED);
314 375
315 encode_ch (enc, '['); encode_nl (enc); 376 encode_ch (enc, '[');
316 ++enc->indent; 377
378 if (len >= 0)
379 {
380 encode_nl (enc); ++enc->indent;
317 381
318 for (i = 0; i <= len; ++i) 382 for (i = 0; i <= len; ++i)
319 { 383 {
320 SV **svp = av_fetch (av, i, 0); 384 SV **svp = av_fetch (av, i, 0);
321 385
322 encode_indent (enc); 386 encode_indent (enc);
323 387
324 if (svp) 388 if (svp)
325 encode_sv (enc, *svp); 389 encode_sv (enc, *svp);
326 else 390 else
327 encode_str (enc, "null", 4, 0); 391 encode_str (enc, "null", 4, 0);
328 392
329 if (i < len) 393 if (i < len)
330 encode_comma (enc); 394 encode_comma (enc);
331 } 395 }
332 396
397 encode_nl (enc); --enc->indent; encode_indent (enc);
398 }
399
333 encode_nl (enc); 400 encode_ch (enc, ']');
334
335 --enc->indent;
336 encode_indent (enc); encode_ch (enc, ']');
337} 401}
338 402
339static void 403static void
340encode_he (enc_t *enc, HE *he) 404encode_hk (enc_t *enc, HE *he)
341{ 405{
342 encode_ch (enc, '"'); 406 encode_ch (enc, '"');
343 407
344 if (HeKLEN (he) == HEf_SVKEY) 408 if (HeKLEN (he) == HEf_SVKEY)
345 { 409 {
… …
358 encode_ch (enc, '"'); 422 encode_ch (enc, '"');
359 423
360 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 424 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
361 encode_ch (enc, ':'); 425 encode_ch (enc, ':');
362 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 426 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
363 encode_sv (enc, HeVAL (he));
364} 427}
365 428
366// compare hash entries, used when all keys are bytestrings 429// compare hash entries, used when all keys are bytestrings
367static int 430static int
368he_cmp_fast (const void *a_, const void *b_) 431he_cmp_fast (const void *a_, const void *b_)
… …
373 HE *b = *(HE **)b_; 436 HE *b = *(HE **)b_;
374 437
375 STRLEN la = HeKLEN (a); 438 STRLEN la = HeKLEN (a);
376 STRLEN lb = HeKLEN (b); 439 STRLEN lb = HeKLEN (b);
377 440
378 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 441 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
379 cmp = la - lb; 442 cmp = lb - la;
380 443
381 return cmp; 444 return cmp;
382} 445}
383 446
384// compare hash entries, used when some keys are sv's or utf-x 447// compare hash entries, used when some keys are sv's or utf-x
385static int 448static int
386he_cmp_slow (const void *a, const void *b) 449he_cmp_slow (const void *a, const void *b)
387{ 450{
388 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 451 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
389} 452}
390 453
391static void 454static void
392encode_hv (enc_t *enc, HV *hv) 455encode_hv (enc_t *enc, HV *hv)
393{ 456{
394 int count, i; 457 HE *he;
395 458
396 if (enc->indent >= enc->maxdepth) 459 if (enc->indent >= enc->json.max_depth)
397 croak ("data structure too deep (hit recursion limit)"); 460 croak (ERR_NESTING_EXCEEDED);
398 461
399 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 462 encode_ch (enc, '{');
400 463
401 if ((count = hv_iterinit (hv)))
402 {
403 // for canonical output we have to sort by keys first 464 // for canonical output we have to sort by keys first
404 // actually, this is mostly due to the stupid so-called 465 // actually, this is mostly due to the stupid so-called
405 // security workaround added somewhere in 5.8.x. 466 // security workaround added somewhere in 5.8.x.
406 // that randomises hash orderings 467 // that randomises hash orderings
407 if (enc->json.flags & F_CANONICAL) 468 if (enc->json.flags & F_CANONICAL)
469 {
470 int count = hv_iterinit (hv);
471
472 if (SvMAGICAL (hv))
408 { 473 {
474 // need to count by iterating. could improve by dynamically building the vector below
475 // but I don't care for the speed of this special case.
476 // note also that we will run into undefined behaviour when the two iterations
477 // do not result in the same count, something I might care for in some later release.
478
479 count = 0;
480 while (hv_iternext (hv))
481 ++count;
482
483 hv_iterinit (hv);
484 }
485
486 if (count)
487 {
409 int fast = 1; 488 int i, fast = 1;
410 HE *he;
411#if defined(__BORLANDC__) || defined(_MSC_VER) 489#if defined(__BORLANDC__) || defined(_MSC_VER)
412 HE **hes = _alloca (count * sizeof (HE)); 490 HE **hes = _alloca (count * sizeof (HE));
413#else 491#else
414 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 492 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
415#endif 493#endif
… …
442 520
443 FREETMPS; 521 FREETMPS;
444 LEAVE; 522 LEAVE;
445 } 523 }
446 524
447 for (i = 0; i < count; ++i) 525 encode_nl (enc); ++enc->indent;
526
527 while (count--)
448 { 528 {
449 encode_indent (enc); 529 encode_indent (enc);
530 he = hes [count];
450 encode_he (enc, hes [i]); 531 encode_hk (enc, he);
532 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
451 533
452 if (i < count - 1) 534 if (count)
453 encode_comma (enc); 535 encode_comma (enc);
454 } 536 }
455 537
456 encode_nl (enc); 538 encode_nl (enc); --enc->indent; encode_indent (enc);
457 } 539 }
540 }
458 else 541 else
542 {
543 if (hv_iterinit (hv) || SvMAGICAL (hv))
544 if ((he = hv_iternext (hv)))
459 { 545 {
460 HE *he = hv_iternext (hv); 546 encode_nl (enc); ++enc->indent;
461 547
462 for (;;) 548 for (;;)
463 { 549 {
464 encode_indent (enc); 550 encode_indent (enc);
465 encode_he (enc, he); 551 encode_hk (enc, he);
552 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
466 553
467 if (!(he = hv_iternext (hv))) 554 if (!(he = hv_iternext (hv)))
468 break; 555 break;
469 556
470 encode_comma (enc); 557 encode_comma (enc);
471 } 558 }
472 559
473 encode_nl (enc); 560 encode_nl (enc); --enc->indent; encode_indent (enc);
474 } 561 }
475 } 562 }
476 563
477 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 564 encode_ch (enc, '}');
478} 565}
479 566
480// encode objects, arrays and special \0=false and \1=true values. 567// encode objects, arrays and special \0=false and \1=true values.
481static void 568static void
482encode_rv (enc_t *enc, SV *sv) 569encode_rv (enc_t *enc, SV *sv)
… …
559 646
560 if (len == 1 && *pv == '1') 647 if (len == 1 && *pv == '1')
561 encode_str (enc, "true", 4, 0); 648 encode_str (enc, "true", 4, 0);
562 else if (len == 1 && *pv == '0') 649 else if (len == 1 && *pv == '0')
563 encode_str (enc, "false", 5, 0); 650 encode_str (enc, "false", 5, 0);
651 else if (enc->json.flags & F_ALLOW_UNKNOWN)
652 encode_str (enc, "null", 4, 0);
564 else 653 else
565 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 654 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
566 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 655 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
567 } 656 }
657 else if (enc->json.flags & F_ALLOW_UNKNOWN)
658 encode_str (enc, "null", 4, 0);
568 else 659 else
569 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 660 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
570 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 661 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
571} 662}
572 663
… …
590 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 681 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
591 enc->cur += strlen (enc->cur); 682 enc->cur += strlen (enc->cur);
592 } 683 }
593 else if (SvIOKp (sv)) 684 else if (SvIOKp (sv))
594 { 685 {
595 // we assume we can always read an IV as a UV 686 // we assume we can always read an IV as a UV and vice versa
596 if (SvUV (sv) & ~(UV)0x7fff) 687 // we assume two's complement
597 { 688 // we assume no aliasing issues in the union
598 // large integer, use the (rather slow) snprintf way. 689 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
599 need (enc, sizeof (UV) * 3); 690 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
600 enc->cur +=
601 SvIsUV(sv)
602 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
603 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
604 }
605 else
606 { 691 {
607 // optimise the "small number case" 692 // optimise the "small number case"
608 // code will likely be branchless and use only a single multiplication 693 // code will likely be branchless and use only a single multiplication
694 // works for numbers up to 59074
609 I32 i = SvIV (sv); 695 I32 i = SvIVX (sv);
610 U32 u; 696 U32 u;
611 char digit, nz = 0; 697 char digit, nz = 0;
612 698
613 need (enc, 6); 699 need (enc, 6);
614 700
… …
620 706
621 // now output digit by digit, each time masking out the integer part 707 // now output digit by digit, each time masking out the integer part
622 // and multiplying by 5 while moving the decimal point one to the right, 708 // and multiplying by 5 while moving the decimal point one to the right,
623 // resulting in a net multiplication by 10. 709 // resulting in a net multiplication by 10.
624 // we always write the digit to memory but conditionally increment 710 // we always write the digit to memory but conditionally increment
625 // the pointer, to ease the usage of conditional move instructions. 711 // the pointer, to enable the use of conditional move instructions.
626 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 712 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
627 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 713 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
628 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 714 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
629 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 715 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
630 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 716 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
631 } 717 }
718 else
719 {
720 // large integer, use the (rather slow) snprintf way.
721 need (enc, IVUV_MAXCHARS);
722 enc->cur +=
723 SvIsUV(sv)
724 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
725 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
726 }
632 } 727 }
633 else if (SvROK (sv)) 728 else if (SvROK (sv))
634 encode_rv (enc, SvRV (sv)); 729 encode_rv (enc, SvRV (sv));
635 else if (!SvOK (sv)) 730 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
636 encode_str (enc, "null", 4, 0); 731 encode_str (enc, "null", 4, 0);
637 else 732 else
638 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 733 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
639 SvPV_nolen (sv), SvFLAGS (sv)); 734 SvPV_nolen (sv), SvFLAGS (sv));
640} 735}
… …
650 enc.json = *json; 745 enc.json = *json;
651 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 746 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
652 enc.cur = SvPVX (enc.sv); 747 enc.cur = SvPVX (enc.sv);
653 enc.end = SvEND (enc.sv); 748 enc.end = SvEND (enc.sv);
654 enc.indent = 0; 749 enc.indent = 0;
655 enc.maxdepth = DEC_DEPTH (enc.json.flags); 750 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
751 : enc.json.flags & F_LATIN1 ? 0x000100UL
752 : 0x110000UL;
656 753
657 SvPOK_only (enc.sv); 754 SvPOK_only (enc.sv);
658 encode_sv (&enc, scalar); 755 encode_sv (&enc, scalar);
659 756
660 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 757 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
… …
681 JSON json; 778 JSON json;
682 U32 depth; // recursion depth 779 U32 depth; // recursion depth
683 U32 maxdepth; // recursion depth limit 780 U32 maxdepth; // recursion depth limit
684} dec_t; 781} dec_t;
685 782
686inline void 783INLINE void
784decode_comment (dec_t *dec)
785{
786 // only '#'-style comments allowed a.t.m.
787
788 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
789 ++dec->cur;
790}
791
792INLINE void
687decode_ws (dec_t *dec) 793decode_ws (dec_t *dec)
688{ 794{
689 for (;;) 795 for (;;)
690 { 796 {
691 char ch = *dec->cur; 797 char ch = *dec->cur;
692 798
693 if (ch > 0x20 799 if (ch > 0x20)
800 {
801 if (expect_false (ch == '#'))
802 {
803 if (dec->json.flags & F_RELAXED)
804 decode_comment (dec);
805 else
806 break;
807 }
808 else
809 break;
810 }
694 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 811 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
695 break; 812 break; // parse error, but let higher level handle it, gives better error messages
696 813
697 ++dec->cur; 814 ++dec->cur;
698 } 815 }
699} 816}
700 817
… …
704 if (*dec->cur != ch) \ 821 if (*dec->cur != ch) \
705 ERR (# ch " expected"); \ 822 ERR (# ch " expected"); \
706 ++dec->cur; \ 823 ++dec->cur; \
707 SE 824 SE
708 825
709#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 826#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
710#define DEC_DEC_DEPTH --dec->depth 827#define DEC_DEC_DEPTH --dec->depth
711 828
712static SV *decode_sv (dec_t *dec); 829static SV *decode_sv (dec_t *dec);
713 830
714static signed char decode_hexdigit[256]; 831static signed char decode_hexdigit[256];
… …
806 923
807 if (hi >= 0x80) 924 if (hi >= 0x80)
808 { 925 {
809 utf8 = 1; 926 utf8 = 1;
810 927
811 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 928 cur = encode_utf8 (cur, hi);
812 } 929 }
813 else 930 else
814 *cur++ = hi; 931 *cur++ = hi;
815 } 932 }
816 break; 933 break;
… …
818 default: 935 default:
819 --dec_cur; 936 --dec_cur;
820 ERR ("illegal backslash escape sequence in string"); 937 ERR ("illegal backslash escape sequence in string");
821 } 938 }
822 } 939 }
823 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 940 else if (expect_true (ch >= 0x20 && ch < 0x80))
824 *cur++ = ch; 941 *cur++ = ch;
825 else if (ch >= 0x80) 942 else if (ch >= 0x80)
826 { 943 {
827 STRLEN clen; 944 STRLEN clen;
828 UV uch; 945 UV uch;
… …
951 1068
952 if (!is_nv) 1069 if (!is_nv)
953 { 1070 {
954 int len = dec->cur - start; 1071 int len = dec->cur - start;
955 1072
956 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1073 // special case the rather common 1..5-digit-int case
957 if (*start == '-') 1074 if (*start == '-')
958 switch (len) 1075 switch (len)
959 { 1076 {
960 case 2: return newSViv (-( start [1] - '0' * 1)); 1077 case 2: return newSViv (-( start [1] - '0' * 1));
961 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1078 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
962 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1079 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
963 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1080 case 5: return newSViv (-( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1081 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
964 } 1082 }
965 else 1083 else
966 switch (len) 1084 switch (len)
967 { 1085 {
968 case 1: return newSViv ( start [0] - '0' * 1); 1086 case 1: return newSViv ( start [0] - '0' * 1);
969 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1087 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
970 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1088 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
971 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1089 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1090 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
972 } 1091 }
973 1092
974 { 1093 {
975 UV uv; 1094 UV uv;
976 int numtype = grok_number (start, len, &uv); 1095 int numtype = grok_number (start, len, &uv);
… …
1037 1156
1038 if (*dec->cur != ',') 1157 if (*dec->cur != ',')
1039 ERR (", or ] expected while parsing array"); 1158 ERR (", or ] expected while parsing array");
1040 1159
1041 ++dec->cur; 1160 ++dec->cur;
1161
1162 decode_ws (dec);
1163
1164 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1165 {
1166 ++dec->cur;
1167 break;
1168 }
1042 } 1169 }
1043 1170
1044 DEC_DEC_DEPTH; 1171 DEC_DEC_DEPTH;
1045 return newRV_noinc ((SV *)av); 1172 return newRV_noinc ((SV *)av);
1046 1173
… …
1062 if (*dec->cur == '}') 1189 if (*dec->cur == '}')
1063 ++dec->cur; 1190 ++dec->cur;
1064 else 1191 else
1065 for (;;) 1192 for (;;)
1066 { 1193 {
1067 decode_ws (dec); EXPECT_CH ('"'); 1194 EXPECT_CH ('"');
1068 1195
1069 // heuristic: assume that 1196 // heuristic: assume that
1070 // a) decode_str + hv_store_ent are abysmally slow. 1197 // a) decode_str + hv_store_ent are abysmally slow.
1071 // b) most hash keys are short, simple ascii text. 1198 // b) most hash keys are short, simple ascii text.
1072 // => try to "fast-match" such strings to avoid 1199 // => try to "fast-match" such strings to avoid
… …
1076 char *p = dec->cur; 1203 char *p = dec->cur;
1077 char *e = p + 24; // only try up to 24 bytes 1204 char *e = p + 24; // only try up to 24 bytes
1078 1205
1079 for (;;) 1206 for (;;)
1080 { 1207 {
1081 // the >= 0x80 is true on most architectures 1208 // the >= 0x80 is false on most architectures
1082 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1209 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1083 { 1210 {
1084 // slow path, back up and use decode_str 1211 // slow path, back up and use decode_str
1085 SV *key = decode_str (dec); 1212 SV *key = decode_str (dec);
1086 if (!key) 1213 if (!key)
1087 goto fail; 1214 goto fail;
1088 1215
1089 decode_ws (dec); EXPECT_CH (':'); 1216 decode_ws (dec); EXPECT_CH (':');
1090 1217
1218 decode_ws (dec);
1091 value = decode_sv (dec); 1219 value = decode_sv (dec);
1092 if (!value) 1220 if (!value)
1093 { 1221 {
1094 SvREFCNT_dec (key); 1222 SvREFCNT_dec (key);
1095 goto fail; 1223 goto fail;
… …
1107 int len = p - key; 1235 int len = p - key;
1108 dec->cur = p + 1; 1236 dec->cur = p + 1;
1109 1237
1110 decode_ws (dec); EXPECT_CH (':'); 1238 decode_ws (dec); EXPECT_CH (':');
1111 1239
1240 decode_ws (dec);
1112 value = decode_sv (dec); 1241 value = decode_sv (dec);
1113 if (!value) 1242 if (!value)
1114 goto fail; 1243 goto fail;
1115 1244
1116 hv_store (hv, key, len, value, 0); 1245 hv_store (hv, key, len, value, 0);
… …
1132 1261
1133 if (*dec->cur != ',') 1262 if (*dec->cur != ',')
1134 ERR (", or } expected while parsing object/hash"); 1263 ERR (", or } expected while parsing object/hash");
1135 1264
1136 ++dec->cur; 1265 ++dec->cur;
1266
1267 decode_ws (dec);
1268
1269 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1270 {
1271 ++dec->cur;
1272 break;
1273 }
1137 } 1274 }
1138 1275
1139 DEC_DEC_DEPTH; 1276 DEC_DEC_DEPTH;
1140 sv = newRV_noinc ((SV *)hv); 1277 sv = newRV_noinc ((SV *)hv);
1141 1278
… …
1206} 1343}
1207 1344
1208static SV * 1345static SV *
1209decode_sv (dec_t *dec) 1346decode_sv (dec_t *dec)
1210{ 1347{
1211 decode_ws (dec);
1212
1213 // the beauty of JSON: you need exactly one character lookahead 1348 // the beauty of JSON: you need exactly one character lookahead
1214 // to parse anything. 1349 // to parse everything.
1215 switch (*dec->cur) 1350 switch (*dec->cur)
1216 { 1351 {
1217 case '"': ++dec->cur; return decode_str (dec); 1352 case '"': ++dec->cur; return decode_str (dec);
1218 case '[': ++dec->cur; return decode_av (dec); 1353 case '[': ++dec->cur; return decode_av (dec);
1219 case '{': ++dec->cur; return decode_hv (dec); 1354 case '{': ++dec->cur; return decode_hv (dec);
1220 1355
1221 case '-': 1356 case '-':
1222 case '0': case '1': case '2': case '3': case '4': 1357 case '0': case '1': case '2': case '3': case '4':
1223 case '5': case '6': case '7': case '8': case '9': 1358 case '5': case '6': case '7': case '8': case '9':
1224 return decode_num (dec); 1359 return decode_num (dec);
… …
1226 case 't': 1361 case 't':
1227 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1362 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1228 { 1363 {
1229 dec->cur += 4; 1364 dec->cur += 4;
1230#if JSON_SLOW 1365#if JSON_SLOW
1231 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1366 json_true = get_bool ("JSON::XS::true");
1232#endif 1367#endif
1233 return SvREFCNT_inc (json_true); 1368 return newSVsv (json_true);
1234 } 1369 }
1235 else 1370 else
1236 ERR ("'true' expected"); 1371 ERR ("'true' expected");
1237 1372
1238 break; 1373 break;
… …
1240 case 'f': 1375 case 'f':
1241 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1376 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1242 { 1377 {
1243 dec->cur += 5; 1378 dec->cur += 5;
1244#if JSON_SLOW 1379#if JSON_SLOW
1245 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1380 json_false = get_bool ("JSON::XS::false");
1246#endif 1381#endif
1247 return SvREFCNT_inc (json_false); 1382 return newSVsv (json_false);
1248 } 1383 }
1249 else 1384 else
1250 ERR ("'false' expected"); 1385 ERR ("'false' expected");
1251 1386
1252 break; 1387 break;
… …
1270fail: 1405fail:
1271 return 0; 1406 return 0;
1272} 1407}
1273 1408
1274static SV * 1409static SV *
1275decode_json (SV *string, JSON *json, UV *offset_return) 1410decode_json (SV *string, JSON *json, STRLEN *offset_return)
1276{ 1411{
1277 dec_t dec; 1412 dec_t dec;
1278 UV offset; 1413 STRLEN offset;
1279 SV *sv; 1414 SV *sv;
1280 1415
1281 SvGETMAGIC (string); 1416 SvGETMAGIC (string);
1282 SvUPGRADE (string, SVt_PV); 1417 SvUPGRADE (string, SVt_PV);
1283 1418
1284 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1419 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1420 * assertion with -DDEBUGGING, although SvCUR is documented to
1421 * return the xpv_cur field which certainly exists after upgrading.
1422 * according to nicholas clark, calling SvPOK fixes this.
1423 */
1424 SvPOK (string);
1425
1426 if (SvCUR (string) > json->max_size && json->max_size)
1285 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1427 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1286 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1428 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1287 1429
1288 if (json->flags & F_UTF8) 1430 if (json->flags & F_UTF8)
1289 sv_utf8_downgrade (string, 0); 1431 sv_utf8_downgrade (string, 0);
1290 else 1432 else
1291 sv_utf8_upgrade (string); 1433 sv_utf8_upgrade (string);
1292 1434
1293 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1435 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1294 1436
1295 dec.json = *json; 1437 dec.json = *json;
1296 dec.cur = SvPVX (string); 1438 dec.cur = SvPVX (string);
1297 dec.end = SvEND (string); 1439 dec.end = SvEND (string);
1298 dec.err = 0; 1440 dec.err = 0;
1299 dec.depth = 0; 1441 dec.depth = 0;
1300 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1301 1442
1302 if (dec.json.cb_object || dec.json.cb_sk_object) 1443 if (dec.json.cb_object || dec.json.cb_sk_object)
1303 dec.json.flags |= F_HOOK; 1444 dec.json.flags |= F_HOOK;
1304 1445
1305 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1446 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1447
1448 decode_ws (&dec);
1306 sv = decode_sv (&dec); 1449 sv = decode_sv (&dec);
1307 1450
1308 if (!(offset_return || !sv)) 1451 if (!(offset_return || !sv))
1309 { 1452 {
1310 // check for trailing garbage 1453 // check for trailing garbage
… …
1354 1497
1355 return sv; 1498 return sv;
1356} 1499}
1357 1500
1358///////////////////////////////////////////////////////////////////////////// 1501/////////////////////////////////////////////////////////////////////////////
1502// incremental parser
1503
1504static void
1505incr_parse (JSON *self)
1506{
1507 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1508
1509 for (;;)
1510 {
1511 //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
1512 switch (self->incr_mode)
1513 {
1514 // only used for intiial whitespace skipping
1515 case INCR_M_WS:
1516 for (;;)
1517 {
1518 if (*p > 0x20)
1519 {
1520 self->incr_mode = INCR_M_JSON;
1521 goto incr_m_json;
1522 }
1523 else if (!*p)
1524 goto interrupt;
1525
1526 ++p;
1527 }
1528
1529 // skip a single char inside a string (for \\-processing)
1530 case INCR_M_BS:
1531 if (!*p)
1532 goto interrupt;
1533
1534 ++p;
1535 self->incr_mode = INCR_M_STR;
1536 goto incr_m_str;
1537
1538 // inside a string
1539 case INCR_M_STR:
1540 incr_m_str:
1541 for (;;)
1542 {
1543 if (*p == '"')
1544 {
1545 ++p;
1546 self->incr_mode = INCR_M_JSON;
1547
1548 if (!self->incr_nest)
1549 goto interrupt;
1550
1551 goto incr_m_json;
1552 }
1553 else if (*p == '\\')
1554 {
1555 ++p; // "virtually" consumes character after \
1556
1557 if (!*p) // if at end of string we have to switch modes
1558 {
1559 self->incr_mode = INCR_M_BS;
1560 goto interrupt;
1561 }
1562 }
1563 else if (!*p)
1564 goto interrupt;
1565
1566 ++p;
1567 }
1568
1569 // after initial ws, outside string
1570 case INCR_M_JSON:
1571 incr_m_json:
1572 for (;;)
1573 {
1574 switch (*p++)
1575 {
1576 case 0:
1577 --p;
1578 goto interrupt;
1579
1580 case 0x09:
1581 case 0x0a:
1582 case 0x0d:
1583 case 0x20:
1584 if (!self->incr_nest)
1585 {
1586 --p; // do not eat the whitespace, let the next round do it
1587 goto interrupt;
1588 }
1589 break;
1590
1591 case '"':
1592 self->incr_mode = INCR_M_STR;
1593 goto incr_m_str;
1594
1595 case '[':
1596 case '{':
1597 if (++self->incr_nest > self->max_depth)
1598 croak (ERR_NESTING_EXCEEDED);
1599 break;
1600
1601 case ']':
1602 case '}':
1603 if (!--self->incr_nest)
1604 goto interrupt;
1605 }
1606 }
1607 }
1608
1609 modechange:
1610 ;
1611 }
1612
1613interrupt:
1614 self->incr_pos = p - SvPVX (self->incr_text);
1615 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1616}
1617
1618/////////////////////////////////////////////////////////////////////////////
1359// XS interface functions 1619// XS interface functions
1360 1620
1361MODULE = JSON::XS PACKAGE = JSON::XS 1621MODULE = JSON::XS PACKAGE = JSON::XS
1362 1622
1363BOOT: 1623BOOT:
… …
1372 : -1; 1632 : -1;
1373 1633
1374 json_stash = gv_stashpv ("JSON::XS" , 1); 1634 json_stash = gv_stashpv ("JSON::XS" , 1);
1375 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1635 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1376 1636
1377 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1637 json_true = get_bool ("JSON::XS::true");
1378 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1638 json_false = get_bool ("JSON::XS::false");
1379} 1639}
1380 1640
1381PROTOTYPES: DISABLE 1641PROTOTYPES: DISABLE
1382 1642
1383void CLONE (...) 1643void CLONE (...)
… …
1388void new (char *klass) 1648void new (char *klass)
1389 PPCODE: 1649 PPCODE:
1390{ 1650{
1391 SV *pv = NEWSV (0, sizeof (JSON)); 1651 SV *pv = NEWSV (0, sizeof (JSON));
1392 SvPOK_only (pv); 1652 SvPOK_only (pv);
1393 Zero (SvPVX (pv), 1, JSON); 1653 json_init ((JSON *)SvPVX (pv));
1394 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1654 XPUSHs (sv_2mortal (sv_bless (
1395 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH))); 1655 newRV_noinc (pv),
1656 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1657 )));
1396} 1658}
1397 1659
1398void ascii (JSON *self, int enable = 1) 1660void ascii (JSON *self, int enable = 1)
1399 ALIAS: 1661 ALIAS:
1400 ascii = F_ASCII 1662 ascii = F_ASCII
… …
1407 pretty = F_PRETTY 1669 pretty = F_PRETTY
1408 allow_nonref = F_ALLOW_NONREF 1670 allow_nonref = F_ALLOW_NONREF
1409 shrink = F_SHRINK 1671 shrink = F_SHRINK
1410 allow_blessed = F_ALLOW_BLESSED 1672 allow_blessed = F_ALLOW_BLESSED
1411 convert_blessed = F_CONV_BLESSED 1673 convert_blessed = F_CONV_BLESSED
1674 relaxed = F_RELAXED
1675 allow_unknown = F_ALLOW_UNKNOWN
1412 PPCODE: 1676 PPCODE:
1413{ 1677{
1414 if (enable) 1678 if (enable)
1415 self->flags |= ix; 1679 self->flags |= ix;
1416 else 1680 else
1417 self->flags &= ~ix; 1681 self->flags &= ~ix;
1418 1682
1419 XPUSHs (ST (0)); 1683 XPUSHs (ST (0));
1420} 1684}
1421 1685
1422void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1686void get_ascii (JSON *self)
1687 ALIAS:
1688 get_ascii = F_ASCII
1689 get_latin1 = F_LATIN1
1690 get_utf8 = F_UTF8
1691 get_indent = F_INDENT
1692 get_canonical = F_CANONICAL
1693 get_space_before = F_SPACE_BEFORE
1694 get_space_after = F_SPACE_AFTER
1695 get_allow_nonref = F_ALLOW_NONREF
1696 get_shrink = F_SHRINK
1697 get_allow_blessed = F_ALLOW_BLESSED
1698 get_convert_blessed = F_CONV_BLESSED
1699 get_relaxed = F_RELAXED
1700 get_allow_unknown = F_ALLOW_UNKNOWN
1423 PPCODE: 1701 PPCODE:
1424{ 1702 XPUSHs (boolSV (self->flags & ix));
1425 UV log2 = 0;
1426 1703
1427 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1704void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1428 1705 PPCODE:
1429 while ((1UL << log2) < max_depth) 1706 self->max_depth = max_depth;
1430 ++log2;
1431
1432 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1433
1434 XPUSHs (ST (0)); 1707 XPUSHs (ST (0));
1435}
1436 1708
1709U32 get_max_depth (JSON *self)
1710 CODE:
1711 RETVAL = self->max_depth;
1712 OUTPUT:
1713 RETVAL
1714
1437void max_size (JSON *self, UV max_size = 0) 1715void max_size (JSON *self, U32 max_size = 0)
1438 PPCODE: 1716 PPCODE:
1439{ 1717 self->max_size = max_size;
1440 UV log2 = 0;
1441
1442 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1443 if (max_size == 1) max_size = 2;
1444
1445 while ((1UL << log2) < max_size)
1446 ++log2;
1447
1448 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1449
1450 XPUSHs (ST (0)); 1718 XPUSHs (ST (0));
1451} 1719
1720int get_max_size (JSON *self)
1721 CODE:
1722 RETVAL = self->max_size;
1723 OUTPUT:
1724 RETVAL
1452 1725
1453void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1726void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1454 PPCODE: 1727 PPCODE:
1455{ 1728{
1456 SvREFCNT_dec (self->cb_object); 1729 SvREFCNT_dec (self->cb_object);
… …
1490 XPUSHs (decode_json (jsonstr, self, 0)); 1763 XPUSHs (decode_json (jsonstr, self, 0));
1491 1764
1492void decode_prefix (JSON *self, SV *jsonstr) 1765void decode_prefix (JSON *self, SV *jsonstr)
1493 PPCODE: 1766 PPCODE:
1494{ 1767{
1495 UV offset; 1768 STRLEN offset;
1496 EXTEND (SP, 2); 1769 EXTEND (SP, 2);
1497 PUSHs (decode_json (jsonstr, self, &offset)); 1770 PUSHs (decode_json (jsonstr, self, &offset));
1498 PUSHs (sv_2mortal (newSVuv (offset))); 1771 PUSHs (sv_2mortal (newSVuv (offset)));
1772}
1773
1774void incr_parse (JSON *self, SV *jsonstr = 0)
1775 PPCODE:
1776{
1777 if (!self->incr_text)
1778 self->incr_text = newSVpvn ("", 0);
1779
1780 // append data, if any
1781 if (jsonstr)
1782 {
1783 if (SvUTF8 (jsonstr) && !SvUTF8 (self->incr_text))
1784 {
1785 /* utf-8-ness differs, need to upgrade */
1786 sv_utf8_upgrade (self->incr_text);
1787
1788 if (self->incr_pos)
1789 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1790 - (U8 *)SvPVX (self->incr_text);
1791 }
1792
1793 {
1794 STRLEN len;
1795 const char *str = SvPV (jsonstr, len);
1796 SvGROW (self->incr_text, SvCUR (self->incr_text) + len + 1);
1797 Move (str, SvEND (self->incr_text), len, char);
1798 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1799 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1800 }
1801 }
1802
1803 if (GIMME_V != G_VOID)
1804 do
1805 {
1806 STRLEN offset;
1807
1808 if (!INCR_DONE (self))
1809 {
1810 incr_parse (self);
1811
1812 if (self->incr_pos > self->max_size && self->max_size)
1813 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1814 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1815
1816 if (!INCR_DONE (self))
1817 break;
1818 }
1819
1820 XPUSHs (decode_json (self->incr_text, self, &offset));
1821
1822 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + offset);
1823 self->incr_pos -= offset;
1824 self->incr_nest = 0;
1825 self->incr_mode = 0;
1826 }
1827 while (GIMME_V == G_ARRAY);
1828}
1829
1830SV *incr_text (JSON *self)
1831 ATTRS: lvalue
1832 CODE:
1833{
1834 if (self->incr_pos)
1835 croak ("incr_text can not be called when the incremental parser already started parsing");
1836
1837 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1838}
1839 OUTPUT:
1840 RETVAL
1841
1842void incr_skip (JSON *self)
1843 CODE:
1844{
1845 if (self->incr_pos)
1846 {
1847 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
1848 self->incr_pos = 0;
1849 self->incr_nest = 0;
1850 self->incr_mode = 0;
1851 }
1852}
1853
1854void incr_reset (JSON *self)
1855 CODE:
1856{
1857 SvREFCNT_dec (self->incr_text);
1858 self->incr_text = 0;
1859 self->incr_pos = 0;
1860 self->incr_nest = 0;
1861 self->incr_mode = 0;
1499} 1862}
1500 1863
1501void DESTROY (JSON *self) 1864void DESTROY (JSON *self)
1502 CODE: 1865 CODE:
1503 SvREFCNT_dec (self->cb_sk_object); 1866 SvREFCNT_dec (self->cb_sk_object);
1504 SvREFCNT_dec (self->cb_object); 1867 SvREFCNT_dec (self->cb_object);
1868 SvREFCNT_dec (self->incr_text);
1505 1869
1506PROTOTYPES: ENABLE 1870PROTOTYPES: ENABLE
1507 1871
1508void to_json (SV *scalar) 1872void encode_json (SV *scalar)
1873 ALIAS:
1874 to_json_ = 0
1875 encode_json = F_UTF8
1509 PPCODE: 1876 PPCODE:
1510{ 1877{
1511 JSON json = { F_DEFAULT | F_UTF8 }; 1878 JSON json;
1879 json_init (&json);
1880 json.flags |= ix;
1512 XPUSHs (encode_json (scalar, &json)); 1881 XPUSHs (encode_json (scalar, &json));
1513} 1882}
1514 1883
1515void from_json (SV *jsonstr) 1884void decode_json (SV *jsonstr)
1885 ALIAS:
1886 from_json_ = 0
1887 decode_json = F_UTF8
1516 PPCODE: 1888 PPCODE:
1517{ 1889{
1518 JSON json = { F_DEFAULT | F_UTF8 }; 1890 JSON json;
1891 json_init (&json);
1892 json.flags |= ix;
1519 XPUSHs (decode_json (jsonstr, &json, 0)); 1893 XPUSHs (decode_json (jsonstr, &json, 0));
1520} 1894}
1521 1895
1896

Diff Legend

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