- remove some unused imports

- add Env.Cache and Env.Env to BackendDAE.Shared

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12278 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Jens Frenkel

Compiler/BackEnd/BackendDAE.mo

@@ -39,6 +39,7 @@ encapsulated package BackendDAE
 
 public import Absyn;
 public import DAE;
+public import Env;
 public import SCode;
 public import Values;
 public import HashTable2;
@@ -250,6 +251,8 @@ uniontype Shared "Data shared for all equation-systems"
     EquationArray initialEqs "initialEqs ; Initial equations" ;
     EquationArray removedEqs "these are equations that cannot solve for a variable. for example assertions, external function calls, algorithm sections without effect" ;
     array< .DAE.Constraint> constraints "constraints (Optimica extension)";
+    .Env.Cache cache;
+    .Env.Env env;
     .DAE.FunctionTree functionTree "functions for Backend";
     EventInfo eventInfo "eventInfo" ;
     ExternalObjectClasses extObjClasses "classes of external objects, contains constructor & destructor";

Compiler/BackEnd/BackendDAECreate.mo

@@ -39,9 +39,10 @@ encapsulated package BackendDAECreate
 "
 
 public import Absyn;
+public import Algorithm;
 public import BackendDAE;
 public import DAE;
-public import Algorithm;
+public import Env;
 
 protected import BackendDAEUtil;
 protected import BackendEquation;
@@ -82,7 +83,8 @@ public function lower
   inputs:  daeList: DAE.DAElist, simplify: bool)
   outputs: BackendDAE.BackendDAE"
   input DAE.DAElist lst;
-  input DAE.FunctionTree inFunctionTree;
+  input Env.Cache inCache;
+  input Env.Env inEnv;  
   input Boolean addDummyDerivativeIfNeeded;
   output BackendDAE.BackendDAE outBackendDAE;
 protected
@@ -103,7 +105,8 @@ protected
   DAE.FunctionTree functionTree;
 algorithm
   System.realtimeTick(BackendDAE.RT_CLOCK_EXECSTAT_BACKEND_MODULES);
-  (DAE.DAE(elems),functionTree) := processDelayExpressions(lst,inFunctionTree);
+  functionTree := Env.getFunctionTree(inCache);
+  (DAE.DAE(elems),functionTree) := processDelayExpressions(lst,functionTree);
   s := states(elems, BackendDAE.emptyBintree);
   vars := BackendDAEUtil.emptyVars();
   knvars := BackendDAEUtil.emptyVars();
@@ -122,7 +125,7 @@ algorithm
   constrarra := listArray(constrs);
   einfo := Inline.inlineEventInfo(BackendDAE.EVENT_INFO(whenclauses_1,{}),(SOME(functionTree),{DAE.NORM_INLINE()}));
   aliasVars := BackendDAEUtil.emptyAliasVariables();
-  outBackendDAE := BackendDAE.DAE(BackendDAE.EQSYSTEM(vars_1,eqnarr,NONE(),NONE(),BackendDAE.NO_MATCHING())::{},BackendDAE.SHARED(knvars,extVars,aliasVars,ieqnarr,reqnarr,constrarra,functionTree,einfo,extObjCls,BackendDAE.SIMULATION(),{}));
+  outBackendDAE := BackendDAE.DAE(BackendDAE.EQSYSTEM(vars_1,eqnarr,NONE(),NONE(),BackendDAE.NO_MATCHING())::{},BackendDAE.SHARED(knvars,extVars,aliasVars,ieqnarr,reqnarr,constrarra,inCache,inEnv,functionTree,einfo,extObjCls,BackendDAE.SIMULATION(),{}));
   BackendDAEUtil.checkBackendDAEWithErrorMsg(outBackendDAE);
   Debug.fcall(Flags.DUMP_BACKENDDAE_INFO,print,"No. of Equations: " +& intString(BackendDAEUtil.equationSize(eqnarr)) +& "\nNo. of Variables: " +& intString(BackendVariable.varsSize(vars_1)) +& "\n");
   Debug.execStat("generate Backend Data Structur",BackendDAE.RT_CLOCK_EXECSTAT_BACKEND_MODULES);
@@ -1990,12 +1993,14 @@ algorithm
       BackendDAE.Matching matching;
       DAE.FunctionTree funcs;
       BackendDAE.SymbolicJacobians symjacs;
-    case (BackendDAE.EQSYSTEM(vars,eqns,m,mT,matching),shared as BackendDAE.SHARED(knvars,exobj,av,inieqns,remeqns,constrs,funcs,einfo,eoc,btp,symjacs))
+      Env.Cache cache;
+      Env.Env env;      
+    case (BackendDAE.EQSYSTEM(vars,eqns,m,mT,matching),shared as BackendDAE.SHARED(knvars,exobj,av,inieqns,remeqns,constrs,cache,env,funcs,einfo,eoc,btp,symjacs))
       equation
         (eqns1,(vars1,_)) = BackendEquation.traverseBackendDAEEqnsWithUpdate(eqns,traverserexpandDerEquation,(vars,shared));
         (inieqns1,(vars2,_)) = BackendEquation.traverseBackendDAEEqnsWithUpdate(inieqns,traverserexpandDerEquation,(vars1,shared));
       then
-        (BackendDAE.EQSYSTEM(vars2,eqns1,m,mT,matching),BackendDAE.SHARED(knvars,exobj,av,inieqns1,remeqns,constrs,funcs,einfo,eoc,btp,symjacs));
+        (BackendDAE.EQSYSTEM(vars2,eqns1,m,mT,matching),BackendDAE.SHARED(knvars,exobj,av,inieqns1,remeqns,constrs,cache,env,funcs,einfo,eoc,btp,symjacs));
   end match;
 end expandDerOperatorWork;
 
@@ -2276,14 +2281,16 @@ algorithm
       BackendDAE.Matching matching;
       DAE.FunctionTree funcs;
       BackendDAE.SymbolicJacobians symjacs;
-    case (BackendDAE.EQSYSTEM(vars,eqns,m,mT,matching),BackendDAE.SHARED(knvars,exobj,av,inieqns,remeqns,constrs,funcs,einfo as BackendDAE.EVENT_INFO(zeroCrossingLst=zero_crossings,whenClauseLst=whenclauses),eoc,btp,symjacs))
+      Env.Cache cache;
+      Env.Env env;      
+    case (BackendDAE.EQSYSTEM(vars,eqns,m,mT,matching),BackendDAE.SHARED(knvars,exobj,av,inieqns,remeqns,constrs,cache,env,funcs,einfo as BackendDAE.EVENT_INFO(zeroCrossingLst=zero_crossings,whenClauseLst=whenclauses),eoc,btp,symjacs))
       equation
         eqs_lst = BackendDAEUtil.equationList(eqns);
         (zero_crossings,eqs_lst1,whenclauses1) = findZeroCrossings2(vars, knvars,eqs_lst,0, whenclauses, 0,0,zero_crossings);
         eqns1 = BackendDAEUtil.listEquation(eqs_lst1);
         einfo1 = BackendDAE.EVENT_INFO(whenclauses1,zero_crossings);
       then
-        (BackendDAE.EQSYSTEM(vars,eqns1,m,mT,matching),BackendDAE.SHARED(knvars,exobj,av,inieqns,remeqns,constrs,funcs,einfo1,eoc,btp,symjacs));
+        (BackendDAE.EQSYSTEM(vars,eqns1,m,mT,matching),BackendDAE.SHARED(knvars,exobj,av,inieqns,remeqns,constrs,cache,env,funcs,einfo1,eoc,btp,symjacs));
   end match;
 end findZeroCrossings1;