From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 14 Jan 2019 12:48:02 +0000 (+0000)
Subject: break out region_cmp nfc
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=2f3f2c6a266158835e1e5afd074db31b72693208;p=pandemic-rising-tide.git

break out region_cmp nfc
---

diff --git a/parse-input-graph b/parse-input-graph
index 25740c7..f970808 100755
--- a/parse-input-graph
+++ b/parse-input-graph
@@ -84,7 +84,13 @@ sub unique_aref ($$) {
   my $r = $found[0][0];
   #print STDERR "resolve $ra -> $adja->{Pattern} = $r\n";
   return $r;
-}   
+}
+
+sub region_cmp {
+  ($a eq 'L' ) <=> ($b eq 'L' ) or
+  ($a eq 'NZ') <=> ($b eq 'NZ') or
+   $a          cmp  $b
+}
 
 sub resolve_arefs () {
   #print Dumper(\%region);
@@ -110,11 +116,7 @@ sub adjacencies () {
   foreach my $ra (sort keys %region) {
     foreach my $adja (@{ $region{$ra}{Adj} }) {
       my $rb = $adja->{Name};
-      my ($r0,$r1) = sort {
-	($a eq 'L' ) <=> ($b eq 'L' ) or
-	($a eq 'NZ') <=> ($b eq 'NZ') or
-	 $a          cmp  $b
-      } ($ra,$rb);
+      my ($r0,$r1) = sort region_cmp ($ra,$rb);
       push @{ $adj{$r0}{$r1}{L} }, $adja->{L};
       my $e = $adj{$r0}{$r1};
       $e->{Dikes} //= $adja->{Dikes};