mktables: Use intermed variable to shorten name

This changes an inside-out hash reference to have a shorthand for it,
making for better readability

5 files changed, 22 insertions, 26 deletions

diff --git a/charclass_invlists.h b/charclass_invlists.h
index 029da9fa13..aba3b9ceed 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
- * 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables
+ * e434c9f1893d6bc747146c687476fa46a5f90fbe0a907f2686bb36c598be0f0d 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 2301676fb7..c772947e3a 100644
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -10866,22 +10866,21 @@ sub output_perl_charnames_line ($code_point, $name) {
 
                 # If not the first time for this property, retrieve info about
                 # it from the cache
-                if (defined ($property_info{$property_addr}{$TYPE})) {
-                    $property_type = $property_info{$property_addr}{$TYPE};
-                    $default_map = $property_info{$property_addr}{$DEFAULT_MAP};
-                    $map_type
-                        = $property_info{$property_addr}{$PSEUDO_MAP_TYPE};
-                    $default_table
-                            = $property_info{$property_addr}{$DEFAULT_TABLE};
+                my $this_property_info = $property_info{$property_addr};
+                if (defined ($this_property_info->{$TYPE})) {
+                    $property_type = $this_property_info->{$TYPE};
+                    $default_map = $this_property_info->{$DEFAULT_MAP};
+                    $map_type = $this_property_info->{$PSEUDO_MAP_TYPE};
+                    $default_table = $this_property_info->{$DEFAULT_TABLE};
                 }
                 else {
 
                     # Here, is the first time for this property.  Set up the
                     # cache.
-                    $property_type = $property_info{$property_addr}{$TYPE}
+                    $property_type = $this_property_info->{$TYPE}
                                    = $property_object->type;
                     $map_type
-                        = $property_info{$property_addr}{$PSEUDO_MAP_TYPE}
+                        = $this_property_info->{$PSEUDO_MAP_TYPE}
                         = $property_object->pseudo_map_type;
 
                     # The Unicode files are set up so that if the map is not
@@ -10894,9 +10893,8 @@ sub output_perl_charnames_line ($code_point, $name) {
                         }
                         else {
                             $property_object->set_type($BINARY);
-                            $property_type
-                                = $property_info{$property_addr}{$TYPE}
-                                = $BINARY;
+                            $property_type = $this_property_info->{$TYPE}
+                                           = $BINARY;
                         }
                     }
 
@@ -10921,17 +10919,17 @@ sub output_perl_charnames_line ($code_point, $name) {
                         if ($property_type == $STRING
                             || $property_type == $UNKNOWN)
                         {
-                            $property_info{$addr}{$MISSINGS} = $default;
+                            $this_property_info->{$MISSINGS} = $default;
                         }
                         else {
-                            $property_info{$addr}{$MISSINGS}
-                                        = $property_object->table($default);
+                            $this_property_info->{$MISSINGS}
+                                            = $property_object->table($default);
                         }
                     }
 
                     # Finished storing all the @missings defaults in the input
                     # file so far.  Get the one for the current property.
-                    my $missings = $property_info{$property_addr}{$MISSINGS};
+                    my $missings = $this_property_info->{$MISSINGS};
 
                     # But we likely have separately stored what the default
                     # should be.  (This is to accommodate versions of the
@@ -10995,8 +10993,8 @@ END
                                 $default_table = $missings;
                                 $default_map = $missings->full_name;
                             }
-                            $property_info{$property_addr}{$DEFAULT_TABLE}
-                                                        = $default_table;
+                            $this_property_info->{$DEFAULT_TABLE}
+                                                            = $default_table;
                         }
                         elsif ($default_map ne $missings) {
                             $file->carp_bad_line(<<END
@@ -11008,8 +11006,7 @@ END
                         }
                     }
 
-                    $property_info{$property_addr}{$DEFAULT_MAP}
-                                                    = $default_map;
+                    $this_property_info->{$DEFAULT_MAP} = $default_map;
 
                     # If haven't done so already, find the table corresponding
                     # to this map for non-string properties.
@@ -11017,8 +11014,7 @@ END
                         && $property_type != $STRING
                         && $property_type != $UNKNOWN)
                     {
-                        $default_table = $property_info{$property_addr}
-                                                        {$DEFAULT_TABLE}
+                        $default_table = $this_property_info->{$DEFAULT_TABLE}
                                     = $property_object->table($default_map);
                     }
                 } # End of is first time for this property
diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl
index ca28c5b898..55940f8f83 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
-# 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables
+# e434c9f1893d6bc747146c687476fa46a5f90fbe0a907f2686bb36c598be0f0d 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 f4b8e51c87..64b719defd 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
- * 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables
+ * e434c9f1893d6bc747146c687476fa46a5f90fbe0a907f2686bb36c598be0f0d 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 96530c48fa..237c7e6bbb 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
- * 95ffb74ffdc138c79781d6f1fd778b0dd110e369d1ce8e9344d46c77ba2c5f3b lib/unicore/mktables
+ * e434c9f1893d6bc747146c687476fa46a5f90fbe0a907f2686bb36c598be0f0d lib/unicore/mktables
  * c72bbdeda99714db1c8024d3311da4aef3c0db3b9b9f11455a7cfe10d5e9aba3 lib/unicore/version
  * 0a6b5ab33bb1026531f816efe81aea1a8ffcd34a27cbea37dd6a70a63d73c844 regen/charset_translations.pl
  * c7ff8e0d207d3538c7feb4a1a152b159e5e902d20293b303569ea8323e84633e regen/mk_PL_charclass.pl