diff options
| -rw-r--r-- | charclass_invlists.h | 2 | ||||
| -rw-r--r-- | lib/unicore/mktables | 16 | ||||
| -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, 8 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h index 7e8acf5c3d..0a7c3ef4e0 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 - * 38749965b8af1a6b3a2569ae1f28e423836dc0bacdbefc99e6d5f794083abd6c lib/unicore/mktables + * 1d0d03a78e13e67ad588acdcde6b4e941de43e77ce1ea469e58d20f5d055d33e 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 06d1979c86..b7afa7a58f 100644 --- a/lib/unicore/mktables +++ b/lib/unicore/mktables @@ -3403,16 +3403,24 @@ package Multi_Default; my $addr = pack 'J', refaddr $self; while (@_ > 1) { - my $default = shift; - my $eval = shift; - $class_defaults{$addr}->{$default} = $eval; + $self->append_default(shift, shift); } - $other_default{$addr} = shift; + $self->set_final_default(shift); return $self; } + sub append_default($self, $new_default, $eval) { + my $addr = pack 'J', refaddr $self; + $class_defaults{$addr}->{$new_default} = $eval + } + + sub set_final_default($self, $new_default) { + my $addr = pack 'J', refaddr $self; + $other_default{$addr} = $new_default; + } + sub get_next_defaults($self) { # Iterates and returns the next class of defaults. diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index 28f98318ad..912ee82358 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 -# 38749965b8af1a6b3a2569ae1f28e423836dc0bacdbefc99e6d5f794083abd6c lib/unicore/mktables +# 1d0d03a78e13e67ad588acdcde6b4e941de43e77ce1ea469e58d20f5d055d33e 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 a8d0e7475a..1e4e52d916 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 - * 38749965b8af1a6b3a2569ae1f28e423836dc0bacdbefc99e6d5f794083abd6c lib/unicore/mktables + * 1d0d03a78e13e67ad588acdcde6b4e941de43e77ce1ea469e58d20f5d055d33e 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 9999c3e7ea..f8d9ce79a7 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 - * 38749965b8af1a6b3a2569ae1f28e423836dc0bacdbefc99e6d5f794083abd6c lib/unicore/mktables + * 1d0d03a78e13e67ad588acdcde6b4e941de43e77ce1ea469e58d20f5d055d33e lib/unicore/mktables * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl |