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

Diff Legend

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