new front-end connection handling preparation

- adapt the old front-end with some changes needed for the new front-end
- add DAE.CONNECT_EQUATION
- use DAE.ConnectorType inside DAE.Attributes.ATTR instead of SCode.ConnectorType

Author: adrpo

Compiler/FFrontEnd/FGraph.mo

@@ -556,7 +556,7 @@ algorithm
               SCode.noComment, NONE(), Absyn.dummyInfo);
         v = DAE.TYPES_VAR(
               name,
-              DAE.ATTR(SCode.POTENTIAL(), SCode.NON_PARALLEL(), variability, Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC()),
+              DAE.ATTR(DAE.NON_CONNECTOR(), SCode.NON_PARALLEL(), variability, Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC()),
               ty,
               binding,
               constOfForIteratorRange);

Compiler/FFrontEnd/FNode.mo

@@ -606,7 +606,7 @@ algorithm
         nd = FCore.CO(inElement, DAE.NOMOD(), inKind, FCore.VAR_UNTYPED());
         i  = DAE.TYPES_VAR(
                   n,
-                  DAE.ATTR(ct,prl,var,dir,io,vis),
+                  DAE.ATTR(DAEUtil.toConnectorTypeNoState(ct),prl,var,dir,io,vis),
                   DAE.T_UNKNOWN_DEFAULT,
                   DAE.UNBOUND(),NONE());
       then

Compiler/FrontEnd/ConnectUtil.mo

@@ -183,7 +183,7 @@ public function addConnection
   input Face face1;
   input DAE.ComponentRef cref2;
   input Face face2;
-  input SCode.ConnectorType connectorType;
+  input DAE.ConnectorType connectorType;
   input DAE.ElementSource source;
 protected
   ConnectorElement e1, e2;
@@ -222,7 +222,7 @@ public function addArrayConnection
   input DAE.ComponentRef cref2;
   input Face face2;
   input DAE.ElementSource source;
-  input SCode.ConnectorType connectorType;
+  input DAE.ConnectorType connectorType;
 protected
   list<DAE.ComponentRef> crefs1, crefs2;
   DAE.ComponentRef cr2;
@@ -238,13 +238,16 @@ end addArrayConnection;
 
 protected function makeConnectorType
   "Creates a connector type from the flow or stream prefix given."
-  input SCode.ConnectorType connectorType;
+  input DAE.ConnectorType connectorType;
   output ConnectorType ty;
+protected
+  Option<DAE.ComponentRef> flowName;
 algorithm
   ty := match(connectorType)
-    case SCode.POTENTIAL() then ConnectorType.EQU();
-    case SCode.FLOW() then ConnectorType.FLOW();
-    case SCode.STREAM() then ConnectorType.STREAM(NONE());
+    case DAE.POTENTIAL() then ConnectorType.EQU();
+    case DAE.FLOW() then ConnectorType.FLOW();
+    case DAE.STREAM(flowName) then ConnectorType.STREAM(flowName);
+    case DAE.NON_CONNECTOR() then ConnectorType.NO_TYPE();
     else
       algorithm
         Error.addMessage(Error.INTERNAL_ERROR,
@@ -381,13 +384,13 @@ protected function getStreamAndFlowVariables
 algorithm
   for var in variables loop
     _ := match var
-      case DAE.TYPES_VAR(attributes = DAE.ATTR(connectorType = SCode.FLOW()))
+      case DAE.TYPES_VAR(attributes = DAE.ATTR(connectorType = DAE.FLOW()))
         algorithm
           flows := var :: flows;
         then
           ();
 
-      case DAE.TYPES_VAR(attributes = DAE.ATTR(connectorType = SCode.STREAM()))
+      case DAE.TYPES_VAR(attributes = DAE.ATTR(connectorType = DAE.STREAM()))
         algorithm
           streams := var :: streams;
         then
@@ -2853,14 +2856,14 @@ algorithm
     else
       _ := match attr
         // A flow variable.
-        case DAE.ATTR(connectorType = SCode.FLOW())
+        case DAE.ATTR(connectorType = DAE.FLOW())
           algorithm
             flowVars := flowVars + sizeOfType(var.ty);
           then
             ();
 
         // A stream variable.
-        case DAE.ATTR(connectorType = SCode.STREAM())
+        case DAE.ATTR(connectorType = DAE.STREAM())
           algorithm
             streamVars := streamVars + sizeOfType(var.ty);
           then

Compiler/FrontEnd/DAE.mo

@@ -47,6 +47,7 @@ import ClassInf;
 import SCode;
 import Prefix;
 import Values;
+import Connect;
 
 protected
 import DAEDump;
@@ -73,9 +74,12 @@ public uniontype VarKind
 end VarKind;
 
 public uniontype ConnectorType
+  "The type of a connector element."
   record POTENTIAL end POTENTIAL;
   record FLOW end FLOW;
-  record STREAM end STREAM;
+  record STREAM
+    Option<ComponentRef> associatedFlow;
+  end STREAM;
   record NON_CONNECTOR end NON_CONNECTOR;
 end ConnectorType;
 
@@ -240,6 +244,14 @@ public uniontype Element
     ElementSource source "the origin of the component/equation/algorithm" ;
   end INITIAL_ARRAY_EQUATION;
 
+  record CONNECT_EQUATION "a connect equation"
+    Element lhsElement;
+    Connect.Face lhsFace;
+    Element rhsElement;
+    Connect.Face rhsFace;
+    ElementSource source "the origin of the component/equation/algorithm";
+  end CONNECT_EQUATION;
+
   record COMPLEX_EQUATION "an equation of complex type, e.g. record = func(..)"
     Exp lhs;
     Exp rhs;
@@ -776,7 +788,7 @@ end Var;
 public
 uniontype Attributes "- Attributes"
   record ATTR
-    SCode.ConnectorType connectorType "flow, stream or unspecified";
+    ConnectorType       connectorType "flow, stream or unspecified";
     SCode.Parallelism   parallelism "parallelism";
     SCode.Variability   variability "variability" ;
     Absyn.Direction     direction "direction" ;
@@ -786,10 +798,10 @@ uniontype Attributes "- Attributes"
 end Attributes;
 
 public
-constant Attributes dummyAttrVar   = ATTR(SCode.POTENTIAL(), SCode.NON_PARALLEL(), SCode.VAR(),   Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
-constant Attributes dummyAttrParam = ATTR(SCode.POTENTIAL(), SCode.NON_PARALLEL(), SCode.PARAM(), Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
-constant Attributes dummyAttrConst = ATTR(SCode.POTENTIAL(), SCode.NON_PARALLEL(), SCode.CONST(), Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
-constant Attributes dummyAttrInput = ATTR(SCode.POTENTIAL(), SCode.NON_PARALLEL(), SCode.VAR(),   Absyn.INPUT(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
+constant Attributes dummyAttrVar   = ATTR(NON_CONNECTOR(), SCode.NON_PARALLEL(), SCode.VAR(),   Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
+constant Attributes dummyAttrParam = ATTR(NON_CONNECTOR(), SCode.NON_PARALLEL(), SCode.PARAM(), Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
+constant Attributes dummyAttrConst = ATTR(NON_CONNECTOR(), SCode.NON_PARALLEL(), SCode.CONST(), Absyn.BIDIR(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
+constant Attributes dummyAttrInput = ATTR(NON_CONNECTOR(), SCode.NON_PARALLEL(), SCode.VAR(),   Absyn.INPUT(), Absyn.NOT_INNER_OUTER(), SCode.PUBLIC());
 
 public uniontype BindingSource "where this binding came from: either default binding or start value"
   record BINDING_FROM_DEFAULT_VALUE "the binding came from the default value" end BINDING_FROM_DEFAULT_VALUE;

Compiler/FrontEnd/DAEUtil.mo

@@ -1988,12 +1988,24 @@ public function toConnectorType
 algorithm
   outConnectorType := match(inConnectorType, inState)
     case (SCode.FLOW(), _) then DAE.FLOW();
-    case (SCode.STREAM(), _) then DAE.STREAM();
+    case (SCode.STREAM(), _) then DAE.STREAM(NONE());
     case (_, ClassInf.CONNECTOR()) then DAE.POTENTIAL();
     else DAE.NON_CONNECTOR();
   end match;
 end toConnectorType;
 
+public function toConnectorTypeNoState
+ input SCode.ConnectorType scodeConnectorType;
+ input Option<DAE.ComponentRef> flowName = NONE();
+ output DAE.ConnectorType daeConnectorType;
+algorithm
+  daeConnectorType := match scodeConnectorType
+    case SCode.FLOW() then DAE.FLOW();
+    case SCode.STREAM() then DAE.STREAM(flowName);
+    else DAE.POTENTIAL();
+  end match;
+end toConnectorTypeNoState;
+
 public function toDaeParallelism "Converts scode parallelsim to dae parallelism.
   Prints a warning if parallel variables are used
   in a non-function class."
@@ -5621,7 +5633,7 @@ protected
 algorithm
   SCode.ATTR(connectorType = ct, parallelism = prl, variability = var, direction = dir) := inAttributes;
   SCode.PREFIXES(innerOuter = io, visibility = vis) := inPrefixes;
-  outAttributes := DAE.ATTR(ct, prl, var, dir, io, vis);
+  outAttributes := DAE.ATTR(toConnectorTypeNoState(ct), prl, var, dir, io, vis);
 end translateSCodeAttrToDAEAttr;
 
 public function varName
@@ -5756,7 +5768,7 @@ public function setAttributeDirection
   input DAE.Attributes inAttributes;
   output DAE.Attributes outAttributes;
 protected
-  SCode.ConnectorType ct;
+  DAE.ConnectorType ct;
   SCode.Parallelism p;
   SCode.Variability var;
   Absyn.InnerOuter io;
@@ -6309,6 +6321,72 @@ algorithm
   (outExp,_) := VarTransform.replaceExp(inExp,replIn,NONE());
 end replaceCompRef;
 
+public function connectorTypeStr
+  input DAE.ConnectorType connectorType;
+  output String string;
+algorithm
+  string := match connectorType
+    local
+      DAE.ComponentRef cref;
+      String cref_str;
+
+    case DAE.POTENTIAL() then "";
+    case DAE.FLOW() then "flow";
+    case DAE.STREAM(NONE()) then "stream()";
+    case DAE.STREAM(SOME(cref))
+      algorithm
+        cref_str := ComponentReference.printComponentRefStr(cref);
+      then
+        "stream(" + cref_str + ")";
+    else "non connector";
+  end match;
+end connectorTypeStr;
+
+public function streamBool
+  input DAE.ConnectorType inStream;
+  output Boolean bStream;
+algorithm
+  bStream := match(inStream)
+    case DAE.STREAM() then true;
+    else false;
+  end match;
+end streamBool;
+
+public function potentialBool
+  input DAE.ConnectorType inConnectorType;
+  output Boolean outPotential;
+algorithm
+  outPotential := match(inConnectorType)
+    case DAE.POTENTIAL() then true;
+    else false;
+  end match;
+end potentialBool;
+
+public function connectorTypeEqual
+  input DAE.ConnectorType inConnectorType1;
+  input DAE.ConnectorType inConnectorType2;
+  output Boolean outEqual;
+algorithm
+  outEqual := match(inConnectorType1, inConnectorType2)
+    case (DAE.POTENTIAL(), DAE.POTENTIAL()) then true;
+    case (DAE.FLOW(), DAE.FLOW()) then true;
+    case (DAE.STREAM(_), DAE.STREAM(_)) then true;
+    case (DAE.NON_CONNECTOR(), DAE.NON_CONNECTOR()) then true;
+  end match;
+end connectorTypeEqual;
+
+public function toSCodeConnectorType
+ input DAE.ConnectorType daeConnectorType;
+ output SCode.ConnectorType scodeConnectorType;
+algorithm
+  scodeConnectorType := match daeConnectorType
+    case DAE.FLOW() then SCode.FLOW();
+    case DAE.STREAM(_) then SCode.STREAM();
+    case DAE.POTENTIAL() then SCode.POTENTIAL();
+    case DAE.NON_CONNECTOR() then SCode.POTENTIAL();
+  end match;
+end toSCodeConnectorType;
+
 annotation(__OpenModelica_Interface="frontend");
 end DAEUtil;
 

Compiler/FrontEnd/InnerOuter.mo

@@ -583,7 +583,7 @@ algorithm
      local
        SCode.Variability vt1,vt2;
        DAE.Type t1,t2;
-       SCode.ConnectorType ct;
+       DAE.ConnectorType ct;
        DAE.DAElist dae;
        InstHierarchy ih;
        Connect.SetTrie sets;
@@ -656,7 +656,7 @@ algorithm
      local
        SCode.Variability vt1,vt2;
        DAE.Type t1,t2;
-       SCode.ConnectorType ct;
+       DAE.ConnectorType ct;
        DAE.DAElist dae;
        InstHierarchy ih;
        Connect.SetTrie sets;
@@ -1265,7 +1265,7 @@ algorithm
       DAE.Type ty;
       DAE.Binding binding;
 
-      SCode.ConnectorType ct;
+      DAE.ConnectorType ct;
       SCode.Parallelism parallelism "parallelism";
       SCode.Variability variability "variability" ;
       Absyn.Direction direction "direction" ;

Compiler/FrontEnd/Inst.mo

@@ -4092,7 +4092,7 @@ algorithm
         updatedComps = BaseHashTable.add((cref,0),updatedComps);
         (cache,env2,ih,SOME(updatedComps)) = updateComponentsInEnv2(cache, env, ih, pre, DAE.NOMOD(), crefs_2, ci_state, impl, SOME(updatedComps), SOME(cref));
 
-        (cache,env_1,ih,updatedComps) = updateComponentInEnv2(cache,env2,cenv,ih,pre,t,n,ad,cl,attr,pf,DAE.ATTR(ct,prl1,var1,dir,io,visibility),info,m,cmod,mods,cref,ci_state,impl,updatedComps);
+        (cache,env_1,ih,updatedComps) = updateComponentInEnv2(cache,env2,cenv,ih,pre,t,n,ad,cl,attr,pf,DAE.ATTR(DAEUtil.toConnectorTypeNoState(ct),prl1,var1,dir,io,visibility),info,m,cmod,mods,cref,ci_state,impl,updatedComps);
 
         //print("updateComponentInEnv: NEW ENV:\n" + FGraph.printGraphStr(env_1) + "\n");
       then
@@ -4150,7 +4150,7 @@ algorithm
         crefs_2 = InstUtil.removeOptCrefFromCrefs(crefs_2, currentCref);
         updatedComps = BaseHashTable.add((cref,0),updatedComps);
         (cache,env2,ih,SOME(updatedComps)) = updateComponentsInEnv2(cache, env, ih, pre, mods, crefs_2, ci_state, impl, SOME(updatedComps), SOME(cref));
-        (cache,env_1,ih,updatedComps) = updateComponentInEnv2(cache,env2,cenv,ih,pre,t,n,ad,cl,attr,pf,DAE.ATTR(ct,prl1,var1,dir,io,visibility),info,m,cmod,mods,cref,ci_state,impl,updatedComps);
+        (cache,env_1,ih,updatedComps) = updateComponentInEnv2(cache,env2,cenv,ih,pre,t,n,ad,cl,attr,pf,DAE.ATTR(DAEUtil.toConnectorTypeNoState(ct),prl1,var1,dir,io,visibility),info,m,cmod,mods,cref,ci_state,impl,updatedComps);
       then
         (cache,env_1,ih,SOME(updatedComps));
 
@@ -4998,7 +4998,7 @@ algorithm
         io = SCode.prefixesInnerOuter(inPrefixes);
         vis = SCode.prefixesVisibility(inPrefixes);
 
-        new_var = DAE.TYPES_VAR(n,DAE.ATTR(ct,prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
+        new_var = DAE.TYPES_VAR(n,DAE.ATTR(DAEUtil.toConnectorTypeNoState(ct),prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
         env = FGraph.updateComp(env, new_var, FCore.VAR_TYPED(), compenv);
         ErrorExt.rollBack("Inst.removeSelfReferenceAndUpdate");
       then
@@ -5036,7 +5036,7 @@ algorithm
         io = SCode.prefixesInnerOuter(inPrefixes);
         vis = SCode.prefixesVisibility(inPrefixes);
 
-        new_var = DAE.TYPES_VAR(n,DAE.ATTR(ct,prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
+        new_var = DAE.TYPES_VAR(n,DAE.ATTR(DAEUtil.toConnectorTypeNoState(ct),prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
         env = FGraph.updateComp(env, new_var, FCore.VAR_TYPED(), compenv);
         ErrorExt.rollBack("Inst.removeSelfReferenceAndUpdate");
       then
@@ -5074,7 +5074,7 @@ algorithm
         io = SCode.prefixesInnerOuter(inPrefixes);
         vis = SCode.prefixesVisibility(inPrefixes);
 
-        new_var = DAE.TYPES_VAR(n,DAE.ATTR(ct,prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
+        new_var = DAE.TYPES_VAR(n,DAE.ATTR(DAEUtil.toConnectorTypeNoState(ct),prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
         env = FGraph.updateComp(env, new_var, FCore.VAR_TYPED(), compenv);
         ErrorExt.rollBack("Inst.removeSelfReferenceAndUpdate");
       then
@@ -5113,7 +5113,7 @@ algorithm
         io = SCode.prefixesInnerOuter(inPrefixes);
         vis = SCode.prefixesVisibility(inPrefixes);
 
-        new_var = DAE.TYPES_VAR(n,DAE.ATTR(ct,prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
+        new_var = DAE.TYPES_VAR(n,DAE.ATTR(DAEUtil.toConnectorTypeNoState(ct),prl1,var1,dir,io,vis),ty,DAE.UNBOUND(),NONE());
         env = FGraph.updateComp(env, new_var, FCore.VAR_TYPED(), compenv);
         ErrorExt.rollBack("Inst.removeSelfReferenceAndUpdate");
       then

Compiler/FrontEnd/InstBinding.mo

@@ -101,19 +101,19 @@ public constant DAE.Type distributionType =
                 {
                   DAE.TYPES_VAR(
                     "name",
-                    DAE.ATTR(SCode.POTENTIAL(),SCode.NON_PARALLEL(),SCode.PARAM(),Absyn.BIDIR(),Absyn.NOT_INNER_OUTER(),SCode.PUBLIC()),
+                    DAE.ATTR(DAE.NON_CONNECTOR(),SCode.NON_PARALLEL(),SCode.PARAM(),Absyn.BIDIR(),Absyn.NOT_INNER_OUTER(),SCode.PUBLIC()),
                     DAE.T_STRING_DEFAULT,
                     DAE.UNBOUND(), // binding
                     NONE()),
                   DAE.TYPES_VAR(
                     "params",
-                    DAE.ATTR(SCode.POTENTIAL(),SCode.NON_PARALLEL(),SCode.PARAM(),Absyn.BIDIR(),Absyn.NOT_INNER_OUTER(),SCode.PUBLIC()),
+                    DAE.ATTR(DAE.NON_CONNECTOR(),SCode.NON_PARALLEL(),SCode.PARAM(),Absyn.BIDIR(),Absyn.NOT_INNER_OUTER(),SCode.PUBLIC()),
                     DAE.T_ARRAY_REAL_NODIM,
                     DAE.UNBOUND(), // binding
                     NONE()),
                   DAE.TYPES_VAR(
                     "paramNames",
-                    DAE.ATTR(SCode.POTENTIAL(),SCode.NON_PARALLEL(),SCode.PARAM(),Absyn.BIDIR(),Absyn.NOT_INNER_OUTER(),SCode.PUBLIC()),
+                    DAE.ATTR(DAE.NON_CONNECTOR(),SCode.NON_PARALLEL(),SCode.PARAM(),Absyn.BIDIR(),Absyn.NOT_INNER_OUTER(),SCode.PUBLIC()),
                     DAE.T_ARRAY_STRING_NODIM,
                     DAE.UNBOUND(), // binding
                     NONE())