Some refactoring to break dependencies

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16744 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 6, 2013 · 2739ef3 · 2739ef3
1 parent f27058c
commit 2739ef3
Show file tree

Hide file tree

Showing 15 changed files with 235 additions and 197 deletions.
diff --git a/Compiler/BackEnd/BackendDAECreate.mo b/Compiler/BackEnd/BackendDAECreate.mo
@@ -4562,7 +4562,7 @@ algorithm
       Boolean b1;
       String id1, str;
       DAE.ElementSource source;
-      Algorithm.Else algElse;
+      DAE.Else algElse;
       tuple<DAE.Exp, list<DAE.Exp>, DAE.Exp, tuple<list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, Integer, Integer>, tuple<Integer, BackendDAE.Variables, BackendDAE.Variables>> extraArg;
       list<tuple<DAE.ComponentRef, Absyn.Info>> loopPrlVars "list of parallel variables used/referenced in the parfor loop";
       list<DAE.ComponentRef> conditions;
@@ -4720,11 +4720,11 @@ author: BZ, 2008-12
 Helper function for traverseStmtsExps
 to find ZeroCrosssings in algorithm Else statements
 modified: 2011-01 by wbraun"
-  input Algorithm.Else inElse;
+  input DAE.Else inElse;
   input FuncExpType func;
   input tuple<DAE.Exp, list<DAE.Exp>, DAE.Exp, tuple<list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, Integer, Integer>, tuple<Integer, BackendDAE.Variables, BackendDAE.Variables>> iextraArg;
   input BackendDAE.Variables knvars;
-  output tuple<Algorithm.Else, tuple<DAE.Exp, list<DAE.Exp>, DAE.Exp, tuple<list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, Integer, Integer>, tuple<Integer, BackendDAE.Variables, BackendDAE.Variables>>> outTplStmtTypeA;
+  output tuple<DAE.Else, tuple<DAE.Exp, list<DAE.Exp>, DAE.Exp, tuple<list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, Integer, Integer>, tuple<Integer, BackendDAE.Variables, BackendDAE.Variables>>> outTplStmtTypeA;
   partial function FuncExpType
     input tuple<DAE.Exp, tuple<DAE.Exp, list<DAE.Exp>, DAE.Exp, tuple<list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, Integer, Integer>, tuple<Integer, BackendDAE.Variables, BackendDAE.Variables>>> arg;
     output tuple<DAE.Exp, Boolean, tuple<DAE.Exp, list<DAE.Exp>, DAE.Exp, tuple<list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, Integer, Integer>, tuple<Integer, BackendDAE.Variables, BackendDAE.Variables>>> oarg;
@@ -4734,7 +4734,7 @@ algorithm
     local
       DAE.Exp e, e_1;
       list<DAE.Statement> st, st_1;
-      Algorithm.Else el, el_1;
+      DAE.Else el, el_1;
       tuple<DAE.Exp, list<DAE.Exp>, DAE.Exp, tuple<list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, list<BackendDAE.ZeroCrossing>, Integer, Integer>, tuple<Integer, BackendDAE.Variables, BackendDAE.Variables>> extraArg;
 
     case(DAE.NOELSE(), _, extraArg, _) then ((DAE.NOELSE(), extraArg));

diff --git a/Compiler/BackEnd/BackendDAEUtil.mo b/Compiler/BackEnd/BackendDAEUtil.mo
@@ -4345,7 +4345,7 @@ algorithm
       DAE.Statement x,ew;
       Boolean b1;
       String id1,str;
-      Algorithm.Else algElse;
+      DAE.Else algElse;
       Type_a extraArg;
 
     case ({},_,extraArg) then extraArg;
@@ -4489,7 +4489,7 @@ protected function traverseStmtsElse "
 Author: Frenkel TUD 2012-06
 Helper function for traverseStmts
 "
-  input Algorithm.Else inElse;
+  input DAE.Else inElse;
   input FuncExpType func;
   input Type_a iextraArg;
   output Type_a oextraArg;
@@ -4503,7 +4503,7 @@ algorithm
   local
     DAE.Exp e;
     list<DAE.Statement> st;
-    Algorithm.Else el;
+    DAE.Else el;
     Type_a extraArg;
   case (DAE.NOELSE(),_,extraArg) then extraArg;
   case (DAE.ELSEIF(e,st,el),_,extraArg)

diff --git a/Compiler/BackEnd/BackendDump.mo b/Compiler/BackEnd/BackendDump.mo
@@ -2087,7 +2087,7 @@ public function dumpAlgorithms "Help function to dump, prints algorithms to stdo
 algorithm
   _ := match(ialgs,indx)
     local
-      list<Algorithm.Statement> stmts;
+      list<DAE.Statement> stmts;
       IOStream.IOStream myStream;
       String is;
       list<DAE.Algorithm> algs;

diff --git a/Compiler/BackEnd/DAEQuery.mo b/Compiler/BackEnd/DAEQuery.mo
@@ -549,7 +549,7 @@ end incidenceRow;
 //   author: PA
 //   Helper function to incidenceRow, investigates statements for
 //   variables, returning variable indexes."
-//   input list<Algorithm.Statement> inAlgorithmStatementLst;
+//   input list<DAE.Statement> inAlgorithmStatementLst;
 //   input BackendDAE.Variables inVariables;
 //   output list<String> outStringLst;
 // algorithm
@@ -559,10 +559,10 @@ end incidenceRow;
 //       DAE.Type tp;
 //       DAE.ComponentRef cr;
 //       DAE.Exp e, e1;
-//       list<Algorithm.Statement> rest,stmts;
+//       list<DAE.Statement> rest,stmts;
 //       BackendDAE.Variables vars;
 //       list<DAE.Exp> expl;
-//       Algorithm.Else else_;
+//       DAE.Else else_;
 //       list<list<String>> lstlst;
 // 
 //     case ({},_) then {};

diff --git a/Compiler/BackEnd/SimCode.mo b/Compiler/BackEnd/SimCode.mo
@@ -381,10 +381,10 @@ uniontype Variable
   end FUNCTION_PTR;
 end Variable;
 
-// TODO: Replace Statement with just list<Algorithm.Statement>?
+// TODO: Replace Statement with just list<DAE.Statement>?
 uniontype Statement
   record ALGORITHM
-    list<Algorithm.Statement> statementLst; // in functions
+    list<DAE.Statement> statementLst; // in functions
   end ALGORITHM;
 end Statement;
 

diff --git a/Compiler/BackEnd/SimCodeUtil.mo b/Compiler/BackEnd/SimCodeUtil.mo
@@ -1088,7 +1088,7 @@ algorithm
   (outStatement):=
   matchcontinue (inElement)
     local
-      list<Algorithm.Statement> stmts;
+      list<DAE.Statement> stmts;
     case (DAE.ALGORITHM(algorithm_ = DAE.ALGORITHM_STMTS(statementLst = stmts)))
     then
       SimCode.ALGORITHM(stmts);
@@ -5428,7 +5428,7 @@ algorithm
       Types.Type ft;
       list<String> rt, rt_1, rt_2;
       list<SimCode.RecordDeclaration> accRecDecls;
-      Algorithm.Algorithm algorithm_;
+      DAE.Algorithm algorithm_;
       list<DAE.Exp> expl;
 
     case ({}, accRecDecls, rt) then (accRecDecls, rt);
@@ -6337,7 +6337,7 @@ protected function createSingleAlgorithmCode
 algorithm
   (equations_, ouniqueEqIndex) := matchcontinue (eqns, vars, skipDiscinAlgorithm, iuniqueEqIndex)
     local
-      Algorithm.Algorithm alg;
+      DAE.Algorithm alg;
       list<Expression.ComponentRef> solvedVars, algOutVars;
       String message, algStr;
       list<DAE.Statement> algStatements;
@@ -6647,7 +6647,7 @@ algorithm
     local
       DAE.ComponentRef cr;
       DAE.Exp exp_;
-      Algorithm.Algorithm alg;
+      DAE.Algorithm alg;
       list<DAE.Statement> algStatements;
       DAE.ElementSource source;