mktables: Avoid some unnecessary work

By simply removing a special case, we can avoid having to work around it
later.

diff --git a/charclass_invlists.h b/charclass_invlists.h
index e390afb..ed41236 100644 (file)
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -374323,7 +374323,7 @@ static const U8 WB_table[24][24] = {
  * be0f129691d479aa38646e4ca0ec1ee576ae7f75b0300a5624a7fa862fa8abba lib/unicore/extracted/DLineBreak.txt
  * 92449d354d9f6b6f2f97a292ebb59f6344ffdeb83d120d7d23e569c43ba67cd5 lib/unicore/extracted/DNumType.txt
  * e3a319527153b0c6c0c549b40fc6f3a01a7a0dcd6620784391db25901df3b154 lib/unicore/extracted/DNumValues.txt
- * 3a7fdbfd785ec3925cef1117591fbd1205963968b2a879084d95db3e7cbeaafe lib/unicore/mktables
+ * 7e5d01b36b473f6dcba54308dc24ced9c5788b6794cc4ad24e64b65cc5e09d84 lib/unicore/mktables
  * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version
  * 4bb677187a1a64e39d48f2e341b5ecb6c99857e49d7a79cf503bd8a3c709999b regen/charset_translations.pl
  * 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl

diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index e597a2a..fd12779 100644 (file)
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -15452,17 +15452,6 @@ END
     # was defined for, this will already have been done by the substitute file
     # portion for 'Input_file' code for WB.)
     my $perl_wb = property_ref('_Perl_WB');
-    if (! defined $perl_wb) {
-        $perl_wb = Property->new('_Perl_WB',
-                                 Fate => $INTERNAL_ONLY,
-                                 Perl_Extension => 1,
-                                 Directory => $map_directory,
-                                 Type => $STRING);
-        my $wb = property_ref('Word_Break');
-        $perl_wb->initialize($wb);
-        $perl_wb->set_default_map($wb->default_map);
-    }
-
     # And simply replace the mappings of horizontal space characters that
     # otherwise would map to the default to instead map to our tailoring.
     my $default = $perl_wb->default_map;
@@ -19720,12 +19709,7 @@ my @input_file_objects = (
                     Skip => $Documentation,
                    ),
     Input_file->new("$AUXILIARY/WordBreakProperty.txt", v4.1.0,
-                    Early => [ "WBsubst.txt", '_Perl_WB', 'ALetter',
-
-                               # Don't use _Perl_WB as a synonym for
-                               # Word_Break in later perls, as it is tailored
-                               # and isn't the same as Word_Break
-                               'ONLY_EARLY' ],
+                    Early => [ "WBsubst.txt", '_Perl_WB', 'ALetter' ],
                     Property => 'Word_Break',
                     Has_Missings_Defaults => $NOT_IGNORED,
                    ),

diff --git a/regcharclass.h b/regcharclass.h
index 406e4a1..6fd9627 100644 (file)
--- a/regcharclass.h
+++ b/regcharclass.h
@@ -1907,7 +1907,7 @@
  * be0f129691d479aa38646e4ca0ec1ee576ae7f75b0300a5624a7fa862fa8abba lib/unicore/extracted/DLineBreak.txt
  * 92449d354d9f6b6f2f97a292ebb59f6344ffdeb83d120d7d23e569c43ba67cd5 lib/unicore/extracted/DNumType.txt
  * e3a319527153b0c6c0c549b40fc6f3a01a7a0dcd6620784391db25901df3b154 lib/unicore/extracted/DNumValues.txt
- * 3a7fdbfd785ec3925cef1117591fbd1205963968b2a879084d95db3e7cbeaafe lib/unicore/mktables
+ * 7e5d01b36b473f6dcba54308dc24ced9c5788b6794cc4ad24e64b65cc5e09d84 lib/unicore/mktables
  * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version
  * 4bb677187a1a64e39d48f2e341b5ecb6c99857e49d7a79cf503bd8a3c709999b regen/charset_translations.pl
  * f4fe24c2a005b636f6e7418df060c6c9a57ddcae4219b54d0cb18baf312dbc3a regen/regcharclass.pl

diff --git a/uni_keywords.h b/uni_keywords.h
index 4b302cc..3e7cec7 100644 (file)
--- a/uni_keywords.h
+++ b/uni_keywords.h
@@ -6834,7 +6834,7 @@ MPH_VALt match_uniprop( const unsigned char * const key, const U16 key_len ) {
  * be0f129691d479aa38646e4ca0ec1ee576ae7f75b0300a5624a7fa862fa8abba lib/unicore/extracted/DLineBreak.txt
  * 92449d354d9f6b6f2f97a292ebb59f6344ffdeb83d120d7d23e569c43ba67cd5 lib/unicore/extracted/DNumType.txt
  * e3a319527153b0c6c0c549b40fc6f3a01a7a0dcd6620784391db25901df3b154 lib/unicore/extracted/DNumValues.txt
- * 3a7fdbfd785ec3925cef1117591fbd1205963968b2a879084d95db3e7cbeaafe lib/unicore/mktables
+ * 7e5d01b36b473f6dcba54308dc24ced9c5788b6794cc4ad24e64b65cc5e09d84 lib/unicore/mktables
  * 21653d2744fdd071f9ef138c805393901bb9547cf3e777ebf50215a191f986ea lib/unicore/version
  * 4bb677187a1a64e39d48f2e341b5ecb6c99857e49d7a79cf503bd8a3c709999b regen/charset_translations.pl
  * 03e51b0f07beebd5da62ab943899aa4934eee1f792fa27c1fb638c33bf4ac6ea regen/mk_PL_charclass.pl