[NF] Improve expandable connectors.

- Handle expandable connectors in complex arrays better.

Author: perost

OMCompiler/Compiler/NFFrontEnd/NFExpandableConnectors.mo

@@ -391,6 +391,7 @@ algorithm
   end if;
 
   cls_node := InstNode.classScope(exp_node);
+  cls_node := InstNode.clone(cls_node);
   cls := InstNode.getClass(cls_node);
   cls_tree := Class.classTree(cls);
 
@@ -418,7 +419,6 @@ algorithm
         ElementSource.getInfo(c.source));
       vars := var :: vars;
     else
-      comp_node := ClassTree.lookupElement(InstNode.name(node), cls_tree);
       comp_node := InstNode.resolveInner(comp_node);
 
       if InstNode.isComponent(comp_node) then

OMCompiler/Compiler/NFFrontEnd/NFInstNode.mo

@@ -1600,6 +1600,7 @@ uniontype InstNode
     () := match node
       local
         Class cls;
+        Component comp;
 
       case CLASS_NODE()
         algorithm
@@ -1610,6 +1611,14 @@ uniontype InstNode
         then
           ();
 
+      case COMPONENT_NODE()
+        algorithm
+          comp := Pointer.access(node.component);
+          comp := Component.setClassInstance(InstNode.clone(Component.classInstance(comp)), comp);
+          node.component := Pointer.create(comp);
+        then
+          ();
+
       else ();
     end match;
   end clone;

testsuite/flattening/modelica/scodeinst/ExpandableConnector4.mo

@@ -0,0 +1,36 @@
+// name: ExpandableConnector4
+// keywords: expandable connector
+// status: correct
+// cflags: -d=newInst
+//
+//
+
+expandable connector EC
+end EC;
+
+model A
+  connector RealOutput = output Real;
+  RealOutput y = 0;
+  EC ec;
+equation
+  connect(ec.y, y);
+end A;
+
+model ExpandableConnector4
+  A a[3];
+end ExpandableConnector4;
+
+// Result:
+// class ExpandableConnector4
+//   Real a[3].ec.y "virtual variable in expandable connector";
+//   Real a[2].ec.y "virtual variable in expandable connector";
+//   Real a[1].ec.y "virtual variable in expandable connector";
+//   Real a[1].y = 0.0;
+//   Real a[2].y = 0.0;
+//   Real a[3].y = 0.0;
+// equation
+//   a[1].ec.y = a[1].y;
+//   a[2].ec.y = a[2].y;
+//   a[3].ec.y = a[3].y;
+// end ExpandableConnector4;
+// endResult

testsuite/flattening/modelica/scodeinst/Makefile

@@ -352,6 +352,7 @@ EvaluateAllParams2.mo \
 ExpandableConnector1.mo \
 ExpandableConnector2.mo \
 ExpandableConnector3.mo \
+ExpandableConnector4.mo \
 ExpandableConnectorFlow1.mo \
 ExpandableConnectorFlow2.mo \
 ExpandableConnectorNonDecl1.mo \