Avoid mktables generating Sterm.pl and Sterm.pl in the same directory

by making the %BaseName check global

p4raw-id: //depot/perl@22761

diff --git a/MANIFEST b/MANIFEST
index cd0707e..db2d0f0 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1932,6 +1932,7 @@ lib/unicore/lib/gc_sc/Cprt.pl             Unicode character database
 lib/unicore/lib/gc_sc/Cs.pl            Unicode character database
 lib/unicore/lib/gc_sc/Cyrl.pl          Unicode character database
 lib/unicore/lib/gc_sc/Dash.pl          Unicode character database
+lib/unicore/lib/gc_sc/Dash2.pl         Unicode character database
 lib/unicore/lib/gc_sc/Dep.pl           Unicode character database
 lib/unicore/lib/gc_sc/Deprecat.pl      Unicode character database
 lib/unicore/lib/gc_sc/Deva.pl          Unicode character database
@@ -1958,6 +1959,7 @@ lib/unicore/lib/gc_sc/Hex.pl              Unicode character database
 lib/unicore/lib/gc_sc/HexDigit.pl      Unicode character database
 lib/unicore/lib/gc_sc/Hira.pl          Unicode character database
 lib/unicore/lib/gc_sc/Hyphen.pl                Unicode character database
+lib/unicore/lib/gc_sc/Hyphen2.pl       Unicode character database
 lib/unicore/lib/gc_sc/IDSB.pl          Unicode character database
 lib/unicore/lib/gc_sc/IDST.pl          Unicode character database
 lib/unicore/lib/gc_sc/IdContin.pl      Unicode character database
@@ -2158,6 +2160,7 @@ lib/unicore/lib/gc_sc/QMark.pl            Unicode character database
 lib/unicore/lib/gc_sc/Qaai.pl          Unicode character database
 lib/unicore/lib/gc_sc/Quotatio.pl      Unicode character database
 lib/unicore/lib/gc_sc/Radical.pl       Unicode character database
+lib/unicore/lib/gc_sc/Radical2.pl      Unicode character database
 lib/unicore/lib/gc_sc/Runr.pl          Unicode character database
 lib/unicore/lib/gc_sc/S.pl             Unicode character database
 lib/unicore/lib/gc_sc/SD.pl            Unicode character database
@@ -2171,7 +2174,7 @@ lib/unicore/lib/gc_sc/So.pl               Unicode character database
 lib/unicore/lib/gc_sc/SoftDott.pl      Unicode character database
 lib/unicore/lib/gc_sc/Space.pl         Unicode character database
 lib/unicore/lib/gc_sc/SpacePer.pl      Unicode character database
-lib/unicore/lib/gc_sc/Sterm.pl         Unicode character database
+lib/unicore/lib/gc_sc/Sterm2.pl                Unicode character database
 lib/unicore/lib/gc_sc/Syrc.pl          Unicode character database
 lib/unicore/lib/gc_sc/Tagb.pl          Unicode character database
 lib/unicore/lib/gc_sc/TaiLe.pl         Unicode character database

diff --git a/lib/unicore/Canonical.pl b/lib/unicore/Canonical.pl
index 9743d49..ac8a17f 100644 (file)
--- a/lib/unicore/Canonical.pl
+++ b/lib/unicore/Canonical.pl
@@ -135,7 +135,7 @@
  # InCyrillicSupplement
    cyrillicsupplement                      => 'InCyril2',
 
-   dash                                    => 'Dash',
+   dash                                    => 'Dash2',
 
  # DashPunctuation
    dashpunctuation                         => 'Pd',
@@ -219,7 +219,7 @@
    highsurrogates                          => 'InHighSu',
 
    hiragana                                => 'Hira',
-   hyphen                                  => 'Hyphen',
+   hyphen                                  => 'Hyphen2',
 
  # IdContinue
    idcontinue                              => 'IdContin',
@@ -809,7 +809,7 @@
  # QuotationMark
    quotationmark                           => 'Quotatio',
 
-   radical                                 => 'Radical',
+   radical                                 => 'Radical2',
    runic                                   => 'Runr',
    separator                               => 'Z',
    shavian                                 => 'Shaw',
@@ -833,7 +833,7 @@
  # InSpecials
    specials                                => 'InSpecia',
 
-   sterm                                   => 'Sterm',
+   sterm                                   => 'Sterm2',
 
  # InSuperscriptsAndSubscripts
    superscriptsandsubscripts               => 'InSupers',

diff --git a/lib/unicore/lib/gc_sc/Dash.pl b/lib/unicore/lib/gc_sc/Dash.pl
index aa3d3f4..91eb9d8 100644 (file)
--- a/lib/unicore/lib/gc_sc/Dash.pl
+++ b/lib/unicore/lib/gc_sc/Dash.pl
@@ -3,10 +3,7 @@
 # Any changes made here will be lost!
 
 #
-# This file supports:
-#      \p{Dash} (and fuzzy permutations)
-# 
-# Meaning: Extended property 'Dash'
+# Binary property 'Dash'
 #
 return <<'END';
 002D           Dash

diff --git a/lib/unicore/lib/gc_sc/Hyphen.pl b/lib/unicore/lib/gc_sc/Hyphen.pl
index a9023e8..64c9349 100644 (file)
--- a/lib/unicore/lib/gc_sc/Hyphen.pl
+++ b/lib/unicore/lib/gc_sc/Hyphen.pl
@@ -3,10 +3,7 @@
 # Any changes made here will be lost!
 
 #
-# This file supports:
-#      \p{Hyphen} (and fuzzy permutations)
-# 
-# Meaning: Extended property 'Hyphen'
+# Binary property 'Hyphen'
 #
 return <<'END';
 002D           Hyphen

diff --git a/lib/unicore/lib/gc_sc/Radical.pl b/lib/unicore/lib/gc_sc/Radical.pl
index 1bd455a..aeb66ed 100644 (file)
--- a/lib/unicore/lib/gc_sc/Radical.pl
+++ b/lib/unicore/lib/gc_sc/Radical.pl
@@ -3,10 +3,7 @@
 # Any changes made here will be lost!
 
 #
-# This file supports:
-#      \p{Radical} (and fuzzy permutations)
-# 
-# Meaning: Extended property 'Radical'
+# Binary property 'Radical'
 #
 return <<'END';
 2E80   2E99    Radical

diff --git a/lib/unicore/lib/gc_sc/Sterm.pl b/lib/unicore/lib/gc_sc/Sterm2.pl
similarity index 100%
rename from lib/unicore/lib/gc_sc/Sterm.pl
rename to lib/unicore/lib/gc_sc/Sterm2.pl

diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index abbcce0..62716c5 100644 (file)
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -12,6 +12,10 @@ mkdir("lib", 0755);
 mkdir("lib/gc_sc", 0755);
 mkdir("To",  0755);
 
+## Base names already used in lib/gc_sc (for avoiding 8.3 conflicts)
+my %BaseNames;
+
+
 ##
 ## Process any args.
 ##
@@ -1298,6 +1302,8 @@ sub PropList_txt()
 
     for (keys %Prop) {
        (my $file = $PA_reverse{$_}) =~ tr/_//d;
+       # XXX I'm assuming that the names from %Prop don't suffer 8.3 clashes.
+       $BaseNames{lc $file}++;
        $Prop{$_}->Write(
            "lib/gc_sc/$file.pl",
            "Binary property '$_'"
@@ -1546,8 +1552,6 @@ sub WriteAllMappings()
 {
     my @MAP;
 
-    my %BaseNames;  ## Base names already used (for avoiding 8.3 conflicts)
-
     ## 'Is' *MUST* come first, so its names have precidence over 'In's
     for my $Type ('Is', 'In')
     {