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.105 by root, Tue Jan 19 01:07:27 2010 UTC vs.
Revision 1.122 by root, Tue Oct 29 15:55:49 2013 UTC

… …
15 15
16// some old perls do not have this, try to make it work, no 16// some old perls do not have this, try to make it work, no
17// guarantees, though. if it breaks, you get to keep the pieces. 17// guarantees, though. if it breaks, you get to keep the pieces.
18#ifndef UTF8_MAXBYTES 18#ifndef UTF8_MAXBYTES
19# define UTF8_MAXBYTES 13 19# define UTF8_MAXBYTES 13
20#endif
21
22// compatibility with perl <5.18
23#ifndef HvNAMELEN_get
24# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
25#endif
26#ifndef HvNAMELEN
27# define HvNAMELEN(hv) HvNAMELEN_get (hv)
28#endif
29#ifndef HvNAMEUTF8
30# define HvNAMEUTF8(hv) 0
20#endif 31#endif
21 32
22// three extra for rounding, sign, and end of string 33// three extra for rounding, sign, and end of string
23#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3) 34#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
24 35
… …
33#define F_SHRINK 0x00000200UL 44#define F_SHRINK 0x00000200UL
34#define F_ALLOW_BLESSED 0x00000400UL 45#define F_ALLOW_BLESSED 0x00000400UL
35#define F_CONV_BLESSED 0x00000800UL 46#define F_CONV_BLESSED 0x00000800UL
36#define F_RELAXED 0x00001000UL 47#define F_RELAXED 0x00001000UL
37#define F_ALLOW_UNKNOWN 0x00002000UL 48#define F_ALLOW_UNKNOWN 0x00002000UL
49#define F_ALLOW_TAGS 0x00004000UL
38#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing 50#define F_HOOK 0x00080000UL // some hooks exist, so slow-path processing
39 51
40#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER 52#define F_PRETTY F_INDENT | F_SPACE_BEFORE | F_SPACE_AFTER
41 53
42#define INIT_SIZE 32 // initial scalar size to be allocated 54#define INIT_SIZE 32 // initial scalar size to be allocated
43#define INDENT_STEP 3 // spaces per indentation level 55#define INDENT_STEP 3 // spaces per indentation level
44 56
45#define SHORT_STRING_LEN 16384 // special-case strings of up to this size 57#define SHORT_STRING_LEN 16384 // special-case strings of up to this size
58
59#define DECODE_WANTS_OCTETS(json) ((json)->flags & F_UTF8)
46 60
47#define SB do { 61#define SB do {
48#define SE } while (0) 62#define SE } while (0)
49 63
50#if __GNUC__ >= 3 64#if __GNUC__ >= 3
… …
70#else 84#else
71# define JSON_SLOW 0 85# define JSON_SLOW 0
72# define JSON_STASH json_stash 86# define JSON_STASH json_stash
73#endif 87#endif
74 88
89// the amount of HEs to allocate on the stack, when sorting keys
90#define STACK_HES 64
91
75static HV *json_stash, *json_boolean_stash; // JSON::XS:: 92static HV *json_stash, *types_boolean_stash; // JSON::XS::
76static SV *json_true, *json_false; 93static SV *types_true, *types_false, *sv_json;
77 94
78enum { 95enum {
79 INCR_M_WS = 0, // initial whitespace skipping, must be 0 96 INCR_M_WS = 0, // initial whitespace skipping, must be 0
80 INCR_M_STR, // inside string 97 INCR_M_STR, // inside string
81 INCR_M_BS, // inside backslash 98 INCR_M_BS, // inside backslash
… …
192///////////////////////////////////////////////////////////////////////////// 209/////////////////////////////////////////////////////////////////////////////
193// fp hell 210// fp hell
194 211
195// scan a group of digits, and a trailing exponent 212// scan a group of digits, and a trailing exponent
196static void 213static void
197json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp) 214json_atof_scan1 (const char *s, NV *accum, int *expo, int postdp, int maxdepth)
198{ 215{
199 UV uaccum = 0; 216 UV uaccum = 0;
200 int eaccum = 0; 217 int eaccum = 0;
218
219 // if we recurse too deep, skip all remaining digits
220 // to avoid a stack overflow attack
221 if (expect_false (--maxdepth <= 0))
222 while (((U8)*s - '0') < 10)
223 ++s;
201 224
202 for (;;) 225 for (;;)
203 { 226 {
204 U8 dig = (U8)*s - '0'; 227 U8 dig = (U8)*s - '0';
205 228
206 if (expect_false (dig >= 10)) 229 if (expect_false (dig >= 10))
207 { 230 {
208 if (dig == (U8)((U8)'.' - (U8)'0')) 231 if (dig == (U8)((U8)'.' - (U8)'0'))
209 { 232 {
210 ++s; 233 ++s;
211 json_atof_scan1 (s, accum, expo, 1); 234 json_atof_scan1 (s, accum, expo, 1, maxdepth);
212 } 235 }
213 else if ((dig | ' ') == 'e' - '0') 236 else if ((dig | ' ') == 'e' - '0')
214 { 237 {
215 int exp2 = 0; 238 int exp2 = 0;
216 int neg = 0; 239 int neg = 0;
… …
242 // if we have too many digits, then recurse for more 265 // if we have too many digits, then recurse for more
243 // we actually do this for rather few digits 266 // we actually do this for rather few digits
244 if (uaccum >= (UV_MAX - 9) / 10) 267 if (uaccum >= (UV_MAX - 9) / 10)
245 { 268 {
246 if (postdp) *expo -= eaccum; 269 if (postdp) *expo -= eaccum;
247 json_atof_scan1 (s, accum, expo, postdp); 270 json_atof_scan1 (s, accum, expo, postdp, maxdepth);
248 if (postdp) *expo += eaccum; 271 if (postdp) *expo += eaccum;
249 272
250 break; 273 break;
251 } 274 }
252 } 275 }
253 276
254 // this relies greatly on the quality of the pow () 277 // this relies greatly on the quality of the pow ()
255 // implementation of the platform, but a good 278 // implementation of the platform, but a good
256 // implementation is hard to beat. 279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
257 if (postdp) *expo -= eaccum; 281 if (postdp) *expo -= eaccum;
258 *accum += uaccum * Perl_pow (10., *expo); 282 *accum += uaccum * Perl_pow (10., *expo);
259 *expo += eaccum; 283 *expo += eaccum;
260} 284}
261 285
… …
270 { 294 {
271 ++s; 295 ++s;
272 neg = 1; 296 neg = 1;
273 } 297 }
274 298
299 // a recursion depth of ten gives us >>500 bits
275 json_atof_scan1 (s, &accum, &expo, 0); 300 json_atof_scan1 (s, &accum, &expo, 0, 10);
276 301
277 return neg ? -accum : accum; 302 return neg ? -accum : accum;
278} 303}
279///////////////////////////////////////////////////////////////////////////// 304/////////////////////////////////////////////////////////////////////////////
280// encoder 305// encoder
… …
470 495
471 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
472 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
473 498
474 encode_ch (enc, '['); 499 encode_ch (enc, '[');
475 500
476 if (len >= 0) 501 if (len >= 0)
477 { 502 {
478 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
479 504
480 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
492 encode_comma (enc); 517 encode_comma (enc);
493 } 518 }
494 519
495 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
496 } 521 }
497 522
498 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
499} 524}
500 525
501static void 526static void
502encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
506 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
507 { 532 {
508 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
509 STRLEN len; 534 STRLEN len;
510 char *str; 535 char *str;
511 536
512 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
513 str = SvPV (sv, len); 538 str = SvPV (sv, len);
514 539
515 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
516 } 541 }
… …
582 } 607 }
583 608
584 if (count) 609 if (count)
585 { 610 {
586 int i, fast = 1; 611 int i, fast = 1;
587#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
588 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
589#else 614
590 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
591#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
592 621
593 i = 0; 622 i = 0;
594 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
595 { 624 {
596 hes [i++] = he; 625 hes [i++] = he;
… …
665// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
666static void 695static void
667encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
668{ 697{
669 svtype svt; 698 svtype svt;
699 GV *method;
670 700
671 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
672 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
673 703
674 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
675 { 705 {
676 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
677 ? json_boolean_stash 707 ? types_boolean_stash
678 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
679 710
680 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
681 { 712 {
682 if (SvIV (sv)) 713 if (SvIV (sv))
683 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
684 else 715 else
685 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
686 } 717 }
718 else if ((enc->json.flags & F_ALLOW_TAGS) && (method = gv_fetchmethod_autoload (stash, "FREEZE", 0)))
719 {
720 int count;
721 dSP;
722
723 ENTER; SAVETMPS; PUSHMARK (SP);
724 EXTEND (SP, 2);
725 // we re-bless the reference to get overload and other niceties right
726 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
727 PUSHs (sv_json);
728
729 PUTBACK;
730 count = call_sv ((SV *)GvCV (method), G_ARRAY);
731 SPAGAIN;
732
733 // catch this surprisingly common error
734 if (SvROK (TOPs) && SvRV (TOPs) == sv)
735 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
736
737 encode_ch (enc, '(');
738 encode_ch (enc, '"');
739 encode_str (enc, HvNAME (stash), HvNAMELEN (stash), HvNAMEUTF8 (stash));
740 encode_ch (enc, '"');
741 encode_ch (enc, ')');
742 encode_ch (enc, '[');
743
744 while (count)
745 {
746 encode_sv (enc, SP[1 - count--]);
747
748 if (count)
749 encode_ch (enc, ',');
750 }
751
752 encode_ch (enc, ']');
753
754 PUTBACK;
755
756 FREETMPS; LEAVE;
757 }
758 else if ((enc->json.flags & F_CONV_BLESSED) && (method = gv_fetchmethod_autoload (stash, "TO_JSON", 0)))
759 {
760 dSP;
761
762 ENTER; SAVETMPS; PUSHMARK (SP);
763 // we re-bless the reference to get overload and other niceties right
764 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
765
766 // calling with G_SCALAR ensures that we always get a 1 return value
767 PUTBACK;
768 call_sv ((SV *)GvCV (method), G_SCALAR);
769 SPAGAIN;
770
771 // catch this surprisingly common error
772 if (SvROK (TOPs) && SvRV (TOPs) == sv)
773 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
774
775 sv = POPs;
776 PUTBACK;
777
778 encode_sv (enc, sv);
779
780 FREETMPS; LEAVE;
781 }
782 else if (enc->json.flags & F_ALLOW_BLESSED)
783 encode_str (enc, "null", 4, 0);
687 else 784 else
688 {
689#if 0
690 if (0 && sv_derived_from (rv, "JSON::Literal"))
691 {
692 // not yet
693 }
694#endif
695 if (enc->json.flags & F_CONV_BLESSED)
696 {
697 // we re-bless the reference to get overload and other niceties right
698 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
699
700 if (to_json)
701 {
702 dSP;
703
704 ENTER; SAVETMPS; PUSHMARK (SP);
705 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
706
707 // calling with G_SCALAR ensures that we always get a 1 return value
708 PUTBACK;
709 call_sv ((SV *)GvCV (to_json), G_SCALAR);
710 SPAGAIN;
711
712 // catch this surprisingly common error
713 if (SvROK (TOPs) && SvRV (TOPs) == sv)
714 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
715
716 sv = POPs;
717 PUTBACK;
718
719 encode_sv (enc, sv);
720
721 FREETMPS; LEAVE;
722 }
723 else if (enc->json.flags & F_ALLOW_BLESSED)
724 encode_str (enc, "null", 4, 0);
725 else
726 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
727 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
728 }
729 else if (enc->json.flags & F_ALLOW_BLESSED)
730 encode_str (enc, "null", 4, 0);
731 else
732 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", 785 croak ("encountered object '%s', but neither allow_blessed, convert_blessed nor allow_tags settings are enabled (or TO_JSON/FREEZE method missing)",
733 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
734 }
735 } 787 }
736 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
737 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
738 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
739 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
815 } 867 }
816 else 868 else
817 { 869 {
818 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
819 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
820 enc->cur += 872 enc->cur +=
821 SvIsUV(sv) 873 SvIsUV(sv)
822 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
823 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
824 } 876 }
825 } 877 }
826 else if (SvROK (sv)) 878 else if (SvROK (sv))
827 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
828 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
829 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
830 else 882 else
831 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this", 883 croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
832 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
833} 885}
834 886
835static SV * 887static SV *
836encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
837{ 889{
… …
1249 if (*dec->cur == ']') 1301 if (*dec->cur == ']')
1250 { 1302 {
1251 ++dec->cur; 1303 ++dec->cur;
1252 break; 1304 break;
1253 } 1305 }
1254 1306
1255 if (*dec->cur != ',') 1307 if (*dec->cur != ',')
1256 ERR (", or ] expected while parsing array"); 1308 ERR (", or ] expected while parsing array");
1257 1309
1258 ++dec->cur; 1310 ++dec->cur;
1259 1311
… …
1394 dSP; 1446 dSP;
1395 int count; 1447 int count;
1396 1448
1397 ENTER; SAVETMPS; PUSHMARK (SP); 1449 ENTER; SAVETMPS; PUSHMARK (SP);
1398 XPUSHs (HeVAL (he)); 1450 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv);
1399 1452
1400 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1401 1454
1402 if (count == 1) 1455 if (count == 1)
1403 { 1456 {
1404 sv = newSVsv (POPs); 1457 sv = newSVsv (POPs);
1405 FREETMPS; LEAVE; 1458 FREETMPS; LEAVE;
1406 return sv; 1459 return sv;
1407 } 1460 }
1408 1461
1462 SvREFCNT_inc (sv);
1409 FREETMPS; LEAVE; 1463 FREETMPS; LEAVE;
1410 } 1464 }
1411 } 1465 }
1412 1466
1413 if (dec->json.cb_object) 1467 if (dec->json.cb_object)
… …
1439 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1440 return 0; 1494 return 0;
1441} 1495}
1442 1496
1443static SV * 1497static SV *
1498decode_tag (dec_t *dec)
1499{
1500 SV *tag = 0;
1501 SV *val = 0;
1502
1503 if (!(dec->json.flags & F_ALLOW_TAGS))
1504 ERR ("malformed JSON string, neither array, object, number, string or atom");
1505
1506 ++dec->cur;
1507
1508 decode_ws (dec);
1509
1510 tag = decode_sv (dec);
1511 if (!tag)
1512 goto fail;
1513
1514 if (!SvPOK (tag))
1515 ERR ("malformed JSON string, (tag) must be a string");
1516
1517 decode_ws (dec);
1518
1519 if (*dec->cur != ')')
1520 ERR (") expected after tag");
1521
1522 ++dec->cur;
1523
1524 decode_ws (dec);
1525
1526 val = decode_sv (dec);
1527 if (!val)
1528 goto fail;
1529
1530 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1531 ERR ("malformed JSON string, tag value must be an array");
1532
1533 {
1534 AV *av = (AV *)SvRV (val);
1535 int i, len = av_len (av) + 1;
1536 HV *stash = gv_stashsv (tag, 0);
1537 SV *sv;
1538
1539 if (!stash)
1540 ERR ("cannot decode perl-object (package does not exist)");
1541
1542 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1543
1544 if (!method)
1545 ERR ("cannot decode perl-object (package does not have a THAW method)");
1546
1547 dSP;
1548
1549 ENTER; SAVETMPS; PUSHMARK (SP);
1550 EXTEND (SP, len + 2);
1551 // we re-bless the reference to get overload and other niceties right
1552 PUSHs (tag);
1553 PUSHs (sv_json);
1554
1555 for (i = 0; i < len; ++i)
1556 PUSHs (*av_fetch (av, i, 1));
1557
1558 PUTBACK;
1559 call_sv ((SV *)GvCV (method), G_SCALAR);
1560 SPAGAIN;
1561
1562 SvREFCNT_dec (tag);
1563 SvREFCNT_dec (val);
1564 sv = SvREFCNT_inc (POPs);
1565
1566 PUTBACK;
1567
1568 FREETMPS; LEAVE;
1569
1570 return sv;
1571 }
1572
1573fail:
1574 SvREFCNT_dec (tag);
1575 SvREFCNT_dec (val);
1576 return 0;
1577}
1578
1579static SV *
1444decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1445{ 1581{
1446 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1447 // to parse everything. 1583 // to parse everything.
1448 switch (*dec->cur) 1584 switch (*dec->cur)
1449 { 1585 {
1450 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1451 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1452 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1453 1590
1454 case '-': 1591 case '-':
1455 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1456 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1457 return decode_num (dec); 1594 return decode_num (dec);
… …
1459 case 't': 1596 case 't':
1460 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1461 { 1598 {
1462 dec->cur += 4; 1599 dec->cur += 4;
1463#if JSON_SLOW 1600#if JSON_SLOW
1464 json_true = get_bool ("JSON::XS::true"); 1601 types_true = get_bool ("Types::Serialiser::true");
1465#endif 1602#endif
1466 return newSVsv (json_true); 1603 return newSVsv (types_true);
1467 } 1604 }
1468 else 1605 else
1469 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1470 1607
1471 break; 1608 break;
… …
1473 case 'f': 1610 case 'f':
1474 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1475 { 1612 {
1476 dec->cur += 5; 1613 dec->cur += 5;
1477#if JSON_SLOW 1614#if JSON_SLOW
1478 json_false = get_bool ("JSON::XS::false"); 1615 types_false = get_bool ("Types::Serialiser::false");
1479#endif 1616#endif
1480 return newSVsv (json_false); 1617 return newSVsv (types_false);
1481 } 1618 }
1482 else 1619 else
1483 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1484 1621
1485 break; 1622 break;
… …
1494 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1495 1632
1496 break; 1633 break;
1497 1634
1498 default: 1635 default:
1499 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1500 break; 1637 break;
1501 } 1638 }
1502 1639
1503fail: 1640fail:
1504 return 0; 1641 return 0;
… …
1509{ 1646{
1510 dec_t dec; 1647 dec_t dec;
1511 SV *sv; 1648 SV *sv;
1512 1649
1513 /* work around bugs in 5.10 where manipulating magic values 1650 /* work around bugs in 5.10 where manipulating magic values
1514 * will perl ignore the magic in subsequent accesses 1651 * makes perl ignore the magic in subsequent accesses.
1652 * also make a copy of non-PV values, to get them into a clean
1653 * state (SvPV should do that, but it's buggy, see below).
1515 */ 1654 */
1516 /*SvGETMAGIC (string);*/ 1655 /*SvGETMAGIC (string);*/
1517 if (SvMAGICAL (string)) 1656 if (SvMAGICAL (string) || !SvPOK (string))
1518 string = sv_2mortal (newSVsv (string)); 1657 string = sv_2mortal (newSVsv (string));
1519 1658
1520 SvUPGRADE (string, SVt_PV); 1659 SvUPGRADE (string, SVt_PV);
1521 1660
1522 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1661 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1539 if (offset > json->max_size && json->max_size) 1678 if (offset > json->max_size && json->max_size)
1540 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1679 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1541 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1680 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1542 } 1681 }
1543 1682
1544 if (json->flags & F_UTF8) 1683 if (DECODE_WANTS_OCTETS (json))
1545 sv_utf8_downgrade (string, 0); 1684 sv_utf8_downgrade (string, 0);
1546 else 1685 else
1547 sv_utf8_upgrade (string); 1686 sv_utf8_upgrade (string);
1548 1687
1549 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1688 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1591 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1730 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1592 LEAVE; 1731 LEAVE;
1593 1732
1594 croak ("%s, at character offset %d (before \"%s\")", 1733 croak ("%s, at character offset %d (before \"%s\")",
1595 dec.err, 1734 dec.err,
1596 ptr_to_index (string, dec.cur), 1735 (int)ptr_to_index (string, dec.cur),
1597 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1598 } 1737 }
1599 1738
1600 sv = sv_2mortal (sv); 1739 sv = sv_2mortal (sv);
1601 1740
… …
1729 self->incr_mode = INCR_M_STR; 1868 self->incr_mode = INCR_M_STR;
1730 goto incr_m_str; 1869 goto incr_m_str;
1731 1870
1732 case '[': 1871 case '[':
1733 case '{': 1872 case '{':
1873 case '(':
1734 if (++self->incr_nest > self->max_depth) 1874 if (++self->incr_nest > self->max_depth)
1735 croak (ERR_NESTING_EXCEEDED); 1875 croak (ERR_NESTING_EXCEEDED);
1736 break; 1876 break;
1737 1877
1738 case ']': 1878 case ']':
1739 case '}': 1879 case '}':
1740 if (--self->incr_nest <= 0) 1880 if (--self->incr_nest <= 0)
1741 goto interrupt; 1881 goto interrupt;
1882 break;
1883
1884 case ')':
1885 --self->incr_nest;
1742 break; 1886 break;
1743 1887
1744 case '#': 1888 case '#':
1745 self->incr_mode = INCR_M_C1; 1889 self->incr_mode = INCR_M_C1;
1746 goto incr_m_c; 1890 goto incr_m_c;
… …
1772 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1773 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1774 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1775 : -1; 1919 : -1;
1776 1920
1777 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1778 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1779 1923
1780 json_true = get_bool ("JSON::XS::true"); 1924 types_true = get_bool ("Types::Serialiser::true");
1781 json_false = get_bool ("JSON::XS::false"); 1925 types_false = get_bool ("Types::Serialiser::false");
1926
1927 sv_json = newSVpv ("JSON", 0);
1928 SvREADONLY_on (sv_json);
1782 1929
1783 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1930 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1784} 1931}
1785 1932
1786PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1787 1934
1788void CLONE (...) 1935void CLONE (...)
1789 CODE: 1936 CODE:
1790 json_stash = 0; 1937 json_stash = 0;
1791 json_boolean_stash = 0; 1938 types_boolean_stash = 0;
1792 1939
1793void new (char *klass) 1940void new (char *klass)
1794 PPCODE: 1941 PPCODE:
1795{ 1942{
1796 SV *pv = NEWSV (0, sizeof (JSON)); 1943 SV *pv = NEWSV (0, sizeof (JSON));
1797 SvPOK_only (pv); 1944 SvPOK_only (pv);
1798 json_init ((JSON *)SvPVX (pv)); 1945 json_init ((JSON *)SvPVX (pv));
1799 XPUSHs (sv_2mortal (sv_bless ( 1946 XPUSHs (sv_2mortal (sv_bless (
1800 newRV_noinc (pv), 1947 newRV_noinc (pv),
1801 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1816 shrink = F_SHRINK 1963 shrink = F_SHRINK
1817 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1818 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1819 relaxed = F_RELAXED 1966 relaxed = F_RELAXED
1820 allow_unknown = F_ALLOW_UNKNOWN 1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1821 PPCODE: 1969 PPCODE:
1822{ 1970{
1823 if (enable) 1971 if (enable)
1824 self->flags |= ix; 1972 self->flags |= ix;
1825 else 1973 else
… …
1841 get_shrink = F_SHRINK 1989 get_shrink = F_SHRINK
1842 get_allow_blessed = F_ALLOW_BLESSED 1990 get_allow_blessed = F_ALLOW_BLESSED
1843 get_convert_blessed = F_CONV_BLESSED 1991 get_convert_blessed = F_CONV_BLESSED
1844 get_relaxed = F_RELAXED 1992 get_relaxed = F_RELAXED
1845 get_allow_unknown = F_ALLOW_UNKNOWN 1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1846 PPCODE: 1995 PPCODE:
1847 XPUSHs (boolSV (self->flags & ix)); 1996 XPUSHs (boolSV (self->flags & ix));
1848 1997
1849void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1850 PPCODE: 1999 PPCODE:
… …
1878} 2027}
1879 2028
1880void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2029void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1881 PPCODE: 2030 PPCODE:
1882{ 2031{
1883 if (!self->cb_sk_object) 2032 if (!self->cb_sk_object)
1884 self->cb_sk_object = newHV (); 2033 self->cb_sk_object = newHV ();
1885 2034
1886 if (SvOK (cb)) 2035 if (SvOK (cb))
1887 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2036 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1888 else 2037 else
… …
1899 XPUSHs (ST (0)); 2048 XPUSHs (ST (0));
1900} 2049}
1901 2050
1902void encode (JSON *self, SV *scalar) 2051void encode (JSON *self, SV *scalar)
1903 PPCODE: 2052 PPCODE:
1904 XPUSHs (encode_json (scalar, self)); 2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2054 XPUSHs (scalar);
1905 2055
1906void decode (JSON *self, SV *jsonstr) 2056void decode (JSON *self, SV *jsonstr)
1907 PPCODE: 2057 PPCODE:
1908 XPUSHs (decode_json (jsonstr, self, 0)); 2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2059 XPUSHs (jsonstr);
1909 2060
1910void decode_prefix (JSON *self, SV *jsonstr) 2061void decode_prefix (JSON *self, SV *jsonstr)
1911 PPCODE: 2062 PPCODE:
1912{ 2063{
2064 SV *sv;
1913 char *offset; 2065 char *offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1914 EXTEND (SP, 2); 2067 EXTEND (SP, 2);
1915 PUSHs (decode_json (jsonstr, self, &offset)); 2068 PUSHs (sv);
1916 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1917} 2070}
1918 2071
1919void incr_parse (JSON *self, SV *jsonstr = 0) 2072void incr_parse (JSON *self, SV *jsonstr = 0)
1920 PPCODE: 2073 PPCODE:
1921{ 2074{
1922 if (!self->incr_text) 2075 if (!self->incr_text)
1923 self->incr_text = newSVpvn ("", 0); 2076 self->incr_text = newSVpvn ("", 0);
2077
2078 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2079 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2080 if (DECODE_WANTS_OCTETS (self))
2081 {
2082 if (self->incr_pos)
2083 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2084 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2085
2086 sv_utf8_downgrade (self->incr_text, 0);
2087 }
2088 else
2089 {
2090 sv_utf8_upgrade (self->incr_text);
2091
2092 if (self->incr_pos)
2093 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2094 - (U8 *)SvPVX (self->incr_text);
2095 }
1924 2096
1925 // append data, if any 2097 // append data, if any
1926 if (jsonstr) 2098 if (jsonstr)
1927 { 2099 {
2100 /* make sure both strings have same encoding */
2101 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1928 if (SvUTF8 (jsonstr)) 2102 if (SvUTF8 (jsonstr))
2103 sv_utf8_downgrade (jsonstr, 0);
1929 { 2104 else
1930 if (!SvUTF8 (self->incr_text))
1931 {
1932 /* utf-8-ness differs, need to upgrade */
1933 sv_utf8_upgrade (self->incr_text);
1934
1935 if (self->incr_pos)
1936 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1937 - (U8 *)SvPVX (self->incr_text);
1938 }
1939 }
1940 else if (SvUTF8 (self->incr_text))
1941 sv_utf8_upgrade (jsonstr); 2105 sv_utf8_upgrade (jsonstr);
1942 2106
2107 /* and then just blindly append */
1943 { 2108 {
1944 STRLEN len; 2109 STRLEN len;
1945 const char *str = SvPV (jsonstr, len); 2110 const char *str = SvPV (jsonstr, len);
1946 STRLEN cur = SvCUR (self->incr_text); 2111 STRLEN cur = SvCUR (self->incr_text);
1947 2112
… …
1955 } 2120 }
1956 2121
1957 if (GIMME_V != G_VOID) 2122 if (GIMME_V != G_VOID)
1958 do 2123 do
1959 { 2124 {
2125 SV *sv;
1960 char *offset; 2126 char *offset;
1961 2127
1962 if (!INCR_DONE (self)) 2128 if (!INCR_DONE (self))
1963 { 2129 {
1964 incr_parse (self); 2130 incr_parse (self);
… …
1966 if (self->incr_pos > self->max_size && self->max_size) 2132 if (self->incr_pos > self->max_size && self->max_size)
1967 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2133 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1968 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2134 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1969 2135
1970 if (!INCR_DONE (self)) 2136 if (!INCR_DONE (self))
2137 {
2138 // as an optimisation, do not accumulate white space in the incr buffer
2139 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2140 {
2141 self->incr_pos = 0;
2142 SvCUR_set (self->incr_text, 0);
2143 }
2144
1971 break; 2145 break;
2146 }
1972 } 2147 }
1973 2148
1974 XPUSHs (decode_json (self->incr_text, self, &offset)); 2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv);
1975 2151
1976 self->incr_pos -= offset - SvPVX (self->incr_text); 2152 self->incr_pos -= offset - SvPVX (self->incr_text);
1977 self->incr_nest = 0; 2153 self->incr_nest = 0;
1978 self->incr_mode = 0; 2154 self->incr_mode = 0;
1979 2155
… …
2023 SvREFCNT_dec (self->incr_text); 2199 SvREFCNT_dec (self->incr_text);
2024 2200
2025PROTOTYPES: ENABLE 2201PROTOTYPES: ENABLE
2026 2202
2027void encode_json (SV *scalar) 2203void encode_json (SV *scalar)
2028 ALIAS:
2029 to_json_ = 0
2030 encode_json = F_UTF8
2031 PPCODE: 2204 PPCODE:
2032{ 2205{
2033 JSON json; 2206 JSON json;
2034 json_init (&json); 2207 json_init (&json);
2035 json.flags |= ix; 2208 json.flags |= F_UTF8;
2036 XPUSHs (encode_json (scalar, &json)); 2209 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2210 XPUSHs (scalar);
2037} 2211}
2038 2212
2039void decode_json (SV *jsonstr) 2213void decode_json (SV *jsonstr)
2040 ALIAS:
2041 from_json_ = 0
2042 decode_json = F_UTF8
2043 PPCODE: 2214 PPCODE:
2044{ 2215{
2045 JSON json; 2216 JSON json;
2046 json_init (&json); 2217 json_init (&json);
2047 json.flags |= ix; 2218 json.flags |= F_UTF8;
2048 XPUSHs (decode_json (jsonstr, &json, 0)); 2219 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2220 XPUSHs (jsonstr);
2049} 2221}
2050 2222

Diff Legend

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