fix to correctly match the last } in a routine

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

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/sbin/c_file_processor.pl b/lib/sbin/c_file_processor.pl
index b040bf92..d16619b5 100644
--- a/lib/sbin/c_file_processor.pl
+++ b/lib/sbin/c_file_processor.pl
@@ -92,17 +92,17 @@ while(<>)
     {
 ##    Start adding first macro, deal with "return }"first, "}" after
       if ($domacro1) {
-        if (!($routine=~s/([ \t\f]*)(return\s*\S*\s*})$/$1$addmacro1\n$1$2/s))
+        if (!($routine=~s/([ \t\f]*)(return\s*\S*\s*}\s*)$/$1$addmacro1\n$1$2/s))
         {
-	  ($routine=~s/(}$)/  $addmacro1\n$1/s)
+	  ($routine=~s/(}\s*$)/  $addmacro1\n$1/s)
 	}
 
       }
 ##    Start adding second macro
       if ($domacro2) {
-	if (!($routine=~s/([ \t\f]*)(return\s*\S*\s*})$/$1$addmacro2\n$1$2/s)) 
+	if (!($routine=~s/([ \t\f]*)(return\s*\S*\s*}\s*)$/$1$addmacro2\n$1$2/s)) 
 	{
-	  ($routine=~s/(}$)/  $addmacro2\n$1/s) 
+	  ($routine=~s/(}\s*$)/  $addmacro2\n$1/s) 
         }
       }  
       $n_arg_braces = -2;