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.48 by root, Sun Jul 1 22:20:00 2007 UTC vs.
Revision 1.99 by root, Sat Aug 8 10:06:02 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// guarantees, though. if it breaks, you get to keep the pieces.
16#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
18#endif 20#endif
21
22#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
… …
25#define F_SPACE_BEFORE 0x00000020UL 29#define F_SPACE_BEFORE 0x00000020UL
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 // NYI 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 37#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
36#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
37#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
38 38
39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 39#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
40#define F_DEFAULT (9UL << S_MAXDEPTH)
41 40
42#define INIT_SIZE 32 // initial scalar size to be allocated 41#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 42#define INDENT_STEP 3 // spaces per indentation level
44 43
45#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
46 45
47#define SB do { 46#define SB do {
48#define SE } while (0) 47#define SE } while (0)
49 48
50#if __GNUC__ >= 3 49#if __GNUC__ >= 3
51# define expect(expr,value) __builtin_expect ((expr),(value)) 50# define expect(expr,value) __builtin_expect ((expr), (value))
52# define inline inline 51# define INLINE static inline
53#else 52#else
54# define expect(expr,value) (expr) 53# define expect(expr,value) (expr)
55# define inline static 54# define INLINE static
56#endif 55#endif
57 56
58#define expect_false(expr) expect ((expr) != 0, 0) 57#define expect_false(expr) expect ((expr) != 0, 0)
59#define expect_true(expr) expect ((expr) != 0, 1) 58#define expect_true(expr) expect ((expr) != 0, 1)
60 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
61static HV *json_stash, *json_boolean_stash; // JSON::XS:: 74static HV *json_stash, *json_boolean_stash; // JSON::XS::
62static SV *json_true, *json_false; 75static SV *json_true, *json_false;
63 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
64typedef struct { 86typedef struct {
65 U32 flags; 87 U32 flags;
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;
66} JSON; 99} JSON;
100
101INLINE void
102json_init (JSON *json)
103{
104 Zero (json, 1, JSON);
105 json->max_depth = 512;
106}
67 107
68///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
69// utility functions 109// utility functions
70 110
71inline 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
72shrink (SV *sv) 123shrink (SV *sv)
73{ 124{
74 sv_utf8_downgrade (sv, 1); 125 sv_utf8_downgrade (sv, 1);
126
75 if (SvLEN (sv) > SvCUR (sv) + 1) 127 if (SvLEN (sv) > SvCUR (sv) + 1)
76 { 128 {
77#ifdef SvPV_shrink_to_cur 129#ifdef SvPV_shrink_to_cur
78 SvPV_shrink_to_cur (sv); 130 SvPV_shrink_to_cur (sv);
79#elif defined (SvPV_renew) 131#elif defined (SvPV_renew)
… …
85// 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
86// case of an error. 138// case of an error.
87// we special-case "safe" characters from U+80 .. U+7FF, 139// we special-case "safe" characters from U+80 .. U+7FF,
88// but use the very good perl function to parse anything else. 140// but use the very good perl function to parse anything else.
89// note that we never call this function for a ascii codepoints 141// note that we never call this function for a ascii codepoints
90inline UV 142INLINE UV
91decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 143decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
92{ 144{
93 if (expect_false (s[0] > 0xdf || s[0] < 0xc2)) 145 if (expect_true (len >= 2
94 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 146 && IN_RANGE_INC (char, s[0], 0xc2, 0xdf)
95 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 147 && IN_RANGE_INC (char, s[1], 0x80, 0xbf)))
96 { 148 {
97 *clen = 2; 149 *clen = 2;
98 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 150 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
99 } 151 }
100 else 152 else
101 { 153 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
102 *clen = (STRLEN)-1; 154}
103 return (UV)-1; 155
104 } 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);
105} 187}
106 188
107///////////////////////////////////////////////////////////////////////////// 189/////////////////////////////////////////////////////////////////////////////
108// encoder 190// encoder
109 191
… …
113 char *cur; // SvPVX (sv) + current output position 195 char *cur; // SvPVX (sv) + current output position
114 char *end; // SvEND (sv) 196 char *end; // SvEND (sv)
115 SV *sv; // result scalar 197 SV *sv; // result scalar
116 JSON json; 198 JSON json;
117 U32 indent; // indentation level 199 U32 indent; // indentation level
118 U32 maxdepth; // max. indentation/recursion level 200 UV limit; // escape character values >= this value when encoding
119} enc_t; 201} enc_t;
120 202
121inline void 203INLINE void
122need (enc_t *enc, STRLEN len) 204need (enc_t *enc, STRLEN len)
123{ 205{
124 if (expect_false (enc->cur + len >= enc->end)) 206 if (expect_false (enc->cur + len >= enc->end))
125 { 207 {
126 STRLEN cur = enc->cur - SvPVX (enc->sv); 208 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
127 SvGROW (enc->sv, cur + len + 1); 209 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
128 enc->cur = SvPVX (enc->sv) + cur; 210 enc->cur = SvPVX (enc->sv) + cur;
129 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 211 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
130 } 212 }
131} 213}
132 214
133inline void 215INLINE void
134encode_ch (enc_t *enc, char ch) 216encode_ch (enc_t *enc, char ch)
135{ 217{
136 need (enc, 1); 218 need (enc, 1);
137 *enc->cur++ = ch; 219 *enc->cur++ = ch;
138} 220}
… …
192 { 274 {
193 uch = ch; 275 uch = ch;
194 clen = 1; 276 clen = 1;
195 } 277 }
196 278
197 if (uch > 0x10FFFFUL) 279 if (uch < 0x80/*0x20*/ || uch >= enc->limit)
198 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
199
200 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
201 { 280 {
202 if (uch > 0xFFFFUL) 281 if (uch >= 0x10000UL)
203 { 282 {
283 if (uch >= 0x110000UL)
284 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
285
204 need (enc, len += 11); 286 need (enc, len += 11);
205 sprintf (enc->cur, "\\u%04x\\u%04x", 287 sprintf (enc->cur, "\\u%04x\\u%04x",
206 (int)((uch - 0x10000) / 0x400 + 0xD800), 288 (int)((uch - 0x10000) / 0x400 + 0xD800),
207 (int)((uch - 0x10000) % 0x400 + 0xDC00)); 289 (int)((uch - 0x10000) % 0x400 + 0xDC00));
208 enc->cur += 12; 290 enc->cur += 12;
209 } 291 }
210 else 292 else
211 { 293 {
212 static char hexdigit [16] = "0123456789abcdef";
213 need (enc, len += 5); 294 need (enc, len += 5);
214 *enc->cur++ = '\\'; 295 *enc->cur++ = '\\';
215 *enc->cur++ = 'u'; 296 *enc->cur++ = 'u';
216 *enc->cur++ = hexdigit [ uch >> 12 ]; 297 *enc->cur++ = PL_hexdigit [ uch >> 12 ];
217 *enc->cur++ = hexdigit [(uch >> 8) & 15]; 298 *enc->cur++ = PL_hexdigit [(uch >> 8) & 15];
218 *enc->cur++ = hexdigit [(uch >> 4) & 15]; 299 *enc->cur++ = PL_hexdigit [(uch >> 4) & 15];
219 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 300 *enc->cur++ = PL_hexdigit [(uch >> 0) & 15];
220 } 301 }
221 302
222 str += clen; 303 str += clen;
223 } 304 }
224 else if (enc->json.flags & F_LATIN1) 305 else if (enc->json.flags & F_LATIN1)
… …
236 while (--clen); 317 while (--clen);
237 } 318 }
238 else 319 else
239 { 320 {
240 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
241 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 322 enc->cur = encode_utf8 (enc->cur, uch);
242 ++str; 323 ++str;
243 } 324 }
244 } 325 }
245 } 326 }
246 } 327 }
247 328
248 --len; 329 --len;
249 } 330 }
250} 331}
251 332
252inline void 333INLINE void
253encode_indent (enc_t *enc) 334encode_indent (enc_t *enc)
254{ 335{
255 if (enc->json.flags & F_INDENT) 336 if (enc->json.flags & F_INDENT)
256 { 337 {
257 int spaces = enc->indent * INDENT_STEP; 338 int spaces = enc->indent * INDENT_STEP;
… …
260 memset (enc->cur, ' ', spaces); 341 memset (enc->cur, ' ', spaces);
261 enc->cur += spaces; 342 enc->cur += spaces;
262 } 343 }
263} 344}
264 345
265inline void 346INLINE void
266encode_space (enc_t *enc) 347encode_space (enc_t *enc)
267{ 348{
268 need (enc, 1); 349 need (enc, 1);
269 encode_ch (enc, ' '); 350 encode_ch (enc, ' ');
270} 351}
271 352
272inline void 353INLINE void
273encode_nl (enc_t *enc) 354encode_nl (enc_t *enc)
274{ 355{
275 if (enc->json.flags & F_INDENT) 356 if (enc->json.flags & F_INDENT)
276 { 357 {
277 need (enc, 1); 358 need (enc, 1);
278 encode_ch (enc, '\n'); 359 encode_ch (enc, '\n');
279 } 360 }
280} 361}
281 362
282inline void 363INLINE void
283encode_comma (enc_t *enc) 364encode_comma (enc_t *enc)
284{ 365{
285 encode_ch (enc, ','); 366 encode_ch (enc, ',');
286 367
287 if (enc->json.flags & F_INDENT) 368 if (enc->json.flags & F_INDENT)
… …
295static void 376static void
296encode_av (enc_t *enc, AV *av) 377encode_av (enc_t *enc, AV *av)
297{ 378{
298 int i, len = av_len (av); 379 int i, len = av_len (av);
299 380
300 if (enc->indent >= enc->maxdepth) 381 if (enc->indent >= enc->json.max_depth)
301 croak ("data structure too deep (hit recursion limit)"); 382 croak (ERR_NESTING_EXCEEDED);
302 383
303 encode_ch (enc, '['); encode_nl (enc); 384 encode_ch (enc, '[');
304 ++enc->indent; 385
386 if (len >= 0)
387 {
388 encode_nl (enc); ++enc->indent;
305 389
306 for (i = 0; i <= len; ++i) 390 for (i = 0; i <= len; ++i)
307 { 391 {
392 SV **svp = av_fetch (av, i, 0);
393
308 encode_indent (enc); 394 encode_indent (enc);
309 encode_sv (enc, *av_fetch (av, i, 0));
310 395
396 if (svp)
397 encode_sv (enc, *svp);
398 else
399 encode_str (enc, "null", 4, 0);
400
311 if (i < len) 401 if (i < len)
312 encode_comma (enc); 402 encode_comma (enc);
313 } 403 }
314 404
405 encode_nl (enc); --enc->indent; encode_indent (enc);
406 }
407
315 encode_nl (enc); 408 encode_ch (enc, ']');
316
317 --enc->indent;
318 encode_indent (enc); encode_ch (enc, ']');
319} 409}
320 410
321static void 411static void
322encode_he (enc_t *enc, HE *he) 412encode_hk (enc_t *enc, HE *he)
323{ 413{
324 encode_ch (enc, '"'); 414 encode_ch (enc, '"');
325 415
326 if (HeKLEN (he) == HEf_SVKEY) 416 if (HeKLEN (he) == HEf_SVKEY)
327 { 417 {
… …
340 encode_ch (enc, '"'); 430 encode_ch (enc, '"');
341 431
342 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc); 432 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
343 encode_ch (enc, ':'); 433 encode_ch (enc, ':');
344 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc); 434 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
345 encode_sv (enc, HeVAL (he));
346} 435}
347 436
348// compare hash entries, used when all keys are bytestrings 437// compare hash entries, used when all keys are bytestrings
349static int 438static int
350he_cmp_fast (const void *a_, const void *b_) 439he_cmp_fast (const void *a_, const void *b_)
… …
355 HE *b = *(HE **)b_; 444 HE *b = *(HE **)b_;
356 445
357 STRLEN la = HeKLEN (a); 446 STRLEN la = HeKLEN (a);
358 STRLEN lb = HeKLEN (b); 447 STRLEN lb = HeKLEN (b);
359 448
360 if (!(cmp = memcmp (HeKEY (a), HeKEY (b), la < lb ? la : lb))) 449 if (!(cmp = memcmp (HeKEY (b), HeKEY (a), lb < la ? lb : la)))
361 cmp = la - lb; 450 cmp = lb - la;
362 451
363 return cmp; 452 return cmp;
364} 453}
365 454
366// 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
367static int 456static int
368he_cmp_slow (const void *a, const void *b) 457he_cmp_slow (const void *a, const void *b)
369{ 458{
370 return sv_cmp (HeSVKEY_force (*(HE **)a), HeSVKEY_force (*(HE **)b)); 459 return sv_cmp (HeSVKEY_force (*(HE **)b), HeSVKEY_force (*(HE **)a));
371} 460}
372 461
373static void 462static void
374encode_hv (enc_t *enc, HV *hv) 463encode_hv (enc_t *enc, HV *hv)
375{ 464{
376 int count, i; 465 HE *he;
377 466
378 if (enc->indent >= enc->maxdepth) 467 if (enc->indent >= enc->json.max_depth)
379 croak ("data structure too deep (hit recursion limit)"); 468 croak (ERR_NESTING_EXCEEDED);
380 469
381 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 470 encode_ch (enc, '{');
382 471
383 if ((count = hv_iterinit (hv)))
384 {
385 // for canonical output we have to sort by keys first 472 // for canonical output we have to sort by keys first
386 // actually, this is mostly due to the stupid so-called 473 // actually, this is mostly due to the stupid so-called
387 // security workaround added somewhere in 5.8.x. 474 // security workaround added somewhere in 5.8.x
388 // that randomises hash orderings 475 // that randomises hash orderings
389 if (enc->json.flags & F_CANONICAL) 476 if (enc->json.flags & F_CANONICAL && !SvRMAGICAL (hv))
477 {
478 int count = hv_iterinit (hv);
479
480 if (SvMAGICAL (hv))
390 { 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 {
391 int fast = 1; 496 int i, fast = 1;
392 HE *he;
393#if defined(__BORLANDC__) || defined(_MSC_VER) 497#if defined(__BORLANDC__) || defined(_MSC_VER)
394 HE **hes = _alloca (count * sizeof (HE)); 498 HE **hes = _alloca (count * sizeof (HE));
395#else 499#else
396 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
397#endif 501#endif
… …
424 528
425 FREETMPS; 529 FREETMPS;
426 LEAVE; 530 LEAVE;
427 } 531 }
428 532
429 for (i = 0; i < count; ++i) 533 encode_nl (enc); ++enc->indent;
534
535 while (count--)
430 { 536 {
431 encode_indent (enc); 537 encode_indent (enc);
538 he = hes [count];
432 encode_he (enc, hes [i]); 539 encode_hk (enc, he);
540 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
433 541
434 if (i < count - 1) 542 if (count)
435 encode_comma (enc); 543 encode_comma (enc);
436 } 544 }
437 545
438 encode_nl (enc); 546 encode_nl (enc); --enc->indent; encode_indent (enc);
439 } 547 }
548 }
440 else 549 else
550 {
551 if (hv_iterinit (hv) || SvMAGICAL (hv))
552 if ((he = hv_iternext (hv)))
441 { 553 {
442 HE *he = hv_iternext (hv); 554 encode_nl (enc); ++enc->indent;
443 555
444 for (;;) 556 for (;;)
445 { 557 {
446 encode_indent (enc); 558 encode_indent (enc);
447 encode_he (enc, he); 559 encode_hk (enc, he);
560 encode_sv (enc, expect_false (SvMAGICAL (hv)) ? hv_iterval (hv, he) : HeVAL (he));
448 561
449 if (!(he = hv_iternext (hv))) 562 if (!(he = hv_iternext (hv)))
450 break; 563 break;
451 564
452 encode_comma (enc); 565 encode_comma (enc);
453 } 566 }
454 567
455 encode_nl (enc); 568 encode_nl (enc); --enc->indent; encode_indent (enc);
456 } 569 }
457 } 570 }
458 571
459 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 572 encode_ch (enc, '}');
460} 573}
461 574
462// encode objects, arrays and special \0=false and \1=true values. 575// encode objects, arrays and special \0=false and \1=true values.
463static void 576static void
464encode_rv (enc_t *enc, SV *sv) 577encode_rv (enc_t *enc, SV *sv)
… …
468 SvGETMAGIC (sv); 581 SvGETMAGIC (sv);
469 svt = SvTYPE (sv); 582 svt = SvTYPE (sv);
470 583
471 if (expect_false (SvOBJECT (sv))) 584 if (expect_false (SvOBJECT (sv)))
472 { 585 {
586 HV *stash = !JSON_SLOW || json_boolean_stash
587 ? json_boolean_stash
588 : gv_stashpv ("JSON::XS::Boolean", 1);
589
473 if (SvSTASH (sv) == json_boolean_stash) 590 if (SvSTASH (sv) == stash)
474 { 591 {
475 if (SvIV (sv) == 0) 592 if (SvIV (sv))
593 encode_str (enc, "true", 4, 0);
594 else
476 encode_str (enc, "false", 5, 0); 595 encode_str (enc, "false", 5, 0);
477 else
478 encode_str (enc, "true", 4, 0);
479 } 596 }
480 else 597 else
481 { 598 {
482#if 0 599#if 0
483 if (0 && sv_derived_from (rv, "JSON::Literal")) 600 if (0 && sv_derived_from (rv, "JSON::Literal"))
… …
486 } 603 }
487#endif 604#endif
488 if (enc->json.flags & F_CONV_BLESSED) 605 if (enc->json.flags & F_CONV_BLESSED)
489 { 606 {
490 // 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
491 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1); 608 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
492 609
493 if (to_json) 610 if (to_json)
494 { 611 {
495 dSP; 612 dSP;
496 ENTER; 613
497 SAVETMPS;
498 PUSHMARK (SP); 614 ENTER; SAVETMPS; PUSHMARK (SP);
499 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 615 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
500 616
501 // 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
502 // check anyways.
503 PUTBACK; 618 PUTBACK;
504 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR)); 619 call_sv ((SV *)GvCV (to_json), G_SCALAR);
505 SPAGAIN; 620 SPAGAIN;
506 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
507 encode_sv (enc, POPs); 629 encode_sv (enc, sv);
508 630
509 FREETMPS; 631 FREETMPS; LEAVE;
510 LEAVE;
511 } 632 }
512 else if (enc->json.flags & F_ALLOW_BLESSED) 633 else if (enc->json.flags & F_ALLOW_BLESSED)
513 encode_str (enc, "null", 4, 0); 634 encode_str (enc, "null", 4, 0);
514 else 635 else
515 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it", 636 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
… …
526 encode_hv (enc, (HV *)sv); 647 encode_hv (enc, (HV *)sv);
527 else if (svt == SVt_PVAV) 648 else if (svt == SVt_PVAV)
528 encode_av (enc, (AV *)sv); 649 encode_av (enc, (AV *)sv);
529 else if (svt < SVt_PVAV) 650 else if (svt < SVt_PVAV)
530 { 651 {
531 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')
532 encode_str (enc, "false", 5, 0); 658 encode_str (enc, "false", 5, 0);
533 else if (SvNIOK (sv) && SvIV (sv) == 1) 659 else if (enc->json.flags & F_ALLOW_UNKNOWN)
534 encode_str (enc, "true", 4, 0); 660 encode_str (enc, "null", 4, 0);
535 else 661 else
536 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",
537 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 663 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
538 } 664 }
665 else if (enc->json.flags & F_ALLOW_UNKNOWN)
666 encode_str (enc, "null", 4, 0);
539 else 667 else
540 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",
541 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 669 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
542} 670}
543 671
… …
561 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 689 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
562 enc->cur += strlen (enc->cur); 690 enc->cur += strlen (enc->cur);
563 } 691 }
564 else if (SvIOKp (sv)) 692 else if (SvIOKp (sv))
565 { 693 {
566 // 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
567 if (SvUV (sv) & ~(UV)0x7fff) 695 // we assume two's complement
568 { 696 // we assume no aliasing issues in the union
569 // large integer, use the (rather slow) snprintf way. 697 if (SvIsUV (sv) ? SvUVX (sv) <= 59000
570 need (enc, sizeof (UV) * 3); 698 : SvIVX (sv) <= 59000 && SvIVX (sv) >= -59000)
571 enc->cur +=
572 SvIsUV(sv)
573 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
574 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
575 }
576 else
577 { 699 {
578 // optimise the "small number case" 700 // optimise the "small number case"
579 // 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
580 I32 i = SvIV (sv); 703 I32 i = SvIVX (sv);
581 U32 u; 704 U32 u;
582 char digit, nz = 0; 705 char digit, nz = 0;
583 706
584 need (enc, 6); 707 need (enc, 6);
585 708
… …
591 714
592 // 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
593 // 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,
594 // resulting in a net multiplication by 10. 717 // resulting in a net multiplication by 10.
595 // we always write the digit to memory but conditionally increment 718 // we always write the digit to memory but conditionally increment
596 // the pointer, to ease the usage of conditional move instructions. 719 // the pointer, to enable the use of conditional move instructions.
597 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;
598 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;
599 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;
600 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;
601 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'
602 } 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 }
603 } 735 }
604 else if (SvROK (sv)) 736 else if (SvROK (sv))
605 encode_rv (enc, SvRV (sv)); 737 encode_rv (enc, SvRV (sv));
606 else if (!SvOK (sv)) 738 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
607 encode_str (enc, "null", 4, 0); 739 encode_str (enc, "null", 4, 0);
608 else 740 else
609 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",
610 SvPV_nolen (sv), SvFLAGS (sv)); 742 SvPV_nolen (sv), SvFLAGS (sv));
611} 743}
… …
621 enc.json = *json; 753 enc.json = *json;
622 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 754 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
623 enc.cur = SvPVX (enc.sv); 755 enc.cur = SvPVX (enc.sv);
624 enc.end = SvEND (enc.sv); 756 enc.end = SvEND (enc.sv);
625 enc.indent = 0; 757 enc.indent = 0;
626 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;
627 761
628 SvPOK_only (enc.sv); 762 SvPOK_only (enc.sv);
629 encode_sv (&enc, scalar); 763 encode_sv (&enc, scalar);
630 764
631 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 765 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
… …
652 JSON json; 786 JSON json;
653 U32 depth; // recursion depth 787 U32 depth; // recursion depth
654 U32 maxdepth; // recursion depth limit 788 U32 maxdepth; // recursion depth limit
655} dec_t; 789} dec_t;
656 790
657inline 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
658decode_ws (dec_t *dec) 801decode_ws (dec_t *dec)
659{ 802{
660 for (;;) 803 for (;;)
661 { 804 {
662 char ch = *dec->cur; 805 char ch = *dec->cur;
663 806
664 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 }
665 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) 819 else if (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)
666 break; 820 break; // parse error, but let higher level handle it, gives better error messages
667 821
668 ++dec->cur; 822 ++dec->cur;
669 } 823 }
670} 824}
671 825
… …
675 if (*dec->cur != ch) \ 829 if (*dec->cur != ch) \
676 ERR (# ch " expected"); \ 830 ERR (# ch " expected"); \
677 ++dec->cur; \ 831 ++dec->cur; \
678 SE 832 SE
679 833
680#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)
681#define DEC_DEC_DEPTH --dec->depth 835#define DEC_DEC_DEPTH --dec->depth
682 836
683static SV *decode_sv (dec_t *dec); 837static SV *decode_sv (dec_t *dec);
684 838
685static signed char decode_hexdigit[256]; 839static signed char decode_hexdigit[256];
… …
777 931
778 if (hi >= 0x80) 932 if (hi >= 0x80)
779 { 933 {
780 utf8 = 1; 934 utf8 = 1;
781 935
782 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0); 936 cur = encode_utf8 (cur, hi);
783 } 937 }
784 else 938 else
785 *cur++ = hi; 939 *cur++ = hi;
786 } 940 }
787 break; 941 break;
… …
789 default: 943 default:
790 --dec_cur; 944 --dec_cur;
791 ERR ("illegal backslash escape sequence in string"); 945 ERR ("illegal backslash escape sequence in string");
792 } 946 }
793 } 947 }
794 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 948 else if (expect_true (ch >= 0x20 && ch < 0x80))
795 *cur++ = ch; 949 *cur++ = ch;
796 else if (ch >= 0x80) 950 else if (ch >= 0x80)
797 { 951 {
798 STRLEN clen; 952 STRLEN clen;
799 UV uch; 953 UV uch;
… …
825 { 979 {
826 STRLEN len = cur - buf; 980 STRLEN len = cur - buf;
827 981
828 if (sv) 982 if (sv)
829 { 983 {
830 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
831 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 989 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
832 SvCUR_set (sv, SvCUR (sv) + len); 990 SvCUR_set (sv, SvCUR (sv) + len);
833 } 991 }
834 else 992 else
835 sv = newSVpvn (buf, len); 993 sv = newSVpvn (buf, len);
… …
920 is_nv = 1; 1078 is_nv = 1;
921 } 1079 }
922 1080
923 if (!is_nv) 1081 if (!is_nv)
924 { 1082 {
1083 int len = dec->cur - start;
1084
925 // 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
926 if (*start == '-') 1086 if (*start == '-')
927 switch (dec->cur - start) 1087 switch (len)
928 { 1088 {
929 case 2: return newSViv (-( start [1] - '0' * 1)); 1089 case 2: return newSViv (-(IV)( start [1] - '0' * 1));
930 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 1090 case 3: return newSViv (-(IV)( start [1] * 10 + start [2] - '0' * 11));
931 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 1091 case 4: return newSViv (-(IV)( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
932 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 1092 case 5: return newSViv (-(IV)( start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
1093 case 6: return newSViv (-(IV)(start [1] * 10000 + start [2] * 1000 + start [3] * 100 + start [4] * 10 + start [5] - '0' * 11111));
933 } 1094 }
934 else 1095 else
935 switch (dec->cur - start) 1096 switch (len)
936 { 1097 {
937 case 1: return newSViv ( start [0] - '0' * 1); 1098 case 1: return newSViv ( start [0] - '0' * 1);
938 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 1099 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
939 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);
940 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);
941 } 1103 }
942 1104
943 { 1105 {
944 UV uv; 1106 UV uv;
945 int numtype = grok_number (start, dec->cur - start, &uv); 1107 int numtype = grok_number (start, len, &uv);
946 if (numtype & IS_NUMBER_IN_UV) 1108 if (numtype & IS_NUMBER_IN_UV)
947 if (numtype & IS_NUMBER_NEG) 1109 if (numtype & IS_NUMBER_NEG)
948 { 1110 {
949 if (uv < (UV)IV_MIN) 1111 if (uv < (UV)IV_MIN)
950 return newSViv (-(IV)uv); 1112 return newSViv (-(IV)uv);
951 } 1113 }
952 else 1114 else
953 return newSVuv (uv); 1115 return newSVuv (uv);
954
955 // here would likely be the place for bigint support
956 } 1116 }
957 }
958 1117
959 // 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
960 return newSVnv (Atof (start)); 1134 return newSVnv (Atof (start));
961 1135
962fail: 1136fail:
963 return 0; 1137 return 0;
964} 1138}
… …
994 1168
995 if (*dec->cur != ',') 1169 if (*dec->cur != ',')
996 ERR (", or ] expected while parsing array"); 1170 ERR (", or ] expected while parsing array");
997 1171
998 ++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 }
999 } 1181 }
1000 1182
1001 DEC_DEC_DEPTH; 1183 DEC_DEC_DEPTH;
1002 return newRV_noinc ((SV *)av); 1184 return newRV_noinc ((SV *)av);
1003 1185
… …
1008} 1190}
1009 1191
1010static SV * 1192static SV *
1011decode_hv (dec_t *dec) 1193decode_hv (dec_t *dec)
1012{ 1194{
1195 SV *sv;
1013 HV *hv = newHV (); 1196 HV *hv = newHV ();
1014 1197
1015 DEC_INC_DEPTH; 1198 DEC_INC_DEPTH;
1016 decode_ws (dec); 1199 decode_ws (dec);
1017 1200
1018 if (*dec->cur == '}') 1201 if (*dec->cur == '}')
1019 ++dec->cur; 1202 ++dec->cur;
1020 else 1203 else
1021 for (;;) 1204 for (;;)
1022 { 1205 {
1023 decode_ws (dec); EXPECT_CH ('"'); 1206 EXPECT_CH ('"');
1024 1207
1025 // heuristic: assume that 1208 // heuristic: assume that
1026 // a) decode_str + hv_store_ent are abysmally slow. 1209 // a) decode_str + hv_store_ent are abysmally slow.
1027 // b) most hash keys are short, simple ascii text. 1210 // b) most hash keys are short, simple ascii text.
1028 // => try to "fast-match" such strings to avoid 1211 // => try to "fast-match" such strings to avoid
… …
1032 char *p = dec->cur; 1215 char *p = dec->cur;
1033 char *e = p + 24; // only try up to 24 bytes 1216 char *e = p + 24; // only try up to 24 bytes
1034 1217
1035 for (;;) 1218 for (;;)
1036 { 1219 {
1037 // the >= 0x80 is true on most architectures 1220 // the >= 0x80 is false on most architectures
1038 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') 1221 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1039 { 1222 {
1040 // slow path, back up and use decode_str 1223 // slow path, back up and use decode_str
1041 SV *key = decode_str (dec); 1224 SV *key = decode_str (dec);
1042 if (!key) 1225 if (!key)
1043 goto fail; 1226 goto fail;
1044 1227
1045 decode_ws (dec); EXPECT_CH (':'); 1228 decode_ws (dec); EXPECT_CH (':');
1046 1229
1230 decode_ws (dec);
1047 value = decode_sv (dec); 1231 value = decode_sv (dec);
1048 if (!value) 1232 if (!value)
1049 { 1233 {
1050 SvREFCNT_dec (key); 1234 SvREFCNT_dec (key);
1051 goto fail; 1235 goto fail;
… …
1063 int len = p - key; 1247 int len = p - key;
1064 dec->cur = p + 1; 1248 dec->cur = p + 1;
1065 1249
1066 decode_ws (dec); EXPECT_CH (':'); 1250 decode_ws (dec); EXPECT_CH (':');
1067 1251
1252 decode_ws (dec);
1068 value = decode_sv (dec); 1253 value = decode_sv (dec);
1069 if (!value) 1254 if (!value)
1070 goto fail; 1255 goto fail;
1071 1256
1072 hv_store (hv, key, len, value, 0); 1257 hv_store (hv, key, len, value, 0);
… …
1088 1273
1089 if (*dec->cur != ',') 1274 if (*dec->cur != ',')
1090 ERR (", or } expected while parsing object/hash"); 1275 ERR (", or } expected while parsing object/hash");
1091 1276
1092 ++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 }
1093 } 1286 }
1094 1287
1095 DEC_DEC_DEPTH; 1288 DEC_DEC_DEPTH;
1096 return newRV_noinc ((SV *)hv); 1289 sv = newRV_noinc ((SV *)hv);
1290
1291 // check filter callbacks
1292 if (dec->json.flags & F_HOOK)
1293 {
1294 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
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;
1309 int count;
1310
1311 ENTER; SAVETMPS; PUSHMARK (SP);
1312 XPUSHs (HeVAL (he));
1313
1314 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1315
1316 if (count == 1)
1317 {
1318 sv = newSVsv (POPs);
1319 FREETMPS; LEAVE;
1320 return sv;
1321 }
1322
1323 FREETMPS; LEAVE;
1324 }
1325 }
1326
1327 if (dec->json.cb_object)
1328 {
1329 dSP;
1330 int count;
1331
1332 ENTER; SAVETMPS; PUSHMARK (SP);
1333 XPUSHs (sv_2mortal (sv));
1334
1335 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1336
1337 if (count == 1)
1338 {
1339 sv = newSVsv (POPs);
1340 FREETMPS; LEAVE;
1341 return sv;
1342 }
1343
1344 SvREFCNT_inc (sv);
1345 FREETMPS; LEAVE;
1346 }
1347 }
1348
1349 return sv;
1097 1350
1098fail: 1351fail:
1099 SvREFCNT_dec (hv); 1352 SvREFCNT_dec (hv);
1100 DEC_DEC_DEPTH; 1353 DEC_DEC_DEPTH;
1101 return 0; 1354 return 0;
1102} 1355}
1103 1356
1104static SV * 1357static SV *
1105decode_sv (dec_t *dec) 1358decode_sv (dec_t *dec)
1106{ 1359{
1107 decode_ws (dec);
1108
1109 // the beauty of JSON: you need exactly one character lookahead 1360 // the beauty of JSON: you need exactly one character lookahead
1110 // to parse anything. 1361 // to parse everything.
1111 switch (*dec->cur) 1362 switch (*dec->cur)
1112 { 1363 {
1113 case '"': ++dec->cur; return decode_str (dec); 1364 case '"': ++dec->cur; return decode_str (dec);
1114 case '[': ++dec->cur; return decode_av (dec); 1365 case '[': ++dec->cur; return decode_av (dec);
1115 case '{': ++dec->cur; return decode_hv (dec); 1366 case '{': ++dec->cur; return decode_hv (dec);
1116 1367
1117 case '-': 1368 case '-':
1118 case '0': case '1': case '2': case '3': case '4': 1369 case '0': case '1': case '2': case '3': case '4':
1119 case '5': case '6': case '7': case '8': case '9': 1370 case '5': case '6': case '7': case '8': case '9':
1120 return decode_num (dec); 1371 return decode_num (dec);
1121 1372
1122 case 't': 1373 case 't':
1123 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1374 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1124 { 1375 {
1125 dec->cur += 4; 1376 dec->cur += 4;
1377#if JSON_SLOW
1378 json_true = get_bool ("JSON::XS::true");
1379#endif
1126 return SvREFCNT_inc (json_true); 1380 return newSVsv (json_true);
1127 } 1381 }
1128 else 1382 else
1129 ERR ("'true' expected"); 1383 ERR ("'true' expected");
1130 1384
1131 break; 1385 break;
1132 1386
1133 case 'f': 1387 case 'f':
1134 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1388 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1135 { 1389 {
1136 dec->cur += 5; 1390 dec->cur += 5;
1391#if JSON_SLOW
1392 json_false = get_bool ("JSON::XS::false");
1393#endif
1137 return SvREFCNT_inc (json_false); 1394 return newSVsv (json_false);
1138 } 1395 }
1139 else 1396 else
1140 ERR ("'false' expected"); 1397 ERR ("'false' expected");
1141 1398
1142 break; 1399 break;
… …
1160fail: 1417fail:
1161 return 0; 1418 return 0;
1162} 1419}
1163 1420
1164static SV * 1421static SV *
1165decode_json (SV *string, JSON *json, UV *offset_return) 1422decode_json (SV *string, JSON *json, char **offset_return)
1166{ 1423{
1167 dec_t dec; 1424 dec_t dec;
1168 UV offset;
1169 SV *sv; 1425 SV *sv;
1170 1426
1427 /* work around bugs in 5.10 where manipulating magic values
1428 * will perl ignore the magic in subsequent accesses
1429 */
1171 SvGETMAGIC (string); 1430 /*SvGETMAGIC (string);*/
1431 if (SvMAGICAL (string))
1432 string = sv_2mortal (newSVsv (string));
1433
1172 SvUPGRADE (string, SVt_PV); 1434 SvUPGRADE (string, SVt_PV);
1173 1435
1174 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)
1175 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",
1176 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags)); 1455 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1456 }
1177 1457
1178 if (json->flags & F_UTF8) 1458 if (json->flags & F_UTF8)
1179 sv_utf8_downgrade (string, 0); 1459 sv_utf8_downgrade (string, 0);
1180 else 1460 else
1181 sv_utf8_upgrade (string); 1461 sv_utf8_upgrade (string);
1182 1462
1183 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1463 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1184 1464
1185 dec.json = *json; 1465 dec.json = *json;
1186 dec.cur = SvPVX (string); 1466 dec.cur = SvPVX (string);
1187 dec.end = SvEND (string); 1467 dec.end = SvEND (string);
1188 dec.err = 0; 1468 dec.err = 0;
1189 dec.depth = 0; 1469 dec.depth = 0;
1190 dec.maxdepth = DEC_DEPTH (dec.json.flags); 1470
1471 if (dec.json.cb_object || dec.json.cb_sk_object)
1472 dec.json.flags |= F_HOOK;
1191 1473
1192 *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);
1193 sv = decode_sv (&dec); 1477 sv = decode_sv (&dec);
1478
1479 if (offset_return)
1480 *offset_return = dec.cur;
1194 1481
1195 if (!(offset_return || !sv)) 1482 if (!(offset_return || !sv))
1196 { 1483 {
1197 // check for trailing garbage 1484 // check for trailing garbage
1198 decode_ws (&dec); 1485 decode_ws (&dec);
… …
1201 { 1488 {
1202 dec.err = "garbage after JSON object"; 1489 dec.err = "garbage after JSON object";
1203 SvREFCNT_dec (sv); 1490 SvREFCNT_dec (sv);
1204 sv = 0; 1491 sv = 0;
1205 } 1492 }
1206 }
1207
1208 if (offset_return || !sv)
1209 {
1210 offset = dec.json.flags & F_UTF8
1211 ? dec.cur - SvPVX (string)
1212 : utf8_distance (dec.cur, SvPVX (string));
1213
1214 if (offset_return)
1215 *offset_return = offset;
1216 } 1493 }
1217 1494
1218 if (!sv) 1495 if (!sv)
1219 { 1496 {
1220 SV *uni = sv_newmortal (); 1497 SV *uni = sv_newmortal ();
… …
1226 SAVEVPTR (PL_curcop); 1503 SAVEVPTR (PL_curcop);
1227 PL_curcop = &cop; 1504 PL_curcop = &cop;
1228 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);
1229 LEAVE; 1506 LEAVE;
1230 1507
1231 croak ("%s, at character offset %d [\"%s\"]", 1508 croak ("%s, at character offset %d (before \"%s\")",
1232 dec.err, 1509 dec.err,
1233 (int)offset, 1510 ptr_to_index (string, dec.cur),
1234 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1511 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1235 } 1512 }
1236 1513
1237 sv = sv_2mortal (sv); 1514 sv = sv_2mortal (sv);
1238 1515
1239 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1516 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1240 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)");
1241 1518
1242 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
1243} 1637}
1244 1638
1245///////////////////////////////////////////////////////////////////////////// 1639/////////////////////////////////////////////////////////////////////////////
1246// XS interface functions 1640// XS interface functions
1247 1641
… …
1259 : -1; 1653 : -1;
1260 1654
1261 json_stash = gv_stashpv ("JSON::XS" , 1); 1655 json_stash = gv_stashpv ("JSON::XS" , 1);
1262 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1656 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1263 1657
1264 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true ); 1658 json_true = get_bool ("JSON::XS::true");
1265 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false); 1659 json_false = get_bool ("JSON::XS::false");
1660
1661 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1266} 1662}
1267 1663
1268PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1665
1666void CLONE (...)
1667 CODE:
1668 json_stash = 0;
1669 json_boolean_stash = 0;
1269 1670
1270void new (char *klass) 1671void new (char *klass)
1271 PPCODE: 1672 PPCODE:
1272{ 1673{
1273 SV *pv = NEWSV (0, sizeof (JSON)); 1674 SV *pv = NEWSV (0, sizeof (JSON));
1274 SvPOK_only (pv); 1675 SvPOK_only (pv);
1275 Zero (SvPVX (pv), 1, sizeof (JSON)); 1676 json_init ((JSON *)SvPVX (pv));
1276 ((JSON *)SvPVX (pv))->flags = F_DEFAULT; 1677 XPUSHs (sv_2mortal (sv_bless (
1277 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash))); 1678 newRV_noinc (pv),
1679 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
1680 )));
1278} 1681}
1279 1682
1280void ascii (JSON *self, int enable = 1) 1683void ascii (JSON *self, int enable = 1)
1281 ALIAS: 1684 ALIAS:
1282 ascii = F_ASCII 1685 ascii = F_ASCII
… …
1289 pretty = F_PRETTY 1692 pretty = F_PRETTY
1290 allow_nonref = F_ALLOW_NONREF 1693 allow_nonref = F_ALLOW_NONREF
1291 shrink = F_SHRINK 1694 shrink = F_SHRINK
1292 allow_blessed = F_ALLOW_BLESSED 1695 allow_blessed = F_ALLOW_BLESSED
1293 convert_blessed = F_CONV_BLESSED 1696 convert_blessed = F_CONV_BLESSED
1697 relaxed = F_RELAXED
1698 allow_unknown = F_ALLOW_UNKNOWN
1294 PPCODE: 1699 PPCODE:
1295{ 1700{
1296 if (enable) 1701 if (enable)
1297 self->flags |= ix; 1702 self->flags |= ix;
1298 else 1703 else
1299 self->flags &= ~ix; 1704 self->flags &= ~ix;
1300 1705
1301 XPUSHs (ST (0)); 1706 XPUSHs (ST (0));
1302} 1707}
1303 1708
1304void max_depth (JSON *self, UV max_depth = 0x80000000UL) 1709void get_ascii (JSON *self)
1710 ALIAS:
1711 get_ascii = F_ASCII
1712 get_latin1 = F_LATIN1
1713 get_utf8 = F_UTF8
1714 get_indent = F_INDENT
1715 get_canonical = F_CANONICAL
1716 get_space_before = F_SPACE_BEFORE
1717 get_space_after = F_SPACE_AFTER
1718 get_allow_nonref = F_ALLOW_NONREF
1719 get_shrink = F_SHRINK
1720 get_allow_blessed = F_ALLOW_BLESSED
1721 get_convert_blessed = F_CONV_BLESSED
1722 get_relaxed = F_RELAXED
1723 get_allow_unknown = F_ALLOW_UNKNOWN
1305 PPCODE: 1724 PPCODE:
1306{ 1725 XPUSHs (boolSV (self->flags & ix));
1307 UV log2 = 0;
1308 1726
1309 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1727void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1310 1728 PPCODE:
1311 while ((1UL << log2) < max_depth) 1729 self->max_depth = max_depth;
1312 ++log2;
1313
1314 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1315
1316 XPUSHs (ST (0)); 1730 XPUSHs (ST (0));
1317}
1318 1731
1732U32 get_max_depth (JSON *self)
1733 CODE:
1734 RETVAL = self->max_depth;
1735 OUTPUT:
1736 RETVAL
1737
1319void max_size (JSON *self, UV max_size = 0) 1738void max_size (JSON *self, U32 max_size = 0)
1320 PPCODE: 1739 PPCODE:
1321{ 1740 self->max_size = max_size;
1322 UV log2 = 0; 1741 XPUSHs (ST (0));
1323 1742
1324 if (max_size > 0x80000000UL) max_size = 0x80000000UL; 1743int get_max_size (JSON *self)
1325 if (max_size == 1) max_size = 2; 1744 CODE:
1745 RETVAL = self->max_size;
1746 OUTPUT:
1747 RETVAL
1326 1748
1327 while ((1UL << log2) < max_size) 1749void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1328 ++log2; 1750 PPCODE:
1751{
1752 SvREFCNT_dec (self->cb_object);
1753 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1329 1754
1330 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE); 1755 XPUSHs (ST (0));
1756}
1757
1758void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1759 PPCODE:
1760{
1761 if (!self->cb_sk_object)
1762 self->cb_sk_object = newHV ();
1763
1764 if (SvOK (cb))
1765 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1766 else
1767 {
1768 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1769
1770 if (!HvKEYS (self->cb_sk_object))
1771 {
1772 SvREFCNT_dec (self->cb_sk_object);
1773 self->cb_sk_object = 0;
1774 }
1775 }
1331 1776
1332 XPUSHs (ST (0)); 1777 XPUSHs (ST (0));
1333} 1778}
1334 1779
1335void encode (JSON *self, SV *scalar) 1780void encode (JSON *self, SV *scalar)
… …
1341 XPUSHs (decode_json (jsonstr, self, 0)); 1786 XPUSHs (decode_json (jsonstr, self, 0));
1342 1787
1343void decode_prefix (JSON *self, SV *jsonstr) 1788void decode_prefix (JSON *self, SV *jsonstr)
1344 PPCODE: 1789 PPCODE:
1345{ 1790{
1346 UV offset; 1791 char *offset;
1347 EXTEND (SP, 2); 1792 EXTEND (SP, 2);
1348 PUSHs (decode_json (jsonstr, self, &offset)); 1793 PUSHs (decode_json (jsonstr, self, &offset));
1349 PUSHs (sv_2mortal (newSVuv (offset))); 1794 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1350} 1795}
1796
1797void incr_parse (JSON *self, SV *jsonstr = 0)
1798 PPCODE:
1799{
1800 if (!self->incr_text)
1801 self->incr_text = newSVpvn ("", 0);
1802
1803 // append data, if any
1804 if (jsonstr)
1805 {
1806 if (SvUTF8 (jsonstr))
1807 {
1808 if (!SvUTF8 (self->incr_text))
1809 {
1810 /* utf-8-ness differs, need to upgrade */
1811 sv_utf8_upgrade (self->incr_text);
1812
1813 if (self->incr_pos)
1814 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1815 - (U8 *)SvPVX (self->incr_text);
1816 }
1817 }
1818 else if (SvUTF8 (self->incr_text))
1819 sv_utf8_upgrade (jsonstr);
1820
1821 {
1822 STRLEN len;
1823 const char *str = SvPV (jsonstr, len);
1824 STRLEN cur = SvCUR (self->incr_text);
1825
1826 if (SvLEN (self->incr_text) <= cur + len)
1827 SvGROW (self->incr_text, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
1828
1829 Move (str, SvEND (self->incr_text), len, char);
1830 SvCUR_set (self->incr_text, SvCUR (self->incr_text) + len);
1831 *SvEND (self->incr_text) = 0; // this should basically be a nop, too, but make sure it's there
1832 }
1833 }
1834
1835 if (GIMME_V != G_VOID)
1836 do
1837 {
1838 char *offset;
1839
1840 if (!INCR_DONE (self))
1841 {
1842 incr_parse (self);
1843
1844 if (self->incr_pos > self->max_size && self->max_size)
1845 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1846 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1847
1848 if (!INCR_DONE (self))
1849 break;
1850 }
1851
1852 XPUSHs (decode_json (self->incr_text, self, &offset));
1853
1854 self->incr_pos -= offset - SvPVX (self->incr_text);
1855 self->incr_nest = 0;
1856 self->incr_mode = 0;
1857
1858 sv_chop (self->incr_text, offset);
1859 }
1860 while (GIMME_V == G_ARRAY);
1861}
1862
1863SV *incr_text (JSON *self)
1864 ATTRS: lvalue
1865 CODE:
1866{
1867 if (self->incr_pos)
1868 croak ("incr_text can not be called when the incremental parser already started parsing");
1869
1870 RETVAL = self->incr_text ? SvREFCNT_inc (self->incr_text) : &PL_sv_undef;
1871}
1872 OUTPUT:
1873 RETVAL
1874
1875void incr_skip (JSON *self)
1876 CODE:
1877{
1878 if (self->incr_pos)
1879 {
1880 sv_chop (self->incr_text, SvPV_nolen (self->incr_text) + self->incr_pos);
1881 self->incr_pos = 0;
1882 self->incr_nest = 0;
1883 self->incr_mode = 0;
1884 }
1885}
1886
1887void incr_reset (JSON *self)
1888 CODE:
1889{
1890 SvREFCNT_dec (self->incr_text);
1891 self->incr_text = 0;
1892 self->incr_pos = 0;
1893 self->incr_nest = 0;
1894 self->incr_mode = 0;
1895}
1896
1897void DESTROY (JSON *self)
1898 CODE:
1899 SvREFCNT_dec (self->cb_sk_object);
1900 SvREFCNT_dec (self->cb_object);
1901 SvREFCNT_dec (self->incr_text);
1351 1902
1352PROTOTYPES: ENABLE 1903PROTOTYPES: ENABLE
1353 1904
1354void to_json (SV *scalar) 1905void encode_json (SV *scalar)
1906 ALIAS:
1907 to_json_ = 0
1908 encode_json = F_UTF8
1355 PPCODE: 1909 PPCODE:
1356{ 1910{
1357 JSON json = { F_DEFAULT | F_UTF8 }; 1911 JSON json;
1912 json_init (&json);
1913 json.flags |= ix;
1358 XPUSHs (encode_json (scalar, &json)); 1914 XPUSHs (encode_json (scalar, &json));
1359} 1915}
1360 1916
1361void from_json (SV *jsonstr) 1917void decode_json (SV *jsonstr)
1918 ALIAS:
1919 from_json_ = 0
1920 decode_json = F_UTF8
1362 PPCODE: 1921 PPCODE:
1363{ 1922{
1364 JSON json = { F_DEFAULT | F_UTF8 }; 1923 JSON json;
1924 json_init (&json);
1925 json.flags |= ix;
1365 XPUSHs (decode_json (jsonstr, &json, 0)); 1926 XPUSHs (decode_json (jsonstr, &json, 0));
1366} 1927}
1367 1928
1929

Diff Legend

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