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.54 by root, Tue Jul 10 16:22:31 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
323 else 340 else
324 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 341 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
325 342
326 encode_ch (enc, '"'); 343 encode_ch (enc, '"');
327 344
328 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 345 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
329 encode_ch (enc, ':'); 346 encode_ch (enc, ':');
330 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 347 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
331 encode_sv (enc, HeVAL (he)); 348 encode_sv (enc, HeVAL (he));
332} 349}
333 350
334// compare hash entries, used when all keys are bytestrings 351// compare hash entries, used when all keys are bytestrings
335static int 352static int
370 { 387 {
371 // for canonical output we have to sort by keys first 388 // for canonical output we have to sort by keys first
372 // actually, this is mostly due to the stupid so-called 389 // actually, this is mostly due to the stupid so-called
373 // security workaround added somewhere in 5.8.x. 390 // security workaround added somewhere in 5.8.x.
374 // that randomises hash orderings 391 // that randomises hash orderings
375 if (enc->flags & F_CANONICAL) 392 if (enc->json.flags & F_CANONICAL)
376 { 393 {
377 int fast = 1; 394 int fast = 1;
378 HE *he; 395 HE *he;
379#if WIN32 396#if defined(__BORLANDC__) || defined(_MSC_VER)
380 HE **hes = _alloca (count * sizeof (HE)); 397 HE **hes = _alloca (count * sizeof (HE));
381#else 398#else
382 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 399 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
383#endif 400#endif
384 401
452 svtype svt; 469 svtype svt;
453 470
454 SvGETMAGIC (sv); 471 SvGETMAGIC (sv);
455 svt = SvTYPE (sv); 472 svt = SvTYPE (sv);
456 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 int count;
499 dSP;
500
501 ENTER; SAVETMPS; PUSHMARK (SP);
502 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
503
504 // calling with G_SCALAR ensures that we always get a 1 return value
505 PUTBACK;
506 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 }
457 if (svt == SVt_PVHV) 533 else if (svt == SVt_PVHV)
458 encode_hv (enc, (HV *)sv); 534 encode_hv (enc, (HV *)sv);
459 else if (svt == SVt_PVAV) 535 else if (svt == SVt_PVAV)
460 encode_av (enc, (AV *)sv); 536 encode_av (enc, (AV *)sv);
461 else if (svt < SVt_PVAV) 537 else if (svt < SVt_PVAV)
462 { 538 {
463 if (SvNIOK (sv) && SvIV (sv) == 0) 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')
464 encode_str (enc, "false", 5, 0); 545 encode_str (enc, "false", 5, 0);
465 else if (SvNIOK (sv) && SvIV (sv) == 1)
466 encode_str (enc, "true", 4, 0);
467 else 546 else
468 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 547 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
469 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
470 } 549 }
471 else 550 else
486 encode_str (enc, str, len, SvUTF8 (sv)); 565 encode_str (enc, str, len, SvUTF8 (sv));
487 encode_ch (enc, '"'); 566 encode_ch (enc, '"');
488 } 567 }
489 else if (SvNOKp (sv)) 568 else if (SvNOKp (sv))
490 { 569 {
570 // trust that perl will do the right thing w.r.t. JSON syntax.
491 need (enc, NV_DIG + 32); 571 need (enc, NV_DIG + 32);
492 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 572 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
493 enc->cur += strlen (enc->cur); 573 enc->cur += strlen (enc->cur);
494 } 574 }
495 else if (SvIOKp (sv)) 575 else if (SvIOKp (sv))
496 { 576 {
497 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);
498 enc->cur += 582 enc->cur +=
499 SvIsUV(sv) 583 SvIsUV(sv)
500 ? snprintf (enc->cur, 64, "%"UVuf, (UV)SvUVX (sv)) 584 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
501 : 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 }
502 } 614 }
503 else if (SvROK (sv)) 615 else if (SvROK (sv))
504 encode_rv (enc, SvRV (sv)); 616 encode_rv (enc, SvRV (sv));
505 else if (!SvOK (sv)) 617 else if (!SvOK (sv))
506 encode_str (enc, "null", 4, 0); 618 encode_str (enc, "null", 4, 0);
508 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",
509 SvPV_nolen (sv), SvFLAGS (sv)); 621 SvPV_nolen (sv), SvFLAGS (sv));
510} 622}
511 623
512static SV * 624static SV *
513encode_json (SV *scalar, U32 flags) 625encode_json (SV *scalar, JSON *json)
514{ 626{
515 enc_t enc; 627 enc_t enc;
516 628
517 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 629 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
518 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)");
519 631
520 enc.flags = flags; 632 enc.json = *json;
521 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 633 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
522 enc.cur = SvPVX (enc.sv); 634 enc.cur = SvPVX (enc.sv);
523 enc.end = SvEND (enc.sv); 635 enc.end = SvEND (enc.sv);
524 enc.indent = 0; 636 enc.indent = 0;
525 enc.maxdepth = DEC_DEPTH (flags); 637 enc.maxdepth = DEC_DEPTH (enc.json.flags);
526 638
527 SvPOK_only (enc.sv); 639 SvPOK_only (enc.sv);
528 encode_sv (&enc, scalar); 640 encode_sv (&enc, scalar);
529 641
530 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 642 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
531 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 643 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
532 644
533 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 645 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
534 SvUTF8_on (enc.sv); 646 SvUTF8_on (enc.sv);
535 647
536 if (enc.flags & F_SHRINK) 648 if (enc.json.flags & F_SHRINK)
537 shrink (enc.sv); 649 shrink (enc.sv);
538 650
539 return enc.sv; 651 return enc.sv;
540} 652}
541 653
546typedef struct 658typedef struct
547{ 659{
548 char *cur; // current parser pointer 660 char *cur; // current parser pointer
549 char *end; // end of input string 661 char *end; // end of input string
550 const char *err; // parse error, if != 0 662 const char *err; // parse error, if != 0
551 U32 flags; // F_* 663 JSON json;
552 U32 depth; // recursion depth 664 U32 depth; // recursion depth
553 U32 maxdepth; // recursion depth limit 665 U32 maxdepth; // recursion depth limit
554} dec_t; 666} dec_t;
555 667
556static void 668inline void
557decode_ws (dec_t *dec) 669decode_ws (dec_t *dec)
558{ 670{
559 for (;;) 671 for (;;)
560 { 672 {
561 char ch = *dec->cur; 673 char ch = *dec->cur;
587decode_4hex (dec_t *dec) 699decode_4hex (dec_t *dec)
588{ 700{
589 signed char d1, d2, d3, d4; 701 signed char d1, d2, d3, d4;
590 unsigned char *cur = (unsigned char *)dec->cur; 702 unsigned char *cur = (unsigned char *)dec->cur;
591 703
592 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");
593 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");
594 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");
595 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");
596 708
597 dec->cur += 4; 709 dec->cur += 4;
598 710
599 return ((UV)d1) << 12 711 return ((UV)d1) << 12
600 | ((UV)d2) << 8 712 | ((UV)d2) << 8
608static SV * 720static SV *
609decode_str (dec_t *dec) 721decode_str (dec_t *dec)
610{ 722{
611 SV *sv = 0; 723 SV *sv = 0;
612 int utf8 = 0; 724 int utf8 = 0;
725 char *dec_cur = dec->cur;
613 726
614 do 727 do
615 { 728 {
616 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 729 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
617 char *cur = buf; 730 char *cur = buf;
618 731
619 do 732 do
620 { 733 {
621 unsigned char ch = *(unsigned char *)dec->cur++; 734 unsigned char ch = *(unsigned char *)dec_cur++;
622 735
623 if (ch == '"') 736 if (expect_false (ch == '"'))
624 { 737 {
625 --dec->cur; 738 --dec_cur;
626 break; 739 break;
627 } 740 }
628 else if (ch == '\\') 741 else if (expect_false (ch == '\\'))
629 { 742 {
630 switch (*dec->cur) 743 switch (*dec_cur)
631 { 744 {
632 case '\\': 745 case '\\':
633 case '/': 746 case '/':
634 case '"': *cur++ = *dec->cur++; break; 747 case '"': *cur++ = *dec_cur++; break;
635 748
636 case 'b': ++dec->cur; *cur++ = '\010'; break; 749 case 'b': ++dec_cur; *cur++ = '\010'; break;
637 case 't': ++dec->cur; *cur++ = '\011'; break; 750 case 't': ++dec_cur; *cur++ = '\011'; break;
638 case 'n': ++dec->cur; *cur++ = '\012'; break; 751 case 'n': ++dec_cur; *cur++ = '\012'; break;
639 case 'f': ++dec->cur; *cur++ = '\014'; break; 752 case 'f': ++dec_cur; *cur++ = '\014'; break;
640 case 'r': ++dec->cur; *cur++ = '\015'; break; 753 case 'r': ++dec_cur; *cur++ = '\015'; break;
641 754
642 case 'u': 755 case 'u':
643 { 756 {
644 UV lo, hi; 757 UV lo, hi;
645 ++dec->cur; 758 ++dec_cur;
646 759
760 dec->cur = dec_cur;
647 hi = decode_4hex (dec); 761 hi = decode_4hex (dec);
762 dec_cur = dec->cur;
648 if (hi == (UV)-1) 763 if (hi == (UV)-1)
649 goto fail; 764 goto fail;
650 765
651 // possibly a surrogate pair 766 // possibly a surrogate pair
652 if (hi >= 0xd800) 767 if (hi >= 0xd800)
653 if (hi < 0xdc00) 768 if (hi < 0xdc00)
654 { 769 {
655 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 770 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
656 ERR ("missing low surrogate character in surrogate pair"); 771 ERR ("missing low surrogate character in surrogate pair");
657 772
658 dec->cur += 2; 773 dec_cur += 2;
659 774
775 dec->cur = dec_cur;
660 lo = decode_4hex (dec); 776 lo = decode_4hex (dec);
777 dec_cur = dec->cur;
661 if (lo == (UV)-1) 778 if (lo == (UV)-1)
662 goto fail; 779 goto fail;
663 780
664 if (lo < 0xdc00 || lo >= 0xe000) 781 if (lo < 0xdc00 || lo >= 0xe000)
665 ERR ("surrogate pair expected"); 782 ERR ("surrogate pair expected");
679 *cur++ = hi; 796 *cur++ = hi;
680 } 797 }
681 break; 798 break;
682 799
683 default: 800 default:
684 --dec->cur; 801 --dec_cur;
685 ERR ("illegal backslash escape sequence in string"); 802 ERR ("illegal backslash escape sequence in string");
686 } 803 }
687 } 804 }
688 else if (ch >= 0x20 && ch <= 0x7f) 805 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
689 *cur++ = ch; 806 *cur++ = ch;
690 else if (ch >= 0x80) 807 else if (ch >= 0x80)
691 { 808 {
692 STRLEN clen; 809 STRLEN clen;
693 UV uch; 810 UV uch;
694 811
695 --dec->cur; 812 --dec_cur;
696 813
697 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 814 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
698 if (clen == (STRLEN)-1) 815 if (clen == (STRLEN)-1)
699 ERR ("malformed UTF-8 character in JSON string"); 816 ERR ("malformed UTF-8 character in JSON string");
700 817
701 do 818 do
702 *cur++ = *dec->cur++; 819 *cur++ = *dec_cur++;
703 while (--clen); 820 while (--clen);
704 821
705 utf8 = 1; 822 utf8 = 1;
706 } 823 }
707 else 824 else
708 { 825 {
709 --dec->cur; 826 --dec_cur;
710 827
711 if (!ch) 828 if (!ch)
712 ERR ("unexpected end of string while parsing JSON string"); 829 ERR ("unexpected end of string while parsing JSON string");
713 else 830 else
714 ERR ("invalid character encountered while parsing JSON string"); 831 ERR ("invalid character encountered while parsing JSON string");
727 } 844 }
728 else 845 else
729 sv = newSVpvn (buf, len); 846 sv = newSVpvn (buf, len);
730 } 847 }
731 } 848 }
732 while (*dec->cur != '"'); 849 while (*dec_cur != '"');
733 850
734 ++dec->cur; 851 ++dec_cur;
735 852
736 if (sv) 853 if (sv)
737 { 854 {
738 SvPOK_only (sv); 855 SvPOK_only (sv);
739 *SvEND (sv) = 0; 856 *SvEND (sv) = 0;
742 SvUTF8_on (sv); 859 SvUTF8_on (sv);
743 } 860 }
744 else 861 else
745 sv = newSVpvn ("", 0); 862 sv = newSVpvn ("", 0);
746 863
864 dec->cur = dec_cur;
747 return sv; 865 return sv;
748 866
749fail: 867fail:
868 dec->cur = dec_cur;
750 return 0; 869 return 0;
751} 870}
752 871
753static SV * 872static SV *
754decode_num (dec_t *dec) 873decode_num (dec_t *dec)
812 is_nv = 1; 931 is_nv = 1;
813 } 932 }
814 933
815 if (!is_nv) 934 if (!is_nv)
816 { 935 {
817 UV uv; 936 // 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); 937 if (*start == '-')
819 if (numtype & IS_NUMBER_IN_UV) 938 switch (dec->cur - start)
820 if (numtype & IS_NUMBER_NEG)
821 { 939 {
822 if (uv < (UV)IV_MIN) 940 case 2: return newSViv (-( start [1] - '0' * 1));
823 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));
824 } 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 }
825 else 963 else
826 return newSVuv (uv); 964 return newSVuv (uv);
965
966 // here would likely be the place for bigint support
827 } 967 }
968 }
828 969
970 // if we ever support bigint or bigfloat, this is the place for bigfloat
829 return newSVnv (Atof (start)); 971 return newSVnv (Atof (start));
830 972
831fail: 973fail:
832 return 0; 974 return 0;
833} 975}
877} 1019}
878 1020
879static SV * 1021static SV *
880decode_hv (dec_t *dec) 1022decode_hv (dec_t *dec)
881{ 1023{
1024 SV *sv;
882 HV *hv = newHV (); 1025 HV *hv = newHV ();
883 1026
884 DEC_INC_DEPTH; 1027 DEC_INC_DEPTH;
885 decode_ws (dec); 1028 decode_ws (dec);
886 1029
887 if (*dec->cur == '}') 1030 if (*dec->cur == '}')
888 ++dec->cur; 1031 ++dec->cur;
889 else 1032 else
890 for (;;) 1033 for (;;)
891 { 1034 {
892 SV *key, *value;
893
894 decode_ws (dec); EXPECT_CH ('"'); 1035 decode_ws (dec); EXPECT_CH ('"');
895 1036
896 key = decode_str (dec); 1037 // heuristic: assume that
897 if (!key) 1038 // a) decode_str + hv_store_ent are abysmally slow.
898 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
899 1046
900 decode_ws (dec); EXPECT_CH (':'); 1047 for (;;)
901
902 value = decode_sv (dec);
903 if (!value)
904 { 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);
905 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)
906 goto fail; 1082 goto fail;
1083
1084 hv_store (hv, key, len, value, 0);
1085
1086 break;
1087 }
1088
1089 ++p;
907 } 1090 }
908 1091 }
909 hv_store_ent (hv, key, value, 0);
910 SvREFCNT_dec (key);
911 1092
912 decode_ws (dec); 1093 decode_ws (dec);
913 1094
914 if (*dec->cur == '}') 1095 if (*dec->cur == '}')
915 { 1096 {
922 1103
923 ++dec->cur; 1104 ++dec->cur;
924 } 1105 }
925 1106
926 DEC_DEC_DEPTH; 1107 DEC_DEC_DEPTH;
927 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;
928 1169
929fail: 1170fail:
930 SvREFCNT_dec (hv); 1171 SvREFCNT_dec (hv);
931 DEC_DEC_DEPTH; 1172 DEC_DEC_DEPTH;
932 return 0; 1173 return 0;
934 1175
935static SV * 1176static SV *
936decode_sv (dec_t *dec) 1177decode_sv (dec_t *dec)
937{ 1178{
938 decode_ws (dec); 1179 decode_ws (dec);
1180
1181 // the beauty of JSON: you need exactly one character lookahead
1182 // to parse anything.
939 switch (*dec->cur) 1183 switch (*dec->cur)
940 { 1184 {
941 case '"': ++dec->cur; return decode_str (dec); 1185 case '"': ++dec->cur; return decode_str (dec);
942 case '[': ++dec->cur; return decode_av (dec); 1186 case '[': ++dec->cur; return decode_av (dec);
943 case '{': ++dec->cur; return decode_hv (dec); 1187 case '{': ++dec->cur; return decode_hv (dec);
949 1193
950 case 't': 1194 case 't':
951 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1195 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
952 { 1196 {
953 dec->cur += 4; 1197 dec->cur += 4;
954 return newSViv (1); 1198 return SvREFCNT_inc (json_true);
955 } 1199 }
956 else 1200 else
957 ERR ("'true' expected"); 1201 ERR ("'true' expected");
958 1202
959 break; 1203 break;
960 1204
961 case 'f': 1205 case 'f':
962 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1206 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
963 { 1207 {
964 dec->cur += 5; 1208 dec->cur += 5;
965 return newSViv (0); 1209 return SvREFCNT_inc (json_false);
966 } 1210 }
967 else 1211 else
968 ERR ("'false' expected"); 1212 ERR ("'false' expected");
969 1213
970 break; 1214 break;
988fail: 1232fail:
989 return 0; 1233 return 0;
990} 1234}
991 1235
992static SV * 1236static SV *
993decode_json (SV *string, U32 flags, UV *offset_return) 1237decode_json (SV *string, JSON *json, UV *offset_return)
994{ 1238{
995 dec_t dec; 1239 dec_t dec;
996 UV offset; 1240 UV offset;
997 SV *sv; 1241 SV *sv;
998 1242
999 SvGETMAGIC (string); 1243 SvGETMAGIC (string);
1000 SvUPGRADE (string, SVt_PV); 1244 SvUPGRADE (string, SVt_PV);
1001 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
1002 if (flags & F_UTF8) 1250 if (json->flags & F_UTF8)
1003 sv_utf8_downgrade (string, 0); 1251 sv_utf8_downgrade (string, 0);
1004 else 1252 else
1005 sv_utf8_upgrade (string); 1253 sv_utf8_upgrade (string);
1006 1254
1007 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1255 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1008 1256
1009 dec.flags = flags; 1257 dec.json = *json;
1010 dec.cur = SvPVX (string); 1258 dec.cur = SvPVX (string);
1011 dec.end = SvEND (string); 1259 dec.end = SvEND (string);
1012 dec.err = 0; 1260 dec.err = 0;
1013 dec.depth = 0; 1261 dec.depth = 0;
1014 dec.maxdepth = DEC_DEPTH (dec.flags); 1262 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1263
1264 if (dec.json.cb_object || dec.json.cb_sk_object)
1265 dec.json.flags |= F_HOOK;
1015 1266
1016 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1267 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1017 sv = decode_sv (&dec); 1268 sv = decode_sv (&dec);
1018 1269
1019 if (!(offset_return || !sv)) 1270 if (!(offset_return || !sv))
1029 } 1280 }
1030 } 1281 }
1031 1282
1032 if (offset_return || !sv) 1283 if (offset_return || !sv)
1033 { 1284 {
1034 offset = dec.flags & F_UTF8 1285 offset = dec.json.flags & F_UTF8
1035 ? dec.cur - SvPVX (string) 1286 ? dec.cur - SvPVX (string)
1036 : utf8_distance (dec.cur, SvPVX (string)); 1287 : utf8_distance (dec.cur, SvPVX (string));
1037 1288
1038 if (offset_return) 1289 if (offset_return)
1039 *offset_return = offset; 1290 *offset_return = offset;
1058 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1309 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1059 } 1310 }
1060 1311
1061 sv = sv_2mortal (sv); 1312 sv = sv_2mortal (sv);
1062 1313
1063 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1314 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)"); 1315 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1065 1316
1066 return sv; 1317 return sv;
1067} 1318}
1068 1319
1072MODULE = JSON::XS PACKAGE = JSON::XS 1323MODULE = JSON::XS PACKAGE = JSON::XS
1073 1324
1074BOOT: 1325BOOT:
1075{ 1326{
1076 int i; 1327 int i;
1077
1078 memset (decode_hexdigit, 0xff, 256);
1079 1328
1080 for (i = 0; i < 256; ++i) 1329 for (i = 0; i < 256; ++i)
1081 decode_hexdigit [i] = 1330 decode_hexdigit [i] =
1082 i >= '0' && i <= '9' ? i - '0' 1331 i >= '0' && i <= '9' ? i - '0'
1083 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1332 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1084 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1333 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1085 : -1; 1334 : -1;
1086 1335
1087 json_stash = gv_stashpv ("JSON::XS", 1); 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);
1088} 1341}
1089 1342
1090PROTOTYPES: DISABLE 1343PROTOTYPES: DISABLE
1091 1344
1092SV *new (char *dummy) 1345void new (char *klass)
1093 CODE: 1346 PPCODE:
1094 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1347{
1095 OUTPUT: 1348 SV *pv = NEWSV (0, sizeof (JSON));
1096 RETVAL 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}
1097 1354
1098SV *ascii (SV *self, int enable = 1) 1355void ascii (JSON *self, int enable = 1)
1099 ALIAS: 1356 ALIAS:
1100 ascii = F_ASCII 1357 ascii = F_ASCII
1101 latin1 = F_LATIN1 1358 latin1 = F_LATIN1
1102 utf8 = F_UTF8 1359 utf8 = F_UTF8
1103 indent = F_INDENT 1360 indent = F_INDENT
1104 canonical = F_CANONICAL 1361 canonical = F_CANONICAL
1105 space_before = F_SPACE_BEFORE 1362 space_before = F_SPACE_BEFORE
1106 space_after = F_SPACE_AFTER 1363 space_after = F_SPACE_AFTER
1107 pretty = F_PRETTY 1364 pretty = F_PRETTY
1108 allow_nonref = F_ALLOW_NONREF 1365 allow_nonref = F_ALLOW_NONREF
1109 shrink = F_SHRINK 1366 shrink = F_SHRINK
1367 allow_blessed = F_ALLOW_BLESSED
1368 convert_blessed = F_CONV_BLESSED
1110 CODE: 1369 PPCODE:
1111{ 1370{
1112 UV *uv = SvJSON (self);
1113 if (enable) 1371 if (enable)
1114 *uv |= ix; 1372 self->flags |= ix;
1115 else 1373 else
1116 *uv &= ~ix; 1374 self->flags &= ~ix;
1117 1375
1118 RETVAL = newSVsv (self); 1376 XPUSHs (ST (0));
1119} 1377}
1120 OUTPUT:
1121 RETVAL
1122 1378
1123SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1379void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1124 CODE: 1380 PPCODE:
1125{ 1381{
1126 UV *uv = SvJSON (self);
1127 UV log2 = 0; 1382 UV log2 = 0;
1128 1383
1129 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1384 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1130 1385
1131 while ((1UL << log2) < max_depth) 1386 while ((1UL << log2) < max_depth)
1132 ++log2; 1387 ++log2;
1133 1388
1134 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1389 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1135 1390
1136 RETVAL = newSVsv (self); 1391 XPUSHs (ST (0));
1137} 1392}
1138 OUTPUT:
1139 RETVAL
1140 1393
1141void encode (SV *self, SV *scalar) 1394void max_size (JSON *self, UV max_size = 0)
1142 PPCODE: 1395 PPCODE:
1143 XPUSHs (encode_json (scalar, *SvJSON (self))); 1396{
1397 UV log2 = 0;
1144 1398
1145void decode (SV *self, SV *jsonstr) 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)
1146 PPCODE: 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
1428 {
1429 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1430
1431 if (!HvKEYS (self->cb_sk_object))
1432 {
1433 SvREFCNT_dec (self->cb_sk_object);
1434 self->cb_sk_object = 0;
1435 }
1436 }
1437
1438 XPUSHs (ST (0));
1439}
1440
1441void encode (JSON *self, SV *scalar)
1442 PPCODE:
1443 XPUSHs (encode_json (scalar, self));
1444
1445void decode (JSON *self, SV *jsonstr)
1446 PPCODE:
1147 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1447 XPUSHs (decode_json (jsonstr, self, 0));
1148 1448
1149void decode_prefix (SV *self, SV *jsonstr) 1449void decode_prefix (JSON *self, SV *jsonstr)
1150 PPCODE: 1450 PPCODE:
1151{ 1451{
1152 UV offset; 1452 UV offset;
1153 EXTEND (SP, 2); 1453 EXTEND (SP, 2);
1154 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1454 PUSHs (decode_json (jsonstr, self, &offset));
1155 PUSHs (sv_2mortal (newSVuv (offset))); 1455 PUSHs (sv_2mortal (newSVuv (offset)));
1156} 1456}
1157 1457
1458void DESTROY (JSON *self)
1459 CODE:
1460 SvREFCNT_dec (self->cb_sk_object);
1461 SvREFCNT_dec (self->cb_object);
1462
1158PROTOTYPES: ENABLE 1463PROTOTYPES: ENABLE
1159 1464
1160void to_json (SV *scalar) 1465void to_json (SV *scalar)
1161 ALIAS:
1162 objToJson = 0
1163 PPCODE: 1466 PPCODE:
1467{
1468 JSON json = { F_DEFAULT | F_UTF8 };
1164 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1469 XPUSHs (encode_json (scalar, &json));
1470}
1165 1471
1166void from_json (SV *jsonstr) 1472void from_json (SV *jsonstr)
1167 ALIAS:
1168 jsonToObj = 0
1169 PPCODE: 1473 PPCODE:
1474{
1475 JSON json = { F_DEFAULT | F_UTF8 };
1170 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1476 XPUSHs (decode_json (jsonstr, &json, 0));
1477}
1171 1478

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines