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

Diff Legend

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