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.49 by root, Sun Jul 1 23:40:07 2007 UTC vs.
Revision 1.103 by root, Wed Jan 6 08:01:39 2010 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include "assert.h" 5#include <assert.h>
6#include "string.h" 6#include <string.h>
7#include "stdlib.h" 7#include <stdlib.h>
8#include "stdio.h" 8#include <stdio.h>
9#include <limits.h>
10#include <float.h>
9 11
10#if defined(__BORLANDC__) || defined(_MSC_VER) 12#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 13# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 14#endif
13 15
14// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
15// guarentees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
18#endif 20#endif
21
22// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
19 24
20#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
22#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
23#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
26#define F_SPACE_AFTER 0x00000040UL 31#define F_SPACE_AFTER 0x00000040UL
27#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
28#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
31#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL 36#define F_RELAXED 0x00001000UL
34#define S_MAXSIZE 20 37#define F_ALLOW_UNKNOWN 0x00002000UL
35#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
36 39
37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
39
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41#define F_DEFAULT (9UL << S_MAXDEPTH)
42 41
43#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
44#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
45 44
46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
47 46
48#define SB do { 47#define SB do {
49#define SE } while (0) 48#define SE } while (0)
50 49
51#if __GNUC__ >= 3 50#if __GNUC__ >= 3
52# define expect(expr,value) __builtin_expect ((expr),(value)) 51# define expect(expr,value) __builtin_expect ((expr), (value))
53# define inline inline 52# define INLINE static inline
54#else 53#else
55# define expect(expr,value) (expr) 54# define expect(expr,value) (expr)
56# define inline static 55# define INLINE static
57#endif 56#endif
58 57
59#define expect_false(expr) expect ((expr) != 0, 0) 58#define expect_false(expr) expect ((expr) != 0, 0)
60#define expect_true(expr) expect ((expr) != 0, 1) 59#define expect_true(expr) expect ((expr) != 0, 1)
61 60
61#define IN_RANGE_INC(type,val,beg,end) \
62 ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
63 <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
64
65#define ERR_NESTING_EXCEEDED "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
66
67#ifdef USE_ITHREADS
68# define JSON_SLOW 1
69# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
70#else
71# define JSON_SLOW 0
72# define JSON_STASH json_stash
73#endif
74
62static HV *json_stash, *json_boolean_stash; // JSON::XS:: 75static HV *json_stash, *json_boolean_stash; // JSON::XS::
63static SV *json_true, *json_false; 76static SV *json_true, *json_false;
64 77
78enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash
82 INCR_M_C0, // inside comment in initial whitespace sequence
83 INCR_M_C1, // inside comment in other places
84 INCR_M_JSON // outside anything, count nesting
85};
86
87#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
88
65typedef struct { 89typedef struct {
66 U32 flags; 90 U32 flags;
67 SV *cb_object, *cb_sk_object; 91 U32 max_depth;
92 STRLEN max_size;
93
94 SV *cb_object;
95 HV *cb_sk_object;
96
97 // for the incremental parser
98 SV *incr_text; // the source text so far
99 STRLEN incr_pos; // the current offset into the text
100 int incr_nest; // {[]}-nesting level
101 unsigned char incr_mode;
68} JSON; 102} JSON;
103
104INLINE void
105json_init (JSON *json)
106{
107 Zero (json, 1, JSON);
108 json->max_depth = 512;
109}
69 110
70///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
71// utility functions 112// utility functions
72 113
73inline void 114INLINE SV *
115get_bool (const char *name)
116{
117 SV *sv = get_sv (name, 1);
118
119 SvREADONLY_on (sv);
120 SvREADONLY_on (SvRV (sv));
121
122 return sv;
123}
124
125INLINE void
74shrink (SV *sv) 126shrink (SV *sv)
75{ 127{
76 sv_utf8_downgrade (sv, 1); 128 sv_utf8_downgrade (sv, 1);
129
77 if (SvLEN (sv) > SvCUR (sv) + 1) 130 if (SvLEN (sv) > SvCUR (sv) + 1)
78 { 131 {
79#ifdef SvPV_shrink_to_cur 132#ifdef SvPV_shrink_to_cur
80 SvPV_shrink_to_cur (sv); 133 SvPV_shrink_to_cur (sv);
81#elif defined (SvPV_renew) 134#elif defined (SvPV_renew)
… …
87// decode an utf-8 character and return it, or (UV)-1 in 140// decode an utf-8 character and return it, or (UV)-1 in
88// case of an error. 141// case of an error.
89// we special-case "safe" characters from U+80 .. U+7FF, 142// we special-case "safe" characters from U+80 .. U+7FF,
90// but use the very good perl function to parse anything else. 143// but use the very good perl function to parse anything else.
91// note that we never call this function for a ascii codepoints 144// note that we never call this function for a ascii codepoints
92inline UV 145INLINE UV
93decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 146decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
94{ 147{
95 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 148 if (expect_true (len >= 2
96 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 149 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
97 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 150 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
98 { 151 {
99 *clen = 2; 152 *clen = 2;
100 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 153 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
101 } 154 }
102 else 155 else
103 { 156 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
104 *clen = (STRLEN)-1; 157}
105 return (UV)-1; 158
106 } 159// likewise for encoding, also never called for ascii codepoints
160// this function takes advantage of this fact, although current gccs
161// seem to optimise the check for >= 0x80 away anyways
162INLINE unsigned char *
163encode_utf8 (unsigned char *s, UV ch)
164{
165 if (expect_false (ch < 0x000080))
166 *s++ = ch;
167 else if (expect_true (ch < 0x000800))
168 *s++ = 0xc0 | ( ch >> 6),
169 *s++ = 0x80 | ( ch & 0x3f);
170 else if ( ch < 0x010000)
171 *s++ = 0xe0 | ( ch >> 12),
172 *s++ = 0x80 | ((ch >> 6) & 0x3f),
173 *s++ = 0x80 | ( ch & 0x3f);
174 else if ( ch < 0x110000)
175 *s++ = 0xf0 | ( ch >> 18),
176 *s++ = 0x80 | ((ch >> 12) & 0x3f),
177 *s++ = 0x80 | ((ch >> 6) & 0x3f),
178 *s++ = 0x80 | ( ch & 0x3f);
179
180 return s;
181}
182
183// convert offset pointer to character index, sv must be string
184static STRLEN
185ptr_to_index (SV *sv, char *offset)
186{
187 return SvUTF8 (sv)
188 ? utf8_distance (offset, SvPVX (sv))
189 : offset - SvPVX (sv);
107} 190}
108 191
109///////////////////////////////////////////////////////////////////////////// 192/////////////////////////////////////////////////////////////////////////////
110// encoder 193// encoder
111 194
… …
115 char *cur; // SvPVX (sv) + current output position 198 char *cur; // SvPVX (sv) + current output position
116 char *end; // SvEND (sv) 199 char *end; // SvEND (sv)
117 SV *sv; // result scalar 200 SV *sv; // result scalar
118 JSON json; 201 JSON json;
119 U32 indent; // indentation level 202 U32 indent; // indentation level
120 U32 maxdepth; // max. indentation/recursion level 203 UV limit; // escape character values >= this value when encoding
121} enc_t; 204} enc_t;
122 205
123inline void 206INLINE void
124need (enc_t *enc, STRLEN len) 207need (enc_t *enc, STRLEN len)
125{ 208{
126 if (expect_false (enc->cur + len >= enc->end)) 209 if (expect_false (enc->cur + len >= enc->end))
127 { 210 {
128 STRLEN cur = enc->cur - SvPVX (enc->sv); 211 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
129 SvGROW (enc->sv, cur + len + 1); 212 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
130 enc->cur = SvPVX (enc->sv) + cur; 213 enc->cur = SvPVX (enc->sv) + cur;
131 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 214 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
132 } 215 }
133} 216}
134 217
135inline void 218INLINE void
136encode_ch (enc_t *enc, char ch) 219encode_ch (enc_t *enc, char ch)
137{ 220{
138 need (enc, 1); 221 need (enc, 1);
139 *enc->cur++ = ch; 222 *enc->cur++ = ch;
140} 223}
… …
194 { 277 {
195 uch = ch; 278 uch = ch;
196 clen = 1; 279 clen = 1;
197 } 280 }
198 281
199 if (uch > 0x10FFFFUL) 282 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
200 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
201
202 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
203 { 283 {
204 if (uch > 0xFFFFUL) 284 if (uch >= 0x10000UL)
205 { 285 {
286 if (uch >= 0x110000UL)
287 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
288
206 need (enc, len += 11); 289 need (enc, len += 11);
207 sprintf (enc->cur, "\\u%04x\\u%04x", 290 sprintf (enc->cur, "\\u%04x\\u%04x",
208 (int)((uch - 0x10000) / 0x400 + 0xD800), 291 (int)((uch - 0x10000) / 0x400 + 0xD800),
209 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 292 (int)((uch - 0x10000) % 0x400 + 0xDC00));
210 enc->cur += 12; 293 enc->cur += 12;
211 } 294 }
212 else 295 else
213 { 296 {
214 static char hexdigit [16] = "0123456789abcdef";
215 need (enc, len += 5); 297 need (enc, len += 5);
216 *enc->cur++ = '\\'; 298 *enc->cur++ = '\\';
217 *enc->cur++ = 'u'; 299 *enc->cur++ = 'u';
218 *enc->cur++ = hexdigit [ uch >> 12 ]; 300 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
219 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 301 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
220 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 302 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
221 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 303 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
222 } 304 }
223 305
224 str += clen; 306 str += clen;
225 } 307 }
226 else if (enc->json.flags & F_LATIN1) 308 else if (enc->json.flags & F_LATIN1)
… …
238 while (--clen); 320 while (--clen);
239 } 321 }
240 else 322 else
241 { 323 {
242 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 324 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
243 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 325 enc->cur = encode_utf8 (enc->cur, uch);
244 ++str; 326 ++str;
245 } 327 }
246 } 328 }
247 } 329 }
248 } 330 }
249 331
250 --len; 332 --len;
251 } 333 }
252} 334}
253 335
254inline void 336INLINE void
255encode_indent (enc_t *enc) 337encode_indent (enc_t *enc)
256{ 338{
257 if (enc->json.flags & F_INDENT) 339 if (enc->json.flags & F_INDENT)
258 { 340 {
259 int spaces = enc->indent * INDENT_STEP; 341 int spaces = enc->indent * INDENT_STEP;
… …
262 memset (enc->cur, ' ', spaces); 344 memset (enc->cur, ' ', spaces);
263 enc->cur += spaces; 345 enc->cur += spaces;
264 } 346 }
265} 347}
266 348
267inline void 349INLINE void
268encode_space (enc_t *enc) 350encode_space (enc_t *enc)
269{ 351{
270 need (enc, 1); 352 need (enc, 1);
271 encode_ch (enc, ' '); 353 encode_ch (enc, ' ');
272} 354}
273 355
274inline void 356INLINE void
275encode_nl (enc_t *enc) 357encode_nl (enc_t *enc)
276{ 358{
277 if (enc->json.flags & F_INDENT) 359 if (enc->json.flags & F_INDENT)
278 { 360 {
279 need (enc, 1); 361 need (enc, 1);
280 encode_ch (enc, '\n'); 362 encode_ch (enc, '\n');
281 } 363 }
282} 364}
283 365
284inline void 366INLINE void
285encode_comma (enc_t *enc) 367encode_comma (enc_t *enc)
286{ 368{
287 encode_ch (enc, ','); 369 encode_ch (enc, ',');
288 370
289 if (enc->json.flags & F_INDENT) 371 if (enc->json.flags & F_INDENT)
… …
297static void 379static void
298encode_av (enc_t *enc, AV *av) 380encode_av (enc_t *enc, AV *av)
299{ 381{
300 int i, len = av_len (av); 382 int i, len = av_len (av);
301 383
302 if (enc->indent >= enc->maxdepth) 384 if (enc->indent >= enc->json.max_depth)
303 croak ("data structure too deep (hit recursion limit)"); 385 croak (ERR_NESTING_EXCEEDED);
304 386
305 encode_ch (enc, '['); encode_nl (enc); 387 encode_ch (enc, '[');
306 ++enc->indent; 388
389 if (len >= 0)
390 {
391 encode_nl (enc); ++enc->indent;
307 392
308 for (i = 0; i <= len; ++i) 393 for (i = 0; i <= len; ++i)
309 { 394 {
395 SV **svp = av_fetch (av, i, 0);
396
310 encode_indent (enc); 397 encode_indent (enc);
311 encode_sv (enc, *av_fetch (av, i, 0));
312 398
399 if (svp)
400 encode_sv (enc, *svp);
401 else
402 encode_str (enc, "null", 4, 0);
403
313 if (i < len) 404 if (i < len)
314 encode_comma (enc); 405 encode_comma (enc);
315 } 406 }
316 407
408 encode_nl (enc); --enc->indent; encode_indent (enc);
409 }
410
317 encode_nl (enc); 411 encode_ch (enc, ']');
318
319 --enc->indent;
320 encode_indent (enc); encode_ch (enc, ']');
321} 412}
322 413
323static void 414static void
324encode_he (enc_t *enc, HE *he) 415encode_hk (enc_t *enc, HE *he)
325{ 416{
326 encode_ch (enc, '"'); 417 encode_ch (enc, '"');
327 418
328 if (HeKLEN (he) == HEf_SVKEY) 419 if (HeKLEN (he) == HEf_SVKEY)
329 { 420 {
… …
342 encode_ch (enc, '"'); 433 encode_ch (enc, '"');
343 434
344 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 435 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
345 encode_ch (enc, ':'); 436 encode_ch (enc, ':');
346 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 437 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
347 encode_sv (enc, HeVAL (he));
348} 438}
349 439
350// compare hash entries, used when all keys are bytestrings 440// compare hash entries, used when all keys are bytestrings
351static int 441static int
352he_cmp_fast (const void *a_, const void *b_) 442he_cmp_fast (const void *a_, const void *b_)
… …
357 HE *b = *(HE **)b_; 447 HE *b = *(HE **)b_;
358 448
359 STRLEN la = HeKLEN (a); 449 STRLEN la = HeKLEN (a);
360 STRLEN lb = HeKLEN (b); 450 STRLEN lb = HeKLEN (b);
361 451
362 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 452 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
363 cmp = la - lb; 453 cmp = lb - la;
364 454
365 return cmp; 455 return cmp;
366} 456}
367 457
368// compare hash entries, used when some keys are sv's or utf-x 458// compare hash entries, used when some keys are sv's or utf-x
369static int 459static int
370he_cmp_slow (const void *a, const void *b) 460he_cmp_slow (const void *a, const void *b)
371{ 461{
372 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 462 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
373} 463}
374 464
375static void 465static void
376encode_hv (enc_t *enc, HV *hv) 466encode_hv (enc_t *enc, HV *hv)
377{ 467{
378 int count, i; 468 HE *he;
379 469
380 if (enc->indent >= enc->maxdepth) 470 if (enc->indent >= enc->json.max_depth)
381 croak ("data structure too deep (hit recursion limit)"); 471 croak (ERR_NESTING_EXCEEDED);
382 472
383 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 473 encode_ch (enc, '{');
384 474
385 if ((count = hv_iterinit (hv)))
386 {
387 // for canonical output we have to sort by keys first 475 // for canonical output we have to sort by keys first
388 // actually, this is mostly due to the stupid so-called 476 // actually, this is mostly due to the stupid so-called
389 // security workaround added somewhere in 5.8.x. 477 // security workaround added somewhere in 5.8.x
390 // that randomises hash orderings 478 // that randomises hash orderings
391 if (enc->json.flags & F_CANONICAL) 479 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
480 {
481 int count = hv_iterinit (hv);
482
483 if (SvMAGICAL (hv))
392 { 484 {
485 // need to count by iterating. could improve by dynamically building the vector below
486 // but I don't care for the speed of this special case.
487 // note also that we will run into undefined behaviour when the two iterations
488 // do not result in the same count, something I might care for in some later release.
489
490 count = 0;
491 while (hv_iternext (hv))
492 ++count;
493
494 hv_iterinit (hv);
495 }
496
497 if (count)
498 {
393 int fast = 1; 499 int i, fast = 1;
394 HE *he;
395#if defined(__BORLANDC__) || defined(_MSC_VER) 500#if defined(__BORLANDC__) || defined(_MSC_VER)
396 HE **hes = _alloca (count * sizeof (HE)); 501 HE **hes = _alloca (count * sizeof (HE));
397#else 502#else
398 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 503 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
399#endif 504#endif
… …
426 531
427 FREETMPS; 532 FREETMPS;
428 LEAVE; 533 LEAVE;
429 } 534 }
430 535
431 for (i = 0; i < count; ++i) 536 encode_nl (enc); ++enc->indent;
537
538 while (count--)
432 { 539 {
433 encode_indent (enc); 540 encode_indent (enc);
541 he = hes [count];
434 encode_he (enc, hes [i]); 542 encode_hk (enc, he);
543 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
435 544
436 if (i < count - 1) 545 if (count)
437 encode_comma (enc); 546 encode_comma (enc);
438 } 547 }
439 548
440 encode_nl (enc); 549 encode_nl (enc); --enc->indent; encode_indent (enc);
441 } 550 }
551 }
442 else 552 else
553 {
554 if (hv_iterinit (hv) || SvMAGICAL (hv))
555 if ((he = hv_iternext (hv)))
443 { 556 {
444 HE *he = hv_iternext (hv); 557 encode_nl (enc); ++enc->indent;
445 558
446 for (;;) 559 for (;;)
447 { 560 {
448 encode_indent (enc); 561 encode_indent (enc);
449 encode_he (enc, he); 562 encode_hk (enc, he);
563 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
450 564
451 if (!(he = hv_iternext (hv))) 565 if (!(he = hv_iternext (hv)))
452 break; 566 break;
453 567
454 encode_comma (enc); 568 encode_comma (enc);
455 } 569 }
456 570
457 encode_nl (enc); 571 encode_nl (enc); --enc->indent; encode_indent (enc);
458 } 572 }
459 } 573 }
460 574
461 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 575 encode_ch (enc, '}');
462} 576}
463 577
464// encode objects, arrays and special \0=false and \1=true values. 578// encode objects, arrays and special \0=false and \1=true values.
465static void 579static void
466encode_rv (enc_t *enc, SV *sv) 580encode_rv (enc_t *enc, SV *sv)
… …
470 SvGETMAGIC (sv); 584 SvGETMAGIC (sv);
471 svt = SvTYPE (sv); 585 svt = SvTYPE (sv);
472 586
473 if (expect_false (SvOBJECT (sv))) 587 if (expect_false (SvOBJECT (sv)))
474 { 588 {
589 HV *stash = !JSON_SLOW || json_boolean_stash
590 ? json_boolean_stash
591 : gv_stashpv ("JSON::XS::Boolean", 1);
592
475 if (SvSTASH (sv) == json_boolean_stash) 593 if (SvSTASH (sv) == stash)
476 { 594 {
477 if (SvIV (sv) == 0) 595 if (SvIV (sv))
596 encode_str (enc, "true", 4, 0);
597 else
478 encode_str (enc, "false", 5, 0); 598 encode_str (enc, "false", 5, 0);
479 else
480 encode_str (enc, "true", 4, 0);
481 } 599 }
482 else 600 else
483 { 601 {
484#if 0 602#if 0
485 if (0 && sv_derived_from (rv, "JSON::Literal")) 603 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
488 } 606 }
489#endif 607#endif
490 if (enc->json.flags & F_CONV_BLESSED) 608 if (enc->json.flags & F_CONV_BLESSED)
491 { 609 {
492 // we re-bless the reference to get overload and other niceties right 610 // we re-bless the reference to get overload and other niceties right
493 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 611 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
494 612
495 if (to_json) 613 if (to_json)
496 { 614 {
615 dSP;
616
497 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 617 ENTER; SAVETMPS; PUSHMARK (SP);
498 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 618 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
499 619
500 // calling with G_SCALAR ensures that we always get a 1 reutrn value 620 // calling with G_SCALAR ensures that we always get a 1 return value
501 // check anyways.
502 PUTBACK; 621 PUTBACK;
503 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 622 call_sv ((SV *)GvCV (to_json), G_SCALAR);
504 SPAGAIN; 623 SPAGAIN;
505 624
625 // catch this surprisingly common error
626 if (SvROK (TOPs) && SvRV (TOPs) == sv)
627 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
628
629 sv = POPs;
630 PUTBACK;
631
506 encode_sv (enc, POPs); 632 encode_sv (enc, sv);
507 633
508 FREETMPS; LEAVE; 634 FREETMPS; LEAVE;
509 } 635 }
510 else if (enc->json.flags & F_ALLOW_BLESSED) 636 else if (enc->json.flags & F_ALLOW_BLESSED)
511 encode_str (enc, "null", 4, 0); 637 encode_str (enc, "null", 4, 0);
… …
524 encode_hv (enc, (HV *)sv); 650 encode_hv (enc, (HV *)sv);
525 else if (svt == SVt_PVAV) 651 else if (svt == SVt_PVAV)
526 encode_av (enc, (AV *)sv); 652 encode_av (enc, (AV *)sv);
527 else if (svt < SVt_PVAV) 653 else if (svt < SVt_PVAV)
528 { 654 {
529 if (SvNIOK (sv) && SvIV (sv) == 0) 655 STRLEN len = 0;
656 char *pv = svt ? SvPV (sv, len) : 0;
657
658 if (len == 1 && *pv == '1')
659 encode_str (enc, "true", 4, 0);
660 else if (len == 1 && *pv == '0')
530 encode_str (enc, "false", 5, 0); 661 encode_str (enc, "false", 5, 0);
531 else if (SvNIOK (sv) && SvIV (sv) == 1) 662 else if (enc->json.flags & F_ALLOW_UNKNOWN)
532 encode_str (enc, "true", 4, 0); 663 encode_str (enc, "null", 4, 0);
533 else 664 else
534 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 665 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
535 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 666 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
536 } 667 }
668 else if (enc->json.flags & F_ALLOW_UNKNOWN)
669 encode_str (enc, "null", 4, 0);
537 else 670 else
538 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 671 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
539 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 672 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
540} 673}
541 674
… …
559 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 692 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
560 enc->cur += strlen (enc->cur); 693 enc->cur += strlen (enc->cur);
561 } 694 }
562 else if (SvIOKp (sv)) 695 else if (SvIOKp (sv))
563 { 696 {
564 // we assume we can always read an IV as a UV 697 // we assume we can always read an IV as a UV and vice versa
565 if (SvUV (sv) & ~(UV)0x7fff) 698 // we assume two's complement
566 { 699 // we assume no aliasing issues in the union
567 // large integer, use the (rather slow) snprintf way. 700 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
568 need (enc, sizeof (UV) * 3); 701 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
569 enc->cur +=
570 SvIsUV(sv)
571 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
572 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
573 }
574 else
575 { 702 {
576 // optimise the "small number case" 703 // optimise the "small number case"
577 // code will likely be branchless and use only a single multiplication 704 // code will likely be branchless and use only a single multiplication
705 // works for numbers up to 59074
578 I32 i = SvIV (sv); 706 I32 i = SvIVX (sv);
579 U32 u; 707 U32 u;
580 char digit, nz = 0; 708 char digit, nz = 0;
581 709
582 need (enc, 6); 710 need (enc, 6);
583 711
… …
589 717
590 // now output digit by digit, each time masking out the integer part 718 // now output digit by digit, each time masking out the integer part
591 // and multiplying by 5 while moving the decimal point one to the right, 719 // and multiplying by 5 while moving the decimal point one to the right,
592 // resulting in a net multiplication by 10. 720 // resulting in a net multiplication by 10.
593 // we always write the digit to memory but conditionally increment 721 // we always write the digit to memory but conditionally increment
594 // the pointer, to ease the usage of conditional move instructions. 722 // the pointer, to enable the use of conditional move instructions.
595 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 723 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
596 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 724 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
597 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 725 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
598 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 726 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
599 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 727 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
600 } 728 }
729 else
730 {
731 // large integer, use the (rather slow) snprintf way.
732 need (enc, IVUV_MAXCHARS);
733 enc->cur +=
734 SvIsUV(sv)
735 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
736 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
737 }
601 } 738 }
602 else if (SvROK (sv)) 739 else if (SvROK (sv))
603 encode_rv (enc, SvRV (sv)); 740 encode_rv (enc, SvRV (sv));
604 else if (!SvOK (sv)) 741 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
605 encode_str (enc, "null", 4, 0); 742 encode_str (enc, "null", 4, 0);
606 else 743 else
607 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 744 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
608 SvPV_nolen (sv), SvFLAGS (sv)); 745 SvPV_nolen (sv), SvFLAGS (sv));
609} 746}
… …
619 enc.json = *json; 756 enc.json = *json;
620 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 757 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
621 enc.cur = SvPVX (enc.sv); 758 enc.cur = SvPVX (enc.sv);
622 enc.end = SvEND (enc.sv); 759 enc.end = SvEND (enc.sv);
623 enc.indent = 0; 760 enc.indent = 0;
624 enc.maxdepth = DEC_DEPTH (enc.json.flags); 761 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
762 : enc.json.flags & F_LATIN1 ? 0x000100UL
763 : 0x110000UL;
625 764
626 SvPOK_only (enc.sv); 765 SvPOK_only (enc.sv);
627 encode_sv (&enc, scalar); 766 encode_sv (&enc, scalar);
767 encode_nl (&enc);
628 768
629 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 769 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
630 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 770 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
631 771
632 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 772 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
650 JSON json; 790 JSON json;
651 U32 depth; // recursion depth 791 U32 depth; // recursion depth
652 U32 maxdepth; // recursion depth limit 792 U32 maxdepth; // recursion depth limit
653} dec_t; 793} dec_t;
654 794
655inline void 795INLINE void
796decode_comment (dec_t *dec)
797{
798 // only '#'-style comments allowed a.t.m.
799
800 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
801 ++dec->cur;
802}
803
804INLINE void
656decode_ws (dec_t *dec) 805decode_ws (dec_t *dec)
657{ 806{
658 for (;;) 807 for (;;)
659 { 808 {
660 char ch = *dec->cur; 809 char ch = *dec->cur;
661 810
662 if (ch > 0x20 811 if (ch > 0x20)
812 {
813 if (expect_false (ch == '#'))
814 {
815 if (dec->json.flags & F_RELAXED)
816 decode_comment (dec);
817 else
818 break;
819 }
820 else
821 break;
822 }
663 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 823 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
664 break; 824 break; // parse error, but let higher level handle it, gives better error messages
665 825
666 ++dec->cur; 826 ++dec->cur;
667 } 827 }
668} 828}
669 829
… …
673 if (*dec->cur != ch) \ 833 if (*dec->cur != ch) \
674 ERR (# ch " expected"); \ 834 ERR (# ch " expected"); \
675 ++dec->cur; \ 835 ++dec->cur; \
676 SE 836 SE
677 837
678#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 838#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
679#define DEC_DEC_DEPTH --dec->depth 839#define DEC_DEC_DEPTH --dec->depth
680 840
681static SV *decode_sv (dec_t *dec); 841static SV *decode_sv (dec_t *dec);
682 842
683static signed char decode_hexdigit[256]; 843static signed char decode_hexdigit[256];
… …
775 935
776 if (hi >= 0x80) 936 if (hi >= 0x80)
777 { 937 {
778 utf8 = 1; 938 utf8 = 1;
779 939
780 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 940 cur = encode_utf8 (cur, hi);
781 } 941 }
782 else 942 else
783 *cur++ = hi; 943 *cur++ = hi;
784 } 944 }
785 break; 945 break;
… …
787 default: 947 default:
788 --dec_cur; 948 --dec_cur;
789 ERR ("illegal backslash escape sequence in string"); 949 ERR ("illegal backslash escape sequence in string");
790 } 950 }
791 } 951 }
792 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 952 else if (expect_true (ch >= 0x20 && ch < 0x80))
793 *cur++ = ch; 953 *cur++ = ch;
794 else if (ch >= 0x80) 954 else if (ch >= 0x80)
795 { 955 {
796 STRLEN clen; 956 STRLEN clen;
797 UV uch;
798 957
799 --dec_cur; 958 --dec_cur;
800 959
801 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 960 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
802 if (clen == (STRLEN)-1) 961 if (clen == (STRLEN)-1)
803 ERR ("malformed UTF-8 character in JSON string"); 962 ERR ("malformed UTF-8 character in JSON string");
804 963
805 do 964 do
806 *cur++ = *dec_cur++; 965 *cur++ = *dec_cur++;
… …
823 { 982 {
824 STRLEN len = cur - buf; 983 STRLEN len = cur - buf;
825 984
826 if (sv) 985 if (sv)
827 { 986 {
828 SvGROW (sv, SvCUR (sv) + len + 1); 987 STRLEN cur = SvCUR (sv);
988
989 if (SvLEN (sv) <= cur + len)
990 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
991
829 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 992 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
830 SvCUR_set (sv, SvCUR (sv) + len); 993 SvCUR_set (sv, SvCUR (sv) + len);
831 } 994 }
832 else 995 else
833 sv = newSVpvn (buf, len); 996 sv = newSVpvn (buf, len);
… …
918 is_nv = 1; 1081 is_nv = 1;
919 } 1082 }
920 1083
921 if (!is_nv) 1084 if (!is_nv)
922 { 1085 {
1086 int len = dec->cur - start;
1087
923 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1088 // special case the rather common 1..5-digit-int case
924 if (*start == '-') 1089 if (*start == '-')
925 switch (dec->cur - start) 1090 switch (len)
926 { 1091 {
927 case 2: return newSViv (-( start [1] - '0' * 1)); 1092 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
928 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1093 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
929 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1094 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
930 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1095 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1096 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
931 } 1097 }
932 else 1098 else
933 switch (dec->cur - start) 1099 switch (len)
934 { 1100 {
935 case 1: return newSViv ( start [0] - '0' * 1); 1101 case 1: return newSViv ( start [0] - '0' * 1);
936 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1102 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
937 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1103 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
938 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1104 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1105 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
939 } 1106 }
940 1107
941 { 1108 {
942 UV uv; 1109 UV uv;
943 int numtype = grok_number (start, dec->cur - start, &uv); 1110 int numtype = grok_number (start, len, &uv);
944 if (numtype & IS_NUMBER_IN_UV) 1111 if (numtype & IS_NUMBER_IN_UV)
945 if (numtype & IS_NUMBER_NEG) 1112 if (numtype & IS_NUMBER_NEG)
946 { 1113 {
947 if (uv < (UV)IV_MIN) 1114 if (uv < (UV)IV_MIN)
948 return newSViv (-(IV)uv); 1115 return newSViv (-(IV)uv);
949 } 1116 }
950 else 1117 else
951 return newSVuv (uv); 1118 return newSVuv (uv);
952
953 // here would likely be the place for bigint support
954 } 1119 }
955 }
956 1120
957 // if we ever support bigint or bigfloat, this is the place for bigfloat 1121 len -= *start == '-' ? 1 : 0;
1122
1123 // does not fit into IV or UV, try NV
1124 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
1125 #if defined (LDBL_DIG)
1126 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
1127 #endif
1128 )
1129 // fits into NV without loss of precision
1130 return newSVnv (Atof (start));
1131
1132 // everything else fails, convert it to a string
1133 return newSVpvn (start, dec->cur - start);
1134 }
1135
1136 // loss of precision here
958 return newSVnv (Atof (start)); 1137 return newSVnv (Atof (start));
959 1138
960fail: 1139fail:
961 return 0; 1140 return 0;
962} 1141}
… …
992 1171
993 if (*dec->cur != ',') 1172 if (*dec->cur != ',')
994 ERR (", or ] expected while parsing array"); 1173 ERR (", or ] expected while parsing array");
995 1174
996 ++dec->cur; 1175 ++dec->cur;
1176
1177 decode_ws (dec);
1178
1179 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1180 {
1181 ++dec->cur;
1182 break;
1183 }
997 } 1184 }
998 1185
999 DEC_DEC_DEPTH; 1186 DEC_DEC_DEPTH;
1000 return newRV_noinc ((SV *)av); 1187 return newRV_noinc ((SV *)av);
1001 1188
… …
1017 if (*dec->cur == '}') 1204 if (*dec->cur == '}')
1018 ++dec->cur; 1205 ++dec->cur;
1019 else 1206 else
1020 for (;;) 1207 for (;;)
1021 { 1208 {
1022 decode_ws (dec); EXPECT_CH ('"'); 1209 EXPECT_CH ('"');
1023 1210
1024 // heuristic: assume that 1211 // heuristic: assume that
1025 // a) decode_str + hv_store_ent are abysmally slow. 1212 // a) decode_str + hv_store_ent are abysmally slow.
1026 // b) most hash keys are short, simple ascii text. 1213 // b) most hash keys are short, simple ascii text.
1027 // => try to "fast-match" such strings to avoid 1214 // => try to "fast-match" such strings to avoid
… …
1031 char *p = dec->cur; 1218 char *p = dec->cur;
1032 char *e = p + 24; // only try up to 24 bytes 1219 char *e = p + 24; // only try up to 24 bytes
1033 1220
1034 for (;;) 1221 for (;;)
1035 { 1222 {
1036 // the >= 0x80 is true on most architectures 1223 // the >= 0x80 is false on most architectures
1037 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1224 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1038 { 1225 {
1039 // slow path, back up and use decode_str 1226 // slow path, back up and use decode_str
1040 SV *key = decode_str (dec); 1227 SV *key = decode_str (dec);
1041 if (!key) 1228 if (!key)
1042 goto fail; 1229 goto fail;
1043 1230
1044 decode_ws (dec); EXPECT_CH (':'); 1231 decode_ws (dec); EXPECT_CH (':');
1045 1232
1233 decode_ws (dec);
1046 value = decode_sv (dec); 1234 value = decode_sv (dec);
1047 if (!value) 1235 if (!value)
1048 { 1236 {
1049 SvREFCNT_dec (key); 1237 SvREFCNT_dec (key);
1050 goto fail; 1238 goto fail;
… …
1062 int len = p - key; 1250 int len = p - key;
1063 dec->cur = p + 1; 1251 dec->cur = p + 1;
1064 1252
1065 decode_ws (dec); EXPECT_CH (':'); 1253 decode_ws (dec); EXPECT_CH (':');
1066 1254
1255 decode_ws (dec);
1067 value = decode_sv (dec); 1256 value = decode_sv (dec);
1068 if (!value) 1257 if (!value)
1069 goto fail; 1258 goto fail;
1070 1259
1071 hv_store (hv, key, len, value, 0); 1260 hv_store (hv, key, len, value, 0);
… …
1087 1276
1088 if (*dec->cur != ',') 1277 if (*dec->cur != ',')
1089 ERR (", or } expected while parsing object/hash"); 1278 ERR (", or } expected while parsing object/hash");
1090 1279
1091 ++dec->cur; 1280 ++dec->cur;
1281
1282 decode_ws (dec);
1283
1284 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1285 {
1286 ++dec->cur;
1287 break;
1288 }
1092 } 1289 }
1093 1290
1094 DEC_DEC_DEPTH; 1291 DEC_DEC_DEPTH;
1095 sv = newRV_noinc ((SV *)hv); 1292 sv = newRV_noinc ((SV *)hv);
1096 1293
1097 // check filter callbacks 1294 // check filter callbacks
1098 if (dec->json.flags & F_HOOK) 1295 if (dec->json.flags & F_HOOK)
1099 { 1296 {
1100 ENTER; SAVETMPS; 1297 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1101
1102 if (HvKEYS (hv) == 1 && dec->json.cb_sk_object)
1103 { 1298 {
1299 HE *cb, *he;
1300
1301 hv_iterinit (hv);
1302 he = hv_iternext (hv);
1303 hv_iterinit (hv);
1304
1305 // the next line creates a mortal sv each time its called.
1306 // might want to optimise this for common cases.
1307 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1308
1309 if (cb)
1310 {
1311 dSP;
1104 int count; 1312 int count;
1105 1313
1106 dSP; PUSHMARK (SP); 1314 ENTER; SAVETMPS; PUSHMARK (SP);
1107 XPUSHs (sv_2mortal (sv)); 1315 XPUSHs (HeVAL (he));
1108 1316
1109 PUTBACK; count = call_sv (dec->json.cb_sk_object, G_ARRAY); SPAGAIN; 1317 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1110 1318
1111 if (count == 1) 1319 if (count == 1)
1320 {
1112 sv = newSVsv (POPs); 1321 sv = newSVsv (POPs);
1113 else 1322 FREETMPS; LEAVE;
1114 SvREFCNT_inc (sv); 1323 return sv;
1324 }
1325
1326 FREETMPS; LEAVE;
1327 }
1115 } 1328 }
1116 1329
1117 if (dec->json.cb_object) 1330 if (dec->json.cb_object)
1118 { 1331 {
1332 dSP;
1119 int count; 1333 int count;
1120 1334
1121 dSP; ENTER; SAVETMPS; PUSHMARK (SP); 1335 ENTER; SAVETMPS; PUSHMARK (SP);
1122 XPUSHs (sv_2mortal (sv)); 1336 XPUSHs (sv_2mortal (sv));
1123 1337
1124 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN; 1338 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1125 1339
1126 if (count == 1) 1340 if (count == 1)
1341 {
1127 sv = newSVsv (POPs); 1342 sv = newSVsv (POPs);
1128 else 1343 FREETMPS; LEAVE;
1344 return sv;
1345 }
1346
1129 SvREFCNT_inc (sv); 1347 SvREFCNT_inc (sv);
1348 FREETMPS; LEAVE;
1130 } 1349 }
1131
1132 FREETMPS; LEAVE;
1133 } 1350 }
1134 1351
1135 return newRV_noinc ((SV *)hv); 1352 return sv;
1136 1353
1137fail: 1354fail:
1138 SvREFCNT_dec (hv); 1355 SvREFCNT_dec (hv);
1139 DEC_DEC_DEPTH; 1356 DEC_DEC_DEPTH;
1140 return 0; 1357 return 0;
1141} 1358}
1142 1359
1143static SV * 1360static SV *
1144decode_sv (dec_t *dec) 1361decode_sv (dec_t *dec)
1145{ 1362{
1146 decode_ws (dec);
1147
1148 // the beauty of JSON: you need exactly one character lookahead 1363 // the beauty of JSON: you need exactly one character lookahead
1149 // to parse anything. 1364 // to parse everything.
1150 switch (*dec->cur) 1365 switch (*dec->cur)
1151 { 1366 {
1152 case '"': ++dec->cur; return decode_str (dec); 1367 case '"': ++dec->cur; return decode_str (dec);
1153 case '[': ++dec->cur; return decode_av (dec); 1368 case '[': ++dec->cur; return decode_av (dec);
1154 case '{': ++dec->cur; return decode_hv (dec); 1369 case '{': ++dec->cur; return decode_hv (dec);
1155 1370
1156 case '-': 1371 case '-':
1157 case '0': case '1': case '2': case '3': case '4': 1372 case '0': case '1': case '2': case '3': case '4':
1158 case '5': case '6': case '7': case '8': case '9': 1373 case '5': case '6': case '7': case '8': case '9':
1159 return decode_num (dec); 1374 return decode_num (dec);
1160 1375
1161 case 't': 1376 case 't':
1162 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1377 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1163 { 1378 {
1164 dec->cur += 4; 1379 dec->cur += 4;
1380#if JSON_SLOW
1381 json_true = get_bool ("JSON::XS::true");
1382#endif
1165 return SvREFCNT_inc (json_true); 1383 return newSVsv (json_true);
1166 } 1384 }
1167 else 1385 else
1168 ERR ("'true' expected"); 1386 ERR ("'true' expected");
1169 1387
1170 break; 1388 break;
1171 1389
1172 case 'f': 1390 case 'f':
1173 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1391 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1174 { 1392 {
1175 dec->cur += 5; 1393 dec->cur += 5;
1394#if JSON_SLOW
1395 json_false = get_bool ("JSON::XS::false");
1396#endif
1176 return SvREFCNT_inc (json_false); 1397 return newSVsv (json_false);
1177 } 1398 }
1178 else 1399 else
1179 ERR ("'false' expected"); 1400 ERR ("'false' expected");
1180 1401
1181 break; 1402 break;
… …
1199fail: 1420fail:
1200 return 0; 1421 return 0;
1201} 1422}
1202 1423
1203static SV * 1424static SV *
1204decode_json (SV *string, JSON *json, UV *offset_return) 1425decode_json (SV *string, JSON *json, char **offset_return)
1205{ 1426{
1206 dec_t dec; 1427 dec_t dec;
1207 UV offset;
1208 SV *sv; 1428 SV *sv;
1209 1429
1430 /* work around bugs in 5.10 where manipulating magic values
1431 * will perl ignore the magic in subsequent accesses
1432 */
1210 SvGETMAGIC (string); 1433 /*SvGETMAGIC (string);*/
1434 if (SvMAGICAL (string))
1435 string = sv_2mortal (newSVsv (string));
1436
1211 SvUPGRADE (string, SVt_PV); 1437 SvUPGRADE (string, SVt_PV);
1212 1438
1213 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1439 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1440 * assertion with -DDEBUGGING, although SvCUR is documented to
1441 * return the xpv_cur field which certainly exists after upgrading.
1442 * according to nicholas clark, calling SvPOK fixes this.
1443 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1444 * and hope for the best.
1445 * Damnit, SvPV_nolen still trips over yet another assertion. This
1446 * assertion business is seriously broken, try yet another workaround
1447 * for the broken -DDEBUGGING.
1448 */
1449 {
1450#ifdef DEBUGGING
1451 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1452#else
1453 STRLEN offset = SvCUR (string);
1454#endif
1455
1456 if (offset > json->max_size && json->max_size)
1214 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1457 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1215 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1458 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1459 }
1216 1460
1217 if (json->flags & F_UTF8) 1461 if (json->flags & F_UTF8)
1218 sv_utf8_downgrade (string, 0); 1462 sv_utf8_downgrade (string, 0);
1219 else 1463 else
1220 sv_utf8_upgrade (string); 1464 sv_utf8_upgrade (string);
1221 1465
1222 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1466 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1223 1467
1224 dec.json = *json; 1468 dec.json = *json;
1225 dec.cur = SvPVX (string); 1469 dec.cur = SvPVX (string);
1226 dec.end = SvEND (string); 1470 dec.end = SvEND (string);
1227 dec.err = 0; 1471 dec.err = 0;
1228 dec.depth = 0; 1472 dec.depth = 0;
1229 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1230 1473
1231 if (dec.json.cb_object || dec.json.cb_sk_object) 1474 if (dec.json.cb_object || dec.json.cb_sk_object)
1232 dec.json.flags |= F_HOOK; 1475 dec.json.flags |= F_HOOK;
1233 1476
1234 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1477 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1478
1479 decode_ws (&dec);
1235 sv = decode_sv (&dec); 1480 sv = decode_sv (&dec);
1481
1482 if (offset_return)
1483 *offset_return = dec.cur;
1236 1484
1237 if (!(offset_return || !sv)) 1485 if (!(offset_return || !sv))
1238 { 1486 {
1239 // check for trailing garbage 1487 // check for trailing garbage
1240 decode_ws (&dec); 1488 decode_ws (&dec);
… …
1243 { 1491 {
1244 dec.err = "garbage after JSON object"; 1492 dec.err = "garbage after JSON object";
1245 SvREFCNT_dec (sv); 1493 SvREFCNT_dec (sv);
1246 sv = 0; 1494 sv = 0;
1247 } 1495 }
1248 }
1249
1250 if (offset_return || !sv)
1251 {
1252 offset = dec.json.flags & F_UTF8
1253 ? dec.cur - SvPVX (string)
1254 : utf8_distance (dec.cur, SvPVX (string));
1255
1256 if (offset_return)
1257 *offset_return = offset;
1258 } 1496 }
1259 1497
1260 if (!sv) 1498 if (!sv)
1261 { 1499 {
1262 SV *uni = sv_newmortal (); 1500 SV *uni = sv_newmortal ();
… …
1268 SAVEVPTR (PL_curcop); 1506 SAVEVPTR (PL_curcop);
1269 PL_curcop = &cop; 1507 PL_curcop = &cop;
1270 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1508 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1271 LEAVE; 1509 LEAVE;
1272 1510
1273 croak ("%s, at character offset %d [\"%s\"]", 1511 croak ("%s, at character offset %d (before \"%s\")",
1274 dec.err, 1512 dec.err,
1275 (int)offset, 1513 ptr_to_index (string, dec.cur),
1276 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1514 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1277 } 1515 }
1278 1516
1279 sv = sv_2mortal (sv); 1517 sv = sv_2mortal (sv);
1280 1518
1281 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1519 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1282 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1520 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1283 1521
1284 return sv; 1522 return sv;
1523}
1524
1525/////////////////////////////////////////////////////////////////////////////
1526// incremental parser
1527
1528static void
1529incr_parse (JSON *self)
1530{
1531 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1532
1533 // the state machine here is a bit convoluted and could be simplified a lot
1534 // but this would make it slower, so...
1535
1536 for (;;)
1537 {
1538 //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
1539 switch (self->incr_mode)
1540 {
1541 // only used for initial whitespace skipping
1542 case INCR_M_WS:
1543 for (;;)
1544 {
1545 if (*p > 0x20)
1546 {
1547 if (*p == '#')
1548 {
1549 self->incr_mode = INCR_M_C0;
1550 goto incr_m_c;
1551 }
1552 else
1553 {
1554 self->incr_mode = INCR_M_JSON;
1555 goto incr_m_json;
1556 }
1557 }
1558 else if (!*p)
1559 goto interrupt;
1560
1561 ++p;
1562 }
1563
1564 // skip a single char inside a string (for \\-processing)
1565 case INCR_M_BS:
1566 if (!*p)
1567 goto interrupt;
1568
1569 ++p;
1570 self->incr_mode = INCR_M_STR;
1571 goto incr_m_str;
1572
1573 // inside #-style comments
1574 case INCR_M_C0:
1575 case INCR_M_C1:
1576 incr_m_c:
1577 for (;;)
1578 {
1579 if (*p == '\n')
1580 {
1581 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1582 break;
1583 }
1584 else if (!*p)
1585 goto interrupt;
1586
1587 ++p;
1588 }
1589
1590 break;
1591
1592 // inside a string
1593 case INCR_M_STR:
1594 incr_m_str:
1595 for (;;)
1596 {
1597 if (*p == '"')
1598 {
1599 ++p;
1600 self->incr_mode = INCR_M_JSON;
1601
1602 if (!self->incr_nest)
1603 goto interrupt;
1604
1605 goto incr_m_json;
1606 }
1607 else if (*p == '\\')
1608 {
1609 ++p; // "virtually" consumes character after \
1610
1611 if (!*p) // if at end of string we have to switch modes
1612 {
1613 self->incr_mode = INCR_M_BS;
1614 goto interrupt;
1615 }
1616 }
1617 else if (!*p)
1618 goto interrupt;
1619
1620 ++p;
1621 }
1622
1623 // after initial ws, outside string
1624 case INCR_M_JSON:
1625 incr_m_json:
1626 for (;;)
1627 {
1628 switch (*p++)
1629 {
1630 case 0:
1631 --p;
1632 goto interrupt;
1633
1634 case 0x09:
1635 case 0x0a:
1636 case 0x0d:
1637 case 0x20:
1638 if (!self->incr_nest)
1639 {
1640 --p; // do not eat the whitespace, let the next round do it
1641 goto interrupt;
1642 }
1643 break;
1644
1645 case '"':
1646 self->incr_mode = INCR_M_STR;
1647 goto incr_m_str;
1648
1649 case '[':
1650 case '{':
1651 if (++self->incr_nest > self->max_depth)
1652 croak (ERR_NESTING_EXCEEDED);
1653 break;
1654
1655 case ']':
1656 case '}':
1657 if (--self->incr_nest <= 0)
1658 goto interrupt;
1659 break;
1660
1661 case '#':
1662 self->incr_mode = INCR_M_C1;
1663 goto incr_m_c;
1664 }
1665 }
1666 }
1667
1668 modechange:
1669 ;
1670 }
1671
1672interrupt:
1673 self->incr_pos = p - SvPVX (self->incr_text);
1674 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1675 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1285} 1676}
1286 1677
1287///////////////////////////////////////////////////////////////////////////// 1678/////////////////////////////////////////////////////////////////////////////
1288// XS interface functions 1679// XS interface functions
1289 1680
… …
1301 : -1; 1692 : -1;
1302 1693
1303 json_stash = gv_stashpv ("JSON::XS" , 1); 1694 json_stash = gv_stashpv ("JSON::XS" , 1);
1304 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1695 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1305 1696
1306 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1697 json_true = get_bool ("JSON::XS::true");
1307 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1698 json_false = get_bool ("JSON::XS::false");
1699
1700 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1308} 1701}
1309 1702
1310PROTOTYPES: DISABLE 1703PROTOTYPES: DISABLE
1704
1705void CLONE (...)
1706 CODE:
1707 json_stash = 0;
1708 json_boolean_stash = 0;
1311 1709
1312void new (char *klass) 1710void new (char *klass)
1313 PPCODE: 1711 PPCODE:
1314{ 1712{
1315 SV *pv = NEWSV (0, sizeof (JSON)); 1713 SV *pv = NEWSV (0, sizeof (JSON));
1316 SvPOK_only (pv); 1714 SvPOK_only (pv);
1317 Zero (SvPVX (pv), 1, JSON); 1715 json_init ((JSON *)SvPVX (pv));
1318 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1716 XPUSHs (sv_2mortal (sv_bless (
1319 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1717 newRV_noinc (pv),
1718 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1719 )));
1320} 1720}
1321 1721
1322void ascii (JSON *self, int enable = 1) 1722void ascii (JSON *self, int enable = 1)
1323 ALIAS: 1723 ALIAS:
1324 ascii = F_ASCII 1724 ascii = F_ASCII
… …
1331 pretty = F_PRETTY 1731 pretty = F_PRETTY
1332 allow_nonref = F_ALLOW_NONREF 1732 allow_nonref = F_ALLOW_NONREF
1333 shrink = F_SHRINK 1733 shrink = F_SHRINK
1334 allow_blessed = F_ALLOW_BLESSED 1734 allow_blessed = F_ALLOW_BLESSED
1335 convert_blessed = F_CONV_BLESSED 1735 convert_blessed = F_CONV_BLESSED
1736 relaxed = F_RELAXED
1737 allow_unknown = F_ALLOW_UNKNOWN
1336 PPCODE: 1738 PPCODE:
1337{ 1739{
1338 if (enable) 1740 if (enable)
1339 self->flags |= ix; 1741 self->flags |= ix;
1340 else 1742 else
1341 self->flags &= ~ix; 1743 self->flags &= ~ix;
1342 1744
1343 XPUSHs (ST (0)); 1745 XPUSHs (ST (0));
1344} 1746}
1345 1747
1346void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1748void get_ascii (JSON *self)
1749 ALIAS:
1750 get_ascii = F_ASCII
1751 get_latin1 = F_LATIN1
1752 get_utf8 = F_UTF8
1753 get_indent = F_INDENT
1754 get_canonical = F_CANONICAL
1755 get_space_before = F_SPACE_BEFORE
1756 get_space_after = F_SPACE_AFTER
1757 get_allow_nonref = F_ALLOW_NONREF
1758 get_shrink = F_SHRINK
1759 get_allow_blessed = F_ALLOW_BLESSED
1760 get_convert_blessed = F_CONV_BLESSED
1761 get_relaxed = F_RELAXED
1762 get_allow_unknown = F_ALLOW_UNKNOWN
1347 PPCODE: 1763 PPCODE:
1348{ 1764 XPUSHs (boolSV (self->flags & ix));
1349 UV log2 = 0;
1350 1765
1351 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1766void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1352 1767 PPCODE:
1353 while ((1UL << log2) < max_depth) 1768 self->max_depth = max_depth;
1354 ++log2;
1355
1356 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1357
1358 XPUSHs (ST (0)); 1769 XPUSHs (ST (0));
1359}
1360 1770
1771U32 get_max_depth (JSON *self)
1772 CODE:
1773 RETVAL = self->max_depth;
1774 OUTPUT:
1775 RETVAL
1776
1361void max_size (JSON *self, UV max_size = 0) 1777void max_size (JSON *self, U32 max_size = 0)
1362 PPCODE: 1778 PPCODE:
1363{ 1779 self->max_size = max_size;
1364 UV log2 = 0;
1365
1366 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1367 if (max_size == 1) max_size = 2;
1368
1369 while ((1UL << log2) < max_size)
1370 ++log2;
1371
1372 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1373
1374 XPUSHs (ST (0)); 1780 XPUSHs (ST (0));
1375}
1376 1781
1782int get_max_size (JSON *self)
1783 CODE:
1784 RETVAL = self->max_size;
1785 OUTPUT:
1786 RETVAL
1787
1377void filter_json_objects (JSON *self, SV *cb = &PL_sv_undef) 1788void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1378 ALIAS:
1379 filter_sk_json_objects = 1
1380 PPCODE: 1789 PPCODE:
1381{ 1790{
1791 SvREFCNT_dec (self->cb_object);
1792 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1793
1794 XPUSHs (ST (0));
1795}
1796
1797void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1798 PPCODE:
1799{
1800 if (!self->cb_sk_object)
1801 self->cb_sk_object = newHV ();
1802
1382 if (!SvOK (cb)) 1803 if (SvOK (cb))
1383 cb = 0; 1804 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1384 1805 else
1385 switch (ix)
1386 { 1806 {
1387 case 0: self->cb_object = cb; break; 1807 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1808
1809 if (!HvKEYS (self->cb_sk_object))
1810 {
1811 SvREFCNT_dec (self->cb_sk_object);
1388 case 1: self->cb_sk_object = cb; break; 1812 self->cb_sk_object = 0;
1813 }
1389 } 1814 }
1390 1815
1391 XPUSHs (ST (0)); 1816 XPUSHs (ST (0));
1392} 1817}
1393 1818
… …
1400 XPUSHs (decode_json (jsonstr, self, 0)); 1825 XPUSHs (decode_json (jsonstr, self, 0));
1401 1826
1402void decode_prefix (JSON *self, SV *jsonstr) 1827void decode_prefix (JSON *self, SV *jsonstr)
1403 PPCODE: 1828 PPCODE:
1404{ 1829{
1405 UV offset; 1830 char *offset;
1406 EXTEND (SP, 2); 1831 EXTEND (SP, 2);
1407 PUSHs (decode_json (jsonstr, self, &offset)); 1832 PUSHs (decode_json (jsonstr, self, &offset));
1408 PUSHs (sv_2mortal (newSVuv (offset))); 1833 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1409} 1834}
1835
1836void incr_parse (JSON *self, SV *jsonstr = 0)
1837 PPCODE:
1838{
1839 if (!self->incr_text)
1840 self->incr_text = newSVpvn ("", 0);
1841
1842 // append data, if any
1843 if (jsonstr)
1844 {
1845 if (SvUTF8 (jsonstr))
1846 {
1847 if (!SvUTF8 (self->incr_text))
1848 {
1849 /* utf-8-ness differs, need to upgrade */
1850 sv_utf8_upgrade (self->incr_text);
1851
1852 if (self->incr_pos)
1853 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1854 - (U8 *)SvPVX (self->incr_text);
1855 }
1856 }
1857 else if (SvUTF8 (self->incr_text))
1858 sv_utf8_upgrade (jsonstr);
1859
1860 {
1861 STRLEN len;
1862 const char *str = SvPV (jsonstr, len);
1863 STRLEN cur = SvCUR (self->incr_text);
1864
1865 if (SvLEN (self->incr_text) <= cur + len)
1866 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1867
1868 Move (str, SvEND (self->incr_text), len, char);
1869 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1870 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1871 }
1872 }
1873
1874 if (GIMME_V != G_VOID)
1875 do
1876 {
1877 char *offset;
1878
1879 if (!INCR_DONE (self))
1880 {
1881 incr_parse (self);
1882
1883 if (self->incr_pos > self->max_size && self->max_size)
1884 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1885 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1886
1887 if (!INCR_DONE (self))
1888 break;
1889 }
1890
1891 XPUSHs (decode_json (self->incr_text, self, &offset));
1892
1893 self->incr_pos -= offset - SvPVX (self->incr_text);
1894 self->incr_nest = 0;
1895 self->incr_mode = 0;
1896
1897 sv_chop (self->incr_text, offset);
1898 }
1899 while (GIMME_V == G_ARRAY);
1900}
1901
1902SV *incr_text (JSON *self)
1903 ATTRS: lvalue
1904 CODE:
1905{
1906 if (self->incr_pos)
1907 croak ("incr_text can not be called when the incremental parser already started parsing");
1908
1909 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1910}
1911 OUTPUT:
1912 RETVAL
1913
1914void incr_skip (JSON *self)
1915 CODE:
1916{
1917 if (self->incr_pos)
1918 {
1919 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
1920 self->incr_pos = 0;
1921 self->incr_nest = 0;
1922 self->incr_mode = 0;
1923 }
1924}
1925
1926void incr_reset (JSON *self)
1927 CODE:
1928{
1929 SvREFCNT_dec (self->incr_text);
1930 self->incr_text = 0;
1931 self->incr_pos = 0;
1932 self->incr_nest = 0;
1933 self->incr_mode = 0;
1934}
1935
1936void DESTROY (JSON *self)
1937 CODE:
1938 SvREFCNT_dec (self->cb_sk_object);
1939 SvREFCNT_dec (self->cb_object);
1940 SvREFCNT_dec (self->incr_text);
1410 1941
1411PROTOTYPES: ENABLE 1942PROTOTYPES: ENABLE
1412 1943
1413void to_json (SV *scalar) 1944void encode_json (SV *scalar)
1945 ALIAS:
1946 to_json_ = 0
1947 encode_json = F_UTF8
1414 PPCODE: 1948 PPCODE:
1415{ 1949{
1416 JSON json = { F_DEFAULT | F_UTF8 }; 1950 JSON json;
1951 json_init (&json);
1952 json.flags |= ix;
1417 XPUSHs (encode_json (scalar, &json)); 1953 XPUSHs (encode_json (scalar, &json));
1418} 1954}
1419 1955
1420void from_json (SV *jsonstr) 1956void decode_json (SV *jsonstr)
1957 ALIAS:
1958 from_json_ = 0
1959 decode_json = F_UTF8
1421 PPCODE: 1960 PPCODE:
1422{ 1961{
1423 JSON json = { F_DEFAULT | F_UTF8 }; 1962 JSON json;
1963 json_init (&json);
1964 json.flags |= ix;
1424 XPUSHs (decode_json (jsonstr, &json, 0)); 1965 XPUSHs (decode_json (jsonstr, &json, 0));
1425} 1966}
1426 1967
1968

Diff Legend

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