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.17 by root, Sun Mar 25 02:46:41 2007 UTC vs.
Revision 1.53 by root, Tue Jul 10 15:45:34 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
31#define F_MAXDEPTH 0xf8000000UL
32#define S_MAXDEPTH 27
33#define F_MAXSIZE 0x01f00000UL
34#define S_MAXSIZE 20
35#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
17 36
18// F_SKIPINVALID? 37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
19// F_EXECCODEREF? 38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
20// F_SELFCONVERT? <=> { &__class__ => }
21 39
22#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
23#define F_DEFAULT 0 41#define F_DEFAULT (9UL << S_MAXDEPTH)
24 42
25#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
26#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
27 45
28#define UTF8_MAX_LEN 11 // for perls UTF-X: max. number of octets per character
29#define SHORT_STRING_LEN 512 // special-case strings of up to this size 46#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
30 47
31#define SB do { 48#define SB do {
32#define SE } while (0) 49#define SE } while (0)
33 50
51#if __GNUC__ >= 3
52# define expect(expr,value) __builtin_expect ((expr),(value))
53# define inline inline
54#else
55# define expect(expr,value) (expr)
56# define inline static
57#endif
58
59#define expect_false(expr) expect ((expr) != 0, 0)
60#define expect_true(expr) expect ((expr) != 0, 1)
61
34static HV *json_stash; // JSON::XS:: 62static HV *json_stash, *json_boolean_stash; // JSON::XS::
63static SV *json_true, *json_false;
64
65typedef struct {
66 U32 flags;
67 SV *cb_object;
68 HV *cb_sk_object;
69} JSON;
35 70
36///////////////////////////////////////////////////////////////////////////// 71/////////////////////////////////////////////////////////////////////////////
37// utility functions 72// utility functions
38 73
39static UV * 74inline void
40SvJSON (SV *sv)
41{
42 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
43 croak ("object is not of type JSON::XS");
44
45 return &SvUVX (SvRV (sv));
46}
47
48static void
49shrink (SV *sv) 75shrink (SV *sv)
50{ 76{
51 sv_utf8_downgrade (sv, 1); 77 sv_utf8_downgrade (sv, 1);
52 if (SvLEN (sv) > SvCUR (sv) + 1) 78 if (SvLEN (sv) > SvCUR (sv) + 1)
53 { 79 {
… …
62// decode an utf-8 character and return it, or (UV)-1 in 88// decode an utf-8 character and return it, or (UV)-1 in
63// case of an error. 89// case of an error.
64// we special-case "safe" characters from U+80 .. U+7FF, 90// we special-case "safe" characters from U+80 .. U+7FF,
65// but use the very good perl function to parse anything else. 91// but use the very good perl function to parse anything else.
66// note that we never call this function for a ascii codepoints 92// note that we never call this function for a ascii codepoints
67static UV 93inline UV
68decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 94decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
69{ 95{
70 if (s[0] > 0xdf || s[0] < 0xc2) 96 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
71 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 97 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
72 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 98 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
73 { 99 {
74 *clen = 2; 100 *clen = 2;
75 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 101 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
76 } 102 }
77 else 103 else
104 {
105 *clen = (STRLEN)-1;
78 return (UV)-1; 106 return (UV)-1;
107 }
79} 108}
80 109
81///////////////////////////////////////////////////////////////////////////// 110/////////////////////////////////////////////////////////////////////////////
82// encoder 111// encoder
83 112
… …
85typedef struct 114typedef struct
86{ 115{
87 char *cur; // SvPVX (sv) + current output position 116 char *cur; // SvPVX (sv) + current output position
88 char *end; // SvEND (sv) 117 char *end; // SvEND (sv)
89 SV *sv; // result scalar 118 SV *sv; // result scalar
90 UV flags; // F_* 119 JSON json;
91 int indent; // indentation level 120 U32 indent; // indentation level
92 int max_depth; // max. recursion level 121 U32 maxdepth; // max. indentation/recursion level
93} enc_t; 122} enc_t;
94 123
95static void 124inline void
96need (enc_t *enc, STRLEN len) 125need (enc_t *enc, STRLEN len)
97{ 126{
98 if (enc->cur + len >= enc->end) 127 if (expect_false (enc->cur + len >= enc->end))
99 { 128 {
100 STRLEN cur = enc->cur - SvPVX (enc->sv); 129 STRLEN cur = enc->cur - SvPVX (enc->sv);
101 SvGROW (enc->sv, cur + len + 1); 130 SvGROW (enc->sv, cur + len + 1);
102 enc->cur = SvPVX (enc->sv) + cur; 131 enc->cur = SvPVX (enc->sv) + cur;
103 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv); 132 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
104 } 133 }
105} 134}
106 135
107static void 136inline void
108encode_ch (enc_t *enc, char ch) 137encode_ch (enc_t *enc, char ch)
109{ 138{
110 need (enc, 1); 139 need (enc, 1);
111 *enc->cur++ = ch; 140 *enc->cur++ = ch;
112} 141}
… …
120 149
121 while (str < end) 150 while (str < end)
122 { 151 {
123 unsigned char ch = *(unsigned char *)str; 152 unsigned char ch = *(unsigned char *)str;
124 153
125 if (ch >= 0x20 && ch < 0x80) // most common case 154 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
126 { 155 {
127 if (ch == '"') // but with slow exceptions 156 if (expect_false (ch == '"')) // but with slow exceptions
128 { 157 {
129 need (enc, len += 1); 158 need (enc, len += 1);
130 *enc->cur++ = '\\'; 159 *enc->cur++ = '\\';
131 *enc->cur++ = '"'; 160 *enc->cur++ = '"';
132 } 161 }
133 else if (ch == '\\') 162 else if (expect_false (ch == '\\'))
134 { 163 {
135 need (enc, len += 1); 164 need (enc, len += 1);
136 *enc->cur++ = '\\'; 165 *enc->cur++ = '\\';
137 *enc->cur++ = '\\'; 166 *enc->cur++ = '\\';
138 } 167 }
… …
156 STRLEN clen; 185 STRLEN clen;
157 UV uch; 186 UV uch;
158 187
159 if (is_utf8) 188 if (is_utf8)
160 { 189 {
161 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
162 uch = decode_utf8 (str, end - str, &clen); 190 uch = decode_utf8 (str, end - str, &clen);
163 if (clen == (STRLEN)-1) 191 if (clen == (STRLEN)-1)
164 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 192 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
165 } 193 }
166 else 194 else
… …
170 } 198 }
171 199
172 if (uch > 0x10FFFFUL) 200 if (uch > 0x10FFFFUL)
173 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 201 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
174 202
175 if (uch < 0x80 || enc->flags & F_ASCII) 203 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
176 { 204 {
177 if (uch > 0xFFFFUL) 205 if (uch > 0xFFFFUL)
178 { 206 {
179 need (enc, len += 11); 207 need (enc, len += 11);
180 sprintf (enc->cur, "\\u%04x\\u%04x", 208 sprintf (enc->cur, "\\u%04x\\u%04x",
… …
194 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 222 *enc->cur++ = hexdigit [(uch >> 0) & 15];
195 } 223 }
196 224
197 str += clen; 225 str += clen;
198 } 226 }
227 else if (enc->json.flags & F_LATIN1)
228 {
229 *enc->cur++ = uch;
230 str += clen;
231 }
199 else if (is_utf8) 232 else if (is_utf8)
200 { 233 {
201 need (enc, len += clen); 234 need (enc, len += clen);
202 do 235 do
203 { 236 {
… …
205 } 238 }
206 while (--clen); 239 while (--clen);
207 } 240 }
208 else 241 else
209 { 242 {
210 need (enc, len += UTF8_MAX_LEN - 1); // never more than 11 bytes needed 243 need (enc, len += UTF8_MAXBYTES - 1); // never more than 11 bytes needed
211 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0); 244 enc->cur = uvuni_to_utf8_flags (enc->cur, uch, 0);
212 ++str; 245 ++str;
213 } 246 }
214 } 247 }
215 } 248 }
… …
217 250
218 --len; 251 --len;
219 } 252 }
220} 253}
221 254
222static void 255inline void
223encode_indent (enc_t *enc) 256encode_indent (enc_t *enc)
224{ 257{
225 if (enc->flags & F_INDENT) 258 if (enc->json.flags & F_INDENT)
226 { 259 {
227 int spaces = enc->indent * INDENT_STEP; 260 int spaces = enc->indent * INDENT_STEP;
228 261
229 need (enc, spaces); 262 need (enc, spaces);
230 memset (enc->cur, ' ', spaces); 263 memset (enc->cur, ' ', spaces);
231 enc->cur += spaces; 264 enc->cur += spaces;
232 } 265 }
233} 266}
234 267
235static void 268inline void
236encode_space (enc_t *enc) 269encode_space (enc_t *enc)
237{ 270{
238 need (enc, 1); 271 need (enc, 1);
239 encode_ch (enc, ' '); 272 encode_ch (enc, ' ');
240} 273}
241 274
242static void 275inline void
243encode_nl (enc_t *enc) 276encode_nl (enc_t *enc)
244{ 277{
245 if (enc->flags & F_INDENT) 278 if (enc->json.flags & F_INDENT)
246 { 279 {
247 need (enc, 1); 280 need (enc, 1);
248 encode_ch (enc, '\n'); 281 encode_ch (enc, '\n');
249 } 282 }
250} 283}
251 284
252static void 285inline void
253encode_comma (enc_t *enc) 286encode_comma (enc_t *enc)
254{ 287{
255 encode_ch (enc, ','); 288 encode_ch (enc, ',');
256 289
257 if (enc->flags & F_INDENT) 290 if (enc->json.flags & F_INDENT)
258 encode_nl (enc); 291 encode_nl (enc);
259 else if (enc->flags & F_SPACE_AFTER) 292 else if (enc->json.flags & F_SPACE_AFTER)
260 encode_space (enc); 293 encode_space (enc);
261} 294}
262 295
263static void encode_sv (enc_t *enc, SV *sv); 296static void encode_sv (enc_t *enc, SV *sv);
264 297
265static void 298static void
266encode_av (enc_t *enc, AV *av) 299encode_av (enc_t *enc, AV *av)
267{ 300{
268 int i, len = av_len (av); 301 int i, len = av_len (av);
302
303 if (enc->indent >= enc->maxdepth)
304 croak ("data structure too deep (hit recursion limit)");
269 305
270 encode_ch (enc, '['); encode_nl (enc); 306 encode_ch (enc, '['); encode_nl (enc);
271 ++enc->indent; 307 ++enc->indent;
272 308
273 for (i = 0; i <= len; ++i) 309 for (i = 0; i <= len; ++i)
… …
304 else 340 else
305 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 341 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
306 342
307 encode_ch (enc, '"'); 343 encode_ch (enc, '"');
308 344
309 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 345 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
310 encode_ch (enc, ':'); 346 encode_ch (enc, ':');
311 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 347 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
312 encode_sv (enc, HeVAL (he)); 348 encode_sv (enc, HeVAL (he));
313} 349}
314 350
315// compare hash entries, used when all keys are bytestrings 351// compare hash entries, used when all keys are bytestrings
316static int 352static int
… …
339 375
340static void 376static void
341encode_hv (enc_t *enc, HV *hv) 377encode_hv (enc_t *enc, HV *hv)
342{ 378{
343 int count, i; 379 int count, i;
380
381 if (enc->indent >= enc->maxdepth)
382 croak ("data structure too deep (hit recursion limit)");
344 383
345 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent; 384 encode_ch (enc, '{'); encode_nl (enc); ++enc->indent;
346 385
347 if ((count = hv_iterinit (hv))) 386 if ((count = hv_iterinit (hv)))
348 { 387 {
349 // for canonical output we have to sort by keys first 388 // for canonical output we have to sort by keys first
350 // actually, this is mostly due to the stupid so-called 389 // actually, this is mostly due to the stupid so-called
351 // security workaround added somewhere in 5.8.x. 390 // security workaround added somewhere in 5.8.x.
352 // that randomises hash orderings 391 // that randomises hash orderings
353 if (enc->flags & F_CANONICAL) 392 if (enc->json.flags & F_CANONICAL)
354 { 393 {
355 HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
356 int fast = 1; 394 int fast = 1;
395 HE *he;
396#if defined(__BORLANDC__) || defined(_MSC_VER)
397 HE **hes = _alloca (count * sizeof (HE));
398#else
399 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
400#endif
357 401
358 i = 0; 402 i = 0;
359 while ((he = hv_iternext (hv))) 403 while ((he = hv_iternext (hv)))
360 { 404 {
361 hes [i++] = he; 405 hes [i++] = he;
… …
396 440
397 encode_nl (enc); 441 encode_nl (enc);
398 } 442 }
399 else 443 else
400 { 444 {
401 SV *sv;
402 HE *he = hv_iternext (hv); 445 HE *he = hv_iternext (hv);
403 446
404 for (;;) 447 for (;;)
405 { 448 {
406 encode_indent (enc); 449 encode_indent (enc);
… …
415 encode_nl (enc); 458 encode_nl (enc);
416 } 459 }
417 } 460 }
418 461
419 --enc->indent; encode_indent (enc); encode_ch (enc, '}'); 462 --enc->indent; encode_indent (enc); encode_ch (enc, '}');
463}
464
465// encode objects, arrays and special \0=false and \1=true values.
466static void
467encode_rv (enc_t *enc, SV *sv)
468{
469 svtype svt;
470
471 SvGETMAGIC (sv);
472 svt = SvTYPE (sv);
473
474 if (expect_false (SvOBJECT (sv)))
475 {
476 if (SvSTASH (sv) == json_boolean_stash)
477 {
478 if (SvIV (sv))
479 encode_str (enc, "true", 4, 0);
480 else
481 encode_str (enc, "false", 5, 0);
482 }
483 else
484 {
485#if 0
486 if (0 && sv_derived_from (rv, "JSON::Literal"))
487 {
488 // not yet
489 }
490#endif
491 if (enc->json.flags & F_CONV_BLESSED)
492 {
493 // we re-bless the reference to get overload and other niceties right
494 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
495
496 if (to_json)
497 {
498 dSP;
499
500 ENTER; SAVETMPS; 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 return value
504 // check anyways.
505 PUTBACK;
506 assert (1 == call_sv ((SV *)GvCV (to_json), G_SCALAR));
507 SPAGAIN;
508
509 // catch this surprisingly common error
510 if (SvROK (TOPs) && SvRV (TOPs) == sv)
511 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
512
513 sv = POPs;
514 PUTBACK;
515
516 encode_sv (enc, sv);
517
518 FREETMPS; LEAVE;
519 }
520 else if (enc->json.flags & F_ALLOW_BLESSED)
521 encode_str (enc, "null", 4, 0);
522 else
523 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
524 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
525 }
526 else if (enc->json.flags & F_ALLOW_BLESSED)
527 encode_str (enc, "null", 4, 0);
528 else
529 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
530 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
531 }
532 }
533 else if (svt == SVt_PVHV)
534 encode_hv (enc, (HV *)sv);
535 else if (svt == SVt_PVAV)
536 encode_av (enc, (AV *)sv);
537 else if (svt < SVt_PVAV)
538 {
539 STRLEN len = 0;
540 char *pv = svt ? SvPV (sv, len) : 0;
541
542 if (len == 1 && *pv == '1')
543 encode_str (enc, "true", 4, 0);
544 else if (len == 1 && *pv == '0')
545 encode_str (enc, "false", 5, 0);
546 else
547 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
549 }
550 else
551 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
552 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
420} 553}
421 554
422static void 555static void
423encode_sv (enc_t *enc, SV *sv) 556encode_sv (enc_t *enc, SV *sv)
424{ 557{
… …
432 encode_str (enc, str, len, SvUTF8 (sv)); 565 encode_str (enc, str, len, SvUTF8 (sv));
433 encode_ch (enc, '"'); 566 encode_ch (enc, '"');
434 } 567 }
435 else if (SvNOKp (sv)) 568 else if (SvNOKp (sv))
436 { 569 {
570 // trust that perl will do the right thing w.r.t. JSON syntax.
437 need (enc, NV_DIG + 32); 571 need (enc, NV_DIG + 32);
438 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 572 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
439 enc->cur += strlen (enc->cur); 573 enc->cur += strlen (enc->cur);
440 } 574 }
441 else if (SvIOKp (sv)) 575 else if (SvIOKp (sv))
442 { 576 {
443 need (enc, 64); 577 // we assume we can always read an IV as a UV
578 if (SvUV (sv) & ~(UV)0x7fff)
579 {
580 // large integer, use the (rather slow) snprintf way.
581 need (enc, sizeof (UV) * 3);
444 enc->cur += 582 enc->cur +=
445 SvIsUV(sv) 583 SvIsUV(sv)
446 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 584 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
447 : snprintf (enc->cur, 64, "%"IVdf, (IV)SvIVX (sv)); 585 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
586 }
587 else
588 {
589 // optimise the "small number case"
590 // code will likely be branchless and use only a single multiplication
591 I32 i = SvIV (sv);
592 U32 u;
593 char digit, nz = 0;
594
595 need (enc, 6);
596
597 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
598 u = i < 0 ? -i : i;
599
600 // convert to 4.28 fixed-point representation
601 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
602
603 // now output digit by digit, each time masking out the integer part
604 // and multiplying by 5 while moving the decimal point one to the right,
605 // resulting in a net multiplication by 10.
606 // we always write the digit to memory but conditionally increment
607 // the pointer, to ease the usage of conditional move instructions.
608 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
609 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
610 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
611 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
612 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
613 }
448 } 614 }
449 else if (SvROK (sv)) 615 else if (SvROK (sv))
450 { 616 encode_rv (enc, SvRV (sv));
451 SV *rv = SvRV (sv);
452
453 if (enc->indent >= enc->max_depth)
454 croak ("data structure too deep (hit recursion limit)");
455
456 switch (SvTYPE (rv))
457 {
458 case SVt_PVAV: encode_av (enc, (AV *)rv); break;
459 case SVt_PVHV: encode_hv (enc, (HV *)rv); break;
460
461 default:
462 croak ("encountered %s, but JSON can only represent references to arrays or hashes",
463 SvPV_nolen (sv));
464 }
465 }
466 else if (!SvOK (sv)) 617 else if (!SvOK (sv))
467 encode_str (enc, "null", 4, 0); 618 encode_str (enc, "null", 4, 0);
468 else 619 else
469 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 620 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
470 SvPV_nolen (sv), SvFLAGS (sv)); 621 SvPV_nolen (sv), SvFLAGS (sv));
471} 622}
472 623
473static SV * 624static SV *
474encode_json (SV *scalar, UV flags) 625encode_json (SV *scalar, JSON *json)
475{ 626{
627 enc_t enc;
628
476 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 629 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
477 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 630 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
478 631
479 enc_t enc; 632 enc.json = *json;
480 enc.flags = flags;
481 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 633 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
482 enc.cur = SvPVX (enc.sv); 634 enc.cur = SvPVX (enc.sv);
483 enc.end = SvEND (enc.sv); 635 enc.end = SvEND (enc.sv);
484 enc.indent = 0; 636 enc.indent = 0;
485 enc.max_depth = 0x7fffffffUL; 637 enc.maxdepth = DEC_DEPTH (enc.json.flags);
486 638
487 SvPOK_only (enc.sv); 639 SvPOK_only (enc.sv);
488 encode_sv (&enc, scalar); 640 encode_sv (&enc, scalar);
489 641
642 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
643 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
644
490 if (!(flags & (F_ASCII | F_UTF8))) 645 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
491 SvUTF8_on (enc.sv); 646 SvUTF8_on (enc.sv);
492 647
493 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
494
495 if (enc.flags & F_SHRINK) 648 if (enc.json.flags & F_SHRINK)
496 shrink (enc.sv); 649 shrink (enc.sv);
497 650
498 return enc.sv; 651 return enc.sv;
499} 652}
500 653
… …
505typedef struct 658typedef struct
506{ 659{
507 char *cur; // current parser pointer 660 char *cur; // current parser pointer
508 char *end; // end of input string 661 char *end; // end of input string
509 const char *err; // parse error, if != 0 662 const char *err; // parse error, if != 0
510 UV flags; // F_* 663 JSON json;
664 U32 depth; // recursion depth
665 U32 maxdepth; // recursion depth limit
511} dec_t; 666} dec_t;
512 667
513static void 668inline void
514decode_ws (dec_t *dec) 669decode_ws (dec_t *dec)
515{ 670{
516 for (;;) 671 for (;;)
517 { 672 {
518 char ch = *dec->cur; 673 char ch = *dec->cur;
… …
524 ++dec->cur; 679 ++dec->cur;
525 } 680 }
526} 681}
527 682
528#define ERR(reason) SB dec->err = reason; goto fail; SE 683#define ERR(reason) SB dec->err = reason; goto fail; SE
684
529#define EXPECT_CH(ch) SB \ 685#define EXPECT_CH(ch) SB \
530 if (*dec->cur != ch) \ 686 if (*dec->cur != ch) \
531 ERR (# ch " expected"); \ 687 ERR (# ch " expected"); \
532 ++dec->cur; \ 688 ++dec->cur; \
533 SE 689 SE
534 690
691#define DEC_INC_DEPTH if (++dec->depth > dec->maxdepth) ERR ("json datastructure exceeds maximum nesting level (set a higher max_depth)")
692#define DEC_DEC_DEPTH --dec->depth
693
535static SV *decode_sv (dec_t *dec); 694static SV *decode_sv (dec_t *dec);
536 695
537static signed char decode_hexdigit[256]; 696static signed char decode_hexdigit[256];
538 697
539static UV 698static UV
540decode_4hex (dec_t *dec) 699decode_4hex (dec_t *dec)
541{ 700{
542 signed char d1, d2, d3, d4; 701 signed char d1, d2, d3, d4;
543 unsigned char *cur = (unsigned char *)dec->cur; 702 unsigned char *cur = (unsigned char *)dec->cur;
544 703
545 d1 = decode_hexdigit [cur [0]]; if (d1 < 0) ERR ("four hexadecimal digits expected"); 704 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
546 d2 = decode_hexdigit [cur [1]]; if (d2 < 0) ERR ("four hexadecimal digits expected"); 705 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
547 d3 = decode_hexdigit [cur [2]]; if (d3 < 0) ERR ("four hexadecimal digits expected"); 706 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
548 d4 = decode_hexdigit [cur [3]]; if (d4 < 0) ERR ("four hexadecimal digits expected"); 707 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
549 708
550 dec->cur += 4; 709 dec->cur += 4;
551 710
552 return ((UV)d1) << 12 711 return ((UV)d1) << 12
553 | ((UV)d2) << 8 712 | ((UV)d2) << 8
… …
561static SV * 720static SV *
562decode_str (dec_t *dec) 721decode_str (dec_t *dec)
563{ 722{
564 SV *sv = 0; 723 SV *sv = 0;
565 int utf8 = 0; 724 int utf8 = 0;
725 char *dec_cur = dec->cur;
566 726
567 do 727 do
568 { 728 {
569 char buf [SHORT_STRING_LEN + UTF8_MAX_LEN]; 729 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
570 char *cur = buf; 730 char *cur = buf;
571 731
572 do 732 do
573 { 733 {
574 unsigned char ch = *(unsigned char *)dec->cur++; 734 unsigned char ch = *(unsigned char *)dec_cur++;
575 735
576 if (ch == '"') 736 if (expect_false (ch == '"'))
577 { 737 {
578 --dec->cur; 738 --dec_cur;
579 break; 739 break;
580 } 740 }
581 else if (ch == '\\') 741 else if (expect_false (ch == '\\'))
582 { 742 {
583 switch (*dec->cur) 743 switch (*dec_cur)
584 { 744 {
585 case '\\': 745 case '\\':
586 case '/': 746 case '/':
587 case '"': *cur++ = *dec->cur++; break; 747 case '"': *cur++ = *dec_cur++; break;
588 748
589 case 'b': ++dec->cur; *cur++ = '\010'; break; 749 case 'b': ++dec_cur; *cur++ = '\010'; break;
590 case 't': ++dec->cur; *cur++ = '\011'; break; 750 case 't': ++dec_cur; *cur++ = '\011'; break;
591 case 'n': ++dec->cur; *cur++ = '\012'; break; 751 case 'n': ++dec_cur; *cur++ = '\012'; break;
592 case 'f': ++dec->cur; *cur++ = '\014'; break; 752 case 'f': ++dec_cur; *cur++ = '\014'; break;
593 case 'r': ++dec->cur; *cur++ = '\015'; break; 753 case 'r': ++dec_cur; *cur++ = '\015'; break;
594 754
595 case 'u': 755 case 'u':
596 { 756 {
597 UV lo, hi; 757 UV lo, hi;
598 ++dec->cur; 758 ++dec_cur;
599 759
760 dec->cur = dec_cur;
600 hi = decode_4hex (dec); 761 hi = decode_4hex (dec);
762 dec_cur = dec->cur;
601 if (hi == (UV)-1) 763 if (hi == (UV)-1)
602 goto fail; 764 goto fail;
603 765
604 // possibly a surrogate pair 766 // possibly a surrogate pair
605 if (hi >= 0xd800) 767 if (hi >= 0xd800)
606 if (hi < 0xdc00) 768 if (hi < 0xdc00)
607 { 769 {
608 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 770 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
609 ERR ("missing low surrogate character in surrogate pair"); 771 ERR ("missing low surrogate character in surrogate pair");
610 772
611 dec->cur += 2; 773 dec_cur += 2;
612 774
775 dec->cur = dec_cur;
613 lo = decode_4hex (dec); 776 lo = decode_4hex (dec);
777 dec_cur = dec->cur;
614 if (lo == (UV)-1) 778 if (lo == (UV)-1)
615 goto fail; 779 goto fail;
616 780
617 if (lo < 0xdc00 || lo >= 0xe000) 781 if (lo < 0xdc00 || lo >= 0xe000)
618 ERR ("surrogate pair expected"); 782 ERR ("surrogate pair expected");
… …
632 *cur++ = hi; 796 *cur++ = hi;
633 } 797 }
634 break; 798 break;
635 799
636 default: 800 default:
637 --dec->cur; 801 --dec_cur;
638 ERR ("illegal backslash escape sequence in string"); 802 ERR ("illegal backslash escape sequence in string");
639 } 803 }
640 } 804 }
641 else if (ch >= 0x20 && ch <= 0x7f) 805 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
642 *cur++ = ch; 806 *cur++ = ch;
643 else if (ch >= 0x80) 807 else if (ch >= 0x80)
644 { 808 {
645 --dec->cur;
646
647 STRLEN clen; 809 STRLEN clen;
810 UV uch;
811
812 --dec_cur;
813
648 UV uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 814 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
649 if (clen == (STRLEN)-1) 815 if (clen == (STRLEN)-1)
650 ERR ("malformed UTF-8 character in JSON string"); 816 ERR ("malformed UTF-8 character in JSON string");
651 817
652 do 818 do
653 {
654 *cur++ = *dec->cur++; 819 *cur++ = *dec_cur++;
655 }
656 while (--clen); 820 while (--clen);
657 821
658 utf8 = 1; 822 utf8 = 1;
659 } 823 }
660 else if (!ch)
661 ERR ("unexpected end of string while parsing json string");
662 else 824 else
825 {
826 --dec_cur;
827
828 if (!ch)
829 ERR ("unexpected end of string while parsing JSON string");
830 else
663 ERR ("invalid character encountered"); 831 ERR ("invalid character encountered while parsing JSON string");
664 832 }
665 } 833 }
666 while (cur < buf + SHORT_STRING_LEN); 834 while (cur < buf + SHORT_STRING_LEN);
667 835
836 {
668 STRLEN len = cur - buf; 837 STRLEN len = cur - buf;
669 838
670 if (sv) 839 if (sv)
671 { 840 {
672 SvGROW (sv, SvCUR (sv) + len + 1); 841 SvGROW (sv, SvCUR (sv) + len + 1);
673 memcpy (SvPVX (sv) + SvCUR (sv), buf, len); 842 memcpy (SvPVX (sv) + SvCUR (sv), buf, len);
674 SvCUR_set (sv, SvCUR (sv) + len); 843 SvCUR_set (sv, SvCUR (sv) + len);
675 } 844 }
676 else 845 else
677 sv = newSVpvn (buf, len); 846 sv = newSVpvn (buf, len);
678 } 847 }
848 }
679 while (*dec->cur != '"'); 849 while (*dec_cur != '"');
680 850
681 ++dec->cur; 851 ++dec_cur;
682 852
683 if (sv) 853 if (sv)
684 { 854 {
685 SvPOK_only (sv); 855 SvPOK_only (sv);
686 *SvEND (sv) = 0; 856 *SvEND (sv) = 0;
… …
689 SvUTF8_on (sv); 859 SvUTF8_on (sv);
690 } 860 }
691 else 861 else
692 sv = newSVpvn ("", 0); 862 sv = newSVpvn ("", 0);
693 863
864 dec->cur = dec_cur;
694 return sv; 865 return sv;
695 866
696fail: 867fail:
868 dec->cur = dec_cur;
697 return 0; 869 return 0;
698} 870}
699 871
700static SV * 872static SV *
701decode_num (dec_t *dec) 873decode_num (dec_t *dec)
… …
759 is_nv = 1; 931 is_nv = 1;
760 } 932 }
761 933
762 if (!is_nv) 934 if (!is_nv)
763 { 935 {
764 UV uv; 936 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
765 int numtype = grok_number (start, dec->cur - start, &uv); 937 if (*start == '-')
766 if (numtype & IS_NUMBER_IN_UV) 938 switch (dec->cur - start)
767 if (numtype & IS_NUMBER_NEG)
768 { 939 {
769 if (uv < (UV)IV_MIN) 940 case 2: return newSViv (-( start [1] - '0' * 1));
770 return newSViv (-(IV)uv); 941 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
942 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
943 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
771 } 944 }
945 else
946 switch (dec->cur - start)
947 {
948 case 1: return newSViv ( start [0] - '0' * 1);
949 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
950 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
951 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
952 }
953
954 {
955 UV uv;
956 int numtype = grok_number (start, dec->cur - start, &uv);
957 if (numtype & IS_NUMBER_IN_UV)
958 if (numtype & IS_NUMBER_NEG)
959 {
960 if (uv < (UV)IV_MIN)
961 return newSViv (-(IV)uv);
962 }
772 else 963 else
773 return newSVuv (uv); 964 return newSVuv (uv);
965
966 // here would likely be the place for bigint support
774 } 967 }
968 }
775 969
970 // if we ever support bigint or bigfloat, this is the place for bigfloat
776 return newSVnv (Atof (start)); 971 return newSVnv (Atof (start));
777 972
778fail: 973fail:
779 return 0; 974 return 0;
780} 975}
… …
782static SV * 977static SV *
783decode_av (dec_t *dec) 978decode_av (dec_t *dec)
784{ 979{
785 AV *av = newAV (); 980 AV *av = newAV ();
786 981
982 DEC_INC_DEPTH;
787 decode_ws (dec); 983 decode_ws (dec);
984
788 if (*dec->cur == ']') 985 if (*dec->cur == ']')
789 ++dec->cur; 986 ++dec->cur;
790 else 987 else
791 for (;;) 988 for (;;)
792 { 989 {
… …
810 ERR (", or ] expected while parsing array"); 1007 ERR (", or ] expected while parsing array");
811 1008
812 ++dec->cur; 1009 ++dec->cur;
813 } 1010 }
814 1011
1012 DEC_DEC_DEPTH;
815 return newRV_noinc ((SV *)av); 1013 return newRV_noinc ((SV *)av);
816 1014
817fail: 1015fail:
818 SvREFCNT_dec (av); 1016 SvREFCNT_dec (av);
1017 DEC_DEC_DEPTH;
819 return 0; 1018 return 0;
820} 1019}
821 1020
822static SV * 1021static SV *
823decode_hv (dec_t *dec) 1022decode_hv (dec_t *dec)
824{ 1023{
1024 SV *sv;
825 HV *hv = newHV (); 1025 HV *hv = newHV ();
826 1026
1027 DEC_INC_DEPTH;
827 decode_ws (dec); 1028 decode_ws (dec);
1029
828 if (*dec->cur == '}') 1030 if (*dec->cur == '}')
829 ++dec->cur; 1031 ++dec->cur;
830 else 1032 else
831 for (;;) 1033 for (;;)
832 { 1034 {
833 SV *key, *value;
834
835 decode_ws (dec); EXPECT_CH ('"'); 1035 decode_ws (dec); EXPECT_CH ('"');
836 1036
837 key = decode_str (dec); 1037 // heuristic: assume that
838 if (!key) 1038 // a) decode_str + hv_store_ent are abysmally slow.
839 goto fail; 1039 // b) most hash keys are short, simple ascii text.
1040 // => try to "fast-match" such strings to avoid
1041 // the overhead of decode_str + hv_store_ent.
1042 {
1043 SV *value;
1044 char *p = dec->cur;
1045 char *e = p + 24; // only try up to 24 bytes
840 1046
841 decode_ws (dec); EXPECT_CH (':'); 1047 for (;;)
842
843 value = decode_sv (dec);
844 if (!value)
845 { 1048 {
1049 // the >= 0x80 is true on most architectures
1050 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1051 {
1052 // slow path, back up and use decode_str
1053 SV *key = decode_str (dec);
1054 if (!key)
1055 goto fail;
1056
1057 decode_ws (dec); EXPECT_CH (':');
1058
1059 value = decode_sv (dec);
1060 if (!value)
1061 {
1062 SvREFCNT_dec (key);
1063 goto fail;
1064 }
1065
1066 hv_store_ent (hv, key, value, 0);
846 SvREFCNT_dec (key); 1067 SvREFCNT_dec (key);
1068
1069 break;
1070 }
1071 else if (*p == '"')
1072 {
1073 // fast path, got a simple key
1074 char *key = dec->cur;
1075 int len = p - key;
1076 dec->cur = p + 1;
1077
1078 decode_ws (dec); EXPECT_CH (':');
1079
1080 value = decode_sv (dec);
1081 if (!value)
847 goto fail; 1082 goto fail;
1083
1084 hv_store (hv, key, len, value, 0);
1085
1086 break;
1087 }
1088
1089 ++p;
848 } 1090 }
849 1091 }
850 //TODO: optimise
851 hv_store_ent (hv, key, value, 0);
852 1092
853 decode_ws (dec); 1093 decode_ws (dec);
854 1094
855 if (*dec->cur == '}') 1095 if (*dec->cur == '}')
856 { 1096 {
… …
862 ERR (", or } expected while parsing object/hash"); 1102 ERR (", or } expected while parsing object/hash");
863 1103
864 ++dec->cur; 1104 ++dec->cur;
865 } 1105 }
866 1106
1107 DEC_DEC_DEPTH;
867 return newRV_noinc ((SV *)hv); 1108 sv = newRV_noinc ((SV *)hv);
1109
1110 // check filter callbacks
1111 if (dec->json.flags & F_HOOK)
1112 {
1113 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1114 {
1115 HE *cb, *he;
1116
1117 hv_iterinit (hv);
1118 he = hv_iternext (hv);
1119 hv_iterinit (hv);
1120
1121 // the next line creates a mortal sv each time its called.
1122 // might want to optimise this for common cases.
1123 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1124
1125 if (cb)
1126 {
1127 dSP;
1128 int count;
1129
1130 ENTER; SAVETMPS; PUSHMARK (SP);
1131 XPUSHs (HeVAL (he));
1132
1133 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1134
1135 if (count == 1)
1136 {
1137 sv = newSVsv (POPs);
1138 FREETMPS; LEAVE;
1139 return sv;
1140 }
1141
1142 FREETMPS; LEAVE;
1143 }
1144 }
1145
1146 if (dec->json.cb_object)
1147 {
1148 dSP;
1149 int count;
1150
1151 ENTER; SAVETMPS; PUSHMARK (SP);
1152 XPUSHs (sv_2mortal (sv));
1153
1154 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1155
1156 if (count == 1)
1157 {
1158 sv = newSVsv (POPs);
1159 FREETMPS; LEAVE;
1160 return sv;
1161 }
1162
1163 SvREFCNT_inc (sv);
1164 FREETMPS; LEAVE;
1165 }
1166 }
1167
1168 return sv;
868 1169
869fail: 1170fail:
870 SvREFCNT_dec (hv); 1171 SvREFCNT_dec (hv);
1172 DEC_DEC_DEPTH;
871 return 0; 1173 return 0;
872} 1174}
873 1175
874static SV * 1176static SV *
875decode_sv (dec_t *dec) 1177decode_sv (dec_t *dec)
876{ 1178{
877 decode_ws (dec); 1179 decode_ws (dec);
1180
1181 // the beauty of JSON: you need exactly one character lookahead
1182 // to parse anything.
878 switch (*dec->cur) 1183 switch (*dec->cur)
879 { 1184 {
880 case '"': ++dec->cur; return decode_str (dec); 1185 case '"': ++dec->cur; return decode_str (dec);
881 case '[': ++dec->cur; return decode_av (dec); 1186 case '[': ++dec->cur; return decode_av (dec);
882 case '{': ++dec->cur; return decode_hv (dec); 1187 case '{': ++dec->cur; return decode_hv (dec);
… …
888 1193
889 case 't': 1194 case 't':
890 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1195 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
891 { 1196 {
892 dec->cur += 4; 1197 dec->cur += 4;
893 return newSViv (1); 1198 return SvREFCNT_inc (json_true);
894 } 1199 }
895 else 1200 else
896 ERR ("'true' expected"); 1201 ERR ("'true' expected");
897 1202
898 break; 1203 break;
899 1204
900 case 'f': 1205 case 'f':
901 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1206 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
902 { 1207 {
903 dec->cur += 5; 1208 dec->cur += 5;
904 return newSViv (0); 1209 return SvREFCNT_inc (json_false);
905 } 1210 }
906 else 1211 else
907 ERR ("'false' expected"); 1212 ERR ("'false' expected");
908 1213
909 break; 1214 break;
… …
918 ERR ("'null' expected"); 1223 ERR ("'null' expected");
919 1224
920 break; 1225 break;
921 1226
922 default: 1227 default:
923 ERR ("malformed json string, neither array, object, number, string or atom"); 1228 ERR ("malformed JSON string, neither array, object, number, string or atom");
924 break; 1229 break;
925 } 1230 }
926 1231
927fail: 1232fail:
928 return 0; 1233 return 0;
929} 1234}
930 1235
931static SV * 1236static SV *
932decode_json (SV *string, UV flags) 1237decode_json (SV *string, JSON *json, UV *offset_return)
933{ 1238{
1239 dec_t dec;
1240 UV offset;
934 SV *sv; 1241 SV *sv;
935 1242
1243 SvGETMAGIC (string);
1244 SvUPGRADE (string, SVt_PV);
1245
1246 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1247 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1248 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1249
936 if (flags & F_UTF8) 1250 if (json->flags & F_UTF8)
937 sv_utf8_downgrade (string, 0); 1251 sv_utf8_downgrade (string, 0);
938 else 1252 else
939 sv_utf8_upgrade (string); 1253 sv_utf8_upgrade (string);
940 1254
941 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1255 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
942 1256
943 dec_t dec; 1257 dec.json = *json;
944 dec.flags = flags;
945 dec.cur = SvPVX (string); 1258 dec.cur = SvPVX (string);
946 dec.end = SvEND (string); 1259 dec.end = SvEND (string);
947 dec.err = 0; 1260 dec.err = 0;
1261 dec.depth = 0;
1262 dec.maxdepth = DEC_DEPTH (dec.json.flags);
948 1263
1264 if (dec.json.cb_object || dec.json.cb_sk_object)
1265 dec.json.flags |= F_HOOK;
1266
1267 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
949 sv = decode_sv (&dec); 1268 sv = decode_sv (&dec);
950 1269
1270 if (!(offset_return || !sv))
1271 {
1272 // check for trailing garbage
1273 decode_ws (&dec);
1274
1275 if (*dec.cur)
1276 {
1277 dec.err = "garbage after JSON object";
1278 SvREFCNT_dec (sv);
1279 sv = 0;
1280 }
1281 }
1282
1283 if (offset_return || !sv)
1284 {
1285 offset = dec.json.flags & F_UTF8
1286 ? dec.cur - SvPVX (string)
1287 : utf8_distance (dec.cur, SvPVX (string));
1288
1289 if (offset_return)
1290 *offset_return = offset;
1291 }
1292
951 if (!sv) 1293 if (!sv)
952 { 1294 {
953 IV offset = dec.flags & F_UTF8
954 ? dec.cur - SvPVX (string)
955 : utf8_distance (dec.cur, SvPVX (string));
956 SV *uni = sv_newmortal (); 1295 SV *uni = sv_newmortal ();
957 1296
958 // horrible hack to silence warning inside pv_uni_display 1297 // horrible hack to silence warning inside pv_uni_display
959 COP cop = *PL_curcop; 1298 COP cop = *PL_curcop;
960 cop.cop_warnings = pWARN_NONE; 1299 cop.cop_warnings = pWARN_NONE;
… …
962 SAVEVPTR (PL_curcop); 1301 SAVEVPTR (PL_curcop);
963 PL_curcop = &cop; 1302 PL_curcop = &cop;
964 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1303 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
965 LEAVE; 1304 LEAVE;
966 1305
967 croak ("%s, at character offset %d (%s)", 1306 croak ("%s, at character offset %d [\"%s\"]",
968 dec.err, 1307 dec.err,
969 (int)offset, 1308 (int)offset,
970 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1309 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
971 } 1310 }
972 1311
973 sv = sv_2mortal (sv); 1312 sv = sv_2mortal (sv);
974 1313
975 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1314 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
976 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1315 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
977 1316
978 return sv; 1317 return sv;
979} 1318}
980 1319
… …
985 1324
986BOOT: 1325BOOT:
987{ 1326{
988 int i; 1327 int i;
989 1328
990 memset (decode_hexdigit, 0xff, 256);
991 for (i = 10; i--; ) 1329 for (i = 0; i < 256; ++i)
992 decode_hexdigit ['0' + i] = i; 1330 decode_hexdigit [i] =
1331 i >= '0' && i <= '9' ? i - '0'
1332 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1333 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1334 : -1;
993 1335
994 for (i = 7; i--; ) 1336 json_stash = gv_stashpv ("JSON::XS" , 1);
1337 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1338
1339 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1340 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1341}
1342
1343PROTOTYPES: DISABLE
1344
1345void new (char *klass)
1346 PPCODE:
1347{
1348 SV *pv = NEWSV (0, sizeof (JSON));
1349 SvPOK_only (pv);
1350 Zero (SvPVX (pv), 1, JSON);
1351 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1352 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), json_stash)));
1353}
1354
1355void ascii (JSON *self, int enable = 1)
1356 ALIAS:
1357 ascii = F_ASCII
1358 latin1 = F_LATIN1
1359 utf8 = F_UTF8
1360 indent = F_INDENT
1361 canonical = F_CANONICAL
1362 space_before = F_SPACE_BEFORE
1363 space_after = F_SPACE_AFTER
1364 pretty = F_PRETTY
1365 allow_nonref = F_ALLOW_NONREF
1366 shrink = F_SHRINK
1367 allow_blessed = F_ALLOW_BLESSED
1368 convert_blessed = F_CONV_BLESSED
1369 PPCODE:
1370{
1371 if (enable)
1372 self->flags |= ix;
1373 else
1374 self->flags &= ~ix;
1375
1376 XPUSHs (ST (0));
1377}
1378
1379void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1380 PPCODE:
1381{
1382 UV log2 = 0;
1383
1384 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1385
1386 while ((1UL << log2) < max_depth)
1387 ++log2;
1388
1389 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1390
1391 XPUSHs (ST (0));
1392}
1393
1394void max_size (JSON *self, UV max_size = 0)
1395 PPCODE:
1396{
1397 UV log2 = 0;
1398
1399 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1400 if (max_size == 1) max_size = 2;
1401
1402 while ((1UL << log2) < max_size)
1403 ++log2;
1404
1405 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1406
1407 XPUSHs (ST (0));
1408}
1409
1410void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1411 PPCODE:
1412{
1413 SvREFCNT_dec (self->cb_object);
1414 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1415
1416 XPUSHs (ST (0));
1417}
1418
1419void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1420 PPCODE:
1421{
1422 if (!self->cb_sk_object)
1423 self->cb_sk_object = newHV ();
1424
1425 if (SvOK (cb))
1426 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1427 else
995 { 1428 {
996 decode_hexdigit ['a' + i] = 10 + i; 1429 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
997 decode_hexdigit ['A' + i] = 10 + i; 1430
1431 if (!HvKEYS (self->cb_sk_object))
1432 {
1433 SvREFCNT_dec (self->cb_sk_object);
1434 self->cb_sk_object = 0;
1435 }
998 } 1436 }
999 1437
1000 json_stash = gv_stashpv ("JSON::XS", 1); 1438 XPUSHs (ST (0));
1001} 1439}
1002 1440
1003PROTOTYPES: DISABLE 1441void encode (JSON *self, SV *scalar)
1442 PPCODE:
1443 XPUSHs (encode_json (scalar, self));
1004 1444
1005SV *new (char *dummy) 1445void decode (JSON *self, SV *jsonstr)
1446 PPCODE:
1447 XPUSHs (decode_json (jsonstr, self, 0));
1448
1449void decode_prefix (JSON *self, SV *jsonstr)
1450 PPCODE:
1451{
1452 UV offset;
1453 EXTEND (SP, 2);
1454 PUSHs (decode_json (jsonstr, self, &offset));
1455 PUSHs (sv_2mortal (newSVuv (offset)));
1456}
1457
1458void DESTROY (JSON *self)
1006 CODE: 1459 CODE:
1007 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1460 SvREFCNT_dec (self->cb_sk_object);
1008 OUTPUT: 1461 SvREFCNT_dec (self->cb_object);
1009 RETVAL
1010 1462
1011SV *ascii (SV *self, int enable = 1) 1463PROTOTYPES: ENABLE
1012 ALIAS:
1013 ascii = F_ASCII
1014 utf8 = F_UTF8
1015 indent = F_INDENT
1016 canonical = F_CANONICAL
1017 space_before = F_SPACE_BEFORE
1018 space_after = F_SPACE_AFTER
1019 pretty = F_PRETTY
1020 allow_nonref = F_ALLOW_NONREF
1021 shrink = F_SHRINK
1022 CODE:
1023{
1024 UV *uv = SvJSON (self);
1025 if (enable)
1026 *uv |= ix;
1027 else
1028 *uv &= ~ix;
1029 1464
1030 RETVAL = newSVsv (self); 1465void to_json (SV *scalar)
1031}
1032 OUTPUT:
1033 RETVAL
1034
1035void encode (SV *self, SV *scalar)
1036 PPCODE: 1466 PPCODE:
1467{
1468 JSON json = { F_DEFAULT | F_UTF8 };
1037 XPUSHs (encode_json (scalar, *SvJSON (self))); 1469 XPUSHs (encode_json (scalar, &json));
1470}
1038 1471
1039void decode (SV *self, SV *jsonstr) 1472void from_json (SV *jsonstr)
1040 PPCODE: 1473 PPCODE:
1041 XPUSHs (decode_json (jsonstr, *SvJSON (self))); 1474{
1042 1475 JSON json = { F_DEFAULT | F_UTF8 };
1043PROTOTYPES: ENABLE
1044
1045void to_json (SV *scalar)
1046 ALIAS:
1047 objToJson = 0
1048 PPCODE:
1049 XPUSHs (encode_json (scalar, F_UTF8));
1050
1051void from_json (SV *jsonstr)
1052 ALIAS:
1053 jsonToObj = 0
1054 PPCODE:
1055 XPUSHs (decode_json (jsonstr, F_UTF8)); 1476 XPUSHs (decode_json (jsonstr, &json, 0));
1477}
1056 1478

Diff Legend

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