- Merge trunk (Per's changes)

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6413 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 18, 2010 · af7516d · af7516d
2 parents e6f8de6 + 7d59665
commit af7516d
Show file tree

Hide file tree

Showing 11 changed files with 720 additions and 1,607 deletions.
diff --git a/Compiler/CevalScript.mo b/Compiler/CevalScript.mo
@@ -3688,7 +3688,7 @@ algorithm
         env3 = Env.openScope(env_1, encflag, SOME(n), SOME(Env.CLASS_SCOPE));
         ci_state = ClassInf.start(r, Env.getEnvName(env3));
         (cache,env4,_,_,dae1,csets_1,ci_state_1,tys,_,_,_,_) = Inst.instClassIn(cache,env3, InnerOuter.emptyInstHierarchy,UnitAbsyn.noStore,DAE.NOMOD(), Prefix.NOPRE(), Connect.emptySet,
-          ci_state, c, false, {}, false, ConnectionGraph.EMPTY,NONE);
+          ci_state, c, false, {}, false, Inst.INNER_CALL, ConnectionGraph.EMPTY,NONE);
         cref_1 = Exp.joinCrefs(cref, DAE.CREF_IDENT("stateSelect",DAE.ET_OTHER(),{}));
         (cache,attr,ty,DAE.EQBOUND(exp,_,_,_),_,_,_,_,_) = Lookup.lookupVar(cache, env4, cref_1);
         ic_1 = Interactive.addInstantiatedClass(ic, Interactive.INSTCLASS(classname_1,dae1,env4));
@@ -3729,7 +3729,7 @@ algorithm
         env3 = Env.openScope(env_1, encflag, SOME(n), SOME(Env.CLASS_SCOPE));
         ci_state = ClassInf.start(r, Env.getEnvName(env3));
         (cache,env4,_,_,dae1,csets_1,ci_state_1,tys,_,_,_,_) = Inst.instClassIn(cache,env3, InnerOuter.emptyInstHierarchy, UnitAbsyn.noStore,DAE.NOMOD(), Prefix.NOPRE(), Connect.emptySet,
-          ci_state, c, false, {}, false, ConnectionGraph.EMPTY,NONE);
+          ci_state, c, false, {}, false, Inst.INNER_CALL, ConnectionGraph.EMPTY,NONE);
         cref_1 = Exp.joinCrefs(cref, DAE.CREF_IDENT(attribute,DAE.ET_OTHER(),{}));
         (cache,attr,ty,DAE.VALBOUND(v,_),_,_,_,_,_) = Lookup.lookupVar(cache, env4, cref_1);
         ic_1 = Interactive.addInstantiatedClass(ic, Interactive.INSTCLASS(classname_1,dae1,env4));

diff --git a/Compiler/Connect.mo b/Compiler/Connect.mo
@@ -61,19 +61,23 @@ uniontype Face"This type indicates whether a connector is an inside or an outsid
   record OUTSIDE "This is an outside connection" end OUTSIDE;
 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>;
+
 public
 uniontype Set "A connection set is represented using the Set type."
 
   record EQU "a list of component references"
-    list<tuple<DAE.ComponentRef, DAE.ElementSource>> expComponentRefLst;
+    list<EquSetElement> expComponentRefLst;
   end EQU;
 
   record FLOW "a list of component reference and a face"
-    list<tuple<DAE.ComponentRef, Face, DAE.ElementSource>> tplExpComponentRefFaceLst;
+    list<FlowSetElement> tplExpComponentRefFaceLst;
   end FLOW;
 
   record STREAM "a list of component reference for stream, a component reference for corresponding flow and a face"
-    list<tuple<DAE.ComponentRef, Option<DAE.ComponentRef>, Face, DAE.ElementSource>> tplExpComponentRefFaceLst;
+    list<StreamSetElement> tplExpComponentRefFaceLst;
   end STREAM;
 
 end Set;