Cactus/236

Fixing potential problems with perl processing of Freeform Fortran source
code


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1404 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 6 insertions, 5 deletions

diff --git a/lib/sbin/f_file_processor.pl b/lib/sbin/f_file_processor.pl
index fc50abbf..1a5dac74 100644
--- a/lib/sbin/f_file_processor.pl
+++ b/lib/sbin/f_file_processor.pl
@@ -182,7 +182,7 @@ sub free_format_splitline
   $LINE =~ s/,\s*\)/\)/;
 
   # Some preprocessors put extraneous spaces in 8-(
-  $LINE =~ s:\. (eq|le|lt|ge|gt|ne) \.:\.$1\.:ig;
+  $LINE =~ s:\. ([a-zA-Z]+) \.:\.$1\.:ig;
 
   # Strip out leading spaces in favor of 3 spaces
   # $LINE =~ s/^\s+/   /;
@@ -195,23 +195,24 @@ sub free_format_splitline
     print "\n";
     $LINE =~ s/.{78,78}//;
 
-    while ($LINE =~ /^(.{74,74}).*/) 
+    while ($LINE =~ /^(.{75,75}).*/) 
     {
+      $LINE =~ /^(.{74,74}).*/;
       $OUT = $1;
-      print "&" if (! ($OUT =~ /^[\s]*\&/));
+      print "   &" if (! ($OUT =~ /^[\s]*\&/));
       print "$OUT";
       print "&" if (! ($OUT =~ /\&[\s]*$/));
       print "\n";
       $LINE =~ s/.{74,74}//;
     }
-    print "&" if (! ($LINE =~ /^[\s]*\&/));
+    print "   &" if (! ($LINE =~ /^[\s]*\&/));
     print "$LINE\n";
   } 
   else 
   {
     print "$LINE\n";
   }
-  
+
 }