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.33 by root, Wed May 23 20:26:40 2007 UTC vs.
Revision 1.55 by root, Mon Jul 23 22:57:40 2007 UTC

9 9
10#if defined(__BORLANDC__) || defined(_MSC_VER) 10#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 11# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 12#endif
13 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
14#define F_ASCII 0x00000001UL 20#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL 21#define F_LATIN1 0x00000002UL
16#define F_UTF8 0x00000004UL 22#define F_UTF8 0x00000004UL
17#define F_INDENT 0x00000008UL 23#define F_INDENT 0x00000008UL
18#define F_CANONICAL 0x00000010UL 24#define F_CANONICAL 0x00000010UL
19#define F_SPACE_BEFORE 0x00000020UL 25#define F_SPACE_BEFORE 0x00000020UL
20#define F_SPACE_AFTER 0x00000040UL 26#define F_SPACE_AFTER 0x00000040UL
21#define F_ALLOW_NONREF 0x00000100UL 27#define F_ALLOW_NONREF 0x00000100UL
22#define F_SHRINK 0x00000200UL 28#define F_SHRINK 0x00000200UL
29#define F_ALLOW_BLESSED 0x00000400UL
30#define F_CONV_BLESSED 0x00000800UL
23#define F_MAXDEPTH 0xf8000000UL 31#define F_MAXDEPTH 0xf8000000UL
24#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
25 36
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 37#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27 38#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
30 39
31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
32#define F_DEFAULT (9UL << S_MAXDEPTH) 41#define F_DEFAULT (9UL << S_MAXDEPTH)
33 42
34#define INIT_SIZE 32 // initial scalar size to be allocated 43#define INIT_SIZE 32 // initial scalar size to be allocated
35#define INDENT_STEP 3 // spaces per indentation level 44#define INDENT_STEP 3 // spaces per indentation level
36 45
37#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
38 47
39#define SB do { 48#define SB do {
40#define SE } while (0) 49#define SE } while (0)
41 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
42static 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;
43 70
44///////////////////////////////////////////////////////////////////////////// 71/////////////////////////////////////////////////////////////////////////////
45// utility functions 72// utility functions
46 73
47static UV * 74inline void
48SvJSON (SV *sv)
49{
50 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
51 croak ("object is not of type JSON::XS");
52
53 return &SvUVX (SvRV (sv));
54}
55
56static void
57shrink (SV *sv) 75shrink (SV *sv)
58{ 76{
59 sv_utf8_downgrade (sv, 1); 77 sv_utf8_downgrade (sv, 1);
60 if (SvLEN (sv) > SvCUR (sv) + 1) 78 if (SvLEN (sv) > SvCUR (sv) + 1)
61 { 79 {
70// 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
71// case of an error. 89// case of an error.
72// we special-case "safe" characters from U+80 .. U+7FF, 90// we special-case "safe" characters from U+80 .. U+7FF,
73// but use the very good perl function to parse anything else. 91// but use the very good perl function to parse anything else.
74// note that we never call this function for a ascii codepoints 92// note that we never call this function for a ascii codepoints
75static UV 93inline UV
76decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen) 94decode_utf8 (unsigned char *s, STRLEN len, STRLEN *clen)
77{ 95{
78 if (s[0] > 0xdf || s[0] < 0xc2) 96 if (expect_false (s[0] > 0xdf || s[0] < 0xc2))
79 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY); 97 return utf8n_to_uvuni (s, len, clen, UTF8_CHECK_ONLY);
80 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf) 98 else if (len > 1 && s[1] >= 0x80 && s[1] <= 0xbf)
81 { 99 {
82 *clen = 2; 100 *clen = 2;
83 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f); 101 return ((s[0] & 0x1f) << 6) | (s[1] & 0x3f);
96typedef struct 114typedef struct
97{ 115{
98 char *cur; // SvPVX (sv) + current output position 116 char *cur; // SvPVX (sv) + current output position
99 char *end; // SvEND (sv) 117 char *end; // SvEND (sv)
100 SV *sv; // result scalar 118 SV *sv; // result scalar
101 U32 flags; // F_* 119 JSON json;
102 U32 indent; // indentation level 120 U32 indent; // indentation level
103 U32 maxdepth; // max. indentation/recursion level 121 U32 maxdepth; // max. indentation/recursion level
104} enc_t; 122} enc_t;
105 123
106static void 124inline void
107need (enc_t *enc, STRLEN len) 125need (enc_t *enc, STRLEN len)
108{ 126{
109 if (enc->cur + len >= enc->end) 127 if (expect_false (enc->cur + len >= enc->end))
110 { 128 {
111 STRLEN cur = enc->cur - SvPVX (enc->sv); 129 STRLEN cur = enc->cur - SvPVX (enc->sv);
112 SvGROW (enc->sv, cur + len + 1); 130 SvGROW (enc->sv, cur + len + 1);
113 enc->cur = SvPVX (enc->sv) + cur; 131 enc->cur = SvPVX (enc->sv) + cur;
114 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 132 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
115 } 133 }
116} 134}
117 135
118static void 136inline void
119encode_ch (enc_t *enc, char ch) 137encode_ch (enc_t *enc, char ch)
120{ 138{
121 need (enc, 1); 139 need (enc, 1);
122 *enc->cur++ = ch; 140 *enc->cur++ = ch;
123} 141}
131 149
132 while (str < end) 150 while (str < end)
133 { 151 {
134 unsigned char ch = *(unsigned char *)str; 152 unsigned char ch = *(unsigned char *)str;
135 153
136 if (ch >= 0x20 && ch < 0x80) // most common case 154 if (expect_true (ch >= 0x20 && ch < 0x80)) // most common case
137 { 155 {
138 if (ch == '"') // but with slow exceptions 156 if (expect_false (ch == '"')) // but with slow exceptions
139 { 157 {
140 need (enc, len += 1); 158 need (enc, len += 1);
141 *enc->cur++ = '\\'; 159 *enc->cur++ = '\\';
142 *enc->cur++ = '"'; 160 *enc->cur++ = '"';
143 } 161 }
144 else if (ch == '\\') 162 else if (expect_false (ch == '\\'))
145 { 163 {
146 need (enc, len += 1); 164 need (enc, len += 1);
147 *enc->cur++ = '\\'; 165 *enc->cur++ = '\\';
148 *enc->cur++ = '\\'; 166 *enc->cur++ = '\\';
149 } 167 }
167 STRLEN clen; 185 STRLEN clen;
168 UV uch; 186 UV uch;
169 187
170 if (is_utf8) 188 if (is_utf8)
171 { 189 {
172 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
173 uch = decode_utf8 (str, end - str, &clen); 190 uch = decode_utf8 (str, end - str, &clen);
174 if (clen == (STRLEN)-1) 191 if (clen == (STRLEN)-1)
175 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);
176 } 193 }
177 else 194 else
181 } 198 }
182 199
183 if (uch > 0x10FFFFUL) 200 if (uch > 0x10FFFFUL)
184 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);
185 202
186 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 203 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
187 { 204 {
188 if (uch > 0xFFFFUL) 205 if (uch > 0xFFFFUL)
189 { 206 {
190 need (enc, len += 11); 207 need (enc, len += 11);
191 sprintf (enc->cur, "\\u%04x\\u%04x", 208 sprintf (enc->cur, "\\u%04x\\u%04x",
205 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 222 *enc->cur++ = hexdigit [(uch >> 0) & 15];
206 } 223 }
207 224
208 str += clen; 225 str += clen;
209 } 226 }
210 else if (enc->flags & F_LATIN1) 227 else if (enc->json.flags & F_LATIN1)
211 { 228 {
212 *enc->cur++ = uch; 229 *enc->cur++ = uch;
213 str += clen; 230 str += clen;
214 } 231 }
215 else if (is_utf8) 232 else if (is_utf8)
233 250
234 --len; 251 --len;
235 } 252 }
236} 253}
237 254
238static void 255inline void
239encode_indent (enc_t *enc) 256encode_indent (enc_t *enc)
240{ 257{
241 if (enc->flags & F_INDENT) 258 if (enc->json.flags & F_INDENT)
242 { 259 {
243 int spaces = enc->indent * INDENT_STEP; 260 int spaces = enc->indent * INDENT_STEP;
244 261
245 need (enc, spaces); 262 need (enc, spaces);
246 memset (enc->cur, ' ', spaces); 263 memset (enc->cur, ' ', spaces);
247 enc->cur += spaces; 264 enc->cur += spaces;
248 } 265 }
249} 266}
250 267
251static void 268inline void
252encode_space (enc_t *enc) 269encode_space (enc_t *enc)
253{ 270{
254 need (enc, 1); 271 need (enc, 1);
255 encode_ch (enc, ' '); 272 encode_ch (enc, ' ');
256} 273}
257 274
258static void 275inline void
259encode_nl (enc_t *enc) 276encode_nl (enc_t *enc)
260{ 277{
261 if (enc->flags & F_INDENT) 278 if (enc->json.flags & F_INDENT)
262 { 279 {
263 need (enc, 1); 280 need (enc, 1);
264 encode_ch (enc, '\n'); 281 encode_ch (enc, '\n');
265 } 282 }
266} 283}
267 284
268static void 285inline void
269encode_comma (enc_t *enc) 286encode_comma (enc_t *enc)
270{ 287{
271 encode_ch (enc, ','); 288 encode_ch (enc, ',');
272 289
273 if (enc->flags & F_INDENT) 290 if (enc->json.flags & F_INDENT)
274 encode_nl (enc); 291 encode_nl (enc);
275 else if (enc->flags & F_SPACE_AFTER) 292 else if (enc->json.flags & F_SPACE_AFTER)
276 encode_space (enc); 293 encode_space (enc);
277} 294}
278 295
279static void encode_sv (enc_t *enc, SV *sv); 296static void encode_sv (enc_t *enc, SV *sv);
280 297
289 encode_ch (enc, '['); encode_nl (enc); 306 encode_ch (enc, '['); encode_nl (enc);
290 ++enc->indent; 307 ++enc->indent;
291 308
292 for (i = 0; i <= len; ++i) 309 for (i = 0; i <= len; ++i)
293 { 310 {
311 SV **svp = av_fetch (av, i, 0);
312
294 encode_indent (enc); 313 encode_indent (enc);
295 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);
296 319
297 if (i < len) 320 if (i < len)
298 encode_comma (enc); 321 encode_comma (enc);
299 } 322 }
300 323
323 else 346 else
324 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 347 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
325 348
326 encode_ch (enc, '"'); 349 encode_ch (enc, '"');
327 350
328 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 351 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
329 encode_ch (enc, ':'); 352 encode_ch (enc, ':');
330 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 353 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
331 encode_sv (enc, HeVAL (he)); 354 encode_sv (enc, HeVAL (he));
332} 355}
333 356
334// compare hash entries, used when all keys are bytestrings 357// compare hash entries, used when all keys are bytestrings
335static int 358static int
370 { 393 {
371 // for canonical output we have to sort by keys first 394 // for canonical output we have to sort by keys first
372 // actually, this is mostly due to the stupid so-called 395 // actually, this is mostly due to the stupid so-called
373 // security workaround added somewhere in 5.8.x. 396 // security workaround added somewhere in 5.8.x.
374 // that randomises hash orderings 397 // that randomises hash orderings
375 if (enc->flags & F_CANONICAL) 398 if (enc->json.flags & F_CANONICAL)
376 { 399 {
377 int fast = 1; 400 int fast = 1;
378 HE *he; 401 HE *he;
379#if WIN32 402#if defined(__BORLANDC__) || defined(_MSC_VER)
380 HE **hes = _alloca (count * sizeof (HE)); 403 HE **hes = _alloca (count * sizeof (HE));
381#else 404#else
382 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 405 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
383#endif 406#endif
384 407
452 svtype svt; 475 svtype svt;
453 476
454 SvGETMAGIC (sv); 477 SvGETMAGIC (sv);
455 svt = SvTYPE (sv); 478 svt = SvTYPE (sv);
456 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 }
457 if (svt == SVt_PVHV) 539 else if (svt == SVt_PVHV)
458 encode_hv (enc, (HV *)sv); 540 encode_hv (enc, (HV *)sv);
459 else if (svt == SVt_PVAV) 541 else if (svt == SVt_PVAV)
460 encode_av (enc, (AV *)sv); 542 encode_av (enc, (AV *)sv);
461 else if (svt < SVt_PVAV) 543 else if (svt < SVt_PVAV)
462 { 544 {
463 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')
464 encode_str (enc, "false", 5, 0); 551 encode_str (enc, "false", 5, 0);
465 else if (SvNIOK (sv) && SvIV (sv) == 1)
466 encode_str (enc, "true", 4, 0);
467 else 552 else
468 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",
469 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 554 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
470 } 555 }
471 else 556 else
486 encode_str (enc, str, len, SvUTF8 (sv)); 571 encode_str (enc, str, len, SvUTF8 (sv));
487 encode_ch (enc, '"'); 572 encode_ch (enc, '"');
488 } 573 }
489 else if (SvNOKp (sv)) 574 else if (SvNOKp (sv))
490 { 575 {
576 // trust that perl will do the right thing w.r.t. JSON syntax.
491 need (enc, NV_DIG + 32); 577 need (enc, NV_DIG + 32);
492 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 578 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
493 enc->cur += strlen (enc->cur); 579 enc->cur += strlen (enc->cur);
494 } 580 }
495 else if (SvIOKp (sv)) 581 else if (SvIOKp (sv))
496 { 582 {
497 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);
498 enc->cur += 588 enc->cur +=
499 SvIsUV(sv) 589 SvIsUV(sv)
500 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 590 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
501 : 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 }
502 } 620 }
503 else if (SvROK (sv)) 621 else if (SvROK (sv))
504 encode_rv (enc, SvRV (sv)); 622 encode_rv (enc, SvRV (sv));
505 else if (!SvOK (sv)) 623 else if (!SvOK (sv))
506 encode_str (enc, "null", 4, 0); 624 encode_str (enc, "null", 4, 0);
508 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",
509 SvPV_nolen (sv), SvFLAGS (sv)); 627 SvPV_nolen (sv), SvFLAGS (sv));
510} 628}
511 629
512static SV * 630static SV *
513encode_json (SV *scalar, U32 flags) 631encode_json (SV *scalar, JSON *json)
514{ 632{
515 enc_t enc; 633 enc_t enc;
516 634
517 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 635 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
518 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)");
519 637
520 enc.flags = flags; 638 enc.json = *json;
521 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 639 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
522 enc.cur = SvPVX (enc.sv); 640 enc.cur = SvPVX (enc.sv);
523 enc.end = SvEND (enc.sv); 641 enc.end = SvEND (enc.sv);
524 enc.indent = 0; 642 enc.indent = 0;
525 enc.maxdepth = DEC_DEPTH (flags); 643 enc.maxdepth = DEC_DEPTH (enc.json.flags);
526 644
527 SvPOK_only (enc.sv); 645 SvPOK_only (enc.sv);
528 encode_sv (&enc, scalar); 646 encode_sv (&enc, scalar);
529 647
530 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 648 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
531 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 649 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
532 650
533 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 651 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
534 SvUTF8_on (enc.sv); 652 SvUTF8_on (enc.sv);
535 653
536 if (enc.flags & F_SHRINK) 654 if (enc.json.flags & F_SHRINK)
537 shrink (enc.sv); 655 shrink (enc.sv);
538 656
539 return enc.sv; 657 return enc.sv;
540} 658}
541 659
546typedef struct 664typedef struct
547{ 665{
548 char *cur; // current parser pointer 666 char *cur; // current parser pointer
549 char *end; // end of input string 667 char *end; // end of input string
550 const char *err; // parse error, if != 0 668 const char *err; // parse error, if != 0
551 U32 flags; // F_* 669 JSON json;
552 U32 depth; // recursion depth 670 U32 depth; // recursion depth
553 U32 maxdepth; // recursion depth limit 671 U32 maxdepth; // recursion depth limit
554} dec_t; 672} dec_t;
555 673
556static void 674inline void
557decode_ws (dec_t *dec) 675decode_ws (dec_t *dec)
558{ 676{
559 for (;;) 677 for (;;)
560 { 678 {
561 char ch = *dec->cur; 679 char ch = *dec->cur;
587decode_4hex (dec_t *dec) 705decode_4hex (dec_t *dec)
588{ 706{
589 signed char d1, d2, d3, d4; 707 signed char d1, d2, d3, d4;
590 unsigned char *cur = (unsigned char *)dec->cur; 708 unsigned char *cur = (unsigned char *)dec->cur;
591 709
592 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");
593 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");
594 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");
595 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");
596 714
597 dec->cur += 4; 715 dec->cur += 4;
598 716
599 return ((UV)d1) << 12 717 return ((UV)d1) << 12
600 | ((UV)d2) << 8 718 | ((UV)d2) << 8
608static SV * 726static SV *
609decode_str (dec_t *dec) 727decode_str (dec_t *dec)
610{ 728{
611 SV *sv = 0; 729 SV *sv = 0;
612 int utf8 = 0; 730 int utf8 = 0;
731 char *dec_cur = dec->cur;
613 732
614 do 733 do
615 { 734 {
616 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 735 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
617 char *cur = buf; 736 char *cur = buf;
618 737
619 do 738 do
620 { 739 {
621 unsigned char ch = *(unsigned char *)dec->cur++; 740 unsigned char ch = *(unsigned char *)dec_cur++;
622 741
623 if (ch == '"') 742 if (expect_false (ch == '"'))
624 { 743 {
625 --dec->cur; 744 --dec_cur;
626 break; 745 break;
627 } 746 }
628 else if (ch == '\\') 747 else if (expect_false (ch == '\\'))
629 { 748 {
630 switch (*dec->cur) 749 switch (*dec_cur)
631 { 750 {
632 case '\\': 751 case '\\':
633 case '/': 752 case '/':
634 case '"': *cur++ = *dec->cur++; break; 753 case '"': *cur++ = *dec_cur++; break;
635 754
636 case 'b': ++dec->cur; *cur++ = '\010'; break; 755 case 'b': ++dec_cur; *cur++ = '\010'; break;
637 case 't': ++dec->cur; *cur++ = '\011'; break; 756 case 't': ++dec_cur; *cur++ = '\011'; break;
638 case 'n': ++dec->cur; *cur++ = '\012'; break; 757 case 'n': ++dec_cur; *cur++ = '\012'; break;
639 case 'f': ++dec->cur; *cur++ = '\014'; break; 758 case 'f': ++dec_cur; *cur++ = '\014'; break;
640 case 'r': ++dec->cur; *cur++ = '\015'; break; 759 case 'r': ++dec_cur; *cur++ = '\015'; break;
641 760
642 case 'u': 761 case 'u':
643 { 762 {
644 UV lo, hi; 763 UV lo, hi;
645 ++dec->cur; 764 ++dec_cur;
646 765
766 dec->cur = dec_cur;
647 hi = decode_4hex (dec); 767 hi = decode_4hex (dec);
768 dec_cur = dec->cur;
648 if (hi == (UV)-1) 769 if (hi == (UV)-1)
649 goto fail; 770 goto fail;
650 771
651 // possibly a surrogate pair 772 // possibly a surrogate pair
652 if (hi >= 0xd800) 773 if (hi >= 0xd800)
653 if (hi < 0xdc00) 774 if (hi < 0xdc00)
654 { 775 {
655 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 776 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
656 ERR ("missing low surrogate character in surrogate pair"); 777 ERR ("missing low surrogate character in surrogate pair");
657 778
658 dec->cur += 2; 779 dec_cur += 2;
659 780
781 dec->cur = dec_cur;
660 lo = decode_4hex (dec); 782 lo = decode_4hex (dec);
783 dec_cur = dec->cur;
661 if (lo == (UV)-1) 784 if (lo == (UV)-1)
662 goto fail; 785 goto fail;
663 786
664 if (lo < 0xdc00 || lo >= 0xe000) 787 if (lo < 0xdc00 || lo >= 0xe000)
665 ERR ("surrogate pair expected"); 788 ERR ("surrogate pair expected");
679 *cur++ = hi; 802 *cur++ = hi;
680 } 803 }
681 break; 804 break;
682 805
683 default: 806 default:
684 --dec->cur; 807 --dec_cur;
685 ERR ("illegal backslash escape sequence in string"); 808 ERR ("illegal backslash escape sequence in string");
686 } 809 }
687 } 810 }
688 else if (ch >= 0x20 && ch <= 0x7f) 811 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
689 *cur++ = ch; 812 *cur++ = ch;
690 else if (ch >= 0x80) 813 else if (ch >= 0x80)
691 { 814 {
692 STRLEN clen; 815 STRLEN clen;
693 UV uch; 816 UV uch;
694 817
695 --dec->cur; 818 --dec_cur;
696 819
697 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 820 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
698 if (clen == (STRLEN)-1) 821 if (clen == (STRLEN)-1)
699 ERR ("malformed UTF-8 character in JSON string"); 822 ERR ("malformed UTF-8 character in JSON string");
700 823
701 do 824 do
702 *cur++ = *dec->cur++; 825 *cur++ = *dec_cur++;
703 while (--clen); 826 while (--clen);
704 827
705 utf8 = 1; 828 utf8 = 1;
706 } 829 }
707 else 830 else
708 { 831 {
709 --dec->cur; 832 --dec_cur;
710 833
711 if (!ch) 834 if (!ch)
712 ERR ("unexpected end of string while parsing JSON string"); 835 ERR ("unexpected end of string while parsing JSON string");
713 else 836 else
714 ERR ("invalid character encountered while parsing JSON string"); 837 ERR ("invalid character encountered while parsing JSON string");
727 } 850 }
728 else 851 else
729 sv = newSVpvn (buf, len); 852 sv = newSVpvn (buf, len);
730 } 853 }
731 } 854 }
732 while (*dec->cur != '"'); 855 while (*dec_cur != '"');
733 856
734 ++dec->cur; 857 ++dec_cur;
735 858
736 if (sv) 859 if (sv)
737 { 860 {
738 SvPOK_only (sv); 861 SvPOK_only (sv);
739 *SvEND (sv) = 0; 862 *SvEND (sv) = 0;
742 SvUTF8_on (sv); 865 SvUTF8_on (sv);
743 } 866 }
744 else 867 else
745 sv = newSVpvn ("", 0); 868 sv = newSVpvn ("", 0);
746 869
870 dec->cur = dec_cur;
747 return sv; 871 return sv;
748 872
749fail: 873fail:
874 dec->cur = dec_cur;
750 return 0; 875 return 0;
751} 876}
752 877
753static SV * 878static SV *
754decode_num (dec_t *dec) 879decode_num (dec_t *dec)
812 is_nv = 1; 937 is_nv = 1;
813 } 938 }
814 939
815 if (!is_nv) 940 if (!is_nv)
816 { 941 {
817 UV uv; 942 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
818 int numtype = grok_number (start, dec->cur - start, &uv); 943 if (*start == '-')
819 if (numtype & IS_NUMBER_IN_UV) 944 switch (dec->cur - start)
820 if (numtype & IS_NUMBER_NEG)
821 { 945 {
822 if (uv < (UV)IV_MIN) 946 case 2: return newSViv (-( start [1] - '0' * 1));
823 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));
824 } 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 }
825 else 969 else
826 return newSVuv (uv); 970 return newSVuv (uv);
971
972 // here would likely be the place for bigint support
827 } 973 }
974 }
828 975
976 // if we ever support bigint or bigfloat, this is the place for bigfloat
829 return newSVnv (Atof (start)); 977 return newSVnv (Atof (start));
830 978
831fail: 979fail:
832 return 0; 980 return 0;
833} 981}
877} 1025}
878 1026
879static SV * 1027static SV *
880decode_hv (dec_t *dec) 1028decode_hv (dec_t *dec)
881{ 1029{
1030 SV *sv;
882 HV *hv = newHV (); 1031 HV *hv = newHV ();
883 1032
884 DEC_INC_DEPTH; 1033 DEC_INC_DEPTH;
885 decode_ws (dec); 1034 decode_ws (dec);
886 1035
887 if (*dec->cur == '}') 1036 if (*dec->cur == '}')
888 ++dec->cur; 1037 ++dec->cur;
889 else 1038 else
890 for (;;) 1039 for (;;)
891 { 1040 {
892 SV *key, *value;
893
894 decode_ws (dec); EXPECT_CH ('"'); 1041 decode_ws (dec); EXPECT_CH ('"');
895 1042
896 key = decode_str (dec); 1043 // heuristic: assume that
897 if (!key) 1044 // a) decode_str + hv_store_ent are abysmally slow.
898 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
899 1052
900 decode_ws (dec); EXPECT_CH (':'); 1053 for (;;)
901
902 value = decode_sv (dec);
903 if (!value)
904 { 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);
905 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)
906 goto fail; 1088 goto fail;
1089
1090 hv_store (hv, key, len, value, 0);
1091
1092 break;
1093 }
1094
1095 ++p;
907 } 1096 }
908 1097 }
909 hv_store_ent (hv, key, value, 0);
910 SvREFCNT_dec (key);
911 1098
912 decode_ws (dec); 1099 decode_ws (dec);
913 1100
914 if (*dec->cur == '}') 1101 if (*dec->cur == '}')
915 { 1102 {
922 1109
923 ++dec->cur; 1110 ++dec->cur;
924 } 1111 }
925 1112
926 DEC_DEC_DEPTH; 1113 DEC_DEC_DEPTH;
927 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;
928 1175
929fail: 1176fail:
930 SvREFCNT_dec (hv); 1177 SvREFCNT_dec (hv);
931 DEC_DEC_DEPTH; 1178 DEC_DEC_DEPTH;
932 return 0; 1179 return 0;
934 1181
935static SV * 1182static SV *
936decode_sv (dec_t *dec) 1183decode_sv (dec_t *dec)
937{ 1184{
938 decode_ws (dec); 1185 decode_ws (dec);
1186
1187 // the beauty of JSON: you need exactly one character lookahead
1188 // to parse anything.
939 switch (*dec->cur) 1189 switch (*dec->cur)
940 { 1190 {
941 case '"': ++dec->cur; return decode_str (dec); 1191 case '"': ++dec->cur; return decode_str (dec);
942 case '[': ++dec->cur; return decode_av (dec); 1192 case '[': ++dec->cur; return decode_av (dec);
943 case '{': ++dec->cur; return decode_hv (dec); 1193 case '{': ++dec->cur; return decode_hv (dec);
949 1199
950 case 't': 1200 case 't':
951 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1201 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
952 { 1202 {
953 dec->cur += 4; 1203 dec->cur += 4;
954 return newSViv (1); 1204 return SvREFCNT_inc (json_true);
955 } 1205 }
956 else 1206 else
957 ERR ("'true' expected"); 1207 ERR ("'true' expected");
958 1208
959 break; 1209 break;
960 1210
961 case 'f': 1211 case 'f':
962 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1212 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
963 { 1213 {
964 dec->cur += 5; 1214 dec->cur += 5;
965 return newSViv (0); 1215 return SvREFCNT_inc (json_false);
966 } 1216 }
967 else 1217 else
968 ERR ("'false' expected"); 1218 ERR ("'false' expected");
969 1219
970 break; 1220 break;
988fail: 1238fail:
989 return 0; 1239 return 0;
990} 1240}
991 1241
992static SV * 1242static SV *
993decode_json (SV *string, U32 flags, UV *offset_return) 1243decode_json (SV *string, JSON *json, UV *offset_return)
994{ 1244{
995 dec_t dec; 1245 dec_t dec;
996 UV offset; 1246 UV offset;
997 SV *sv; 1247 SV *sv;
998 1248
999 SvGETMAGIC (string); 1249 SvGETMAGIC (string);
1000 SvUPGRADE (string, SVt_PV); 1250 SvUPGRADE (string, SVt_PV);
1001 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
1002 if (flags & F_UTF8) 1256 if (json->flags & F_UTF8)
1003 sv_utf8_downgrade (string, 0); 1257 sv_utf8_downgrade (string, 0);
1004 else 1258 else
1005 sv_utf8_upgrade (string); 1259 sv_utf8_upgrade (string);
1006 1260
1007 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1261 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1008 1262
1009 dec.flags = flags; 1263 dec.json = *json;
1010 dec.cur = SvPVX (string); 1264 dec.cur = SvPVX (string);
1011 dec.end = SvEND (string); 1265 dec.end = SvEND (string);
1012 dec.err = 0; 1266 dec.err = 0;
1013 dec.depth = 0; 1267 dec.depth = 0;
1014 dec.maxdepth = DEC_DEPTH (dec.flags); 1268 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1269
1270 if (dec.json.cb_object || dec.json.cb_sk_object)
1271 dec.json.flags |= F_HOOK;
1015 1272
1016 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1273 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1017 sv = decode_sv (&dec); 1274 sv = decode_sv (&dec);
1018 1275
1019 if (!(offset_return || !sv)) 1276 if (!(offset_return || !sv))
1029 } 1286 }
1030 } 1287 }
1031 1288
1032 if (offset_return || !sv) 1289 if (offset_return || !sv)
1033 { 1290 {
1034 offset = dec.flags & F_UTF8 1291 offset = dec.json.flags & F_UTF8
1035 ? dec.cur - SvPVX (string) 1292 ? dec.cur - SvPVX (string)
1036 : utf8_distance (dec.cur, SvPVX (string)); 1293 : utf8_distance (dec.cur, SvPVX (string));
1037 1294
1038 if (offset_return) 1295 if (offset_return)
1039 *offset_return = offset; 1296 *offset_return = offset;
1058 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1315 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1059 } 1316 }
1060 1317
1061 sv = sv_2mortal (sv); 1318 sv = sv_2mortal (sv);
1062 1319
1063 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1320 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1064 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)");
1065 1322
1066 return sv; 1323 return sv;
1067} 1324}
1068 1325
1072MODULE = JSON::XS PACKAGE = JSON::XS 1329MODULE = JSON::XS PACKAGE = JSON::XS
1073 1330
1074BOOT: 1331BOOT:
1075{ 1332{
1076 int i; 1333 int i;
1077
1078 memset (decode_hexdigit, 0xff, 256);
1079 1334
1080 for (i = 0; i < 256; ++i) 1335 for (i = 0; i < 256; ++i)
1081 decode_hexdigit [i] = 1336 decode_hexdigit [i] =
1082 i >= '0' && i <= '9' ? i - '0' 1337 i >= '0' && i <= '9' ? i - '0'
1083 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1338 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1084 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1339 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1085 : -1; 1340 : -1;
1086 1341
1087 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);
1088} 1347}
1089 1348
1090PROTOTYPES: DISABLE 1349PROTOTYPES: DISABLE
1091 1350
1092SV *new (char *dummy) 1351void new (char *klass)
1093 CODE: 1352 PPCODE:
1094 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1353{
1095 OUTPUT: 1354 SV *pv = NEWSV (0, sizeof (JSON));
1096 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}
1097 1360
1098SV *ascii (SV *self, int enable = 1) 1361void ascii (JSON *self, int enable = 1)
1099 ALIAS: 1362 ALIAS:
1100 ascii = F_ASCII 1363 ascii = F_ASCII
1101 latin1 = F_LATIN1 1364 latin1 = F_LATIN1
1102 utf8 = F_UTF8 1365 utf8 = F_UTF8
1103 indent = F_INDENT 1366 indent = F_INDENT
1104 canonical = F_CANONICAL 1367 canonical = F_CANONICAL
1105 space_before = F_SPACE_BEFORE 1368 space_before = F_SPACE_BEFORE
1106 space_after = F_SPACE_AFTER 1369 space_after = F_SPACE_AFTER
1107 pretty = F_PRETTY 1370 pretty = F_PRETTY
1108 allow_nonref = F_ALLOW_NONREF 1371 allow_nonref = F_ALLOW_NONREF
1109 shrink = F_SHRINK 1372 shrink = F_SHRINK
1373 allow_blessed = F_ALLOW_BLESSED
1374 convert_blessed = F_CONV_BLESSED
1110 CODE: 1375 PPCODE:
1111{ 1376{
1112 UV *uv = SvJSON (self);
1113 if (enable) 1377 if (enable)
1114 *uv |= ix; 1378 self->flags |= ix;
1115 else 1379 else
1116 *uv &= ~ix; 1380 self->flags &= ~ix;
1117 1381
1118 RETVAL = newSVsv (self); 1382 XPUSHs (ST (0));
1119} 1383}
1120 OUTPUT:
1121 RETVAL
1122 1384
1123SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1385void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1124 CODE: 1386 PPCODE:
1125{ 1387{
1126 UV *uv = SvJSON (self);
1127 UV log2 = 0; 1388 UV log2 = 0;
1128 1389
1129 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1390 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1130 1391
1131 while ((1UL << log2) < max_depth) 1392 while ((1UL << log2) < max_depth)
1132 ++log2; 1393 ++log2;
1133 1394
1134 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1395 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1135 1396
1136 RETVAL = newSVsv (self); 1397 XPUSHs (ST (0));
1137} 1398}
1138 OUTPUT:
1139 RETVAL
1140 1399
1141void encode (SV *self, SV *scalar) 1400void max_size (JSON *self, UV max_size = 0)
1142 PPCODE: 1401 PPCODE:
1143 XPUSHs (encode_json (scalar, *SvJSON (self))); 1402{
1403 UV log2 = 0;
1144 1404
1145void 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)
1146 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:
1147 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1453 XPUSHs (decode_json (jsonstr, self, 0));
1148 1454
1149void decode_prefix (SV *self, SV *jsonstr) 1455void decode_prefix (JSON *self, SV *jsonstr)
1150 PPCODE: 1456 PPCODE:
1151{ 1457{
1152 UV offset; 1458 UV offset;
1153 EXTEND (SP, 2); 1459 EXTEND (SP, 2);
1154 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1460 PUSHs (decode_json (jsonstr, self, &offset));
1155 PUSHs (sv_2mortal (newSVuv (offset))); 1461 PUSHs (sv_2mortal (newSVuv (offset)));
1156} 1462}
1157 1463
1464void DESTROY (JSON *self)
1465 CODE:
1466 SvREFCNT_dec (self->cb_sk_object);
1467 SvREFCNT_dec (self->cb_object);
1468
1158PROTOTYPES: ENABLE 1469PROTOTYPES: ENABLE
1159 1470
1160void to_json (SV *scalar) 1471void to_json (SV *scalar)
1161 ALIAS:
1162 objToJson = 0
1163 PPCODE: 1472 PPCODE:
1473{
1474 JSON json = { F_DEFAULT | F_UTF8 };
1164 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1475 XPUSHs (encode_json (scalar, &json));
1476}
1165 1477
1166void from_json (SV *jsonstr) 1478void from_json (SV *jsonstr)
1167 ALIAS:
1168 jsonToObj = 0
1169 PPCODE: 1479 PPCODE:
1480{
1481 JSON json = { F_DEFAULT | F_UTF8 };
1170 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1482 XPUSHs (decode_json (jsonstr, &json, 0));
1483}
1171 1484

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines