- Relaxed type requirements of Util.listGetMemberOnTrue to make it mo…

…re versatile.

- Added Util.listRemoveFirstOnTrue.
- Implemented inStream and actualStream for one-to-one stream connections.


git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6910 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/ComponentReference.mo

@@ -56,6 +56,8 @@ protected import System;
 protected import Util;
 
 
+public constant DAE.ComponentRef DUMMY = DAE.CREF_IDENT("dummy", DAE.ET_OTHER(), {});
+
 /***************************************************/
 /* generate a ComponentRef */
 /***************************************************/

Compiler/Connect.mo

@@ -62,7 +62,14 @@ end Face;
 
 type EquSetElement = tuple<DAE.ComponentRef, DAE.ElementSource>;
 type FlowSetElement = tuple<DAE.ComponentRef, Face, DAE.ElementSource>;
-type StreamSetElement = tuple<DAE.ComponentRef, Option<DAE.ComponentRef>, Face, DAE.ElementSource>;
+type StreamSetElement = tuple<DAE.ComponentRef, DAE.ComponentRef, Face, DAE.ElementSource>;
+
+// FlowStreamConnect models an association between a stream variable and a flow
+// variable, which is needed to implement the stream operators. The Sets type
+// have a list of these associations that are added when a connector is
+// instantiated, and when two streams are connected their associated flow
+// variables are looked up in that list.
+type StreamFlowConnect = tuple<DAE.ComponentRef, DAE.ComponentRef>;
 
 public
 uniontype Set "A connection set is represented using the Set type."
@@ -99,6 +106,7 @@ uniontype Sets "The connection \'Sets\' contains
 					      It is registered in env by Inst.addConnnectionSetToEnv.";
 		list<DAE.ComponentRef> deletedComponents "list of components with conditional declaration = false";
 		list<OuterConnect> outerConnects "connect statements to propagate upwards";
+    list<StreamFlowConnect> streamFlowConnects "list of stream-flow associations.";
   end SETS;
 end Sets;
 
@@ -115,7 +123,7 @@ uniontype OuterConnect
   end OUTERCONNECT;
 end OuterConnect;
 
-public constant Sets emptySet=SETS({},{},{},{});
+public constant Sets emptySet=SETS({},{},{},{},{});
 
 end Connect;