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

Diff Legend

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