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.55 by root, Mon Jul 23 22:57:40 2007 UTC vs.
Revision 1.119 by root, Mon Oct 28 23:19:54 2013 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// guarantees, 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// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
19 24
20#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
22#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
23#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
26#define F_SPACE_AFTER 0x00000040UL 31#define F_SPACE_AFTER 0x00000040UL
27#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
28#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
31#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 36#define F_RELAXED 0x00001000UL
34#define S_MAXSIZE 20 37#define F_ALLOW_UNKNOWN 0x00002000UL
38#define F_ALLOW_TAGS 0x00004000UL
35#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 39#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
36 40
37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
39
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41#define F_DEFAULT (9UL << S_MAXDEPTH)
42 42
43#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
44#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
45 45
46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
47 47
48#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
49
48#define SB do { 50#define SB do {
49#define SE } while (0) 51#define SE } while (0)
50 52
51#if __GNUC__ >= 3 53#if __GNUC__ >= 3
52# define expect(expr,value) __builtin_expect ((expr),(value)) 54# define expect(expr,value) __builtin_expect ((expr), (value))
53# define inline inline 55# define INLINE static inline
54#else 56#else
55# define expect(expr,value) (expr) 57# define expect(expr,value) (expr)
56# define inline static 58# define INLINE static
57#endif 59#endif
58 60
59#define expect_false(expr) expect ((expr) != 0, 0) 61#define expect_false(expr) expect ((expr) != 0, 0)
60#define expect_true(expr) expect ((expr) != 0, 1) 62#define expect_true(expr) expect ((expr) != 0, 1)
61 63
64#define IN_RANGE_INC(type,val,beg,end) \
65 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
66 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
67
68#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
69
70#ifdef USE_ITHREADS
71# define JSON_SLOW 1
72# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
73#else
74# define JSON_SLOW 0
75# define JSON_STASH json_stash
76#endif
77
78// the amount of HEs to allocate on the stack, when sorting keys
79#define STACK_HES 64
80
62static HV *json_stash, *json_boolean_stash; // JSON::XS:: 81static HV *json_stash, *types_boolean_stash; // JSON::XS::
63static SV *json_true, *json_false; 82static SV *types_true, *types_false, *sv_json;
83
84enum {
85 INCR_M_WS = 0, // initial whitespace skipping, must be 0
86 INCR_M_STR, // inside string
87 INCR_M_BS, // inside backslash
88 INCR_M_C0, // inside comment in initial whitespace sequence
89 INCR_M_C1, // inside comment in other places
90 INCR_M_JSON // outside anything, count nesting
91};
92
93#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
64 94
65typedef struct { 95typedef struct {
66 U32 flags; 96 U32 flags;
97 U32 max_depth;
98 STRLEN max_size;
99
67 SV *cb_object; 100 SV *cb_object;
68 HV *cb_sk_object; 101 HV *cb_sk_object;
102
103 // for the incremental parser
104 SV *incr_text; // the source text so far
105 STRLEN incr_pos; // the current offset into the text
106 int incr_nest; // {[]}-nesting level
107 unsigned char incr_mode;
69} JSON; 108} JSON;
109
110INLINE void
111json_init (JSON *json)
112{
113 Zero (json, 1, JSON);
114 json->max_depth = 512;
115}
70 116
71///////////////////////////////////////////////////////////////////////////// 117/////////////////////////////////////////////////////////////////////////////
72// utility functions 118// utility functions
73 119
74inline void 120INLINE SV *
121get_bool (const char *name)
122{
123 SV *sv = get_sv (name, 1);
124
125 SvREADONLY_on (sv);
126 SvREADONLY_on (SvRV (sv));
127
128 return sv;
129}
130
131INLINE void
75shrink (SV *sv) 132shrink (SV *sv)
76{ 133{
77 sv_utf8_downgrade (sv, 1); 134 sv_utf8_downgrade (sv, 1);
135
78 if (SvLEN (sv) > SvCUR (sv) + 1) 136 if (SvLEN (sv) > SvCUR (sv) + 1)
79 { 137 {
80#ifdef SvPV_shrink_to_cur 138#ifdef SvPV_shrink_to_cur
81 SvPV_shrink_to_cur (sv); 139 SvPV_shrink_to_cur (sv);
82#elif defined (SvPV_renew) 140#elif defined (SvPV_renew)
… …
88// decode an utf-8 character and return it, or (UV)-1 in 146// decode an utf-8 character and return it, or (UV)-1 in
89// case of an error. 147// case of an error.
90// we special-case "safe" characters from U+80 .. U+7FF, 148// we special-case "safe" characters from U+80 .. U+7FF,
91// but use the very good perl function to parse anything else. 149// but use the very good perl function to parse anything else.
92// note that we never call this function for a ascii codepoints 150// note that we never call this function for a ascii codepoints
93inline UV 151INLINE UV
94decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 152decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
95{ 153{
96 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 154 if (expect_true (len >= 2
97 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 155 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
98 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 156 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
99 { 157 {
100 *clen = 2; 158 *clen = 2;
101 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 159 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
102 } 160 }
103 else 161 else
104 { 162 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
105 *clen = (STRLEN)-1; 163}
106 return (UV)-1; 164
165// likewise for encoding, also never called for ascii codepoints
166// this function takes advantage of this fact, although current gccs
167// seem to optimise the check for >= 0x80 away anyways
168INLINE unsigned char *
169encode_utf8 (unsigned char *s, UV ch)
170{
171 if (expect_false (ch < 0x000080))
172 *s++ = ch;
173 else if (expect_true (ch < 0x000800))
174 *s++ = 0xc0 | ( ch >> 6),
175 *s++ = 0x80 | ( ch & 0x3f);
176 else if ( ch < 0x010000)
177 *s++ = 0xe0 | ( ch >> 12),
178 *s++ = 0x80 | ((ch >> 6) & 0x3f),
179 *s++ = 0x80 | ( ch & 0x3f);
180 else if ( ch < 0x110000)
181 *s++ = 0xf0 | ( ch >> 18),
182 *s++ = 0x80 | ((ch >> 12) & 0x3f),
183 *s++ = 0x80 | ((ch >> 6) & 0x3f),
184 *s++ = 0x80 | ( ch & 0x3f);
185
186 return s;
187}
188
189// convert offset pointer to character index, sv must be string
190static STRLEN
191ptr_to_index (SV *sv, char *offset)
192{
193 return SvUTF8 (sv)
194 ? utf8_distance (offset, SvPVX (sv))
195 : offset - SvPVX (sv);
196}
197
198/////////////////////////////////////////////////////////////////////////////
199// fp hell
200
201// scan a group of digits, and a trailing exponent
202static void
203json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
204{
205 UV uaccum = 0;
206 int eaccum = 0;
207
208 // if we recurse too deep, skip all remaining digits
209 // to avoid a stack overflow attack
210 if (expect_false (--maxdepth <= 0))
211 while (((U8)*s - '0') < 10)
212 ++s;
213
214 for (;;)
107 } 215 {
108} 216 U8 dig = (U8)*s - '0';
109 217
218 if (expect_false (dig >= 10))
219 {
220 if (dig == (U8)((U8)'.' - (U8)'0'))
221 {
222 ++s;
223 json_atof_scan1 (s, accum, expo, 1, maxdepth);
224 }
225 else if ((dig | ' ') == 'e' - '0')
226 {
227 int exp2 = 0;
228 int neg = 0;
229
230 ++s;
231
232 if (*s == '-')
233 {
234 ++s;
235 neg = 1;
236 }
237 else if (*s == '+')
238 ++s;
239
240 while ((dig = (U8)*s - '0') < 10)
241 exp2 = exp2 * 10 + *s++ - '0';
242
243 *expo += neg ? -exp2 : exp2;
244 }
245
246 break;
247 }
248
249 ++s;
250
251 uaccum = uaccum * 10 + dig;
252 ++eaccum;
253
254 // if we have too many digits, then recurse for more
255 // we actually do this for rather few digits
256 if (uaccum >= (UV_MAX - 9) / 10)
257 {
258 if (postdp) *expo -= eaccum;
259 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
260 if (postdp) *expo += eaccum;
261
262 break;
263 }
264 }
265
266 // this relies greatly on the quality of the pow ()
267 // implementation of the platform, but a good
268 // implementation is hard to beat.
269 // (IEEE 754 conformant ones are required to be exact)
270 if (postdp) *expo -= eaccum;
271 *accum += uaccum * Perl_pow (10., *expo);
272 *expo += eaccum;
273}
274
275static NV
276json_atof (const char *s)
277{
278 NV accum = 0.;
279 int expo = 0;
280 int neg = 0;
281
282 if (*s == '-')
283 {
284 ++s;
285 neg = 1;
286 }
287
288 // a recursion depth of ten gives us >>500 bits
289 json_atof_scan1 (s, &accum, &expo, 0, 10);
290
291 return neg ? -accum : accum;
292}
110///////////////////////////////////////////////////////////////////////////// 293/////////////////////////////////////////////////////////////////////////////
111// encoder 294// encoder
112 295
113// structure used for encoding JSON 296// structure used for encoding JSON
114typedef struct 297typedef struct
… …
116 char *cur; // SvPVX (sv) + current output position 299 char *cur; // SvPVX (sv) + current output position
117 char *end; // SvEND (sv) 300 char *end; // SvEND (sv)
118 SV *sv; // result scalar 301 SV *sv; // result scalar
119 JSON json; 302 JSON json;
120 U32 indent; // indentation level 303 U32 indent; // indentation level
121 U32 maxdepth; // max. indentation/recursion level 304 UV limit; // escape character values >= this value when encoding
122} enc_t; 305} enc_t;
123 306
124inline void 307INLINE void
125need (enc_t *enc, STRLEN len) 308need (enc_t *enc, STRLEN len)
126{ 309{
127 if (expect_false (enc->cur + len >= enc->end)) 310 if (expect_false (enc->cur + len >= enc->end))
128 { 311 {
129 STRLEN cur = enc->cur - SvPVX (enc->sv); 312 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
130 SvGROW (enc->sv, cur + len + 1); 313 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
131 enc->cur = SvPVX (enc->sv) + cur; 314 enc->cur = SvPVX (enc->sv) + cur;
132 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 315 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
133 } 316 }
134} 317}
135 318
136inline void 319INLINE void
137encode_ch (enc_t *enc, char ch) 320encode_ch (enc_t *enc, char ch)
138{ 321{
139 need (enc, 1); 322 need (enc, 1);
140 *enc->cur++ = ch; 323 *enc->cur++ = ch;
141} 324}
… …
195 { 378 {
196 uch = ch; 379 uch = ch;
197 clen = 1; 380 clen = 1;
198 } 381 }
199 382
200 if (uch > 0x10FFFFUL) 383 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
201 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
202
203 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
204 { 384 {
205 if (uch > 0xFFFFUL) 385 if (uch >= 0x10000UL)
206 { 386 {
387 if (uch >= 0x110000UL)
388 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
389
207 need (enc, len += 11); 390 need (enc, len += 11);
208 sprintf (enc->cur, "\\u%04x\\u%04x", 391 sprintf (enc->cur, "\\u%04x\\u%04x",
209 (int)((uch - 0x10000) / 0x400 + 0xD800), 392 (int)((uch - 0x10000) / 0x400 + 0xD800),
210 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 393 (int)((uch - 0x10000) % 0x400 + 0xDC00));
211 enc->cur += 12; 394 enc->cur += 12;
212 } 395 }
213 else 396 else
214 { 397 {
215 static char hexdigit [16] = "0123456789abcdef";
216 need (enc, len += 5); 398 need (enc, len += 5);
217 *enc->cur++ = '\\'; 399 *enc->cur++ = '\\';
218 *enc->cur++ = 'u'; 400 *enc->cur++ = 'u';
219 *enc->cur++ = hexdigit [ uch >> 12 ]; 401 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
220 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 402 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
221 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 403 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
222 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 404 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
223 } 405 }
224 406
225 str += clen; 407 str += clen;
226 } 408 }
227 else if (enc->json.flags & F_LATIN1) 409 else if (enc->json.flags & F_LATIN1)
… …
239 while (--clen); 421 while (--clen);
240 } 422 }
241 else 423 else
242 { 424 {
243 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 425 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
244 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 426 enc->cur = encode_utf8 (enc->cur, uch);
245 ++str; 427 ++str;
246 } 428 }
247 } 429 }
248 } 430 }
249 } 431 }
250 432
251 --len; 433 --len;
252 } 434 }
253} 435}
254 436
255inline void 437INLINE void
256encode_indent (enc_t *enc) 438encode_indent (enc_t *enc)
257{ 439{
258 if (enc->json.flags & F_INDENT) 440 if (enc->json.flags & F_INDENT)
259 { 441 {
260 int spaces = enc->indent * INDENT_STEP; 442 int spaces = enc->indent * INDENT_STEP;
… …
263 memset (enc->cur, ' ', spaces); 445 memset (enc->cur, ' ', spaces);
264 enc->cur += spaces; 446 enc->cur += spaces;
265 } 447 }
266} 448}
267 449
268inline void 450INLINE void
269encode_space (enc_t *enc) 451encode_space (enc_t *enc)
270{ 452{
271 need (enc, 1); 453 need (enc, 1);
272 encode_ch (enc, ' '); 454 encode_ch (enc, ' ');
273} 455}
274 456
275inline void 457INLINE void
276encode_nl (enc_t *enc) 458encode_nl (enc_t *enc)
277{ 459{
278 if (enc->json.flags & F_INDENT) 460 if (enc->json.flags & F_INDENT)
279 { 461 {
280 need (enc, 1); 462 need (enc, 1);
281 encode_ch (enc, '\n'); 463 encode_ch (enc, '\n');
282 } 464 }
283} 465}
284 466
285inline void 467INLINE void
286encode_comma (enc_t *enc) 468encode_comma (enc_t *enc)
287{ 469{
288 encode_ch (enc, ','); 470 encode_ch (enc, ',');
289 471
290 if (enc->json.flags & F_INDENT) 472 if (enc->json.flags & F_INDENT)
… …
298static void 480static void
299encode_av (enc_t *enc, AV *av) 481encode_av (enc_t *enc, AV *av)
300{ 482{
301 int i, len = av_len (av); 483 int i, len = av_len (av);
302 484
303 if (enc->indent >= enc->maxdepth) 485 if (enc->indent >= enc->json.max_depth)
304 croak ("data structure too deep (hit recursion limit)"); 486 croak (ERR_NESTING_EXCEEDED);
305 487
306 encode_ch (enc, '['); encode_nl (enc); 488 encode_ch (enc, '[');
307 ++enc->indent;
308 489
490 if (len >= 0)
491 {
492 encode_nl (enc); ++enc->indent;
493
309 for (i = 0; i <= len; ++i) 494 for (i = 0; i <= len; ++i)
310 { 495 {
311 SV **svp = av_fetch (av, i, 0); 496 SV **svp = av_fetch (av, i, 0);
312 497
313 encode_indent (enc); 498 encode_indent (enc);
314 499
315 if (svp) 500 if (svp)
316 encode_sv (enc, *svp); 501 encode_sv (enc, *svp);
317 else 502 else
318 encode_str (enc, "null", 4, 0); 503 encode_str (enc, "null", 4, 0);
319 504
320 if (i < len) 505 if (i < len)
321 encode_comma (enc); 506 encode_comma (enc);
322 } 507 }
323 508
509 encode_nl (enc); --enc->indent; encode_indent (enc);
510 }
511
324 encode_nl (enc); 512 encode_ch (enc, ']');
325
326 --enc->indent;
327 encode_indent (enc); encode_ch (enc, ']');
328} 513}
329 514
330static void 515static void
331encode_he (enc_t *enc, HE *he) 516encode_hk (enc_t *enc, HE *he)
332{ 517{
333 encode_ch (enc, '"'); 518 encode_ch (enc, '"');
334 519
335 if (HeKLEN (he) == HEf_SVKEY) 520 if (HeKLEN (he) == HEf_SVKEY)
336 { 521 {
337 SV *sv = HeSVKEY (he); 522 SV *sv = HeSVKEY (he);
338 STRLEN len; 523 STRLEN len;
339 char *str; 524 char *str;
340 525
341 SvGETMAGIC (sv); 526 SvGETMAGIC (sv);
342 str = SvPV (sv, len); 527 str = SvPV (sv, len);
343 528
344 encode_str (enc, str, len, SvUTF8 (sv)); 529 encode_str (enc, str, len, SvUTF8 (sv));
345 } 530 }
… …
349 encode_ch (enc, '"'); 534 encode_ch (enc, '"');
350 535
351 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 536 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
352 encode_ch (enc, ':'); 537 encode_ch (enc, ':');
353 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 538 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
354 encode_sv (enc, HeVAL (he));
355} 539}
356 540
357// compare hash entries, used when all keys are bytestrings 541// compare hash entries, used when all keys are bytestrings
358static int 542static int
359he_cmp_fast (const void *a_, const void *b_) 543he_cmp_fast (const void *a_, const void *b_)
… …
364 HE *b = *(HE **)b_; 548 HE *b = *(HE **)b_;
365 549
366 STRLEN la = HeKLEN (a); 550 STRLEN la = HeKLEN (a);
367 STRLEN lb = HeKLEN (b); 551 STRLEN lb = HeKLEN (b);
368 552
369 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 553 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
370 cmp = la - lb; 554 cmp = lb - la;
371 555
372 return cmp; 556 return cmp;
373} 557}
374 558
375// compare hash entries, used when some keys are sv's or utf-x 559// compare hash entries, used when some keys are sv's or utf-x
376static int 560static int
377he_cmp_slow (const void *a, const void *b) 561he_cmp_slow (const void *a, const void *b)
378{ 562{
379 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 563 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
380} 564}
381 565
382static void 566static void
383encode_hv (enc_t *enc, HV *hv) 567encode_hv (enc_t *enc, HV *hv)
384{ 568{
385 int count, i; 569 HE *he;
386 570
387 if (enc->indent >= enc->maxdepth) 571 if (enc->indent >= enc->json.max_depth)
388 croak ("data structure too deep (hit recursion limit)"); 572 croak (ERR_NESTING_EXCEEDED);
389 573
390 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 574 encode_ch (enc, '{');
391 575
392 if ((count = hv_iterinit (hv)))
393 {
394 // for canonical output we have to sort by keys first 576 // for canonical output we have to sort by keys first
395 // actually, this is mostly due to the stupid so-called 577 // actually, this is mostly due to the stupid so-called
396 // security workaround added somewhere in 5.8.x. 578 // security workaround added somewhere in 5.8.x
397 // that randomises hash orderings 579 // that randomises hash orderings
398 if (enc->json.flags & F_CANONICAL) 580 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
581 {
582 int count = hv_iterinit (hv);
583
584 if (SvMAGICAL (hv))
399 { 585 {
586 // need to count by iterating. could improve by dynamically building the vector below
587 // but I don't care for the speed of this special case.
588 // note also that we will run into undefined behaviour when the two iterations
589 // do not result in the same count, something I might care for in some later release.
590
591 count = 0;
592 while (hv_iternext (hv))
593 ++count;
594
595 hv_iterinit (hv);
596 }
597
598 if (count)
599 {
400 int fast = 1; 600 int i, fast = 1;
401 HE *he; 601 HE *hes_stack [STACK_HES];
402#if defined(__BORLANDC__) || defined(_MSC_VER) 602 HE **hes = hes_stack;
403 HE **hes = _alloca (count * sizeof (HE)); 603
404#else 604 // allocate larger arrays on the heap
405 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 605 if (count > STACK_HES)
406#endif 606 {
607 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
608 hes = (HE **)SvPVX (sv);
609 }
407 610
408 i = 0; 611 i = 0;
409 while ((he = hv_iternext (hv))) 612 while ((he = hv_iternext (hv)))
410 { 613 {
411 hes [i++] = he; 614 hes [i++] = he;
… …
433 636
434 FREETMPS; 637 FREETMPS;
435 LEAVE; 638 LEAVE;
436 } 639 }
437 640
438 for (i = 0; i < count; ++i) 641 encode_nl (enc); ++enc->indent;
642
643 while (count--)
439 { 644 {
440 encode_indent (enc); 645 encode_indent (enc);
646 he = hes [count];
441 encode_he (enc, hes [i]); 647 encode_hk (enc, he);
648 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
442 649
443 if (i < count - 1) 650 if (count)
444 encode_comma (enc); 651 encode_comma (enc);
445 } 652 }
446 653
447 encode_nl (enc); 654 encode_nl (enc); --enc->indent; encode_indent (enc);
448 } 655 }
656 }
449 else 657 else
658 {
659 if (hv_iterinit (hv) || SvMAGICAL (hv))
660 if ((he = hv_iternext (hv)))
450 { 661 {
451 HE *he = hv_iternext (hv); 662 encode_nl (enc); ++enc->indent;
452 663
453 for (;;) 664 for (;;)
454 { 665 {
455 encode_indent (enc); 666 encode_indent (enc);
456 encode_he (enc, he); 667 encode_hk (enc, he);
668 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
457 669
458 if (!(he = hv_iternext (hv))) 670 if (!(he = hv_iternext (hv)))
459 break; 671 break;
460 672
461 encode_comma (enc); 673 encode_comma (enc);
462 } 674 }
463 675
464 encode_nl (enc); 676 encode_nl (enc); --enc->indent; encode_indent (enc);
465 } 677 }
466 } 678 }
467 679
468 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 680 encode_ch (enc, '}');
469} 681}
470 682
471// encode objects, arrays and special \0=false and \1=true values. 683// encode objects, arrays and special \0=false and \1=true values.
472static void 684static void
473encode_rv (enc_t *enc, SV *sv) 685encode_rv (enc_t *enc, SV *sv)
… …
477 SvGETMAGIC (sv); 689 SvGETMAGIC (sv);
478 svt = SvTYPE (sv); 690 svt = SvTYPE (sv);
479 691
480 if (expect_false (SvOBJECT (sv))) 692 if (expect_false (SvOBJECT (sv)))
481 { 693 {
482 if (SvSTASH (sv) == json_boolean_stash) 694 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
695 ? types_boolean_stash
696 : gv_stashpv ("Types::Serialiser::Boolean", 1);
697 HV *stash = SvSTASH (sv);
698
699 if (stash == boolean_stash)
483 { 700 {
484 if (SvIV (sv)) 701 if (SvIV (sv))
485 encode_str (enc, "true", 4, 0); 702 encode_str (enc, "true", 4, 0);
486 else 703 else
487 encode_str (enc, "false", 5, 0); 704 encode_str (enc, "false", 5, 0);
488 } 705 }
489 else 706 else if (enc->json.flags & F_CONV_BLESSED)
490 { 707 {
491#if 0 708 GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0);
492 if (0 && sv_derived_from (rv, "JSON::Literal")) 709
493 { 710 if (to_json)
494 // not yet
495 } 711 {
496#endif
497 if (enc->json.flags & F_CONV_BLESSED)
498 { 712 dSP;
713
714 ENTER; SAVETMPS; PUSHMARK (SP);
499 // we re-bless the reference to get overload and other niceties right 715 // we re-bless the reference to get overload and other niceties right
500 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501
502 if (to_json)
503 {
504 int count;
505 dSP;
506
507 ENTER; SAVETMPS; PUSHMARK (SP);
508 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 716 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
509 717
510 // calling with G_SCALAR ensures that we always get a 1 return value 718 // calling with G_SCALAR ensures that we always get a 1 return value
511 PUTBACK; 719 PUTBACK;
512 call_sv ((SV *)GvCV (to_json), G_SCALAR); 720 call_sv ((SV *)GvCV (to_json), G_SCALAR);
513 SPAGAIN; 721 SPAGAIN;
514 722
515 // catch this surprisingly common error 723 // catch this surprisingly common error
516 if (SvROK (TOPs) && SvRV (TOPs) == sv) 724 if (SvROK (TOPs) && SvRV (TOPs) == sv)
517 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 725 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
518 726
519 sv = POPs; 727 sv = POPs;
520 PUTBACK; 728 PUTBACK;
521 729
522 encode_sv (enc, sv); 730 encode_sv (enc, sv);
523 731
524 FREETMPS; LEAVE; 732 FREETMPS; LEAVE;
525 }
526 else if (enc->json.flags & F_ALLOW_BLESSED)
527 encode_str (enc, "null", 4, 0);
528 else
529 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
530 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
531 } 733 }
532 else if (enc->json.flags & F_ALLOW_BLESSED) 734 else if (enc->json.flags & F_ALLOW_BLESSED)
533 encode_str (enc, "null", 4, 0); 735 encode_str (enc, "null", 4, 0);
534 else 736 else
535 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 737 croak ("encountered object '%s' when conv_object is enabled, but TO_JSON is missing and allow_blessed disabled",
536 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 738 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
537 } 739 }
740 else if (enc->json.flags & F_ALLOW_TAGS)
741 {
742 GV *method = gv_fetchmethod_autoload (stash, "FREEZE", 0);
743
744 if (method)
745 {
746 int count;
747 dSP;
748
749 ENTER; SAVETMPS; PUSHMARK (SP);
750 EXTEND (SP, 2);
751 // we re-bless the reference to get overload and other niceties right
752 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
753 PUSHs (sv_json);
754
755 PUTBACK;
756 count = call_sv ((SV *)GvCV (method), G_ARRAY);
757 SPAGAIN;
758
759 // catch this surprisingly common error
760 if (SvROK (TOPs) && SvRV (TOPs) == sv)
761 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
762
763 encode_ch (enc, '(');
764 encode_ch (enc, '"');
765 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
766 encode_ch (enc, '"');
767 encode_ch (enc, ')');
768 encode_ch (enc, '[');
769
770 while (count)
771 {
772 encode_sv (enc, SP[1 - count--]);
773
774 if (count)
775 encode_ch (enc, ',');
776 }
777
778 encode_ch (enc, ']');
779
780 PUTBACK;
781
782 FREETMPS; LEAVE;
783 }
784 else if (enc->json.flags & F_ALLOW_BLESSED)
785 encode_str (enc, "null", 4, 0);
786 else
787 croak ("encountered object '%s' when allow_tags is enabled, but FREEZE is missing and allow_blessed disabled",
788 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
789 }
790 else if (enc->json.flags & F_ALLOW_BLESSED)
791 encode_str (enc, "null", 4, 0);
792 else
793 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled",
794 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538 } 795 }
539 else if (svt == SVt_PVHV) 796 else if (svt == SVt_PVHV)
540 encode_hv (enc, (HV *)sv); 797 encode_hv (enc, (HV *)sv);
541 else if (svt == SVt_PVAV) 798 else if (svt == SVt_PVAV)
542 encode_av (enc, (AV *)sv); 799 encode_av (enc, (AV *)sv);
… …
547 804
548 if (len == 1 && *pv == '1') 805 if (len == 1 && *pv == '1')
549 encode_str (enc, "true", 4, 0); 806 encode_str (enc, "true", 4, 0);
550 else if (len == 1 && *pv == '0') 807 else if (len == 1 && *pv == '0')
551 encode_str (enc, "false", 5, 0); 808 encode_str (enc, "false", 5, 0);
809 else if (enc->json.flags & F_ALLOW_UNKNOWN)
810 encode_str (enc, "null", 4, 0);
552 else 811 else
553 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 812 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
554 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 813 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
555 } 814 }
815 else if (enc->json.flags & F_ALLOW_UNKNOWN)
816 encode_str (enc, "null", 4, 0);
556 else 817 else
557 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 818 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
558 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 819 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
559} 820}
560 821
… …
578 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 839 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
579 enc->cur += strlen (enc->cur); 840 enc->cur += strlen (enc->cur);
580 } 841 }
581 else if (SvIOKp (sv)) 842 else if (SvIOKp (sv))
582 { 843 {
583 // we assume we can always read an IV as a UV 844 // we assume we can always read an IV as a UV and vice versa
584 if (SvUV (sv) & ~(UV)0x7fff) 845 // we assume two's complement
585 { 846 // we assume no aliasing issues in the union
586 // large integer, use the (rather slow) snprintf way. 847 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
587 need (enc, sizeof (UV) * 3); 848 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
588 enc->cur +=
589 SvIsUV(sv)
590 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
591 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
592 }
593 else
594 { 849 {
595 // optimise the "small number case" 850 // optimise the "small number case"
596 // code will likely be branchless and use only a single multiplication 851 // code will likely be branchless and use only a single multiplication
852 // works for numbers up to 59074
597 I32 i = SvIV (sv); 853 I32 i = SvIVX (sv);
598 U32 u; 854 U32 u;
599 char digit, nz = 0; 855 char digit, nz = 0;
600 856
601 need (enc, 6); 857 need (enc, 6);
602 858
… …
608 864
609 // now output digit by digit, each time masking out the integer part 865 // now output digit by digit, each time masking out the integer part
610 // and multiplying by 5 while moving the decimal point one to the right, 866 // and multiplying by 5 while moving the decimal point one to the right,
611 // resulting in a net multiplication by 10. 867 // resulting in a net multiplication by 10.
612 // we always write the digit to memory but conditionally increment 868 // we always write the digit to memory but conditionally increment
613 // the pointer, to ease the usage of conditional move instructions. 869 // the pointer, to enable the use of conditional move instructions.
614 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 870 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
615 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 871 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
616 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 872 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
617 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 873 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
618 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 874 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
619 } 875 }
876 else
877 {
878 // large integer, use the (rather slow) snprintf way.
879 need (enc, IVUV_MAXCHARS);
880 enc->cur +=
881 SvIsUV(sv)
882 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
883 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
884 }
620 } 885 }
621 else if (SvROK (sv)) 886 else if (SvROK (sv))
622 encode_rv (enc, SvRV (sv)); 887 encode_rv (enc, SvRV (sv));
623 else if (!SvOK (sv)) 888 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
624 encode_str (enc, "null", 4, 0); 889 encode_str (enc, "null", 4, 0);
625 else 890 else
626 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 891 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
627 SvPV_nolen (sv), SvFLAGS (sv)); 892 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
628} 893}
629 894
630static SV * 895static SV *
631encode_json (SV *scalar, JSON *json) 896encode_json (SV *scalar, JSON *json)
632{ 897{
… …
638 enc.json = *json; 903 enc.json = *json;
639 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 904 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
640 enc.cur = SvPVX (enc.sv); 905 enc.cur = SvPVX (enc.sv);
641 enc.end = SvEND (enc.sv); 906 enc.end = SvEND (enc.sv);
642 enc.indent = 0; 907 enc.indent = 0;
643 enc.maxdepth = DEC_DEPTH (enc.json.flags); 908 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
909 : enc.json.flags & F_LATIN1 ? 0x000100UL
910 : 0x110000UL;
644 911
645 SvPOK_only (enc.sv); 912 SvPOK_only (enc.sv);
646 encode_sv (&enc, scalar); 913 encode_sv (&enc, scalar);
914 encode_nl (&enc);
647 915
648 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 916 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
649 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 917 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
650 918
651 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 919 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
669 JSON json; 937 JSON json;
670 U32 depth; // recursion depth 938 U32 depth; // recursion depth
671 U32 maxdepth; // recursion depth limit 939 U32 maxdepth; // recursion depth limit
672} dec_t; 940} dec_t;
673 941
674inline void 942INLINE void
943decode_comment (dec_t *dec)
944{
945 // only '#'-style comments allowed a.t.m.
946
947 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
948 ++dec->cur;
949}
950
951INLINE void
675decode_ws (dec_t *dec) 952decode_ws (dec_t *dec)
676{ 953{
677 for (;;) 954 for (;;)
678 { 955 {
679 char ch = *dec->cur; 956 char ch = *dec->cur;
680 957
681 if (ch > 0x20 958 if (ch > 0x20)
959 {
960 if (expect_false (ch == '#'))
961 {
962 if (dec->json.flags & F_RELAXED)
963 decode_comment (dec);
964 else
965 break;
966 }
967 else
968 break;
969 }
682 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 970 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
683 break; 971 break; // parse error, but let higher level handle it, gives better error messages
684 972
685 ++dec->cur; 973 ++dec->cur;
686 } 974 }
687} 975}
688 976
… …
692 if (*dec->cur != ch) \ 980 if (*dec->cur != ch) \
693 ERR (# ch " expected"); \ 981 ERR (# ch " expected"); \
694 ++dec->cur; \ 982 ++dec->cur; \
695 SE 983 SE
696 984
697#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 985#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
698#define DEC_DEC_DEPTH --dec->depth 986#define DEC_DEC_DEPTH --dec->depth
699 987
700static SV *decode_sv (dec_t *dec); 988static SV *decode_sv (dec_t *dec);
701 989
702static signed char decode_hexdigit[256]; 990static signed char decode_hexdigit[256];
… …
794 1082
795 if (hi >= 0x80) 1083 if (hi >= 0x80)
796 { 1084 {
797 utf8 = 1; 1085 utf8 = 1;
798 1086
799 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 1087 cur = encode_utf8 (cur, hi);
800 } 1088 }
801 else 1089 else
802 *cur++ = hi; 1090 *cur++ = hi;
803 } 1091 }
804 break; 1092 break;
… …
806 default: 1094 default:
807 --dec_cur; 1095 --dec_cur;
808 ERR ("illegal backslash escape sequence in string"); 1096 ERR ("illegal backslash escape sequence in string");
809 } 1097 }
810 } 1098 }
811 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1099 else if (expect_true (ch >= 0x20 && ch < 0x80))
812 *cur++ = ch; 1100 *cur++ = ch;
813 else if (ch >= 0x80) 1101 else if (ch >= 0x80)
814 { 1102 {
815 STRLEN clen; 1103 STRLEN clen;
816 UV uch;
817 1104
818 --dec_cur; 1105 --dec_cur;
819 1106
820 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1107 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
821 if (clen == (STRLEN)-1) 1108 if (clen == (STRLEN)-1)
822 ERR ("malformed UTF-8 character in JSON string"); 1109 ERR ("malformed UTF-8 character in JSON string");
823 1110
824 do 1111 do
825 *cur++ = *dec_cur++; 1112 *cur++ = *dec_cur++;
… …
842 { 1129 {
843 STRLEN len = cur - buf; 1130 STRLEN len = cur - buf;
844 1131
845 if (sv) 1132 if (sv)
846 { 1133 {
847 SvGROW (sv, SvCUR (sv) + len + 1); 1134 STRLEN cur = SvCUR (sv);
1135
1136 if (SvLEN (sv) <= cur + len)
1137 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1138
848 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1139 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
849 SvCUR_set (sv, SvCUR (sv) + len); 1140 SvCUR_set (sv, SvCUR (sv) + len);
850 } 1141 }
851 else 1142 else
852 sv = newSVpvn (buf, len); 1143 sv = newSVpvn (buf, len);
… …
937 is_nv = 1; 1228 is_nv = 1;
938 } 1229 }
939 1230
940 if (!is_nv) 1231 if (!is_nv)
941 { 1232 {
1233 int len = dec->cur - start;
1234
942 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1235 // special case the rather common 1..5-digit-int case
943 if (*start == '-') 1236 if (*start == '-')
944 switch (dec->cur - start) 1237 switch (len)
945 { 1238 {
946 case 2: return newSViv (-( start [1] - '0' * 1)); 1239 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
947 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1240 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
948 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1241 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
949 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1242 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1243 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
950 } 1244 }
951 else 1245 else
952 switch (dec->cur - start) 1246 switch (len)
953 { 1247 {
954 case 1: return newSViv ( start [0] - '0' * 1); 1248 case 1: return newSViv ( start [0] - '0' * 1);
955 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1249 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
956 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1250 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
957 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1251 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1252 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
958 } 1253 }
959 1254
960 { 1255 {
961 UV uv; 1256 UV uv;
962 int numtype = grok_number (start, dec->cur - start, &uv); 1257 int numtype = grok_number (start, len, &uv);
963 if (numtype & IS_NUMBER_IN_UV) 1258 if (numtype & IS_NUMBER_IN_UV)
964 if (numtype & IS_NUMBER_NEG) 1259 if (numtype & IS_NUMBER_NEG)
965 { 1260 {
966 if (uv < (UV)IV_MIN) 1261 if (uv < (UV)IV_MIN)
967 return newSViv (-(IV)uv); 1262 return newSViv (-(IV)uv);
968 } 1263 }
969 else 1264 else
970 return newSVuv (uv); 1265 return newSVuv (uv);
971
972 // here would likely be the place for bigint support
973 } 1266 }
974 }
975 1267
976 // if we ever support bigint or bigfloat, this is the place for bigfloat 1268 len -= *start == '-' ? 1 : 0;
1269
1270 // does not fit into IV or UV, try NV
1271 if (len <= NV_DIG)
1272 // fits into NV without loss of precision
1273 return newSVnv (json_atof (start));
1274
1275 // everything else fails, convert it to a string
1276 return newSVpvn (start, dec->cur - start);
1277 }
1278
1279 // loss of precision here
977 return newSVnv (Atof (start)); 1280 return newSVnv (json_atof (start));
978 1281
979fail: 1282fail:
980 return 0; 1283 return 0;
981} 1284}
982 1285
… …
1006 if (*dec->cur == ']') 1309 if (*dec->cur == ']')
1007 { 1310 {
1008 ++dec->cur; 1311 ++dec->cur;
1009 break; 1312 break;
1010 } 1313 }
1011 1314
1012 if (*dec->cur != ',') 1315 if (*dec->cur != ',')
1013 ERR (", or ] expected while parsing array"); 1316 ERR (", or ] expected while parsing array");
1014 1317
1015 ++dec->cur; 1318 ++dec->cur;
1319
1320 decode_ws (dec);
1321
1322 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1323 {
1324 ++dec->cur;
1325 break;
1326 }
1016 } 1327 }
1017 1328
1018 DEC_DEC_DEPTH; 1329 DEC_DEC_DEPTH;
1019 return newRV_noinc ((SV *)av); 1330 return newRV_noinc ((SV *)av);
1020 1331
… …
1036 if (*dec->cur == '}') 1347 if (*dec->cur == '}')
1037 ++dec->cur; 1348 ++dec->cur;
1038 else 1349 else
1039 for (;;) 1350 for (;;)
1040 { 1351 {
1041 decode_ws (dec); EXPECT_CH ('"'); 1352 EXPECT_CH ('"');
1042 1353
1043 // heuristic: assume that 1354 // heuristic: assume that
1044 // a) decode_str + hv_store_ent are abysmally slow. 1355 // a) decode_str + hv_store_ent are abysmally slow.
1045 // b) most hash keys are short, simple ascii text. 1356 // b) most hash keys are short, simple ascii text.
1046 // => try to "fast-match" such strings to avoid 1357 // => try to "fast-match" such strings to avoid
… …
1050 char *p = dec->cur; 1361 char *p = dec->cur;
1051 char *e = p + 24; // only try up to 24 bytes 1362 char *e = p + 24; // only try up to 24 bytes
1052 1363
1053 for (;;) 1364 for (;;)
1054 { 1365 {
1055 // the >= 0x80 is true on most architectures 1366 // the >= 0x80 is false on most architectures
1056 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1367 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1057 { 1368 {
1058 // slow path, back up and use decode_str 1369 // slow path, back up and use decode_str
1059 SV *key = decode_str (dec); 1370 SV *key = decode_str (dec);
1060 if (!key) 1371 if (!key)
1061 goto fail; 1372 goto fail;
1062 1373
1063 decode_ws (dec); EXPECT_CH (':'); 1374 decode_ws (dec); EXPECT_CH (':');
1064 1375
1376 decode_ws (dec);
1065 value = decode_sv (dec); 1377 value = decode_sv (dec);
1066 if (!value) 1378 if (!value)
1067 { 1379 {
1068 SvREFCNT_dec (key); 1380 SvREFCNT_dec (key);
1069 goto fail; 1381 goto fail;
… …
1081 int len = p - key; 1393 int len = p - key;
1082 dec->cur = p + 1; 1394 dec->cur = p + 1;
1083 1395
1084 decode_ws (dec); EXPECT_CH (':'); 1396 decode_ws (dec); EXPECT_CH (':');
1085 1397
1398 decode_ws (dec);
1086 value = decode_sv (dec); 1399 value = decode_sv (dec);
1087 if (!value) 1400 if (!value)
1088 goto fail; 1401 goto fail;
1089 1402
1090 hv_store (hv, key, len, value, 0); 1403 hv_store (hv, key, len, value, 0);
… …
1106 1419
1107 if (*dec->cur != ',') 1420 if (*dec->cur != ',')
1108 ERR (", or } expected while parsing object/hash"); 1421 ERR (", or } expected while parsing object/hash");
1109 1422
1110 ++dec->cur; 1423 ++dec->cur;
1424
1425 decode_ws (dec);
1426
1427 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1428 {
1429 ++dec->cur;
1430 break;
1431 }
1111 } 1432 }
1112 1433
1113 DEC_DEC_DEPTH; 1434 DEC_DEC_DEPTH;
1114 sv = newRV_noinc ((SV *)hv); 1435 sv = newRV_noinc ((SV *)hv);
1115 1436
… …
1133 dSP; 1454 dSP;
1134 int count; 1455 int count;
1135 1456
1136 ENTER; SAVETMPS; PUSHMARK (SP); 1457 ENTER; SAVETMPS; PUSHMARK (SP);
1137 XPUSHs (HeVAL (he)); 1458 XPUSHs (HeVAL (he));
1459 sv_2mortal (sv);
1138 1460
1139 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1461 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1140 1462
1141 if (count == 1) 1463 if (count == 1)
1142 { 1464 {
1143 sv = newSVsv (POPs); 1465 sv = newSVsv (POPs);
1144 FREETMPS; LEAVE; 1466 FREETMPS; LEAVE;
1145 return sv; 1467 return sv;
1146 } 1468 }
1147 1469
1470 SvREFCNT_inc (sv);
1148 FREETMPS; LEAVE; 1471 FREETMPS; LEAVE;
1149 } 1472 }
1150 } 1473 }
1151 1474
1152 if (dec->json.cb_object) 1475 if (dec->json.cb_object)
… …
1178 DEC_DEC_DEPTH; 1501 DEC_DEC_DEPTH;
1179 return 0; 1502 return 0;
1180} 1503}
1181 1504
1182static SV * 1505static SV *
1506decode_tag (dec_t *dec)
1507{
1508 SV *tag = 0;
1509 SV *val = 0;
1510
1511 if (!(dec->json.flags & F_ALLOW_TAGS))
1512 ERR ("malformed JSON string, neither array, object, number, string or atom");
1513
1514 ++dec->cur;
1515
1516 tag = decode_sv (dec);
1517 if (!tag)
1518 goto fail;
1519
1520 if (!SvPOK (tag))
1521 ERR ("malformed JSON string, (tag) must be a string");
1522
1523 if (*dec->cur != ')')
1524 ERR (") expected after tag");
1525
1526 ++dec->cur;
1527
1528 val = decode_sv (dec);
1529 if (!val)
1530 goto fail;
1531
1532 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1533 ERR ("malformed JSON string, tag value must be an array");
1534
1535 {
1536 AV *av = (AV *)SvRV (val);
1537 int i, len = av_len (av) + 1;
1538 HV *stash = gv_stashsv (tag, 0);
1539 SV *sv;
1540
1541 if (!stash)
1542 ERR ("cannot decode perl-object (package does not exist)");
1543
1544 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1545
1546 if (!method)
1547 ERR ("cannot decode perl-object (package does not have a THAW method)");
1548
1549 dSP;
1550
1551 ENTER; SAVETMPS; PUSHMARK (SP);
1552 EXTEND (SP, len + 2);
1553 // we re-bless the reference to get overload and other niceties right
1554 PUSHs (tag);
1555 PUSHs (sv_json);
1556
1557 for (i = 0; i < len; ++i)
1558 PUSHs (*av_fetch (av, i, 1));
1559
1560 PUTBACK;
1561 call_sv ((SV *)GvCV (method), G_SCALAR);
1562 SPAGAIN;
1563
1564 SvREFCNT_dec (tag);
1565 SvREFCNT_dec (val);
1566 sv = SvREFCNT_inc (POPs);
1567
1568 PUTBACK;
1569
1570 FREETMPS; LEAVE;
1571
1572 return sv;
1573 }
1574
1575fail:
1576 SvREFCNT_dec (tag);
1577 SvREFCNT_dec (val);
1578 return 0;
1579}
1580
1581static SV *
1183decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1184{ 1583{
1185 decode_ws (dec);
1186
1187 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1188 // to parse anything. 1585 // to parse everything.
1189 switch (*dec->cur) 1586 switch (*dec->cur)
1190 { 1587 {
1191 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1192 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1193 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1194 1592
1195 case '-': 1593 case '-':
1196 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1197 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1198 return decode_num (dec); 1596 return decode_num (dec);
1199 1597
1200 case 't': 1598 case 't':
1201 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1202 { 1600 {
1203 dec->cur += 4; 1601 dec->cur += 4;
1204 return SvREFCNT_inc (json_true); 1602#if JSON_SLOW
1603 types_true = get_bool ("Types::Serialiser::true");
1604#endif
1605 return newSVsv (types_true);
1205 } 1606 }
1206 else 1607 else
1207 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1208 1609
1209 break; 1610 break;
1210 1611
1211 case 'f': 1612 case 'f':
1212 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1213 { 1614 {
1214 dec->cur += 5; 1615 dec->cur += 5;
1215 return SvREFCNT_inc (json_false); 1616#if JSON_SLOW
1617 types_false = get_bool ("Types::Serialiser::false");
1618#endif
1619 return newSVsv (types_false);
1216 } 1620 }
1217 else 1621 else
1218 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1219 1623
1220 break; 1624 break;
… …
1229 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1230 1634
1231 break; 1635 break;
1232 1636
1233 default: 1637 default:
1234 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1235 break; 1639 break;
1236 } 1640 }
1237 1641
1238fail: 1642fail:
1239 return 0; 1643 return 0;
1240} 1644}
1241 1645
1242static SV * 1646static SV *
1243decode_json (SV *string, JSON *json, UV *offset_return) 1647decode_json (SV *string, JSON *json, char **offset_return)
1244{ 1648{
1245 dec_t dec; 1649 dec_t dec;
1246 UV offset;
1247 SV *sv; 1650 SV *sv;
1248 1651
1652 /* work around bugs in 5.10 where manipulating magic values
1653 * makes perl ignore the magic in subsequent accesses.
1654 * also make a copy of non-PV values, to get them into a clean
1655 * state (SvPV should do that, but it's buggy, see below).
1656 */
1249 SvGETMAGIC (string); 1657 /*SvGETMAGIC (string);*/
1658 if (SvMAGICAL (string) || !SvPOK (string))
1659 string = sv_2mortal (newSVsv (string));
1660
1250 SvUPGRADE (string, SVt_PV); 1661 SvUPGRADE (string, SVt_PV);
1251 1662
1252 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1663 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1664 * assertion with -DDEBUGGING, although SvCUR is documented to
1665 * return the xpv_cur field which certainly exists after upgrading.
1666 * according to nicholas clark, calling SvPOK fixes this.
1667 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1668 * and hope for the best.
1669 * Damnit, SvPV_nolen still trips over yet another assertion. This
1670 * assertion business is seriously broken, try yet another workaround
1671 * for the broken -DDEBUGGING.
1672 */
1673 {
1674#ifdef DEBUGGING
1675 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1676#else
1677 STRLEN offset = SvCUR (string);
1678#endif
1679
1680 if (offset > json->max_size && json->max_size)
1253 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1681 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1254 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1682 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1683 }
1255 1684
1256 if (json->flags & F_UTF8) 1685 if (DECODE_WANTS_OCTETS (json))
1257 sv_utf8_downgrade (string, 0); 1686 sv_utf8_downgrade (string, 0);
1258 else 1687 else
1259 sv_utf8_upgrade (string); 1688 sv_utf8_upgrade (string);
1260 1689
1261 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1690 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1262 1691
1263 dec.json = *json; 1692 dec.json = *json;
1264 dec.cur = SvPVX (string); 1693 dec.cur = SvPVX (string);
1265 dec.end = SvEND (string); 1694 dec.end = SvEND (string);
1266 dec.err = 0; 1695 dec.err = 0;
1267 dec.depth = 0; 1696 dec.depth = 0;
1268 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1269 1697
1270 if (dec.json.cb_object || dec.json.cb_sk_object) 1698 if (dec.json.cb_object || dec.json.cb_sk_object)
1271 dec.json.flags |= F_HOOK; 1699 dec.json.flags |= F_HOOK;
1272 1700
1273 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1701 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1702
1703 decode_ws (&dec);
1274 sv = decode_sv (&dec); 1704 sv = decode_sv (&dec);
1705
1706 if (offset_return)
1707 *offset_return = dec.cur;
1275 1708
1276 if (!(offset_return || !sv)) 1709 if (!(offset_return || !sv))
1277 { 1710 {
1278 // check for trailing garbage 1711 // check for trailing garbage
1279 decode_ws (&dec); 1712 decode_ws (&dec);
… …
1282 { 1715 {
1283 dec.err = "garbage after JSON object"; 1716 dec.err = "garbage after JSON object";
1284 SvREFCNT_dec (sv); 1717 SvREFCNT_dec (sv);
1285 sv = 0; 1718 sv = 0;
1286 } 1719 }
1287 }
1288
1289 if (offset_return || !sv)
1290 {
1291 offset = dec.json.flags & F_UTF8
1292 ? dec.cur - SvPVX (string)
1293 : utf8_distance (dec.cur, SvPVX (string));
1294
1295 if (offset_return)
1296 *offset_return = offset;
1297 } 1720 }
1298 1721
1299 if (!sv) 1722 if (!sv)
1300 { 1723 {
1301 SV *uni = sv_newmortal (); 1724 SV *uni = sv_newmortal ();
… …
1307 SAVEVPTR (PL_curcop); 1730 SAVEVPTR (PL_curcop);
1308 PL_curcop = &cop; 1731 PL_curcop = &cop;
1309 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1732 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1310 LEAVE; 1733 LEAVE;
1311 1734
1312 croak ("%s, at character offset %d [\"%s\"]", 1735 croak ("%s, at character offset %d (before \"%s\")",
1313 dec.err, 1736 dec.err,
1314 (int)offset, 1737 (int)ptr_to_index (string, dec.cur),
1315 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1316 } 1739 }
1317 1740
1318 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1319 1742
1320 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1743 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1321 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1744 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1322 1745
1323 return sv; 1746 return sv;
1747}
1748
1749/////////////////////////////////////////////////////////////////////////////
1750// incremental parser
1751
1752static void
1753incr_parse (JSON *self)
1754{
1755 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1756
1757 // the state machine here is a bit convoluted and could be simplified a lot
1758 // but this would make it slower, so...
1759
1760 for (;;)
1761 {
1762 //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
1763 switch (self->incr_mode)
1764 {
1765 // only used for initial whitespace skipping
1766 case INCR_M_WS:
1767 for (;;)
1768 {
1769 if (*p > 0x20)
1770 {
1771 if (*p == '#')
1772 {
1773 self->incr_mode = INCR_M_C0;
1774 goto incr_m_c;
1775 }
1776 else
1777 {
1778 self->incr_mode = INCR_M_JSON;
1779 goto incr_m_json;
1780 }
1781 }
1782 else if (!*p)
1783 goto interrupt;
1784
1785 ++p;
1786 }
1787
1788 // skip a single char inside a string (for \\-processing)
1789 case INCR_M_BS:
1790 if (!*p)
1791 goto interrupt;
1792
1793 ++p;
1794 self->incr_mode = INCR_M_STR;
1795 goto incr_m_str;
1796
1797 // inside #-style comments
1798 case INCR_M_C0:
1799 case INCR_M_C1:
1800 incr_m_c:
1801 for (;;)
1802 {
1803 if (*p == '\n')
1804 {
1805 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1806 break;
1807 }
1808 else if (!*p)
1809 goto interrupt;
1810
1811 ++p;
1812 }
1813
1814 break;
1815
1816 // inside a string
1817 case INCR_M_STR:
1818 incr_m_str:
1819 for (;;)
1820 {
1821 if (*p == '"')
1822 {
1823 ++p;
1824 self->incr_mode = INCR_M_JSON;
1825
1826 if (!self->incr_nest)
1827 goto interrupt;
1828
1829 goto incr_m_json;
1830 }
1831 else if (*p == '\\')
1832 {
1833 ++p; // "virtually" consumes character after \
1834
1835 if (!*p) // if at end of string we have to switch modes
1836 {
1837 self->incr_mode = INCR_M_BS;
1838 goto interrupt;
1839 }
1840 }
1841 else if (!*p)
1842 goto interrupt;
1843
1844 ++p;
1845 }
1846
1847 // after initial ws, outside string
1848 case INCR_M_JSON:
1849 incr_m_json:
1850 for (;;)
1851 {
1852 switch (*p++)
1853 {
1854 case 0:
1855 --p;
1856 goto interrupt;
1857
1858 case 0x09:
1859 case 0x0a:
1860 case 0x0d:
1861 case 0x20:
1862 if (!self->incr_nest)
1863 {
1864 --p; // do not eat the whitespace, let the next round do it
1865 goto interrupt;
1866 }
1867 break;
1868
1869 case '"':
1870 self->incr_mode = INCR_M_STR;
1871 goto incr_m_str;
1872
1873 case '[':
1874 case '{':
1875 case '(':
1876 if (++self->incr_nest > self->max_depth)
1877 croak (ERR_NESTING_EXCEEDED);
1878 break;
1879
1880 case ']':
1881 case '}':
1882 if (--self->incr_nest <= 0)
1883 goto interrupt;
1884 break;
1885
1886 case ')':
1887 --self->incr_nest;
1888 break;
1889
1890 case '#':
1891 self->incr_mode = INCR_M_C1;
1892 goto incr_m_c;
1893 }
1894 }
1895 }
1896
1897 modechange:
1898 ;
1899 }
1900
1901interrupt:
1902 self->incr_pos = p - SvPVX (self->incr_text);
1903 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1904 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1324} 1905}
1325 1906
1326///////////////////////////////////////////////////////////////////////////// 1907/////////////////////////////////////////////////////////////////////////////
1327// XS interface functions 1908// XS interface functions
1328 1909
… …
1337 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1338 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1339 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1340 : -1; 1921 : -1;
1341 1922
1342 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1343 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1344 1925
1345 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1926 types_true = get_bool ("Types::Serialiser::true");
1346 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1927 types_false = get_bool ("Types::Serialiser::false");
1928
1929 sv_json = newSVpv ("JSON", 0);
1930 SvREADONLY_on (sv_json);
1931
1932 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1347} 1933}
1348 1934
1349PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1936
1937void CLONE (...)
1938 CODE:
1939 json_stash = 0;
1940 types_boolean_stash = 0;
1350 1941
1351void new (char *klass) 1942void new (char *klass)
1352 PPCODE: 1943 PPCODE:
1353{ 1944{
1354 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1355 SvPOK_only (pv); 1946 SvPOK_only (pv);
1356 Zero (SvPVX (pv), 1, JSON); 1947 json_init ((JSON *)SvPVX (pv));
1357 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1948 XPUSHs (sv_2mortal (sv_bless (
1358 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1949 newRV_noinc (pv),
1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1951 )));
1359} 1952}
1360 1953
1361void ascii (JSON *self, int enable = 1) 1954void ascii (JSON *self, int enable = 1)
1362 ALIAS: 1955 ALIAS:
1363 ascii = F_ASCII 1956 ascii = F_ASCII
… …
1370 pretty = F_PRETTY 1963 pretty = F_PRETTY
1371 allow_nonref = F_ALLOW_NONREF 1964 allow_nonref = F_ALLOW_NONREF
1372 shrink = F_SHRINK 1965 shrink = F_SHRINK
1373 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1374 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1968 relaxed = F_RELAXED
1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1375 PPCODE: 1971 PPCODE:
1376{ 1972{
1377 if (enable) 1973 if (enable)
1378 self->flags |= ix; 1974 self->flags |= ix;
1379 else 1975 else
1380 self->flags &= ~ix; 1976 self->flags &= ~ix;
1381 1977
1382 XPUSHs (ST (0)); 1978 XPUSHs (ST (0));
1383} 1979}
1384 1980
1385void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1981void get_ascii (JSON *self)
1982 ALIAS:
1983 get_ascii = F_ASCII
1984 get_latin1 = F_LATIN1
1985 get_utf8 = F_UTF8
1986 get_indent = F_INDENT
1987 get_canonical = F_CANONICAL
1988 get_space_before = F_SPACE_BEFORE
1989 get_space_after = F_SPACE_AFTER
1990 get_allow_nonref = F_ALLOW_NONREF
1991 get_shrink = F_SHRINK
1992 get_allow_blessed = F_ALLOW_BLESSED
1993 get_convert_blessed = F_CONV_BLESSED
1994 get_relaxed = F_RELAXED
1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1386 PPCODE: 1997 PPCODE:
1387{ 1998 XPUSHs (boolSV (self->flags & ix));
1388 UV log2 = 0;
1389 1999
1390 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1391 2001 PPCODE:
1392 while ((1UL << log2) < max_depth) 2002 self->max_depth = max_depth;
1393 ++log2;
1394
1395 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1396
1397 XPUSHs (ST (0)); 2003 XPUSHs (ST (0));
1398}
1399 2004
2005U32 get_max_depth (JSON *self)
2006 CODE:
2007 RETVAL = self->max_depth;
2008 OUTPUT:
2009 RETVAL
2010
1400void max_size (JSON *self, UV max_size = 0) 2011void max_size (JSON *self, U32 max_size = 0)
1401 PPCODE: 2012 PPCODE:
1402{ 2013 self->max_size = max_size;
1403 UV log2 = 0;
1404
1405 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1406 if (max_size == 1) max_size = 2;
1407
1408 while ((1UL << log2) < max_size)
1409 ++log2;
1410
1411 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1412
1413 XPUSHs (ST (0)); 2014 XPUSHs (ST (0));
1414} 2015
2016int get_max_size (JSON *self)
2017 CODE:
2018 RETVAL = self->max_size;
2019 OUTPUT:
2020 RETVAL
1415 2021
1416void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2022void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1417 PPCODE: 2023 PPCODE:
1418{ 2024{
1419 SvREFCNT_dec (self->cb_object); 2025 SvREFCNT_dec (self->cb_object);
… …
1423} 2029}
1424 2030
1425void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2031void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1426 PPCODE: 2032 PPCODE:
1427{ 2033{
1428 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1429 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1430 2036
1431 if (SvOK (cb)) 2037 if (SvOK (cb))
1432 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1433 else 2039 else
… …
1444 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1445} 2051}
1446 2052
1447void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1448 PPCODE: 2054 PPCODE:
1449 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1450 2057
1451void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1452 PPCODE: 2059 PPCODE:
1453 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1454 2062
1455void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1456 PPCODE: 2064 PPCODE:
1457{ 2065{
1458 UV offset; 2066 SV *sv;
2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1459 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1460 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1461 PUSHs (sv_2mortal (newSVuv (offset))); 2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
2072}
2073
2074void incr_parse (JSON *self, SV *jsonstr = 0)
2075 PPCODE:
2076{
2077 if (!self->incr_text)
2078 self->incr_text = newSVpvn ("", 0);
2079
2080 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2081 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2082 if (DECODE_WANTS_OCTETS (self))
2083 {
2084 if (self->incr_pos)
2085 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2086 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2087
2088 sv_utf8_downgrade (self->incr_text, 0);
2089 }
2090 else
2091 {
2092 sv_utf8_upgrade (self->incr_text);
2093
2094 if (self->incr_pos)
2095 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2096 - (U8 *)SvPVX (self->incr_text);
2097 }
2098
2099 // append data, if any
2100 if (jsonstr)
2101 {
2102 /* make sure both strings have same encoding */
2103 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
2104 if (SvUTF8 (jsonstr))
2105 sv_utf8_downgrade (jsonstr, 0);
2106 else
2107 sv_utf8_upgrade (jsonstr);
2108
2109 /* and then just blindly append */
2110 {
2111 STRLEN len;
2112 const char *str = SvPV (jsonstr, len);
2113 STRLEN cur = SvCUR (self->incr_text);
2114
2115 if (SvLEN (self->incr_text) <= cur + len)
2116 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
2117
2118 Move (str, SvEND (self->incr_text), len, char);
2119 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
2120 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
2121 }
2122 }
2123
2124 if (GIMME_V != G_VOID)
2125 do
2126 {
2127 SV *sv;
2128 char *offset;
2129
2130 if (!INCR_DONE (self))
2131 {
2132 incr_parse (self);
2133
2134 if (self->incr_pos > self->max_size && self->max_size)
2135 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
2136 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
2137
2138 if (!INCR_DONE (self))
2139 {
2140 // as an optimisation, do not accumulate white space in the incr buffer
2141 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2142 {
2143 self->incr_pos = 0;
2144 SvCUR_set (self->incr_text, 0);
2145 }
2146
2147 break;
2148 }
2149 }
2150
2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv);
2153
2154 self->incr_pos -= offset - SvPVX (self->incr_text);
2155 self->incr_nest = 0;
2156 self->incr_mode = 0;
2157
2158 sv_chop (self->incr_text, offset);
2159 }
2160 while (GIMME_V == G_ARRAY);
2161}
2162
2163SV *incr_text (JSON *self)
2164 ATTRS: lvalue
2165 CODE:
2166{
2167 if (self->incr_pos)
2168 croak ("incr_text can not be called when the incremental parser already started parsing");
2169
2170 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2171}
2172 OUTPUT:
2173 RETVAL
2174
2175void incr_skip (JSON *self)
2176 CODE:
2177{
2178 if (self->incr_pos)
2179 {
2180 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2181 self->incr_pos = 0;
2182 self->incr_nest = 0;
2183 self->incr_mode = 0;
2184 }
2185}
2186
2187void incr_reset (JSON *self)
2188 CODE:
2189{
2190 SvREFCNT_dec (self->incr_text);
2191 self->incr_text = 0;
2192 self->incr_pos = 0;
2193 self->incr_nest = 0;
2194 self->incr_mode = 0;
1462} 2195}
1463 2196
1464void DESTROY (JSON *self) 2197void DESTROY (JSON *self)
1465 CODE: 2198 CODE:
1466 SvREFCNT_dec (self->cb_sk_object); 2199 SvREFCNT_dec (self->cb_sk_object);
1467 SvREFCNT_dec (self->cb_object); 2200 SvREFCNT_dec (self->cb_object);
2201 SvREFCNT_dec (self->incr_text);
1468 2202
1469PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
1470 2204
1471void to_json (SV *scalar) 2205void encode_json (SV *scalar)
1472 PPCODE: 2206 PPCODE:
1473{ 2207{
1474 JSON json = { F_DEFAULT | F_UTF8 }; 2208 JSON json;
1475 XPUSHs (encode_json (scalar, &json)); 2209 json_init (&json);
2210 json.flags |= F_UTF8;
2211 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2212 XPUSHs (scalar);
1476} 2213}
1477 2214
1478void from_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
1479 PPCODE: 2216 PPCODE:
1480{ 2217{
1481 JSON json = { F_DEFAULT | F_UTF8 }; 2218 JSON json;
1482 XPUSHs (decode_json (jsonstr, &json, 0)); 2219 json_init (&json);
2220 json.flags |= F_UTF8;
2221 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2222 XPUSHs (jsonstr);
1483} 2223}
1484 2224

Diff Legend

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