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.56 by root, Thu Jul 26 11:33:35 2007 UTC vs.
Revision 1.107 by root, Wed Mar 17 01:45:43 2010 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// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
20 24
21#define F_ASCII 0x00000001UL 25#define F_ASCII 0x00000001UL
22#define F_LATIN1 0x00000002UL 26#define F_LATIN1 0x00000002UL
23#define F_UTF8 0x00000004UL 27#define F_UTF8 0x00000004UL
24#define F_INDENT 0x00000008UL 28#define F_INDENT 0x00000008UL
… …
27#define F_SPACE_AFTER 0x00000040UL 31#define F_SPACE_AFTER 0x00000040UL
28#define F_ALLOW_NONREF 0x00000100UL 32#define F_ALLOW_NONREF 0x00000100UL
29#define F_SHRINK 0x00000200UL 33#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL 34#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL 35#define F_CONV_BLESSED 0x00000800UL
32#define F_MAXDEPTH 0xf8000000UL
33#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL 36#define F_RELAXED 0x00001000UL
35#define S_MAXSIZE 20 37#define F_ALLOW_UNKNOWN 0x00002000UL
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
37 39
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 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
42#define F_DEFAULT (9UL << S_MAXDEPTH)
43 41
44#define INIT_SIZE 32 // initial scalar size to be allocated 42#define INIT_SIZE 32 // initial scalar size to be allocated
45#define INDENT_STEP 3 // spaces per indentation level 43#define INDENT_STEP 3 // spaces per indentation level
46 44
47#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
48 46
49#define SB do { 47#define SB do {
50#define SE } while (0) 48#define SE } while (0)
51 49
52#if __GNUC__ >= 3 50#if __GNUC__ >= 3
53# define expect(expr,value) __builtin_expect ((expr),(value)) 51# define expect(expr,value) __builtin_expect ((expr), (value))
54# define inline inline 52# define INLINE static inline
55#else 53#else
56# define expect(expr,value) (expr) 54# define expect(expr,value) (expr)
57# define inline static 55# define INLINE static
58#endif 56#endif
59 57
60#define expect_false(expr) expect ((expr) != 0, 0) 58#define expect_false(expr) expect ((expr) != 0, 0)
61#define expect_true(expr) expect ((expr) != 0, 1) 59#define expect_true(expr) expect ((expr) != 0, 1)
62 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
63static HV *json_stash, *json_boolean_stash; // JSON::XS:: 75static HV *json_stash, *json_boolean_stash; // JSON::XS::
64static SV *json_true, *json_false; 76static SV *json_true, *json_false;
65 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
66typedef struct { 89typedef struct {
67 U32 flags; 90 U32 flags;
91 U32 max_depth;
92 STRLEN max_size;
93
68 SV *cb_object; 94 SV *cb_object;
69 HV *cb_sk_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;
70} JSON; 102} JSON;
103
104INLINE void
105json_init (JSON *json)
106{
107 Zero (json, 1, JSON);
108 json->max_depth = 512;
109}
71 110
72///////////////////////////////////////////////////////////////////////////// 111/////////////////////////////////////////////////////////////////////////////
73// utility functions 112// utility functions
74 113
75inline 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
76shrink (SV *sv) 126shrink (SV *sv)
77{ 127{
78 sv_utf8_downgrade (sv, 1); 128 sv_utf8_downgrade (sv, 1);
129
79 if (SvLEN (sv) > SvCUR (sv) + 1) 130 if (SvLEN (sv) > SvCUR (sv) + 1)
80 { 131 {
81#ifdef SvPV_shrink_to_cur 132#ifdef SvPV_shrink_to_cur
82 SvPV_shrink_to_cur (sv); 133 SvPV_shrink_to_cur (sv);
83#elif defined (SvPV_renew) 134#elif defined (SvPV_renew)
… …
89// 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
90// case of an error. 141// case of an error.
91// we special-case "safe" characters from U+80 .. U+7FF, 142// we special-case "safe" characters from U+80 .. U+7FF,
92// but use the very good perl function to parse anything else. 143// but use the very good perl function to parse anything else.
93// note that we never call this function for a ascii codepoints 144// note that we never call this function for a ascii codepoints
94inline UV 145INLINE UV
95decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 146decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
96{ 147{
97 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 148 if (expect_true (len >= 2
98 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 149 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
99 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 150 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
100 { 151 {
101 *clen = 2; 152 *clen = 2;
102 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 153 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
103 } 154 }
104 else 155 else
105 { 156 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
106 *clen = (STRLEN)-1; 157}
107 return (UV)-1; 158
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);
190}
191
192/////////////////////////////////////////////////////////////////////////////
193// fp hell
194
195// scan a group of digits, and a trailing exponent
196static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{
199 UV uaccum = 0;
200 int eaccum = 0;
201
202 // if we recurse too deep, skip all remaining digits
203 // to avoid a stack overflow attack
204 if (expect_false (--maxdepth <= 0))
205 while (((U8)*s - '0') < 10)
206 ++s;
207
208 for (;;)
108 } 209 {
109} 210 U8 dig = (U8)*s - '0';
110 211
212 if (expect_false (dig >= 10))
213 {
214 if (dig == (U8)((U8)'.' - (U8)'0'))
215 {
216 ++s;
217 json_atof_scan1 (s, accum, expo, 1, maxdepth);
218 }
219 else if ((dig | ' ') == 'e' - '0')
220 {
221 int exp2 = 0;
222 int neg = 0;
223
224 ++s;
225
226 if (*s == '-')
227 {
228 ++s;
229 neg = 1;
230 }
231 else if (*s == '+')
232 ++s;
233
234 while ((dig = (U8)*s - '0') < 10)
235 exp2 = exp2 * 10 + *s++ - '0';
236
237 *expo += neg ? -exp2 : exp2;
238 }
239
240 break;
241 }
242
243 ++s;
244
245 uaccum = uaccum * 10 + dig;
246 ++eaccum;
247
248 // if we have too many digits, then recurse for more
249 // we actually do this for rather few digits
250 if (uaccum >= (UV_MAX - 9) / 10)
251 {
252 if (postdp) *expo -= eaccum;
253 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
254 if (postdp) *expo += eaccum;
255
256 break;
257 }
258 }
259
260 // this relies greatly on the quality of the pow ()
261 // implementation of the platform, but a good
262 // implementation is hard to beat.
263 if (postdp) *expo -= eaccum;
264 *accum += uaccum * Perl_pow (10., *expo);
265 *expo += eaccum;
266}
267
268static NV
269json_atof (const char *s)
270{
271 NV accum = 0.;
272 int expo = 0;
273 int neg = 0;
274
275 if (*s == '-')
276 {
277 ++s;
278 neg = 1;
279 }
280
281 // a recursion depth of ten gives us >>500 bits
282 json_atof_scan1 (s, &accum, &expo, 0, 10);
283
284 return neg ? -accum : accum;
285}
111///////////////////////////////////////////////////////////////////////////// 286/////////////////////////////////////////////////////////////////////////////
112// encoder 287// encoder
113 288
114// structure used for encoding JSON 289// structure used for encoding JSON
115typedef struct 290typedef struct
… …
117 char *cur; // SvPVX (sv) + current output position 292 char *cur; // SvPVX (sv) + current output position
118 char *end; // SvEND (sv) 293 char *end; // SvEND (sv)
119 SV *sv; // result scalar 294 SV *sv; // result scalar
120 JSON json; 295 JSON json;
121 U32 indent; // indentation level 296 U32 indent; // indentation level
122 U32 maxdepth; // max. indentation/recursion level 297 UV limit; // escape character values >= this value when encoding
123} enc_t; 298} enc_t;
124 299
125inline void 300INLINE void
126need (enc_t *enc, STRLEN len) 301need (enc_t *enc, STRLEN len)
127{ 302{
128 if (expect_false (enc->cur + len >= enc->end)) 303 if (expect_false (enc->cur + len >= enc->end))
129 { 304 {
130 STRLEN cur = enc->cur - SvPVX (enc->sv); 305 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
131 SvGROW (enc->sv, cur + len + 1); 306 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
132 enc->cur = SvPVX (enc->sv) + cur; 307 enc->cur = SvPVX (enc->sv) + cur;
133 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 308 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
134 } 309 }
135} 310}
136 311
137inline void 312INLINE void
138encode_ch (enc_t *enc, char ch) 313encode_ch (enc_t *enc, char ch)
139{ 314{
140 need (enc, 1); 315 need (enc, 1);
141 *enc->cur++ = ch; 316 *enc->cur++ = ch;
142} 317}
… …
196 { 371 {
197 uch = ch; 372 uch = ch;
198 clen = 1; 373 clen = 1;
199 } 374 }
200 375
201 if (uch > 0x10FFFFUL) 376 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
202 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
203
204 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
205 { 377 {
206 if (uch > 0xFFFFUL) 378 if (uch >= 0x10000UL)
207 { 379 {
380 if (uch >= 0x110000UL)
381 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
382
208 need (enc, len += 11); 383 need (enc, len += 11);
209 sprintf (enc->cur, "\\u%04x\\u%04x", 384 sprintf (enc->cur, "\\u%04x\\u%04x",
210 (int)((uch - 0x10000) / 0x400 + 0xD800), 385 (int)((uch - 0x10000) / 0x400 + 0xD800),
211 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 386 (int)((uch - 0x10000) % 0x400 + 0xDC00));
212 enc->cur += 12; 387 enc->cur += 12;
213 } 388 }
214 else 389 else
215 { 390 {
216 static char hexdigit [16] = "0123456789abcdef";
217 need (enc, len += 5); 391 need (enc, len += 5);
218 *enc->cur++ = '\\'; 392 *enc->cur++ = '\\';
219 *enc->cur++ = 'u'; 393 *enc->cur++ = 'u';
220 *enc->cur++ = hexdigit [ uch >> 12 ]; 394 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
221 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 395 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
222 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 396 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
223 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 397 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
224 } 398 }
225 399
226 str += clen; 400 str += clen;
227 } 401 }
228 else if (enc->json.flags & F_LATIN1) 402 else if (enc->json.flags & F_LATIN1)
… …
240 while (--clen); 414 while (--clen);
241 } 415 }
242 else 416 else
243 { 417 {
244 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed 418 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
245 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 419 enc->cur = encode_utf8 (enc->cur, uch);
246 ++str; 420 ++str;
247 } 421 }
248 } 422 }
249 } 423 }
250 } 424 }
251 425
252 --len; 426 --len;
253 } 427 }
254} 428}
255 429
256inline void 430INLINE void
257encode_indent (enc_t *enc) 431encode_indent (enc_t *enc)
258{ 432{
259 if (enc->json.flags & F_INDENT) 433 if (enc->json.flags & F_INDENT)
260 { 434 {
261 int spaces = enc->indent * INDENT_STEP; 435 int spaces = enc->indent * INDENT_STEP;
… …
264 memset (enc->cur, ' ', spaces); 438 memset (enc->cur, ' ', spaces);
265 enc->cur += spaces; 439 enc->cur += spaces;
266 } 440 }
267} 441}
268 442
269inline void 443INLINE void
270encode_space (enc_t *enc) 444encode_space (enc_t *enc)
271{ 445{
272 need (enc, 1); 446 need (enc, 1);
273 encode_ch (enc, ' '); 447 encode_ch (enc, ' ');
274} 448}
275 449
276inline void 450INLINE void
277encode_nl (enc_t *enc) 451encode_nl (enc_t *enc)
278{ 452{
279 if (enc->json.flags & F_INDENT) 453 if (enc->json.flags & F_INDENT)
280 { 454 {
281 need (enc, 1); 455 need (enc, 1);
282 encode_ch (enc, '\n'); 456 encode_ch (enc, '\n');
283 } 457 }
284} 458}
285 459
286inline void 460INLINE void
287encode_comma (enc_t *enc) 461encode_comma (enc_t *enc)
288{ 462{
289 encode_ch (enc, ','); 463 encode_ch (enc, ',');
290 464
291 if (enc->json.flags & F_INDENT) 465 if (enc->json.flags & F_INDENT)
… …
299static void 473static void
300encode_av (enc_t *enc, AV *av) 474encode_av (enc_t *enc, AV *av)
301{ 475{
302 int i, len = av_len (av); 476 int i, len = av_len (av);
303 477
304 if (enc->indent >= enc->maxdepth) 478 if (enc->indent >= enc->json.max_depth)
305 croak ("data structure too deep (hit recursion limit)"); 479 croak (ERR_NESTING_EXCEEDED);
306 480
307 encode_ch (enc, '['); encode_nl (enc); 481 encode_ch (enc, '[');
308 ++enc->indent; 482
483 if (len >= 0)
484 {
485 encode_nl (enc); ++enc->indent;
309 486
310 for (i = 0; i <= len; ++i) 487 for (i = 0; i <= len; ++i)
311 { 488 {
312 SV **svp = av_fetch (av, i, 0); 489 SV **svp = av_fetch (av, i, 0);
313 490
314 encode_indent (enc); 491 encode_indent (enc);
315 492
316 if (svp) 493 if (svp)
317 encode_sv (enc, *svp); 494 encode_sv (enc, *svp);
318 else 495 else
319 encode_str (enc, "null", 4, 0); 496 encode_str (enc, "null", 4, 0);
320 497
321 if (i < len) 498 if (i < len)
322 encode_comma (enc); 499 encode_comma (enc);
323 } 500 }
324 501
502 encode_nl (enc); --enc->indent; encode_indent (enc);
503 }
504
325 encode_nl (enc); 505 encode_ch (enc, ']');
326
327 --enc->indent;
328 encode_indent (enc); encode_ch (enc, ']');
329} 506}
330 507
331static void 508static void
332encode_he (enc_t *enc, HE *he) 509encode_hk (enc_t *enc, HE *he)
333{ 510{
334 encode_ch (enc, '"'); 511 encode_ch (enc, '"');
335 512
336 if (HeKLEN (he) == HEf_SVKEY) 513 if (HeKLEN (he) == HEf_SVKEY)
337 { 514 {
… …
350 encode_ch (enc, '"'); 527 encode_ch (enc, '"');
351 528
352 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 529 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
353 encode_ch (enc, ':'); 530 encode_ch (enc, ':');
354 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 531 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
355 encode_sv (enc, HeVAL (he));
356} 532}
357 533
358// compare hash entries, used when all keys are bytestrings 534// compare hash entries, used when all keys are bytestrings
359static int 535static int
360he_cmp_fast (const void *a_, const void *b_) 536he_cmp_fast (const void *a_, const void *b_)
… …
365 HE *b = *(HE **)b_; 541 HE *b = *(HE **)b_;
366 542
367 STRLEN la = HeKLEN (a); 543 STRLEN la = HeKLEN (a);
368 STRLEN lb = HeKLEN (b); 544 STRLEN lb = HeKLEN (b);
369 545
370 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 546 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
371 cmp = la - lb; 547 cmp = lb - la;
372 548
373 return cmp; 549 return cmp;
374} 550}
375 551
376// compare hash entries, used when some keys are sv's or utf-x 552// compare hash entries, used when some keys are sv's or utf-x
377static int 553static int
378he_cmp_slow (const void *a, const void *b) 554he_cmp_slow (const void *a, const void *b)
379{ 555{
380 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 556 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
381} 557}
382 558
383static void 559static void
384encode_hv (enc_t *enc, HV *hv) 560encode_hv (enc_t *enc, HV *hv)
385{ 561{
386 int count, i; 562 HE *he;
387 563
388 if (enc->indent >= enc->maxdepth) 564 if (enc->indent >= enc->json.max_depth)
389 croak ("data structure too deep (hit recursion limit)"); 565 croak (ERR_NESTING_EXCEEDED);
390 566
391 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 567 encode_ch (enc, '{');
392 568
393 if ((count = hv_iterinit (hv)))
394 {
395 // for canonical output we have to sort by keys first 569 // for canonical output we have to sort by keys first
396 // actually, this is mostly due to the stupid so-called 570 // actually, this is mostly due to the stupid so-called
397 // security workaround added somewhere in 5.8.x. 571 // security workaround added somewhere in 5.8.x
398 // that randomises hash orderings 572 // that randomises hash orderings
399 if (enc->json.flags & F_CANONICAL) 573 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
574 {
575 int count = hv_iterinit (hv);
576
577 if (SvMAGICAL (hv))
400 { 578 {
579 // need to count by iterating. could improve by dynamically building the vector below
580 // but I don't care for the speed of this special case.
581 // note also that we will run into undefined behaviour when the two iterations
582 // do not result in the same count, something I might care for in some later release.
583
584 count = 0;
585 while (hv_iternext (hv))
586 ++count;
587
588 hv_iterinit (hv);
589 }
590
591 if (count)
592 {
401 int fast = 1; 593 int i, fast = 1;
402 HE *he;
403#if defined(__BORLANDC__) || defined(_MSC_VER) 594#if defined(__BORLANDC__) || defined(_MSC_VER)
404 HE **hes = _alloca (count * sizeof (HE)); 595 HE **hes = _alloca (count * sizeof (HE));
405#else 596#else
406 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 597 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
407#endif 598#endif
… …
434 625
435 FREETMPS; 626 FREETMPS;
436 LEAVE; 627 LEAVE;
437 } 628 }
438 629
439 for (i = 0; i < count; ++i) 630 encode_nl (enc); ++enc->indent;
631
632 while (count--)
440 { 633 {
441 encode_indent (enc); 634 encode_indent (enc);
635 he = hes [count];
442 encode_he (enc, hes [i]); 636 encode_hk (enc, he);
637 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
443 638
444 if (i < count - 1) 639 if (count)
445 encode_comma (enc); 640 encode_comma (enc);
446 } 641 }
447 642
448 encode_nl (enc); 643 encode_nl (enc); --enc->indent; encode_indent (enc);
449 } 644 }
645 }
450 else 646 else
647 {
648 if (hv_iterinit (hv) || SvMAGICAL (hv))
649 if ((he = hv_iternext (hv)))
451 { 650 {
452 HE *he = hv_iternext (hv); 651 encode_nl (enc); ++enc->indent;
453 652
454 for (;;) 653 for (;;)
455 { 654 {
456 encode_indent (enc); 655 encode_indent (enc);
457 encode_he (enc, he); 656 encode_hk (enc, he);
657 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
458 658
459 if (!(he = hv_iternext (hv))) 659 if (!(he = hv_iternext (hv)))
460 break; 660 break;
461 661
462 encode_comma (enc); 662 encode_comma (enc);
463 } 663 }
464 664
465 encode_nl (enc); 665 encode_nl (enc); --enc->indent; encode_indent (enc);
466 } 666 }
467 } 667 }
468 668
469 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 669 encode_ch (enc, '}');
470} 670}
471 671
472// encode objects, arrays and special \0=false and \1=true values. 672// encode objects, arrays and special \0=false and \1=true values.
473static void 673static void
474encode_rv (enc_t *enc, SV *sv) 674encode_rv (enc_t *enc, SV *sv)
… …
478 SvGETMAGIC (sv); 678 SvGETMAGIC (sv);
479 svt = SvTYPE (sv); 679 svt = SvTYPE (sv);
480 680
481 if (expect_false (SvOBJECT (sv))) 681 if (expect_false (SvOBJECT (sv)))
482 { 682 {
683 HV *stash = !JSON_SLOW || json_boolean_stash
684 ? json_boolean_stash
685 : gv_stashpv ("JSON::XS::Boolean", 1);
686
483 if (SvSTASH (sv) == json_boolean_stash) 687 if (SvSTASH (sv) == stash)
484 { 688 {
485 if (SvIV (sv)) 689 if (SvIV (sv))
486 encode_str (enc, "true", 4, 0); 690 encode_str (enc, "true", 4, 0);
487 else 691 else
488 encode_str (enc, "false", 5, 0); 692 encode_str (enc, "false", 5, 0);
… …
500 // we re-bless the reference to get overload and other niceties right 704 // we re-bless the reference to get overload and other niceties right
501 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0); 705 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
502 706
503 if (to_json) 707 if (to_json)
504 { 708 {
505 int count;
506 dSP; 709 dSP;
507 710
508 ENTER; SAVETMPS; PUSHMARK (SP); 711 ENTER; SAVETMPS; PUSHMARK (SP);
509 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 712 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
510 713
… …
548 751
549 if (len == 1 && *pv == '1') 752 if (len == 1 && *pv == '1')
550 encode_str (enc, "true", 4, 0); 753 encode_str (enc, "true", 4, 0);
551 else if (len == 1 && *pv == '0') 754 else if (len == 1 && *pv == '0')
552 encode_str (enc, "false", 5, 0); 755 encode_str (enc, "false", 5, 0);
756 else if (enc->json.flags & F_ALLOW_UNKNOWN)
757 encode_str (enc, "null", 4, 0);
553 else 758 else
554 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 759 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
555 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 760 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
556 } 761 }
762 else if (enc->json.flags & F_ALLOW_UNKNOWN)
763 encode_str (enc, "null", 4, 0);
557 else 764 else
558 croak ("encountered %s, but JSON can only represent references to arrays or hashes", 765 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
559 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 766 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
560} 767}
561 768
… …
579 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 786 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
580 enc->cur += strlen (enc->cur); 787 enc->cur += strlen (enc->cur);
581 } 788 }
582 else if (SvIOKp (sv)) 789 else if (SvIOKp (sv))
583 { 790 {
584 // we assume we can always read an IV as a UV 791 // we assume we can always read an IV as a UV and vice versa
585 if (SvUV (sv) & ~(UV)0x7fff) 792 // we assume two's complement
586 { 793 // we assume no aliasing issues in the union
587 // large integer, use the (rather slow) snprintf way. 794 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
588 need (enc, sizeof (UV) * 3); 795 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
589 enc->cur +=
590 SvIsUV(sv)
591 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
592 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
593 }
594 else
595 { 796 {
596 // optimise the "small number case" 797 // optimise the "small number case"
597 // code will likely be branchless and use only a single multiplication 798 // code will likely be branchless and use only a single multiplication
799 // works for numbers up to 59074
598 I32 i = SvIV (sv); 800 I32 i = SvIVX (sv);
599 U32 u; 801 U32 u;
600 char digit, nz = 0; 802 char digit, nz = 0;
601 803
602 need (enc, 6); 804 need (enc, 6);
603 805
… …
609 811
610 // now output digit by digit, each time masking out the integer part 812 // now output digit by digit, each time masking out the integer part
611 // and multiplying by 5 while moving the decimal point one to the right, 813 // and multiplying by 5 while moving the decimal point one to the right,
612 // resulting in a net multiplication by 10. 814 // resulting in a net multiplication by 10.
613 // we always write the digit to memory but conditionally increment 815 // we always write the digit to memory but conditionally increment
614 // the pointer, to ease the usage of conditional move instructions. 816 // the pointer, to enable the use of conditional move instructions.
615 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 817 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffffUL) * 5;
616 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 818 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffffUL) * 5;
617 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 819 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffffUL) * 5;
618 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 820 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffffUL) * 5;
619 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0' 821 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
620 } 822 }
823 else
824 {
825 // large integer, use the (rather slow) snprintf way.
826 need (enc, IVUV_MAXCHARS);
827 enc->cur +=
828 SvIsUV(sv)
829 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831 }
621 } 832 }
622 else if (SvROK (sv)) 833 else if (SvROK (sv))
623 encode_rv (enc, SvRV (sv)); 834 encode_rv (enc, SvRV (sv));
624 else if (!SvOK (sv)) 835 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
625 encode_str (enc, "null", 4, 0); 836 encode_str (enc, "null", 4, 0);
626 else 837 else
627 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 838 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
628 SvPV_nolen (sv), SvFLAGS (sv)); 839 SvPV_nolen (sv), SvFLAGS (sv));
629} 840}
… …
639 enc.json = *json; 850 enc.json = *json;
640 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 851 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
641 enc.cur = SvPVX (enc.sv); 852 enc.cur = SvPVX (enc.sv);
642 enc.end = SvEND (enc.sv); 853 enc.end = SvEND (enc.sv);
643 enc.indent = 0; 854 enc.indent = 0;
644 enc.maxdepth = DEC_DEPTH (enc.json.flags); 855 enc.limit = enc.json.flags & F_ASCII ? 0x000080UL
856 : enc.json.flags & F_LATIN1 ? 0x000100UL
857 : 0x110000UL;
645 858
646 SvPOK_only (enc.sv); 859 SvPOK_only (enc.sv);
647 encode_sv (&enc, scalar); 860 encode_sv (&enc, scalar);
861 encode_nl (&enc);
648 862
649 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 863 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
650 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 864 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
651 865
652 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8))) 866 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
… …
670 JSON json; 884 JSON json;
671 U32 depth; // recursion depth 885 U32 depth; // recursion depth
672 U32 maxdepth; // recursion depth limit 886 U32 maxdepth; // recursion depth limit
673} dec_t; 887} dec_t;
674 888
675inline void 889INLINE void
890decode_comment (dec_t *dec)
891{
892 // only '#'-style comments allowed a.t.m.
893
894 while (*dec->cur && *dec->cur != 0x0a && *dec->cur != 0x0d)
895 ++dec->cur;
896}
897
898INLINE void
676decode_ws (dec_t *dec) 899decode_ws (dec_t *dec)
677{ 900{
678 for (;;) 901 for (;;)
679 { 902 {
680 char ch = *dec->cur; 903 char ch = *dec->cur;
681 904
682 if (ch > 0x20 905 if (ch > 0x20)
906 {
907 if (expect_false (ch == '#'))
908 {
909 if (dec->json.flags & F_RELAXED)
910 decode_comment (dec);
911 else
912 break;
913 }
914 else
915 break;
916 }
683 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 917 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
684 break; 918 break; // parse error, but let higher level handle it, gives better error messages
685 919
686 ++dec->cur; 920 ++dec->cur;
687 } 921 }
688} 922}
689 923
… …
693 if (*dec->cur != ch) \ 927 if (*dec->cur != ch) \
694 ERR (# ch " expected"); \ 928 ERR (# ch " expected"); \
695 ++dec->cur; \ 929 ++dec->cur; \
696 SE 930 SE
697 931
698#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)") 932#define DEC_INC_DEPTH if (++dec->depth > dec->json.max_depth) ERR (ERR_NESTING_EXCEEDED)
699#define DEC_DEC_DEPTH --dec->depth 933#define DEC_DEC_DEPTH --dec->depth
700 934
701static SV *decode_sv (dec_t *dec); 935static SV *decode_sv (dec_t *dec);
702 936
703static signed char decode_hexdigit[256]; 937static signed char decode_hexdigit[256];
… …
795 1029
796 if (hi >= 0x80) 1030 if (hi >= 0x80)
797 { 1031 {
798 utf8 = 1; 1032 utf8 = 1;
799 1033
800 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 1034 cur = encode_utf8 (cur, hi);
801 } 1035 }
802 else 1036 else
803 *cur++ = hi; 1037 *cur++ = hi;
804 } 1038 }
805 break; 1039 break;
… …
807 default: 1041 default:
808 --dec_cur; 1042 --dec_cur;
809 ERR ("illegal backslash escape sequence in string"); 1043 ERR ("illegal backslash escape sequence in string");
810 } 1044 }
811 } 1045 }
812 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 1046 else if (expect_true (ch >= 0x20 && ch < 0x80))
813 *cur++ = ch; 1047 *cur++ = ch;
814 else if (ch >= 0x80) 1048 else if (ch >= 0x80)
815 { 1049 {
816 STRLEN clen; 1050 STRLEN clen;
817 UV uch;
818 1051
819 --dec_cur; 1052 --dec_cur;
820 1053
821 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen); 1054 decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
822 if (clen == (STRLEN)-1) 1055 if (clen == (STRLEN)-1)
823 ERR ("malformed UTF-8 character in JSON string"); 1056 ERR ("malformed UTF-8 character in JSON string");
824 1057
825 do 1058 do
826 *cur++ = *dec_cur++; 1059 *cur++ = *dec_cur++;
… …
843 { 1076 {
844 STRLEN len = cur - buf; 1077 STRLEN len = cur - buf;
845 1078
846 if (sv) 1079 if (sv)
847 { 1080 {
848 SvGROW (sv, SvCUR (sv) + len + 1); 1081 STRLEN cur = SvCUR (sv);
1082
1083 if (SvLEN (sv) <= cur + len)
1084 SvGROW (sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1085
849 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 1086 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
850 SvCUR_set (sv, SvCUR (sv) + len); 1087 SvCUR_set (sv, SvCUR (sv) + len);
851 } 1088 }
852 else 1089 else
853 sv = newSVpvn (buf, len); 1090 sv = newSVpvn (buf, len);
… …
940 1177
941 if (!is_nv) 1178 if (!is_nv)
942 { 1179 {
943 int len = dec->cur - start; 1180 int len = dec->cur - start;
944 1181
945 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 1182 // special case the rather common 1..5-digit-int case
946 if (*start == '-') 1183 if (*start == '-')
947 switch (len) 1184 switch (len)
948 { 1185 {
949 case 2: return newSViv (-( start [1] - '0' * 1)); 1186 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
950 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1187 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
951 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1188 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
952 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1189 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1190 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
953 } 1191 }
954 else 1192 else
955 switch (len) 1193 switch (len)
956 { 1194 {
957 case 1: return newSViv ( start [0] - '0' * 1); 1195 case 1: return newSViv ( start [0] - '0' * 1);
958 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1196 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
959 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 1197 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
960 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 1198 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
1199 case 5: return newSViv ( start [0] * 10000 + start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 11111);
961 } 1200 }
962 1201
963 { 1202 {
964 UV uv; 1203 UV uv;
965 int numtype = grok_number (start, len, &uv); 1204 int numtype = grok_number (start, len, &uv);
… …
974 } 1213 }
975 1214
976 len -= *start == '-' ? 1 : 0; 1215 len -= *start == '-' ? 1 : 0;
977 1216
978 // does not fit into IV or UV, try NV 1217 // does not fit into IV or UV, try NV
979 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len) 1218 if (len <= NV_DIG)
980 #if defined (LDBL_DIG)
981 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
982 #endif
983 )
984 // fits into NV without loss of precision 1219 // fits into NV without loss of precision
985 return newSVnv (Atof (start)); 1220 return newSVnv (json_atof (start));
986 1221
987 // everything else fails, convert it to a string 1222 // everything else fails, convert it to a string
988 return newSVpvn (start, dec->cur - start); 1223 return newSVpvn (start, dec->cur - start);
989 } 1224 }
990 1225
991 // loss of precision here 1226 // loss of precision here
992 return newSVnv (Atof (start)); 1227 return newSVnv (json_atof (start));
993 1228
994fail: 1229fail:
995 return 0; 1230 return 0;
996} 1231}
997 1232
… …
1026 1261
1027 if (*dec->cur != ',') 1262 if (*dec->cur != ',')
1028 ERR (", or ] expected while parsing array"); 1263 ERR (", or ] expected while parsing array");
1029 1264
1030 ++dec->cur; 1265 ++dec->cur;
1266
1267 decode_ws (dec);
1268
1269 if (*dec->cur == ']' && dec->json.flags & F_RELAXED)
1270 {
1271 ++dec->cur;
1272 break;
1273 }
1031 } 1274 }
1032 1275
1033 DEC_DEC_DEPTH; 1276 DEC_DEC_DEPTH;
1034 return newRV_noinc ((SV *)av); 1277 return newRV_noinc ((SV *)av);
1035 1278
… …
1051 if (*dec->cur == '}') 1294 if (*dec->cur == '}')
1052 ++dec->cur; 1295 ++dec->cur;
1053 else 1296 else
1054 for (;;) 1297 for (;;)
1055 { 1298 {
1056 decode_ws (dec); EXPECT_CH ('"'); 1299 EXPECT_CH ('"');
1057 1300
1058 // heuristic: assume that 1301 // heuristic: assume that
1059 // a) decode_str + hv_store_ent are abysmally slow. 1302 // a) decode_str + hv_store_ent are abysmally slow.
1060 // b) most hash keys are short, simple ascii text. 1303 // b) most hash keys are short, simple ascii text.
1061 // => try to "fast-match" such strings to avoid 1304 // => try to "fast-match" such strings to avoid
… …
1065 char *p = dec->cur; 1308 char *p = dec->cur;
1066 char *e = p + 24; // only try up to 24 bytes 1309 char *e = p + 24; // only try up to 24 bytes
1067 1310
1068 for (;;) 1311 for (;;)
1069 { 1312 {
1070 // the >= 0x80 is true on most architectures 1313 // the >= 0x80 is false on most architectures
1071 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1314 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1072 { 1315 {
1073 // slow path, back up and use decode_str 1316 // slow path, back up and use decode_str
1074 SV *key = decode_str (dec); 1317 SV *key = decode_str (dec);
1075 if (!key) 1318 if (!key)
1076 goto fail; 1319 goto fail;
1077 1320
1078 decode_ws (dec); EXPECT_CH (':'); 1321 decode_ws (dec); EXPECT_CH (':');
1079 1322
1323 decode_ws (dec);
1080 value = decode_sv (dec); 1324 value = decode_sv (dec);
1081 if (!value) 1325 if (!value)
1082 { 1326 {
1083 SvREFCNT_dec (key); 1327 SvREFCNT_dec (key);
1084 goto fail; 1328 goto fail;
… …
1096 int len = p - key; 1340 int len = p - key;
1097 dec->cur = p + 1; 1341 dec->cur = p + 1;
1098 1342
1099 decode_ws (dec); EXPECT_CH (':'); 1343 decode_ws (dec); EXPECT_CH (':');
1100 1344
1345 decode_ws (dec);
1101 value = decode_sv (dec); 1346 value = decode_sv (dec);
1102 if (!value) 1347 if (!value)
1103 goto fail; 1348 goto fail;
1104 1349
1105 hv_store (hv, key, len, value, 0); 1350 hv_store (hv, key, len, value, 0);
… …
1121 1366
1122 if (*dec->cur != ',') 1367 if (*dec->cur != ',')
1123 ERR (", or } expected while parsing object/hash"); 1368 ERR (", or } expected while parsing object/hash");
1124 1369
1125 ++dec->cur; 1370 ++dec->cur;
1371
1372 decode_ws (dec);
1373
1374 if (*dec->cur == '}' && dec->json.flags & F_RELAXED)
1375 {
1376 ++dec->cur;
1377 break;
1378 }
1126 } 1379 }
1127 1380
1128 DEC_DEC_DEPTH; 1381 DEC_DEC_DEPTH;
1129 sv = newRV_noinc ((SV *)hv); 1382 sv = newRV_noinc ((SV *)hv);
1130 1383
… …
1148 dSP; 1401 dSP;
1149 int count; 1402 int count;
1150 1403
1151 ENTER; SAVETMPS; PUSHMARK (SP); 1404 ENTER; SAVETMPS; PUSHMARK (SP);
1152 XPUSHs (HeVAL (he)); 1405 XPUSHs (HeVAL (he));
1406 sv_2mortal (sv);
1153 1407
1154 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1408 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1155 1409
1156 if (count == 1) 1410 if (count == 1)
1157 { 1411 {
1158 sv = newSVsv (POPs); 1412 sv = newSVsv (POPs);
1159 FREETMPS; LEAVE; 1413 FREETMPS; LEAVE;
1160 return sv; 1414 return sv;
1161 } 1415 }
1162 1416
1417 SvREFCNT_inc (sv);
1163 FREETMPS; LEAVE; 1418 FREETMPS; LEAVE;
1164 } 1419 }
1165 } 1420 }
1166 1421
1167 if (dec->json.cb_object) 1422 if (dec->json.cb_object)
… …
1195} 1450}
1196 1451
1197static SV * 1452static SV *
1198decode_sv (dec_t *dec) 1453decode_sv (dec_t *dec)
1199{ 1454{
1200 decode_ws (dec);
1201
1202 // the beauty of JSON: you need exactly one character lookahead 1455 // the beauty of JSON: you need exactly one character lookahead
1203 // to parse anything. 1456 // to parse everything.
1204 switch (*dec->cur) 1457 switch (*dec->cur)
1205 { 1458 {
1206 case '"': ++dec->cur; return decode_str (dec); 1459 case '"': ++dec->cur; return decode_str (dec);
1207 case '[': ++dec->cur; return decode_av (dec); 1460 case '[': ++dec->cur; return decode_av (dec);
1208 case '{': ++dec->cur; return decode_hv (dec); 1461 case '{': ++dec->cur; return decode_hv (dec);
1209 1462
1210 case '-': 1463 case '-':
1211 case '0': case '1': case '2': case '3': case '4': 1464 case '0': case '1': case '2': case '3': case '4':
1212 case '5': case '6': case '7': case '8': case '9': 1465 case '5': case '6': case '7': case '8': case '9':
1213 return decode_num (dec); 1466 return decode_num (dec);
1214 1467
1215 case 't': 1468 case 't':
1216 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1469 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1217 { 1470 {
1218 dec->cur += 4; 1471 dec->cur += 4;
1472#if JSON_SLOW
1473 json_true = get_bool ("JSON::XS::true");
1474#endif
1219 return SvREFCNT_inc (json_true); 1475 return newSVsv (json_true);
1220 } 1476 }
1221 else 1477 else
1222 ERR ("'true' expected"); 1478 ERR ("'true' expected");
1223 1479
1224 break; 1480 break;
1225 1481
1226 case 'f': 1482 case 'f':
1227 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1483 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1228 { 1484 {
1229 dec->cur += 5; 1485 dec->cur += 5;
1486#if JSON_SLOW
1487 json_false = get_bool ("JSON::XS::false");
1488#endif
1230 return SvREFCNT_inc (json_false); 1489 return newSVsv (json_false);
1231 } 1490 }
1232 else 1491 else
1233 ERR ("'false' expected"); 1492 ERR ("'false' expected");
1234 1493
1235 break; 1494 break;
… …
1253fail: 1512fail:
1254 return 0; 1513 return 0;
1255} 1514}
1256 1515
1257static SV * 1516static SV *
1258decode_json (SV *string, JSON *json, UV *offset_return) 1517decode_json (SV *string, JSON *json, char **offset_return)
1259{ 1518{
1260 dec_t dec; 1519 dec_t dec;
1261 UV offset;
1262 SV *sv; 1520 SV *sv;
1263 1521
1522 /* work around bugs in 5.10 where manipulating magic values
1523 * will perl ignore the magic in subsequent accesses
1524 */
1264 SvGETMAGIC (string); 1525 /*SvGETMAGIC (string);*/
1526 if (SvMAGICAL (string))
1527 string = sv_2mortal (newSVsv (string));
1528
1265 SvUPGRADE (string, SVt_PV); 1529 SvUPGRADE (string, SVt_PV);
1266 1530
1267 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags)) 1531 /* work around a bug in perl 5.10, which causes SvCUR to fail an
1532 * assertion with -DDEBUGGING, although SvCUR is documented to
1533 * return the xpv_cur field which certainly exists after upgrading.
1534 * according to nicholas clark, calling SvPOK fixes this.
1535 * But it doesn't fix it, so try another workaround, call SvPV_nolen
1536 * and hope for the best.
1537 * Damnit, SvPV_nolen still trips over yet another assertion. This
1538 * assertion business is seriously broken, try yet another workaround
1539 * for the broken -DDEBUGGING.
1540 */
1541 {
1542#ifdef DEBUGGING
1543 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
1544#else
1545 STRLEN offset = SvCUR (string);
1546#endif
1547
1548 if (offset > json->max_size && json->max_size)
1268 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1549 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1269 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1550 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1551 }
1270 1552
1271 if (json->flags & F_UTF8) 1553 if (json->flags & F_UTF8)
1272 sv_utf8_downgrade (string, 0); 1554 sv_utf8_downgrade (string, 0);
1273 else 1555 else
1274 sv_utf8_upgrade (string); 1556 sv_utf8_upgrade (string);
1275 1557
1276 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1558 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1277 1559
1278 dec.json = *json; 1560 dec.json = *json;
1279 dec.cur = SvPVX (string); 1561 dec.cur = SvPVX (string);
1280 dec.end = SvEND (string); 1562 dec.end = SvEND (string);
1281 dec.err = 0; 1563 dec.err = 0;
1282 dec.depth = 0; 1564 dec.depth = 0;
1283 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1284 1565
1285 if (dec.json.cb_object || dec.json.cb_sk_object) 1566 if (dec.json.cb_object || dec.json.cb_sk_object)
1286 dec.json.flags |= F_HOOK; 1567 dec.json.flags |= F_HOOK;
1287 1568
1288 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1569 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1570
1571 decode_ws (&dec);
1289 sv = decode_sv (&dec); 1572 sv = decode_sv (&dec);
1573
1574 if (offset_return)
1575 *offset_return = dec.cur;
1290 1576
1291 if (!(offset_return || !sv)) 1577 if (!(offset_return || !sv))
1292 { 1578 {
1293 // check for trailing garbage 1579 // check for trailing garbage
1294 decode_ws (&dec); 1580 decode_ws (&dec);
… …
1297 { 1583 {
1298 dec.err = "garbage after JSON object"; 1584 dec.err = "garbage after JSON object";
1299 SvREFCNT_dec (sv); 1585 SvREFCNT_dec (sv);
1300 sv = 0; 1586 sv = 0;
1301 } 1587 }
1302 }
1303
1304 if (offset_return || !sv)
1305 {
1306 offset = dec.json.flags & F_UTF8
1307 ? dec.cur - SvPVX (string)
1308 : utf8_distance (dec.cur, SvPVX (string));
1309
1310 if (offset_return)
1311 *offset_return = offset;
1312 } 1588 }
1313 1589
1314 if (!sv) 1590 if (!sv)
1315 { 1591 {
1316 SV *uni = sv_newmortal (); 1592 SV *uni = sv_newmortal ();
… …
1322 SAVEVPTR (PL_curcop); 1598 SAVEVPTR (PL_curcop);
1323 PL_curcop = &cop; 1599 PL_curcop = &cop;
1324 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1600 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1325 LEAVE; 1601 LEAVE;
1326 1602
1327 croak ("%s, at character offset %d [\"%s\"]", 1603 croak ("%s, at character offset %d (before \"%s\")",
1328 dec.err, 1604 dec.err,
1329 (int)offset, 1605 ptr_to_index (string, dec.cur),
1330 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1606 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1331 } 1607 }
1332 1608
1333 sv = sv_2mortal (sv); 1609 sv = sv_2mortal (sv);
1334 1610
1335 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1611 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1336 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1612 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1337 1613
1338 return sv; 1614 return sv;
1615}
1616
1617/////////////////////////////////////////////////////////////////////////////
1618// incremental parser
1619
1620static void
1621incr_parse (JSON *self)
1622{
1623 const char *p = SvPVX (self->incr_text) + self->incr_pos;
1624
1625 // the state machine here is a bit convoluted and could be simplified a lot
1626 // but this would make it slower, so...
1627
1628 for (;;)
1629 {
1630 //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
1631 switch (self->incr_mode)
1632 {
1633 // only used for initial whitespace skipping
1634 case INCR_M_WS:
1635 for (;;)
1636 {
1637 if (*p > 0x20)
1638 {
1639 if (*p == '#')
1640 {
1641 self->incr_mode = INCR_M_C0;
1642 goto incr_m_c;
1643 }
1644 else
1645 {
1646 self->incr_mode = INCR_M_JSON;
1647 goto incr_m_json;
1648 }
1649 }
1650 else if (!*p)
1651 goto interrupt;
1652
1653 ++p;
1654 }
1655
1656 // skip a single char inside a string (for \\-processing)
1657 case INCR_M_BS:
1658 if (!*p)
1659 goto interrupt;
1660
1661 ++p;
1662 self->incr_mode = INCR_M_STR;
1663 goto incr_m_str;
1664
1665 // inside #-style comments
1666 case INCR_M_C0:
1667 case INCR_M_C1:
1668 incr_m_c:
1669 for (;;)
1670 {
1671 if (*p == '\n')
1672 {
1673 self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
1674 break;
1675 }
1676 else if (!*p)
1677 goto interrupt;
1678
1679 ++p;
1680 }
1681
1682 break;
1683
1684 // inside a string
1685 case INCR_M_STR:
1686 incr_m_str:
1687 for (;;)
1688 {
1689 if (*p == '"')
1690 {
1691 ++p;
1692 self->incr_mode = INCR_M_JSON;
1693
1694 if (!self->incr_nest)
1695 goto interrupt;
1696
1697 goto incr_m_json;
1698 }
1699 else if (*p == '\\')
1700 {
1701 ++p; // "virtually" consumes character after \
1702
1703 if (!*p) // if at end of string we have to switch modes
1704 {
1705 self->incr_mode = INCR_M_BS;
1706 goto interrupt;
1707 }
1708 }
1709 else if (!*p)
1710 goto interrupt;
1711
1712 ++p;
1713 }
1714
1715 // after initial ws, outside string
1716 case INCR_M_JSON:
1717 incr_m_json:
1718 for (;;)
1719 {
1720 switch (*p++)
1721 {
1722 case 0:
1723 --p;
1724 goto interrupt;
1725
1726 case 0x09:
1727 case 0x0a:
1728 case 0x0d:
1729 case 0x20:
1730 if (!self->incr_nest)
1731 {
1732 --p; // do not eat the whitespace, let the next round do it
1733 goto interrupt;
1734 }
1735 break;
1736
1737 case '"':
1738 self->incr_mode = INCR_M_STR;
1739 goto incr_m_str;
1740
1741 case '[':
1742 case '{':
1743 if (++self->incr_nest > self->max_depth)
1744 croak (ERR_NESTING_EXCEEDED);
1745 break;
1746
1747 case ']':
1748 case '}':
1749 if (--self->incr_nest <= 0)
1750 goto interrupt;
1751 break;
1752
1753 case '#':
1754 self->incr_mode = INCR_M_C1;
1755 goto incr_m_c;
1756 }
1757 }
1758 }
1759
1760 modechange:
1761 ;
1762 }
1763
1764interrupt:
1765 self->incr_pos = p - SvPVX (self->incr_text);
1766 //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
1767 //printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
1339} 1768}
1340 1769
1341///////////////////////////////////////////////////////////////////////////// 1770/////////////////////////////////////////////////////////////////////////////
1342// XS interface functions 1771// XS interface functions
1343 1772
… …
1355 : -1; 1784 : -1;
1356 1785
1357 json_stash = gv_stashpv ("JSON::XS" , 1); 1786 json_stash = gv_stashpv ("JSON::XS" , 1);
1358 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1787 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1359 1788
1360 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1789 json_true = get_bool ("JSON::XS::true");
1361 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1790 json_false = get_bool ("JSON::XS::false");
1791
1792 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1362} 1793}
1363 1794
1364PROTOTYPES: DISABLE 1795PROTOTYPES: DISABLE
1796
1797void CLONE (...)
1798 CODE:
1799 json_stash = 0;
1800 json_boolean_stash = 0;
1365 1801
1366void new (char *klass) 1802void new (char *klass)
1367 PPCODE: 1803 PPCODE:
1368{ 1804{
1369 SV *pv = NEWSV (0, sizeof (JSON)); 1805 SV *pv = NEWSV (0, sizeof (JSON));
1370 SvPOK_only (pv); 1806 SvPOK_only (pv);
1371 Zero (SvPVX (pv), 1, JSON); 1807 json_init ((JSON *)SvPVX (pv));
1372 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1808 XPUSHs (sv_2mortal (sv_bless (
1373 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1809 newRV_noinc (pv),
1810 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1811 )));
1374} 1812}
1375 1813
1376void ascii (JSON *self, int enable = 1) 1814void ascii (JSON *self, int enable = 1)
1377 ALIAS: 1815 ALIAS:
1378 ascii = F_ASCII 1816 ascii = F_ASCII
… …
1385 pretty = F_PRETTY 1823 pretty = F_PRETTY
1386 allow_nonref = F_ALLOW_NONREF 1824 allow_nonref = F_ALLOW_NONREF
1387 shrink = F_SHRINK 1825 shrink = F_SHRINK
1388 allow_blessed = F_ALLOW_BLESSED 1826 allow_blessed = F_ALLOW_BLESSED
1389 convert_blessed = F_CONV_BLESSED 1827 convert_blessed = F_CONV_BLESSED
1828 relaxed = F_RELAXED
1829 allow_unknown = F_ALLOW_UNKNOWN
1390 PPCODE: 1830 PPCODE:
1391{ 1831{
1392 if (enable) 1832 if (enable)
1393 self->flags |= ix; 1833 self->flags |= ix;
1394 else 1834 else
1395 self->flags &= ~ix; 1835 self->flags &= ~ix;
1396 1836
1397 XPUSHs (ST (0)); 1837 XPUSHs (ST (0));
1398} 1838}
1399 1839
1400void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1840void get_ascii (JSON *self)
1841 ALIAS:
1842 get_ascii = F_ASCII
1843 get_latin1 = F_LATIN1
1844 get_utf8 = F_UTF8
1845 get_indent = F_INDENT
1846 get_canonical = F_CANONICAL
1847 get_space_before = F_SPACE_BEFORE
1848 get_space_after = F_SPACE_AFTER
1849 get_allow_nonref = F_ALLOW_NONREF
1850 get_shrink = F_SHRINK
1851 get_allow_blessed = F_ALLOW_BLESSED
1852 get_convert_blessed = F_CONV_BLESSED
1853 get_relaxed = F_RELAXED
1854 get_allow_unknown = F_ALLOW_UNKNOWN
1401 PPCODE: 1855 PPCODE:
1402{ 1856 XPUSHs (boolSV (self->flags & ix));
1403 UV log2 = 0;
1404 1857
1405 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1858void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1406 1859 PPCODE:
1407 while ((1UL << log2) < max_depth) 1860 self->max_depth = max_depth;
1408 ++log2;
1409
1410 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1411
1412 XPUSHs (ST (0)); 1861 XPUSHs (ST (0));
1413}
1414 1862
1863U32 get_max_depth (JSON *self)
1864 CODE:
1865 RETVAL = self->max_depth;
1866 OUTPUT:
1867 RETVAL
1868
1415void max_size (JSON *self, UV max_size = 0) 1869void max_size (JSON *self, U32 max_size = 0)
1416 PPCODE: 1870 PPCODE:
1417{ 1871 self->max_size = max_size;
1418 UV log2 = 0;
1419
1420 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1421 if (max_size == 1) max_size = 2;
1422
1423 while ((1UL << log2) < max_size)
1424 ++log2;
1425
1426 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1427
1428 XPUSHs (ST (0)); 1872 XPUSHs (ST (0));
1429} 1873
1874int get_max_size (JSON *self)
1875 CODE:
1876 RETVAL = self->max_size;
1877 OUTPUT:
1878 RETVAL
1430 1879
1431void filter_json_object (JSON *self, SV *cb = &PL_sv_undef) 1880void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1432 PPCODE: 1881 PPCODE:
1433{ 1882{
1434 SvREFCNT_dec (self->cb_object); 1883 SvREFCNT_dec (self->cb_object);
… …
1468 XPUSHs (decode_json (jsonstr, self, 0)); 1917 XPUSHs (decode_json (jsonstr, self, 0));
1469 1918
1470void decode_prefix (JSON *self, SV *jsonstr) 1919void decode_prefix (JSON *self, SV *jsonstr)
1471 PPCODE: 1920 PPCODE:
1472{ 1921{
1473 UV offset; 1922 char *offset;
1474 EXTEND (SP, 2); 1923 EXTEND (SP, 2);
1475 PUSHs (decode_json (jsonstr, self, &offset)); 1924 PUSHs (decode_json (jsonstr, self, &offset));
1476 PUSHs (sv_2mortal (newSVuv (offset))); 1925 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1926}
1927
1928void incr_parse (JSON *self, SV *jsonstr = 0)
1929 PPCODE:
1930{
1931 if (!self->incr_text)
1932 self->incr_text = newSVpvn ("", 0);
1933
1934 // append data, if any
1935 if (jsonstr)
1936 {
1937 if (SvUTF8 (jsonstr))
1938 {
1939 if (!SvUTF8 (self->incr_text))
1940 {
1941 /* utf-8-ness differs, need to upgrade */
1942 sv_utf8_upgrade (self->incr_text);
1943
1944 if (self->incr_pos)
1945 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1946 - (U8 *)SvPVX (self->incr_text);
1947 }
1948 }
1949 else if (SvUTF8 (self->incr_text))
1950 sv_utf8_upgrade (jsonstr);
1951
1952 {
1953 STRLEN len;
1954 const char *str = SvPV (jsonstr, len);
1955 STRLEN cur = SvCUR (self->incr_text);
1956
1957 if (SvLEN (self->incr_text) <= cur + len)
1958 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1959
1960 Move (str, SvEND (self->incr_text), len, char);
1961 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1962 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1963 }
1964 }
1965
1966 if (GIMME_V != G_VOID)
1967 do
1968 {
1969 char *offset;
1970
1971 if (!INCR_DONE (self))
1972 {
1973 incr_parse (self);
1974
1975 if (self->incr_pos > self->max_size && self->max_size)
1976 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1977 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1978
1979 if (!INCR_DONE (self))
1980 break;
1981 }
1982
1983 XPUSHs (decode_json (self->incr_text, self, &offset));
1984
1985 self->incr_pos -= offset - SvPVX (self->incr_text);
1986 self->incr_nest = 0;
1987 self->incr_mode = 0;
1988
1989 sv_chop (self->incr_text, offset);
1990 }
1991 while (GIMME_V == G_ARRAY);
1992}
1993
1994SV *incr_text (JSON *self)
1995 ATTRS: lvalue
1996 CODE:
1997{
1998 if (self->incr_pos)
1999 croak ("incr_text can not be called when the incremental parser already started parsing");
2000
2001 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
2002}
2003 OUTPUT:
2004 RETVAL
2005
2006void incr_skip (JSON *self)
2007 CODE:
2008{
2009 if (self->incr_pos)
2010 {
2011 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
2012 self->incr_pos = 0;
2013 self->incr_nest = 0;
2014 self->incr_mode = 0;
2015 }
2016}
2017
2018void incr_reset (JSON *self)
2019 CODE:
2020{
2021 SvREFCNT_dec (self->incr_text);
2022 self->incr_text = 0;
2023 self->incr_pos = 0;
2024 self->incr_nest = 0;
2025 self->incr_mode = 0;
1477} 2026}
1478 2027
1479void DESTROY (JSON *self) 2028void DESTROY (JSON *self)
1480 CODE: 2029 CODE:
1481 SvREFCNT_dec (self->cb_sk_object); 2030 SvREFCNT_dec (self->cb_sk_object);
1482 SvREFCNT_dec (self->cb_object); 2031 SvREFCNT_dec (self->cb_object);
2032 SvREFCNT_dec (self->incr_text);
1483 2033
1484PROTOTYPES: ENABLE 2034PROTOTYPES: ENABLE
1485 2035
1486void to_json (SV *scalar) 2036void encode_json (SV *scalar)
2037 ALIAS:
2038 to_json_ = 0
2039 encode_json = F_UTF8
1487 PPCODE: 2040 PPCODE:
1488{ 2041{
1489 JSON json = { F_DEFAULT | F_UTF8 }; 2042 JSON json;
2043 json_init (&json);
2044 json.flags |= ix;
1490 XPUSHs (encode_json (scalar, &json)); 2045 XPUSHs (encode_json (scalar, &json));
1491} 2046}
1492 2047
1493void from_json (SV *jsonstr) 2048void decode_json (SV *jsonstr)
2049 ALIAS:
2050 from_json_ = 0
2051 decode_json = F_UTF8
1494 PPCODE: 2052 PPCODE:
1495{ 2053{
1496 JSON json = { F_DEFAULT | F_UTF8 }; 2054 JSON json;
2055 json_init (&json);
2056 json.flags |= ix;
1497 XPUSHs (decode_json (jsonstr, &json, 0)); 2057 XPUSHs (decode_json (jsonstr, &json, 0));
1498} 2058}
1499 2059

Diff Legend

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