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.109 by root, Tue Mar 8 10:18:50 2011 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
35#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
36 39
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 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41#define F_DEFAULT (9UL << S_MAXDEPTH)
42 41
43#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
44#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
45 44
46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
47 46
47#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
48
48#define SB do { 49#define SB do {
49#define SE } while (0) 50#define SE } while (0)
50 51
51#if __GNUC__ >= 3 52#if __GNUC__ >= 3
52# define expect(expr,value) __builtin_expect ((expr),(value)) 53# define expect(expr,value) __builtin_expect ((expr), (value))
53# define inline inline 54# define INLINE static inline
54#else 55#else
55# define expect(expr,value) (expr) 56# define expect(expr,value) (expr)
56# define inline static 57# define INLINE static
57#endif 58#endif
58 59
59#define expect_false(expr) expect ((expr) != 0, 0) 60#define expect_false(expr) expect ((expr) != 0, 0)
60#define expect_true(expr) expect ((expr) != 0, 1) 61#define expect_true(expr) expect ((expr) != 0, 1)
61 62
63#define IN_RANGE_INC(type,val,beg,end) \
64 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
65 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
66
67#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
68
69#ifdef USE_ITHREADS
70# define JSON_SLOW 1
71# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
72#else
73# define JSON_SLOW 0
74# define JSON_STASH json_stash
75#endif
76
62static HV *json_stash, *json_boolean_stash; // JSON::XS:: 77static HV *json_stash, *json_boolean_stash; // JSON::XS::
63static SV *json_true, *json_false; 78static SV *json_true, *json_false;
64 79
80enum {
81 INCR_M_WS = 0, // initial whitespace skipping, must be 0
82 INCR_M_STR, // inside string
83 INCR_M_BS, // inside backslash
84 INCR_M_C0, // inside comment in initial whitespace sequence
85 INCR_M_C1, // inside comment in other places
86 INCR_M_JSON // outside anything, count nesting
87};
88
89#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
90
65typedef struct { 91typedef struct {
66 U32 flags; 92 U32 flags;
93 U32 max_depth;
94 STRLEN max_size;
95
67 SV *cb_object; 96 SV *cb_object;
68 HV *cb_sk_object; 97 HV *cb_sk_object;
98
99 // for the incremental parser
100 SV *incr_text; // the source text so far
101 STRLEN incr_pos; // the current offset into the text
102 int incr_nest; // {[]}-nesting level
103 unsigned char incr_mode;
69} JSON; 104} JSON;
105
106INLINE void
107json_init (JSON *json)
108{
109 Zero (json, 1, JSON);
110 json->max_depth = 512;
111}
70 112
71///////////////////////////////////////////////////////////////////////////// 113/////////////////////////////////////////////////////////////////////////////
72// utility functions 114// utility functions
73 115
74inline void 116INLINE SV *
117get_bool (const char *name)
118{
119 SV *sv = get_sv (name, 1);
120
121 SvREADONLY_on (sv);
122 SvREADONLY_on (SvRV (sv));
123
124 return sv;
125}
126
127INLINE void
75shrink (SV *sv) 128shrink (SV *sv)
76{ 129{
77 sv_utf8_downgrade (sv, 1); 130 sv_utf8_downgrade (sv, 1);
131
78 if (SvLEN (sv) > SvCUR (sv) + 1) 132 if (SvLEN (sv) > SvCUR (sv) + 1)
79 { 133 {
80#ifdef SvPV_shrink_to_cur 134#ifdef SvPV_shrink_to_cur
81 SvPV_shrink_to_cur (sv); 135 SvPV_shrink_to_cur (sv);
82#elif defined (SvPV_renew) 136#elif defined (SvPV_renew)
… …
88// decode an utf-8 character and return it, or (UV)-1 in 142// decode an utf-8 character and return it, or (UV)-1 in
89// case of an error. 143// case of an error.
90// we special-case "safe" characters from U+80 .. U+7FF, 144// we special-case "safe" characters from U+80 .. U+7FF,
91// but use the very good perl function to parse anything else. 145// but use the very good perl function to parse anything else.
92// note that we never call this function for a ascii codepoints 146// note that we never call this function for a ascii codepoints
93inline UV 147INLINE UV
94decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 148decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
95{ 149{
96 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 150 if (expect_true (len >= 2
97 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 151 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
98 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 152 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
99 { 153 {
100 *clen = 2; 154 *clen = 2;
101 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 155 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
102 } 156 }
103 else 157 else
104 { 158 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
105 *clen = (STRLEN)-1; 159}
106 return (UV)-1; 160
161// likewise for encoding, also never called for ascii codepoints
162// this function takes advantage of this fact, although current gccs
163// seem to optimise the check for >= 0x80 away anyways
164INLINE unsigned char *
165encode_utf8 (unsigned char *s, UV ch)
166{
167 if (expect_false (ch < 0x000080))
168 *s++ = ch;
169 else if (expect_true (ch < 0x000800))
170 *s++ = 0xc0 | ( ch >> 6),
171 *s++ = 0x80 | ( ch & 0x3f);
172 else if ( ch < 0x010000)
173 *s++ = 0xe0 | ( ch >> 12),
174 *s++ = 0x80 | ((ch >> 6) & 0x3f),
175 *s++ = 0x80 | ( ch & 0x3f);
176 else if ( ch < 0x110000)
177 *s++ = 0xf0 | ( ch >> 18),
178 *s++ = 0x80 | ((ch >> 12) & 0x3f),
179 *s++ = 0x80 | ((ch >> 6) & 0x3f),
180 *s++ = 0x80 | ( ch & 0x3f);
181
182 return s;
183}
184
185// convert offset pointer to character index, sv must be string
186static STRLEN
187ptr_to_index (SV *sv, char *offset)
188{
189 return SvUTF8 (sv)
190 ? utf8_distance (offset, SvPVX (sv))
191 : offset - SvPVX (sv);
192}
193
194/////////////////////////////////////////////////////////////////////////////
195// fp hell
196
197// scan a group of digits, and a trailing exponent
198static void
199json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
200{
201 UV uaccum = 0;
202 int eaccum = 0;
203
204 // if we recurse too deep, skip all remaining digits
205 // to avoid a stack overflow attack
206 if (expect_false (--maxdepth <= 0))
207 while (((U8)*s - '0') < 10)
208 ++s;
209
210 for (;;)
107 } 211 {
108} 212 U8 dig = (U8)*s - '0';
109 213
214 if (expect_false (dig >= 10))
215 {
216 if (dig == (U8)((U8)'.' - (U8)'0'))
217 {
218 ++s;
219 json_atof_scan1 (s, accum, expo, 1, maxdepth);
220 }
221 else if ((dig | ' ') == 'e' - '0')
222 {
223 int exp2 = 0;
224 int neg = 0;
225
226 ++s;
227
228 if (*s == '-')
229 {
230 ++s;
231 neg = 1;
232 }
233 else if (*s == '+')
234 ++s;
235
236 while ((dig = (U8)*s - '0') < 10)
237 exp2 = exp2 * 10 + *s++ - '0';
238
239 *expo += neg ? -exp2 : exp2;
240 }
241
242 break;
243 }
244
245 ++s;
246
247 uaccum = uaccum * 10 + dig;
248 ++eaccum;
249
250 // if we have too many digits, then recurse for more
251 // we actually do this for rather few digits
252 if (uaccum >= (UV_MAX - 9) / 10)
253 {
254 if (postdp) *expo -= eaccum;
255 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
256 if (postdp) *expo += eaccum;
257
258 break;
259 }
260 }
261
262 // this relies greatly on the quality of the pow ()
263 // implementation of the platform, but a good
264 // implementation is hard to beat.
265 if (postdp) *expo -= eaccum;
266 *accum += uaccum * Perl_pow (10., *expo);
267 *expo += eaccum;
268}
269
270static NV
271json_atof (const char *s)
272{
273 NV accum = 0.;
274 int expo = 0;
275 int neg = 0;
276
277 if (*s == '-')
278 {
279 ++s;
280 neg = 1;
281 }
282
283 // a recursion depth of ten gives us >>500 bits
284 json_atof_scan1 (s, &accum, &expo, 0, 10);
285
286 return neg ? -accum : accum;
287}
110///////////////////////////////////////////////////////////////////////////// 288/////////////////////////////////////////////////////////////////////////////
111// encoder 289// encoder
112 290
113// structure used for encoding JSON 291// structure used for encoding JSON
114typedef struct 292typedef struct
… …
116 char *cur; // SvPVX (sv) + current output position 294 char *cur; // SvPVX (sv) + current output position
117 char *end; // SvEND (sv) 295 char *end; // SvEND (sv)
118 SV *sv; // result scalar 296 SV *sv; // result scalar
119 JSON json; 297 JSON json;
120 U32 indent; // indentation level 298 U32 indent; // indentation level
121 U32 maxdepth; // max. indentation/recursion level 299 UV limit; // escape character values >= this value when encoding
122} enc_t; 300} enc_t;
123 301
124inline void 302INLINE void
125need (enc_t *enc, STRLEN len) 303need (enc_t *enc, STRLEN len)
126{ 304{
127 if (expect_false (enc->cur + len >= enc->end)) 305 if (expect_false (enc->cur + len >= enc->end))
128 { 306 {
129 STRLEN cur = enc->cur - SvPVX (enc->sv); 307 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
130 SvGROW (enc->sv, cur + len + 1); 308 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
131 enc->cur = SvPVX (enc->sv) + cur; 309 enc->cur = SvPVX (enc->sv) + cur;
132 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 310 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
133 } 311 }
134} 312}
135 313
136inline void 314INLINE void
137encode_ch (enc_t *enc, char ch) 315encode_ch (enc_t *enc, char ch)
138{ 316{
139 need (enc, 1); 317 need (enc, 1);
140 *enc->cur++ = ch; 318 *enc->cur++ = ch;
141} 319}
… …
195 { 373 {
196 uch = ch; 374 uch = ch;
197 clen = 1; 375 clen = 1;
198 } 376 }
199 377
200 if (uch > 0x10FFFFUL) 378 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 { 379 {
205 if (uch > 0xFFFFUL) 380 if (uch >= 0x10000UL)
206 { 381 {
382 if (uch >= 0x110000UL)
383 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
384
207 need (enc, len += 11); 385 need (enc, len += 11);
208 sprintf (enc->cur, "\\u%04x\\u%04x", 386 sprintf (enc->cur, "\\u%04x\\u%04x",
209 (int)((uch - 0x10000) / 0x400 + 0xD800), 387 (int)((uch - 0x10000) / 0x400 + 0xD800),
210 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 388 (int)((uch - 0x10000) % 0x400 + 0xDC00));
211 enc->cur += 12; 389 enc->cur += 12;
212 } 390 }
213 else 391 else
214 { 392 {
215 static char hexdigit [16] = "0123456789abcdef";
216 need (enc, len += 5); 393 need (enc, len += 5);
217 *enc->cur++ = '\\'; 394 *enc->cur++ = '\\';
218 *enc->cur++ = 'u'; 395 *enc->cur++ = 'u';
219 *enc->cur++ = hexdigit [ uch >> 12 ]; 396 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
220 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 397 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
221 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 398 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
222 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 399 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
223 } 400 }
224 401
225 str += clen; 402 str += clen;
226 } 403 }
227 else if (enc->json.flags & F_LATIN1) 404 else if (enc->json.flags & F_LATIN1)
… …
239 while (--clen); 416 while (--clen);
240 } 417 }
241 else 418 else
242 { 419 {
243 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 420 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
244 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 421 enc->cur = encode_utf8 (enc->cur, uch);
245 ++str; 422 ++str;
246 } 423 }
247 } 424 }
248 } 425 }
249 } 426 }
250 427
251 --len; 428 --len;
252 } 429 }
253} 430}
254 431
255inline void 432INLINE void
256encode_indent (enc_t *enc) 433encode_indent (enc_t *enc)
257{ 434{
258 if (enc->json.flags & F_INDENT) 435 if (enc->json.flags & F_INDENT)
259 { 436 {
260 int spaces = enc->indent * INDENT_STEP; 437 int spaces = enc->indent * INDENT_STEP;
… …
263 memset (enc->cur, ' ', spaces); 440 memset (enc->cur, ' ', spaces);
264 enc->cur += spaces; 441 enc->cur += spaces;
265 } 442 }
266} 443}
267 444
268inline void 445INLINE void
269encode_space (enc_t *enc) 446encode_space (enc_t *enc)
270{ 447{
271 need (enc, 1); 448 need (enc, 1);
272 encode_ch (enc, ' '); 449 encode_ch (enc, ' ');
273} 450}
274 451
275inline void 452INLINE void
276encode_nl (enc_t *enc) 453encode_nl (enc_t *enc)
277{ 454{
278 if (enc->json.flags & F_INDENT) 455 if (enc->json.flags & F_INDENT)
279 { 456 {
280 need (enc, 1); 457 need (enc, 1);
281 encode_ch (enc, '\n'); 458 encode_ch (enc, '\n');
282 } 459 }
283} 460}
284 461
285inline void 462INLINE void
286encode_comma (enc_t *enc) 463encode_comma (enc_t *enc)
287{ 464{
288 encode_ch (enc, ','); 465 encode_ch (enc, ',');
289 466
290 if (enc->json.flags & F_INDENT) 467 if (enc->json.flags & F_INDENT)
… …
298static void 475static void
299encode_av (enc_t *enc, AV *av) 476encode_av (enc_t *enc, AV *av)
300{ 477{
301 int i, len = av_len (av); 478 int i, len = av_len (av);
302 479
303 if (enc->indent >= enc->maxdepth) 480 if (enc->indent >= enc->json.max_depth)
304 croak ("data structure too deep (hit recursion limit)"); 481 croak (ERR_NESTING_EXCEEDED);
305 482
306 encode_ch (enc, '['); encode_nl (enc); 483 encode_ch (enc, '[');
307 ++enc->indent; 484
485 if (len >= 0)
486 {
487 encode_nl (enc); ++enc->indent;
308 488
309 for (i = 0; i <= len; ++i) 489 for (i = 0; i <= len; ++i)
310 { 490 {
311 SV **svp = av_fetch (av, i, 0); 491 SV **svp = av_fetch (av, i, 0);
312 492
313 encode_indent (enc); 493 encode_indent (enc);
314 494
315 if (svp) 495 if (svp)
316 encode_sv (enc, *svp); 496 encode_sv (enc, *svp);
317 else 497 else
318 encode_str (enc, "null", 4, 0); 498 encode_str (enc, "null", 4, 0);
319 499
320 if (i < len) 500 if (i < len)
321 encode_comma (enc); 501 encode_comma (enc);
322 } 502 }
323 503
504 encode_nl (enc); --enc->indent; encode_indent (enc);
505 }
506
324 encode_nl (enc); 507 encode_ch (enc, ']');
325
326 --enc->indent;
327 encode_indent (enc); encode_ch (enc, ']');
328} 508}
329 509
330static void 510static void
331encode_he (enc_t *enc, HE *he) 511encode_hk (enc_t *enc, HE *he)
332{ 512{
333 encode_ch (enc, '"'); 513 encode_ch (enc, '"');
334 514
335 if (HeKLEN (he) == HEf_SVKEY) 515 if (HeKLEN (he) == HEf_SVKEY)
336 { 516 {
… …
349 encode_ch (enc, '"'); 529 encode_ch (enc, '"');
350 530
351 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 531 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
352 encode_ch (enc, ':'); 532 encode_ch (enc, ':');
353 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 533 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
354 encode_sv (enc, HeVAL (he));
355} 534}
356 535
357// compare hash entries, used when all keys are bytestrings 536// compare hash entries, used when all keys are bytestrings
358static int 537static int
359he_cmp_fast (const void *a_, const void *b_) 538he_cmp_fast (const void *a_, const void *b_)
… …
364 HE *b = *(HE **)b_; 543 HE *b = *(HE **)b_;
365 544
366 STRLEN la = HeKLEN (a); 545 STRLEN la = HeKLEN (a);
367 STRLEN lb = HeKLEN (b); 546 STRLEN lb = HeKLEN (b);
368 547
369 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 548 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
370 cmp = la - lb; 549 cmp = lb - la;
371 550
372 return cmp; 551 return cmp;
373} 552}
374 553
375// compare hash entries, used when some keys are sv's or utf-x 554// compare hash entries, used when some keys are sv's or utf-x
376static int 555static int
377he_cmp_slow (const void *a, const void *b) 556he_cmp_slow (const void *a, const void *b)
378{ 557{
379 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 558 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
380} 559}
381 560
382static void 561static void
383encode_hv (enc_t *enc, HV *hv) 562encode_hv (enc_t *enc, HV *hv)
384{ 563{
385 int count, i; 564 HE *he;
386 565
387 if (enc->indent >= enc->maxdepth) 566 if (enc->indent >= enc->json.max_depth)
388 croak ("data structure too deep (hit recursion limit)"); 567 croak (ERR_NESTING_EXCEEDED);
389 568
390 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 569 encode_ch (enc, '{');
391 570
392 if ((count = hv_iterinit (hv)))
393 {
394 // for canonical output we have to sort by keys first 571 // for canonical output we have to sort by keys first
395 // actually, this is mostly due to the stupid so-called 572 // actually, this is mostly due to the stupid so-called
396 // security workaround added somewhere in 5.8.x. 573 // security workaround added somewhere in 5.8.x
397 // that randomises hash orderings 574 // that randomises hash orderings
398 if (enc->json.flags & F_CANONICAL) 575 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
576 {
577 int count = hv_iterinit (hv);
578
579 if (SvMAGICAL (hv))
399 { 580 {
581 // need to count by iterating. could improve by dynamically building the vector below
582 // but I don't care for the speed of this special case.
583 // note also that we will run into undefined behaviour when the two iterations
584 // do not result in the same count, something I might care for in some later release.
585
586 count = 0;
587 while (hv_iternext (hv))
588 ++count;
589
590 hv_iterinit (hv);
591 }
592
593 if (count)
594 {
400 int fast = 1; 595 int i, fast = 1;
401 HE *he;
402#if defined(__BORLANDC__) || defined(_MSC_VER) 596#if defined(__BORLANDC__) || defined(_MSC_VER)
403 HE **hes = _alloca (count * sizeof (HE)); 597 HE **hes = _alloca (count * sizeof (HE));
404#else 598#else
405 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 599 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
406#endif 600#endif
… …
433 627
434 FREETMPS; 628 FREETMPS;
435 LEAVE; 629 LEAVE;
436 } 630 }
437 631
438 for (i = 0; i < count; ++i) 632 encode_nl (enc); ++enc->indent;
633
634 while (count--)
439 { 635 {
440 encode_indent (enc); 636 encode_indent (enc);
637 he = hes [count];
441 encode_he (enc, hes [i]); 638 encode_hk (enc, he);
639 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
442 640
443 if (i < count - 1) 641 if (count)
444 encode_comma (enc); 642 encode_comma (enc);
445 } 643 }
446 644
447 encode_nl (enc); 645 encode_nl (enc); --enc->indent; encode_indent (enc);
448 } 646 }
647 }
449 else 648 else
649 {
650 if (hv_iterinit (hv) || SvMAGICAL (hv))
651 if ((he = hv_iternext (hv)))
450 { 652 {
451 HE *he = hv_iternext (hv); 653 encode_nl (enc); ++enc->indent;
452 654
453 for (;;) 655 for (;;)
454 { 656 {
455 encode_indent (enc); 657 encode_indent (enc);
456 encode_he (enc, he); 658 encode_hk (enc, he);
659 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
457 660
458 if (!(he = hv_iternext (hv))) 661 if (!(he = hv_iternext (hv)))
459 break; 662 break;
460 663
461 encode_comma (enc); 664 encode_comma (enc);
462 } 665 }
463 666
464 encode_nl (enc); 667 encode_nl (enc); --enc->indent; encode_indent (enc);
465 } 668 }
466 } 669 }
467 670
468 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 671 encode_ch (enc, '}');
469} 672}
470 673
471// encode objects, arrays and special \0=false and \1=true values. 674// encode objects, arrays and special \0=false and \1=true values.
472static void 675static void
473encode_rv (enc_t *enc, SV *sv) 676encode_rv (enc_t *enc, SV *sv)
… …
477 SvGETMAGIC (sv); 680 SvGETMAGIC (sv);
478 svt = SvTYPE (sv); 681 svt = SvTYPE (sv);
479 682
480 if (expect_false (SvOBJECT (sv))) 683 if (expect_false (SvOBJECT (sv)))
481 { 684 {
685 HV *stash = !JSON_SLOW || json_boolean_stash
686 ? json_boolean_stash
687 : gv_stashpv ("JSON::XS::Boolean", 1);
688
482 if (SvSTASH (sv) == json_boolean_stash) 689 if (SvSTASH (sv) == stash)
483 { 690 {
484 if (SvIV (sv)) 691 if (SvIV (sv))
485 encode_str (enc, "true", 4, 0); 692 encode_str (enc, "true", 4, 0);
486 else 693 else
487 encode_str (enc, "false", 5, 0); 694 encode_str (enc, "false", 5, 0);
… …
499 // we re-bless the reference to get overload and other niceties right 706 // we re-bless the reference to get overload and other niceties right
500 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0); 707 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
501 708
502 if (to_json) 709 if (to_json)
503 { 710 {
504 int count;
505 dSP; 711 dSP;
506 712
507 ENTER; SAVETMPS; PUSHMARK (SP); 713 ENTER; SAVETMPS; PUSHMARK (SP);
508 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 714 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509 715
… …
547 753
548 if (len == 1 && *pv == '1') 754 if (len == 1 && *pv == '1')
549 encode_str (enc, "true", 4, 0); 755 encode_str (enc, "true", 4, 0);
550 else if (len == 1 && *pv == '0') 756 else if (len == 1 && *pv == '0')
551 encode_str (enc, "false", 5, 0); 757 encode_str (enc, "false", 5, 0);
758 else if (enc->json.flags & F_ALLOW_UNKNOWN)
759 encode_str (enc, "null", 4, 0);
552 else 760 else
553 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 761 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
554 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 762 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
555 } 763 }
764 else if (enc->json.flags & F_ALLOW_UNKNOWN)
765 encode_str (enc, "null", 4, 0);
556 else 766 else
557 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 767 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
558 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 768 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
559} 769}
560 770
… …
578 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 788 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
579 enc->cur += strlen (enc->cur); 789 enc->cur += strlen (enc->cur);
580 } 790 }
581 else if (SvIOKp (sv)) 791 else if (SvIOKp (sv))
582 { 792 {
583 // we assume we can always read an IV as a UV 793 // we assume we can always read an IV as a UV and vice versa
584 if (SvUV (sv) & ~(UV)0x7fff) 794 // we assume two's complement
585 { 795 // we assume no aliasing issues in the union
586 // large integer, use the (rather slow) snprintf way. 796 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
587 need (enc, sizeof (UV) * 3); 797 : 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 { 798 {
595 // optimise the "small number case" 799 // optimise the "small number case"
596 // code will likely be branchless and use only a single multiplication 800 // code will likely be branchless and use only a single multiplication
801 // works for numbers up to 59074
597 I32 i = SvIV (sv); 802 I32 i = SvIVX (sv);
598 U32 u; 803 U32 u;
599 char digit, nz = 0; 804 char digit, nz = 0;
600 805
601 need (enc, 6); 806 need (enc, 6);
602 807
… …
608 813
609 // now output digit by digit, each time masking out the integer part 814 // 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, 815 // and multiplying by 5 while moving the decimal point one to the right,
611 // resulting in a net multiplication by 10. 816 // resulting in a net multiplication by 10.
612 // we always write the digit to memory but conditionally increment 817 // we always write the digit to memory but conditionally increment
613 // the pointer, to ease the usage of conditional move instructions. 818 // 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; 819 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; 820 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; 821 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; 822 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' 823 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
619 } 824 }
825 else
826 {
827 // large integer, use the (rather slow) snprintf way.
828 need (enc, IVUV_MAXCHARS);
829 enc->cur +=
830 SvIsUV(sv)
831 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
832 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
833 }
620 } 834 }
621 else if (SvROK (sv)) 835 else if (SvROK (sv))
622 encode_rv (enc, SvRV (sv)); 836 encode_rv (enc, SvRV (sv));
623 else if (!SvOK (sv)) 837 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
624 encode_str (enc, "null", 4, 0); 838 encode_str (enc, "null", 4, 0);
625 else 839 else
626 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 840 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
627 SvPV_nolen (sv), SvFLAGS (sv)); 841 SvPV_nolen (sv), SvFLAGS (sv));
628} 842}
… …
638 enc.json = *json; 852 enc.json = *json;
639 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 853 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
640 enc.cur = SvPVX (enc.sv); 854 enc.cur = SvPVX (enc.sv);
641 enc.end = SvEND (enc.sv); 855 enc.end = SvEND (enc.sv);
642 enc.indent = 0; 856 enc.indent = 0;
643 enc.maxdepth = DEC_DEPTH (enc.json.flags); 857 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
858 : enc.json.flags & F_LATIN1 ? 0x000100UL
859 : 0x110000UL;
644 860
645 SvPOK_only (enc.sv); 861 SvPOK_only (enc.sv);
646 encode_sv (&enc, scalar); 862 encode_sv (&enc, scalar);
863 encode_nl (&enc);
647 864
648 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 865 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
649 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 866 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
650 867
651 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 868 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
669 JSON json; 886 JSON json;
670 U32 depth; // recursion depth 887 U32 depth; // recursion depth
671 U32 maxdepth; // recursion depth limit 888 U32 maxdepth; // recursion depth limit
672} dec_t; 889} dec_t;
673 890
674inline void 891INLINE void
892decode_comment (dec_t *dec)
893{
894 // only '#'-style comments allowed a.t.m.
895
896 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
897 ++dec->cur;
898}
899
900INLINE void
675decode_ws (dec_t *dec) 901decode_ws (dec_t *dec)
676{ 902{
677 for (;;) 903 for (;;)
678 { 904 {
679 char ch = *dec->cur; 905 char ch = *dec->cur;
680 906
681 if (ch > 0x20 907 if (ch > 0x20)
908 {
909 if (expect_false (ch == '#'))
910 {
911 if (dec->json.flags & F_RELAXED)
912 decode_comment (dec);
913 else
914 break;
915 }
916 else
917 break;
918 }
682 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 919 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
683 break; 920 break; // parse error, but let higher level handle it, gives better error messages
684 921
685 ++dec->cur; 922 ++dec->cur;
686 } 923 }
687} 924}
688 925
… …
692 if (*dec->cur != ch) \ 929 if (*dec->cur != ch) \
693 ERR (# ch " expected"); \ 930 ERR (# ch " expected"); \
694 ++dec->cur; \ 931 ++dec->cur; \
695 SE 932 SE
696 933
697#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 934#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
698#define DEC_DEC_DEPTH --dec->depth 935#define DEC_DEC_DEPTH --dec->depth
699 936
700static SV *decode_sv (dec_t *dec); 937static SV *decode_sv (dec_t *dec);
701 938
702static signed char decode_hexdigit[256]; 939static signed char decode_hexdigit[256];
… …
794 1031
795 if (hi >= 0x80) 1032 if (hi >= 0x80)
796 { 1033 {
797 utf8 = 1; 1034 utf8 = 1;
798 1035
799 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 1036 cur = encode_utf8 (cur, hi);
800 } 1037 }
801 else 1038 else
802 *cur++ = hi; 1039 *cur++ = hi;
803 } 1040 }
804 break; 1041 break;
… …
806 default: 1043 default:
807 --dec_cur; 1044 --dec_cur;
808 ERR ("illegal backslash escape sequence in string"); 1045 ERR ("illegal backslash escape sequence in string");
809 } 1046 }
810 } 1047 }
811 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1048 else if (expect_true (ch >= 0x20 && ch < 0x80))
812 *cur++ = ch; 1049 *cur++ = ch;
813 else if (ch >= 0x80) 1050 else if (ch >= 0x80)
814 { 1051 {
815 STRLEN clen; 1052 STRLEN clen;
816 UV uch;
817 1053
818 --dec_cur; 1054 --dec_cur;
819 1055
820 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1056 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
821 if (clen == (STRLEN)-1) 1057 if (clen == (STRLEN)-1)
822 ERR ("malformed UTF-8 character in JSON string"); 1058 ERR ("malformed UTF-8 character in JSON string");
823 1059
824 do 1060 do
825 *cur++ = *dec_cur++; 1061 *cur++ = *dec_cur++;
… …
842 { 1078 {
843 STRLEN len = cur - buf; 1079 STRLEN len = cur - buf;
844 1080
845 if (sv) 1081 if (sv)
846 { 1082 {
847 SvGROW (sv, SvCUR (sv) + len + 1); 1083 STRLEN cur = SvCUR (sv);
1084
1085 if (SvLEN (sv) <= cur + len)
1086 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1087
848 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1088 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
849 SvCUR_set (sv, SvCUR (sv) + len); 1089 SvCUR_set (sv, SvCUR (sv) + len);
850 } 1090 }
851 else 1091 else
852 sv = newSVpvn (buf, len); 1092 sv = newSVpvn (buf, len);
… …
937 is_nv = 1; 1177 is_nv = 1;
938 } 1178 }
939 1179
940 if (!is_nv) 1180 if (!is_nv)
941 { 1181 {
1182 int len = dec->cur - start;
1183
942 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1184 // special case the rather common 1..5-digit-int case
943 if (*start == '-') 1185 if (*start == '-')
944 switch (dec->cur - start) 1186 switch (len)
945 { 1187 {
946 case 2: return newSViv (-( start [1] - '0' * 1)); 1188 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
947 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1189 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)); 1190 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)); 1191 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1192 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
950 } 1193 }
951 else 1194 else
952 switch (dec->cur - start) 1195 switch (len)
953 { 1196 {
954 case 1: return newSViv ( start [0] - '0' * 1); 1197 case 1: return newSViv ( start [0] - '0' * 1);
955 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1198 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); 1199 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); 1200 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1201 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
958 } 1202 }
959 1203
960 { 1204 {
961 UV uv; 1205 UV uv;
962 int numtype = grok_number (start, dec->cur - start, &uv); 1206 int numtype = grok_number (start, len, &uv);
963 if (numtype & IS_NUMBER_IN_UV) 1207 if (numtype & IS_NUMBER_IN_UV)
964 if (numtype & IS_NUMBER_NEG) 1208 if (numtype & IS_NUMBER_NEG)
965 { 1209 {
966 if (uv < (UV)IV_MIN) 1210 if (uv < (UV)IV_MIN)
967 return newSViv (-(IV)uv); 1211 return newSViv (-(IV)uv);
968 } 1212 }
969 else 1213 else
970 return newSVuv (uv); 1214 return newSVuv (uv);
971
972 // here would likely be the place for bigint support
973 } 1215 }
974 }
975 1216
976 // if we ever support bigint or bigfloat, this is the place for bigfloat 1217 len -= *start == '-' ? 1 : 0;
1218
1219 // does not fit into IV or UV, try NV
1220 if (len <= NV_DIG)
1221 // fits into NV without loss of precision
1222 return newSVnv (json_atof (start));
1223
1224 // everything else fails, convert it to a string
1225 return newSVpvn (start, dec->cur - start);
1226 }
1227
1228 // loss of precision here
977 return newSVnv (Atof (start)); 1229 return newSVnv (json_atof (start));
978 1230
979fail: 1231fail:
980 return 0; 1232 return 0;
981} 1233}
982 1234
… …
1011 1263
1012 if (*dec->cur != ',') 1264 if (*dec->cur != ',')
1013 ERR (", or ] expected while parsing array"); 1265 ERR (", or ] expected while parsing array");
1014 1266
1015 ++dec->cur; 1267 ++dec->cur;
1268
1269 decode_ws (dec);
1270
1271 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1272 {
1273 ++dec->cur;
1274 break;
1275 }
1016 } 1276 }
1017 1277
1018 DEC_DEC_DEPTH; 1278 DEC_DEC_DEPTH;
1019 return newRV_noinc ((SV *)av); 1279 return newRV_noinc ((SV *)av);
1020 1280
… …
1036 if (*dec->cur == '}') 1296 if (*dec->cur == '}')
1037 ++dec->cur; 1297 ++dec->cur;
1038 else 1298 else
1039 for (;;) 1299 for (;;)
1040 { 1300 {
1041 decode_ws (dec); EXPECT_CH ('"'); 1301 EXPECT_CH ('"');
1042 1302
1043 // heuristic: assume that 1303 // heuristic: assume that
1044 // a) decode_str + hv_store_ent are abysmally slow. 1304 // a) decode_str + hv_store_ent are abysmally slow.
1045 // b) most hash keys are short, simple ascii text. 1305 // b) most hash keys are short, simple ascii text.
1046 // => try to "fast-match" such strings to avoid 1306 // => try to "fast-match" such strings to avoid
… …
1050 char *p = dec->cur; 1310 char *p = dec->cur;
1051 char *e = p + 24; // only try up to 24 bytes 1311 char *e = p + 24; // only try up to 24 bytes
1052 1312
1053 for (;;) 1313 for (;;)
1054 { 1314 {
1055 // the >= 0x80 is true on most architectures 1315 // the >= 0x80 is false on most architectures
1056 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1316 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1057 { 1317 {
1058 // slow path, back up and use decode_str 1318 // slow path, back up and use decode_str
1059 SV *key = decode_str (dec); 1319 SV *key = decode_str (dec);
1060 if (!key) 1320 if (!key)
1061 goto fail; 1321 goto fail;
1062 1322
1063 decode_ws (dec); EXPECT_CH (':'); 1323 decode_ws (dec); EXPECT_CH (':');
1064 1324
1325 decode_ws (dec);
1065 value = decode_sv (dec); 1326 value = decode_sv (dec);
1066 if (!value) 1327 if (!value)
1067 { 1328 {
1068 SvREFCNT_dec (key); 1329 SvREFCNT_dec (key);
1069 goto fail; 1330 goto fail;
… …
1081 int len = p - key; 1342 int len = p - key;
1082 dec->cur = p + 1; 1343 dec->cur = p + 1;
1083 1344
1084 decode_ws (dec); EXPECT_CH (':'); 1345 decode_ws (dec); EXPECT_CH (':');
1085 1346
1347 decode_ws (dec);
1086 value = decode_sv (dec); 1348 value = decode_sv (dec);
1087 if (!value) 1349 if (!value)
1088 goto fail; 1350 goto fail;
1089 1351
1090 hv_store (hv, key, len, value, 0); 1352 hv_store (hv, key, len, value, 0);
… …
1106 1368
1107 if (*dec->cur != ',') 1369 if (*dec->cur != ',')
1108 ERR (", or } expected while parsing object/hash"); 1370 ERR (", or } expected while parsing object/hash");
1109 1371
1110 ++dec->cur; 1372 ++dec->cur;
1373
1374 decode_ws (dec);
1375
1376 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1377 {
1378 ++dec->cur;
1379 break;
1380 }
1111 } 1381 }
1112 1382
1113 DEC_DEC_DEPTH; 1383 DEC_DEC_DEPTH;
1114 sv = newRV_noinc ((SV *)hv); 1384 sv = newRV_noinc ((SV *)hv);
1115 1385
… …
1133 dSP; 1403 dSP;
1134 int count; 1404 int count;
1135 1405
1136 ENTER; SAVETMPS; PUSHMARK (SP); 1406 ENTER; SAVETMPS; PUSHMARK (SP);
1137 XPUSHs (HeVAL (he)); 1407 XPUSHs (HeVAL (he));
1408 sv_2mortal (sv);
1138 1409
1139 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1410 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1140 1411
1141 if (count == 1) 1412 if (count == 1)
1142 { 1413 {
1143 sv = newSVsv (POPs); 1414 sv = newSVsv (POPs);
1144 FREETMPS; LEAVE; 1415 FREETMPS; LEAVE;
1145 return sv; 1416 return sv;
1146 } 1417 }
1147 1418
1419 SvREFCNT_inc (sv);
1148 FREETMPS; LEAVE; 1420 FREETMPS; LEAVE;
1149 } 1421 }
1150 } 1422 }
1151 1423
1152 if (dec->json.cb_object) 1424 if (dec->json.cb_object)
… …
1180} 1452}
1181 1453
1182static SV * 1454static SV *
1183decode_sv (dec_t *dec) 1455decode_sv (dec_t *dec)
1184{ 1456{
1185 decode_ws (dec);
1186
1187 // the beauty of JSON: you need exactly one character lookahead 1457 // the beauty of JSON: you need exactly one character lookahead
1188 // to parse anything. 1458 // to parse everything.
1189 switch (*dec->cur) 1459 switch (*dec->cur)
1190 { 1460 {
1191 case '"': ++dec->cur; return decode_str (dec); 1461 case '"': ++dec->cur; return decode_str (dec);
1192 case '[': ++dec->cur; return decode_av (dec); 1462 case '[': ++dec->cur; return decode_av (dec);
1193 case '{': ++dec->cur; return decode_hv (dec); 1463 case '{': ++dec->cur; return decode_hv (dec);
1194 1464
1195 case '-': 1465 case '-':
1196 case '0': case '1': case '2': case '3': case '4': 1466 case '0': case '1': case '2': case '3': case '4':
1197 case '5': case '6': case '7': case '8': case '9': 1467 case '5': case '6': case '7': case '8': case '9':
1198 return decode_num (dec); 1468 return decode_num (dec);
1199 1469
1200 case 't': 1470 case 't':
1201 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1471 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1202 { 1472 {
1203 dec->cur += 4; 1473 dec->cur += 4;
1474#if JSON_SLOW
1475 json_true = get_bool ("JSON::XS::true");
1476#endif
1204 return SvREFCNT_inc (json_true); 1477 return newSVsv (json_true);
1205 } 1478 }
1206 else 1479 else
1207 ERR ("'true' expected"); 1480 ERR ("'true' expected");
1208 1481
1209 break; 1482 break;
1210 1483
1211 case 'f': 1484 case 'f':
1212 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1485 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1213 { 1486 {
1214 dec->cur += 5; 1487 dec->cur += 5;
1488#if JSON_SLOW
1489 json_false = get_bool ("JSON::XS::false");
1490#endif
1215 return SvREFCNT_inc (json_false); 1491 return newSVsv (json_false);
1216 } 1492 }
1217 else 1493 else
1218 ERR ("'false' expected"); 1494 ERR ("'false' expected");
1219 1495
1220 break; 1496 break;
… …
1238fail: 1514fail:
1239 return 0; 1515 return 0;
1240} 1516}
1241 1517
1242static SV * 1518static SV *
1243decode_json (SV *string, JSON *json, UV *offset_return) 1519decode_json (SV *string, JSON *json, char **offset_return)
1244{ 1520{
1245 dec_t dec; 1521 dec_t dec;
1246 UV offset;
1247 SV *sv; 1522 SV *sv;
1248 1523
1524 /* work around bugs in 5.10 where manipulating magic values
1525 * will perl ignore the magic in subsequent accesses.
1526 * also make a copy of non-PV values, to get them into a clean
1527 * state (SvPV should do that, but it's buggy, see below).
1528 */
1249 SvGETMAGIC (string); 1529 /*SvGETMAGIC (string);*/
1530 if (SvMAGICAL (string) || !SvPOK (string))
1531 string = sv_2mortal (newSVsv (string));
1532
1250 SvUPGRADE (string, SVt_PV); 1533 SvUPGRADE (string, SVt_PV);
1251 1534
1252 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1535 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1536 * assertion with -DDEBUGGING, although SvCUR is documented to
1537 * return the xpv_cur field which certainly exists after upgrading.
1538 * according to nicholas clark, calling SvPOK fixes this.
1539 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1540 * and hope for the best.
1541 * Damnit, SvPV_nolen still trips over yet another assertion. This
1542 * assertion business is seriously broken, try yet another workaround
1543 * for the broken -DDEBUGGING.
1544 */
1545 {
1546#ifdef DEBUGGING
1547 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1548#else
1549 STRLEN offset = SvCUR (string);
1550#endif
1551
1552 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", 1553 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)); 1554 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1555 }
1255 1556
1256 if (json->flags & F_UTF8) 1557 if (DECODE_WANTS_OCTETS (json))
1257 sv_utf8_downgrade (string, 0); 1558 sv_utf8_downgrade (string, 0);
1258 else 1559 else
1259 sv_utf8_upgrade (string); 1560 sv_utf8_upgrade (string);
1260 1561
1261 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1562 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1262 1563
1263 dec.json = *json; 1564 dec.json = *json;
1264 dec.cur = SvPVX (string); 1565 dec.cur = SvPVX (string);
1265 dec.end = SvEND (string); 1566 dec.end = SvEND (string);
1266 dec.err = 0; 1567 dec.err = 0;
1267 dec.depth = 0; 1568 dec.depth = 0;
1268 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1269 1569
1270 if (dec.json.cb_object || dec.json.cb_sk_object) 1570 if (dec.json.cb_object || dec.json.cb_sk_object)
1271 dec.json.flags |= F_HOOK; 1571 dec.json.flags |= F_HOOK;
1272 1572
1273 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1573 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1574
1575 decode_ws (&dec);
1274 sv = decode_sv (&dec); 1576 sv = decode_sv (&dec);
1577
1578 if (offset_return)
1579 *offset_return = dec.cur;
1275 1580
1276 if (!(offset_return || !sv)) 1581 if (!(offset_return || !sv))
1277 { 1582 {
1278 // check for trailing garbage 1583 // check for trailing garbage
1279 decode_ws (&dec); 1584 decode_ws (&dec);
… …
1282 { 1587 {
1283 dec.err = "garbage after JSON object"; 1588 dec.err = "garbage after JSON object";
1284 SvREFCNT_dec (sv); 1589 SvREFCNT_dec (sv);
1285 sv = 0; 1590 sv = 0;
1286 } 1591 }
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 } 1592 }
1298 1593
1299 if (!sv) 1594 if (!sv)
1300 { 1595 {
1301 SV *uni = sv_newmortal (); 1596 SV *uni = sv_newmortal ();
… …
1307 SAVEVPTR (PL_curcop); 1602 SAVEVPTR (PL_curcop);
1308 PL_curcop = &cop; 1603 PL_curcop = &cop;
1309 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1604 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1310 LEAVE; 1605 LEAVE;
1311 1606
1312 croak ("%s, at character offset %d [\"%s\"]", 1607 croak ("%s, at character offset %d (before \"%s\")",
1313 dec.err, 1608 dec.err,
1314 (int)offset, 1609 ptr_to_index (string, dec.cur),
1315 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1610 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1316 } 1611 }
1317 1612
1318 sv = sv_2mortal (sv); 1613 sv = sv_2mortal (sv);
1319 1614
1320 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1615 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)"); 1616 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1322 1617
1323 return sv; 1618 return sv;
1619}
1620
1621/////////////////////////////////////////////////////////////////////////////
1622// incremental parser
1623
1624static void
1625incr_parse (JSON *self)
1626{
1627 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1628
1629 // the state machine here is a bit convoluted and could be simplified a lot
1630 // but this would make it slower, so...
1631
1632 for (;;)
1633 {
1634 //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
1635 switch (self->incr_mode)
1636 {
1637 // only used for initial whitespace skipping
1638 case INCR_M_WS:
1639 for (;;)
1640 {
1641 if (*p > 0x20)
1642 {
1643 if (*p == '#')
1644 {
1645 self->incr_mode = INCR_M_C0;
1646 goto incr_m_c;
1647 }
1648 else
1649 {
1650 self->incr_mode = INCR_M_JSON;
1651 goto incr_m_json;
1652 }
1653 }
1654 else if (!*p)
1655 goto interrupt;
1656
1657 ++p;
1658 }
1659
1660 // skip a single char inside a string (for \\-processing)
1661 case INCR_M_BS:
1662 if (!*p)
1663 goto interrupt;
1664
1665 ++p;
1666 self->incr_mode = INCR_M_STR;
1667 goto incr_m_str;
1668
1669 // inside #-style comments
1670 case INCR_M_C0:
1671 case INCR_M_C1:
1672 incr_m_c:
1673 for (;;)
1674 {
1675 if (*p == '\n')
1676 {
1677 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1678 break;
1679 }
1680 else if (!*p)
1681 goto interrupt;
1682
1683 ++p;
1684 }
1685
1686 break;
1687
1688 // inside a string
1689 case INCR_M_STR:
1690 incr_m_str:
1691 for (;;)
1692 {
1693 if (*p == '"')
1694 {
1695 ++p;
1696 self->incr_mode = INCR_M_JSON;
1697
1698 if (!self->incr_nest)
1699 goto interrupt;
1700
1701 goto incr_m_json;
1702 }
1703 else if (*p == '\\')
1704 {
1705 ++p; // "virtually" consumes character after \
1706
1707 if (!*p) // if at end of string we have to switch modes
1708 {
1709 self->incr_mode = INCR_M_BS;
1710 goto interrupt;
1711 }
1712 }
1713 else if (!*p)
1714 goto interrupt;
1715
1716 ++p;
1717 }
1718
1719 // after initial ws, outside string
1720 case INCR_M_JSON:
1721 incr_m_json:
1722 for (;;)
1723 {
1724 switch (*p++)
1725 {
1726 case 0:
1727 --p;
1728 goto interrupt;
1729
1730 case 0x09:
1731 case 0x0a:
1732 case 0x0d:
1733 case 0x20:
1734 if (!self->incr_nest)
1735 {
1736 --p; // do not eat the whitespace, let the next round do it
1737 goto interrupt;
1738 }
1739 break;
1740
1741 case '"':
1742 self->incr_mode = INCR_M_STR;
1743 goto incr_m_str;
1744
1745 case '[':
1746 case '{':
1747 if (++self->incr_nest > self->max_depth)
1748 croak (ERR_NESTING_EXCEEDED);
1749 break;
1750
1751 case ']':
1752 case '}':
1753 if (--self->incr_nest <= 0)
1754 goto interrupt;
1755 break;
1756
1757 case '#':
1758 self->incr_mode = INCR_M_C1;
1759 goto incr_m_c;
1760 }
1761 }
1762 }
1763
1764 modechange:
1765 ;
1766 }
1767
1768interrupt:
1769 self->incr_pos = p - SvPVX (self->incr_text);
1770 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1771 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1324} 1772}
1325 1773
1326///////////////////////////////////////////////////////////////////////////// 1774/////////////////////////////////////////////////////////////////////////////
1327// XS interface functions 1775// XS interface functions
1328 1776
… …
1340 : -1; 1788 : -1;
1341 1789
1342 json_stash = gv_stashpv ("JSON::XS" , 1); 1790 json_stash = gv_stashpv ("JSON::XS" , 1);
1343 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1791 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1344 1792
1345 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1793 json_true = get_bool ("JSON::XS::true");
1346 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1794 json_false = get_bool ("JSON::XS::false");
1795
1796 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1347} 1797}
1348 1798
1349PROTOTYPES: DISABLE 1799PROTOTYPES: DISABLE
1800
1801void CLONE (...)
1802 CODE:
1803 json_stash = 0;
1804 json_boolean_stash = 0;
1350 1805
1351void new (char *klass) 1806void new (char *klass)
1352 PPCODE: 1807 PPCODE:
1353{ 1808{
1354 SV *pv = NEWSV (0, sizeof (JSON)); 1809 SV *pv = NEWSV (0, sizeof (JSON));
1355 SvPOK_only (pv); 1810 SvPOK_only (pv);
1356 Zero (SvPVX (pv), 1, JSON); 1811 json_init ((JSON *)SvPVX (pv));
1357 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1812 XPUSHs (sv_2mortal (sv_bless (
1358 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1813 newRV_noinc (pv),
1814 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1815 )));
1359} 1816}
1360 1817
1361void ascii (JSON *self, int enable = 1) 1818void ascii (JSON *self, int enable = 1)
1362 ALIAS: 1819 ALIAS:
1363 ascii = F_ASCII 1820 ascii = F_ASCII
… …
1370 pretty = F_PRETTY 1827 pretty = F_PRETTY
1371 allow_nonref = F_ALLOW_NONREF 1828 allow_nonref = F_ALLOW_NONREF
1372 shrink = F_SHRINK 1829 shrink = F_SHRINK
1373 allow_blessed = F_ALLOW_BLESSED 1830 allow_blessed = F_ALLOW_BLESSED
1374 convert_blessed = F_CONV_BLESSED 1831 convert_blessed = F_CONV_BLESSED
1832 relaxed = F_RELAXED
1833 allow_unknown = F_ALLOW_UNKNOWN
1375 PPCODE: 1834 PPCODE:
1376{ 1835{
1377 if (enable) 1836 if (enable)
1378 self->flags |= ix; 1837 self->flags |= ix;
1379 else 1838 else
1380 self->flags &= ~ix; 1839 self->flags &= ~ix;
1381 1840
1382 XPUSHs (ST (0)); 1841 XPUSHs (ST (0));
1383} 1842}
1384 1843
1385void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1844void get_ascii (JSON *self)
1845 ALIAS:
1846 get_ascii = F_ASCII
1847 get_latin1 = F_LATIN1
1848 get_utf8 = F_UTF8
1849 get_indent = F_INDENT
1850 get_canonical = F_CANONICAL
1851 get_space_before = F_SPACE_BEFORE
1852 get_space_after = F_SPACE_AFTER
1853 get_allow_nonref = F_ALLOW_NONREF
1854 get_shrink = F_SHRINK
1855 get_allow_blessed = F_ALLOW_BLESSED
1856 get_convert_blessed = F_CONV_BLESSED
1857 get_relaxed = F_RELAXED
1858 get_allow_unknown = F_ALLOW_UNKNOWN
1386 PPCODE: 1859 PPCODE:
1387{ 1860 XPUSHs (boolSV (self->flags & ix));
1388 UV log2 = 0;
1389 1861
1390 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1862void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1391 1863 PPCODE:
1392 while ((1UL << log2) < max_depth) 1864 self->max_depth = max_depth;
1393 ++log2;
1394
1395 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1396
1397 XPUSHs (ST (0)); 1865 XPUSHs (ST (0));
1398}
1399 1866
1867U32 get_max_depth (JSON *self)
1868 CODE:
1869 RETVAL = self->max_depth;
1870 OUTPUT:
1871 RETVAL
1872
1400void max_size (JSON *self, UV max_size = 0) 1873void max_size (JSON *self, U32 max_size = 0)
1401 PPCODE: 1874 PPCODE:
1402{ 1875 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)); 1876 XPUSHs (ST (0));
1414} 1877
1878int get_max_size (JSON *self)
1879 CODE:
1880 RETVAL = self->max_size;
1881 OUTPUT:
1882 RETVAL
1415 1883
1416void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1884void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1417 PPCODE: 1885 PPCODE:
1418{ 1886{
1419 SvREFCNT_dec (self->cb_object); 1887 SvREFCNT_dec (self->cb_object);
… …
1453 XPUSHs (decode_json (jsonstr, self, 0)); 1921 XPUSHs (decode_json (jsonstr, self, 0));
1454 1922
1455void decode_prefix (JSON *self, SV *jsonstr) 1923void decode_prefix (JSON *self, SV *jsonstr)
1456 PPCODE: 1924 PPCODE:
1457{ 1925{
1458 UV offset; 1926 char *offset;
1459 EXTEND (SP, 2); 1927 EXTEND (SP, 2);
1460 PUSHs (decode_json (jsonstr, self, &offset)); 1928 PUSHs (decode_json (jsonstr, self, &offset));
1461 PUSHs (sv_2mortal (newSVuv (offset))); 1929 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1930}
1931
1932void incr_parse (JSON *self, SV *jsonstr = 0)
1933 PPCODE:
1934{
1935 if (!self->incr_text)
1936 self->incr_text = newSVpvn ("", 0);
1937
1938 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
1939 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
1940 if (DECODE_WANTS_OCTETS (self))
1941 {
1942 if (self->incr_pos)
1943 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
1944 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
1945
1946 sv_utf8_downgrade (self->incr_text, 0);
1947 }
1948 else
1949 {
1950 sv_utf8_upgrade (self->incr_text);
1951
1952 if (self->incr_pos)
1953 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1954 - (U8 *)SvPVX (self->incr_text);
1955 }
1956
1957 // append data, if any
1958 if (jsonstr)
1959 {
1960 /* make sure both strings have same encoding */
1961 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1962 if (SvUTF8 (jsonstr))
1963 sv_utf8_downgrade (jsonstr, 0);
1964 else
1965 sv_utf8_upgrade (jsonstr);
1966
1967 /* and then just blindly append */
1968 {
1969 STRLEN len;
1970 const char *str = SvPV (jsonstr, len);
1971 STRLEN cur = SvCUR (self->incr_text);
1972
1973 if (SvLEN (self->incr_text) <= cur + len)
1974 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1975
1976 Move (str, SvEND (self->incr_text), len, char);
1977 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1978 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1979 }
1980 }
1981
1982 if (GIMME_V != G_VOID)
1983 do
1984 {
1985 char *offset;
1986
1987 if (!INCR_DONE (self))
1988 {
1989 incr_parse (self);
1990
1991 if (self->incr_pos > self->max_size && self->max_size)
1992 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1993 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1994
1995 if (!INCR_DONE (self))
1996 break;
1997 }
1998
1999 XPUSHs (decode_json (self->incr_text, self, &offset));
2000
2001 self->incr_pos -= offset - SvPVX (self->incr_text);
2002 self->incr_nest = 0;
2003 self->incr_mode = 0;
2004
2005 sv_chop (self->incr_text, offset);
2006 }
2007 while (GIMME_V == G_ARRAY);
2008}
2009
2010SV *incr_text (JSON *self)
2011 ATTRS: lvalue
2012 CODE:
2013{
2014 if (self->incr_pos)
2015 croak ("incr_text can not be called when the incremental parser already started parsing");
2016
2017 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2018}
2019 OUTPUT:
2020 RETVAL
2021
2022void incr_skip (JSON *self)
2023 CODE:
2024{
2025 if (self->incr_pos)
2026 {
2027 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2028 self->incr_pos = 0;
2029 self->incr_nest = 0;
2030 self->incr_mode = 0;
2031 }
2032}
2033
2034void incr_reset (JSON *self)
2035 CODE:
2036{
2037 SvREFCNT_dec (self->incr_text);
2038 self->incr_text = 0;
2039 self->incr_pos = 0;
2040 self->incr_nest = 0;
2041 self->incr_mode = 0;
1462} 2042}
1463 2043
1464void DESTROY (JSON *self) 2044void DESTROY (JSON *self)
1465 CODE: 2045 CODE:
1466 SvREFCNT_dec (self->cb_sk_object); 2046 SvREFCNT_dec (self->cb_sk_object);
1467 SvREFCNT_dec (self->cb_object); 2047 SvREFCNT_dec (self->cb_object);
2048 SvREFCNT_dec (self->incr_text);
1468 2049
1469PROTOTYPES: ENABLE 2050PROTOTYPES: ENABLE
1470 2051
1471void to_json (SV *scalar) 2052void encode_json (SV *scalar)
2053 ALIAS:
2054 to_json_ = 0
2055 encode_json = F_UTF8
1472 PPCODE: 2056 PPCODE:
1473{ 2057{
1474 JSON json = { F_DEFAULT | F_UTF8 }; 2058 JSON json;
2059 json_init (&json);
2060 json.flags |= ix;
1475 XPUSHs (encode_json (scalar, &json)); 2061 XPUSHs (encode_json (scalar, &json));
1476} 2062}
1477 2063
1478void from_json (SV *jsonstr) 2064void decode_json (SV *jsonstr)
2065 ALIAS:
2066 from_json_ = 0
2067 decode_json = F_UTF8
1479 PPCODE: 2068 PPCODE:
1480{ 2069{
1481 JSON json = { F_DEFAULT | F_UTF8 }; 2070 JSON json;
2071 json_init (&json);
2072 json.flags |= ix;
1482 XPUSHs (decode_json (jsonstr, &json, 0)); 2073 XPUSHs (decode_json (jsonstr, &json, 0));
1483} 2074}
1484 2075

Diff Legend

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