[groff] [PATCH] Sort Perl hash keys

[Colin Watson]

Hash iteration order may differ between runs, which makes builds
harder to reproduce.  Sort hash keys in gropdf and afmtodit output
to avoid this.

* src/devices/gropdf/gropdf.pl: Sort hash keys.
* src/utils/afmtodit/afmtodit.pl: Iterate over sorted keys rather
  than using `each'.
---
 ChangeLog                      | 12 ++++++++++++
 src/devices/gropdf/gropdf.pl   |  8 ++++----
 src/utils/afmtodit/afmtodit.pl | 12 ++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25b6629..fb6914d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-03-05  Colin Watson  <address@hidden>
+
+       Sort Perl hash keys.
+
+       Hash iteration order may differ between runs, which makes builds
+       harder to reproduce.  Sort hash keys in gropdf and afmtodit output
+       to avoid this.
+
+       * src/devices/gropdf/gropdf.pl: Sort hash keys.
+       * src/utils/afmtodit/afmtodit.pl: Iterate over sorted keys rather
+         than using `each'.
+
 2018-03-02  Werner LEMBERG  <address@hidden>
 
        Hyphenation exceptions in pattern files now obey `.hy' (#53196).
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 8a4b4b6..867ab30 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -375,7 +375,7 @@ my $info=BuildObj(++$objct,\%info);
 
 PutObj($objct);
 
-foreach my $fontno (keys %fontlst)
+foreach my $fontno (sort keys %fontlst)
 {
     my $o=$fontlst{$fontno}->{FNT};
 
@@ -844,7 +844,7 @@ sub do_x
                    my @xwds=split(' ',"<< $1 >>");
                    my $docinfo=ParsePDFValue(address@hidden);
 
-                   foreach my $k (keys %{$docinfo})
+                   foreach my $k (sort keys %{$docinfo})
                    {
                        $info{$k}=$docinfo->{$k} if $k ne 'Producer';
                    }
@@ -854,7 +854,7 @@ sub do_x
                    my @xwds=split(' ',"<< $1 >>");
                    my $docview=ParsePDFValue(address@hidden);
 
-                   foreach my $k (keys %{$docview})
+                   foreach my $k (sort keys %{$docview})
                    {
                        $cat->{$k}=$docview->{$k} if !exists($cat->{$k});
                    }
@@ -1697,7 +1697,7 @@ sub MapInsHash
     my $val=shift;
 
 
-    foreach my $k (keys(%{$val}))
+    foreach my $k (sort keys(%{$val}))
     {
        MapInsValue($pdf,$o,$k,$insmap,$parent,$val->{$k}) if $k ne 'Contents';
     }
diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
index f2fc6c2..0a3857a 100644
--- a/src/utils/afmtodit/afmtodit.pl
+++ b/src/utils/afmtodit/afmtodit.pl
@@ -164,8 +164,8 @@ while (<AFM>) {
                $depth{$n} = -$lly;
                $left_side_bearing{$n} = -$llx;
                $right_side_bearing{$n} = $urx - $w;
-#              while ((my $lig, my $glyph2) = each %ligs) {
-#                  $ligatures{$lig} = $n . " " . $glyph2;
+#              foreach my $lig (sort keys %ligs) {
+#                  $ligatures{$lig} = $n . " " . $ligs{$lig};
 #              }
            }
        }
@@ -267,7 +267,7 @@ $italic_angle = $opt_a if $opt_a;
 if (!$opt_x) {
     my %mapped;
     my $i = ($#encoding > 256) ? ($#encoding + 1) : 256;
-    while (my $ch = each %width) {
+    foreach my $ch (sort keys %width) {
        # add unencoded characters
        if (!$in_encoding{$ch}) {
            $encoding[$i] = $ch;
@@ -407,9 +407,9 @@ my %default_ligatures = (
   "ffl", "ff l",
 );
 
-while (my ($lig, $components) = each %default_ligatures) {
+foreach my $lig (sort keys %default_ligatures) {
     if (defined $width{$lig} && !defined $ligatures{$lig}) {
-       $ligatures{$lig} = $components;
+       $ligatures{$lig} = $default_ligatures{$lig};
     }
 }
 
@@ -456,7 +456,7 @@ if ($opt_e) {
 
 if (!$opt_n && %ligatures) {
     print("ligatures");
-    while (my $lig = each %ligatures) {
+    foreach my $lig (sort keys %ligatures) {
        print(" $lig");
     }
     print(" 0\n");
-- 
2.7.4