[NF] Redeclare improvements.

- Improved handling of all types of redeclare.
- Implemented propagation of final through the frontend, and added
  checks for final elements being modified.
- Various instantiation improvements.

Belonging to [master]:
  - #2288
  - OpenModelica/OpenModelica-testsuite#880

Author: perost

Compiler/FrontEnd/SCode.mo

@@ -4113,6 +4113,16 @@ algorithm
   end match;
 end getModifierBinding;
 
+function getComponentCondition
+  input Element element;
+  output Option<Absyn.Exp> condition;
+algorithm
+  condition := match element
+    case COMPONENT() then element.condition;
+    else NONE();
+  end match;
+end getComponentCondition;
+
 public function removeComponentCondition
   input Element inElement;
   output Element outElement;
@@ -5763,5 +5773,39 @@ algorithm
   end match;
 end isEmptyMod;
 
+function getConstrainingMod
+  input SCode.Element element;
+  output SCode.Mod mod;
+algorithm
+  mod := match element
+    case Element.CLASS(prefixes = Prefixes.PREFIXES(replaceablePrefix =
+      Replaceable.REPLACEABLE(cc = SOME(ConstrainClass.CONSTRAINCLASS(modifier = mod))))) then mod;
+    case Element.CLASS(classDef = ClassDef.DERIVED(modifications = mod)) then mod;
+    case Element.COMPONENT(prefixes = Prefixes.PREFIXES(replaceablePrefix =
+      Replaceable.REPLACEABLE(cc = SOME(ConstrainClass.CONSTRAINCLASS(modifier = mod))))) then mod;
+    case Element.COMPONENT(modifications = mod) then mod;
+    else Mod.NOMOD();
+  end match;
+end getConstrainingMod;
+
+function isEmptyClassDef
+  input SCode.ClassDef cdef;
+  output Boolean isEmpty;
+algorithm
+  isEmpty := match cdef
+    case PARTS()
+      then listEmpty(cdef.elementLst) and
+           listEmpty(cdef.normalEquationLst) and
+           listEmpty(cdef.initialEquationLst) and
+           listEmpty(cdef.normalAlgorithmLst) and
+           listEmpty(cdef.initialAlgorithmLst) and
+           isNone(cdef.externalDecl);
+
+    case CLASS_EXTENDS() then isEmptyClassDef(cdef.composition);
+    case ENUMERATION() then listEmpty(cdef.enumLst);
+    else true;
+  end match;
+end isEmptyClassDef;
+
 annotation(__OpenModelica_Interface="frontend");
 end SCode;

Compiler/NFFrontEnd/NFClass.mo

@@ -78,6 +78,7 @@ uniontype Class
   record PARTIAL_CLASS
     ClassTree elements;
     Modifier modifier;
+    Class.Prefixes prefixes;
   end PARTIAL_CLASS;
 
   record EXPANDED_CLASS
@@ -121,12 +122,13 @@ uniontype Class
     input list<SCode.Element> elements;
     input Boolean isClassExtends;
     input InstNode scope;
+    input Prefixes prefixes;
     output Class cls;
   protected
     ClassTree tree;
   algorithm
     tree := ClassTree.fromSCode(elements, isClassExtends, scope);
-    cls := PARTIAL_CLASS(tree, Modifier.NOMOD());
+    cls := PARTIAL_CLASS(tree, Modifier.NOMOD(), prefixes);
   end fromSCode;
 
   function fromEnumeration
@@ -147,8 +149,7 @@ uniontype Class
   algorithm
     cls := match cls
       case PARTIAL_CLASS()
-        then EXPANDED_CLASS(cls.elements, cls.modifier, DEFAULT_PREFIXES,
-          Restriction.UNKNOWN());
+        then EXPANDED_CLASS(cls.elements, cls.modifier, cls.prefixes, Restriction.UNKNOWN());
     end match;
   end initExpandedClass;
 
@@ -261,6 +262,39 @@ uniontype Class
     end match;
   end getModifier;
 
+  function setModifier
+    input Modifier modifier;
+    input output Class cls;
+  algorithm
+    () := match cls
+      case PARTIAL_CLASS()
+        algorithm
+          cls.modifier := modifier;
+        then
+          ();
+      case EXPANDED_CLASS()
+        algorithm
+          cls.modifier := modifier;
+        then
+          ();
+      case DERIVED_CLASS()
+        algorithm
+          cls.modifier := modifier;
+        then
+          ();
+      case PARTIAL_BUILTIN()
+        algorithm
+          cls.modifier := modifier;
+        then
+          ();
+      else
+        algorithm
+          Error.assertion(false, getInstanceName() + " got non-modifiable class", sourceInfo());
+        then
+          fail();
+    end match;
+  end setModifier;
+
   function mergeModifier
     input Modifier modifier;
     input output Class cls;
@@ -422,6 +456,36 @@ uniontype Class
     output Boolean isFunction = Restriction.isFunction(restriction(cls));
   end isFunction;
 
+  function getPrefixes
+    input Class cls;
+    output Prefixes prefs;
+  algorithm
+    prefs := match cls
+      case PARTIAL_CLASS() then cls.prefixes;
+      case EXPANDED_CLASS() then cls.prefixes;
+      case DERIVED_CLASS() then cls.prefixes;
+    end match;
+  end getPrefixes;
+
+  function setPrefixes
+    input Prefixes prefs;
+    input output Class cls;
+  algorithm
+    () := match cls
+      case EXPANDED_CLASS()
+        algorithm
+          cls.prefixes := prefs;
+        then
+          ();
+
+      case DERIVED_CLASS()
+        algorithm
+          cls.prefixes := prefs;
+        then
+          ();
+
+    end match;
+  end setPrefixes;
 end Class;
 
 annotation(__OpenModelica_Interface="frontend");