From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 13 Jan 2019 23:49:14 +0000 (+0000)
Subject: wip
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=4131184d3a3091d9eba7ea42bbb5144a88b4e0b6;p=pandemic-rising-tide.git

wip
---

diff --git a/parse-input-graph b/parse-input-graph
index b6d267c..36314ff 100755
--- a/parse-input-graph
+++ b/parse-input-graph
@@ -17,8 +17,7 @@ sub read_in () {
   while (<>) {
     next if m{^\s*\#};
     next unless m{\S};
-    s{\s+$}{};
-    chomp or confess;
+    s{\s+$}{} or confess;
     if (m{^\w+}) {
       $ccolour = $&;
       next;
@@ -33,7 +32,7 @@ sub read_in () {
     }
     if (my ($aref, $adykes) = m{^\t\t(\S.*\S)(?: (\+\+?))$}) {
       my $adj = { Dykes => length $adykes };
-      if ($aref =~ {\.}) {
+      if ($aref =~ m{\.}) {
 	$aref =~ s{\-}{[^- ]*-};
 	$aref =~ s{\.}{[^- ]* ?};
 	$adj->{Regexp} = $aref;
@@ -49,8 +48,8 @@ sub read_in () {
 
 sub unique_aref ($$) {
   my ($ra, $adja) = @_;
-  my $re = $adj->{Regexp};
-  return $adj->{Name} unless defined $re;
+  my $re = $adja->{Regexp};
+  return $adja->{Name} unless defined $re;
   my @found;
   foreach my $rb (sort keys %region) {
     next unless $rb =~ m{^$re$};
@@ -66,18 +65,18 @@ sub unique_aref ($$) {
 }   
 
 sub resolve_arefs () {
-  foreach my $ra (sort keys $region) {
+  foreach my $ra (sort keys %region) {
     foreach my $adj (@{ $region{$ra}{Adj} }) {
       next if defined $adj->{Name};
       $adj->{ProspectiveName} = unique_aref $ra, $adj;
     }
   }
-  foreach my $ra (sort keys $region) {
+  foreach my $ra (sort keys %region) {
     foreach my $adj (@{ $region{$ra}{Adj} }) {
       $adj->{Name} //= $adj->{ProspectiveName};
     }
   }
-  foreach my $ra (sort keys $region) {
+  foreach my $ra (sort keys %region) {
     foreach my $adj (@{ $region{$ra}{Adj} }) {
       confess unless $adj->{Name} eq unique_aref $ra, $adj;
     }