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.70 by root, Wed Mar 19 00:44:54 2008 UTC vs.
Revision 1.119 by root, Mon Oct 28 23:19:54 2013 UTC

… …
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>
9#include <float.h> 10#include <float.h>
10 11
11#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
12# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
13#endif 14#endif
14 15
15// 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
16// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
19#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)
20 24
21#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
28#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
32#define F_RELAXED 0x00001000UL 36#define F_RELAXED 0x00001000UL
33 37#define F_ALLOW_UNKNOWN 0x00002000UL
34#define F_MAXDEPTH 0xf8000000UL 38#define F_ALLOW_TAGS 0x00004000UL
35#define S_MAXDEPTH 27
36#define F_MAXSIZE 0x01f00000UL
37#define S_MAXSIZE 20
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 39#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 40
40#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
41#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
42
43#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
44#define F_DEFAULT (9UL << S_MAXDEPTH)
45 42
46#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
47#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
48 45
49#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
50 47
48#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
49
51#define SB do { 50#define SB do {
52#define SE } while (0) 51#define SE } while (0)
53 52
54#if __GNUC__ >= 3 53#if __GNUC__ >= 3
55# define expect(expr,value) __builtin_expect ((expr),(value)) 54# define expect(expr,value) __builtin_expect ((expr), (value))
56# define inline inline 55# define INLINE static inline
57#else 56#else
58# define expect(expr,value) (expr) 57# define expect(expr,value) (expr)
59# define inline static 58# define INLINE static
60#endif 59#endif
61 60
62#define expect_false(expr) expect ((expr) != 0, 0) 61#define expect_false(expr) expect ((expr) != 0, 0)
63#define expect_true(expr) expect ((expr) != 0, 1) 62#define expect_true(expr) expect ((expr) != 0, 1)
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?)"
64 69
65#ifdef USE_ITHREADS 70#ifdef USE_ITHREADS
66# define JSON_SLOW 1 71# define JSON_SLOW 1
67# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1)) 72# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
68#else 73#else
69# define JSON_SLOW 0 74# define JSON_SLOW 0
70# define JSON_STASH json_stash 75# define JSON_STASH json_stash
71#endif 76#endif
72 77
78// the amount of HEs to allocate on the stack, when sorting keys
79#define STACK_HES 64
80
73static HV *json_stash, *json_boolean_stash; // JSON::XS:: 81static HV *json_stash, *types_boolean_stash; // JSON::XS::
74static 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)
75 94
76typedef struct { 95typedef struct {
77 U32 flags; 96 U32 flags;
97 U32 max_depth;
98 STRLEN max_size;
99
78 SV *cb_object; 100 SV *cb_object;
79 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;
80} JSON; 108} JSON;
109
110INLINE void
111json_init (JSON *json)
112{
113 Zero (json, 1, JSON);
114 json->max_depth = 512;
115}
81 116
82///////////////////////////////////////////////////////////////////////////// 117/////////////////////////////////////////////////////////////////////////////
83// utility functions 118// utility functions
84 119
85inline 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
86shrink (SV *sv) 132shrink (SV *sv)
87{ 133{
88 sv_utf8_downgrade (sv, 1); 134 sv_utf8_downgrade (sv, 1);
135
89 if (SvLEN (sv) > SvCUR (sv) + 1) 136 if (SvLEN (sv) > SvCUR (sv) + 1)
90 { 137 {
91#ifdef SvPV_shrink_to_cur 138#ifdef SvPV_shrink_to_cur
92 SvPV_shrink_to_cur (sv); 139 SvPV_shrink_to_cur (sv);
93#elif defined (SvPV_renew) 140#elif defined (SvPV_renew)
… …
99// 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
100// case of an error. 147// case of an error.
101// we special-case "safe" characters from U+80 .. U+7FF, 148// we special-case "safe" characters from U+80 .. U+7FF,
102// but use the very good perl function to parse anything else. 149// but use the very good perl function to parse anything else.
103// note that we never call this function for a ascii codepoints 150// note that we never call this function for a ascii codepoints
104inline UV 151INLINE UV
105decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 152decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
106{ 153{
107 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 154 if (expect_true (len >= 2
108 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 155 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
109 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 156 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
110 { 157 {
111 *clen = 2; 158 *clen = 2;
112 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 159 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
113 } 160 }
114 else 161 else
115 { 162 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
116 *clen = (STRLEN)-1; 163}
117 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 (;;)
118 } 215 {
119} 216 U8 dig = (U8)*s - '0';
120 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}
121///////////////////////////////////////////////////////////////////////////// 293/////////////////////////////////////////////////////////////////////////////
122// encoder 294// encoder
123 295
124// structure used for encoding JSON 296// structure used for encoding JSON
125typedef struct 297typedef struct
… …
127 char *cur; // SvPVX (sv) + current output position 299 char *cur; // SvPVX (sv) + current output position
128 char *end; // SvEND (sv) 300 char *end; // SvEND (sv)
129 SV *sv; // result scalar 301 SV *sv; // result scalar
130 JSON json; 302 JSON json;
131 U32 indent; // indentation level 303 U32 indent; // indentation level
132 U32 maxdepth; // max. indentation/recursion level 304 UV limit; // escape character values >= this value when encoding
133} enc_t; 305} enc_t;
134 306
135inline void 307INLINE void
136need (enc_t *enc, STRLEN len) 308need (enc_t *enc, STRLEN len)
137{ 309{
138 if (expect_false (enc->cur + len >= enc->end)) 310 if (expect_false (enc->cur + len >= enc->end))
139 { 311 {
140 STRLEN cur = enc->cur - SvPVX (enc->sv); 312 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
141 SvGROW (enc->sv, cur + len + 1); 313 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
142 enc->cur = SvPVX (enc->sv) + cur; 314 enc->cur = SvPVX (enc->sv) + cur;
143 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 315 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
144 } 316 }
145} 317}
146 318
147inline void 319INLINE void
148encode_ch (enc_t *enc, char ch) 320encode_ch (enc_t *enc, char ch)
149{ 321{
150 need (enc, 1); 322 need (enc, 1);
151 *enc->cur++ = ch; 323 *enc->cur++ = ch;
152} 324}
… …
206 { 378 {
207 uch = ch; 379 uch = ch;
208 clen = 1; 380 clen = 1;
209 } 381 }
210 382
211 if (uch > 0x10FFFFUL) 383 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
212 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
213
214 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
215 { 384 {
216 if (uch > 0xFFFFUL) 385 if (uch >= 0x10000UL)
217 { 386 {
387 if (uch >= 0x110000UL)
388 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
389
218 need (enc, len += 11); 390 need (enc, len += 11);
219 sprintf (enc->cur, "\\u%04x\\u%04x", 391 sprintf (enc->cur, "\\u%04x\\u%04x",
220 (int)((uch - 0x10000) / 0x400 + 0xD800), 392 (int)((uch - 0x10000) / 0x400 + 0xD800),
221 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 393 (int)((uch - 0x10000) % 0x400 + 0xDC00));
222 enc->cur += 12; 394 enc->cur += 12;
223 } 395 }
224 else 396 else
225 { 397 {
226 static char hexdigit [16] = "0123456789abcdef";
227 need (enc, len += 5); 398 need (enc, len += 5);
228 *enc->cur++ = '\\'; 399 *enc->cur++ = '\\';
229 *enc->cur++ = 'u'; 400 *enc->cur++ = 'u';
230 *enc->cur++ = hexdigit [ uch >> 12 ]; 401 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
231 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 402 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
232 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 403 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
233 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 404 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
234 } 405 }
235 406
236 str += clen; 407 str += clen;
237 } 408 }
238 else if (enc->json.flags & F_LATIN1) 409 else if (enc->json.flags & F_LATIN1)
… …
250 while (--clen); 421 while (--clen);
251 } 422 }
252 else 423 else
253 { 424 {
254 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
255 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 426 enc->cur = encode_utf8 (enc->cur, uch);
256 ++str; 427 ++str;
257 } 428 }
258 } 429 }
259 } 430 }
260 } 431 }
261 432
262 --len; 433 --len;
263 } 434 }
264} 435}
265 436
266inline void 437INLINE void
267encode_indent (enc_t *enc) 438encode_indent (enc_t *enc)
268{ 439{
269 if (enc->json.flags & F_INDENT) 440 if (enc->json.flags & F_INDENT)
270 { 441 {
271 int spaces = enc->indent * INDENT_STEP; 442 int spaces = enc->indent * INDENT_STEP;
… …
274 memset (enc->cur, ' ', spaces); 445 memset (enc->cur, ' ', spaces);
275 enc->cur += spaces; 446 enc->cur += spaces;
276 } 447 }
277} 448}
278 449
279inline void 450INLINE void
280encode_space (enc_t *enc) 451encode_space (enc_t *enc)
281{ 452{
282 need (enc, 1); 453 need (enc, 1);
283 encode_ch (enc, ' '); 454 encode_ch (enc, ' ');
284} 455}
285 456
286inline void 457INLINE void
287encode_nl (enc_t *enc) 458encode_nl (enc_t *enc)
288{ 459{
289 if (enc->json.flags & F_INDENT) 460 if (enc->json.flags & F_INDENT)
290 { 461 {
291 need (enc, 1); 462 need (enc, 1);
292 encode_ch (enc, '\n'); 463 encode_ch (enc, '\n');
293 } 464 }
294} 465}
295 466
296inline void 467INLINE void
297encode_comma (enc_t *enc) 468encode_comma (enc_t *enc)
298{ 469{
299 encode_ch (enc, ','); 470 encode_ch (enc, ',');
300 471
301 if (enc->json.flags & F_INDENT) 472 if (enc->json.flags & F_INDENT)
… …
309static void 480static void
310encode_av (enc_t *enc, AV *av) 481encode_av (enc_t *enc, AV *av)
311{ 482{
312 int i, len = av_len (av); 483 int i, len = av_len (av);
313 484
314 if (enc->indent >= enc->maxdepth) 485 if (enc->indent >= enc->json.max_depth)
315 croak ("data structure too deep (hit recursion limit)"); 486 croak (ERR_NESTING_EXCEEDED);
316 487
317 encode_ch (enc, '['); 488 encode_ch (enc, '[');
318 489
319 if (len >= 0) 490 if (len >= 0)
320 { 491 {
321 encode_nl (enc); ++enc->indent; 492 encode_nl (enc); ++enc->indent;
322 493
323 for (i = 0; i <= len; ++i) 494 for (i = 0; i <= len; ++i)
… …
335 encode_comma (enc); 506 encode_comma (enc);
336 } 507 }
337 508
338 encode_nl (enc); --enc->indent; encode_indent (enc); 509 encode_nl (enc); --enc->indent; encode_indent (enc);
339 } 510 }
340 511
341 encode_ch (enc, ']'); 512 encode_ch (enc, ']');
342} 513}
343 514
344static void 515static void
345encode_hk (enc_t *enc, HE *he) 516encode_hk (enc_t *enc, HE *he)
… …
349 if (HeKLEN (he) == HEf_SVKEY) 520 if (HeKLEN (he) == HEf_SVKEY)
350 { 521 {
351 SV *sv = HeSVKEY (he); 522 SV *sv = HeSVKEY (he);
352 STRLEN len; 523 STRLEN len;
353 char *str; 524 char *str;
354 525
355 SvGETMAGIC (sv); 526 SvGETMAGIC (sv);
356 str = SvPV (sv, len); 527 str = SvPV (sv, len);
357 528
358 encode_str (enc, str, len, SvUTF8 (sv)); 529 encode_str (enc, str, len, SvUTF8 (sv));
359 } 530 }
… …
394 565
395static void 566static void
396encode_hv (enc_t *enc, HV *hv) 567encode_hv (enc_t *enc, HV *hv)
397{ 568{
398 HE *he; 569 HE *he;
399 int count;
400 570
401 if (enc->indent >= enc->maxdepth) 571 if (enc->indent >= enc->json.max_depth)
402 croak ("data structure too deep (hit recursion limit)"); 572 croak (ERR_NESTING_EXCEEDED);
403 573
404 encode_ch (enc, '{'); 574 encode_ch (enc, '{');
405 575
406 // for canonical output we have to sort by keys first 576 // for canonical output we have to sort by keys first
407 // actually, this is mostly due to the stupid so-called 577 // actually, this is mostly due to the stupid so-called
408 // security workaround added somewhere in 5.8.x. 578 // security workaround added somewhere in 5.8.x
409 // that randomises hash orderings 579 // that randomises hash orderings
410 if (enc->json.flags & F_CANONICAL) 580 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
411 { 581 {
412 int count = hv_iterinit (hv); 582 int count = hv_iterinit (hv);
413 583
414 if (SvMAGICAL (hv)) 584 if (SvMAGICAL (hv))
415 { 585 {
… …
426 } 596 }
427 597
428 if (count) 598 if (count)
429 { 599 {
430 int i, fast = 1; 600 int i, fast = 1;
431#if defined(__BORLANDC__) || defined(_MSC_VER) 601 HE *hes_stack [STACK_HES];
432 HE **hes = _alloca (count * sizeof (HE)); 602 HE **hes = hes_stack;
433#else 603
434 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 604 // allocate larger arrays on the heap
435#endif 605 if (count > STACK_HES)
606 {
607 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
608 hes = (HE **)SvPVX (sv);
609 }
436 610
437 i = 0; 611 i = 0;
438 while ((he = hv_iternext (hv))) 612 while ((he = hv_iternext (hv)))
439 { 613 {
440 hes [i++] = he; 614 hes [i++] = he;
… …
515 SvGETMAGIC (sv); 689 SvGETMAGIC (sv);
516 svt = SvTYPE (sv); 690 svt = SvTYPE (sv);
517 691
518 if (expect_false (SvOBJECT (sv))) 692 if (expect_false (SvOBJECT (sv)))
519 { 693 {
520 HV *stash = !JSON_SLOW || json_boolean_stash 694 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
521 ? json_boolean_stash 695 ? types_boolean_stash
522 : gv_stashpv ("JSON::XS::Boolean", 1); 696 : gv_stashpv ("Types::Serialiser::Boolean", 1);
697 HV *stash = SvSTASH (sv);
523 698
524 if (SvSTASH (sv) == stash) 699 if (stash == boolean_stash)
525 { 700 {
526 if (SvIV (sv)) 701 if (SvIV (sv))
527 encode_str (enc, "true", 4, 0); 702 encode_str (enc, "true", 4, 0);
528 else 703 else
529 encode_str (enc, "false", 5, 0); 704 encode_str (enc, "false", 5, 0);
530 } 705 }
531 else 706 else if (enc->json.flags & F_CONV_BLESSED)
532 { 707 {
533#if 0 708 GV *to_json = gv_fetchmethod_autoload (stash, "TO_JSON", 0);
534 if (0 && sv_derived_from (rv, "JSON::Literal")) 709
535 { 710 if (to_json)
536 // not yet
537 } 711 {
538#endif
539 if (enc->json.flags & F_CONV_BLESSED)
540 { 712 dSP;
713
714 ENTER; SAVETMPS; PUSHMARK (SP);
541 // 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
542 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
543
544 if (to_json)
545 {
546 dSP;
547
548 ENTER; SAVETMPS; PUSHMARK (SP);
549 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 716 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
550 717
551 // 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
552 PUTBACK; 719 PUTBACK;
553 call_sv ((SV *)GvCV (to_json), G_SCALAR); 720 call_sv ((SV *)GvCV (to_json), G_SCALAR);
554 SPAGAIN; 721 SPAGAIN;
555 722
556 // catch this surprisingly common error 723 // catch this surprisingly common error
557 if (SvROK (TOPs) && SvRV (TOPs) == sv) 724 if (SvROK (TOPs) && SvRV (TOPs) == sv)
558 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)));
559 726
560 sv = POPs; 727 sv = POPs;
561 PUTBACK; 728 PUTBACK;
562 729
563 encode_sv (enc, sv); 730 encode_sv (enc, sv);
564 731
565 FREETMPS; LEAVE; 732 FREETMPS; LEAVE;
566 }
567 else if (enc->json.flags & F_ALLOW_BLESSED)
568 encode_str (enc, "null", 4, 0);
569 else
570 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
571 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
572 } 733 }
573 else if (enc->json.flags & F_ALLOW_BLESSED) 734 else if (enc->json.flags & F_ALLOW_BLESSED)
574 encode_str (enc, "null", 4, 0); 735 encode_str (enc, "null", 4, 0);
575 else 736 else
576 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",
577 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 738 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
578 } 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))));
579 } 795 }
580 else if (svt == SVt_PVHV) 796 else if (svt == SVt_PVHV)
581 encode_hv (enc, (HV *)sv); 797 encode_hv (enc, (HV *)sv);
582 else if (svt == SVt_PVAV) 798 else if (svt == SVt_PVAV)
583 encode_av (enc, (AV *)sv); 799 encode_av (enc, (AV *)sv);
… …
588 804
589 if (len == 1 && *pv == '1') 805 if (len == 1 && *pv == '1')
590 encode_str (enc, "true", 4, 0); 806 encode_str (enc, "true", 4, 0);
591 else if (len == 1 && *pv == '0') 807 else if (len == 1 && *pv == '0')
592 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);
593 else 811 else
594 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",
595 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 813 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
596 } 814 }
815 else if (enc->json.flags & F_ALLOW_UNKNOWN)
816 encode_str (enc, "null", 4, 0);
597 else 817 else
598 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",
599 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 819 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
600} 820}
601 821
… …
619 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 839 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
620 enc->cur += strlen (enc->cur); 840 enc->cur += strlen (enc->cur);
621 } 841 }
622 else if (SvIOKp (sv)) 842 else if (SvIOKp (sv))
623 { 843 {
624 // 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
625 if (SvUV (sv) & ~(UV)0x7fff) 845 // we assume two's complement
626 { 846 // we assume no aliasing issues in the union
627 // large integer, use the (rather slow) snprintf way. 847 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
628 need (enc, sizeof (UV) * 3); 848 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
629 enc->cur +=
630 SvIsUV(sv)
631 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
632 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
633 }
634 else
635 { 849 {
636 // optimise the "small number case" 850 // optimise the "small number case"
637 // 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
638 I32 i = SvIV (sv); 853 I32 i = SvIVX (sv);
639 U32 u; 854 U32 u;
640 char digit, nz = 0; 855 char digit, nz = 0;
641 856
642 need (enc, 6); 857 need (enc, 6);
643 858
… …
649 864
650 // 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
651 // 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,
652 // resulting in a net multiplication by 10. 867 // resulting in a net multiplication by 10.
653 // we always write the digit to memory but conditionally increment 868 // we always write the digit to memory but conditionally increment
654 // the pointer, to ease the usage of conditional move instructions. 869 // the pointer, to enable the use of conditional move instructions.
655 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;
656 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;
657 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;
658 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;
659 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'
660 } 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 }
661 } 885 }
662 else if (SvROK (sv)) 886 else if (SvROK (sv))
663 encode_rv (enc, SvRV (sv)); 887 encode_rv (enc, SvRV (sv));
664 else if (!SvOK (sv)) 888 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
665 encode_str (enc, "null", 4, 0); 889 encode_str (enc, "null", 4, 0);
666 else 890 else
667 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",
668 SvPV_nolen (sv), SvFLAGS (sv)); 892 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
669} 893}
670 894
671static SV * 895static SV *
672encode_json (SV *scalar, JSON *json) 896encode_json (SV *scalar, JSON *json)
673{ 897{
… …
679 enc.json = *json; 903 enc.json = *json;
680 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 904 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
681 enc.cur = SvPVX (enc.sv); 905 enc.cur = SvPVX (enc.sv);
682 enc.end = SvEND (enc.sv); 906 enc.end = SvEND (enc.sv);
683 enc.indent = 0; 907 enc.indent = 0;
684 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;
685 911
686 SvPOK_only (enc.sv); 912 SvPOK_only (enc.sv);
687 encode_sv (&enc, scalar); 913 encode_sv (&enc, scalar);
914 encode_nl (&enc);
688 915
689 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 916 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
690 *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
691 918
692 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 919 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
710 JSON json; 937 JSON json;
711 U32 depth; // recursion depth 938 U32 depth; // recursion depth
712 U32 maxdepth; // recursion depth limit 939 U32 maxdepth; // recursion depth limit
713} dec_t; 940} dec_t;
714 941
715inline void 942INLINE void
716decode_comment (dec_t *dec) 943decode_comment (dec_t *dec)
717{ 944{
718 // only '#'-style comments allowed a.t.m. 945 // only '#'-style comments allowed a.t.m.
719 946
720 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d) 947 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
721 ++dec->cur; 948 ++dec->cur;
722} 949}
723 950
724inline void 951INLINE void
725decode_ws (dec_t *dec) 952decode_ws (dec_t *dec)
726{ 953{
727 for (;;) 954 for (;;)
728 { 955 {
729 char ch = *dec->cur; 956 char ch = *dec->cur;
… …
753 if (*dec->cur != ch) \ 980 if (*dec->cur != ch) \
754 ERR (# ch " expected"); \ 981 ERR (# ch " expected"); \
755 ++dec->cur; \ 982 ++dec->cur; \
756 SE 983 SE
757 984
758#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)
759#define DEC_DEC_DEPTH --dec->depth 986#define DEC_DEC_DEPTH --dec->depth
760 987
761static SV *decode_sv (dec_t *dec); 988static SV *decode_sv (dec_t *dec);
762 989
763static signed char decode_hexdigit[256]; 990static signed char decode_hexdigit[256];
… …
855 1082
856 if (hi >= 0x80) 1083 if (hi >= 0x80)
857 { 1084 {
858 utf8 = 1; 1085 utf8 = 1;
859 1086
860 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 1087 cur = encode_utf8 (cur, hi);
861 } 1088 }
862 else 1089 else
863 *cur++ = hi; 1090 *cur++ = hi;
864 } 1091 }
865 break; 1092 break;
… …
867 default: 1094 default:
868 --dec_cur; 1095 --dec_cur;
869 ERR ("illegal backslash escape sequence in string"); 1096 ERR ("illegal backslash escape sequence in string");
870 } 1097 }
871 } 1098 }
872 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1099 else if (expect_true (ch >= 0x20 && ch < 0x80))
873 *cur++ = ch; 1100 *cur++ = ch;
874 else if (ch >= 0x80) 1101 else if (ch >= 0x80)
875 { 1102 {
876 STRLEN clen; 1103 STRLEN clen;
877 UV uch;
878 1104
879 --dec_cur; 1105 --dec_cur;
880 1106
881 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1107 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
882 if (clen == (STRLEN)-1) 1108 if (clen == (STRLEN)-1)
883 ERR ("malformed UTF-8 character in JSON string"); 1109 ERR ("malformed UTF-8 character in JSON string");
884 1110
885 do 1111 do
886 *cur++ = *dec_cur++; 1112 *cur++ = *dec_cur++;
… …
903 { 1129 {
904 STRLEN len = cur - buf; 1130 STRLEN len = cur - buf;
905 1131
906 if (sv) 1132 if (sv)
907 { 1133 {
908 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
909 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1139 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
910 SvCUR_set (sv, SvCUR (sv) + len); 1140 SvCUR_set (sv, SvCUR (sv) + len);
911 } 1141 }
912 else 1142 else
913 sv = newSVpvn (buf, len); 1143 sv = newSVpvn (buf, len);
… …
1004 1234
1005 // special case the rather common 1..5-digit-int case 1235 // special case the rather common 1..5-digit-int case
1006 if (*start == '-') 1236 if (*start == '-')
1007 switch (len) 1237 switch (len)
1008 { 1238 {
1009 case 2: return newSViv (-( start [1] - '0' * 1)); 1239 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
1010 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1240 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
1011 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));
1012 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));
1013 case 6: return newSViv (-(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111)); 1243 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
1014 } 1244 }
1015 else 1245 else
1016 switch (len) 1246 switch (len)
1017 { 1247 {
1018 case 1: return newSViv ( start [0] - '0' * 1); 1248 case 1: return newSViv ( start [0] - '0' * 1);
1019 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1249 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
1020 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);
1021 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);
1022 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111); 1252 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
1023 } 1253 }
1024 1254
1025 { 1255 {
1026 UV uv; 1256 UV uv;
1027 int numtype = grok_number (start, len, &uv); 1257 int numtype = grok_number (start, len, &uv);
… …
1036 } 1266 }
1037 1267
1038 len -= *start == '-' ? 1 : 0; 1268 len -= *start == '-' ? 1 : 0;
1039 1269
1040 // does not fit into IV or UV, try NV 1270 // does not fit into IV or UV, try NV
1041 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1271 if (len <= NV_DIG)
1042 #if defined (LDBL_DIG)
1043 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1044 #endif
1045 )
1046 // fits into NV without loss of precision 1272 // fits into NV without loss of precision
1047 return newSVnv (Atof (start)); 1273 return newSVnv (json_atof (start));
1048 1274
1049 // everything else fails, convert it to a string 1275 // everything else fails, convert it to a string
1050 return newSVpvn (start, dec->cur - start); 1276 return newSVpvn (start, dec->cur - start);
1051 } 1277 }
1052 1278
1053 // loss of precision here 1279 // loss of precision here
1054 return newSVnv (Atof (start)); 1280 return newSVnv (json_atof (start));
1055 1281
1056fail: 1282fail:
1057 return 0; 1283 return 0;
1058} 1284}
1059 1285
… …
1083 if (*dec->cur == ']') 1309 if (*dec->cur == ']')
1084 { 1310 {
1085 ++dec->cur; 1311 ++dec->cur;
1086 break; 1312 break;
1087 } 1313 }
1088 1314
1089 if (*dec->cur != ',') 1315 if (*dec->cur != ',')
1090 ERR (", or ] expected while parsing array"); 1316 ERR (", or ] expected while parsing array");
1091 1317
1092 ++dec->cur; 1318 ++dec->cur;
1093 1319
… …
1135 char *p = dec->cur; 1361 char *p = dec->cur;
1136 char *e = p + 24; // only try up to 24 bytes 1362 char *e = p + 24; // only try up to 24 bytes
1137 1363
1138 for (;;) 1364 for (;;)
1139 { 1365 {
1140 // the >= 0x80 is true on most architectures 1366 // the >= 0x80 is false on most architectures
1141 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1367 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1142 { 1368 {
1143 // slow path, back up and use decode_str 1369 // slow path, back up and use decode_str
1144 SV *key = decode_str (dec); 1370 SV *key = decode_str (dec);
1145 if (!key) 1371 if (!key)
… …
1228 dSP; 1454 dSP;
1229 int count; 1455 int count;
1230 1456
1231 ENTER; SAVETMPS; PUSHMARK (SP); 1457 ENTER; SAVETMPS; PUSHMARK (SP);
1232 XPUSHs (HeVAL (he)); 1458 XPUSHs (HeVAL (he));
1459 sv_2mortal (sv);
1233 1460
1234 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1461 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1235 1462
1236 if (count == 1) 1463 if (count == 1)
1237 { 1464 {
1238 sv = newSVsv (POPs); 1465 sv = newSVsv (POPs);
1239 FREETMPS; LEAVE; 1466 FREETMPS; LEAVE;
1240 return sv; 1467 return sv;
1241 } 1468 }
1242 1469
1470 SvREFCNT_inc (sv);
1243 FREETMPS; LEAVE; 1471 FREETMPS; LEAVE;
1244 } 1472 }
1245 } 1473 }
1246 1474
1247 if (dec->json.cb_object) 1475 if (dec->json.cb_object)
… …
1273 DEC_DEC_DEPTH; 1501 DEC_DEC_DEPTH;
1274 return 0; 1502 return 0;
1275} 1503}
1276 1504
1277static 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 *
1278decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1279{ 1583{
1280 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1281 // to parse anything. 1585 // to parse everything.
1282 switch (*dec->cur) 1586 switch (*dec->cur)
1283 { 1587 {
1284 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1285 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1286 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1287 1592
1288 case '-': 1593 case '-':
1289 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1290 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1291 return decode_num (dec); 1596 return decode_num (dec);
… …
1293 case 't': 1598 case 't':
1294 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1295 { 1600 {
1296 dec->cur += 4; 1601 dec->cur += 4;
1297#if JSON_SLOW 1602#if JSON_SLOW
1298 json_true = get_sv ("JSON::XS::true", 1); SvREADONLY_on (json_true); 1603 types_true = get_bool ("Types::Serialiser::true");
1299#endif 1604#endif
1300 return SvREFCNT_inc (json_true); 1605 return newSVsv (types_true);
1301 } 1606 }
1302 else 1607 else
1303 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1304 1609
1305 break; 1610 break;
… …
1307 case 'f': 1612 case 'f':
1308 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1309 { 1614 {
1310 dec->cur += 5; 1615 dec->cur += 5;
1311#if JSON_SLOW 1616#if JSON_SLOW
1312 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1617 types_false = get_bool ("Types::Serialiser::false");
1313#endif 1618#endif
1314 return SvREFCNT_inc (json_false); 1619 return newSVsv (types_false);
1315 } 1620 }
1316 else 1621 else
1317 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1318 1623
1319 break; 1624 break;
… …
1328 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1329 1634
1330 break; 1635 break;
1331 1636
1332 default: 1637 default:
1333 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1334 break; 1639 break;
1335 } 1640 }
1336 1641
1337fail: 1642fail:
1338 return 0; 1643 return 0;
1339} 1644}
1340 1645
1341static SV * 1646static SV *
1342decode_json (SV *string, JSON *json, UV *offset_return) 1647decode_json (SV *string, JSON *json, char **offset_return)
1343{ 1648{
1344 dec_t dec; 1649 dec_t dec;
1345 UV offset;
1346 SV *sv; 1650 SV *sv;
1347 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 */
1348 SvGETMAGIC (string); 1657 /*SvGETMAGIC (string);*/
1658 if (SvMAGICAL (string) || !SvPOK (string))
1659 string = sv_2mortal (newSVsv (string));
1660
1349 SvUPGRADE (string, SVt_PV); 1661 SvUPGRADE (string, SVt_PV);
1350 1662
1351 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)
1352 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",
1353 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1682 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1683 }
1354 1684
1355 if (json->flags & F_UTF8) 1685 if (DECODE_WANTS_OCTETS (json))
1356 sv_utf8_downgrade (string, 0); 1686 sv_utf8_downgrade (string, 0);
1357 else 1687 else
1358 sv_utf8_upgrade (string); 1688 sv_utf8_upgrade (string);
1359 1689
1360 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1690 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1361 1691
1362 dec.json = *json; 1692 dec.json = *json;
1363 dec.cur = SvPVX (string); 1693 dec.cur = SvPVX (string);
1364 dec.end = SvEND (string); 1694 dec.end = SvEND (string);
1365 dec.err = 0; 1695 dec.err = 0;
1366 dec.depth = 0; 1696 dec.depth = 0;
1367 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1368 1697
1369 if (dec.json.cb_object || dec.json.cb_sk_object) 1698 if (dec.json.cb_object || dec.json.cb_sk_object)
1370 dec.json.flags |= F_HOOK; 1699 dec.json.flags |= F_HOOK;
1371 1700
1372 *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
1373 1702
1374 decode_ws (&dec); 1703 decode_ws (&dec);
1375 sv = decode_sv (&dec); 1704 sv = decode_sv (&dec);
1705
1706 if (offset_return)
1707 *offset_return = dec.cur;
1376 1708
1377 if (!(offset_return || !sv)) 1709 if (!(offset_return || !sv))
1378 { 1710 {
1379 // check for trailing garbage 1711 // check for trailing garbage
1380 decode_ws (&dec); 1712 decode_ws (&dec);
… …
1383 { 1715 {
1384 dec.err = "garbage after JSON object"; 1716 dec.err = "garbage after JSON object";
1385 SvREFCNT_dec (sv); 1717 SvREFCNT_dec (sv);
1386 sv = 0; 1718 sv = 0;
1387 } 1719 }
1388 }
1389
1390 if (offset_return || !sv)
1391 {
1392 offset = dec.json.flags & F_UTF8
1393 ? dec.cur - SvPVX (string)
1394 : utf8_distance (dec.cur, SvPVX (string));
1395
1396 if (offset_return)
1397 *offset_return = offset;
1398 } 1720 }
1399 1721
1400 if (!sv) 1722 if (!sv)
1401 { 1723 {
1402 SV *uni = sv_newmortal (); 1724 SV *uni = sv_newmortal ();
… …
1408 SAVEVPTR (PL_curcop); 1730 SAVEVPTR (PL_curcop);
1409 PL_curcop = &cop; 1731 PL_curcop = &cop;
1410 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);
1411 LEAVE; 1733 LEAVE;
1412 1734
1413 croak ("%s, at character offset %d [\"%s\"]", 1735 croak ("%s, at character offset %d (before \"%s\")",
1414 dec.err, 1736 dec.err,
1415 (int)offset, 1737 (int)ptr_to_index (string, dec.cur),
1416 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1417 } 1739 }
1418 1740
1419 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1420 1742
1421 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1743 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1422 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)");
1423 1745
1424 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
1425} 1905}
1426 1906
1427///////////////////////////////////////////////////////////////////////////// 1907/////////////////////////////////////////////////////////////////////////////
1428// XS interface functions 1908// XS interface functions
1429 1909
… …
1438 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1439 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1440 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1441 : -1; 1921 : -1;
1442 1922
1443 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1444 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1445 1925
1446 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1926 types_true = get_bool ("Types::Serialiser::true");
1447 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 */
1448} 1933}
1449 1934
1450PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1451 1936
1452void CLONE (...) 1937void CLONE (...)
1453 CODE: 1938 CODE:
1454 json_stash = 0; 1939 json_stash = 0;
1455 json_boolean_stash = 0; 1940 types_boolean_stash = 0;
1456 1941
1457void new (char *klass) 1942void new (char *klass)
1458 PPCODE: 1943 PPCODE:
1459{ 1944{
1460 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1461 SvPOK_only (pv); 1946 SvPOK_only (pv);
1462 Zero (SvPVX (pv), 1, JSON); 1947 json_init ((JSON *)SvPVX (pv));
1463 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1464 XPUSHs (sv_2mortal (sv_bless ( 1948 XPUSHs (sv_2mortal (sv_bless (
1465 newRV_noinc (pv), 1949 newRV_noinc (pv),
1466 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1467 ))); 1951 )));
1468} 1952}
… …
1480 allow_nonref = F_ALLOW_NONREF 1964 allow_nonref = F_ALLOW_NONREF
1481 shrink = F_SHRINK 1965 shrink = F_SHRINK
1482 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1483 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1484 relaxed = F_RELAXED 1968 relaxed = F_RELAXED
1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1485 PPCODE: 1971 PPCODE:
1486{ 1972{
1487 if (enable) 1973 if (enable)
1488 self->flags |= ix; 1974 self->flags |= ix;
1489 else 1975 else
… …
1504 get_allow_nonref = F_ALLOW_NONREF 1990 get_allow_nonref = F_ALLOW_NONREF
1505 get_shrink = F_SHRINK 1991 get_shrink = F_SHRINK
1506 get_allow_blessed = F_ALLOW_BLESSED 1992 get_allow_blessed = F_ALLOW_BLESSED
1507 get_convert_blessed = F_CONV_BLESSED 1993 get_convert_blessed = F_CONV_BLESSED
1508 get_relaxed = F_RELAXED 1994 get_relaxed = F_RELAXED
1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1509 PPCODE: 1997 PPCODE:
1510 XPUSHs (boolSV (self->flags & ix)); 1998 XPUSHs (boolSV (self->flags & ix));
1511 1999
1512void max_depth (JSON *self, UV max_depth = 0x80000000UL) 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1513 PPCODE: 2001 PPCODE:
1514{ 2002 self->max_depth = max_depth;
1515 UV log2 = 0;
1516
1517 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1518
1519 while ((1UL << log2) < max_depth)
1520 ++log2;
1521
1522 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1523
1524 XPUSHs (ST (0)); 2003 XPUSHs (ST (0));
1525}
1526 2004
1527U32 get_max_depth (JSON *self) 2005U32 get_max_depth (JSON *self)
1528 CODE: 2006 CODE:
1529 RETVAL = DEC_DEPTH (self->flags); 2007 RETVAL = self->max_depth;
1530 OUTPUT: 2008 OUTPUT:
1531 RETVAL 2009 RETVAL
1532 2010
1533void max_size (JSON *self, UV max_size = 0) 2011void max_size (JSON *self, U32 max_size = 0)
1534 PPCODE: 2012 PPCODE:
1535{ 2013 self->max_size = max_size;
1536 UV log2 = 0;
1537
1538 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1539 if (max_size == 1) max_size = 2;
1540
1541 while ((1UL << log2) < max_size)
1542 ++log2;
1543
1544 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1545
1546 XPUSHs (ST (0)); 2014 XPUSHs (ST (0));
1547}
1548 2015
1549int get_max_size (JSON *self) 2016int get_max_size (JSON *self)
1550 CODE: 2017 CODE:
1551 RETVAL = DEC_SIZE (self->flags); 2018 RETVAL = self->max_size;
1552 OUTPUT: 2019 OUTPUT:
1553 RETVAL 2020 RETVAL
1554 2021
1555void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 2022void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1556 PPCODE: 2023 PPCODE:
… …
1562} 2029}
1563 2030
1564void 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)
1565 PPCODE: 2032 PPCODE:
1566{ 2033{
1567 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1568 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1569 2036
1570 if (SvOK (cb)) 2037 if (SvOK (cb))
1571 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1572 else 2039 else
… …
1583 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1584} 2051}
1585 2052
1586void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1587 PPCODE: 2054 PPCODE:
1588 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1589 2057
1590void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1591 PPCODE: 2059 PPCODE:
1592 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1593 2062
1594void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1595 PPCODE: 2064 PPCODE:
1596{ 2065{
1597 UV offset; 2066 SV *sv;
2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1598 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1599 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1600 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;
1601} 2195}
1602 2196
1603void DESTROY (JSON *self) 2197void DESTROY (JSON *self)
1604 CODE: 2198 CODE:
1605 SvREFCNT_dec (self->cb_sk_object); 2199 SvREFCNT_dec (self->cb_sk_object);
1606 SvREFCNT_dec (self->cb_object); 2200 SvREFCNT_dec (self->cb_object);
2201 SvREFCNT_dec (self->incr_text);
1607 2202
1608PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
1609 2204
1610void encode_json (SV *scalar) 2205void encode_json (SV *scalar)
1611 PPCODE: 2206 PPCODE:
1612{ 2207{
1613 JSON json = { F_DEFAULT | F_UTF8 }; 2208 JSON json;
1614 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);
1615} 2213}
1616 2214
1617void decode_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
1618 PPCODE: 2216 PPCODE:
1619{ 2217{
1620 JSON json = { F_DEFAULT | F_UTF8 }; 2218 JSON json;
1621 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);
1622} 2223}
1623 2224

Diff Legend

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