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.47 by root, Sun Jul 1 14:08:03 2007 UTC vs.
Revision 1.122 by root, Tue Oct 29 15:55:49 2013 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include <assert.h>
6#include "string.h" 6#include <string.h>
7#include "stdlib.h" 7#include <stdlib.h>
8#include "stdio.h" 8#include <stdio.h>
9#include <limits.h>
10#include <float.h>
9 11
10#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 14#endif
13 15
14// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
15// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
18#endif 20#endif
21
22// 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)
19 35
20#define F_ASCII 0x00000001UL 36#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL 37#define F_LATIN1 0x00000002UL
22#define F_UTF8 0x00000004UL 38#define F_UTF8 0x00000004UL
23#define F_INDENT 0x00000008UL 39#define F_INDENT 0x00000008UL
… …
25#define F_SPACE_BEFORE 0x00000020UL 41#define F_SPACE_BEFORE 0x00000020UL
26#define F_SPACE_AFTER 0x00000040UL 42#define F_SPACE_AFTER 0x00000040UL
27#define F_ALLOW_NONREF 0x00000100UL 43#define F_ALLOW_NONREF 0x00000100UL
28#define F_SHRINK 0x00000200UL 44#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL 45#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL // NYI 46#define F_CONV_BLESSED 0x00000800UL
31#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 47#define F_RELAXED 0x00001000UL
34#define S_MAXSIZE 20 48#define F_ALLOW_UNKNOWN 0x00002000UL
35 49#define F_ALLOW_TAGS 0x00004000UL
36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38 51
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40#define F_DEFAULT (9UL << S_MAXDEPTH)
41 53
42#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
44 56
45#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
46 58
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
60
47#define SB do { 61#define SB do {
48#define SE } while (0) 62#define SE } while (0)
49 63
50#if __GNUC__ >= 3 64#if __GNUC__ >= 3
51# define expect(expr,value) __builtin_expect ((expr),(value)) 65# define expect(expr,value) __builtin_expect ((expr), (value))
52# define inline inline 66# define INLINE static inline
53#else 67#else
54# define expect(expr,value) (expr) 68# define expect(expr,value) (expr)
55# define inline static 69# define INLINE static
56#endif 70#endif
57 71
58#define expect_false(expr) expect ((expr) != 0, 0) 72#define expect_false(expr) expect ((expr) != 0, 0)
59#define expect_true(expr) expect ((expr) != 0, 1) 73#define expect_true(expr) expect ((expr) != 0, 1)
60 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
81#ifdef USE_ITHREADS
82# define JSON_SLOW 1
83# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
84#else
85# define JSON_SLOW 0
86# define JSON_STASH json_stash
87#endif
88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
61static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
63 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)
105
64typedef struct json { 106typedef struct {
65 U32 flags; 107 U32 flags;
108 U32 max_depth;
109 STRLEN max_size;
110
111 SV *cb_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;
66} JSON__XS; 119} JSON;
120
121INLINE void
122json_init (JSON *json)
123{
124 Zero (json, 1, JSON);
125 json->max_depth = 512;
126}
67 127
68///////////////////////////////////////////////////////////////////////////// 128/////////////////////////////////////////////////////////////////////////////
69// utility functions 129// utility functions
70 130
71static UV * 131INLINE SV *
72SvJSON (SV *sv) 132get_bool (const char *name)
73{ 133{
74 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash)) 134 SV *sv = get_sv (name, 1);
75 croak ("object is not of type JSON::XS");
76 135
77 return &SvUVX (SvRV (sv)); 136 SvREADONLY_on (sv);
78} 137 SvREADONLY_on (SvRV (sv));
79 138
80static void 139 return sv;
140}
141
142INLINE void
81shrink (SV *sv) 143shrink (SV *sv)
82{ 144{
83 sv_utf8_downgrade (sv, 1); 145 sv_utf8_downgrade (sv, 1);
146
84 if (SvLEN (sv) > SvCUR (sv) + 1) 147 if (SvLEN (sv) > SvCUR (sv) + 1)
85 { 148 {
86#ifdef SvPV_shrink_to_cur 149#ifdef SvPV_shrink_to_cur
87 SvPV_shrink_to_cur (sv); 150 SvPV_shrink_to_cur (sv);
88#elif defined (SvPV_renew) 151#elif defined (SvPV_renew)
… …
94// decode an utf-8 character and return it, or (UV)-1 in 157// decode an utf-8 character and return it, or (UV)-1 in
95// case of an error. 158// case of an error.
96// we special-case "safe" characters from U+80 .. U+7FF, 159// we special-case "safe" characters from U+80 .. U+7FF,
97// but use the very good perl function to parse anything else. 160// but use the very good perl function to parse anything else.
98// note that we never call this function for a ascii codepoints 161// note that we never call this function for a ascii codepoints
99inline UV 162INLINE UV
100decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 163decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
101{ 164{
102 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 165 if (expect_true (len >= 2
103 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 166 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
104 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 167 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
105 { 168 {
106 *clen = 2; 169 *clen = 2;
107 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 170 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
108 } 171 }
109 else 172 else
110 { 173 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
111 *clen = (STRLEN)-1; 174}
112 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 (;;)
113 } 226 {
114} 227 U8 dig = (U8)*s - '0';
115 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}
116///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
117// encoder 305// encoder
118 306
119// structure used for encoding JSON 307// structure used for encoding JSON
120typedef struct 308typedef struct
121{ 309{
122 char *cur; // SvPVX (sv) + current output position 310 char *cur; // SvPVX (sv) + current output position
123 char *end; // SvEND (sv) 311 char *end; // SvEND (sv)
124 SV *sv; // result scalar 312 SV *sv; // result scalar
125 struct json json; 313 JSON json;
126 U32 indent; // indentation level 314 U32 indent; // indentation level
127 U32 maxdepth; // max. indentation/recursion level 315 UV limit; // escape character values >= this value when encoding
128} enc_t; 316} enc_t;
129 317
130inline void 318INLINE void
131need (enc_t *enc, STRLEN len) 319need (enc_t *enc, STRLEN len)
132{ 320{
133 if (expect_false (enc->cur + len >= enc->end)) 321 if (expect_false (enc->cur + len >= enc->end))
134 { 322 {
135 STRLEN cur = enc->cur - SvPVX (enc->sv); 323 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
136 SvGROW (enc->sv, cur + len + 1); 324 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
137 enc->cur = SvPVX (enc->sv) + cur; 325 enc->cur = SvPVX (enc->sv) + cur;
138 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 326 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
139 } 327 }
140} 328}
141 329
142inline void 330INLINE void
143encode_ch (enc_t *enc, char ch) 331encode_ch (enc_t *enc, char ch)
144{ 332{
145 need (enc, 1); 333 need (enc, 1);
146 *enc->cur++ = ch; 334 *enc->cur++ = ch;
147} 335}
… …
201 { 389 {
202 uch = ch; 390 uch = ch;
203 clen = 1; 391 clen = 1;
204 } 392 }
205 393
206 if (uch > 0x10FFFFUL) 394 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
207 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
208
209 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
210 { 395 {
211 if (uch > 0xFFFFUL) 396 if (uch >= 0x10000UL)
212 { 397 {
398 if (uch >= 0x110000UL)
399 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
400
213 need (enc, len += 11); 401 need (enc, len += 11);
214 sprintf (enc->cur, "\\u%04x\\u%04x", 402 sprintf (enc->cur, "\\u%04x\\u%04x",
215 (int)((uch - 0x10000) / 0x400 + 0xD800), 403 (int)((uch - 0x10000) / 0x400 + 0xD800),
216 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 404 (int)((uch - 0x10000) % 0x400 + 0xDC00));
217 enc->cur += 12; 405 enc->cur += 12;
218 } 406 }
219 else 407 else
220 { 408 {
221 static char hexdigit [16] = "0123456789abcdef";
222 need (enc, len += 5); 409 need (enc, len += 5);
223 *enc->cur++ = '\\'; 410 *enc->cur++ = '\\';
224 *enc->cur++ = 'u'; 411 *enc->cur++ = 'u';
225 *enc->cur++ = hexdigit [ uch >> 12 ]; 412 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
226 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 413 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
227 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 414 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
228 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 415 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
229 } 416 }
230 417
231 str += clen; 418 str += clen;
232 } 419 }
233 else if (enc->json.flags & F_LATIN1) 420 else if (enc->json.flags & F_LATIN1)
… …
245 while (--clen); 432 while (--clen);
246 } 433 }
247 else 434 else
248 { 435 {
249 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
250 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 437 enc->cur = encode_utf8 (enc->cur, uch);
251 ++str; 438 ++str;
252 } 439 }
253 } 440 }
254 } 441 }
255 } 442 }
256 443
257 --len; 444 --len;
258 } 445 }
259} 446}
260 447
261inline void 448INLINE void
262encode_indent (enc_t *enc) 449encode_indent (enc_t *enc)
263{ 450{
264 if (enc->json.flags & F_INDENT) 451 if (enc->json.flags & F_INDENT)
265 { 452 {
266 int spaces = enc->indent * INDENT_STEP; 453 int spaces = enc->indent * INDENT_STEP;
… …
269 memset (enc->cur, ' ', spaces); 456 memset (enc->cur, ' ', spaces);
270 enc->cur += spaces; 457 enc->cur += spaces;
271 } 458 }
272} 459}
273 460
274inline void 461INLINE void
275encode_space (enc_t *enc) 462encode_space (enc_t *enc)
276{ 463{
277 need (enc, 1); 464 need (enc, 1);
278 encode_ch (enc, ' '); 465 encode_ch (enc, ' ');
279} 466}
280 467
281inline void 468INLINE void
282encode_nl (enc_t *enc) 469encode_nl (enc_t *enc)
283{ 470{
284 if (enc->json.flags & F_INDENT) 471 if (enc->json.flags & F_INDENT)
285 { 472 {
286 need (enc, 1); 473 need (enc, 1);
287 encode_ch (enc, '\n'); 474 encode_ch (enc, '\n');
288 } 475 }
289} 476}
290 477
291inline void 478INLINE void
292encode_comma (enc_t *enc) 479encode_comma (enc_t *enc)
293{ 480{
294 encode_ch (enc, ','); 481 encode_ch (enc, ',');
295 482
296 if (enc->json.flags & F_INDENT) 483 if (enc->json.flags & F_INDENT)
… …
304static void 491static void
305encode_av (enc_t *enc, AV *av) 492encode_av (enc_t *enc, AV *av)
306{ 493{
307 int i, len = av_len (av); 494 int i, len = av_len (av);
308 495
309 if (enc->indent >= enc->maxdepth) 496 if (enc->indent >= enc->json.max_depth)
310 croak ("data structure too deep (hit recursion limit)"); 497 croak (ERR_NESTING_EXCEEDED);
311 498
312 encode_ch (enc, '['); encode_nl (enc); 499 encode_ch (enc, '[');
313 ++enc->indent;
314 500
501 if (len >= 0)
502 {
503 encode_nl (enc); ++enc->indent;
504
315 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
316 { 506 {
507 SV **svp = av_fetch (av, i, 0);
508
317 encode_indent (enc); 509 encode_indent (enc);
318 encode_sv (enc, *av_fetch (av, i, 0));
319 510
511 if (svp)
512 encode_sv (enc, *svp);
513 else
514 encode_str (enc, "null", 4, 0);
515
320 if (i < len) 516 if (i < len)
321 encode_comma (enc); 517 encode_comma (enc);
322 } 518 }
323 519
520 encode_nl (enc); --enc->indent; encode_indent (enc);
521 }
522
324 encode_nl (enc); 523 encode_ch (enc, ']');
325
326 --enc->indent;
327 encode_indent (enc); encode_ch (enc, ']');
328} 524}
329 525
330static void 526static void
331encode_he (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
332{ 528{
333 encode_ch (enc, '"'); 529 encode_ch (enc, '"');
334 530
335 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
336 { 532 {
337 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
338 STRLEN len; 534 STRLEN len;
339 char *str; 535 char *str;
340 536
341 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
342 str = SvPV (sv, len); 538 str = SvPV (sv, len);
343 539
344 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
345 } 541 }
… …
349 encode_ch (enc, '"'); 545 encode_ch (enc, '"');
350 546
351 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 547 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
352 encode_ch (enc, ':'); 548 encode_ch (enc, ':');
353 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 549 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
354 encode_sv (enc, HeVAL (he));
355} 550}
356 551
357// compare hash entries, used when all keys are bytestrings 552// compare hash entries, used when all keys are bytestrings
358static int 553static int
359he_cmp_fast (const void *a_, const void *b_) 554he_cmp_fast (const void *a_, const void *b_)
… …
364 HE *b = *(HE **)b_; 559 HE *b = *(HE **)b_;
365 560
366 STRLEN la = HeKLEN (a); 561 STRLEN la = HeKLEN (a);
367 STRLEN lb = HeKLEN (b); 562 STRLEN lb = HeKLEN (b);
368 563
369 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 564 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
370 cmp = la - lb; 565 cmp = lb - la;
371 566
372 return cmp; 567 return cmp;
373} 568}
374 569
375// compare hash entries, used when some keys are sv's or utf-x 570// compare hash entries, used when some keys are sv's or utf-x
376static int 571static int
377he_cmp_slow (const void *a, const void *b) 572he_cmp_slow (const void *a, const void *b)
378{ 573{
379 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 574 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
380} 575}
381 576
382static void 577static void
383encode_hv (enc_t *enc, HV *hv) 578encode_hv (enc_t *enc, HV *hv)
384{ 579{
385 int count, i; 580 HE *he;
386 581
387 if (enc->indent >= enc->maxdepth) 582 if (enc->indent >= enc->json.max_depth)
388 croak ("data structure too deep (hit recursion limit)"); 583 croak (ERR_NESTING_EXCEEDED);
389 584
390 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 585 encode_ch (enc, '{');
391 586
392 if ((count = hv_iterinit (hv)))
393 {
394 // for canonical output we have to sort by keys first 587 // for canonical output we have to sort by keys first
395 // actually, this is mostly due to the stupid so-called 588 // actually, this is mostly due to the stupid so-called
396 // security workaround added somewhere in 5.8.x. 589 // security workaround added somewhere in 5.8.x
397 // that randomises hash orderings 590 // that randomises hash orderings
398 if (enc->json.flags & F_CANONICAL) 591 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
592 {
593 int count = hv_iterinit (hv);
594
595 if (SvMAGICAL (hv))
399 { 596 {
597 // need to count by iterating. could improve by dynamically building the vector below
598 // but I don't care for the speed of this special case.
599 // note also that we will run into undefined behaviour when the two iterations
600 // do not result in the same count, something I might care for in some later release.
601
602 count = 0;
603 while (hv_iternext (hv))
604 ++count;
605
606 hv_iterinit (hv);
607 }
608
609 if (count)
610 {
400 int fast = 1; 611 int i, fast = 1;
401 HE *he; 612 HE *hes_stack [STACK_HES];
402#if defined(__BORLANDC__) || defined(_MSC_VER) 613 HE **hes = hes_stack;
403 HE **hes = _alloca (count * sizeof (HE)); 614
404#else 615 // allocate larger arrays on the heap
405 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 616 if (count > STACK_HES)
406#endif 617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
407 621
408 i = 0; 622 i = 0;
409 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
410 { 624 {
411 hes [i++] = he; 625 hes [i++] = he;
… …
433 647
434 FREETMPS; 648 FREETMPS;
435 LEAVE; 649 LEAVE;
436 } 650 }
437 651
438 for (i = 0; i < count; ++i) 652 encode_nl (enc); ++enc->indent;
653
654 while (count--)
439 { 655 {
440 encode_indent (enc); 656 encode_indent (enc);
657 he = hes [count];
441 encode_he (enc, hes [i]); 658 encode_hk (enc, he);
659 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
442 660
443 if (i < count - 1) 661 if (count)
444 encode_comma (enc); 662 encode_comma (enc);
445 } 663 }
446 664
447 encode_nl (enc); 665 encode_nl (enc); --enc->indent; encode_indent (enc);
448 } 666 }
667 }
449 else 668 else
669 {
670 if (hv_iterinit (hv) || SvMAGICAL (hv))
671 if ((he = hv_iternext (hv)))
450 { 672 {
451 HE *he = hv_iternext (hv); 673 encode_nl (enc); ++enc->indent;
452 674
453 for (;;) 675 for (;;)
454 { 676 {
455 encode_indent (enc); 677 encode_indent (enc);
456 encode_he (enc, he); 678 encode_hk (enc, he);
679 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
457 680
458 if (!(he = hv_iternext (hv))) 681 if (!(he = hv_iternext (hv)))
459 break; 682 break;
460 683
461 encode_comma (enc); 684 encode_comma (enc);
462 } 685 }
463 686
464 encode_nl (enc); 687 encode_nl (enc); --enc->indent; encode_indent (enc);
465 } 688 }
466 } 689 }
467 690
468 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 691 encode_ch (enc, '}');
469} 692}
470 693
471// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
472static void 695static void
473encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
474{ 697{
475 svtype svt; 698 svtype svt;
699 GV *method;
476 700
477 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
478 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
479 703
480 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
481 { 705 {
482 if (SvSTASH (sv) == json_boolean_stash) 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
707 ? types_boolean_stash
708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
710
711 if (stash == boolean_stash)
483 { 712 {
484 if (SvIV (sv) == 0) 713 if (SvIV (sv))
714 encode_str (enc, "true", 4, 0);
715 else
485 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
486 else
487 encode_str (enc, "true", 4, 0);
488 } 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);
489 else 784 else
490 {
491#if 0
492 if (0 && sv_derived_from (rv, "JSON::Literal"))
493 {
494 // not yet
495 }
496#endif
497 if (enc->json.flags & F_CONV_BLESSED)
498 {
499 // we re-bless the reference to get overload and other niceties right
500 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
501
502 if (to_json)
503 {
504 dSP;
505 ENTER;
506 SAVETMPS;
507 PUSHMARK (SP);
508 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
509
510 // calling with G_SCALAR ensures that we always get a 1 reutrn value
511 // check anyways.
512 PUTBACK;
513 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
514 SPAGAIN;
515
516 encode_sv (enc, POPs);
517
518 FREETMPS;
519 LEAVE;
520 }
521 else if (enc->json.flags & F_ALLOW_BLESSED)
522 encode_str (enc, "null", 4, 0);
523 else
524 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
525 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
526 }
527 else if (enc->json.flags & F_ALLOW_BLESSED)
528 encode_str (enc, "null", 4, 0);
529 else
530 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)",
531 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
532 }
533 } 787 }
534 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
535 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
536 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
537 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
538 else if (svt < SVt_PVAV) 792 else if (svt < SVt_PVAV)
539 { 793 {
540 if (SvNIOK (sv) && SvIV (sv) == 0) 794 STRLEN len = 0;
795 char *pv = svt ? SvPV (sv, len) : 0;
796
797 if (len == 1 && *pv == '1')
798 encode_str (enc, "true", 4, 0);
799 else if (len == 1 && *pv == '0')
541 encode_str (enc, "false", 5, 0); 800 encode_str (enc, "false", 5, 0);
542 else if (SvNIOK (sv) && SvIV (sv) == 1) 801 else if (enc->json.flags & F_ALLOW_UNKNOWN)
543 encode_str (enc, "true", 4, 0); 802 encode_str (enc, "null", 4, 0);
544 else 803 else
545 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",
546 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 805 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
547 } 806 }
807 else if (enc->json.flags & F_ALLOW_UNKNOWN)
808 encode_str (enc, "null", 4, 0);
548 else 809 else
549 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",
550 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 811 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
551} 812}
552 813
… …
570 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 831 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
571 enc->cur += strlen (enc->cur); 832 enc->cur += strlen (enc->cur);
572 } 833 }
573 else if (SvIOKp (sv)) 834 else if (SvIOKp (sv))
574 { 835 {
575 // 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
576 if (SvUV (sv) & ~(UV)0x7fff) 837 // we assume two's complement
577 { 838 // we assume no aliasing issues in the union
578 // large integer, use the (rather slow) snprintf way. 839 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
579 need (enc, sizeof (UV) * 3); 840 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
580 enc->cur +=
581 SvIsUV(sv)
582 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
583 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
584 }
585 else
586 { 841 {
587 // optimise the "small number case" 842 // optimise the "small number case"
588 // 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
589 I32 i = SvIV (sv); 845 I32 i = SvIVX (sv);
590 U32 u; 846 U32 u;
591 char digit, nz = 0; 847 char digit, nz = 0;
592 848
593 need (enc, 6); 849 need (enc, 6);
594 850
… …
600 856
601 // 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
602 // 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,
603 // resulting in a net multiplication by 10. 859 // resulting in a net multiplication by 10.
604 // we always write the digit to memory but conditionally increment 860 // we always write the digit to memory but conditionally increment
605 // the pointer, to ease the usage of conditional move instructions. 861 // the pointer, to enable the use of conditional move instructions.
606 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;
607 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;
608 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;
609 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;
610 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'
611 } 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 }
612 } 877 }
613 else if (SvROK (sv)) 878 else if (SvROK (sv))
614 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
615 else if (!SvOK (sv)) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
616 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
617 else 882 else
618 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",
619 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
620} 885}
621 886
622static SV * 887static SV *
623encode_json (SV *scalar, struct json *json) 888encode_json (SV *scalar, JSON *json)
624{ 889{
625 enc_t enc; 890 enc_t enc;
626 891
627 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar)) 892 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
628 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 893 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
… …
630 enc.json = *json; 895 enc.json = *json;
631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 896 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
632 enc.cur = SvPVX (enc.sv); 897 enc.cur = SvPVX (enc.sv);
633 enc.end = SvEND (enc.sv); 898 enc.end = SvEND (enc.sv);
634 enc.indent = 0; 899 enc.indent = 0;
635 enc.maxdepth = DEC_DEPTH (enc.json.flags); 900 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
901 : enc.json.flags & F_LATIN1 ? 0x000100UL
902 : 0x110000UL;
636 903
637 SvPOK_only (enc.sv); 904 SvPOK_only (enc.sv);
638 encode_sv (&enc, scalar); 905 encode_sv (&enc, scalar);
906 encode_nl (&enc);
639 907
640 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 908 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
641 *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
642 910
643 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 911 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
656typedef struct 924typedef struct
657{ 925{
658 char *cur; // current parser pointer 926 char *cur; // current parser pointer
659 char *end; // end of input string 927 char *end; // end of input string
660 const char *err; // parse error, if != 0 928 const char *err; // parse error, if != 0
661 struct json json; 929 JSON json;
662 U32 depth; // recursion depth 930 U32 depth; // recursion depth
663 U32 maxdepth; // recursion depth limit 931 U32 maxdepth; // recursion depth limit
664} dec_t; 932} dec_t;
665 933
666inline void 934INLINE void
935decode_comment (dec_t *dec)
936{
937 // only '#'-style comments allowed a.t.m.
938
939 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
940 ++dec->cur;
941}
942
943INLINE void
667decode_ws (dec_t *dec) 944decode_ws (dec_t *dec)
668{ 945{
669 for (;;) 946 for (;;)
670 { 947 {
671 char ch = *dec->cur; 948 char ch = *dec->cur;
672 949
673 if (ch > 0x20 950 if (ch > 0x20)
951 {
952 if (expect_false (ch == '#'))
953 {
954 if (dec->json.flags & F_RELAXED)
955 decode_comment (dec);
956 else
957 break;
958 }
959 else
960 break;
961 }
674 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 962 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
675 break; 963 break; // parse error, but let higher level handle it, gives better error messages
676 964
677 ++dec->cur; 965 ++dec->cur;
678 } 966 }
679} 967}
680 968
… …
684 if (*dec->cur != ch) \ 972 if (*dec->cur != ch) \
685 ERR (# ch " expected"); \ 973 ERR (# ch " expected"); \
686 ++dec->cur; \ 974 ++dec->cur; \
687 SE 975 SE
688 976
689#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)
690#define DEC_DEC_DEPTH --dec->depth 978#define DEC_DEC_DEPTH --dec->depth
691 979
692static SV *decode_sv (dec_t *dec); 980static SV *decode_sv (dec_t *dec);
693 981
694static signed char decode_hexdigit[256]; 982static signed char decode_hexdigit[256];
… …
786 1074
787 if (hi >= 0x80) 1075 if (hi >= 0x80)
788 { 1076 {
789 utf8 = 1; 1077 utf8 = 1;
790 1078
791 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 1079 cur = encode_utf8 (cur, hi);
792 } 1080 }
793 else 1081 else
794 *cur++ = hi; 1082 *cur++ = hi;
795 } 1083 }
796 break; 1084 break;
… …
798 default: 1086 default:
799 --dec_cur; 1087 --dec_cur;
800 ERR ("illegal backslash escape sequence in string"); 1088 ERR ("illegal backslash escape sequence in string");
801 } 1089 }
802 } 1090 }
803 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1091 else if (expect_true (ch >= 0x20 && ch < 0x80))
804 *cur++ = ch; 1092 *cur++ = ch;
805 else if (ch >= 0x80) 1093 else if (ch >= 0x80)
806 { 1094 {
807 STRLEN clen; 1095 STRLEN clen;
808 UV uch;
809 1096
810 --dec_cur; 1097 --dec_cur;
811 1098
812 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1099 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
813 if (clen == (STRLEN)-1) 1100 if (clen == (STRLEN)-1)
814 ERR ("malformed UTF-8 character in JSON string"); 1101 ERR ("malformed UTF-8 character in JSON string");
815 1102
816 do 1103 do
817 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
… …
834 { 1121 {
835 STRLEN len = cur - buf; 1122 STRLEN len = cur - buf;
836 1123
837 if (sv) 1124 if (sv)
838 { 1125 {
839 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
840 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1131 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
841 SvCUR_set (sv, SvCUR (sv) + len); 1132 SvCUR_set (sv, SvCUR (sv) + len);
842 } 1133 }
843 else 1134 else
844 sv = newSVpvn (buf, len); 1135 sv = newSVpvn (buf, len);
… …
929 is_nv = 1; 1220 is_nv = 1;
930 } 1221 }
931 1222
932 if (!is_nv) 1223 if (!is_nv)
933 { 1224 {
1225 int len = dec->cur - start;
1226
934 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1227 // special case the rather common 1..5-digit-int case
935 if (*start == '-') 1228 if (*start == '-')
936 switch (dec->cur - start) 1229 switch (len)
937 { 1230 {
938 case 2: return newSViv (-( start [1] - '0' * 1)); 1231 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
939 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1232 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
940 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));
941 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));
1235 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
942 } 1236 }
943 else 1237 else
944 switch (dec->cur - start) 1238 switch (len)
945 { 1239 {
946 case 1: return newSViv ( start [0] - '0' * 1); 1240 case 1: return newSViv ( start [0] - '0' * 1);
947 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1241 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
948 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);
949 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);
1244 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
950 } 1245 }
951 1246
952 { 1247 {
953 UV uv; 1248 UV uv;
954 int numtype = grok_number (start, dec->cur - start, &uv); 1249 int numtype = grok_number (start, len, &uv);
955 if (numtype & IS_NUMBER_IN_UV) 1250 if (numtype & IS_NUMBER_IN_UV)
956 if (numtype & IS_NUMBER_NEG) 1251 if (numtype & IS_NUMBER_NEG)
957 { 1252 {
958 if (uv < (UV)IV_MIN) 1253 if (uv < (UV)IV_MIN)
959 return newSViv (-(IV)uv); 1254 return newSViv (-(IV)uv);
960 } 1255 }
961 else 1256 else
962 return newSVuv (uv); 1257 return newSVuv (uv);
963
964 // here would likely be the place for bigint support
965 } 1258 }
966 }
967 1259
968 // if we ever support bigint or bigfloat, this is the place for bigfloat 1260 len -= *start == '-' ? 1 : 0;
1261
1262 // does not fit into IV or UV, try NV
1263 if (len <= NV_DIG)
1264 // fits into NV without loss of precision
1265 return newSVnv (json_atof (start));
1266
1267 // everything else fails, convert it to a string
1268 return newSVpvn (start, dec->cur - start);
1269 }
1270
1271 // loss of precision here
969 return newSVnv (Atof (start)); 1272 return newSVnv (json_atof (start));
970 1273
971fail: 1274fail:
972 return 0; 1275 return 0;
973} 1276}
974 1277
… …
998 if (*dec->cur == ']') 1301 if (*dec->cur == ']')
999 { 1302 {
1000 ++dec->cur; 1303 ++dec->cur;
1001 break; 1304 break;
1002 } 1305 }
1003 1306
1004 if (*dec->cur != ',') 1307 if (*dec->cur != ',')
1005 ERR (", or ] expected while parsing array"); 1308 ERR (", or ] expected while parsing array");
1006 1309
1007 ++dec->cur; 1310 ++dec->cur;
1311
1312 decode_ws (dec);
1313
1314 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1315 {
1316 ++dec->cur;
1317 break;
1318 }
1008 } 1319 }
1009 1320
1010 DEC_DEC_DEPTH; 1321 DEC_DEC_DEPTH;
1011 return newRV_noinc ((SV *)av); 1322 return newRV_noinc ((SV *)av);
1012 1323
… …
1017} 1328}
1018 1329
1019static SV * 1330static SV *
1020decode_hv (dec_t *dec) 1331decode_hv (dec_t *dec)
1021{ 1332{
1333 SV *sv;
1022 HV *hv = newHV (); 1334 HV *hv = newHV ();
1023 1335
1024 DEC_INC_DEPTH; 1336 DEC_INC_DEPTH;
1025 decode_ws (dec); 1337 decode_ws (dec);
1026 1338
1027 if (*dec->cur == '}') 1339 if (*dec->cur == '}')
1028 ++dec->cur; 1340 ++dec->cur;
1029 else 1341 else
1030 for (;;) 1342 for (;;)
1031 { 1343 {
1032 decode_ws (dec); EXPECT_CH ('"'); 1344 EXPECT_CH ('"');
1033 1345
1034 // heuristic: assume that 1346 // heuristic: assume that
1035 // a) decode_str + hv_store_ent are abysmally slow. 1347 // a) decode_str + hv_store_ent are abysmally slow.
1036 // b) most hash keys are short, simple ascii text. 1348 // b) most hash keys are short, simple ascii text.
1037 // => try to "fast-match" such strings to avoid 1349 // => try to "fast-match" such strings to avoid
… …
1041 char *p = dec->cur; 1353 char *p = dec->cur;
1042 char *e = p + 24; // only try up to 24 bytes 1354 char *e = p + 24; // only try up to 24 bytes
1043 1355
1044 for (;;) 1356 for (;;)
1045 { 1357 {
1046 // the >= 0x80 is true on most architectures 1358 // the >= 0x80 is false on most architectures
1047 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1359 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1048 { 1360 {
1049 // slow path, back up and use decode_str 1361 // slow path, back up and use decode_str
1050 SV *key = decode_str (dec); 1362 SV *key = decode_str (dec);
1051 if (!key) 1363 if (!key)
1052 goto fail; 1364 goto fail;
1053 1365
1054 decode_ws (dec); EXPECT_CH (':'); 1366 decode_ws (dec); EXPECT_CH (':');
1055 1367
1368 decode_ws (dec);
1056 value = decode_sv (dec); 1369 value = decode_sv (dec);
1057 if (!value) 1370 if (!value)
1058 { 1371 {
1059 SvREFCNT_dec (key); 1372 SvREFCNT_dec (key);
1060 goto fail; 1373 goto fail;
… …
1072 int len = p - key; 1385 int len = p - key;
1073 dec->cur = p + 1; 1386 dec->cur = p + 1;
1074 1387
1075 decode_ws (dec); EXPECT_CH (':'); 1388 decode_ws (dec); EXPECT_CH (':');
1076 1389
1390 decode_ws (dec);
1077 value = decode_sv (dec); 1391 value = decode_sv (dec);
1078 if (!value) 1392 if (!value)
1079 goto fail; 1393 goto fail;
1080 1394
1081 hv_store (hv, key, len, value, 0); 1395 hv_store (hv, key, len, value, 0);
… …
1097 1411
1098 if (*dec->cur != ',') 1412 if (*dec->cur != ',')
1099 ERR (", or } expected while parsing object/hash"); 1413 ERR (", or } expected while parsing object/hash");
1100 1414
1101 ++dec->cur; 1415 ++dec->cur;
1416
1417 decode_ws (dec);
1418
1419 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1420 {
1421 ++dec->cur;
1422 break;
1423 }
1102 } 1424 }
1103 1425
1104 DEC_DEC_DEPTH; 1426 DEC_DEC_DEPTH;
1105 return newRV_noinc ((SV *)hv); 1427 sv = newRV_noinc ((SV *)hv);
1428
1429 // check filter callbacks
1430 if (dec->json.flags & F_HOOK)
1431 {
1432 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1433 {
1434 HE *cb, *he;
1435
1436 hv_iterinit (hv);
1437 he = hv_iternext (hv);
1438 hv_iterinit (hv);
1439
1440 // the next line creates a mortal sv each time its called.
1441 // might want to optimise this for common cases.
1442 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1443
1444 if (cb)
1445 {
1446 dSP;
1447 int count;
1448
1449 ENTER; SAVETMPS; PUSHMARK (SP);
1450 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv);
1452
1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1454
1455 if (count == 1)
1456 {
1457 sv = newSVsv (POPs);
1458 FREETMPS; LEAVE;
1459 return sv;
1460 }
1461
1462 SvREFCNT_inc (sv);
1463 FREETMPS; LEAVE;
1464 }
1465 }
1466
1467 if (dec->json.cb_object)
1468 {
1469 dSP;
1470 int count;
1471
1472 ENTER; SAVETMPS; PUSHMARK (SP);
1473 XPUSHs (sv_2mortal (sv));
1474
1475 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1476
1477 if (count == 1)
1478 {
1479 sv = newSVsv (POPs);
1480 FREETMPS; LEAVE;
1481 return sv;
1482 }
1483
1484 SvREFCNT_inc (sv);
1485 FREETMPS; LEAVE;
1486 }
1487 }
1488
1489 return sv;
1106 1490
1107fail: 1491fail:
1108 SvREFCNT_dec (hv); 1492 SvREFCNT_dec (hv);
1109 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1110 return 0; 1494 return 0;
1111} 1495}
1112 1496
1113static 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 *
1114decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1115{ 1581{
1116 decode_ws (dec);
1117
1118 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1119 // to parse anything. 1583 // to parse everything.
1120 switch (*dec->cur) 1584 switch (*dec->cur)
1121 { 1585 {
1122 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1123 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1124 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1125 1590
1126 case '-': 1591 case '-':
1127 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1128 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1129 return decode_num (dec); 1594 return decode_num (dec);
1130 1595
1131 case 't': 1596 case 't':
1132 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1133 { 1598 {
1134 dec->cur += 4; 1599 dec->cur += 4;
1135 return SvREFCNT_inc (json_true); 1600#if JSON_SLOW
1601 types_true = get_bool ("Types::Serialiser::true");
1602#endif
1603 return newSVsv (types_true);
1136 } 1604 }
1137 else 1605 else
1138 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1139 1607
1140 break; 1608 break;
1141 1609
1142 case 'f': 1610 case 'f':
1143 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1144 { 1612 {
1145 dec->cur += 5; 1613 dec->cur += 5;
1146 return SvREFCNT_inc (json_false); 1614#if JSON_SLOW
1615 types_false = get_bool ("Types::Serialiser::false");
1616#endif
1617 return newSVsv (types_false);
1147 } 1618 }
1148 else 1619 else
1149 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1150 1621
1151 break; 1622 break;
… …
1160 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1161 1632
1162 break; 1633 break;
1163 1634
1164 default: 1635 default:
1165 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1166 break; 1637 break;
1167 } 1638 }
1168 1639
1169fail: 1640fail:
1170 return 0; 1641 return 0;
1171} 1642}
1172 1643
1173static SV * 1644static SV *
1174decode_json (SV *string, struct json *json, UV *offset_return) 1645decode_json (SV *string, JSON *json, char **offset_return)
1175{ 1646{
1176 dec_t dec; 1647 dec_t dec;
1177 UV offset;
1178 SV *sv; 1648 SV *sv;
1179 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 */
1180 SvGETMAGIC (string); 1655 /*SvGETMAGIC (string);*/
1656 if (SvMAGICAL (string) || !SvPOK (string))
1657 string = sv_2mortal (newSVsv (string));
1658
1181 SvUPGRADE (string, SVt_PV); 1659 SvUPGRADE (string, SVt_PV);
1182 1660
1183 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)
1184 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",
1185 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1680 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1681 }
1186 1682
1187 if (json->flags & F_UTF8) 1683 if (DECODE_WANTS_OCTETS (json))
1188 sv_utf8_downgrade (string, 0); 1684 sv_utf8_downgrade (string, 0);
1189 else 1685 else
1190 sv_utf8_upgrade (string); 1686 sv_utf8_upgrade (string);
1191 1687
1192 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1688 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1193 1689
1194 dec.json = *json; 1690 dec.json = *json;
1195 dec.cur = SvPVX (string); 1691 dec.cur = SvPVX (string);
1196 dec.end = SvEND (string); 1692 dec.end = SvEND (string);
1197 dec.err = 0; 1693 dec.err = 0;
1198 dec.depth = 0; 1694 dec.depth = 0;
1199 dec.maxdepth = DEC_DEPTH (dec.json.flags); 1695
1696 if (dec.json.cb_object || dec.json.cb_sk_object)
1697 dec.json.flags |= F_HOOK;
1200 1698
1201 *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
1700
1701 decode_ws (&dec);
1202 sv = decode_sv (&dec); 1702 sv = decode_sv (&dec);
1703
1704 if (offset_return)
1705 *offset_return = dec.cur;
1203 1706
1204 if (!(offset_return || !sv)) 1707 if (!(offset_return || !sv))
1205 { 1708 {
1206 // check for trailing garbage 1709 // check for trailing garbage
1207 decode_ws (&dec); 1710 decode_ws (&dec);
… …
1210 { 1713 {
1211 dec.err = "garbage after JSON object"; 1714 dec.err = "garbage after JSON object";
1212 SvREFCNT_dec (sv); 1715 SvREFCNT_dec (sv);
1213 sv = 0; 1716 sv = 0;
1214 } 1717 }
1215 }
1216
1217 if (offset_return || !sv)
1218 {
1219 offset = dec.json.flags & F_UTF8
1220 ? dec.cur - SvPVX (string)
1221 : utf8_distance (dec.cur, SvPVX (string));
1222
1223 if (offset_return)
1224 *offset_return = offset;
1225 } 1718 }
1226 1719
1227 if (!sv) 1720 if (!sv)
1228 { 1721 {
1229 SV *uni = sv_newmortal (); 1722 SV *uni = sv_newmortal ();
… …
1235 SAVEVPTR (PL_curcop); 1728 SAVEVPTR (PL_curcop);
1236 PL_curcop = &cop; 1729 PL_curcop = &cop;
1237 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);
1238 LEAVE; 1731 LEAVE;
1239 1732
1240 croak ("%s, at character offset %d [\"%s\"]", 1733 croak ("%s, at character offset %d (before \"%s\")",
1241 dec.err, 1734 dec.err,
1242 (int)offset, 1735 (int)ptr_to_index (string, dec.cur),
1243 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1244 } 1737 }
1245 1738
1246 sv = sv_2mortal (sv); 1739 sv = sv_2mortal (sv);
1247 1740
1248 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1741 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1249 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)");
1250 1743
1251 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
1252} 1903}
1253 1904
1254///////////////////////////////////////////////////////////////////////////// 1905/////////////////////////////////////////////////////////////////////////////
1255// XS interface functions 1906// XS interface functions
1256 1907
… …
1265 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1266 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1267 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1268 : -1; 1919 : -1;
1269 1920
1270 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1271 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1272 1923
1273 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1924 types_true = get_bool ("Types::Serialiser::true");
1274 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 */
1275} 1931}
1276 1932
1277PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1278 1934
1279SV *new (char *dummy) 1935void CLONE (...)
1280 CODE: 1936 CODE:
1281 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1937 json_stash = 0;
1282 OUTPUT: 1938 types_boolean_stash = 0;
1283 RETVAL
1284 1939
1940void new (char *klass)
1941 PPCODE:
1942{
1943 SV *pv = NEWSV (0, sizeof (JSON));
1944 SvPOK_only (pv);
1945 json_init ((JSON *)SvPVX (pv));
1946 XPUSHs (sv_2mortal (sv_bless (
1947 newRV_noinc (pv),
1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1949 )));
1950}
1951
1285SV *ascii (SV *self, int enable = 1) 1952void ascii (JSON *self, int enable = 1)
1286 ALIAS: 1953 ALIAS:
1287 ascii = F_ASCII 1954 ascii = F_ASCII
1288 latin1 = F_LATIN1 1955 latin1 = F_LATIN1
1289 utf8 = F_UTF8 1956 utf8 = F_UTF8
1290 indent = F_INDENT 1957 indent = F_INDENT
… …
1294 pretty = F_PRETTY 1961 pretty = F_PRETTY
1295 allow_nonref = F_ALLOW_NONREF 1962 allow_nonref = F_ALLOW_NONREF
1296 shrink = F_SHRINK 1963 shrink = F_SHRINK
1297 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1298 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1966 relaxed = F_RELAXED
1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1969 PPCODE:
1970{
1971 if (enable)
1972 self->flags |= ix;
1973 else
1974 self->flags &= ~ix;
1975
1976 XPUSHs (ST (0));
1977}
1978
1979void get_ascii (JSON *self)
1980 ALIAS:
1981 get_ascii = F_ASCII
1982 get_latin1 = F_LATIN1
1983 get_utf8 = F_UTF8
1984 get_indent = F_INDENT
1985 get_canonical = F_CANONICAL
1986 get_space_before = F_SPACE_BEFORE
1987 get_space_after = F_SPACE_AFTER
1988 get_allow_nonref = F_ALLOW_NONREF
1989 get_shrink = F_SHRINK
1990 get_allow_blessed = F_ALLOW_BLESSED
1991 get_convert_blessed = F_CONV_BLESSED
1992 get_relaxed = F_RELAXED
1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1995 PPCODE:
1996 XPUSHs (boolSV (self->flags & ix));
1997
1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1999 PPCODE:
2000 self->max_depth = max_depth;
2001 XPUSHs (ST (0));
2002
2003U32 get_max_depth (JSON *self)
1299 CODE: 2004 CODE:
1300{ 2005 RETVAL = self->max_depth;
1301 UV *uv = SvJSON (self);
1302 if (enable)
1303 *uv |= ix;
1304 else
1305 *uv &= ~ix;
1306
1307 RETVAL = newSVsv (self);
1308}
1309 OUTPUT: 2006 OUTPUT:
1310 RETVAL 2007 RETVAL
1311 2008
1312SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 2009void max_size (JSON *self, U32 max_size = 0)
2010 PPCODE:
2011 self->max_size = max_size;
2012 XPUSHs (ST (0));
2013
2014int get_max_size (JSON *self)
1313 CODE: 2015 CODE:
1314{ 2016 RETVAL = self->max_size;
1315 UV *uv = SvJSON (self);
1316 UV log2 = 0;
1317
1318 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1319
1320 while ((1UL << log2) < max_depth)
1321 ++log2;
1322
1323 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1324
1325 RETVAL = newSVsv (self);
1326}
1327 OUTPUT: 2017 OUTPUT:
1328 RETVAL 2018 RETVAL
1329 2019
1330SV *max_size (SV *self, UV max_size = 0) 2020void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
2021 PPCODE:
2022{
2023 SvREFCNT_dec (self->cb_object);
2024 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
2025
2026 XPUSHs (ST (0));
2027}
2028
2029void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
2030 PPCODE:
2031{
2032 if (!self->cb_sk_object)
2033 self->cb_sk_object = newHV ();
2034
2035 if (SvOK (cb))
2036 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
2037 else
2038 {
2039 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
2040
2041 if (!HvKEYS (self->cb_sk_object))
2042 {
2043 SvREFCNT_dec (self->cb_sk_object);
2044 self->cb_sk_object = 0;
2045 }
2046 }
2047
2048 XPUSHs (ST (0));
2049}
2050
2051void encode (JSON *self, SV *scalar)
2052 PPCODE:
2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2054 XPUSHs (scalar);
2055
2056void decode (JSON *self, SV *jsonstr)
2057 PPCODE:
2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2059 XPUSHs (jsonstr);
2060
2061void decode_prefix (JSON *self, SV *jsonstr)
2062 PPCODE:
2063{
2064 SV *sv;
2065 char *offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
2067 EXTEND (SP, 2);
2068 PUSHs (sv);
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
1331 CODE: 2163 CODE:
1332{ 2164{
1333 UV *uv = SvJSON (self); 2165 if (self->incr_pos)
1334 UV log2 = 0; 2166 croak ("incr_text can not be called when the incremental parser already started parsing");
1335 2167
1336 if (max_size > 0x80000000UL) max_size = 0x80000000UL; 2168 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1337 if (max_size == 1) max_size = 2;
1338
1339 while ((1UL << log2) < max_size)
1340 ++log2;
1341
1342 *uv = *uv & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1343
1344 RETVAL = newSVsv (self);
1345} 2169}
1346 OUTPUT: 2170 OUTPUT:
1347 RETVAL 2171 RETVAL
1348 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;
2193}
2194
2195void DESTROY (JSON *self)
2196 CODE:
2197 SvREFCNT_dec (self->cb_sk_object);
2198 SvREFCNT_dec (self->cb_object);
2199 SvREFCNT_dec (self->incr_text);
2200
2201PROTOTYPES: ENABLE
2202
1349void encode (SV *self, SV *scalar) 2203void encode_json (SV *scalar)
1350 PPCODE: 2204 PPCODE:
1351{ 2205{
1352 struct json json = { *SvJSON (self) }; 2206 JSON json;
1353 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);
1354} 2211}
1355 2212
1356void decode (SV *self, SV *jsonstr) 2213void decode_json (SV *jsonstr)
1357 PPCODE: 2214 PPCODE:
1358{ 2215{
1359 struct json json = { *SvJSON (self) }; 2216 JSON json;
1360 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);
1361} 2221}
1362 2222
1363void decode_prefix (SV *self, SV *jsonstr)
1364 PPCODE:
1365{
1366 UV offset;
1367 struct json json = { *SvJSON (self) };
1368 EXTEND (SP, 2);
1369 PUSHs (decode_json (jsonstr, &json, &offset));
1370 PUSHs (sv_2mortal (newSVuv (offset)));
1371}
1372
1373PROTOTYPES: ENABLE
1374
1375void to_json (SV *scalar)
1376 PPCODE:
1377{
1378 struct json json = { F_DEFAULT | F_UTF8 };
1379 XPUSHs (encode_json (scalar, &json));
1380}
1381
1382void from_json (SV *jsonstr)
1383 PPCODE:
1384{
1385 struct json json = { F_DEFAULT | F_UTF8 };
1386 XPUSHs (decode_json (jsonstr, &json, 0));
1387}
1388

Diff Legend

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