[NF] Improve handling of conditional components.

- Correctly handle connections where the connectors themselves are not
  deleted but contain children that are.

Belonging to [master]:
  - #2529
  - OpenModelica/OpenModelica-testsuite#982

Author: perost

Compiler/NFFrontEnd/NFComponent.mo

@@ -195,6 +195,10 @@ uniontype Component
     Modifier modifier;
   end TYPE_ATTRIBUTE;
 
+  record DELETED_COMPONENT
+    Component component;
+  end DELETED_COMPONENT;
+
   function new
     input SCode.Element definition;
     output Component component;
@@ -325,6 +329,7 @@ uniontype Component
       case UNTYPED_COMPONENT() then InstNode.getType(component.classInst);
       case ITERATOR() then component.ty;
       case TYPE_ATTRIBUTE() then component.ty;
+      case DELETED_COMPONENT() then getType(component.component);
       else Type.UNKNOWN();
     end match;
   end getType;
@@ -628,6 +633,7 @@ uniontype Component
     cty := match component
       case UNTYPED_COMPONENT(attributes = Attributes.ATTRIBUTES(connectorType = cty)) then cty;
       case TYPED_COMPONENT(attributes = Attributes.ATTRIBUTES(connectorType = cty)) then cty;
+      case DELETED_COMPONENT() then connectorType(component.component);
       else ConnectorType.POTENTIAL;
     end match;
   end connectorType;
@@ -752,6 +758,8 @@ uniontype Component
 
       case TYPED_COMPONENT(condition = condition)
         then Binding.isBound(condition) and Expression.isFalse(Binding.getTypedExp(condition));
+
+      case DELETED_COMPONENT() then true;
       else false;
     end match;
   end isDeleted;

Compiler/NFFrontEnd/NFComponentRef.mo

@@ -739,7 +739,7 @@ public
         InstNode node;
 
       case CREF(node = node, origin = Origin.CREF)
-        then InstNode.isComponent(node) and Component.isDeleted(InstNode.component(node)) or isDeleted(cref.restCref);
+        then InstNode.isComponent(node) and Component.isDeleted(InstNode.component(node));
       else false;
     end match;
   end isDeleted;

Compiler/NFFrontEnd/NFConnectionSets.mo

@@ -106,7 +106,13 @@ package ConnectionSets
 
     for c1 in lhsl loop
       c2 :: rhsl := rhsl;
-      sets := merge(c1, c2, sets);
+
+      // Connections involving deleted conditional connectors are filtered out
+      // when collecting the connections, but if the connectors themselves
+      // contain connectors that have been deleted we need to remove them here.
+      if not (Connector.isDeleted(c1) or Connector.isDeleted(c2)) then
+        sets := merge(c1, c2, sets);
+      end if;
     end for;
   end addConnection;
 

Compiler/NFFrontEnd/NFConnector.mo

@@ -147,6 +147,11 @@ public
     isInside := f == Face.INSIDE;
   end isInside;
 
+  function isDeleted
+    input Connector conn;
+    output Boolean isDeleted = ComponentRef.isDeleted(conn.name);
+  end isDeleted;
+
   function name
     input Connector conn;
     output ComponentRef name = conn.name;

Compiler/NFFrontEnd/NFFlatten.mo

@@ -243,8 +243,9 @@ algorithm
   () := match c
     case Component.TYPED_COMPONENT(condition = condition, ty = ty)
       algorithm
-        // Don't add the component if it has a condition that's false.
+        // Delete the component if it has a condition that's false.
         if Binding.isBound(condition) and Expression.isFalse(Binding.getTypedExp(condition)) then
+          deleteComponent(component);
           return;
         end if;
 
@@ -269,6 +270,45 @@ algorithm
   end match;
 end flattenComponent;
 
+function deleteComponent
+  "Recursively marks components as deleted."
+  input InstNode compNode;
+protected
+  Component comp;
+algorithm
+  if not InstNode.isEmpty(compNode) then
+    comp := InstNode.component(compNode);
+    InstNode.updateComponent(Component.DELETED_COMPONENT(comp), compNode);
+    deleteClassComponents(Component.classInstance(comp));
+  end if;
+end deleteComponent;
+
+function deleteClassComponents
+  input InstNode clsNode;
+protected
+  Class cls = InstNode.getClass(clsNode);
+  array<InstNode> comps;
+algorithm
+  () := match cls
+    case Class.INSTANCED_CLASS(elements = ClassTree.FLAT_TREE(components = comps))
+      guard not Restriction.isType(cls.restriction)
+      algorithm
+        for c in comps loop
+          deleteComponent(c);
+        end for;
+      then
+        ();
+
+    case Class.TYPED_DERIVED()
+      algorithm
+        deleteClassComponents(cls.baseClass);
+      then
+        ();
+
+    else ();
+  end match;
+end deleteClassComponents;
+
 function isComplexComponent
   input Type ty;
   output Boolean isComplex;