diff options
| author | Karl Williamson <khw@cpan.org> | 2022-09-15 21:28:44 -0600 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2022-09-28 07:33:44 -0600 |
| commit | 47629d41e4e57b37cc01ea50711708664ff733ba (patch) | |
| tree | 4d14192ab9216b68fc04b994361de0e3131e1180 /lib/unicore | |
| parent | a6d3f2487f48cf4cbd33faf2d6a404eb1e0d8de6 (diff) | |
| download | perl-47629d41e4e57b37cc01ea50711708664ff733ba.tar.gz | |
mktables: Reorder some code
This moves some code ahead of other code so that the end of the sub all
works on a single related issue. This is in preparation for 15.0, where
that issue becomes moot, so we can then change to return early from the
sub.
Diffstat (limited to 'lib/unicore')
| -rw-r--r-- | lib/unicore/mktables | 34 | ||||
| -rw-r--r-- | lib/unicore/uni_keywords.pl | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/lib/unicore/mktables b/lib/unicore/mktables index d9d1b1340b..03cb9acd48 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -9990,8 +9990,23 @@ sub finish_property_setup($file) { } } - # The following use the Multi_Default class to create objects for - # defaults. + # For backwards compatibility with applications that may read the mapping + # file directly (it was documented in 5.12 and 5.14 as being thusly + # usable), keep it from being adjusted. (range_size_1 is + # used to force the traditional format.) + if (defined (my $nfkc_cf = property_ref('NFKC_Casefold'))) { + $nfkc_cf->set_to_output_map($EXTERNAL_MAP); + $nfkc_cf->set_range_size_1(1); + } + if (defined (my $bmg = property_ref('Bidi_Mirroring_Glyph'))) { + $bmg->set_to_output_map($EXTERNAL_MAP); + $bmg->set_range_size_1(1); + } + + property_ref('Numeric_Value')->set_to_output_map($OUTPUT_ADJUSTED); + + # The rest of this sub is for properties that need the Multi_Default class + # to create objects for defaults. # Bidi class has a complicated default, but the derived file takes care of # the complications, leaving just 'L'. @@ -10077,21 +10092,6 @@ sub finish_property_setup($file) { } } - # For backwards compatibility with applications that may read the mapping - # file directly (it was documented in 5.12 and 5.14 as being thusly - # usable), keep it from being adjusted. (range_size_1 is - # used to force the traditional format.) - if (defined (my $nfkc_cf = property_ref('NFKC_Casefold'))) { - $nfkc_cf->set_to_output_map($EXTERNAL_MAP); - $nfkc_cf->set_range_size_1(1); - } - if (defined (my $bmg = property_ref('Bidi_Mirroring_Glyph'))) { - $bmg->set_to_output_map($EXTERNAL_MAP); - $bmg->set_range_size_1(1); - } - - property_ref('Numeric_Value')->set_to_output_map($OUTPUT_ADJUSTED); - return; } diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index f262c1103b..3fd3f95091 100644 --- a/lib/unicore/uni_keywords.pl +++ b/lib/unicore/uni_keywords.pl @@ -1320,7 +1320,7 @@ # 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt # a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt # 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt -# 9a9969f3b07153998899ac0988eb4bffed406e53edb1831ea2444678702a6c2b lib/unicore/mktables +# da311266ec741173c392e9f95697d93305916833325c5c85847afadc577a869a lib/unicore/mktables # c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version # 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl # c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl |