changeset 1720:1dd41dd74b2f

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 12 Oct 2017 17:36:19 +0300
parents 3f38040dafce
children 80e76257dc7a
files old/mapref.pl
diffstat 1 files changed, 33 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/old/mapref.pl	Thu Oct 12 13:38:40 2017 +0300
+++ b/old/mapref.pl	Thu Oct 12 17:36:19 2017 +0300
@@ -38,18 +38,27 @@
 ### Read loc files
 ### 
 my %locfiles = ();
-foreach my $filename (keys %opt_locfiles) {
+foreach my $filename (keys %opt_locfiles)
+{
   open(INFILE, "<", $filename) or die("Could not open loc-file '$filename'.\n");
-  while (defined(my $line = <INFILE>)) {
+  while (defined(my $line = <INFILE>))
+  {
     chomp($line);
-    if ($line =~ /^(#|\s*$)/) {
+    if ($line =~ /^(#|\s*$)/)
+    {
       # Ignore empty lines and comments
-    } elsif ($line =~ /^\s*(\d+)\s*;\s*(\d+)\s*;\s*(\d\S*)\s*;\s*([^;]+);(.*)/) {
+    }
+    elsif ($line =~ /^\s*(\d+)\s*;\s*(\d+)\s*;\s*(\d\S*)\s*;\s*([^;]+);(.*)/)
+    {
       my ($flags, $namestr, $rest) = ($3,$4,$5);
       my @names = split(/\s*\|\s*/, $namestr);
       my $key = lc($names[0]);
-      if (substr($key,0,1) eq "\@") { $key = substr($key, 1); }
-      if ($flags !~ /C/) {
+      if (substr($key, 0, 1) eq "\@")
+      {
+        $key = substr($key, 1);
+      }
+      if ($flags !~ /C/)
+      {
         $locfiles{$key}{"flags"} = $flags;
         $locfiles{$key}{"name"} = $namestr;
         $locfiles{$key}{"rest"} = $rest;
@@ -64,22 +73,32 @@
 ###
 open(INFILE, "<", $opt_reffile) or die("Could not open loc-file '$opt_reffile'.\n");
 my $nline = 0;
-while (defined(my $line = <INFILE>)) {
+while (defined(my $line = <INFILE>))
+{
   $nline++;
   chomp($line);
-  if ($line =~ /^(#|\s*$)/) {
+  if ($line =~ /^(#|\s*$)/)
+  {
     print "$line\n";
-  } elsif ($line =~ /^\s*(\d+)\s*;\s*(\d+)\s*;\s*(\d\S*)\s*;([^;]+);(.*)/) {
+  }
+  elsif ($line =~ /^\s*(\d+)\s*;\s*(\d+)\s*;\s*(\d\S*)\s*;([^;]+);(.*)/)
+  {
     my ($xc, $yc, $flags, $namestr, $rest) = ($1,$2,$3,$4,$5);
-    if (substr($namestr,0,1) eq "\@") {
+    if (substr($namestr,0,1) eq "\@")
+    {
       my $key = lc(substr($namestr, 1));
-      if (defined($locfiles{$key})) {
+      if (defined($locfiles{$key}))
+      {
         print "$xc\t; $yc\t; $flags\t;".$locfiles{$key}{"name"}.";".$locfiles{$key}{"rest"}."\n";
-      } else {
+      }
+      else
+      {
         print "# Location key '$key' on line #$nline not defined!\n";
       }
-    } else {
-      print "$line\n";
+    }
+    else
+    {
+      print $line."\n";
     }
   }
 }