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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines