Fix for #3535.

- Detect duplicate classes and give an error.

Author: perost

Compiler/FFrontEnd/FGraph.mo

@@ -1085,6 +1085,7 @@ public function mkClassNode
   input SCode.Element inClass;
   input Prefix.Prefix inPrefix;
   input DAE.Mod inMod;
+  input Boolean checkDuplicate = false;
   output Graph outGraph;
 algorithm
   outGraph := matchcontinue (inGraph, inClass, inPrefix, inMod)
@@ -1105,7 +1106,8 @@ algorithm
     case (g, SCode.CLASS(), _, _)
       equation
         r = lastScopeRef(g);
-        g = FGraphBuildEnv.mkClassNode(inClass, inPrefix, inMod, r, FCore.USERDEFINED(), g);
+        g = FGraphBuildEnv.mkClassNode(inClass, inPrefix, inMod, r,
+          FCore.USERDEFINED(), g, checkDuplicate);
       then
         g;
 

Compiler/FFrontEnd/FGraphBuildEnv.mo

@@ -78,13 +78,15 @@ public function mkProgramGraph
 "builds nodes out of classes"
   input SCode.Program inProgram;
   input Kind inKind;
-  input Graph inGraph;
-  output Graph outGraph;
+  input output Graph graph;
 protected
   Ref topRef;
 algorithm
-  topRef := FGraph.top(inGraph);
-  outGraph := List.fold2(inProgram, mkClassGraph, topRef, inKind, inGraph);
+  topRef := FGraph.top(graph);
+
+  for cls in inProgram loop
+    graph := mkClassGraph(cls, topRef, inKind, graph, true);
+  end for;
 end mkProgramGraph;
 
 protected function mkClassGraph
@@ -93,6 +95,7 @@ protected function mkClassGraph
   input Ref inParentRef;
   input Kind inKind;
   input Graph inGraph;
+  input Boolean checkDuplicate = false;
   output Graph outGraph;
 algorithm
   outGraph := match(inClass, inParentRef, inKind, inGraph)
@@ -105,7 +108,8 @@ algorithm
     // class (we don't care here if is replaceable or not we can get that from the class)
     case (SCode.CLASS(), _, _, g)
       equation
-        g = mkClassNode(inClass, Prefix.NOPRE(), DAE.NOMOD(), inParentRef, inKind, g);
+        g = mkClassNode(inClass, Prefix.NOPRE(), DAE.NOMOD(), inParentRef,
+          inKind, g, checkDuplicate);
       then
         g;
 
@@ -119,6 +123,7 @@ public function mkClassNode
   input Ref inParentRef;
   input Kind inKind;
   input Graph inGraph;
+  input Boolean checkDuplicate = false;
   output Graph outGraph;
 algorithm
   outGraph := match(inClass, inPrefix, inMod, inParentRef, inKind, inGraph)
@@ -137,7 +142,7 @@ algorithm
         SCode.CLASS(name = name) = cls;
         (g, n) = FGraph.node(g, name, {inParentRef}, FCore.CL(cls, inPrefix, inMod, inKind, FCore.CLS_UNTYPED()));
         nr = FNode.toRef(n);
-        FNode.addChildRef(inParentRef, name, nr);
+        FNode.addChildRef(inParentRef, name, nr, checkDuplicate);
         // g = mkRefNode(FNode.refNodeName, {}, nr, g);
       then
         g;

Compiler/FFrontEnd/FNode.mo

@@ -330,6 +330,7 @@ public function addChildRef
   input Ref inParentRef;
   input Name inName;
   input Ref inChildRef;
+  input Boolean checkDuplicate = false;
 protected
   Name n;
   Integer i;
@@ -339,7 +340,8 @@ protected
   Ref parent;
 algorithm
   FCore.N(n, i, p, c, d) := fromRef(inParentRef);
-  c := RefTree.add(c, inName, inChildRef, printElementConflictError);
+  c := RefTree.add(c, inName, inChildRef,
+    if checkDuplicate then printElementConflictError else RefTree.addConflictReplace);
   parent := updateRef(inParentRef, FCore.N(n, i, p, c, d));
   FGraphStream.edge(inName, fromRef(parent), fromRef(inChildRef));
 end addChildRef;
@@ -352,11 +354,14 @@ protected
   SourceInfo info1, info2;
   String name;
 algorithm
-  dummy := newRef;
-  //(name, info1) := SCode.elementNameInfo(FNode.getElementFromRef(newRef));
-  //info2 := SCode.elementInfo(FNode.getElementFromRef(oldRef));
-  //Error.addMultiSourceMessage(Error.DOUBLE_DECLARATION_OF_ELEMENTS, {name}, {info2, info1});
-  //fail();
+  if Config.acceptMetaModelicaGrammar() then
+    dummy := newRef;
+  else
+    (name, info1) := SCode.elementNameInfo(FNode.getElementFromRef(newRef));
+    info2 := SCode.elementInfo(FNode.getElementFromRef(oldRef));
+    Error.addMultiSourceMessage(Error.DOUBLE_DECLARATION_OF_ELEMENTS, {name}, {info2, info1});
+    fail();
+  end if;
 end printElementConflictError;
 
 public function addImportToRef

Compiler/FrontEnd/Inst.mo

@@ -2011,7 +2011,8 @@ algorithm
 
         extendselts = SCodeUtil.addRedeclareAsElementsToExtends(extendselts, List.select(els, SCodeUtil.isRedeclareElement));
 
-        (cache, env1,ih) = InstUtil.addClassdefsToEnv(cache, env, ih, pre, cdefelts, impl, SOME(mods));
+        (cache, env1,ih) = InstUtil.addClassdefsToEnv(cache, env, ih, pre,
+          cdefelts, impl, SOME(mods), FGraph.isEmptyScope(env));
 
         //// fprintln(Flags.INST_TRACE, "after InstUtil.addClassdefsToEnv ENV: " + if_(stringEq(className, "PortVolume"), FGraph.printGraphStr(env1), " no env print "));
 
@@ -2849,7 +2850,7 @@ algorithm
 
         // Classes and imports are added to env.
         (outCache, outEnv, outIH) := InstUtil.addClassdefsToEnv(inCache, inEnv,
-          inIH, inPrefix, cdef_els, true, SOME(inMod));
+          inIH, inPrefix, cdef_els, true, SOME(inMod), FGraph.isEmptyScope(inEnv));
         // Inherited elements are added to env.
         (outCache, outEnv, outIH, emods, ext_comps) := InstExtends.instExtendsAndClassExtendsList(
           outCache, outEnv, outIH, inMod, inPrefix, extends_els, class_ext_els,

Compiler/FrontEnd/InstUtil.mo

@@ -2196,13 +2196,14 @@ public function addClassdefsToEnv
   input list<SCode.Element> inClasses;
   input Boolean inImpl;
   input Option<DAE.Mod> inRedeclareMod;
+  input Boolean checkDuplicates = false;
   output FCore.Cache outCache = inCache;
   output FCore.Graph outEnv = inEnv;
   output InnerOuter.InstHierarchy outIH = inIH;
 algorithm
   for c in inClasses loop
     (outCache, outEnv, outIH) :=
-      addClassdefToEnv(outCache, outEnv, outIH, inPrefix, c, inImpl, inRedeclareMod);
+      addClassdefToEnv(outCache, outEnv, outIH, inPrefix, c, inImpl, inRedeclareMod, checkDuplicates);
   end for;
 end addClassdefsToEnv;
 
@@ -2216,6 +2217,7 @@ protected function addClassdefToEnv
   input SCode.Element inSCodeElement;
   input Boolean inBoolean;
   input Option<DAE.Mod> redeclareMod;
+  input Boolean checkDuplicates = false;
   output FCore.Cache outCache;
   output FCore.Graph outEnv;
   output InnerOuter.InstHierarchy outIH;
@@ -2252,7 +2254,7 @@ algorithm
     case (cache,env,ih,pre,(sel1 as SCode.CLASS()),_)
       equation
         // Debug.traceln("Extend frame " + FGraph.printGraphPathStr(env) + " with " + SCode.className(cl));
-        env_1 = FGraph.mkClassNode(env, sel1, pre, DAE.NOMOD());
+        env_1 = FGraph.mkClassNode(env, sel1, pre, DAE.NOMOD(), checkDuplicates);
         ih = InnerOuter.addClassIfInner(sel1, pre, env_1, ih);
       then
         (cache,env_1,ih);