[NF] Keep vectors in connect equations

Belonging to [master]: - OpenModelica/OMCompiler#2712
OpenModelica · Oct 10, 2018 · d7274ca · d7274ca
1 parent 0dbda2b
commit d7274ca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Compiler/NFFrontEnd/NFConnections.mo b/Compiler/NFFrontEnd/NFConnections.mo
@@ -144,6 +144,12 @@ public
     Boolean expanded;
   algorithm
     cr := ComponentRef.evaluateSubscripts(cref);
+
+    if not Flags.isSet(Flags.NF_SCALARIZE) then
+      connectors := {Connector.fromCref(cr, ComponentRef.getSubscriptedType(cr), source)};
+      return;
+    end if;
+
     cref_exp := Expression.CREF(ComponentRef.getSubscriptedType(cr), cr);
     (cref_exp, expanded) := ExpandExp.expand(cref_exp);
 

diff --git a/Compiler/NFFrontEnd/NFConnector.mo b/Compiler/NFFrontEnd/NFConnector.mo
@@ -230,10 +230,14 @@ protected
 
       case Type.ARRAY()
         algorithm
-          t := Type.arrayElementType(ty);
-          for c in ComponentRef.scalarize(name) loop
-            conns := splitImpl(c, t, face, source, cty, conns);
-          end for;
+          if Flags.isSet(Flags.NF_SCALARIZE) then
+            t := Type.arrayElementType(ty);
+            for c in ComponentRef.scalarize(name) loop
+              conns := splitImpl(c, t, face, source, cty, conns);
+            end for;
+          else
+            conns := CONNECTOR(name, ty, face, cty, source) :: conns;
+          end if;
         then
           conns;