Added LOGICAL to one of the matches, and made the change

<       elsif($1 && $1 =~ m:EXTENDS:i && $block ne "FRIEND")
---
>       elsif($1 && $1 =~ m:EXTENDS:i && $block !~ m:FRIEND\s*\S:)


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

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/sbin/parameter_parser.pl b/lib/sbin/parameter_parser.pl
index 10ca33cd..204ec58b 100644
--- a/lib/sbin/parameter_parser.pl
+++ b/lib/sbin/parameter_parser.pl
@@ -154,7 +154,7 @@ sub parse_param_ccl
   
   # Initialise, to prevent perl -w from complaining.
   $parameter_db{"\U$thorn PRIVATE\E variables"} = "";
-  
+
   for($line_number = 0; $line_number < @data; $line_number++)
   {
     $line = $data[$line_number];
@@ -182,9 +182,9 @@ sub parse_param_ccl
 	$parameter_db{"\U$thorn $block\E variables"} = "";
       }
     }
-    elsif($line =~ m:(EXTENDS )?\s*(INTEGER|REAL|KEYWORD|STRING)\s*([a-zA-Z]+[a-zA-Z0-9_]*) \s*(\"[^\"]*\"):i)
+    elsif($line =~ m:(EXTENDS )?\s*(INTEGER|REAL|LOGICAL|KEYWORD|STRING)\s*([a-zA-Z]+[a-zA-Z0-9_]*) \s*(\"[^\"]*\"):i)
     {
-      
+
       #           This is a parameter definition.
       $type = "\U$2\E";
       $variable = $3;
@@ -197,7 +197,7 @@ sub parse_param_ccl
 	$nerrors++;
 	$line_number++ until ($data[$line_number] =~ m:\}:);
       }
-      elsif($1 && $1 =~ m:EXTENDS:i && $block ne "FRIEND")
+      elsif($1 && $1 =~ m:EXTENDS:i && $block !~ m:FRIEND\s*\S:)
       {
 	#               Can only extend a friend variable.
 	print STDERR "Parse error at line $line_number\n";