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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines