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

Diff Legend

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