From cda89128bdfd724b16a4cf21c6e1ddb335b7d6c7 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Sat, 29 May 2021 14:31:47 -0600 Subject: [PATCH] regen/charset_translations.pl: Use revised macros The previous two commits have revised two UTF-8 macros. This perl file emulates those macros; change it to use the new definitions. --- charclass_invlists.h | 2 +- lib/unicore/uni_keywords.pl | 2 +- regcharclass.h | 2 +- regen/charset_translations.pl | 4 ++-- uni_keywords.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charclass_invlists.h b/charclass_invlists.h index 177f5f1afded..6991339ed796 100644 --- a/charclass_invlists.h +++ b/charclass_invlists.h @@ -419902,7 +419902,7 @@ static const U8 WB_table[23][23] = { * 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt * 696e706fddd3ce8cd48c7ea91caf4c9edf5c296432d320aa7b78631f69aa9eac lib/unicore/mktables * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version - * 24120d5e0c9685c442c93bc1dbea9b85ef973bf8e9474baf0e55b160c288226b regen/charset_translations.pl + * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 9f74e34278592ddf58fef8c32236b294e94ea5e12627f911f4563e8040a07292 regen/mk_PL_charclass.pl * 5eb9e6c825496cc9aa705e3cd33bc6d5a9657dcca16d4c4acc4824ff30b34a26 regen/mk_invlists.pl * ex: set ro: */ diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl index 2e53dc7c35d6..0f671a9b157c 100644 --- a/lib/unicore/uni_keywords.pl +++ b/lib/unicore/uni_keywords.pl @@ -1297,7 +1297,7 @@ # 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt # 696e706fddd3ce8cd48c7ea91caf4c9edf5c296432d320aa7b78631f69aa9eac lib/unicore/mktables # 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version -# 24120d5e0c9685c442c93bc1dbea9b85ef973bf8e9474baf0e55b160c288226b regen/charset_translations.pl +# 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl # 9f74e34278592ddf58fef8c32236b294e94ea5e12627f911f4563e8040a07292 regen/mk_PL_charclass.pl # 5eb9e6c825496cc9aa705e3cd33bc6d5a9657dcca16d4c4acc4824ff30b34a26 regen/mk_invlists.pl # ex: set ro: diff --git a/regcharclass.h b/regcharclass.h index 08b1358dcd94..6c2f9afdd49f 100644 --- a/regcharclass.h +++ b/regcharclass.h @@ -3616,7 +3616,7 @@ * 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt * 696e706fddd3ce8cd48c7ea91caf4c9edf5c296432d320aa7b78631f69aa9eac lib/unicore/mktables * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version - * 24120d5e0c9685c442c93bc1dbea9b85ef973bf8e9474baf0e55b160c288226b regen/charset_translations.pl + * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 3635c6e564558e965018947bdab45f37d9a4fa82eb05b2694eae1a04bf7e65a3 regen/regcharclass.pl * b2f896452d2b30da3e04800f478c60c1fd0b03d6b668689b020f1e3cf1f1cdd9 regen/regcharclass_multi_char_folds.pl * ex: set ro: */ diff --git a/regen/charset_translations.pl b/regen/charset_translations.pl index cb7f801b0721..218b85e551eb 100644 --- a/regen/charset_translations.pl +++ b/regen/charset_translations.pl @@ -243,13 +243,13 @@ ($) sub _UTF_START_MASK($) { # Internal my $len = shift; - return (($len >= 7) ? 0x00 : (0x1F >> ($len - 2))); + return (0x7F >> ($len)); } sub _UTF_START_MARK($) { # Internal my $len = shift; - return (($len > 7) ? 0xFF : (0xFF & (0xFE << (7- $len)))); + return (0xFF & ~(0xFF >> ($len))); } sub cp_2_utfbytes($$) { diff --git a/uni_keywords.h b/uni_keywords.h index e65dddfdc979..d629f28ac6fd 100644 --- a/uni_keywords.h +++ b/uni_keywords.h @@ -7544,7 +7544,7 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) { * 5b7c14380d5cceeaffcfbc18db1ed936391d2af2d51f5a41f1a17b692c77e59b lib/unicore/extracted/DNumValues.txt * 696e706fddd3ce8cd48c7ea91caf4c9edf5c296432d320aa7b78631f69aa9eac lib/unicore/mktables * 50b85a67451145545a65cea370dab8d3444fbfe07e9c34cef560c5b7da9d3eef lib/unicore/version - * 24120d5e0c9685c442c93bc1dbea9b85ef973bf8e9474baf0e55b160c288226b regen/charset_translations.pl + * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl * 9f74e34278592ddf58fef8c32236b294e94ea5e12627f911f4563e8040a07292 regen/mk_PL_charclass.pl * 5eb9e6c825496cc9aa705e3cd33bc6d5a9657dcca16d4c4acc4824ff30b34a26 regen/mk_invlists.pl * cf1d68efb7d919d302c4005641eae8d36da6d7850816ad374b0c00b45e609f43 regen/mph.pl