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.107 by root, Wed Mar 17 01:45:43 2010 UTC vs.
Revision 1.124 by root, Mon Nov 24 18:42:51 2014 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
… …
258 } 275 }
259 276
260 // this relies greatly on the quality of the pow () 277 // this relies greatly on the quality of the pow ()
261 // implementation of the platform, but a good 278 // implementation of the platform, but a good
262 // implementation is hard to beat. 279 // implementation is hard to beat.
280 // (IEEE 754 conformant ones are required to be exact)
263 if (postdp) *expo -= eaccum; 281 if (postdp) *expo -= eaccum;
264 *accum += uaccum * Perl_pow (10., *expo); 282 *accum += uaccum * Perl_pow (10., *expo);
265 *expo += eaccum; 283 *expo += eaccum;
266} 284}
267 285
… …
477 495
478 if (enc->indent >= enc->json.max_depth) 496 if (enc->indent >= enc->json.max_depth)
479 croak (ERR_NESTING_EXCEEDED); 497 croak (ERR_NESTING_EXCEEDED);
480 498
481 encode_ch (enc, '['); 499 encode_ch (enc, '[');
482 500
483 if (len >= 0) 501 if (len >= 0)
484 { 502 {
485 encode_nl (enc); ++enc->indent; 503 encode_nl (enc); ++enc->indent;
486 504
487 for (i = 0; i <= len; ++i) 505 for (i = 0; i <= len; ++i)
… …
499 encode_comma (enc); 517 encode_comma (enc);
500 } 518 }
501 519
502 encode_nl (enc); --enc->indent; encode_indent (enc); 520 encode_nl (enc); --enc->indent; encode_indent (enc);
503 } 521 }
504 522
505 encode_ch (enc, ']'); 523 encode_ch (enc, ']');
506} 524}
507 525
508static void 526static void
509encode_hk (enc_t *enc, HE *he) 527encode_hk (enc_t *enc, HE *he)
… …
513 if (HeKLEN (he) == HEf_SVKEY) 531 if (HeKLEN (he) == HEf_SVKEY)
514 { 532 {
515 SV *sv = HeSVKEY (he); 533 SV *sv = HeSVKEY (he);
516 STRLEN len; 534 STRLEN len;
517 char *str; 535 char *str;
518 536
519 SvGETMAGIC (sv); 537 SvGETMAGIC (sv);
520 str = SvPV (sv, len); 538 str = SvPV (sv, len);
521 539
522 encode_str (enc, str, len, SvUTF8 (sv)); 540 encode_str (enc, str, len, SvUTF8 (sv));
523 } 541 }
… …
589 } 607 }
590 608
591 if (count) 609 if (count)
592 { 610 {
593 int i, fast = 1; 611 int i, fast = 1;
594#if defined(__BORLANDC__) || defined(_MSC_VER) 612 HE *hes_stack [STACK_HES];
595 HE **hes = _alloca (count * sizeof (HE)); 613 HE **hes = hes_stack;
596#else 614
597 HE *hes [count]; // if your compiler dies here, you need to enable C99 mode 615 // allocate larger arrays on the heap
598#endif 616 if (count > STACK_HES)
617 {
618 SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
619 hes = (HE **)SvPVX (sv);
620 }
599 621
600 i = 0; 622 i = 0;
601 while ((he = hv_iternext (hv))) 623 while ((he = hv_iternext (hv)))
602 { 624 {
603 hes [i++] = he; 625 hes [i++] = he;
… …
672// encode objects, arrays and special \0=false and \1=true values. 694// encode objects, arrays and special \0=false and \1=true values.
673static void 695static void
674encode_rv (enc_t *enc, SV *sv) 696encode_rv (enc_t *enc, SV *sv)
675{ 697{
676 svtype svt; 698 svtype svt;
699 GV *method;
677 700
678 SvGETMAGIC (sv); 701 SvGETMAGIC (sv);
679 svt = SvTYPE (sv); 702 svt = SvTYPE (sv);
680 703
681 if (expect_false (SvOBJECT (sv))) 704 if (expect_false (SvOBJECT (sv)))
682 { 705 {
683 HV *stash = !JSON_SLOW || json_boolean_stash 706 HV *boolean_stash = !JSON_SLOW || types_boolean_stash
684 ? json_boolean_stash 707 ? types_boolean_stash
685 : gv_stashpv ("JSON::XS::Boolean", 1); 708 : gv_stashpv ("Types::Serialiser::Boolean", 1);
709 HV *stash = SvSTASH (sv);
686 710
687 if (SvSTASH (sv) == stash) 711 if (stash == boolean_stash)
688 { 712 {
689 if (SvIV (sv)) 713 if (SvIV (sv))
690 encode_str (enc, "true", 4, 0); 714 encode_str (enc, "true", 4, 0);
691 else 715 else
692 encode_str (enc, "false", 5, 0); 716 encode_str (enc, "false", 5, 0);
693 } 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::FREEZE 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);
694 else 784 else
695 {
696#if 0
697 if (0 && sv_derived_from (rv, "JSON::Literal"))
698 {
699 // not yet
700 }
701#endif
702 if (enc->json.flags & F_CONV_BLESSED)
703 {
704 // we re-bless the reference to get overload and other niceties right
705 GV *to_json = gv_fetchmethod_autoload (SvSTASH (sv), "TO_JSON", 0);
706
707 if (to_json)
708 {
709 dSP;
710
711 ENTER; SAVETMPS; PUSHMARK (SP);
712 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
713
714 // calling with G_SCALAR ensures that we always get a 1 return value
715 PUTBACK;
716 call_sv ((SV *)GvCV (to_json), G_SCALAR);
717 SPAGAIN;
718
719 // catch this surprisingly common error
720 if (SvROK (TOPs) && SvRV (TOPs) == sv)
721 croak ("%s::TO_JSON method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
722
723 sv = POPs;
724 PUTBACK;
725
726 encode_sv (enc, sv);
727
728 FREETMPS; LEAVE;
729 }
730 else if (enc->json.flags & F_ALLOW_BLESSED)
731 encode_str (enc, "null", 4, 0);
732 else
733 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_JSON method available on it",
734 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
735 }
736 else if (enc->json.flags & F_ALLOW_BLESSED)
737 encode_str (enc, "null", 4, 0);
738 else
739 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)",
740 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 786 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
741 }
742 } 787 }
743 else if (svt == SVt_PVHV) 788 else if (svt == SVt_PVHV)
744 encode_hv (enc, (HV *)sv); 789 encode_hv (enc, (HV *)sv);
745 else if (svt == SVt_PVAV) 790 else if (svt == SVt_PVAV)
746 encode_av (enc, (AV *)sv); 791 encode_av (enc, (AV *)sv);
… …
822 } 867 }
823 else 868 else
824 { 869 {
825 // large integer, use the (rather slow) snprintf way. 870 // large integer, use the (rather slow) snprintf way.
826 need (enc, IVUV_MAXCHARS); 871 need (enc, IVUV_MAXCHARS);
827 enc->cur += 872 enc->cur +=
828 SvIsUV(sv) 873 SvIsUV(sv)
829 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv)) 874 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
830 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv)); 875 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
831 } 876 }
832 } 877 }
833 else if (SvROK (sv)) 878 else if (SvROK (sv))
834 encode_rv (enc, SvRV (sv)); 879 encode_rv (enc, SvRV (sv));
835 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN) 880 else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
836 encode_str (enc, "null", 4, 0); 881 encode_str (enc, "null", 4, 0);
837 else 882 else
838 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",
839 SvPV_nolen (sv), SvFLAGS (sv)); 884 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
840} 885}
841 886
842static SV * 887static SV *
843encode_json (SV *scalar, JSON *json) 888encode_json (SV *scalar, JSON *json)
844{ 889{
… …
1059 *cur++ = *dec_cur++; 1104 *cur++ = *dec_cur++;
1060 while (--clen); 1105 while (--clen);
1061 1106
1062 utf8 = 1; 1107 utf8 = 1;
1063 } 1108 }
1109 else if (ch == '\t' && dec->json.flags & F_RELAXED)
1110 *cur++ = ch;
1064 else 1111 else
1065 { 1112 {
1066 --dec_cur; 1113 --dec_cur;
1067 1114
1068 if (!ch) 1115 if (!ch)
… …
1256 if (*dec->cur == ']') 1303 if (*dec->cur == ']')
1257 { 1304 {
1258 ++dec->cur; 1305 ++dec->cur;
1259 break; 1306 break;
1260 } 1307 }
1261 1308
1262 if (*dec->cur != ',') 1309 if (*dec->cur != ',')
1263 ERR (", or ] expected while parsing array"); 1310 ERR (", or ] expected while parsing array");
1264 1311
1265 ++dec->cur; 1312 ++dec->cur;
1266 1313
… …
1448 DEC_DEC_DEPTH; 1495 DEC_DEC_DEPTH;
1449 return 0; 1496 return 0;
1450} 1497}
1451 1498
1452static SV * 1499static SV *
1500decode_tag (dec_t *dec)
1501{
1502 SV *tag = 0;
1503 SV *val = 0;
1504
1505 if (!(dec->json.flags & F_ALLOW_TAGS))
1506 ERR ("malformed JSON string, neither array, object, number, string or atom");
1507
1508 ++dec->cur;
1509
1510 decode_ws (dec);
1511
1512 tag = decode_sv (dec);
1513 if (!tag)
1514 goto fail;
1515
1516 if (!SvPOK (tag))
1517 ERR ("malformed JSON string, (tag) must be a string");
1518
1519 decode_ws (dec);
1520
1521 if (*dec->cur != ')')
1522 ERR (") expected after tag");
1523
1524 ++dec->cur;
1525
1526 decode_ws (dec);
1527
1528 val = decode_sv (dec);
1529 if (!val)
1530 goto fail;
1531
1532 if (!SvROK (val) || SvTYPE (SvRV (val)) != SVt_PVAV)
1533 ERR ("malformed JSON string, tag value must be an array");
1534
1535 {
1536 AV *av = (AV *)SvRV (val);
1537 int i, len = av_len (av) + 1;
1538 HV *stash = gv_stashsv (tag, 0);
1539 SV *sv;
1540
1541 if (!stash)
1542 ERR ("cannot decode perl-object (package does not exist)");
1543
1544 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1545
1546 if (!method)
1547 ERR ("cannot decode perl-object (package does not have a THAW method)");
1548
1549 dSP;
1550
1551 ENTER; SAVETMPS; PUSHMARK (SP);
1552 EXTEND (SP, len + 2);
1553 // we re-bless the reference to get overload and other niceties right
1554 PUSHs (tag);
1555 PUSHs (sv_json);
1556
1557 for (i = 0; i < len; ++i)
1558 PUSHs (*av_fetch (av, i, 1));
1559
1560 PUTBACK;
1561 call_sv ((SV *)GvCV (method), G_SCALAR);
1562 SPAGAIN;
1563
1564 SvREFCNT_dec (tag);
1565 SvREFCNT_dec (val);
1566 sv = SvREFCNT_inc (POPs);
1567
1568 PUTBACK;
1569
1570 FREETMPS; LEAVE;
1571
1572 return sv;
1573 }
1574
1575fail:
1576 SvREFCNT_dec (tag);
1577 SvREFCNT_dec (val);
1578 return 0;
1579}
1580
1581static SV *
1453decode_sv (dec_t *dec) 1582decode_sv (dec_t *dec)
1454{ 1583{
1455 // the beauty of JSON: you need exactly one character lookahead 1584 // the beauty of JSON: you need exactly one character lookahead
1456 // to parse everything. 1585 // to parse everything.
1457 switch (*dec->cur) 1586 switch (*dec->cur)
1458 { 1587 {
1459 case '"': ++dec->cur; return decode_str (dec); 1588 case '"': ++dec->cur; return decode_str (dec);
1460 case '[': ++dec->cur; return decode_av (dec); 1589 case '[': ++dec->cur; return decode_av (dec);
1461 case '{': ++dec->cur; return decode_hv (dec); 1590 case '{': ++dec->cur; return decode_hv (dec);
1591 case '(': return decode_tag (dec);
1462 1592
1463 case '-': 1593 case '-':
1464 case '0': case '1': case '2': case '3': case '4': 1594 case '0': case '1': case '2': case '3': case '4':
1465 case '5': case '6': case '7': case '8': case '9': 1595 case '5': case '6': case '7': case '8': case '9':
1466 return decode_num (dec); 1596 return decode_num (dec);
… …
1468 case 't': 1598 case 't':
1469 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1599 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1470 { 1600 {
1471 dec->cur += 4; 1601 dec->cur += 4;
1472#if JSON_SLOW 1602#if JSON_SLOW
1473 json_true = get_bool ("JSON::XS::true"); 1603 types_true = get_bool ("Types::Serialiser::true");
1474#endif 1604#endif
1475 return newSVsv (json_true); 1605 return newSVsv (types_true);
1476 } 1606 }
1477 else 1607 else
1478 ERR ("'true' expected"); 1608 ERR ("'true' expected");
1479 1609
1480 break; 1610 break;
… …
1482 case 'f': 1612 case 'f':
1483 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1613 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1484 { 1614 {
1485 dec->cur += 5; 1615 dec->cur += 5;
1486#if JSON_SLOW 1616#if JSON_SLOW
1487 json_false = get_bool ("JSON::XS::false"); 1617 types_false = get_bool ("Types::Serialiser::false");
1488#endif 1618#endif
1489 return newSVsv (json_false); 1619 return newSVsv (types_false);
1490 } 1620 }
1491 else 1621 else
1492 ERR ("'false' expected"); 1622 ERR ("'false' expected");
1493 1623
1494 break; 1624 break;
… …
1503 ERR ("'null' expected"); 1633 ERR ("'null' expected");
1504 1634
1505 break; 1635 break;
1506 1636
1507 default: 1637 default:
1508 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1638 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1509 break; 1639 break;
1510 } 1640 }
1511 1641
1512fail: 1642fail:
1513 return 0; 1643 return 0;
… …
1518{ 1648{
1519 dec_t dec; 1649 dec_t dec;
1520 SV *sv; 1650 SV *sv;
1521 1651
1522 /* work around bugs in 5.10 where manipulating magic values 1652 /* work around bugs in 5.10 where manipulating magic values
1523 * will perl ignore the magic in subsequent accesses 1653 * makes perl ignore the magic in subsequent accesses.
1654 * also make a copy of non-PV values, to get them into a clean
1655 * state (SvPV should do that, but it's buggy, see below).
1524 */ 1656 */
1525 /*SvGETMAGIC (string);*/ 1657 /*SvGETMAGIC (string);*/
1526 if (SvMAGICAL (string)) 1658 if (SvMAGICAL (string) || !SvPOK (string))
1527 string = sv_2mortal (newSVsv (string)); 1659 string = sv_2mortal (newSVsv (string));
1528 1660
1529 SvUPGRADE (string, SVt_PV); 1661 SvUPGRADE (string, SVt_PV);
1530 1662
1531 /* work around a bug in perl 5.10, which causes SvCUR to fail an 1663 /* work around a bug in perl 5.10, which causes SvCUR to fail an
… …
1548 if (offset > json->max_size && json->max_size) 1680 if (offset > json->max_size && json->max_size)
1549 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 1681 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1550 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1682 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1551 } 1683 }
1552 1684
1553 if (json->flags & F_UTF8) 1685 if (DECODE_WANTS_OCTETS (json))
1554 sv_utf8_downgrade (string, 0); 1686 sv_utf8_downgrade (string, 0);
1555 else 1687 else
1556 sv_utf8_upgrade (string); 1688 sv_utf8_upgrade (string);
1557 1689
1558 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1690 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1600 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ); 1732 pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
1601 LEAVE; 1733 LEAVE;
1602 1734
1603 croak ("%s, at character offset %d (before \"%s\")", 1735 croak ("%s, at character offset %d (before \"%s\")",
1604 dec.err, 1736 dec.err,
1605 ptr_to_index (string, dec.cur), 1737 (int)ptr_to_index (string, dec.cur),
1606 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1738 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1607 } 1739 }
1608 1740
1609 sv = sv_2mortal (sv); 1741 sv = sv_2mortal (sv);
1610 1742
… …
1738 self->incr_mode = INCR_M_STR; 1870 self->incr_mode = INCR_M_STR;
1739 goto incr_m_str; 1871 goto incr_m_str;
1740 1872
1741 case '[': 1873 case '[':
1742 case '{': 1874 case '{':
1875 case '(':
1743 if (++self->incr_nest > self->max_depth) 1876 if (++self->incr_nest > self->max_depth)
1744 croak (ERR_NESTING_EXCEEDED); 1877 croak (ERR_NESTING_EXCEEDED);
1745 break; 1878 break;
1746 1879
1747 case ']': 1880 case ']':
1748 case '}': 1881 case '}':
1749 if (--self->incr_nest <= 0) 1882 if (--self->incr_nest <= 0)
1750 goto interrupt; 1883 goto interrupt;
1884 break;
1885
1886 case ')':
1887 --self->incr_nest;
1751 break; 1888 break;
1752 1889
1753 case '#': 1890 case '#':
1754 self->incr_mode = INCR_M_C1; 1891 self->incr_mode = INCR_M_C1;
1755 goto incr_m_c; 1892 goto incr_m_c;
… …
1781 i >= '0' && i <= '9' ? i - '0' 1918 i >= '0' && i <= '9' ? i - '0'
1782 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1919 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1783 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1920 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1784 : -1; 1921 : -1;
1785 1922
1786 json_stash = gv_stashpv ("JSON::XS" , 1); 1923 json_stash = gv_stashpv ("JSON::XS" , 1);
1787 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1924 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1788 1925
1789 json_true = get_bool ("JSON::XS::true"); 1926 types_true = get_bool ("Types::Serialiser::true");
1790 json_false = get_bool ("JSON::XS::false"); 1927 types_false = get_bool ("Types::Serialiser::false");
1928
1929 sv_json = newSVpv ("JSON", 0);
1930 SvREADONLY_on (sv_json);
1791 1931
1792 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */ 1932 CvNODEBUG_on (get_cv ("JSON::XS::incr_text", 0)); /* the debugger completely breaks lvalue subs */
1793} 1933}
1794 1934
1795PROTOTYPES: DISABLE 1935PROTOTYPES: DISABLE
1796 1936
1797void CLONE (...) 1937void CLONE (...)
1798 CODE: 1938 CODE:
1799 json_stash = 0; 1939 json_stash = 0;
1800 json_boolean_stash = 0; 1940 types_boolean_stash = 0;
1801 1941
1802void new (char *klass) 1942void new (char *klass)
1803 PPCODE: 1943 PPCODE:
1804{ 1944{
1805 SV *pv = NEWSV (0, sizeof (JSON)); 1945 SV *pv = NEWSV (0, sizeof (JSON));
1806 SvPOK_only (pv); 1946 SvPOK_only (pv);
1807 json_init ((JSON *)SvPVX (pv)); 1947 json_init ((JSON *)SvPVX (pv));
1808 XPUSHs (sv_2mortal (sv_bless ( 1948 XPUSHs (sv_2mortal (sv_bless (
1809 newRV_noinc (pv), 1949 newRV_noinc (pv),
1810 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1950 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1825 shrink = F_SHRINK 1965 shrink = F_SHRINK
1826 allow_blessed = F_ALLOW_BLESSED 1966 allow_blessed = F_ALLOW_BLESSED
1827 convert_blessed = F_CONV_BLESSED 1967 convert_blessed = F_CONV_BLESSED
1828 relaxed = F_RELAXED 1968 relaxed = F_RELAXED
1829 allow_unknown = F_ALLOW_UNKNOWN 1969 allow_unknown = F_ALLOW_UNKNOWN
1970 allow_tags = F_ALLOW_TAGS
1830 PPCODE: 1971 PPCODE:
1831{ 1972{
1832 if (enable) 1973 if (enable)
1833 self->flags |= ix; 1974 self->flags |= ix;
1834 else 1975 else
… …
1850 get_shrink = F_SHRINK 1991 get_shrink = F_SHRINK
1851 get_allow_blessed = F_ALLOW_BLESSED 1992 get_allow_blessed = F_ALLOW_BLESSED
1852 get_convert_blessed = F_CONV_BLESSED 1993 get_convert_blessed = F_CONV_BLESSED
1853 get_relaxed = F_RELAXED 1994 get_relaxed = F_RELAXED
1854 get_allow_unknown = F_ALLOW_UNKNOWN 1995 get_allow_unknown = F_ALLOW_UNKNOWN
1996 get_allow_tags = F_ALLOW_TAGS
1855 PPCODE: 1997 PPCODE:
1856 XPUSHs (boolSV (self->flags & ix)); 1998 XPUSHs (boolSV (self->flags & ix));
1857 1999
1858void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 2000void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1859 PPCODE: 2001 PPCODE:
… …
1887} 2029}
1888 2030
1889void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef) 2031void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
1890 PPCODE: 2032 PPCODE:
1891{ 2033{
1892 if (!self->cb_sk_object) 2034 if (!self->cb_sk_object)
1893 self->cb_sk_object = newHV (); 2035 self->cb_sk_object = newHV ();
1894 2036
1895 if (SvOK (cb)) 2037 if (SvOK (cb))
1896 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2038 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1897 else 2039 else
… …
1908 XPUSHs (ST (0)); 2050 XPUSHs (ST (0));
1909} 2051}
1910 2052
1911void encode (JSON *self, SV *scalar) 2053void encode (JSON *self, SV *scalar)
1912 PPCODE: 2054 PPCODE:
1913 XPUSHs (encode_json (scalar, self)); 2055 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2056 XPUSHs (scalar);
1914 2057
1915void decode (JSON *self, SV *jsonstr) 2058void decode (JSON *self, SV *jsonstr)
1916 PPCODE: 2059 PPCODE:
1917 XPUSHs (decode_json (jsonstr, self, 0)); 2060 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2061 XPUSHs (jsonstr);
1918 2062
1919void decode_prefix (JSON *self, SV *jsonstr) 2063void decode_prefix (JSON *self, SV *jsonstr)
1920 PPCODE: 2064 PPCODE:
1921{ 2065{
2066 SV *sv;
1922 char *offset; 2067 char *offset;
2068 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1923 EXTEND (SP, 2); 2069 EXTEND (SP, 2);
1924 PUSHs (decode_json (jsonstr, self, &offset)); 2070 PUSHs (sv);
1925 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2071 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1926} 2072}
1927 2073
1928void incr_parse (JSON *self, SV *jsonstr = 0) 2074void incr_parse (JSON *self, SV *jsonstr = 0)
1929 PPCODE: 2075 PPCODE:
1930{ 2076{
1931 if (!self->incr_text) 2077 if (!self->incr_text)
1932 self->incr_text = newSVpvn ("", 0); 2078 self->incr_text = newSVpvn ("", 0);
2079
2080 /* if utf8-ness doesn't match the decoder, need to upgrade/downgrade */
2081 if (!DECODE_WANTS_OCTETS (self) == !SvUTF8 (self->incr_text))
2082 if (DECODE_WANTS_OCTETS (self))
2083 {
2084 if (self->incr_pos)
2085 self->incr_pos = utf8_length ((U8 *)SvPVX (self->incr_text),
2086 (U8 *)SvPVX (self->incr_text) + self->incr_pos);
2087
2088 sv_utf8_downgrade (self->incr_text, 0);
2089 }
2090 else
2091 {
2092 sv_utf8_upgrade (self->incr_text);
2093
2094 if (self->incr_pos)
2095 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
2096 - (U8 *)SvPVX (self->incr_text);
2097 }
1933 2098
1934 // append data, if any 2099 // append data, if any
1935 if (jsonstr) 2100 if (jsonstr)
1936 { 2101 {
2102 /* make sure both strings have same encoding */
2103 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1937 if (SvUTF8 (jsonstr)) 2104 if (SvUTF8 (jsonstr))
2105 sv_utf8_downgrade (jsonstr, 0);
1938 { 2106 else
1939 if (!SvUTF8 (self->incr_text))
1940 {
1941 /* utf-8-ness differs, need to upgrade */
1942 sv_utf8_upgrade (self->incr_text);
1943
1944 if (self->incr_pos)
1945 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1946 - (U8 *)SvPVX (self->incr_text);
1947 }
1948 }
1949 else if (SvUTF8 (self->incr_text))
1950 sv_utf8_upgrade (jsonstr); 2107 sv_utf8_upgrade (jsonstr);
1951 2108
2109 /* and then just blindly append */
1952 { 2110 {
1953 STRLEN len; 2111 STRLEN len;
1954 const char *str = SvPV (jsonstr, len); 2112 const char *str = SvPV (jsonstr, len);
1955 STRLEN cur = SvCUR (self->incr_text); 2113 STRLEN cur = SvCUR (self->incr_text);
1956 2114
… …
1964 } 2122 }
1965 2123
1966 if (GIMME_V != G_VOID) 2124 if (GIMME_V != G_VOID)
1967 do 2125 do
1968 { 2126 {
2127 SV *sv;
1969 char *offset; 2128 char *offset;
1970 2129
1971 if (!INCR_DONE (self)) 2130 if (!INCR_DONE (self))
1972 { 2131 {
1973 incr_parse (self); 2132 incr_parse (self);
… …
1975 if (self->incr_pos > self->max_size && self->max_size) 2134 if (self->incr_pos > self->max_size && self->max_size)
1976 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu", 2135 croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
1977 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2136 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1978 2137
1979 if (!INCR_DONE (self)) 2138 if (!INCR_DONE (self))
2139 {
2140 // as an optimisation, do not accumulate white space in the incr buffer
2141 if (self->incr_mode == INCR_M_WS && self->incr_pos)
2142 {
2143 self->incr_pos = 0;
2144 SvCUR_set (self->incr_text, 0);
2145 }
2146
1980 break; 2147 break;
2148 }
1981 } 2149 }
1982 2150
1983 XPUSHs (decode_json (self->incr_text, self, &offset)); 2151 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2152 XPUSHs (sv);
1984 2153
1985 self->incr_pos -= offset - SvPVX (self->incr_text); 2154 self->incr_pos -= offset - SvPVX (self->incr_text);
1986 self->incr_nest = 0; 2155 self->incr_nest = 0;
1987 self->incr_mode = 0; 2156 self->incr_mode = 0;
1988 2157
… …
2032 SvREFCNT_dec (self->incr_text); 2201 SvREFCNT_dec (self->incr_text);
2033 2202
2034PROTOTYPES: ENABLE 2203PROTOTYPES: ENABLE
2035 2204
2036void encode_json (SV *scalar) 2205void encode_json (SV *scalar)
2037 ALIAS:
2038 to_json_ = 0
2039 encode_json = F_UTF8
2040 PPCODE: 2206 PPCODE:
2041{ 2207{
2042 JSON json; 2208 JSON json;
2043 json_init (&json); 2209 json_init (&json);
2044 json.flags |= ix; 2210 json.flags |= F_UTF8;
2045 XPUSHs (encode_json (scalar, &json)); 2211 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2212 XPUSHs (scalar);
2046} 2213}
2047 2214
2048void decode_json (SV *jsonstr) 2215void decode_json (SV *jsonstr)
2049 ALIAS:
2050 from_json_ = 0
2051 decode_json = F_UTF8
2052 PPCODE: 2216 PPCODE:
2053{ 2217{
2054 JSON json; 2218 JSON json;
2055 json_init (&json); 2219 json_init (&json);
2056 json.flags |= ix; 2220 json.flags |= F_UTF8;
2057 XPUSHs (decode_json (jsonstr, &json, 0)); 2221 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2222 XPUSHs (jsonstr);
2058} 2223}
2059 2224

Diff Legend

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