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

Diff Legend

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