Detect if an inherited variable has the same name as a locally declared

one in an interface.ccl file.
Patch from Yaakoub.
Fixes PR 821.


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

1 files changed, 16 insertions, 1 deletions

diff --git a/lib/sbin/interface_parser.pl b/lib/sbin/interface_parser.pl
index d390cda5..cc8d7985 100644
--- a/lib/sbin/interface_parser.pl
+++ b/lib/sbin/interface_parser.pl
@@ -638,9 +638,24 @@ sub check_interface_consistency
     {
       if ($interface_data{"\U$ancestor_thorn\E PUBLIC GROUPS"} =~ m:([\^\s]+$private_group[$\s]+):)
       {
-        $message = "Private group $private_group in thorn $thorn has same name as \n     public group in ancestor implementation $ancestor_imp (e.g. thorn $ancestor_thorn)";
+        $message = "Private group $private_group in thorn $thorn has same name as \n     public group in ancestor implementation $ancestor_imp (i.e. thorn $ancestor_thorn)";
         &CST_error(0,$message,"",__LINE__,__FILE__);
       }
+      foreach $var (split " ", $interface_data{"\U$thorn\E GROUP \U$private_group\E"})
+      {
+        foreach $pub_anc(split " ", $interface_data{"\U$ancestor_thorn\E PUBLIC GROUPS"})
+        { 
+          if ($interface_data{"\U$ancestor_thorn\E GROUP \U$pub_anc\E"} =~  /$var/i)
+          {
+            $message = "Private variable $var in group $private_group in thorn $thorn has same name as \n     a variable in public group: $pub_anc in ancestor implementation $ancestor_imp (i.e. thorn $ancestor_thorn)";
+            &CST_error(0,$message,"",__LINE__,__FILE__);  
+          }
+
+        }
+
+        
+      }
+
     }
   }
 }