Check for a semicolon after a 'DECLARE_CCTK_*' macro. This will be removed

by the preprocessor.
This closes Cactus-681.


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

1 files changed, 78 insertions, 78 deletions

diff --git a/lib/sbin/c_file_processor.pl b/lib/sbin/c_file_processor.pl
index c182573a..3ca6573a 100644
--- a/lib/sbin/c_file_processor.pl
+++ b/lib/sbin/c_file_processor.pl
@@ -3,19 +3,19 @@
 #  @file      c_file_processor.pl
 #  @date      Fri Jan 22 18:09:47 1999
 #  @author    Tom Goodale / Gerd Lanfermann
-#  @desc 
+#  @desc
 #  Processes a c file replacing certain strings which can't be dealt
 #  with by the normal c preprocessor.
-#  
-#  It also parses the C source and adds the USE macros, which perform 
+#
+#  It also parses the C source and adds the USE macros, which perform
 #  a dummy assign. This avoid ugly warnings on some compilers.
-#  This auto adding was tested on all C-thorns and it worked. Since this 
+#  This auto adding was tested on all C-thorns and it worked. Since this
 #  does not match the full C syntax, there can pathological cases, where
 #  this script will not be able to put the USE stuff in the right place.
 #  There is a switch to turn this auto-adding off: place the string
-#  "CCTK_NO_AUTOUSE_MACRO" somewhere at the top (within a comment). 
+#  "CCTK_NO_AUTOUSE_MACRO" somewhere at the top (within a comment).
 #  Everything after will not be matched.
-#  @enddesc 
+#  @enddesc
 #  @version   $Header$
 #@@*/
 
@@ -23,9 +23,9 @@ $home = shift(@ARGV);
 
 $fortran_name_file = "$home/fortran_name.pl";
 
-if (! -e "$fortran_name_file" ) 
+if (! -e "$fortran_name_file" )
 {
-    die "Unable to get fortran name file $fortran_name_file!";
+  die "Unable to get fortran name file $fortran_name_file!";
 }
 
 require "$fortran_name_file";
@@ -46,129 +46,129 @@ $domacro2  = 0;
 $done2     = 0;
 
 $n_arg_braces = -3;
-$sc =0;
 
-$skip      = 0;
-$skipstring= "CCTK_NO_AUTOUSE_MACRO";
-  
+$skip       = 0;
+$skipstring = "CCTK_NO_AUTOUSE_MACRO";
+
 $/ = ";\n";
-$*=1;
+$* = 1;
 
-## parse the file up to a ";\n"
-while(<>)
-{ 
+$routine = '';
 
-## split in lines... and collect in routine;
-  $piece = $_;  
-  @lines = split("\n",$piece);
-  foreach $mline (@lines) 
+# parse the file up to a ";\n"
+while (<>)
+{
+  # split in lines... and collect in routine;
+  foreach $mline (split ("\n"))
   {
-    $routine.=$mline."\n";
+    $routine .= $mline . "\n";
 
     # skip one-line comments
     # (note that this is still incomplete for C comments -
     #  it is not checked if some code follows after the closing '*/')
-    next if ($mline=~m/^\s*\/\//);
-    next if ($mline=~m/^\s*\/\*.*\*\//);
+    next if ($mline =~ m/^\s*\/\//);
+    next if ($mline =~ m/^\s*\/\*.*\*\//);
 
-    if ($mline=~/$skipstring/)
+    if ($mline =~ /$skipstring/)
     {
       $skip = 1;
     }
 
-## check if the DECLARE macros are found on a line
-    if($mline=~m/$checkfor2/)
+    # check if the DECLARE macros are found on a line
+    if ($mline =~ m/$checkfor2/)
     {
+      # remove the trailing semicolon (is already expanded by the macro)
+      if ($mline =~ m/$checkfor2(\s*;)/)
+      {
+        $routine =~ s/$checkfor2$1/$checkfor2/g;
+      }
       $domacro2     = 1;
       $n_arg_braces = 0;
       $trigger      = 1;
     }
-    if($mline=~m/$checkfor1/)
+    if ($mline =~ m/$checkfor1/)
     {
+      # remove the trailing semicolon (is already expanded by the macro)
+      if ($mline =~ m/$checkfor1(\s*;)/)
+      {
+        $routine =~ s/$checkfor1$1/$checkfor1/g;
+      }
       $domacro1     = 1;
       $n_arg_braces = 0;
       $trigger      = 1;
     }
-## start counting braces if there has been a DECLARE_
-    if ($trigger>0) 
-    { 
-      while ($mline=~m/(})/g) {
-        $n_arg_braces--;
-      }
-      while ($mline=~m/({)/g)  {
-        $n_arg_braces++;
-      }
+    # start counting braces if there has been a DECLARE_
+    if ($trigger)
+    {
+      $n_arg_braces-- while ($mline =~ m/(})/g);
+      $n_arg_braces++ while ($mline =~ m/({)/g);
     }
-   
-    if (($n_arg_braces == -1) && ($skip==0))
+
+    if ($n_arg_braces == -1 && ! $skip)
     {
-##    Start adding first macro, deal with "return }"first, "}" after
-      if ($domacro1) {
-        if (!($routine=~s/([ \t\f]*)(return\s*\S*\s*}\s*)$/$1$addmacro1; $1$2/s))
+      # Start adding first macro, deal with "return }"first, "}" after
+      if ($domacro1)
+      {
+        if (! ($routine =~ s/([ \t\f]*)(return\s*\S*\s*}\s*)$/$1$addmacro1; $1$2/s))
         {
-          ($routine=~s/(}\s*$)/  $addmacro1; $1/s)
+          $routine =~ s/(}\s*$)/  $addmacro1; $1/s;
         }
-        $domacro1=0;  
+        $domacro1 = 0;
       }
-##    Start adding second macro
-      if ($domacro2) {
-        if (!($routine=~s/([ \t\f]*)(return\s*\S*\s*}\s*)$/$1$addmacro2 $1$2/s)) 
+      # Start adding second macro
+      if ($domacro2)
+      {
+        if (! ($routine =~ s/([ \t\f]*)(return\s*\S*\s*}\s*)$/$1$addmacro2 $1$2/s))
         {
-          ($routine=~s/(}\s*$)/  $addmacro2 $1/s) 
+          $routine =~ s/(}\s*$)/  $addmacro2 $1/s;
         }
-        $domacro2=0;
-      }  
-      $n_arg_braces = -2; 
-      $sc           =  0;
-
-## call the fortran namefix routine/reset routine
-      fixfnames($routine);
-      $routine      ="";
+        $domacro2 = 0;
+      }
+      $n_arg_braces = -2;
+
+      # call the fortran namefix routine/reset routine
+      fixfnames ($routine);
+      $routine = '';
     }
   }
-  
 }
-fixfnames($routine);
-$routine      ="";
 
+fixfnames ($routine);
+$routine = '';
 
-sub fixfnames {
 
-  my $myroutine=shift(@_); 
-  @flines=split /(;)/,$myroutine;
+sub fixfnames
+{
+  my $myroutine = shift (@_);
+  @flines = split /(;)/,$myroutine;
 
 #  print $myroutine;
 
   foreach $fline (@flines)
   {
-      while($fline =~ m:CCTK_FNAME\s*\(([^\)]*)\):)
+    while ($fline =~ m:CCTK_FNAME\s*\(([^\)]*)\):)
     {
-        $arglist = $1;
-        $arglist =~ s:[\s\n\t]+::g;
+      $arglist = $1;
+      $arglist =~ s:[\s\n\t]+::g;
 
-        @args = split(",", $arglist );
+      @args = split(",", $arglist );
 
-        $new = &fortran_name($args[$#args]);
+      $new = &fortran_name($args[$#args]);
 
-        $fline =~ s:CCTK_FNAME\s*\(([^\)]*)\):$new:;
+      $fline =~ s:CCTK_FNAME\s*\(([^\)]*)\):$new:;
     }
-    while($fline =~ m:CCTK_FORTRAN_COMMON_NAME\s*\(([^\)]*)\):)
+    while ($fline =~ m:CCTK_FORTRAN_COMMON_NAME\s*\(([^\)]*)\):)
     {
-        $arglist = $1;
-        $arglist =~ s:[\s\n\t]+::g;
+      $arglist = $1;
+      $arglist =~ s:[\s\n\t]+::g;
 
-        @args = split(",", $arglist );
+      @args = split(",", $arglist );
 
-        $new = &fortran_common_name($args[$#args]);
+      $new = &fortran_common_name($args[$#args]);
 
-        $fline =~ s:CCTK_FORTRAN_COMMON_NAME\s*\(([^\)]*)\):$new:;
+      $fline =~ s:CCTK_FORTRAN_COMMON_NAME\s*\(([^\)]*)\):$new:;
     }
 
     print $fline;
-    
-    
   }
-
 }
-
-