This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
mktables: Refactor area of code for future commits
authorKarl Williamson <public@khwilliamson.com>
Fri, 4 Nov 2011 20:26:22 +0000 (14:26 -0600)
committerKarl Williamson <public@khwilliamson.com>
Tue, 8 Nov 2011 15:09:30 +0000 (08:09 -0700)
This commit changes this area of code to not skip the whole thing for
string properties.  This is because future commits will use those parts
of it.

lib/unicore/mktables

index 158b5e1..9bf590a 100644 (file)
@@ -14555,7 +14555,6 @@ sub write_all_tables() {
                 # Don't write out or make references to the $perl property
                 next if $table == $perl;
 
-                if ($type != $STRING) {
 
                     # There is a mapping stored of the various synonyms to the
                     # standardized name of the property for utf8_heavy.pl.
@@ -14578,6 +14577,7 @@ sub write_all_tables() {
 
                         # For utf8_heavy, set the mapping of the alias to the
                         # property
+                        if ($type != $STRING) {
                         if (exists ($loose_property_name_of{$alias_standard}))
                         {
                             Carp::my_carp("There already is a property with the same standard name as $alias_name: $loose_property_name_of{$alias_standard}.  Old name is retained");
@@ -14605,8 +14605,8 @@ sub write_all_tables() {
                                         '\p{' . $alias->name . ': *}',
                                         $rhs,
                                         $alias->status);
+                        }
                     }
-                } # End of non-string-like property code
 
 
                 # Don't write out a mapping file if not desired.