#1808

- Look for duplicate elements when parsing a file instead of later when it is too late (for functions)


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12924 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/BackEnd/BackendDAEOptimize.mo

@@ -2299,7 +2299,7 @@ protected function mergeAliasVars
   output BackendDAE.Var outVar;
 protected
   BackendDAE.Var v,va,v1,v2;
-  Boolean fixeda, fixed,fixeda,f;
+  Boolean fixed,fixeda,f;
   Option<DAE.Exp> sv,sva;
   DAE.Exp start;
 algorithm

Compiler/FrontEnd/SCode.mo

@@ -668,7 +668,7 @@ algorithm
   end match;
 end getElementNamed;
 
-protected function getElementNamedFromElts
+public function getElementNamedFromElts
 "function: getElementNamedFromElts
   Helper function to getElementNamed."
   input Ident inIdent;
@@ -847,11 +847,32 @@ public function elementName ""
   output String s;
 algorithm
   s := match(e)
-    case(COMPONENT(name = s)) then s;
-    case(CLASS(name = s)) then s;
+    case (COMPONENT(name = s)) then s;
+    case (CLASS(name = s)) then s;
   end match;
 end elementName;
 
+public function elementNames "Gets all elements that have an element name from the list"
+  input list<Element> elts;
+  output list<String> names;
+algorithm
+  names := List.fold(elts,elementNamesWork,{});
+end elementNames;
+
+protected function elementNamesWork "Gets all elements that have an element name from the list"
+  input Element e;
+  input list<String> acc;
+  output list<String> out;
+algorithm
+  out := match(e,acc)
+    local
+      String s;
+    case (COMPONENT(name = s),acc) then s::acc;
+    case (CLASS(name = s),acc) then s::acc;
+    else acc;
+  end match;
+end elementNamesWork;
+
 public function renameElement
   input Element inElement;
   input String inName;

Compiler/FrontEnd/SCodeCheck.mo

@@ -51,7 +51,7 @@ protected import List;
 protected import SCodeDump;
 protected import Util;
 
-public function checkDuplicateClasses
+public function checkDuplicateElements
   input SCode.Program inProgram;
 algorithm
   _ := match(inProgram)
@@ -61,30 +61,54 @@ algorithm
 
     case (sp)
       equation
-        names = List.map(sp, SCode.className);
+        names = SCode.elementNames(sp);
         names = List.sort(names,Util.strcmpBool);
         (_,names) = Util.splitUniqueOnBool(names,stringEqual);
-        checkForDuplicateClassesInTopScope(names);
-      then
-        ();
+        checkForDuplicateElements(names,sp);
+        List.map_0(sp,checkDuplicateElementsInClass);
+      then ();
+  end match;
+end checkDuplicateElements;
+
+public function checkDuplicateElementsInClass
+  input SCode.Element el;
+algorithm
+  _ := match el
+    local
+      SCode.Program sp;
+      list<SCode.Element> elts;
+      Absyn.Info info;
+      
+    case SCode.CLASS(classDef=SCode.PARTS(elementLst=elts),info=info)
+      equation
+        checkDuplicateElements(elts);
+      then ();
+    case SCode.CLASS(classDef=SCode.CLASS_EXTENDS(composition=SCode.PARTS(elementLst=elts)),info=info)
+      equation
+        checkDuplicateElements(elts);
+      then ();
+    else ();
   end match;
-end checkDuplicateClasses;
+end checkDuplicateElementsInClass;
 
-protected function checkForDuplicateClassesInTopScope
+protected function checkForDuplicateElements
 "Verifies that the input is empty; else an error message is printed"
   input list<String> duplicateNames;
+  input SCode.Program program;
 algorithm
-  _ := match duplicateNames
+  _ := match (duplicateNames,program)
     local
-      String msg;
-    case {} then ();
-    else
+      String msg,id;
+      SCode.Element elt;
+    case ({},_) then ();
+    case (id::_,program)
       equation
+        elt = SCode.getElementNamedFromElts(id,program);
         msg = stringDelimitList(duplicateNames, ",");
-        Error.addMessage(Error.DUPLICATE_CLASSES_TOP_LEVEL,{msg});
+        Error.addSourceMessage(Error.DOUBLE_DECLARATION_OF_ELEMENTS,{msg},SCode.elementInfo(elt));
       then fail();
   end match;
-end checkForDuplicateClassesInTopScope;
+end checkForDuplicateElements;
 
 public function checkRecursiveShortDefinition
   input Absyn.TypeSpec inTypeSpec;

Compiler/FrontEnd/SCodeUtil.mo

@@ -112,9 +112,9 @@ algorithm
         //       ModelicaBuiltin.mo and MetaModelicaBuiltin.mo
 
         // check duplicates in builtin (initial) functions
-        SCodeCheck.checkDuplicateClasses(spInitial);
+        SCodeCheck.checkDuplicateElements(spInitial);
         // check duplicates in absyn
-        SCodeCheck.checkDuplicateClasses(spAbsyn);
+        SCodeCheck.checkDuplicateElements(spAbsyn);
 
         sp = listAppend(spInitial, spAbsyn);
       then
@@ -1099,8 +1099,7 @@ algorithm
         e_1 = translateElement(e, vis);
         es_1 = translateEitemlist(es, vis);
         l = listAppend(e_1, es_1);
-      then
-        l;
+      then l;
 
     case ((Absyn.LEXER_COMMENT(comment = _) :: es),vis)
       then translateEitemlist(es, vis);
@@ -1112,6 +1111,22 @@ algorithm
   end match;
 end translateEitemlist;
 
+protected function checkForDuplicateElements
+"Verifies that the input is empty; else an error message is printed"
+  input list<String> duplicateNames;
+algorithm
+  _ := match duplicateNames
+    local
+      String msg;
+    case {} then ();
+    else
+      equation
+        msg = stringDelimitList(duplicateNames, ",");
+        Error.addMessage(Error.DOUBLE_DECLARATION_OF_ELEMENTS,{msg});
+      then fail();
+  end match;
+end checkForDuplicateElements;
+
 // stefan
 protected function translateAnnotations
 "function: translateAnnotations

Compiler/Util/Name.mo

@@ -145,7 +145,7 @@ protected
   NameInteger n2i;
   IntegerName i2n;
   Integer seqNo;
-  String str, str1, str2;
+  String str1, str2;
 algorithm
   NAMES(n2i, i2n, seqNo) := inNames;
   str1 := AvlTree.prettyPrintTreeStr(n2i);