From abcd2798a3caca6295c39865e33d0927b983292a Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Sat, 11 Dec 2021 13:07:05 -0700 Subject: mktables: Don't calculate some unused values These apparently were once needed, but no longer. --- charclass_invlists.h | 2 +- lib/unicore/mktables | 10 ---------- lib/unicore/uni_keywords.pl | 2 +- regcharclass.h | 2 +- uni_keywords.h | 2 +- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/charclass_invlists.h b/charclass_invlists.h index 2f8e392b91..98c8e402d5 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -430828,7 +430828,7 @@ static const U8 WB_table[23][23] = { * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt - * 26d28cb7efd6987ebe22c3686af6763bb83cf311933d04b4aa8f4b563f34377b lib/unicore/mktables + * bbe28a1f209e4a9f6172673b5109f13d00819c7d749068c7dc89459517f61830 lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl diff --git a/lib/unicore/mktables b/lib/unicore/mktables index e5cf15ebd2..1ba9d41dba 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -3254,8 +3254,6 @@ END # Find what code points are assigned in this release main::calculate_Assigned() if ! defined $Assigned; - my $addr = do { no overloading; pack 'J', $self; }; - my ($range, @remainder) = split /\s*;\s*/, $_, -1; # -1 => retain trailing null fields @@ -5143,7 +5141,6 @@ sub trace { return main::trace(@_); } # Return a code point that's part of the range list. Returns nothing # if the table is empty or we can't find a suitable code point. This # used only for making the test script. - my $addr = do { no overloading; pack 'J', $self; }; # On first pass, don't choose less desirable code points; if no good # one is found, repeat, allowing a less desirable one to be selected. @@ -6809,8 +6806,6 @@ sub trace { return main::trace(@_); } # Can't change the table if locked. return if $self->carp_if_locked; - my $addr = do { no overloading; pack 'J', $self; }; - $self->_range_list->add_map($lower, $upper, $string, @_, @@ -6843,9 +6838,6 @@ sub trace { return main::trace(@_); } return; } - my $addr = do { no overloading; pack 'J', $self; }; - my $other_addr = do { no overloading; pack 'J', $other; }; - local $to_trace = 0 if main::DEBUG; my $self_range_list = $self->_range_list; @@ -7740,8 +7732,6 @@ sub trace { return main::trace(@_); } return if $self->carp_if_locked; - my $addr = do { no overloading; pack 'J', $self; }; - if (ref $other) { # Change the range list of this table to be the diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index 6eda8e27bf..ce6779e2d1 100644 --- a/lib/unicore/uni_keywords.pl +++ b/lib/unicore/uni_keywords.pl @@ -1319,7 +1319,7 @@ # 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt # a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt # 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt -# 26d28cb7efd6987ebe22c3686af6763bb83cf311933d04b4aa8f4b563f34377b lib/unicore/mktables +# bbe28a1f209e4a9f6172673b5109f13d00819c7d749068c7dc89459517f61830 lib/unicore/mktables # c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version # 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl # 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl diff --git a/regcharclass.h b/regcharclass.h index a85aa8da16..bfecd79a1a 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -3762,7 +3762,7 @@ * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt - * 26d28cb7efd6987ebe22c3686af6763bb83cf311933d04b4aa8f4b563f34377b lib/unicore/mktables + * bbe28a1f209e4a9f6172673b5109f13d00819c7d749068c7dc89459517f61830 lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 1aa94679c695efd507b7e4491629dba1021b74c21a5324dfd3a582a5d654bd32 regen/regcharclass.pl diff --git a/uni_keywords.h b/uni_keywords.h index 7683d1d710..1276aa20ea 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -7697,7 +7697,7 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) { * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt - * 26d28cb7efd6987ebe22c3686af6763bb83cf311933d04b4aa8f4b563f34377b lib/unicore/mktables + * bbe28a1f209e4a9f6172673b5109f13d00819c7d749068c7dc89459517f61830 lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 5f8520d3a17ade6317fc0c423f5091470924b1ef425bca0c41ce8e4a9f8460fe regen/mk_PL_charclass.pl -- cgit v1.2.1