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