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.48 by root, Sun Jul 1 22:20:00 2007 UTC vs.
Revision 1.86 by root, Tue May 27 05:31:39 2008 UTC

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

Diff Legend

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