diff options
| -rw-r--r-- | charclass_invlists.h | 2 | ||||
| -rw-r--r-- | lib/unicore/mktables | 21 | ||||
| -rw-r--r-- | lib/unicore/uni_keywords.pl | 2 | ||||
| -rw-r--r-- | regcharclass.h | 2 | ||||
| -rw-r--r-- | uni_keywords.h | 2 |
5 files changed, 16 insertions, 13 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h index 2f6a79fdfb..029da9fa13 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -430752,7 +430752,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 - * a31ce67488e0e767884a7bbac251bd16e86ca742ca8c83bd2fb0e06e1f0ecb25 lib/unicore/mktables + * 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl diff --git a/lib/unicore/mktables b/lib/unicore/mktables index 564ea59378..2301676fb7 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -3002,8 +3002,10 @@ END $default = "Unknown"; } - # Store them as a sub-arrays with both components. - push @{$missings{$addr}}, [ $default, $property ]; + # Store them as a sub-hash as part of an array, with + # both components. + push @{$missings{$addr}}, { default => $default, + property => $property }; } } @@ -3217,9 +3219,9 @@ END sub get_missings($self) { # Returns the stored up @missings lines' values, and clears the list. - # The values are in an array, consisting of the default in the first - # element, and the property in the 2nd. However, since these lines - # can be stacked up, the return is an array of all these arrays. + # The values are in a hash, consisting of 'default' and 'property'. + # However, since these lines can be stacked up, the return is an array + # of all these hashes. my $addr = pack 'J', refaddr $self; @@ -10389,8 +10391,8 @@ END # entries in the file, and may not show up until the end. my @defaults = $file->get_missings; foreach my $default_ref (@defaults) { - my $default = $default_ref->[0]; - my $property = property_ref($default_ref->[1]); + my $default = $default_ref->{default}; + my $property = property_ref($default_ref->{property}); $property->set_default_map($default); } return; @@ -10906,9 +10908,10 @@ sub output_perl_charnames_line ($code_point, $name) { # waiting for us; collect them all, and parse my @missings_list = $file->get_missings if $file->has_missings_defaults; + foreach my $default_ref (@missings_list) { - my $default = $default_ref->[0]; - my $addr = pack 'J', refaddr property_ref($default_ref->[1]); + my $default = $default_ref->{default}; + my $addr = pack 'J', refaddr property_ref($default_ref->{property}); # For string properties, the default is just what the # file says, but non-string properties should already diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index 51601e52d0..ca28c5b898 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 -# a31ce67488e0e767884a7bbac251bd16e86ca742ca8c83bd2fb0e06e1f0ecb25 lib/unicore/mktables +# 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables # c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version # 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl # c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl diff --git a/regcharclass.h b/regcharclass.h index 9ff198175d..f4b8e51c87 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -3850,7 +3850,7 @@ * 43f6df50e4878f501b417e366b0ee097ae5ccb2d4ce942026bed3d62d78e7887 lib/unicore/extracted/DLineBreak.txt * a04502ebb36a45d83cbe48a7d8132ea8143edb7b3d34d0aa6afe4a9685049741 lib/unicore/extracted/DNumType.txt * 11075771b112e8e7ccf6ffa637c4c91eadc3ef3db0517b24e605df8fd3624239 lib/unicore/extracted/DNumValues.txt - * a31ce67488e0e767884a7bbac251bd16e86ca742ca8c83bd2fb0e06e1f0ecb25 lib/unicore/mktables + * 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * acc94e4afc339fe2cf2ae74d6e1cbcf2c396328d78e56236ad314eadbfc84125 regen/regcharclass.pl diff --git a/uni_keywords.h b/uni_keywords.h index c54902904b..96530c48fa 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -7677,7 +7677,7 @@ 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 - * a31ce67488e0e767884a7bbac251bd16e86ca742ca8c83bd2fb0e06e1f0ecb25 lib/unicore/mktables + * 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl |