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.14 by root, Sat Mar 24 22:55:43 2007 UTC vs.
Revision 1.44 by root, Mon Jun 25 04:08:17 2007 UTC

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 9
10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif
13
14// 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.
16#ifndef UTF8_MAXBYTES
17# define UTF8_MAXBYTES 13
18#endif
19
9#define F_ASCII 0x00000001 20#define F_ASCII 0x00000001UL
21#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002 22#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004 23#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008 24#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010 25#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020 26#define F_SPACE_AFTER 0x00000040UL
15#define F_ALLOW_NONREF 0x00000080 27#define F_ALLOW_NONREF 0x00000100UL
16#define F_SHRINK 0x00000100 28#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL // NYI
31#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27
33
34#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
17 35
18#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 36#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
19#define F_DEFAULT 0 37#define F_DEFAULT (9UL << S_MAXDEPTH)
20 38
21#define INIT_SIZE 32 // initial scalar size to be allocated 39#define INIT_SIZE 32 // initial scalar size to be allocated
22#define INDENT_STEP 3 // spaces per indentation level 40#define INDENT_STEP 3 // spaces per indentation level
23 41
24#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
25#define SHORT_STRING_LEN 512 // special-case strings of up to this size 42#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
26 43
27#define SB do { 44#define SB do {
28#define SE } while (0) 45#define SE } while (0)
29 46
47#if __GNUC__ >= 3
48# define expect(expr,value) __builtin_expect ((expr),(value))
49# define inline inline
50#else
51# define expect(expr,value) (expr)
52# define inline static
53#endif
54
55#define expect_false(expr) expect ((expr) != 0, 0)
56#define expect_true(expr) expect ((expr) != 0, 1)
57
30static HV *json_stash; // JSON::XS:: 58static HV *json_stash, *json_boolean_stash; // JSON::XS::
59static SV *json_true, *json_false;
31 60
32///////////////////////////////////////////////////////////////////////////// 61/////////////////////////////////////////////////////////////////////////////
33// utility functions 62// utility functions
34 63
35static UV * 64static UV *
58// decode an utf-8 character and return it, or (UV)-1 in 87// decode an utf-8 character and return it, or (UV)-1 in
59// case of an error. 88// case of an error.
60// we special-case "safe" characters from U+80 .. U+7FF, 89// we special-case "safe" characters from U+80 .. U+7FF,
61// but use the very good perl function to parse anything else. 90// but use the very good perl function to parse anything else.
62// note that we never call this function for a ascii codepoints 91// note that we never call this function for a ascii codepoints
63static UV 92inline UV
64decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 93decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
65{ 94{
66 if (s[0] > 0xdf || s[0] < 0xc2) 95 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
67 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 96 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
68 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 97 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
69 { 98 {
70 *clen = 2; 99 *clen = 2;
71 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 100 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
72 } 101 }
73 else 102 else
103 {
104 *clen = (STRLEN)-1;
74 return (UV)-1; 105 return (UV)-1;
106 }
75} 107}
76 108
77///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
78// encoder 110// encoder
79 111
81typedef struct 113typedef struct
82{ 114{
83 char *cur; // SvPVX (sv) + current output position 115 char *cur; // SvPVX (sv) + current output position
84 char *end; // SvEND (sv) 116 char *end; // SvEND (sv)
85 SV *sv; // result scalar 117 SV *sv; // result scalar
86 UV flags; // F_* 118 U32 flags; // F_*
87 int indent; // indentation level 119 U32 indent; // indentation level
88 int max_depth; // max. recursion level 120 U32 maxdepth; // max. indentation/recursion level
89} enc_t; 121} enc_t;
90 122
91static void 123inline void
92need (enc_t *enc, STRLEN len) 124need (enc_t *enc, STRLEN len)
93{ 125{
94 if (enc->cur + len >= enc->end) 126 if (expect_false (enc->cur + len >= enc->end))
95 { 127 {
96 STRLEN cur = enc->cur - SvPVX (enc->sv); 128 STRLEN cur = enc->cur - SvPVX (enc->sv);
97 SvGROW (enc->sv, cur + len + 1); 129 SvGROW (enc->sv, cur + len + 1);
98 enc->cur = SvPVX (enc->sv) + cur; 130 enc->cur = SvPVX (enc->sv) + cur;
99 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 131 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
100 } 132 }
101} 133}
102 134
103static void 135inline void
104encode_ch (enc_t *enc, char ch) 136encode_ch (enc_t *enc, char ch)
105{ 137{
106 need (enc, 1); 138 need (enc, 1);
107 *enc->cur++ = ch; 139 *enc->cur++ = ch;
108} 140}
116 148
117 while (str < end) 149 while (str < end)
118 { 150 {
119 unsigned char ch = *(unsigned char *)str; 151 unsigned char ch = *(unsigned char *)str;
120 152
121 if (ch >= 0x20 && ch < 0x80) // most common case 153 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
122 { 154 {
123 if (ch == '"') // but with slow exceptions 155 if (expect_false (ch == '"')) // but with slow exceptions
124 { 156 {
125 need (enc, len += 1); 157 need (enc, len += 1);
126 *enc->cur++ = '\\'; 158 *enc->cur++ = '\\';
127 *enc->cur++ = '"'; 159 *enc->cur++ = '"';
128 } 160 }
129 else if (ch == '\\') 161 else if (expect_false (ch == '\\'))
130 { 162 {
131 need (enc, len += 1); 163 need (enc, len += 1);
132 *enc->cur++ = '\\'; 164 *enc->cur++ = '\\';
133 *enc->cur++ = '\\'; 165 *enc->cur++ = '\\';
134 } 166 }
152 STRLEN clen; 184 STRLEN clen;
153 UV uch; 185 UV uch;
154 186
155 if (is_utf8) 187 if (is_utf8)
156 { 188 {
157 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
158 uch = decode_utf8 (str, end - str, &clen); 189 uch = decode_utf8 (str, end - str, &clen);
159 if (clen == (STRLEN)-1) 190 if (clen == (STRLEN)-1)
160 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 191 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
161 } 192 }
162 else 193 else
166 } 197 }
167 198
168 if (uch > 0x10FFFFUL) 199 if (uch > 0x10FFFFUL)
169 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 200 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
170 201
171 if (uch < 0x80 || enc->flags & F_ASCII) 202 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
172 { 203 {
173 if (uch > 0xFFFFUL) 204 if (uch > 0xFFFFUL)
174 { 205 {
175 need (enc, len += 11); 206 need (enc, len += 11);
176 sprintf (enc->cur, "\\u%04x\\u%04x", 207 sprintf (enc->cur, "\\u%04x\\u%04x",
190 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 221 *enc->cur++ = hexdigit [(uch >> 0) & 15];
191 } 222 }
192 223
193 str += clen; 224 str += clen;
194 } 225 }
226 else if (enc->flags & F_LATIN1)
227 {
228 *enc->cur++ = uch;
229 str += clen;
230 }
195 else if (is_utf8) 231 else if (is_utf8)
196 { 232 {
197 need (enc, len += clen); 233 need (enc, len += clen);
198 do 234 do
199 { 235 {
201 } 237 }
202 while (--clen); 238 while (--clen);
203 } 239 }
204 else 240 else
205 { 241 {
206 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed 242 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
207 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 243 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
208 ++str; 244 ++str;
209 } 245 }
210 } 246 }
211 } 247 }
213 249
214 --len; 250 --len;
215 } 251 }
216} 252}
217 253
218static void 254inline void
219encode_indent (enc_t *enc) 255encode_indent (enc_t *enc)
220{ 256{
221 if (enc->flags & F_INDENT) 257 if (enc->flags & F_INDENT)
222 { 258 {
223 int spaces = enc->indent * INDENT_STEP; 259 int spaces = enc->indent * INDENT_STEP;
226 memset (enc->cur, ' ', spaces); 262 memset (enc->cur, ' ', spaces);
227 enc->cur += spaces; 263 enc->cur += spaces;
228 } 264 }
229} 265}
230 266
231static void 267inline void
232encode_space (enc_t *enc) 268encode_space (enc_t *enc)
233{ 269{
234 need (enc, 1); 270 need (enc, 1);
235 encode_ch (enc, ' '); 271 encode_ch (enc, ' ');
236} 272}
237 273
238static void 274inline void
239encode_nl (enc_t *enc) 275encode_nl (enc_t *enc)
240{ 276{
241 if (enc->flags & F_INDENT) 277 if (enc->flags & F_INDENT)
242 { 278 {
243 need (enc, 1); 279 need (enc, 1);
244 encode_ch (enc, '\n'); 280 encode_ch (enc, '\n');
245 } 281 }
246} 282}
247 283
248static void 284inline void
249encode_comma (enc_t *enc) 285encode_comma (enc_t *enc)
250{ 286{
251 encode_ch (enc, ','); 287 encode_ch (enc, ',');
252 288
253 if (enc->flags & F_INDENT) 289 if (enc->flags & F_INDENT)
260 296
261static void 297static void
262encode_av (enc_t *enc, AV *av) 298encode_av (enc_t *enc, AV *av)
263{ 299{
264 int i, len = av_len (av); 300 int i, len = av_len (av);
301
302 if (enc->indent >= enc->maxdepth)
303 croak ("data structure too deep (hit recursion limit)");
265 304
266 encode_ch (enc, '['); encode_nl (enc); 305 encode_ch (enc, '['); encode_nl (enc);
267 ++enc->indent; 306 ++enc->indent;
268 307
269 for (i = 0; i <= len; ++i) 308 for (i = 0; i <= len; ++i)
336static void 375static void
337encode_hv (enc_t *enc, HV *hv) 376encode_hv (enc_t *enc, HV *hv)
338{ 377{
339 int count, i; 378 int count, i;
340 379
380 if (enc->indent >= enc->maxdepth)
381 croak ("data structure too deep (hit recursion limit)");
382
341 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 383 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
342 384
343 if ((count = hv_iterinit (hv))) 385 if ((count = hv_iterinit (hv)))
344 { 386 {
345 // for canonical output we have to sort by keys first 387 // for canonical output we have to sort by keys first
346 // actually, this is mostly due to the stupid so-called 388 // actually, this is mostly due to the stupid so-called
347 // security workaround added somewhere in 5.8.x. 389 // security workaround added somewhere in 5.8.x.
348 // that randomises hash orderings 390 // that randomises hash orderings
349 if (enc->flags & F_CANONICAL) 391 if (enc->flags & F_CANONICAL)
350 { 392 {
351 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
352 int fast = 1; 393 int fast = 1;
394 HE *he;
395#if defined(__BORLANDC__) || defined(_MSC_VER)
396 HE **hes = _alloca (count * sizeof (HE));
397#else
398 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
399#endif
353 400
354 i = 0; 401 i = 0;
355 while ((he = hv_iternext (hv))) 402 while ((he = hv_iternext (hv)))
356 { 403 {
357 hes [i++] = he; 404 hes [i++] = he;
392 439
393 encode_nl (enc); 440 encode_nl (enc);
394 } 441 }
395 else 442 else
396 { 443 {
397 SV *sv;
398 HE *he = hv_iternext (hv); 444 HE *he = hv_iternext (hv);
399 445
400 for (;;) 446 for (;;)
401 { 447 {
402 encode_indent (enc); 448 encode_indent (enc);
411 encode_nl (enc); 457 encode_nl (enc);
412 } 458 }
413 } 459 }
414 460
415 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 461 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
462}
463
464// encode objects, arrays and special \0=false and \1=true values.
465static void
466encode_rv (enc_t *enc, SV *sv)
467{
468 svtype svt;
469
470 SvGETMAGIC (sv);
471 svt = SvTYPE (sv);
472
473 if (expect_false (SvOBJECT (sv)))
474 {
475 if (SvSTASH (sv) == json_boolean_stash)
476 {
477 if (SvIV (sv) == 0)
478 encode_str (enc, "false", 5, 0);
479 else
480 encode_str (enc, "true", 4, 0);
481 }
482 else
483 {
484#if 0
485 if (0 && sv_derived_from (rv, "JSON::Literal"))
486 {
487 // not yet
488 }
489#endif
490 if (enc->flags & F_CONV_BLESSED)
491 {
492 // we re-bless the reference to get overload and other niceties right
493 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 1);
494
495 if (to_json)
496 {
497 dSP;
498 ENTER;
499 SAVETMPS;
500 PUSHMARK (SP);
501 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
502
503 // calling with G_SCALAR ensures that we always get a 1 reutrn value
504 // check anyways.
505 PUTBACK;
506 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
507 SPAGAIN;
508
509 encode_sv (enc, POPs);
510
511 FREETMPS;
512 LEAVE;
513 }
514 else if (enc->flags & F_ALLOW_BLESSED)
515 encode_str (enc, "null", 4, 0);
516 else
517 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
518 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
519 }
520 else if (enc->flags & F_ALLOW_BLESSED)
521 encode_str (enc, "null", 4, 0);
522 else
523 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
524 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
525 }
526 }
527 else if (svt == SVt_PVHV)
528 encode_hv (enc, (HV *)sv);
529 else if (svt == SVt_PVAV)
530 encode_av (enc, (AV *)sv);
531 else if (svt < SVt_PVAV)
532 {
533 if (SvNIOK (sv) && SvIV (sv) == 0)
534 encode_str (enc, "false", 5, 0);
535 else if (SvNIOK (sv) && SvIV (sv) == 1)
536 encode_str (enc, "true", 4, 0);
537 else
538 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
539 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
540 }
541 else
542 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
543 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
416} 544}
417 545
418static void 546static void
419encode_sv (enc_t *enc, SV *sv) 547encode_sv (enc_t *enc, SV *sv)
420{ 548{
428 encode_str (enc, str, len, SvUTF8 (sv)); 556 encode_str (enc, str, len, SvUTF8 (sv));
429 encode_ch (enc, '"'); 557 encode_ch (enc, '"');
430 } 558 }
431 else if (SvNOKp (sv)) 559 else if (SvNOKp (sv))
432 { 560 {
561 // trust that perl will do the right thing w.r.t. JSON syntax.
433 need (enc, NV_DIG + 32); 562 need (enc, NV_DIG + 32);
434 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 563 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
435 enc->cur += strlen (enc->cur); 564 enc->cur += strlen (enc->cur);
436 } 565 }
437 else if (SvIOKp (sv)) 566 else if (SvIOKp (sv))
438 { 567 {
439 need (enc, 64); 568 // we assume we can always read an IV as a UV
569 if (SvUV (sv) & ~(UV)0x7fff)
570 {
571 // large integer, use the (rather slow) snprintf way.
572 need (enc, sizeof (UV) * 3);
440 enc->cur += 573 enc->cur +=
441 SvIsUV(sv) 574 SvIsUV(sv)
442 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 575 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
443 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 576 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
577 }
578 else
579 {
580 // optimise the "small number case"
581 // code will likely be branchless and use only a single multiplication
582 I32 i = SvIV (sv);
583 U32 u;
584 char digit, nz = 0;
585
586 need (enc, 6);
587
588 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
589 u = i < 0 ? -i : i;
590
591 // convert to 4.28 fixed-point representation
592 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
593
594 // now output digit by digit, each time masking out the integer part
595 // and multiplying by 5 while moving the decimal point one to the right,
596 // resulting in a net multiplication by 10.
597 // we always write the digit to memory but conditionally increment
598 // the pointer, to ease the usage of conditional move instructions.
599 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
600 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
601 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
602 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
603 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
604 }
444 } 605 }
445 else if (SvROK (sv)) 606 else if (SvROK (sv))
446 { 607 encode_rv (enc, SvRV (sv));
447 SV *rv = SvRV (sv);
448
449 if (enc->indent >= enc->max_depth)
450 croak ("data structure too deep (hit recursion limit)");
451
452 switch (SvTYPE (rv))
453 {
454 case SVt_PVAV: encode_av (enc, (AV *)rv); break;
455 case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
456
457 default:
458 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
459 SvPV_nolen (sv));
460 }
461 }
462 else if (!SvOK (sv)) 608 else if (!SvOK (sv))
463 encode_str (enc, "null", 4, 0); 609 encode_str (enc, "null", 4, 0);
464 else 610 else
465 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 611 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
466 SvPV_nolen (sv), SvFLAGS (sv)); 612 SvPV_nolen (sv), SvFLAGS (sv));
467} 613}
468 614
469static SV * 615static SV *
470encode_json (SV *scalar, UV flags) 616encode_json (SV *scalar, U32 flags)
471{ 617{
618 enc_t enc;
619
472 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 620 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
473 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 621 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
474 622
475 enc_t enc;
476 enc.flags = flags; 623 enc.flags = flags;
477 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 624 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
478 enc.cur = SvPVX (enc.sv); 625 enc.cur = SvPVX (enc.sv);
479 enc.end = SvEND (enc.sv); 626 enc.end = SvEND (enc.sv);
480 enc.indent = 0; 627 enc.indent = 0;
481 enc.max_depth = 0x7fffffffUL; 628 enc.maxdepth = DEC_DEPTH (flags);
482 629
483 SvPOK_only (enc.sv); 630 SvPOK_only (enc.sv);
484 encode_sv (&enc, scalar); 631 encode_sv (&enc, scalar);
485 632
633 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
634 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
635
486 if (!(flags & (F_ASCII | F_UTF8))) 636 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
487 SvUTF8_on (enc.sv); 637 SvUTF8_on (enc.sv);
488
489 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
490 638
491 if (enc.flags & F_SHRINK) 639 if (enc.flags & F_SHRINK)
492 shrink (enc.sv); 640 shrink (enc.sv);
493 641
494 return enc.sv; 642 return enc.sv;
501typedef struct 649typedef struct
502{ 650{
503 char *cur; // current parser pointer 651 char *cur; // current parser pointer
504 char *end; // end of input string 652 char *end; // end of input string
505 const char *err; // parse error, if != 0 653 const char *err; // parse error, if != 0
506 UV flags; // F_* 654 U32 flags; // F_*
655 U32 depth; // recursion depth
656 U32 maxdepth; // recursion depth limit
507} dec_t; 657} dec_t;
508 658
509static void 659inline void
510decode_ws (dec_t *dec) 660decode_ws (dec_t *dec)
511{ 661{
512 for (;;) 662 for (;;)
513 { 663 {
514 char ch = *dec->cur; 664 char ch = *dec->cur;
520 ++dec->cur; 670 ++dec->cur;
521 } 671 }
522} 672}
523 673
524#define ERR(reason) SB dec->err = reason; goto fail; SE 674#define ERR(reason) SB dec->err = reason; goto fail; SE
675
525#define EXPECT_CH(ch) SB \ 676#define EXPECT_CH(ch) SB \
526 if (*dec->cur != ch) \ 677 if (*dec->cur != ch) \
527 ERR (# ch " expected"); \ 678 ERR (# ch " expected"); \
528 ++dec->cur; \ 679 ++dec->cur; \
529 SE 680 SE
530 681
682#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
683#define DEC_DEC_DEPTH --dec->depth
684
531static SV *decode_sv (dec_t *dec); 685static SV *decode_sv (dec_t *dec);
532 686
533static signed char decode_hexdigit[256]; 687static signed char decode_hexdigit[256];
534 688
535static UV 689static UV
536decode_4hex (dec_t *dec) 690decode_4hex (dec_t *dec)
537{ 691{
538 signed char d1, d2, d3, d4; 692 signed char d1, d2, d3, d4;
539 unsigned char *cur = (unsigned char *)dec->cur; 693 unsigned char *cur = (unsigned char *)dec->cur;
540 694
541 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 695 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
542 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 696 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
543 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 697 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
544 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 698 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
545 699
546 dec->cur += 4; 700 dec->cur += 4;
547 701
548 return ((UV)d1) << 12 702 return ((UV)d1) << 12
549 | ((UV)d2) << 8 703 | ((UV)d2) << 8
557static SV * 711static SV *
558decode_str (dec_t *dec) 712decode_str (dec_t *dec)
559{ 713{
560 SV *sv = 0; 714 SV *sv = 0;
561 int utf8 = 0; 715 int utf8 = 0;
716 char *dec_cur = dec->cur;
562 717
563 do 718 do
564 { 719 {
565 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN]; 720 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
566 char *cur = buf; 721 char *cur = buf;
567 722
568 do 723 do
569 { 724 {
570 unsigned char ch = *(unsigned char *)dec->cur++; 725 unsigned char ch = *(unsigned char *)dec_cur++;
571 726
572 if (ch == '"') 727 if (expect_false (ch == '"'))
573 { 728 {
574 --dec->cur; 729 --dec_cur;
575 break; 730 break;
576 } 731 }
577 else if (ch == '\\') 732 else if (expect_false (ch == '\\'))
578 { 733 {
579 switch (*dec->cur) 734 switch (*dec_cur)
580 { 735 {
581 case '\\': 736 case '\\':
582 case '/': 737 case '/':
583 case '"': *cur++ = *dec->cur++; break; 738 case '"': *cur++ = *dec_cur++; break;
584 739
585 case 'b': ++dec->cur; *cur++ = '\010'; break; 740 case 'b': ++dec_cur; *cur++ = '\010'; break;
586 case 't': ++dec->cur; *cur++ = '\011'; break; 741 case 't': ++dec_cur; *cur++ = '\011'; break;
587 case 'n': ++dec->cur; *cur++ = '\012'; break; 742 case 'n': ++dec_cur; *cur++ = '\012'; break;
588 case 'f': ++dec->cur; *cur++ = '\014'; break; 743 case 'f': ++dec_cur; *cur++ = '\014'; break;
589 case 'r': ++dec->cur; *cur++ = '\015'; break; 744 case 'r': ++dec_cur; *cur++ = '\015'; break;
590 745
591 case 'u': 746 case 'u':
592 { 747 {
593 UV lo, hi; 748 UV lo, hi;
594 ++dec->cur; 749 ++dec_cur;
595 750
751 dec->cur = dec_cur;
596 hi = decode_4hex (dec); 752 hi = decode_4hex (dec);
753 dec_cur = dec->cur;
597 if (hi == (UV)-1) 754 if (hi == (UV)-1)
598 goto fail; 755 goto fail;
599 756
600 // possibly a surrogate pair 757 // possibly a surrogate pair
601 if (hi >= 0xd800) 758 if (hi >= 0xd800)
602 if (hi < 0xdc00) 759 if (hi < 0xdc00)
603 { 760 {
604 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 761 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
605 ERR ("missing low surrogate character in surrogate pair"); 762 ERR ("missing low surrogate character in surrogate pair");
606 763
607 dec->cur += 2; 764 dec_cur += 2;
608 765
766 dec->cur = dec_cur;
609 lo = decode_4hex (dec); 767 lo = decode_4hex (dec);
768 dec_cur = dec->cur;
610 if (lo == (UV)-1) 769 if (lo == (UV)-1)
611 goto fail; 770 goto fail;
612 771
613 if (lo < 0xdc00 || lo >= 0xe000) 772 if (lo < 0xdc00 || lo >= 0xe000)
614 ERR ("surrogate pair expected"); 773 ERR ("surrogate pair expected");
628 *cur++ = hi; 787 *cur++ = hi;
629 } 788 }
630 break; 789 break;
631 790
632 default: 791 default:
633 --dec->cur; 792 --dec_cur;
634 ERR ("illegal backslash escape sequence in string"); 793 ERR ("illegal backslash escape sequence in string");
635 } 794 }
636 } 795 }
637 else if (ch >= 0x20 && ch <= 0x7f) 796 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
638 *cur++ = ch; 797 *cur++ = ch;
639 else if (ch >= 0x80) 798 else if (ch >= 0x80)
640 { 799 {
641 --dec->cur;
642
643 STRLEN clen; 800 STRLEN clen;
801 UV uch;
802
803 --dec_cur;
804
644 UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 805 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
645 if (clen == (STRLEN)-1) 806 if (clen == (STRLEN)-1)
646 ERR ("malformed UTF-8 character in JSON string"); 807 ERR ("malformed UTF-8 character in JSON string");
647 808
648 do 809 do
649 {
650 *cur++ = *dec->cur++; 810 *cur++ = *dec_cur++;
651 }
652 while (--clen); 811 while (--clen);
653 812
654 utf8 = 1; 813 utf8 = 1;
655 } 814 }
656 else if (!ch)
657 ERR ("unexpected end of string while parsing json string");
658 else 815 else
816 {
817 --dec_cur;
818
819 if (!ch)
820 ERR ("unexpected end of string while parsing JSON string");
821 else
659 ERR ("invalid character encountered"); 822 ERR ("invalid character encountered while parsing JSON string");
660 823 }
661 } 824 }
662 while (cur < buf + SHORT_STRING_LEN); 825 while (cur < buf + SHORT_STRING_LEN);
663 826
827 {
664 STRLEN len = cur - buf; 828 STRLEN len = cur - buf;
665 829
666 if (sv) 830 if (sv)
667 { 831 {
668 SvGROW (sv, SvCUR (sv) + len + 1); 832 SvGROW (sv, SvCUR (sv) + len + 1);
669 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 833 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
670 SvCUR_set (sv, SvCUR (sv) + len); 834 SvCUR_set (sv, SvCUR (sv) + len);
671 } 835 }
672 else 836 else
673 sv = newSVpvn (buf, len); 837 sv = newSVpvn (buf, len);
674 } 838 }
839 }
675 while (*dec->cur != '"'); 840 while (*dec_cur != '"');
676 841
677 ++dec->cur; 842 ++dec_cur;
678 843
679 if (sv) 844 if (sv)
680 { 845 {
681 SvPOK_only (sv); 846 SvPOK_only (sv);
682 *SvEND (sv) = 0; 847 *SvEND (sv) = 0;
685 SvUTF8_on (sv); 850 SvUTF8_on (sv);
686 } 851 }
687 else 852 else
688 sv = newSVpvn ("", 0); 853 sv = newSVpvn ("", 0);
689 854
855 dec->cur = dec_cur;
690 return sv; 856 return sv;
691 857
692fail: 858fail:
859 dec->cur = dec_cur;
693 return 0; 860 return 0;
694} 861}
695 862
696static SV * 863static SV *
697decode_num (dec_t *dec) 864decode_num (dec_t *dec)
755 is_nv = 1; 922 is_nv = 1;
756 } 923 }
757 924
758 if (!is_nv) 925 if (!is_nv)
759 { 926 {
760 UV uv; 927 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
761 int numtype = grok_number (start, dec->cur - start, &uv); 928 if (*start == '-')
762 if (numtype & IS_NUMBER_IN_UV) 929 switch (dec->cur - start)
763 if (numtype & IS_NUMBER_NEG)
764 { 930 {
765 if (uv < (UV)IV_MIN) 931 case 2: return newSViv (-( start [1] - '0' * 1));
766 return newSViv (-(IV)uv); 932 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
933 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
934 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
767 } 935 }
936 else
937 switch (dec->cur - start)
938 {
939 case 1: return newSViv ( start [0] - '0' * 1);
940 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
941 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
942 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
943 }
944
945 {
946 UV uv;
947 int numtype = grok_number (start, dec->cur - start, &uv);
948 if (numtype & IS_NUMBER_IN_UV)
949 if (numtype & IS_NUMBER_NEG)
950 {
951 if (uv < (UV)IV_MIN)
952 return newSViv (-(IV)uv);
953 }
768 else 954 else
769 return newSVuv (uv); 955 return newSVuv (uv);
956
957 // here would likely be the place for bigint support
770 } 958 }
959 }
771 960
961 // if we ever support bigint or bigfloat, this is the place for bigfloat
772 return newSVnv (Atof (start)); 962 return newSVnv (Atof (start));
773 963
774fail: 964fail:
775 return 0; 965 return 0;
776} 966}
778static SV * 968static SV *
779decode_av (dec_t *dec) 969decode_av (dec_t *dec)
780{ 970{
781 AV *av = newAV (); 971 AV *av = newAV ();
782 972
973 DEC_INC_DEPTH;
783 decode_ws (dec); 974 decode_ws (dec);
975
784 if (*dec->cur == ']') 976 if (*dec->cur == ']')
785 ++dec->cur; 977 ++dec->cur;
786 else 978 else
787 for (;;) 979 for (;;)
788 { 980 {
806 ERR (", or ] expected while parsing array"); 998 ERR (", or ] expected while parsing array");
807 999
808 ++dec->cur; 1000 ++dec->cur;
809 } 1001 }
810 1002
1003 DEC_DEC_DEPTH;
811 return newRV_noinc ((SV *)av); 1004 return newRV_noinc ((SV *)av);
812 1005
813fail: 1006fail:
814 SvREFCNT_dec (av); 1007 SvREFCNT_dec (av);
1008 DEC_DEC_DEPTH;
815 return 0; 1009 return 0;
816} 1010}
817 1011
818static SV * 1012static SV *
819decode_hv (dec_t *dec) 1013decode_hv (dec_t *dec)
820{ 1014{
821 HV *hv = newHV (); 1015 HV *hv = newHV ();
822 1016
1017 DEC_INC_DEPTH;
823 decode_ws (dec); 1018 decode_ws (dec);
1019
824 if (*dec->cur == '}') 1020 if (*dec->cur == '}')
825 ++dec->cur; 1021 ++dec->cur;
826 else 1022 else
827 for (;;) 1023 for (;;)
828 { 1024 {
841 { 1037 {
842 SvREFCNT_dec (key); 1038 SvREFCNT_dec (key);
843 goto fail; 1039 goto fail;
844 } 1040 }
845 1041
846 //TODO: optimise
847 hv_store_ent (hv, key, value, 0); 1042 hv_store_ent (hv, key, value, 0);
1043 SvREFCNT_dec (key);
848 1044
849 decode_ws (dec); 1045 decode_ws (dec);
850 1046
851 if (*dec->cur == '}') 1047 if (*dec->cur == '}')
852 { 1048 {
858 ERR (", or } expected while parsing object/hash"); 1054 ERR (", or } expected while parsing object/hash");
859 1055
860 ++dec->cur; 1056 ++dec->cur;
861 } 1057 }
862 1058
1059 DEC_DEC_DEPTH;
863 return newRV_noinc ((SV *)hv); 1060 return newRV_noinc ((SV *)hv);
864 1061
865fail: 1062fail:
866 SvREFCNT_dec (hv); 1063 SvREFCNT_dec (hv);
1064 DEC_DEC_DEPTH;
867 return 0; 1065 return 0;
868} 1066}
869 1067
870static SV * 1068static SV *
871decode_sv (dec_t *dec) 1069decode_sv (dec_t *dec)
872{ 1070{
873 decode_ws (dec); 1071 decode_ws (dec);
1072
1073 // the beauty of JSON: you need exactly one character lookahead
1074 // to parse anything.
874 switch (*dec->cur) 1075 switch (*dec->cur)
875 { 1076 {
876 case '"': ++dec->cur; return decode_str (dec); 1077 case '"': ++dec->cur; return decode_str (dec);
877 case '[': ++dec->cur; return decode_av (dec); 1078 case '[': ++dec->cur; return decode_av (dec);
878 case '{': ++dec->cur; return decode_hv (dec); 1079 case '{': ++dec->cur; return decode_hv (dec);
884 1085
885 case 't': 1086 case 't':
886 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1087 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
887 { 1088 {
888 dec->cur += 4; 1089 dec->cur += 4;
889 return newSViv (1); 1090 return SvREFCNT_inc (json_true);
890 } 1091 }
891 else 1092 else
892 ERR ("'true' expected"); 1093 ERR ("'true' expected");
893 1094
894 break; 1095 break;
895 1096
896 case 'f': 1097 case 'f':
897 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1098 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
898 { 1099 {
899 dec->cur += 5; 1100 dec->cur += 5;
900 return newSViv (0); 1101 return SvREFCNT_inc (json_false);
901 } 1102 }
902 else 1103 else
903 ERR ("'false' expected"); 1104 ERR ("'false' expected");
904 1105
905 break; 1106 break;
914 ERR ("'null' expected"); 1115 ERR ("'null' expected");
915 1116
916 break; 1117 break;
917 1118
918 default: 1119 default:
919 ERR ("malformed json string, neither array, object, number, string or atom"); 1120 ERR ("malformed JSON string, neither array, object, number, string or atom");
920 break; 1121 break;
921 } 1122 }
922 1123
923fail: 1124fail:
924 return 0; 1125 return 0;
925} 1126}
926 1127
927static SV * 1128static SV *
928decode_json (SV *string, UV flags) 1129decode_json (SV *string, U32 flags, UV *offset_return)
929{ 1130{
1131 dec_t dec;
1132 UV offset;
930 SV *sv; 1133 SV *sv;
1134
1135 SvGETMAGIC (string);
1136 SvUPGRADE (string, SVt_PV);
931 1137
932 if (flags & F_UTF8) 1138 if (flags & F_UTF8)
933 sv_utf8_downgrade (string, 0); 1139 sv_utf8_downgrade (string, 0);
934 else 1140 else
935 sv_utf8_upgrade (string); 1141 sv_utf8_upgrade (string);
936 1142
937 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1143 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
938 1144
939 dec_t dec;
940 dec.flags = flags; 1145 dec.flags = flags;
941 dec.cur = SvPVX (string); 1146 dec.cur = SvPVX (string);
942 dec.end = SvEND (string); 1147 dec.end = SvEND (string);
943 dec.err = 0; 1148 dec.err = 0;
1149 dec.depth = 0;
1150 dec.maxdepth = DEC_DEPTH (dec.flags);
944 1151
1152 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
945 sv = decode_sv (&dec); 1153 sv = decode_sv (&dec);
946 1154
1155 if (!(offset_return || !sv))
1156 {
1157 // check for trailing garbage
1158 decode_ws (&dec);
1159
1160 if (*dec.cur)
1161 {
1162 dec.err = "garbage after JSON object";
1163 SvREFCNT_dec (sv);
1164 sv = 0;
1165 }
1166 }
1167
1168 if (offset_return || !sv)
1169 {
1170 offset = dec.flags & F_UTF8
1171 ? dec.cur - SvPVX (string)
1172 : utf8_distance (dec.cur, SvPVX (string));
1173
1174 if (offset_return)
1175 *offset_return = offset;
1176 }
1177
947 if (!sv) 1178 if (!sv)
948 { 1179 {
949 IV offset = dec.flags & F_UTF8
950 ? dec.cur - SvPVX (string)
951 : utf8_distance (dec.cur, SvPVX (string));
952 SV *uni = sv_newmortal (); 1180 SV *uni = sv_newmortal ();
953 1181
954 // horrible hack to silence warning inside pv_uni_display 1182 // horrible hack to silence warning inside pv_uni_display
955 COP cop = *PL_curcop; 1183 COP cop = *PL_curcop;
956 cop.cop_warnings = pWARN_NONE; 1184 cop.cop_warnings = pWARN_NONE;
958 SAVEVPTR (PL_curcop); 1186 SAVEVPTR (PL_curcop);
959 PL_curcop = &cop; 1187 PL_curcop = &cop;
960 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1188 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
961 LEAVE; 1189 LEAVE;
962 1190
963 croak ("%s, at character offset %d (%s)", 1191 croak ("%s, at character offset %d [\"%s\"]",
964 dec.err, 1192 dec.err,
965 (int)offset, 1193 (int)offset,
966 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1194 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
967 } 1195 }
968 1196
981 1209
982BOOT: 1210BOOT:
983{ 1211{
984 int i; 1212 int i;
985 1213
986 memset (decode_hexdigit, 0xff, 256);
987 for (i = 10; i--; ) 1214 for (i = 0; i < 256; ++i)
988 decode_hexdigit ['0' + i] = i; 1215 decode_hexdigit [i] =
1216 i >= '0' && i <= '9' ? i - '0'
1217 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1218 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1219 : -1;
989 1220
990 for (i = 7; i--; )
991 {
992 decode_hexdigit ['a' + i] = 10 + i;
993 decode_hexdigit ['A' + i] = 10 + i;
994 }
995
996 json_stash = gv_stashpv ("JSON::XS", 1); 1221 json_stash = gv_stashpv ("JSON::XS" , 1);
1222 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1223
1224 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1225 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
997} 1226}
998 1227
999PROTOTYPES: DISABLE 1228PROTOTYPES: DISABLE
1000 1229
1001SV *new (char *dummy) 1230SV *new (char *dummy)
1004 OUTPUT: 1233 OUTPUT:
1005 RETVAL 1234 RETVAL
1006 1235
1007SV *ascii (SV *self, int enable = 1) 1236SV *ascii (SV *self, int enable = 1)
1008 ALIAS: 1237 ALIAS:
1009 ascii = F_ASCII 1238 ascii = F_ASCII
1239 latin1 = F_LATIN1
1010 utf8 = F_UTF8 1240 utf8 = F_UTF8
1011 indent = F_INDENT 1241 indent = F_INDENT
1012 canonical = F_CANONICAL 1242 canonical = F_CANONICAL
1013 space_before = F_SPACE_BEFORE 1243 space_before = F_SPACE_BEFORE
1014 space_after = F_SPACE_AFTER 1244 space_after = F_SPACE_AFTER
1015 pretty = F_PRETTY 1245 pretty = F_PRETTY
1016 allow_nonref = F_ALLOW_NONREF 1246 allow_nonref = F_ALLOW_NONREF
1017 shrink = F_SHRINK 1247 shrink = F_SHRINK
1248 allow_blessed = F_ALLOW_BLESSED
1249 convert_blessed = F_CONV_BLESSED
1018 CODE: 1250 CODE:
1019{ 1251{
1020 UV *uv = SvJSON (self); 1252 UV *uv = SvJSON (self);
1021 if (enable) 1253 if (enable)
1022 *uv |= ix; 1254 *uv |= ix;
1026 RETVAL = newSVsv (self); 1258 RETVAL = newSVsv (self);
1027} 1259}
1028 OUTPUT: 1260 OUTPUT:
1029 RETVAL 1261 RETVAL
1030 1262
1263SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1264 CODE:
1265{
1266 UV *uv = SvJSON (self);
1267 UV log2 = 0;
1268
1269 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1270
1271 while ((1UL << log2) < max_depth)
1272 ++log2;
1273
1274 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1275
1276 RETVAL = newSVsv (self);
1277}
1278 OUTPUT:
1279 RETVAL
1280
1031void encode (SV *self, SV *scalar) 1281void encode (SV *self, SV *scalar)
1032 PPCODE: 1282 PPCODE:
1033 XPUSHs (encode_json (scalar, *SvJSON (self))); 1283 XPUSHs (encode_json (scalar, *SvJSON (self)));
1034 1284
1035void decode (SV *self, SV *jsonstr) 1285void decode (SV *self, SV *jsonstr)
1036 PPCODE: 1286 PPCODE:
1037 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1287 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
1288
1289void decode_prefix (SV *self, SV *jsonstr)
1290 PPCODE:
1291{
1292 UV offset;
1293 EXTEND (SP, 2);
1294 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
1295 PUSHs (sv_2mortal (newSVuv (offset)));
1296}
1038 1297
1039PROTOTYPES: ENABLE 1298PROTOTYPES: ENABLE
1040 1299
1041void to_json (SV *scalar) 1300void to_json (SV *scalar)
1301 ALIAS:
1302 objToJson = 0
1042 PPCODE: 1303 PPCODE:
1043 XPUSHs (encode_json (scalar, F_UTF8)); 1304 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
1044 1305
1045void from_json (SV *jsonstr) 1306void from_json (SV *jsonstr)
1307 ALIAS:
1308 jsonToObj = 0
1046 PPCODE: 1309 PPCODE:
1047 XPUSHs (decode_json (jsonstr, F_UTF8)); 1310 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0));
1048 1311

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines