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

Diff Legend

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