Implemented handling of duplicates in nfinst.

- Changed BaseAvlTree.ConflictFunc to also take the key as argument,
  to make it more useful for e.g. BaseAvlTree.join and to facilitate
  reuse of conflict handlers.
- Implemented basic handling of duplicate elements.
- Implemented basic handling of element redeclares.
- Improved name lookup for e.g. base class names.
- Added check for transitively non-replaceable base classes.

Author: perost

Compiler/FFrontEnd/FNode.mo

@@ -349,15 +349,15 @@ end addChildRef;
 protected function printElementConflictError
   input Ref newRef;
   input Ref oldRef;
+  input RefTree.Key name;
   output Ref dummy;
 protected
   SourceInfo info1, info2;
-  String name;
 algorithm
   if Config.acceptMetaModelicaGrammar() then
     dummy := newRef;
   else
-    (name, info1) := SCode.elementNameInfo(FNode.getElementFromRef(newRef));
+    info1 := SCode.elementInfo(FNode.getElementFromRef(newRef));
     info2 := SCode.elementInfo(FNode.getElementFromRef(oldRef));
     Error.addMultiSourceMessage(Error.DOUBLE_DECLARATION_OF_ELEMENTS, {name}, {info2, info1});
     fail();

Compiler/FrontEnd/NFSCodeEnv.mo

@@ -787,6 +787,7 @@ end extendEnvWithItem;
 function extendEnvWithItemConflict
   input Item newItem;
   input Item oldItem;
+  input String name;
   output Item item;
 algorithm
   item := linkItemUsage(oldItem, newItem);

Compiler/NFFrontEnd/NFBinding.mo

@@ -205,5 +205,27 @@ public
     end match;
   end toString;
 
+  function isEqual
+    input Binding binding1;
+    input Binding binding2;
+    output Boolean equal;
+  algorithm
+    equal := match (binding1, binding2)
+      case (UNBOUND(), UNBOUND()) then true;
+
+      // TODO: Handle propagated dims.
+      case (RAW_BINDING(), RAW_BINDING())
+        then Absyn.expEqual(binding1.bindingExp, binding2.bindingExp);
+
+      case (UNTYPED_BINDING(), UNTYPED_BINDING())
+        then Expression.isEqual(binding1.bindingExp, binding2.bindingExp);
+
+      case (TYPED_BINDING(), TYPED_BINDING())
+        then Expression.isEqual(binding1.bindingExp, binding2.bindingExp);
+
+      else false;
+    end match;
+  end isEqual;
+
 annotation(__OpenModelica_Interface="frontend");
 end NFBinding;

Compiler/NFFrontEnd/NFClass.mo

@@ -54,6 +54,12 @@ uniontype Class
     end PREFIXES;
 
     record DEFAULT end DEFAULT;
+
+    function isEqual
+      input Prefixes prefs1;
+      input Prefixes prefs2;
+      output Boolean isEqual = valueEq(prefs1, prefs2);
+    end isEqual;
   end Prefixes;
 
   record NOT_INSTANTIATED end NOT_INSTANTIATED;
@@ -238,6 +244,28 @@ uniontype Class
           fail();
     end match;
   end mergeModifier;
+
+  function isIdentical
+    input Class cls1;
+    input Class cls2;
+    output Boolean identical = false;
+  algorithm
+    identical := match (cls1, cls2)
+      case (EXPANDED_CLASS(), EXPANDED_CLASS())
+        then Prefixes.isEqual(cls1.prefixes, cls2.prefixes) and
+             ClassTree.isIdentical(cls1.elements, cls2.elements);
+
+      case (INSTANCED_BUILTIN(), INSTANCED_BUILTIN())
+        algorithm
+          if not Type.isEqual(cls1.ty, cls2.ty) then
+            return;
+          end if;
+        then
+          true;
+
+      else true;
+    end match;
+  end isIdentical;
 end Class;
 
 annotation(__OpenModelica_Interface="frontend");