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

Diff Legend

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