From 17b5fefb76f57779aecdf031f02745e69f097b32 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 2 Mar 2019 17:44:03 +0000 Subject: [PATCH] rename dike -> dyke everywhere --- Parse.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Parse.pm b/Parse.pm index 147ecd3..30648ba 100644 --- a/Parse.pm +++ b/Parse.pm @@ -22,11 +22,11 @@ our %region; # $region{NAME}{Adj}[]{DisplayName}[] # $region{NAME}{Adj}[]{Pattern} # $region{NAME}{Adj}[]{Regexp} -# $region{NAME}{Adj}[]{Dikes} +# $region{NAME}{Adj}[]{Dykes} # $region{NAME}{Adj}[]{L} our %adj; -# $adj{EARLIER}{LATER}{Dikes} +# $adj{EARLIER}{LATER}{Dykes} # $adj{EARLIER}{LATER}{L}[] # $adj{EARLIER}{LATER}{T}[] @@ -59,8 +59,8 @@ sub read_in () { $cregion = $name; next; } - if (my ($aref, $adikes) = m{^\t\t(\S.*[A-Za-z.]|L2?)(?: (\+\+?))?$}) { - my $adj = { Dikes => (length $adikes // 0), L => $. }; + if (my ($aref, $adykes) = m{^\t\t(\S.*[A-Za-z.]|L2?)(?: (\+\+?))?$}) { + my $adj = { Dykes => (length $adykes // 0), L => $. }; if ($aref =~ m{\.}) { $adj->{Pattern} = $aref; $aref =~ s{\-}{[^- ]*-}g; @@ -143,20 +143,20 @@ sub adjacencies () { push @{ $adj{$r0}{$r1}{L} }, $adja->{L}; push @{ $adj{$r0}{$r1}{T} }, substr($ra,0,1)."#".$adji; my $e = $adj{$r0}{$r1}; - $e->{Dikes} //= $adja->{Dikes}; - confess "$r0 - $r1 | @{ $e->{L} } | $e->{Dikes} $adja->{Dikes} ?" - unless $e->{Dikes} == $adja->{Dikes}; + $e->{Dykes} //= $adja->{Dykes}; + confess "$r0 - $r1 | @{ $e->{L} } | $e->{Dykes} $adja->{Dykes} ?" + unless $e->{Dykes} == $adja->{Dykes}; } } - my $ndikes = 0; + my $ndykes = 0; foreach my $r0 (sort keys %adj) { foreach my $r1 (sort keys %{ $adj{$r0} }) { my $e = $adj{$r0}{$r1}; confess "$r0 / $r1 : @{ $e->{L} } ?" unless @{ $e->{L} } == 2; - $ndikes += $e->{Dikes}; + $ndykes += $e->{Dykes}; } } - #print STDERR "total $ndikes dikes\n"; + #print STDERR "total $ndykes dykes\n"; } sub names () { -- 2.30.2