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.11 by root, Sat Mar 24 19:42:14 2007 UTC vs.
Revision 1.37 by root, Wed Jun 6 17:49:01 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
9#define F_ASCII 0x00000001 14#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL
10#define F_UTF8 0x00000002 16#define F_UTF8 0x00000004UL
11#define F_INDENT 0x00000004 17#define F_INDENT 0x00000008UL
12#define F_CANONICAL 0x00000008 18#define F_CANONICAL 0x00000010UL
13#define F_SPACE_BEFORE 0x00000010 19#define F_SPACE_BEFORE 0x00000020UL
14#define F_SPACE_AFTER 0x00000020 20#define F_SPACE_AFTER 0x00000040UL
15#define F_ALLOW_NONREF 0x00000080 21#define F_ALLOW_NONREF 0x00000100UL
16#define F_SHRINK 0x00000100 22#define F_SHRINK 0x00000200UL
23#define F_MAXDEPTH 0xf8000000UL
24#define S_MAXDEPTH 27
25
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
17 30
18#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
19#define F_DEFAULT 0 32#define F_DEFAULT (9UL << S_MAXDEPTH)
20 33
21#define INIT_SIZE 32 // initial scalar size to be allocated 34#define INIT_SIZE 32 // initial scalar size to be allocated
35#define INDENT_STEP 3 // spaces per indentation level
36
37#define SHORT_STRING_LEN 512 // special-case strings of up to this size
22 38
23#define SB do { 39#define SB do {
24#define SE } while (0) 40#define SE } while (0)
25 41
42#if __GNUC__ >= 3
43# define expect(expr,value) __builtin_expect ((expr),(value))
44# define inline inline
45#else
46# define expect(expr,value) (expr)
47# define inline static
48#endif
49
50#define expect_false(expr) expect ((expr) != 0, 0)
51#define expect_true(expr) expect ((expr) != 0, 1)
52
26static HV *json_stash; 53static HV *json_stash; // JSON::XS::
54
55/////////////////////////////////////////////////////////////////////////////
56// utility functions
57
58static UV *
59SvJSON (SV *sv)
60{
61 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62 croak ("object is not of type JSON::XS");
63
64 return &SvUVX (SvRV (sv));
65}
66
67static void
68shrink (SV *sv)
69{
70 sv_utf8_downgrade (sv, 1);
71 if (SvLEN (sv) > SvCUR (sv) + 1)
72 {
73#ifdef SvPV_shrink_to_cur
74 SvPV_shrink_to_cur (sv);
75#elif defined (SvPV_renew)
76 SvPV_renew (sv, SvCUR (sv) + 1);
77#endif
78 }
79}
80
81// decode an utf-8 character and return it, or (UV)-1 in
82// case of an error.
83// we special-case "safe" characters from U+80 .. U+7FF,
84// but use the very good perl function to parse anything else.
85// note that we never call this function for a ascii codepoints
86inline UV
87decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
88{
89 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
90 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
91 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
92 {
93 *clen = 2;
94 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
95 }
96 else
97 {
98 *clen = (STRLEN)-1;
99 return (UV)-1;
100 }
101}
102
103/////////////////////////////////////////////////////////////////////////////
104// encoder
27 105
28// structure used for encoding JSON 106// structure used for encoding JSON
29typedef struct 107typedef struct
30{ 108{
31 char *cur; 109 char *cur; // SvPVX (sv) + current output position
32 STRLEN len; // SvLEN (sv)
33 char *end; // SvEND (sv) 110 char *end; // SvEND (sv)
34 SV *sv; 111 SV *sv; // result scalar
35 UV flags; 112 U32 flags; // F_*
36 int max_recurse; 113 U32 indent; // indentation level
37 int indent; 114 U32 maxdepth; // max. indentation/recursion level
38} enc_t; 115} enc_t;
39 116
40// structure used for decoding JSON 117inline void
41typedef struct
42{
43 char *cur;
44 char *end;
45 const char *err;
46 UV flags;
47} dec_t;
48
49static UV *
50SvJSON (SV *sv)
51{
52 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
53 croak ("object is not of type JSON::XS");
54
55 return &SvUVX (SvRV (sv));
56}
57
58static void
59shrink (SV *sv)
60{
61 sv_utf8_downgrade (sv, 1);
62#ifdef SvPV_shrink_to_cur
63 SvPV_shrink_to_cur (sv);
64#endif
65}
66
67/////////////////////////////////////////////////////////////////////////////
68
69static void
70need (enc_t *enc, STRLEN len) 118need (enc_t *enc, STRLEN len)
71{ 119{
72 if (enc->cur + len >= enc->end) 120 if (expect_false (enc->cur + len >= enc->end))
73 { 121 {
74 STRLEN cur = enc->cur - SvPVX (enc->sv); 122 STRLEN cur = enc->cur - SvPVX (enc->sv);
75 SvGROW (enc->sv, cur + len + 1); 123 SvGROW (enc->sv, cur + len + 1);
76 enc->cur = SvPVX (enc->sv) + cur; 124 enc->cur = SvPVX (enc->sv) + cur;
77 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 125 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
78 } 126 }
79} 127}
80 128
81static void 129inline void
82encode_ch (enc_t *enc, char ch) 130encode_ch (enc_t *enc, char ch)
83{ 131{
84 need (enc, 1); 132 need (enc, 1);
85 *enc->cur++ = ch; 133 *enc->cur++ = ch;
86} 134}
… …
94 142
95 while (str < end) 143 while (str < end)
96 { 144 {
97 unsigned char ch = *(unsigned char *)str; 145 unsigned char ch = *(unsigned char *)str;
98 146
99 if (ch >= 0x20 && ch < 0x80) // most common case 147 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
100 { 148 {
101 if (ch == '"') // but with slow exceptions 149 if (expect_false (ch == '"')) // but with slow exceptions
102 { 150 {
103 need (enc, len += 1); 151 need (enc, len += 1);
104 *enc->cur++ = '\\'; 152 *enc->cur++ = '\\';
105 *enc->cur++ = '"'; 153 *enc->cur++ = '"';
106 } 154 }
107 else if (ch == '\\') 155 else if (expect_false (ch == '\\'))
108 { 156 {
109 need (enc, len += 1); 157 need (enc, len += 1);
110 *enc->cur++ = '\\'; 158 *enc->cur++ = '\\';
111 *enc->cur++ = '\\'; 159 *enc->cur++ = '\\';
112 } 160 }
… …
130 STRLEN clen; 178 STRLEN clen;
131 UV uch; 179 UV uch;
132 180
133 if (is_utf8) 181 if (is_utf8)
134 { 182 {
135 uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY); 183 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
184 uch = decode_utf8 (str, end - str, &clen);
136 if (clen == (STRLEN)-1) 185 if (clen == (STRLEN)-1)
137 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 186 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
138 } 187 }
139 else 188 else
140 { 189 {
… …
143 } 192 }
144 193
145 if (uch > 0x10FFFFUL) 194 if (uch > 0x10FFFFUL)
146 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 195 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
147 196
148 if (uch < 0x80 || enc->flags & F_ASCII) 197 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF))
149 { 198 {
150 if (uch > 0xFFFFUL) 199 if (uch > 0xFFFFUL)
151 { 200 {
152 need (enc, len += 11); 201 need (enc, len += 11);
153 sprintf (enc->cur, "\\u%04x\\u%04x", 202 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
167 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 216 *enc->cur++ = hexdigit [(uch >> 0) & 15];
168 } 217 }
169 218
170 str += clen; 219 str += clen;
171 } 220 }
221 else if (enc->flags & F_LATIN1)
222 {
223 *enc->cur++ = uch;
224 str += clen;
225 }
172 else if (is_utf8) 226 else if (is_utf8)
173 { 227 {
174 need (enc, len += clen); 228 need (enc, len += clen);
175 do 229 do
176 { 230 {
… …
178 } 232 }
179 while (--clen); 233 while (--clen);
180 } 234 }
181 else 235 else
182 { 236 {
183 need (enc, len += 10); // never more than 11 bytes needed 237 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
184 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 238 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
185 ++str; 239 ++str;
186 } 240 }
187 } 241 }
188 } 242 }
… …
190 244
191 --len; 245 --len;
192 } 246 }
193} 247}
194 248
195#define INDENT SB \ 249inline void
250encode_indent (enc_t *enc)
251{
196 if (enc->flags & F_INDENT) \ 252 if (enc->flags & F_INDENT)
197 { \ 253 {
198 int i_; \ 254 int spaces = enc->indent * INDENT_STEP;
199 need (enc, enc->indent); \
200 for (i_ = enc->indent * 3; i_--; )\
201 encode_ch (enc, ' '); \
202 } \
203 SE
204 255
205#define SPACE SB need (enc, 1); encode_ch (enc, ' '); SE 256 need (enc, spaces);
206#define NL SB if (enc->flags & F_INDENT) { need (enc, 1); encode_ch (enc, '\n'); } SE 257 memset (enc->cur, ' ', spaces);
207#define COMMA SB \ 258 enc->cur += spaces;
259 }
260}
261
262inline void
263encode_space (enc_t *enc)
264{
265 need (enc, 1);
208 encode_ch (enc, ','); \ 266 encode_ch (enc, ' ');
267}
268
269inline void
270encode_nl (enc_t *enc)
271{
209 if (enc->flags & F_INDENT) \ 272 if (enc->flags & F_INDENT)
210 NL; \ 273 {
274 need (enc, 1);
275 encode_ch (enc, '\n');
276 }
277}
278
279inline void
280encode_comma (enc_t *enc)
281{
282 encode_ch (enc, ',');
283
284 if (enc->flags & F_INDENT)
285 encode_nl (enc);
211 else if (enc->flags & F_SPACE_AFTER) \ 286 else if (enc->flags & F_SPACE_AFTER)
212 SPACE; \ 287 encode_space (enc);
213 SE 288}
214 289
215static void encode_sv (enc_t *enc, SV *sv); 290static void encode_sv (enc_t *enc, SV *sv);
216 291
217static void 292static void
218encode_av (enc_t *enc, AV *av) 293encode_av (enc_t *enc, AV *av)
219{ 294{
220 int i, len = av_len (av); 295 int i, len = av_len (av);
221 296
222 encode_ch (enc, '['); NL; 297 if (enc->indent >= enc->maxdepth)
298 croak ("data structure too deep (hit recursion limit)");
299
300 encode_ch (enc, '['); encode_nl (enc);
223 ++enc->indent; 301 ++enc->indent;
224 302
225 for (i = 0; i <= len; ++i) 303 for (i = 0; i <= len; ++i)
226 { 304 {
227 INDENT; 305 encode_indent (enc);
228 encode_sv (enc, *av_fetch (av, i, 0)); 306 encode_sv (enc, *av_fetch (av, i, 0));
229 307
230 if (i < len) 308 if (i < len)
231 COMMA; 309 encode_comma (enc);
232 } 310 }
233 311
234 NL; 312 encode_nl (enc);
235 313
236 --enc->indent; 314 --enc->indent;
237 INDENT; encode_ch (enc, ']'); 315 encode_indent (enc); encode_ch (enc, ']');
238} 316}
239 317
240static void 318static void
241encode_he (enc_t *enc, HE *he) 319encode_he (enc_t *enc, HE *he)
242{ 320{
… …
256 else 334 else
257 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 335 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
258 336
259 encode_ch (enc, '"'); 337 encode_ch (enc, '"');
260 338
261 if (enc->flags & F_SPACE_BEFORE) SPACE; 339 if (enc->flags & F_SPACE_BEFORE) encode_space (enc);
262 encode_ch (enc, ':'); 340 encode_ch (enc, ':');
263 if (enc->flags & F_SPACE_AFTER ) SPACE; 341 if (enc->flags & F_SPACE_AFTER ) encode_space (enc);
264 encode_sv (enc, HeVAL (he)); 342 encode_sv (enc, HeVAL (he));
265} 343}
266 344
267// compare hash entries, used when all keys are bytestrings 345// compare hash entries, used when all keys are bytestrings
268static int 346static int
… …
292static void 370static void
293encode_hv (enc_t *enc, HV *hv) 371encode_hv (enc_t *enc, HV *hv)
294{ 372{
295 int count, i; 373 int count, i;
296 374
375 if (enc->indent >= enc->maxdepth)
376 croak ("data structure too deep (hit recursion limit)");
377
297 encode_ch (enc, '{'); NL; ++enc->indent; 378 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
298 379
299 if ((count = hv_iterinit (hv))) 380 if ((count = hv_iterinit (hv)))
300 { 381 {
301 // for canonical output we have to sort by keys first 382 // for canonical output we have to sort by keys first
302 // actually, this is mostly due to the stupid so-called 383 // actually, this is mostly due to the stupid so-called
303 // security workaround added somewhere in 5.8.x. 384 // security workaround added somewhere in 5.8.x.
304 // that randomises hash orderings 385 // that randomises hash orderings
305 if (enc->flags & F_CANONICAL) 386 if (enc->flags & F_CANONICAL)
306 { 387 {
307 HE *he, *hes [count];
308 int fast = 1; 388 int fast = 1;
389 HE *he;
390#if defined(__BORLANDC__) || defined(_MSC_VER)
391 HE **hes = _alloca (count * sizeof (HE));
392#else
393 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
394#endif
309 395
310 i = 0; 396 i = 0;
311 while ((he = hv_iternext (hv))) 397 while ((he = hv_iternext (hv)))
312 { 398 {
313 hes [i++] = he; 399 hes [i++] = he;
… …
337 LEAVE; 423 LEAVE;
338 } 424 }
339 425
340 for (i = 0; i < count; ++i) 426 for (i = 0; i < count; ++i)
341 { 427 {
342 INDENT; 428 encode_indent (enc);
343 encode_he (enc, hes [i]); 429 encode_he (enc, hes [i]);
344 430
345 if (i < count - 1) 431 if (i < count - 1)
346 COMMA; 432 encode_comma (enc);
347 } 433 }
348 434
349 NL; 435 encode_nl (enc);
350 } 436 }
351 else 437 else
352 { 438 {
353 SV *sv;
354 HE *he = hv_iternext (hv); 439 HE *he = hv_iternext (hv);
355 440
356 for (;;) 441 for (;;)
357 { 442 {
358 INDENT; 443 encode_indent (enc);
359 encode_he (enc, he); 444 encode_he (enc, he);
360 445
361 if (!(he = hv_iternext (hv))) 446 if (!(he = hv_iternext (hv)))
362 break; 447 break;
363 448
364 COMMA; 449 encode_comma (enc);
365 } 450 }
366 451
367 NL; 452 encode_nl (enc);
368 } 453 }
369 } 454 }
370 455
371 --enc->indent; INDENT; encode_ch (enc, '}'); 456 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
457}
458
459// encode objects, arrays and special \0=false and \1=true values.
460static void
461encode_rv (enc_t *enc, SV *sv)
462{
463 svtype svt;
464
465 SvGETMAGIC (sv);
466 svt = SvTYPE (sv);
467
468 if (svt == SVt_PVHV)
469 encode_hv (enc, (HV *)sv);
470 else if (svt == SVt_PVAV)
471 encode_av (enc, (AV *)sv);
472 else if (svt < SVt_PVAV)
473 {
474 if (SvNIOK (sv) && SvIV (sv) == 0)
475 encode_str (enc, "false", 5, 0);
476 else if (SvNIOK (sv) && SvIV (sv) == 1)
477 encode_str (enc, "true", 4, 0);
478 else
479 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
480 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
481 }
482 else
483 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
484 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
372} 485}
373 486
374static void 487static void
375encode_sv (enc_t *enc, SV *sv) 488encode_sv (enc_t *enc, SV *sv)
376{ 489{
… …
390 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 503 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
391 enc->cur += strlen (enc->cur); 504 enc->cur += strlen (enc->cur);
392 } 505 }
393 else if (SvIOKp (sv)) 506 else if (SvIOKp (sv))
394 { 507 {
395 need (enc, 64); 508 // we assume we can always read an IV as a UV
509 if (SvUV (sv) & ~(UV)0x7fff)
510 {
511 need (enc, sizeof (UV) * 3);
396 enc->cur += 512 enc->cur +=
397 SvIsUV(sv) 513 SvIsUV(sv)
398 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 514 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
399 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 515 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
516 }
517 else
518 {
519 // optimise the "small number case"
520 // code will likely be branchless and use only a single multiplication
521 I32 i = SvIV (sv);
522 U32 u;
523
524 need (enc, 6);
525
526 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
527 u = i < 0 ? -i : i;
528
529 // convert to 4.28 fixed-point representation
530 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
531
532 char digit, nz = 0;
533
534 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
535 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
536 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
537 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
538 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1;
539 }
400 } 540 }
401 else if (SvROK (sv)) 541 else if (SvROK (sv))
402 { 542 encode_rv (enc, SvRV (sv));
403 SV *rv = SvRV (sv);
404
405 if (!--enc->max_recurse)
406 croak ("data structure too deep (hit recursion limit)");
407
408 switch (SvTYPE (rv))
409 {
410 case SVt_PVAV: encode_av (enc, (AV *)rv); break;
411 case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
412
413 default:
414 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
415 SvPV_nolen (sv));
416 }
417 }
418 else if (!SvOK (sv)) 543 else if (!SvOK (sv))
419 encode_str (enc, "null", 4, 0); 544 encode_str (enc, "null", 4, 0);
420 else 545 else
421 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 546 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
422 SvPV_nolen (sv), SvFLAGS (sv)); 547 SvPV_nolen (sv), SvFLAGS (sv));
423} 548}
424 549
425static SV * 550static SV *
426encode_json (SV *scalar, UV flags) 551encode_json (SV *scalar, U32 flags)
427{ 552{
553 enc_t enc;
554
428 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 555 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar))
429 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 556 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
430 557
431 enc_t enc;
432 enc.flags = flags; 558 enc.flags = flags;
433 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 559 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
434 enc.cur = SvPVX (enc.sv); 560 enc.cur = SvPVX (enc.sv);
435 enc.end = SvEND (enc.sv); 561 enc.end = SvEND (enc.sv);
436 enc.max_recurse = 0;
437 enc.indent = 0; 562 enc.indent = 0;
563 enc.maxdepth = DEC_DEPTH (flags);
438 564
439 SvPOK_only (enc.sv); 565 SvPOK_only (enc.sv);
440 encode_sv (&enc, scalar); 566 encode_sv (&enc, scalar);
441 567
568 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
569 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
570
442 if (!(flags & (F_ASCII | F_UTF8))) 571 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8)))
443 SvUTF8_on (enc.sv); 572 SvUTF8_on (enc.sv);
444
445 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
446 573
447 if (enc.flags & F_SHRINK) 574 if (enc.flags & F_SHRINK)
448 shrink (enc.sv); 575 shrink (enc.sv);
449 576
450 return enc.sv; 577 return enc.sv;
451} 578}
452 579
453///////////////////////////////////////////////////////////////////////////// 580/////////////////////////////////////////////////////////////////////////////
581// decoder
454 582
455#define WS \ 583// structure used for decoding JSON
584typedef struct
585{
586 char *cur; // current parser pointer
587 char *end; // end of input string
588 const char *err; // parse error, if != 0
589 U32 flags; // F_*
590 U32 depth; // recursion depth
591 U32 maxdepth; // recursion depth limit
592} dec_t;
593
594inline void
595decode_ws (dec_t *dec)
596{
456 for (;;) \ 597 for (;;)
457 { \ 598 {
458 char ch = *dec->cur; \ 599 char ch = *dec->cur;
600
459 if (ch > 0x20 \ 601 if (ch > 0x20
460 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09)) \ 602 || (ch != 0x20 && ch != 0x0a && ch != 0x0d && ch != 0x09))
461 break; \ 603 break;
604
462 ++dec->cur; \ 605 ++dec->cur;
463 } 606 }
607}
464 608
465#define ERR(reason) SB dec->err = reason; goto fail; SE 609#define ERR(reason) SB dec->err = reason; goto fail; SE
610
466#define EXPECT_CH(ch) SB \ 611#define EXPECT_CH(ch) SB \
467 if (*dec->cur != ch) \ 612 if (*dec->cur != ch) \
468 ERR (# ch " expected"); \ 613 ERR (# ch " expected"); \
469 ++dec->cur; \ 614 ++dec->cur; \
470 SE 615 SE
471 616
617#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
618#define DEC_DEC_DEPTH --dec->depth
619
472static SV *decode_sv (dec_t *dec); 620static SV *decode_sv (dec_t *dec);
473 621
474static signed char decode_hexdigit[256]; 622static signed char decode_hexdigit[256];
475 623
476static UV 624static UV
477decode_4hex (dec_t *dec) 625decode_4hex (dec_t *dec)
478{ 626{
479 signed char d1, d2, d3, d4; 627 signed char d1, d2, d3, d4;
628 unsigned char *cur = (unsigned char *)dec->cur;
480 629
481 d1 = decode_hexdigit [((unsigned char *)dec->cur) [0]]; 630 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("four hexadecimal digits expected");
482 if (d1 < 0) ERR ("four hexadecimal digits expected"); 631 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("four hexadecimal digits expected");
483 d2 = decode_hexdigit [((unsigned char *)dec->cur) [1]]; 632 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("four hexadecimal digits expected");
484 if (d2 < 0) ERR ("four hexadecimal digits expected"); 633 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("four hexadecimal digits expected");
485 d3 = decode_hexdigit [((unsigned char *)dec->cur) [2]];
486 if (d3 < 0) ERR ("four hexadecimal digits expected");
487 d4 = decode_hexdigit [((unsigned char *)dec->cur) [3]];
488 if (d4 < 0) ERR ("four hexadecimal digits expected");
489 634
490 dec->cur += 4; 635 dec->cur += 4;
491 636
492 return ((UV)d1) << 12 637 return ((UV)d1) << 12
493 | ((UV)d2) << 8 638 | ((UV)d2) << 8
… …
496 641
497fail: 642fail:
498 return (UV)-1; 643 return (UV)-1;
499} 644}
500 645
501#define APPEND_GROW(n) SB \
502 if (cur + (n) >= end) \
503 { \
504 STRLEN ofs = cur - SvPVX (sv); \
505 SvGROW (sv, ofs + (n) + 1); \
506 cur = SvPVX (sv) + ofs; \
507 end = SvEND (sv); \
508 } \
509 SE
510
511#define APPEND_CH(ch) SB \
512 APPEND_GROW (1); \
513 *cur++ = (ch); \
514 SE
515
516static SV * 646static SV *
517decode_str (dec_t *dec) 647decode_str (dec_t *dec)
518{ 648{
519 SV *sv = NEWSV (0,2); 649 SV *sv = 0;
520 int utf8 = 0; 650 int utf8 = 0;
521 char *cur = SvPVX (sv);
522 char *end = SvEND (sv);
523 651
524 for (;;) 652 do
525 { 653 {
526 unsigned char ch = *(unsigned char *)dec->cur; 654 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
655 char *cur = buf;
527 656
528 if (ch == '"') 657 do
529 break;
530 else if (ch == '\\')
531 { 658 {
532 switch (*++dec->cur) 659 unsigned char ch = *(unsigned char *)dec->cur++;
660
661 if (expect_false (ch == '"'))
533 { 662 {
534 case '\\': 663 --dec->cur;
535 case '/': 664 break;
536 case '"': APPEND_CH (*dec->cur++); break; 665 }
537 666 else if (expect_false (ch == '\\'))
538 case 'b': APPEND_CH ('\010'); ++dec->cur; break; 667 {
539 case 't': APPEND_CH ('\011'); ++dec->cur; break; 668 switch (*dec->cur)
540 case 'n': APPEND_CH ('\012'); ++dec->cur; break;
541 case 'f': APPEND_CH ('\014'); ++dec->cur; break;
542 case 'r': APPEND_CH ('\015'); ++dec->cur; break;
543
544 case 'u':
545 { 669 {
546 UV lo, hi; 670 case '\\':
547 ++dec->cur; 671 case '/':
672 case '"': *cur++ = *dec->cur++; break;
548 673
549 hi = decode_4hex (dec); 674 case 'b': ++dec->cur; *cur++ = '\010'; break;
550 if (hi == (UV)-1) 675 case 't': ++dec->cur; *cur++ = '\011'; break;
551 goto fail; 676 case 'n': ++dec->cur; *cur++ = '\012'; break;
677 case 'f': ++dec->cur; *cur++ = '\014'; break;
678 case 'r': ++dec->cur; *cur++ = '\015'; break;
552 679
553 // possibly a surrogate pair 680 case 'u':
554 if (hi >= 0xd800 && hi < 0xdc00)
555 { 681 {
556 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 682 UV lo, hi;
557 ERR ("missing low surrogate character in surrogate pair");
558
559 dec->cur += 2; 683 ++dec->cur;
560 684
561 lo = decode_4hex (dec); 685 hi = decode_4hex (dec);
562 if (lo == (UV)-1) 686 if (hi == (UV)-1)
563 goto fail; 687 goto fail;
564 688
689 // possibly a surrogate pair
690 if (hi >= 0xd800)
691 if (hi < 0xdc00)
692 {
693 if (dec->cur [0] != '\\' || dec->cur [1] != 'u')
694 ERR ("missing low surrogate character in surrogate pair");
695
696 dec->cur += 2;
697
698 lo = decode_4hex (dec);
699 if (lo == (UV)-1)
700 goto fail;
701
565 if (lo < 0xdc00 || lo >= 0xe000) 702 if (lo < 0xdc00 || lo >= 0xe000)
566 ERR ("surrogate pair expected"); 703 ERR ("surrogate pair expected");
567 704
568 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000; 705 hi = (hi - 0xD800) * 0x400 + (lo - 0xDC00) + 0x10000;
706 }
707 else if (hi < 0xe000)
708 ERR ("missing high surrogate character in surrogate pair");
709
710 if (hi >= 0x80)
711 {
712 utf8 = 1;
713
714 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
715 }
716 else
717 *cur++ = hi;
569 } 718 }
570 else if (hi >= 0xdc00 && hi < 0xe000)
571 ERR ("missing high surrogate character in surrogate pair");
572
573 if (hi >= 0x80)
574 { 719 break;
575 utf8 = 1;
576 720
577 APPEND_GROW (4); // at most 4 bytes for 21 bits
578 cur = (char *)uvuni_to_utf8_flags (cur, hi, 0);
579 }
580 else 721 default:
581 APPEND_CH (hi); 722 --dec->cur;
723 ERR ("illegal backslash escape sequence in string");
582 } 724 }
583 break; 725 }
726 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
727 *cur++ = ch;
728 else if (ch >= 0x80)
729 {
730 STRLEN clen;
731 UV uch;
584 732
585 default:
586 --dec->cur; 733 --dec->cur;
587 ERR ("illegal backslash escape sequence in string"); 734
735 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen);
736 if (clen == (STRLEN)-1)
737 ERR ("malformed UTF-8 character in JSON string");
738
739 do
740 *cur++ = *dec->cur++;
741 while (--clen);
742
743 utf8 = 1;
744 }
745 else
746 {
747 --dec->cur;
748
749 if (!ch)
750 ERR ("unexpected end of string while parsing JSON string");
751 else
752 ERR ("invalid character encountered while parsing JSON string");
588 } 753 }
589 } 754 }
590 else if (ch >= 0x20 && ch <= 0x7f) 755 while (cur < buf + SHORT_STRING_LEN);
591 APPEND_CH (*dec->cur++); 756
592 else if (ch >= 0x80)
593 { 757 {
594 STRLEN clen; 758 STRLEN len = cur - buf;
595 UV uch = utf8n_to_uvuni (dec->cur, dec->end - dec->cur, &clen, UTF8_CHECK_ONLY);
596 if (clen == (STRLEN)-1)
597 ERR ("malformed UTF-8 character in JSON string");
598 759
599 APPEND_GROW (clen); 760 if (sv)
600 do
601 { 761 {
602 *cur++ = *dec->cur++; 762 SvGROW (sv, SvCUR (sv) + len + 1);
763 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
764 SvCUR_set (sv, SvCUR (sv) + len);
603 } 765 }
604 while (--clen);
605
606 utf8 = 1;
607 }
608 else if (dec->cur == dec->end)
609 ERR ("unexpected end of string while parsing json string");
610 else 766 else
611 ERR ("invalid character encountered"); 767 sv = newSVpvn (buf, len);
612 } 768 }
769 }
770 while (*dec->cur != '"');
613 771
614 ++dec->cur; 772 ++dec->cur;
615 773
616 SvCUR_set (sv, cur - SvPVX (sv)); 774 if (sv)
617 775 {
618 SvPOK_only (sv); 776 SvPOK_only (sv);
619 *SvEND (sv) = 0; 777 *SvEND (sv) = 0;
620 778
621 if (utf8) 779 if (utf8)
622 SvUTF8_on (sv); 780 SvUTF8_on (sv);
623 781 }
624 if (dec->flags & F_SHRINK) 782 else
625 shrink (sv); 783 sv = newSVpvn ("", 0);
626 784
627 return sv; 785 return sv;
628 786
629fail: 787fail:
630 SvREFCNT_dec (sv);
631 return 0; 788 return 0;
632} 789}
633 790
634static SV * 791static SV *
635decode_num (dec_t *dec) 792decode_num (dec_t *dec)
… …
693 is_nv = 1; 850 is_nv = 1;
694 } 851 }
695 852
696 if (!is_nv) 853 if (!is_nv)
697 { 854 {
698 UV uv; 855 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
699 int numtype = grok_number (start, dec->cur - start, &uv); 856 if (*start == '-')
700 if (numtype & IS_NUMBER_IN_UV) 857 switch (dec->cur - start)
701 if (numtype & IS_NUMBER_NEG)
702 { 858 {
703 if (uv < (UV)IV_MIN) 859 case 2: return newSViv (-( start [1] - '0' ));
704 return newSViv (-(IV)uv); 860 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
861 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
862 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
705 } 863 }
864 else
865 switch (dec->cur - start)
866 {
867 case 1: return newSViv ( start [0] - '0' );
868 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
869 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
870 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
871 }
872
873 {
874 UV uv;
875 int numtype = grok_number (start, dec->cur - start, &uv);
876 if (numtype & IS_NUMBER_IN_UV)
877 if (numtype & IS_NUMBER_NEG)
878 {
879 if (uv < (UV)IV_MIN)
880 return newSViv (-(IV)uv);
881 }
706 else 882 else
707 return newSVuv (uv); 883 return newSVuv (uv);
884 }
708 } 885 }
709 886
710 return newSVnv (Atof (start)); 887 return newSVnv (Atof (start));
711 888
712fail: 889fail:
… …
716static SV * 893static SV *
717decode_av (dec_t *dec) 894decode_av (dec_t *dec)
718{ 895{
719 AV *av = newAV (); 896 AV *av = newAV ();
720 897
721 WS; 898 DEC_INC_DEPTH;
899 decode_ws (dec);
900
722 if (*dec->cur == ']') 901 if (*dec->cur == ']')
723 ++dec->cur; 902 ++dec->cur;
724 else 903 else
725 for (;;) 904 for (;;)
726 { 905 {
… …
730 if (!value) 909 if (!value)
731 goto fail; 910 goto fail;
732 911
733 av_push (av, value); 912 av_push (av, value);
734 913
735 WS; 914 decode_ws (dec);
736 915
737 if (*dec->cur == ']') 916 if (*dec->cur == ']')
738 { 917 {
739 ++dec->cur; 918 ++dec->cur;
740 break; 919 break;
… …
744 ERR (", or ] expected while parsing array"); 923 ERR (", or ] expected while parsing array");
745 924
746 ++dec->cur; 925 ++dec->cur;
747 } 926 }
748 927
928 DEC_DEC_DEPTH;
749 return newRV_noinc ((SV *)av); 929 return newRV_noinc ((SV *)av);
750 930
751fail: 931fail:
752 SvREFCNT_dec (av); 932 SvREFCNT_dec (av);
933 DEC_DEC_DEPTH;
753 return 0; 934 return 0;
754} 935}
755 936
756static SV * 937static SV *
757decode_hv (dec_t *dec) 938decode_hv (dec_t *dec)
758{ 939{
759 HV *hv = newHV (); 940 HV *hv = newHV ();
760 941
761 WS; 942 DEC_INC_DEPTH;
943 decode_ws (dec);
944
762 if (*dec->cur == '}') 945 if (*dec->cur == '}')
763 ++dec->cur; 946 ++dec->cur;
764 else 947 else
765 for (;;) 948 for (;;)
766 { 949 {
767 SV *key, *value; 950 SV *key, *value;
768 951
769 WS; EXPECT_CH ('"'); 952 decode_ws (dec); EXPECT_CH ('"');
770 953
771 key = decode_str (dec); 954 key = decode_str (dec);
772 if (!key) 955 if (!key)
773 goto fail; 956 goto fail;
774 957
775 WS; EXPECT_CH (':'); 958 decode_ws (dec); EXPECT_CH (':');
776 959
777 value = decode_sv (dec); 960 value = decode_sv (dec);
778 if (!value) 961 if (!value)
779 { 962 {
780 SvREFCNT_dec (key); 963 SvREFCNT_dec (key);
781 goto fail; 964 goto fail;
782 } 965 }
783 966
784 //TODO: optimise
785 hv_store_ent (hv, key, value, 0); 967 hv_store_ent (hv, key, value, 0);
968 SvREFCNT_dec (key);
786 969
787 WS; 970 decode_ws (dec);
788 971
789 if (*dec->cur == '}') 972 if (*dec->cur == '}')
790 { 973 {
791 ++dec->cur; 974 ++dec->cur;
792 break; 975 break;
… …
796 ERR (", or } expected while parsing object/hash"); 979 ERR (", or } expected while parsing object/hash");
797 980
798 ++dec->cur; 981 ++dec->cur;
799 } 982 }
800 983
984 DEC_DEC_DEPTH;
801 return newRV_noinc ((SV *)hv); 985 return newRV_noinc ((SV *)hv);
802 986
803fail: 987fail:
804 SvREFCNT_dec (hv); 988 SvREFCNT_dec (hv);
989 DEC_DEC_DEPTH;
805 return 0; 990 return 0;
806} 991}
807 992
808static SV * 993static SV *
809decode_sv (dec_t *dec) 994decode_sv (dec_t *dec)
810{ 995{
811 WS; 996 decode_ws (dec);
812 switch (*dec->cur) 997 switch (*dec->cur)
813 { 998 {
814 case '"': ++dec->cur; return decode_str (dec); 999 case '"': ++dec->cur; return decode_str (dec);
815 case '[': ++dec->cur; return decode_av (dec); 1000 case '[': ++dec->cur; return decode_av (dec);
816 case '{': ++dec->cur; return decode_hv (dec); 1001 case '{': ++dec->cur; return decode_hv (dec);
… …
852 ERR ("'null' expected"); 1037 ERR ("'null' expected");
853 1038
854 break; 1039 break;
855 1040
856 default: 1041 default:
857 ERR ("malformed json string, neither array, object, number, string or atom"); 1042 ERR ("malformed JSON string, neither array, object, number, string or atom");
858 break; 1043 break;
859 } 1044 }
860 1045
861fail: 1046fail:
862 return 0; 1047 return 0;
863} 1048}
864 1049
865static SV * 1050static SV *
866decode_json (SV *string, UV flags) 1051decode_json (SV *string, U32 flags, UV *offset_return)
867{ 1052{
1053 dec_t dec;
1054 UV offset;
868 SV *sv; 1055 SV *sv;
1056
1057 SvGETMAGIC (string);
1058 SvUPGRADE (string, SVt_PV);
869 1059
870 if (flags & F_UTF8) 1060 if (flags & F_UTF8)
871 sv_utf8_downgrade (string, 0); 1061 sv_utf8_downgrade (string, 0);
872 else 1062 else
873 sv_utf8_upgrade (string); 1063 sv_utf8_upgrade (string);
874 1064
875 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1065 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
876 1066
877 dec_t dec;
878 dec.flags = flags; 1067 dec.flags = flags;
879 dec.cur = SvPVX (string); 1068 dec.cur = SvPVX (string);
880 dec.end = SvEND (string); 1069 dec.end = SvEND (string);
881 dec.err = 0; 1070 dec.err = 0;
1071 dec.depth = 0;
1072 dec.maxdepth = DEC_DEPTH (dec.flags);
882 1073
1074 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
883 sv = decode_sv (&dec); 1075 sv = decode_sv (&dec);
884 1076
1077 if (!(offset_return || !sv))
1078 {
1079 // check for trailing garbage
1080 decode_ws (&dec);
1081
1082 if (*dec.cur)
1083 {
1084 dec.err = "garbage after JSON object";
1085 SvREFCNT_dec (sv);
1086 sv = 0;
1087 }
1088 }
1089
1090 if (offset_return || !sv)
1091 {
1092 offset = dec.flags & F_UTF8
1093 ? dec.cur - SvPVX (string)
1094 : utf8_distance (dec.cur, SvPVX (string));
1095
1096 if (offset_return)
1097 *offset_return = offset;
1098 }
1099
885 if (!sv) 1100 if (!sv)
886 { 1101 {
887 IV offset = dec.flags & F_UTF8
888 ? dec.cur - SvPVX (string)
889 : utf8_distance (dec.cur, SvPVX (string));
890 SV *uni = sv_newmortal (); 1102 SV *uni = sv_newmortal ();
891 1103
892 // horrible hack to silence warning inside pv_uni_display 1104 // horrible hack to silence warning inside pv_uni_display
893 COP cop = *PL_curcop; 1105 COP cop = *PL_curcop;
894 cop.cop_warnings = pWARN_NONE; 1106 cop.cop_warnings = pWARN_NONE;
… …
896 SAVEVPTR (PL_curcop); 1108 SAVEVPTR (PL_curcop);
897 PL_curcop = &cop; 1109 PL_curcop = &cop;
898 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1110 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
899 LEAVE; 1111 LEAVE;
900 1112
901 croak ("%s, at character offset %d (%s)", 1113 croak ("%s, at character offset %d [\"%s\"]",
902 dec.err, 1114 dec.err,
903 (int)offset, 1115 (int)offset,
904 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1116 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
905 } 1117 }
906 1118
… …
910 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1122 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
911 1123
912 return sv; 1124 return sv;
913} 1125}
914 1126
1127/////////////////////////////////////////////////////////////////////////////
1128// XS interface functions
1129
915MODULE = JSON::XS PACKAGE = JSON::XS 1130MODULE = JSON::XS PACKAGE = JSON::XS
916 1131
917BOOT: 1132BOOT:
918{ 1133{
919 int i; 1134 int i;
920 1135
921 memset (decode_hexdigit, 0xff, 256); 1136 memset (decode_hexdigit, 0xff, 256);
1137
922 for (i = 10; i--; ) 1138 for (i = 0; i < 256; ++i)
923 decode_hexdigit ['0' + i] = i; 1139 decode_hexdigit [i] =
924 1140 i >= '0' && i <= '9' ? i - '0'
925 for (i = 7; i--; ) 1141 : i >= 'a' && i <= 'f' ? i - 'a' + 10
926 { 1142 : i >= 'A' && i <= 'F' ? i - 'A' + 10
927 decode_hexdigit ['a' + i] = 10 + i; 1143 : -1;
928 decode_hexdigit ['A' + i] = 10 + i;
929 }
930 1144
931 json_stash = gv_stashpv ("JSON::XS", 1); 1145 json_stash = gv_stashpv ("JSON::XS", 1);
932} 1146}
933 1147
934PROTOTYPES: DISABLE 1148PROTOTYPES: DISABLE
… …
940 RETVAL 1154 RETVAL
941 1155
942SV *ascii (SV *self, int enable = 1) 1156SV *ascii (SV *self, int enable = 1)
943 ALIAS: 1157 ALIAS:
944 ascii = F_ASCII 1158 ascii = F_ASCII
1159 latin1 = F_LATIN1
945 utf8 = F_UTF8 1160 utf8 = F_UTF8
946 indent = F_INDENT 1161 indent = F_INDENT
947 canonical = F_CANONICAL 1162 canonical = F_CANONICAL
948 space_before = F_SPACE_BEFORE 1163 space_before = F_SPACE_BEFORE
949 space_after = F_SPACE_AFTER 1164 space_after = F_SPACE_AFTER
… …
961 RETVAL = newSVsv (self); 1176 RETVAL = newSVsv (self);
962} 1177}
963 OUTPUT: 1178 OUTPUT:
964 RETVAL 1179 RETVAL
965 1180
1181SV *max_depth (SV *self, UV max_depth = 0x80000000UL)
1182 CODE:
1183{
1184 UV *uv = SvJSON (self);
1185 UV log2 = 0;
1186
1187 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1188
1189 while ((1UL << log2) < max_depth)
1190 ++log2;
1191
1192 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1193
1194 RETVAL = newSVsv (self);
1195}
1196 OUTPUT:
1197 RETVAL
1198
966void encode (SV *self, SV *scalar) 1199void encode (SV *self, SV *scalar)
967 PPCODE: 1200 PPCODE:
968 XPUSHs (encode_json (scalar, *SvJSON (self))); 1201 XPUSHs (encode_json (scalar, *SvJSON (self)));
969 1202
970void decode (SV *self, SV *jsonstr) 1203void decode (SV *self, SV *jsonstr)
971 PPCODE: 1204 PPCODE:
972 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1205 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
1206
1207void decode_prefix (SV *self, SV *jsonstr)
1208 PPCODE:
1209{
1210 UV offset;
1211 EXTEND (SP, 2);
1212 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
1213 PUSHs (sv_2mortal (newSVuv (offset)));
1214}
973 1215
974PROTOTYPES: ENABLE 1216PROTOTYPES: ENABLE
975 1217
976void to_json (SV *scalar) 1218void to_json (SV *scalar)
1219 ALIAS:
1220 objToJson = 0
977 PPCODE: 1221 PPCODE:
978 XPUSHs (encode_json (scalar, F_UTF8)); 1222 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8));
979 1223
980void from_json (SV *jsonstr) 1224void from_json (SV *jsonstr)
1225 ALIAS:
1226 jsonToObj = 0
981 PPCODE: 1227 PPCODE:
982 XPUSHs (decode_json (jsonstr, F_UTF8)); 1228 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0));
983 1229

Diff Legend

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