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.106 by root, Tue Jan 19 01:36:34 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
… …
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::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);
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{
… …
1256 if (*dec->cur == ']') 1301 if (*dec->cur == ']')
1257 { 1302 {
1258 ++dec->cur; 1303 ++dec->cur;
1259 break; 1304 break;
1260 } 1305 }
1261 1306
1262 if (*dec->cur != ',') 1307 if (*dec->cur != ',')
1263 ERR (", or ] expected while parsing array"); 1308 ERR (", or ] expected while parsing array");
1264 1309
1265 ++dec->cur; 1310 ++dec->cur;
1266 1311
… …
1401 dSP; 1446 dSP;
1402 int count; 1447 int count;
1403 1448
1404 ENTER; SAVETMPS; PUSHMARK (SP); 1449 ENTER; SAVETMPS; PUSHMARK (SP);
1405 XPUSHs (HeVAL (he)); 1450 XPUSHs (HeVAL (he));
1451 sv_2mortal (sv);
1406 1452
1407 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; 1453 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
1408 1454
1409 if (count == 1) 1455 if (count == 1)
1410 { 1456 {
1411 sv = newSVsv (POPs); 1457 sv = newSVsv (POPs);
1412 FREETMPS; LEAVE; 1458 FREETMPS; LEAVE;
1413 return sv; 1459 return sv;
1414 } 1460 }
1415 1461
1462 SvREFCNT_inc (sv);
1416 FREETMPS; LEAVE; 1463 FREETMPS; LEAVE;
1417 } 1464 }
1418 } 1465 }
1419 1466
1420 if (dec->json.cb_object) 1467 if (dec->json.cb_object)
… …
1446 DEC_DEC_DEPTH; 1493 DEC_DEC_DEPTH;
1447 return 0; 1494 return 0;
1448} 1495}
1449 1496
1450static 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 *
1451decode_sv (dec_t *dec) 1580decode_sv (dec_t *dec)
1452{ 1581{
1453 // the beauty of JSON: you need exactly one character lookahead 1582 // the beauty of JSON: you need exactly one character lookahead
1454 // to parse everything. 1583 // to parse everything.
1455 switch (*dec->cur) 1584 switch (*dec->cur)
1456 { 1585 {
1457 case '"': ++dec->cur; return decode_str (dec); 1586 case '"': ++dec->cur; return decode_str (dec);
1458 case '[': ++dec->cur; return decode_av (dec); 1587 case '[': ++dec->cur; return decode_av (dec);
1459 case '{': ++dec->cur; return decode_hv (dec); 1588 case '{': ++dec->cur; return decode_hv (dec);
1589 case '(': return decode_tag (dec);
1460 1590
1461 case '-': 1591 case '-':
1462 case '0': case '1': case '2': case '3': case '4': 1592 case '0': case '1': case '2': case '3': case '4':
1463 case '5': case '6': case '7': case '8': case '9': 1593 case '5': case '6': case '7': case '8': case '9':
1464 return decode_num (dec); 1594 return decode_num (dec);
… …
1466 case 't': 1596 case 't':
1467 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) 1597 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
1468 { 1598 {
1469 dec->cur += 4; 1599 dec->cur += 4;
1470#if JSON_SLOW 1600#if JSON_SLOW
1471 json_true = get_bool ("JSON::XS::true"); 1601 types_true = get_bool ("Types::Serialiser::true");
1472#endif 1602#endif
1473 return newSVsv (json_true); 1603 return newSVsv (types_true);
1474 } 1604 }
1475 else 1605 else
1476 ERR ("'true' expected"); 1606 ERR ("'true' expected");
1477 1607
1478 break; 1608 break;
… …
1480 case 'f': 1610 case 'f':
1481 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) 1611 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
1482 { 1612 {
1483 dec->cur += 5; 1613 dec->cur += 5;
1484#if JSON_SLOW 1614#if JSON_SLOW
1485 json_false = get_bool ("JSON::XS::false"); 1615 types_false = get_bool ("Types::Serialiser::false");
1486#endif 1616#endif
1487 return newSVsv (json_false); 1617 return newSVsv (types_false);
1488 } 1618 }
1489 else 1619 else
1490 ERR ("'false' expected"); 1620 ERR ("'false' expected");
1491 1621
1492 break; 1622 break;
… …
1501 ERR ("'null' expected"); 1631 ERR ("'null' expected");
1502 1632
1503 break; 1633 break;
1504 1634
1505 default: 1635 default:
1506 ERR ("malformed JSON string, neither array, object, number, string or atom"); 1636 ERR ("malformed JSON string, neither tag, array, object, number, string or atom");
1507 break; 1637 break;
1508 } 1638 }
1509 1639
1510fail: 1640fail:
1511 return 0; 1641 return 0;
… …
1516{ 1646{
1517 dec_t dec; 1647 dec_t dec;
1518 SV *sv; 1648 SV *sv;
1519 1649
1520 /* work around bugs in 5.10 where manipulating magic values 1650 /* work around bugs in 5.10 where manipulating magic values
1521 * 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).
1522 */ 1654 */
1523 /*SvGETMAGIC (string);*/ 1655 /*SvGETMAGIC (string);*/
1524 if (SvMAGICAL (string)) 1656 if (SvMAGICAL (string) || !SvPOK (string))
1525 string = sv_2mortal (newSVsv (string)); 1657 string = sv_2mortal (newSVsv (string));
1526 1658
1527 SvUPGRADE (string, SVt_PV); 1659 SvUPGRADE (string, SVt_PV);
1528 1660
1529 /* 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
… …
1546 if (offset > json->max_size && json->max_size) 1678 if (offset > json->max_size && json->max_size)
1547 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",
1548 (unsigned long)SvCUR (string), (unsigned long)json->max_size); 1680 (unsigned long)SvCUR (string), (unsigned long)json->max_size);
1549 } 1681 }
1550 1682
1551 if (json->flags & F_UTF8) 1683 if (DECODE_WANTS_OCTETS (json))
1552 sv_utf8_downgrade (string, 0); 1684 sv_utf8_downgrade (string, 0);
1553 else 1685 else
1554 sv_utf8_upgrade (string); 1686 sv_utf8_upgrade (string);
1555 1687
1556 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP 1688 SvGROW (string, SvCUR (string) + 1); // should basically be a NOP
… …
1598 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);
1599 LEAVE; 1731 LEAVE;
1600 1732
1601 croak ("%s, at character offset %d (before \"%s\")", 1733 croak ("%s, at character offset %d (before \"%s\")",
1602 dec.err, 1734 dec.err,
1603 ptr_to_index (string, dec.cur), 1735 (int)ptr_to_index (string, dec.cur),
1604 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)"); 1736 dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
1605 } 1737 }
1606 1738
1607 sv = sv_2mortal (sv); 1739 sv = sv_2mortal (sv);
1608 1740
… …
1736 self->incr_mode = INCR_M_STR; 1868 self->incr_mode = INCR_M_STR;
1737 goto incr_m_str; 1869 goto incr_m_str;
1738 1870
1739 case '[': 1871 case '[':
1740 case '{': 1872 case '{':
1873 case '(':
1741 if (++self->incr_nest > self->max_depth) 1874 if (++self->incr_nest > self->max_depth)
1742 croak (ERR_NESTING_EXCEEDED); 1875 croak (ERR_NESTING_EXCEEDED);
1743 break; 1876 break;
1744 1877
1745 case ']': 1878 case ']':
1746 case '}': 1879 case '}':
1747 if (--self->incr_nest <= 0) 1880 if (--self->incr_nest <= 0)
1748 goto interrupt; 1881 goto interrupt;
1882 break;
1883
1884 case ')':
1885 --self->incr_nest;
1749 break; 1886 break;
1750 1887
1751 case '#': 1888 case '#':
1752 self->incr_mode = INCR_M_C1; 1889 self->incr_mode = INCR_M_C1;
1753 goto incr_m_c; 1890 goto incr_m_c;
… …
1779 i >= '0' && i <= '9' ? i - '0' 1916 i >= '0' && i <= '9' ? i - '0'
1780 : i >= 'a' && i <= 'f' ? i - 'a' + 10 1917 : i >= 'a' && i <= 'f' ? i - 'a' + 10
1781 : i >= 'A' && i <= 'F' ? i - 'A' + 10 1918 : i >= 'A' && i <= 'F' ? i - 'A' + 10
1782 : -1; 1919 : -1;
1783 1920
1784 json_stash = gv_stashpv ("JSON::XS" , 1); 1921 json_stash = gv_stashpv ("JSON::XS" , 1);
1785 json_boolean_stash = gv_stashpv ("JSON::XS::Boolean", 1); 1922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1786 1923
1787 json_true = get_bool ("JSON::XS::true"); 1924 types_true = get_bool ("Types::Serialiser::true");
1788 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);
1789 1929
1790 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 */
1791} 1931}
1792 1932
1793PROTOTYPES: DISABLE 1933PROTOTYPES: DISABLE
1794 1934
1795void CLONE (...) 1935void CLONE (...)
1796 CODE: 1936 CODE:
1797 json_stash = 0; 1937 json_stash = 0;
1798 json_boolean_stash = 0; 1938 types_boolean_stash = 0;
1799 1939
1800void new (char *klass) 1940void new (char *klass)
1801 PPCODE: 1941 PPCODE:
1802{ 1942{
1803 SV *pv = NEWSV (0, sizeof (JSON)); 1943 SV *pv = NEWSV (0, sizeof (JSON));
1804 SvPOK_only (pv); 1944 SvPOK_only (pv);
1805 json_init ((JSON *)SvPVX (pv)); 1945 json_init ((JSON *)SvPVX (pv));
1806 XPUSHs (sv_2mortal (sv_bless ( 1946 XPUSHs (sv_2mortal (sv_bless (
1807 newRV_noinc (pv), 1947 newRV_noinc (pv),
1808 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1) 1948 strEQ (klass, "JSON::XS") ? JSON_STASH : gv_stashpv (klass, 1)
… …
1823 shrink = F_SHRINK 1963 shrink = F_SHRINK
1824 allow_blessed = F_ALLOW_BLESSED 1964 allow_blessed = F_ALLOW_BLESSED
1825 convert_blessed = F_CONV_BLESSED 1965 convert_blessed = F_CONV_BLESSED
1826 relaxed = F_RELAXED 1966 relaxed = F_RELAXED
1827 allow_unknown = F_ALLOW_UNKNOWN 1967 allow_unknown = F_ALLOW_UNKNOWN
1968 allow_tags = F_ALLOW_TAGS
1828 PPCODE: 1969 PPCODE:
1829{ 1970{
1830 if (enable) 1971 if (enable)
1831 self->flags |= ix; 1972 self->flags |= ix;
1832 else 1973 else
… …
1848 get_shrink = F_SHRINK 1989 get_shrink = F_SHRINK
1849 get_allow_blessed = F_ALLOW_BLESSED 1990 get_allow_blessed = F_ALLOW_BLESSED
1850 get_convert_blessed = F_CONV_BLESSED 1991 get_convert_blessed = F_CONV_BLESSED
1851 get_relaxed = F_RELAXED 1992 get_relaxed = F_RELAXED
1852 get_allow_unknown = F_ALLOW_UNKNOWN 1993 get_allow_unknown = F_ALLOW_UNKNOWN
1994 get_allow_tags = F_ALLOW_TAGS
1853 PPCODE: 1995 PPCODE:
1854 XPUSHs (boolSV (self->flags & ix)); 1996 XPUSHs (boolSV (self->flags & ix));
1855 1997
1856void max_depth (JSON *self, U32 max_depth = 0x80000000UL) 1998void max_depth (JSON *self, U32 max_depth = 0x80000000UL)
1857 PPCODE: 1999 PPCODE:
… …
1885} 2027}
1886 2028
1887void 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)
1888 PPCODE: 2030 PPCODE:
1889{ 2031{
1890 if (!self->cb_sk_object) 2032 if (!self->cb_sk_object)
1891 self->cb_sk_object = newHV (); 2033 self->cb_sk_object = newHV ();
1892 2034
1893 if (SvOK (cb)) 2035 if (SvOK (cb))
1894 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0); 2036 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1895 else 2037 else
… …
1906 XPUSHs (ST (0)); 2048 XPUSHs (ST (0));
1907} 2049}
1908 2050
1909void encode (JSON *self, SV *scalar) 2051void encode (JSON *self, SV *scalar)
1910 PPCODE: 2052 PPCODE:
1911 XPUSHs (encode_json (scalar, self)); 2053 PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
2054 XPUSHs (scalar);
1912 2055
1913void decode (JSON *self, SV *jsonstr) 2056void decode (JSON *self, SV *jsonstr)
1914 PPCODE: 2057 PPCODE:
1915 XPUSHs (decode_json (jsonstr, self, 0)); 2058 PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
2059 XPUSHs (jsonstr);
1916 2060
1917void decode_prefix (JSON *self, SV *jsonstr) 2061void decode_prefix (JSON *self, SV *jsonstr)
1918 PPCODE: 2062 PPCODE:
1919{ 2063{
2064 SV *sv;
1920 char *offset; 2065 char *offset;
2066 PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
1921 EXTEND (SP, 2); 2067 EXTEND (SP, 2);
1922 PUSHs (decode_json (jsonstr, self, &offset)); 2068 PUSHs (sv);
1923 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset)))); 2069 PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
1924} 2070}
1925 2071
1926void incr_parse (JSON *self, SV *jsonstr = 0) 2072void incr_parse (JSON *self, SV *jsonstr = 0)
1927 PPCODE: 2073 PPCODE:
1928{ 2074{
1929 if (!self->incr_text) 2075 if (!self->incr_text)
1930 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 }
1931 2096
1932 // append data, if any 2097 // append data, if any
1933 if (jsonstr) 2098 if (jsonstr)
1934 { 2099 {
2100 /* make sure both strings have same encoding */
2101 if (SvUTF8 (jsonstr) != SvUTF8 (self->incr_text))
1935 if (SvUTF8 (jsonstr)) 2102 if (SvUTF8 (jsonstr))
2103 sv_utf8_downgrade (jsonstr, 0);
1936 { 2104 else
1937 if (!SvUTF8 (self->incr_text))
1938 {
1939 /* utf-8-ness differs, need to upgrade */
1940 sv_utf8_upgrade (self->incr_text);
1941
1942 if (self->incr_pos)
1943 self->incr_pos = utf8_hop ((U8 *)SvPVX (self->incr_text), self->incr_pos)
1944 - (U8 *)SvPVX (self->incr_text);
1945 }
1946 }
1947 else if (SvUTF8 (self->incr_text))
1948 sv_utf8_upgrade (jsonstr); 2105 sv_utf8_upgrade (jsonstr);
1949 2106
2107 /* and then just blindly append */
1950 { 2108 {
1951 STRLEN len; 2109 STRLEN len;
1952 const char *str = SvPV (jsonstr, len); 2110 const char *str = SvPV (jsonstr, len);
1953 STRLEN cur = SvCUR (self->incr_text); 2111 STRLEN cur = SvCUR (self->incr_text);
1954 2112
… …
1962 } 2120 }
1963 2121
1964 if (GIMME_V != G_VOID) 2122 if (GIMME_V != G_VOID)
1965 do 2123 do
1966 { 2124 {
2125 SV *sv;
1967 char *offset; 2126 char *offset;
1968 2127
1969 if (!INCR_DONE (self)) 2128 if (!INCR_DONE (self))
1970 { 2129 {
1971 incr_parse (self); 2130 incr_parse (self);
… …
1973 if (self->incr_pos > self->max_size && self->max_size) 2132 if (self->incr_pos > self->max_size && self->max_size)
1974 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",
1975 (unsigned long)self->incr_pos, (unsigned long)self->max_size); 2134 (unsigned long)self->incr_pos, (unsigned long)self->max_size);
1976 2135
1977 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
1978 break; 2145 break;
2146 }
1979 } 2147 }
1980 2148
1981 XPUSHs (decode_json (self->incr_text, self, &offset)); 2149 PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
2150 XPUSHs (sv);
1982 2151
1983 self->incr_pos -= offset - SvPVX (self->incr_text); 2152 self->incr_pos -= offset - SvPVX (self->incr_text);
1984 self->incr_nest = 0; 2153 self->incr_nest = 0;
1985 self->incr_mode = 0; 2154 self->incr_mode = 0;
1986 2155
… …
2030 SvREFCNT_dec (self->incr_text); 2199 SvREFCNT_dec (self->incr_text);
2031 2200
2032PROTOTYPES: ENABLE 2201PROTOTYPES: ENABLE
2033 2202
2034void encode_json (SV *scalar) 2203void encode_json (SV *scalar)
2035 ALIAS:
2036 to_json_ = 0
2037 encode_json = F_UTF8
2038 PPCODE: 2204 PPCODE:
2039{ 2205{
2040 JSON json; 2206 JSON json;
2041 json_init (&json); 2207 json_init (&json);
2042 json.flags |= ix; 2208 json.flags |= F_UTF8;
2043 XPUSHs (encode_json (scalar, &json)); 2209 PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
2210 XPUSHs (scalar);
2044} 2211}
2045 2212
2046void decode_json (SV *jsonstr) 2213void decode_json (SV *jsonstr)
2047 ALIAS:
2048 from_json_ = 0
2049 decode_json = F_UTF8
2050 PPCODE: 2214 PPCODE:
2051{ 2215{
2052 JSON json; 2216 JSON json;
2053 json_init (&json); 2217 json_init (&json);
2054 json.flags |= ix; 2218 json.flags |= F_UTF8;
2055 XPUSHs (decode_json (jsonstr, &json, 0)); 2219 PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
2220 XPUSHs (jsonstr);
2056} 2221}
2057 2222

Diff Legend

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