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.37 by root, Wed Jun 6 17:49:01 2007 UTC vs.
Revision 1.59 by root, Mon Aug 13 16:14:20 2007 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
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#include <stdio.h>
9#include <float.h>
9 10
10#if defined(__BORLANDC__) || defined(_MSC_VER) 11#if defined(__BORLANDC__) || defined(_MSC_VER)
11# define snprintf _snprintf // C compilers have this in stdio.h 12# define snprintf _snprintf // C compilers have this in stdio.h
12#endif 13#endif
13 14
15// some old perls do not have this, try to make it work, no
16// guarentees, though. if it breaks, you get to keep the pieces.
17#ifndef UTF8_MAXBYTES
18# define UTF8_MAXBYTES 13
19#endif
20
14#define F_ASCII 0x00000001UL 21#define F_ASCII 0x00000001UL
15#define F_LATIN1 0x00000002UL 22#define F_LATIN1 0x00000002UL
16#define F_UTF8 0x00000004UL 23#define F_UTF8 0x00000004UL
17#define F_INDENT 0x00000008UL 24#define F_INDENT 0x00000008UL
18#define F_CANONICAL 0x00000010UL 25#define F_CANONICAL 0x00000010UL
19#define F_SPACE_BEFORE 0x00000020UL 26#define F_SPACE_BEFORE 0x00000020UL
20#define F_SPACE_AFTER 0x00000040UL 27#define F_SPACE_AFTER 0x00000040UL
21#define F_ALLOW_NONREF 0x00000100UL 28#define F_ALLOW_NONREF 0x00000100UL
22#define F_SHRINK 0x00000200UL 29#define F_SHRINK 0x00000200UL
30#define F_ALLOW_BLESSED 0x00000400UL
31#define F_CONV_BLESSED 0x00000800UL
23#define F_MAXDEPTH 0xf8000000UL 32#define F_MAXDEPTH 0xf8000000UL
24#define S_MAXDEPTH 27 33#define S_MAXDEPTH 27
34#define F_MAXSIZE 0x01f00000UL
35#define S_MAXSIZE 20
36#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
25 37
26#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH)) 38#define DEC_DEPTH(flags) (1UL << ((flags & F_MAXDEPTH) >> S_MAXDEPTH))
27 39#define DEC_SIZE(flags) (1UL << ((flags & F_MAXSIZE ) >> S_MAXSIZE ))
28// F_SELFCONVERT? <=> to_json/toJson
29// F_BLESSED? <=> { $__class__$ => }
30 40
31#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 41#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
32#define F_DEFAULT (9UL << S_MAXDEPTH) 42#define F_DEFAULT (9UL << S_MAXDEPTH)
33 43
34#define INIT_SIZE 32 // initial scalar size to be allocated 44#define INIT_SIZE 32 // initial scalar size to be allocated
35#define INDENT_STEP 3 // spaces per indentation level 45#define INDENT_STEP 3 // spaces per indentation level
36 46
37#define SHORT_STRING_LEN 512 // special-case strings of up to this size 47#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
38 48
39#define SB do { 49#define SB do {
40#define SE } while (0) 50#define SE } while (0)
41 51
42#if __GNUC__ >= 3 52#if __GNUC__ >= 3
48#endif 58#endif
49 59
50#define expect_false(expr) expect ((expr) != 0, 0) 60#define expect_false(expr) expect ((expr) != 0, 0)
51#define expect_true(expr) expect ((expr) != 0, 1) 61#define expect_true(expr) expect ((expr) != 0, 1)
52 62
63#ifdef USE_ITHREADS
64# define JSON_SLOW 1
65# define JSON_STASH (json_stash ? json_stash : gv_stashpv ("JSON::XS", 1))
66#else
67# define JSON_SLOW 0
68# define JSON_STASH json_stash
69#endif
70
53static HV *json_stash; // JSON::XS:: 71static HV *json_stash, *json_boolean_stash; // JSON::XS::
72static SV *json_true, *json_false;
73
74typedef struct {
75 U32 flags;
76 SV *cb_object;
77 HV *cb_sk_object;
78} JSON;
54 79
55///////////////////////////////////////////////////////////////////////////// 80/////////////////////////////////////////////////////////////////////////////
56// utility functions 81// utility functions
57 82
58static UV * 83inline void
59SvJSON (SV *sv)
60{
61 if (!(SvROK (sv) && SvOBJECT (SvRV (sv)) && SvSTASH (SvRV (sv)) == json_stash))
62 croak ("object is not of type JSON::XS");
63
64 return &SvUVX (SvRV (sv));
65}
66
67static void
68shrink (SV *sv) 84shrink (SV *sv)
69{ 85{
70 sv_utf8_downgrade (sv, 1); 86 sv_utf8_downgrade (sv, 1);
71 if (SvLEN (sv) > SvCUR (sv) + 1) 87 if (SvLEN (sv) > SvCUR (sv) + 1)
72 { 88 {
107typedef struct 123typedef struct
108{ 124{
109 char *cur; // SvPVX (sv) + current output position 125 char *cur; // SvPVX (sv) + current output position
110 char *end; // SvEND (sv) 126 char *end; // SvEND (sv)
111 SV *sv; // result scalar 127 SV *sv; // result scalar
112 U32 flags; // F_* 128 JSON json;
113 U32 indent; // indentation level 129 U32 indent; // indentation level
114 U32 maxdepth; // max. indentation/recursion level 130 U32 maxdepth; // max. indentation/recursion level
115} enc_t; 131} enc_t;
116 132
117inline void 133inline void
178 STRLEN clen; 194 STRLEN clen;
179 UV uch; 195 UV uch;
180 196
181 if (is_utf8) 197 if (is_utf8)
182 { 198 {
183 //uch = utf8n_to_uvuni (str, end - str, &clen, UTF8_CHECK_ONLY);
184 uch = decode_utf8 (str, end - str, &clen); 199 uch = decode_utf8 (str, end - str, &clen);
185 if (clen == (STRLEN)-1) 200 if (clen == (STRLEN)-1)
186 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str); 201 croak ("malformed or illegal unicode character in string [%.11s], cannot convert to JSON", str);
187 } 202 }
188 else 203 else
192 } 207 }
193 208
194 if (uch > 0x10FFFFUL) 209 if (uch > 0x10FFFFUL)
195 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch); 210 croak ("out of range codepoint (0x%lx) encountered, unrepresentable in JSON", (unsigned long)uch);
196 211
197 if (uch < 0x80 || enc->flags & F_ASCII || (enc->flags & F_LATIN1 && uch > 0xFF)) 212 if (uch < 0x80 || enc->json.flags & F_ASCII || (enc->json.flags & F_LATIN1 && uch > 0xFF))
198 { 213 {
199 if (uch > 0xFFFFUL) 214 if (uch > 0xFFFFUL)
200 { 215 {
201 need (enc, len += 11); 216 need (enc, len += 11);
202 sprintf (enc->cur, "\\u%04x\\u%04x", 217 sprintf (enc->cur, "\\u%04x\\u%04x",
216 *enc->cur++ = hexdigit [(uch >> 0) & 15]; 231 *enc->cur++ = hexdigit [(uch >> 0) & 15];
217 } 232 }
218 233
219 str += clen; 234 str += clen;
220 } 235 }
221 else if (enc->flags & F_LATIN1) 236 else if (enc->json.flags & F_LATIN1)
222 { 237 {
223 *enc->cur++ = uch; 238 *enc->cur++ = uch;
224 str += clen; 239 str += clen;
225 } 240 }
226 else if (is_utf8) 241 else if (is_utf8)
247} 262}
248 263
249inline void 264inline void
250encode_indent (enc_t *enc) 265encode_indent (enc_t *enc)
251{ 266{
252 if (enc->flags & F_INDENT) 267 if (enc->json.flags & F_INDENT)
253 { 268 {
254 int spaces = enc->indent * INDENT_STEP; 269 int spaces = enc->indent * INDENT_STEP;
255 270
256 need (enc, spaces); 271 need (enc, spaces);
257 memset (enc->cur, ' ', spaces); 272 memset (enc->cur, ' ', spaces);
267} 282}
268 283
269inline void 284inline void
270encode_nl (enc_t *enc) 285encode_nl (enc_t *enc)
271{ 286{
272 if (enc->flags & F_INDENT) 287 if (enc->json.flags & F_INDENT)
273 { 288 {
274 need (enc, 1); 289 need (enc, 1);
275 encode_ch (enc, '\n'); 290 encode_ch (enc, '\n');
276 } 291 }
277} 292}
279inline void 294inline void
280encode_comma (enc_t *enc) 295encode_comma (enc_t *enc)
281{ 296{
282 encode_ch (enc, ','); 297 encode_ch (enc, ',');
283 298
284 if (enc->flags & F_INDENT) 299 if (enc->json.flags & F_INDENT)
285 encode_nl (enc); 300 encode_nl (enc);
286 else if (enc->flags & F_SPACE_AFTER) 301 else if (enc->json.flags & F_SPACE_AFTER)
287 encode_space (enc); 302 encode_space (enc);
288} 303}
289 304
290static void encode_sv (enc_t *enc, SV *sv); 305static void encode_sv (enc_t *enc, SV *sv);
291 306
300 encode_ch (enc, '['); encode_nl (enc); 315 encode_ch (enc, '['); encode_nl (enc);
301 ++enc->indent; 316 ++enc->indent;
302 317
303 for (i = 0; i <= len; ++i) 318 for (i = 0; i <= len; ++i)
304 { 319 {
320 SV **svp = av_fetch (av, i, 0);
321
305 encode_indent (enc); 322 encode_indent (enc);
306 encode_sv (enc, *av_fetch (av, i, 0)); 323
324 if (svp)
325 encode_sv (enc, *svp);
326 else
327 encode_str (enc, "null", 4, 0);
307 328
308 if (i < len) 329 if (i < len)
309 encode_comma (enc); 330 encode_comma (enc);
310 } 331 }
311 332
334 else 355 else
335 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he)); 356 encode_str (enc, HeKEY (he), HeKLEN (he), HeKUTF8 (he));
336 357
337 encode_ch (enc, '"'); 358 encode_ch (enc, '"');
338 359
339 if (enc->flags & F_SPACE_BEFORE) encode_space (enc); 360 if (enc->json.flags & F_SPACE_BEFORE) encode_space (enc);
340 encode_ch (enc, ':'); 361 encode_ch (enc, ':');
341 if (enc->flags & F_SPACE_AFTER ) encode_space (enc); 362 if (enc->json.flags & F_SPACE_AFTER ) encode_space (enc);
342 encode_sv (enc, HeVAL (he)); 363 encode_sv (enc, HeVAL (he));
343} 364}
344 365
345// compare hash entries, used when all keys are bytestrings 366// compare hash entries, used when all keys are bytestrings
346static int 367static int
381 { 402 {
382 // for canonical output we have to sort by keys first 403 // for canonical output we have to sort by keys first
383 // actually, this is mostly due to the stupid so-called 404 // actually, this is mostly due to the stupid so-called
384 // security workaround added somewhere in 5.8.x. 405 // security workaround added somewhere in 5.8.x.
385 // that randomises hash orderings 406 // that randomises hash orderings
386 if (enc->flags & F_CANONICAL) 407 if (enc->json.flags & F_CANONICAL)
387 { 408 {
388 int fast = 1; 409 int fast = 1;
389 HE *he; 410 HE *he;
390#if defined(__BORLANDC__) || defined(_MSC_VER) 411#if defined(__BORLANDC__) || defined(_MSC_VER)
391 HE **hes = _alloca (count * sizeof (HE)); 412 HE **hes = _alloca (count * sizeof (HE));
463 svtype svt; 484 svtype svt;
464 485
465 SvGETMAGIC (sv); 486 SvGETMAGIC (sv);
466 svt = SvTYPE (sv); 487 svt = SvTYPE (sv);
467 488
489 if (expect_false (SvOBJECT (sv)))
490 {
491 HV *stash = !JSON_SLOW || json_boolean_stash
492 ? json_boolean_stash
493 : gv_stashpv ("JSON::XS::Boolean", 1);
494
495 if (SvSTASH (sv) == stash)
496 {
497 if (SvIV (sv))
498 encode_str (enc, "true", 4, 0);
499 else
500 encode_str (enc, "false", 5, 0);
501 }
502 else
503 {
504#if 0
505 if (0 && sv_derived_from (rv, "JSON::Literal"))
506 {
507 // not yet
508 }
509#endif
510 if (enc->json.flags & F_CONV_BLESSED)
511 {
512 // we re-bless the reference to get overload and other niceties right
513 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
514
515 if (to_json)
516 {
517 dSP;
518
519 ENTER; SAVETMPS; PUSHMARK (SP);
520 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
521
522 // calling with G_SCALAR ensures that we always get a 1 return value
523 PUTBACK;
524 call_sv ((SV *)GvCV (to_json), G_SCALAR);
525 SPAGAIN;
526
527 // catch this surprisingly common error
528 if (SvROK (TOPs) && SvRV (TOPs) == sv)
529 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
530
531 sv = POPs;
532 PUTBACK;
533
534 encode_sv (enc, sv);
535
536 FREETMPS; LEAVE;
537 }
538 else if (enc->json.flags & F_ALLOW_BLESSED)
539 encode_str (enc, "null", 4, 0);
540 else
541 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
542 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
543 }
544 else if (enc->json.flags & F_ALLOW_BLESSED)
545 encode_str (enc, "null", 4, 0);
546 else
547 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
549 }
550 }
468 if (svt == SVt_PVHV) 551 else if (svt == SVt_PVHV)
469 encode_hv (enc, (HV *)sv); 552 encode_hv (enc, (HV *)sv);
470 else if (svt == SVt_PVAV) 553 else if (svt == SVt_PVAV)
471 encode_av (enc, (AV *)sv); 554 encode_av (enc, (AV *)sv);
472 else if (svt < SVt_PVAV) 555 else if (svt < SVt_PVAV)
473 { 556 {
474 if (SvNIOK (sv) && SvIV (sv) == 0) 557 STRLEN len = 0;
558 char *pv = svt ? SvPV (sv, len) : 0;
559
560 if (len == 1 && *pv == '1')
561 encode_str (enc, "true", 4, 0);
562 else if (len == 1 && *pv == '0')
475 encode_str (enc, "false", 5, 0); 563 encode_str (enc, "false", 5, 0);
476 else if (SvNIOK (sv) && SvIV (sv) == 1)
477 encode_str (enc, "true", 4, 0);
478 else 564 else
479 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1", 565 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
480 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 566 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
481 } 567 }
482 else 568 else
497 encode_str (enc, str, len, SvUTF8 (sv)); 583 encode_str (enc, str, len, SvUTF8 (sv));
498 encode_ch (enc, '"'); 584 encode_ch (enc, '"');
499 } 585 }
500 else if (SvNOKp (sv)) 586 else if (SvNOKp (sv))
501 { 587 {
588 // trust that perl will do the right thing w.r.t. JSON syntax.
502 need (enc, NV_DIG + 32); 589 need (enc, NV_DIG + 32);
503 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur); 590 Gconvert (SvNVX (sv), NV_DIG, 0, enc->cur);
504 enc->cur += strlen (enc->cur); 591 enc->cur += strlen (enc->cur);
505 } 592 }
506 else if (SvIOKp (sv)) 593 else if (SvIOKp (sv))
507 { 594 {
508 // we assume we can always read an IV as a UV 595 // we assume we can always read an IV as a UV
509 if (SvUV (sv) & ~(UV)0x7fff) 596 if (SvUV (sv) & ~(UV)0x7fff)
510 { 597 {
598 // large integer, use the (rather slow) snprintf way.
511 need (enc, sizeof (UV) * 3); 599 need (enc, sizeof (UV) * 3);
512 enc->cur += 600 enc->cur +=
513 SvIsUV(sv) 601 SvIsUV(sv)
514 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv)) 602 ? snprintf (enc->cur, sizeof (UV) * 3, "%"UVuf, (UV)SvUVX (sv))
515 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv)); 603 : snprintf (enc->cur, sizeof (UV) * 3, "%"IVdf, (IV)SvIVX (sv));
518 { 606 {
519 // optimise the "small number case" 607 // optimise the "small number case"
520 // code will likely be branchless and use only a single multiplication 608 // code will likely be branchless and use only a single multiplication
521 I32 i = SvIV (sv); 609 I32 i = SvIV (sv);
522 U32 u; 610 U32 u;
611 char digit, nz = 0;
523 612
524 need (enc, 6); 613 need (enc, 6);
525 614
526 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0; 615 *enc->cur = '-'; enc->cur += i < 0 ? 1 : 0;
527 u = i < 0 ? -i : i; 616 u = i < 0 ? -i : i;
528 617
529 // convert to 4.28 fixed-point representation 618 // convert to 4.28 fixed-point representation
530 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits 619 u = u * ((0xfffffff + 10000) / 10000); // 10**5, 5 fractional digits
531 620
532 char digit, nz = 0; 621 // now output digit by digit, each time masking out the integer part
533 622 // and multiplying by 5 while moving the decimal point one to the right,
623 // resulting in a net multiplication by 10.
624 // we always write the digit to memory but conditionally increment
625 // the pointer, to ease the usage of conditional move instructions.
534 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5; 626 digit = u >> 28; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0xfffffff) * 5;
535 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5; 627 digit = u >> 27; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x7ffffff) * 5;
536 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5; 628 digit = u >> 26; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x3ffffff) * 5;
537 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5; 629 digit = u >> 25; *enc->cur = digit + '0'; enc->cur += (nz = nz || digit); u = (u & 0x1ffffff) * 5;
538 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; 630 digit = u >> 24; *enc->cur = digit + '0'; enc->cur += 1; // correctly generate '0'
539 } 631 }
540 } 632 }
541 else if (SvROK (sv)) 633 else if (SvROK (sv))
542 encode_rv (enc, SvRV (sv)); 634 encode_rv (enc, SvRV (sv));
543 else if (!SvOK (sv)) 635 else if (!SvOK (sv))
546 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 638 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
547 SvPV_nolen (sv), SvFLAGS (sv)); 639 SvPV_nolen (sv), SvFLAGS (sv));
548} 640}
549 641
550static SV * 642static SV *
551encode_json (SV *scalar, U32 flags) 643encode_json (SV *scalar, JSON *json)
552{ 644{
553 enc_t enc; 645 enc_t enc;
554 646
555 if (!(flags & F_ALLOW_NONREF) && !SvROK (scalar)) 647 if (!(json->flags & F_ALLOW_NONREF) && !SvROK (scalar))
556 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"); 648 croak ("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)");
557 649
558 enc.flags = flags; 650 enc.json = *json;
559 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 651 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
560 enc.cur = SvPVX (enc.sv); 652 enc.cur = SvPVX (enc.sv);
561 enc.end = SvEND (enc.sv); 653 enc.end = SvEND (enc.sv);
562 enc.indent = 0; 654 enc.indent = 0;
563 enc.maxdepth = DEC_DEPTH (flags); 655 enc.maxdepth = DEC_DEPTH (enc.json.flags);
564 656
565 SvPOK_only (enc.sv); 657 SvPOK_only (enc.sv);
566 encode_sv (&enc, scalar); 658 encode_sv (&enc, scalar);
567 659
568 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 660 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
569 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 661 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
570 662
571 if (!(flags & (F_ASCII | F_LATIN1 | F_UTF8))) 663 if (!(enc.json.flags & (F_ASCII | F_LATIN1 | F_UTF8)))
572 SvUTF8_on (enc.sv); 664 SvUTF8_on (enc.sv);
573 665
574 if (enc.flags & F_SHRINK) 666 if (enc.json.flags & F_SHRINK)
575 shrink (enc.sv); 667 shrink (enc.sv);
576 668
577 return enc.sv; 669 return enc.sv;
578} 670}
579 671
584typedef struct 676typedef struct
585{ 677{
586 char *cur; // current parser pointer 678 char *cur; // current parser pointer
587 char *end; // end of input string 679 char *end; // end of input string
588 const char *err; // parse error, if != 0 680 const char *err; // parse error, if != 0
589 U32 flags; // F_* 681 JSON json;
590 U32 depth; // recursion depth 682 U32 depth; // recursion depth
591 U32 maxdepth; // recursion depth limit 683 U32 maxdepth; // recursion depth limit
592} dec_t; 684} dec_t;
593 685
594inline void 686inline void
625decode_4hex (dec_t *dec) 717decode_4hex (dec_t *dec)
626{ 718{
627 signed char d1, d2, d3, d4; 719 signed char d1, d2, d3, d4;
628 unsigned char *cur = (unsigned char *)dec->cur; 720 unsigned char *cur = (unsigned char *)dec->cur;
629 721
630 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("four hexadecimal digits expected"); 722 d1 = decode_hexdigit [cur [0]]; if (expect_false (d1 < 0)) ERR ("exactly four hexadecimal digits expected");
631 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("four hexadecimal digits expected"); 723 d2 = decode_hexdigit [cur [1]]; if (expect_false (d2 < 0)) ERR ("exactly four hexadecimal digits expected");
632 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("four hexadecimal digits expected"); 724 d3 = decode_hexdigit [cur [2]]; if (expect_false (d3 < 0)) ERR ("exactly four hexadecimal digits expected");
633 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("four hexadecimal digits expected"); 725 d4 = decode_hexdigit [cur [3]]; if (expect_false (d4 < 0)) ERR ("exactly four hexadecimal digits expected");
634 726
635 dec->cur += 4; 727 dec->cur += 4;
636 728
637 return ((UV)d1) << 12 729 return ((UV)d1) << 12
638 | ((UV)d2) << 8 730 | ((UV)d2) << 8
646static SV * 738static SV *
647decode_str (dec_t *dec) 739decode_str (dec_t *dec)
648{ 740{
649 SV *sv = 0; 741 SV *sv = 0;
650 int utf8 = 0; 742 int utf8 = 0;
743 char *dec_cur = dec->cur;
651 744
652 do 745 do
653 { 746 {
654 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES]; 747 char buf [SHORT_STRING_LEN + UTF8_MAXBYTES];
655 char *cur = buf; 748 char *cur = buf;
656 749
657 do 750 do
658 { 751 {
659 unsigned char ch = *(unsigned char *)dec->cur++; 752 unsigned char ch = *(unsigned char *)dec_cur++;
660 753
661 if (expect_false (ch == '"')) 754 if (expect_false (ch == '"'))
662 { 755 {
663 --dec->cur; 756 --dec_cur;
664 break; 757 break;
665 } 758 }
666 else if (expect_false (ch == '\\')) 759 else if (expect_false (ch == '\\'))
667 { 760 {
668 switch (*dec->cur) 761 switch (*dec_cur)
669 { 762 {
670 case '\\': 763 case '\\':
671 case '/': 764 case '/':
672 case '"': *cur++ = *dec->cur++; break; 765 case '"': *cur++ = *dec_cur++; break;
673 766
674 case 'b': ++dec->cur; *cur++ = '\010'; break; 767 case 'b': ++dec_cur; *cur++ = '\010'; break;
675 case 't': ++dec->cur; *cur++ = '\011'; break; 768 case 't': ++dec_cur; *cur++ = '\011'; break;
676 case 'n': ++dec->cur; *cur++ = '\012'; break; 769 case 'n': ++dec_cur; *cur++ = '\012'; break;
677 case 'f': ++dec->cur; *cur++ = '\014'; break; 770 case 'f': ++dec_cur; *cur++ = '\014'; break;
678 case 'r': ++dec->cur; *cur++ = '\015'; break; 771 case 'r': ++dec_cur; *cur++ = '\015'; break;
679 772
680 case 'u': 773 case 'u':
681 { 774 {
682 UV lo, hi; 775 UV lo, hi;
683 ++dec->cur; 776 ++dec_cur;
684 777
778 dec->cur = dec_cur;
685 hi = decode_4hex (dec); 779 hi = decode_4hex (dec);
780 dec_cur = dec->cur;
686 if (hi == (UV)-1) 781 if (hi == (UV)-1)
687 goto fail; 782 goto fail;
688 783
689 // possibly a surrogate pair 784 // possibly a surrogate pair
690 if (hi >= 0xd800) 785 if (hi >= 0xd800)
691 if (hi < 0xdc00) 786 if (hi < 0xdc00)
692 { 787 {
693 if (dec->cur [0] != '\\' || dec->cur [1] != 'u') 788 if (dec_cur [0] != '\\' || dec_cur [1] != 'u')
694 ERR ("missing low surrogate character in surrogate pair"); 789 ERR ("missing low surrogate character in surrogate pair");
695 790
696 dec->cur += 2; 791 dec_cur += 2;
697 792
793 dec->cur = dec_cur;
698 lo = decode_4hex (dec); 794 lo = decode_4hex (dec);
795 dec_cur = dec->cur;
699 if (lo == (UV)-1) 796 if (lo == (UV)-1)
700 goto fail; 797 goto fail;
701 798
702 if (lo < 0xdc00 || lo >= 0xe000) 799 if (lo < 0xdc00 || lo >= 0xe000)
703 ERR ("surrogate pair expected"); 800 ERR ("surrogate pair expected");
717 *cur++ = hi; 814 *cur++ = hi;
718 } 815 }
719 break; 816 break;
720 817
721 default: 818 default:
722 --dec->cur; 819 --dec_cur;
723 ERR ("illegal backslash escape sequence in string"); 820 ERR ("illegal backslash escape sequence in string");
724 } 821 }
725 } 822 }
726 else if (expect_true (ch >= 0x20 && ch <= 0x7f)) 823 else if (expect_true (ch >= 0x20 && ch <= 0x7f))
727 *cur++ = ch; 824 *cur++ = ch;
728 else if (ch >= 0x80) 825 else if (ch >= 0x80)
729 { 826 {
730 STRLEN clen; 827 STRLEN clen;
731 UV uch; 828 UV uch;
732 829
733 --dec->cur; 830 --dec_cur;
734 831
735 uch = decode_utf8 (dec->cur, dec->end - dec->cur, &clen); 832 uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
736 if (clen == (STRLEN)-1) 833 if (clen == (STRLEN)-1)
737 ERR ("malformed UTF-8 character in JSON string"); 834 ERR ("malformed UTF-8 character in JSON string");
738 835
739 do 836 do
740 *cur++ = *dec->cur++; 837 *cur++ = *dec_cur++;
741 while (--clen); 838 while (--clen);
742 839
743 utf8 = 1; 840 utf8 = 1;
744 } 841 }
745 else 842 else
746 { 843 {
747 --dec->cur; 844 --dec_cur;
748 845
749 if (!ch) 846 if (!ch)
750 ERR ("unexpected end of string while parsing JSON string"); 847 ERR ("unexpected end of string while parsing JSON string");
751 else 848 else
752 ERR ("invalid character encountered while parsing JSON string"); 849 ERR ("invalid character encountered while parsing JSON string");
765 } 862 }
766 else 863 else
767 sv = newSVpvn (buf, len); 864 sv = newSVpvn (buf, len);
768 } 865 }
769 } 866 }
770 while (*dec->cur != '"'); 867 while (*dec_cur != '"');
771 868
772 ++dec->cur; 869 ++dec_cur;
773 870
774 if (sv) 871 if (sv)
775 { 872 {
776 SvPOK_only (sv); 873 SvPOK_only (sv);
777 *SvEND (sv) = 0; 874 *SvEND (sv) = 0;
780 SvUTF8_on (sv); 877 SvUTF8_on (sv);
781 } 878 }
782 else 879 else
783 sv = newSVpvn ("", 0); 880 sv = newSVpvn ("", 0);
784 881
882 dec->cur = dec_cur;
785 return sv; 883 return sv;
786 884
787fail: 885fail:
886 dec->cur = dec_cur;
788 return 0; 887 return 0;
789} 888}
790 889
791static SV * 890static SV *
792decode_num (dec_t *dec) 891decode_num (dec_t *dec)
850 is_nv = 1; 949 is_nv = 1;
851 } 950 }
852 951
853 if (!is_nv) 952 if (!is_nv)
854 { 953 {
954 int len = dec->cur - start;
955
855 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so 956 // special case the rather common 1..4-digit-int case, assumes 32 bit ints or so
856 if (*start == '-') 957 if (*start == '-')
857 switch (dec->cur - start) 958 switch (len)
858 { 959 {
859 case 2: return newSViv (-( start [1] - '0' )); 960 case 2: return newSViv (-( start [1] - '0' * 1));
860 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11)); 961 case 3: return newSViv (-( start [1] * 10 + start [2] - '0' * 11));
861 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111)); 962 case 4: return newSViv (-( start [1] * 100 + start [2] * 10 + start [3] - '0' * 111));
862 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111)); 963 case 5: return newSViv (-(start [1] * 1000 + start [2] * 100 + start [3] * 10 + start [4] - '0' * 1111));
863 } 964 }
864 else 965 else
865 switch (dec->cur - start) 966 switch (len)
866 { 967 {
867 case 1: return newSViv ( start [0] - '0' ); 968 case 1: return newSViv ( start [0] - '0' * 1);
868 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11); 969 case 2: return newSViv ( start [0] * 10 + start [1] - '0' * 11);
869 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111); 970 case 3: return newSViv ( start [0] * 100 + start [1] * 10 + start [2] - '0' * 111);
870 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111); 971 case 4: return newSViv ( start [0] * 1000 + start [1] * 100 + start [2] * 10 + start [3] - '0' * 1111);
871 } 972 }
872 973
873 { 974 {
874 UV uv; 975 UV uv;
875 int numtype = grok_number (start, dec->cur - start, &uv); 976 int numtype = grok_number (start, len, &uv);
876 if (numtype & IS_NUMBER_IN_UV) 977 if (numtype & IS_NUMBER_IN_UV)
877 if (numtype & IS_NUMBER_NEG) 978 if (numtype & IS_NUMBER_NEG)
878 { 979 {
879 if (uv < (UV)IV_MIN) 980 if (uv < (UV)IV_MIN)
880 return newSViv (-(IV)uv); 981 return newSViv (-(IV)uv);
881 } 982 }
882 else 983 else
883 return newSVuv (uv); 984 return newSVuv (uv);
884 } 985 }
885 }
886 986
987 len -= *start == '-' ? 1 : 0;
988
989 // does not fit into IV or UV, try NV
990 if ((sizeof (NV) == sizeof (double) && DBL_DIG >= len)
991 #if defined (LDBL_DIG)
992 || (sizeof (NV) == sizeof (long double) && LDBL_DIG >= len)
993 #endif
994 )
995 // fits into NV without loss of precision
996 return newSVnv (Atof (start));
997
998 // everything else fails, convert it to a string
999 return newSVpvn (start, dec->cur - start);
1000 }
1001
1002 // loss of precision here
887 return newSVnv (Atof (start)); 1003 return newSVnv (Atof (start));
888 1004
889fail: 1005fail:
890 return 0; 1006 return 0;
891} 1007}
935} 1051}
936 1052
937static SV * 1053static SV *
938decode_hv (dec_t *dec) 1054decode_hv (dec_t *dec)
939{ 1055{
1056 SV *sv;
940 HV *hv = newHV (); 1057 HV *hv = newHV ();
941 1058
942 DEC_INC_DEPTH; 1059 DEC_INC_DEPTH;
943 decode_ws (dec); 1060 decode_ws (dec);
944 1061
945 if (*dec->cur == '}') 1062 if (*dec->cur == '}')
946 ++dec->cur; 1063 ++dec->cur;
947 else 1064 else
948 for (;;) 1065 for (;;)
949 { 1066 {
950 SV *key, *value;
951
952 decode_ws (dec); EXPECT_CH ('"'); 1067 decode_ws (dec); EXPECT_CH ('"');
953 1068
954 key = decode_str (dec); 1069 // heuristic: assume that
955 if (!key) 1070 // a) decode_str + hv_store_ent are abysmally slow.
956 goto fail; 1071 // b) most hash keys are short, simple ascii text.
1072 // => try to "fast-match" such strings to avoid
1073 // the overhead of decode_str + hv_store_ent.
1074 {
1075 SV *value;
1076 char *p = dec->cur;
1077 char *e = p + 24; // only try up to 24 bytes
957 1078
958 decode_ws (dec); EXPECT_CH (':'); 1079 for (;;)
959
960 value = decode_sv (dec);
961 if (!value)
962 { 1080 {
1081 // the >= 0x80 is true on most architectures
1082 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
1083 {
1084 // slow path, back up and use decode_str
1085 SV *key = decode_str (dec);
1086 if (!key)
1087 goto fail;
1088
1089 decode_ws (dec); EXPECT_CH (':');
1090
1091 value = decode_sv (dec);
1092 if (!value)
1093 {
1094 SvREFCNT_dec (key);
1095 goto fail;
1096 }
1097
1098 hv_store_ent (hv, key, value, 0);
963 SvREFCNT_dec (key); 1099 SvREFCNT_dec (key);
1100
1101 break;
1102 }
1103 else if (*p == '"')
1104 {
1105 // fast path, got a simple key
1106 char *key = dec->cur;
1107 int len = p - key;
1108 dec->cur = p + 1;
1109
1110 decode_ws (dec); EXPECT_CH (':');
1111
1112 value = decode_sv (dec);
1113 if (!value)
964 goto fail; 1114 goto fail;
1115
1116 hv_store (hv, key, len, value, 0);
1117
1118 break;
1119 }
1120
1121 ++p;
965 } 1122 }
966 1123 }
967 hv_store_ent (hv, key, value, 0);
968 SvREFCNT_dec (key);
969 1124
970 decode_ws (dec); 1125 decode_ws (dec);
971 1126
972 if (*dec->cur == '}') 1127 if (*dec->cur == '}')
973 { 1128 {
980 1135
981 ++dec->cur; 1136 ++dec->cur;
982 } 1137 }
983 1138
984 DEC_DEC_DEPTH; 1139 DEC_DEC_DEPTH;
985 return newRV_noinc ((SV *)hv); 1140 sv = newRV_noinc ((SV *)hv);
1141
1142 // check filter callbacks
1143 if (dec->json.flags & F_HOOK)
1144 {
1145 if (dec->json.cb_sk_object && HvKEYS (hv) == 1)
1146 {
1147 HE *cb, *he;
1148
1149 hv_iterinit (hv);
1150 he = hv_iternext (hv);
1151 hv_iterinit (hv);
1152
1153 // the next line creates a mortal sv each time its called.
1154 // might want to optimise this for common cases.
1155 cb = hv_fetch_ent (dec->json.cb_sk_object, hv_iterkeysv (he), 0, 0);
1156
1157 if (cb)
1158 {
1159 dSP;
1160 int count;
1161
1162 ENTER; SAVETMPS; PUSHMARK (SP);
1163 XPUSHs (HeVAL (he));
1164
1165 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1166
1167 if (count == 1)
1168 {
1169 sv = newSVsv (POPs);
1170 FREETMPS; LEAVE;
1171 return sv;
1172 }
1173
1174 FREETMPS; LEAVE;
1175 }
1176 }
1177
1178 if (dec->json.cb_object)
1179 {
1180 dSP;
1181 int count;
1182
1183 ENTER; SAVETMPS; PUSHMARK (SP);
1184 XPUSHs (sv_2mortal (sv));
1185
1186 PUTBACK; count = call_sv (dec->json.cb_object, G_ARRAY); SPAGAIN;
1187
1188 if (count == 1)
1189 {
1190 sv = newSVsv (POPs);
1191 FREETMPS; LEAVE;
1192 return sv;
1193 }
1194
1195 SvREFCNT_inc (sv);
1196 FREETMPS; LEAVE;
1197 }
1198 }
1199
1200 return sv;
986 1201
987fail: 1202fail:
988 SvREFCNT_dec (hv); 1203 SvREFCNT_dec (hv);
989 DEC_DEC_DEPTH; 1204 DEC_DEC_DEPTH;
990 return 0; 1205 return 0;
992 1207
993static SV * 1208static SV *
994decode_sv (dec_t *dec) 1209decode_sv (dec_t *dec)
995{ 1210{
996 decode_ws (dec); 1211 decode_ws (dec);
1212
1213 // the beauty of JSON: you need exactly one character lookahead
1214 // to parse anything.
997 switch (*dec->cur) 1215 switch (*dec->cur)
998 { 1216 {
999 case '"': ++dec->cur; return decode_str (dec); 1217 case '"': ++dec->cur; return decode_str (dec);
1000 case '[': ++dec->cur; return decode_av (dec); 1218 case '[': ++dec->cur; return decode_av (dec);
1001 case '{': ++dec->cur; return decode_hv (dec); 1219 case '{': ++dec->cur; return decode_hv (dec);
1007 1225
1008 case 't': 1226 case 't':
1009 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1227 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1010 { 1228 {
1011 dec->cur += 4; 1229 dec->cur += 4;
1012 return newSViv (1); 1230 return SvREFCNT_inc (json_true);
1013 } 1231 }
1014 else 1232 else
1015 ERR ("'true' expected"); 1233 ERR ("'true' expected");
1016 1234
1017 break; 1235 break;
1018 1236
1019 case 'f': 1237 case 'f':
1020 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1238 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1021 { 1239 {
1022 dec->cur += 5; 1240 dec->cur += 5;
1023 return newSViv (0); 1241 return SvREFCNT_inc (json_false);
1024 } 1242 }
1025 else 1243 else
1026 ERR ("'false' expected"); 1244 ERR ("'false' expected");
1027 1245
1028 break; 1246 break;
1046fail: 1264fail:
1047 return 0; 1265 return 0;
1048} 1266}
1049 1267
1050static SV * 1268static SV *
1051decode_json (SV *string, U32 flags, UV *offset_return) 1269decode_json (SV *string, JSON *json, UV *offset_return)
1052{ 1270{
1053 dec_t dec; 1271 dec_t dec;
1054 UV offset; 1272 UV offset;
1055 SV *sv; 1273 SV *sv;
1056 1274
1057 SvGETMAGIC (string); 1275 SvGETMAGIC (string);
1058 SvUPGRADE (string, SVt_PV); 1276 SvUPGRADE (string, SVt_PV);
1059 1277
1278 if (json->flags & F_MAXSIZE && SvCUR (string) > DEC_SIZE (json->flags))
1279 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1280 (unsigned long)SvCUR (string), (unsigned long)DEC_SIZE (json->flags));
1281
1060 if (flags & F_UTF8) 1282 if (json->flags & F_UTF8)
1061 sv_utf8_downgrade (string, 0); 1283 sv_utf8_downgrade (string, 0);
1062 else 1284 else
1063 sv_utf8_upgrade (string); 1285 sv_utf8_upgrade (string);
1064 1286
1065 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1287 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
1066 1288
1067 dec.flags = flags; 1289 dec.json = *json;
1068 dec.cur = SvPVX (string); 1290 dec.cur = SvPVX (string);
1069 dec.end = SvEND (string); 1291 dec.end = SvEND (string);
1070 dec.err = 0; 1292 dec.err = 0;
1071 dec.depth = 0; 1293 dec.depth = 0;
1072 dec.maxdepth = DEC_DEPTH (dec.flags); 1294 dec.maxdepth = DEC_DEPTH (dec.json.flags);
1295
1296 if (dec.json.cb_object || dec.json.cb_sk_object)
1297 dec.json.flags |= F_HOOK;
1073 1298
1074 *dec.end = 0; // this should basically be a nop, too, but make sure it's there 1299 *dec.end = 0; // this should basically be a nop, too, but make sure it's there
1075 sv = decode_sv (&dec); 1300 sv = decode_sv (&dec);
1076 1301
1077 if (!(offset_return || !sv)) 1302 if (!(offset_return || !sv))
1087 } 1312 }
1088 } 1313 }
1089 1314
1090 if (offset_return || !sv) 1315 if (offset_return || !sv)
1091 { 1316 {
1092 offset = dec.flags & F_UTF8 1317 offset = dec.json.flags & F_UTF8
1093 ? dec.cur - SvPVX (string) 1318 ? dec.cur - SvPVX (string)
1094 : utf8_distance (dec.cur, SvPVX (string)); 1319 : utf8_distance (dec.cur, SvPVX (string));
1095 1320
1096 if (offset_return) 1321 if (offset_return)
1097 *offset_return = offset; 1322 *offset_return = offset;
1116 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1341 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1117 } 1342 }
1118 1343
1119 sv = sv_2mortal (sv); 1344 sv = sv_2mortal (sv);
1120 1345
1121 if (!(dec.flags & F_ALLOW_NONREF) && !SvROK (sv)) 1346 if (!(dec.json.flags & F_ALLOW_NONREF) && !SvROK (sv))
1122 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)"); 1347 croak ("JSON text must be an object or array (but found number, string, true, false or null, use allow_nonref to allow this)");
1123 1348
1124 return sv; 1349 return sv;
1125} 1350}
1126 1351
1130MODULE = JSON::XS PACKAGE = JSON::XS 1355MODULE = JSON::XS PACKAGE = JSON::XS
1131 1356
1132BOOT: 1357BOOT:
1133{ 1358{
1134 int i; 1359 int i;
1135
1136 memset (decode_hexdigit, 0xff, 256);
1137 1360
1138 for (i = 0; i < 256; ++i) 1361 for (i = 0; i < 256; ++i)
1139 decode_hexdigit [i] = 1362 decode_hexdigit [i] =
1140 i >= '0' && i <= '9' ? i - '0' 1363 i >= '0' && i <= '9' ? i - '0'
1141 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1364 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1142 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1365 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1143 : -1; 1366 : -1;
1144 1367
1145 json_stash = gv_stashpv ("JSON::XS", 1); 1368 json_stash = gv_stashpv ("JSON::XS" , 1);
1369 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1);
1370
1371 json_true = get_sv ("JSON::XS::true" , 1); SvREADONLY_on (json_true );
1372 json_false = get_sv ("JSON::XS::false", 1); SvREADONLY_on (json_false);
1146} 1373}
1147 1374
1148PROTOTYPES: DISABLE 1375PROTOTYPES: DISABLE
1149 1376
1150SV *new (char *dummy) 1377void CLONE (...)
1151 CODE: 1378 CODE:
1152 RETVAL = sv_bless (newRV_noinc (newSVuv (F_DEFAULT)), json_stash); 1379 json_stash = 0;
1153 OUTPUT: 1380 json_boolean_stash = 0;
1154 RETVAL
1155 1381
1382void new (char *klass)
1383 PPCODE:
1384{
1385 SV *pv = NEWSV (0, sizeof (JSON));
1386 SvPOK_only (pv);
1387 Zero (SvPVX (pv), 1, JSON);
1388 ((JSON *)SvPVX (pv))->flags = F_DEFAULT;
1389 XPUSHs (sv_2mortal (sv_bless (newRV_noinc (pv), JSON_STASH)));
1390}
1391
1156SV *ascii (SV *self, int enable = 1) 1392void ascii (JSON *self, int enable = 1)
1157 ALIAS: 1393 ALIAS:
1158 ascii = F_ASCII 1394 ascii = F_ASCII
1159 latin1 = F_LATIN1 1395 latin1 = F_LATIN1
1160 utf8 = F_UTF8 1396 utf8 = F_UTF8
1161 indent = F_INDENT 1397 indent = F_INDENT
1162 canonical = F_CANONICAL 1398 canonical = F_CANONICAL
1163 space_before = F_SPACE_BEFORE 1399 space_before = F_SPACE_BEFORE
1164 space_after = F_SPACE_AFTER 1400 space_after = F_SPACE_AFTER
1165 pretty = F_PRETTY 1401 pretty = F_PRETTY
1166 allow_nonref = F_ALLOW_NONREF 1402 allow_nonref = F_ALLOW_NONREF
1167 shrink = F_SHRINK 1403 shrink = F_SHRINK
1404 allow_blessed = F_ALLOW_BLESSED
1405 convert_blessed = F_CONV_BLESSED
1168 CODE: 1406 PPCODE:
1169{ 1407{
1170 UV *uv = SvJSON (self);
1171 if (enable) 1408 if (enable)
1172 *uv |= ix; 1409 self->flags |= ix;
1173 else 1410 else
1174 *uv &= ~ix; 1411 self->flags &= ~ix;
1175 1412
1176 RETVAL = newSVsv (self); 1413 XPUSHs (ST (0));
1177} 1414}
1178 OUTPUT:
1179 RETVAL
1180 1415
1181SV *max_depth (SV *self, UV max_depth = 0x80000000UL) 1416void max_depth (JSON *self, UV max_depth = 0x80000000UL)
1182 CODE: 1417 PPCODE:
1183{ 1418{
1184 UV *uv = SvJSON (self);
1185 UV log2 = 0; 1419 UV log2 = 0;
1186 1420
1187 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL; 1421 if (max_depth > 0x80000000UL) max_depth = 0x80000000UL;
1188 1422
1189 while ((1UL << log2) < max_depth) 1423 while ((1UL << log2) < max_depth)
1190 ++log2; 1424 ++log2;
1191 1425
1192 *uv = *uv & ~F_MAXDEPTH | (log2 << S_MAXDEPTH); 1426 self->flags = self->flags & ~F_MAXDEPTH | (log2 << S_MAXDEPTH);
1193 1427
1194 RETVAL = newSVsv (self); 1428 XPUSHs (ST (0));
1195} 1429}
1196 OUTPUT:
1197 RETVAL
1198 1430
1199void encode (SV *self, SV *scalar) 1431void max_size (JSON *self, UV max_size = 0)
1200 PPCODE: 1432 PPCODE:
1201 XPUSHs (encode_json (scalar, *SvJSON (self))); 1433{
1434 UV log2 = 0;
1202 1435
1203void decode (SV *self, SV *jsonstr) 1436 if (max_size > 0x80000000UL) max_size = 0x80000000UL;
1437 if (max_size == 1) max_size = 2;
1438
1439 while ((1UL << log2) < max_size)
1440 ++log2;
1441
1442 self->flags = self->flags & ~F_MAXSIZE | (log2 << S_MAXSIZE);
1443
1444 XPUSHs (ST (0));
1445}
1446
1447void filter_json_object (JSON *self, SV *cb = &PL_sv_undef)
1204 PPCODE: 1448 PPCODE:
1449{
1450 SvREFCNT_dec (self->cb_object);
1451 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1452
1453 XPUSHs (ST (0));
1454}
1455
1456void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1457 PPCODE:
1458{
1459 if (!self->cb_sk_object)
1460 self->cb_sk_object = newHV ();
1461
1462 if (SvOK (cb))
1463 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1464 else
1465 {
1466 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1467
1468 if (!HvKEYS (self->cb_sk_object))
1469 {
1470 SvREFCNT_dec (self->cb_sk_object);
1471 self->cb_sk_object = 0;
1472 }
1473 }
1474
1475 XPUSHs (ST (0));
1476}
1477
1478void encode (JSON *self, SV *scalar)
1479 PPCODE:
1480 XPUSHs (encode_json (scalar, self));
1481
1482void decode (JSON *self, SV *jsonstr)
1483 PPCODE:
1205 XPUSHs (decode_json (jsonstr, *SvJSON (self), 0)); 1484 XPUSHs (decode_json (jsonstr, self, 0));
1206 1485
1207void decode_prefix (SV *self, SV *jsonstr) 1486void decode_prefix (JSON *self, SV *jsonstr)
1208 PPCODE: 1487 PPCODE:
1209{ 1488{
1210 UV offset; 1489 UV offset;
1211 EXTEND (SP, 2); 1490 EXTEND (SP, 2);
1212 PUSHs (decode_json (jsonstr, *SvJSON (self), &offset)); 1491 PUSHs (decode_json (jsonstr, self, &offset));
1213 PUSHs (sv_2mortal (newSVuv (offset))); 1492 PUSHs (sv_2mortal (newSVuv (offset)));
1214} 1493}
1215 1494
1495void DESTROY (JSON *self)
1496 CODE:
1497 SvREFCNT_dec (self->cb_sk_object);
1498 SvREFCNT_dec (self->cb_object);
1499
1216PROTOTYPES: ENABLE 1500PROTOTYPES: ENABLE
1217 1501
1218void to_json (SV *scalar) 1502void to_json (SV *scalar)
1219 ALIAS:
1220 objToJson = 0
1221 PPCODE: 1503 PPCODE:
1504{
1505 JSON json = { F_DEFAULT | F_UTF8 };
1222 XPUSHs (encode_json (scalar, F_DEFAULT | F_UTF8)); 1506 XPUSHs (encode_json (scalar, &json));
1507}
1223 1508
1224void from_json (SV *jsonstr) 1509void from_json (SV *jsonstr)
1225 ALIAS:
1226 jsonToObj = 0
1227 PPCODE: 1510 PPCODE:
1511{
1512 JSON json = { F_DEFAULT | F_UTF8 };
1228 XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0)); 1513 XPUSHs (decode_json (jsonstr, &json, 0));
1514}
1229 1515

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines