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

Diff Legend

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