Skip to content

Commit

Permalink
- Replace more NONE with NONE()
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6504 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@sjoelund
sjoelund committed Oct 21, 2010
1 parent 5b26c40 commit a310414
Show file tree
Hide file tree
Showing 43 changed files with 1,096 additions and 1,096 deletions.
72 changes: 36 additions & 36 deletions Compiler/BackendVarTransform.mo
View file
Expand Up @@ -81,8 +81,8 @@ algorithm

case ((DAELow.EQUATION(exp = e1,scalar = e2,source = source) :: es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e2_1 = VarTransform.replaceExp(e2, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e2_1 = VarTransform.replaceExp(e2, repl,NONE());
e1_2 = Exp.simplify(e1_1);
e2_2 = Exp.simplify(e2_1);
es_1 = replaceEquations(es, repl);
Expand All @@ -99,15 +99,15 @@ algorithm

case ((DAELow.SOLVED_EQUATION(componentRef = cr,exp = e,source = source) :: es),repl)
equation
e_1 = VarTransform.replaceExp(e, repl, NONE);
e_1 = VarTransform.replaceExp(e, repl,NONE());
e_2 = Exp.simplify(e_1);
es_1 = replaceEquations(es, repl);
then
(DAELow.SOLVED_EQUATION(cr,e_2,source) :: es_1);

case ((DAELow.RESIDUAL_EQUATION(exp = e,source = source) :: es),repl)
equation
e_1 = VarTransform.replaceExp(e, repl, NONE);
e_1 = VarTransform.replaceExp(e, repl,NONE());
e_2 = Exp.simplify(e_1);
es_1 = replaceEquations(es, repl);
then
Expand Down Expand Up @@ -141,21 +141,21 @@ algorithm
DAELow.WhenEquation elsePart,elsePart2;

case (DAELow.WHEN_EQ(i,cr,e,NONE()),repl) equation
e1 = VarTransform.replaceExp(e, repl, NONE);
e1 = VarTransform.replaceExp(e, repl,NONE());
e2 = Exp.simplify(e1);
DAE.CREF(cr1,_) = VarTransform.replaceExp(DAE.CREF(cr,DAE.ET_OTHER()),repl,NONE());
then DAELow.WHEN_EQ(i,cr1,e2,NONE());

// Replacements makes cr negative, a = -b
case (DAELow.WHEN_EQ(i,cr,e,NONE()),repl) equation
DAE.UNARY(DAE.UMINUS(tp),DAE.CREF(cr1,_)) = VarTransform.replaceExp(DAE.CREF(cr,DAE.ET_OTHER()),repl,NONE());
e1 = VarTransform.replaceExp(e, repl, NONE);
e1 = VarTransform.replaceExp(e, repl,NONE());
e2 = Exp.simplify(DAE.UNARY(DAE.UMINUS(tp),e1));
then DAELow.WHEN_EQ(i,cr1,e2,NONE());

case (DAELow.WHEN_EQ(i,cr,e,SOME(elsePart)),repl) equation
elsePart2 = replaceWhenEquation(elsePart,repl);
e1 = VarTransform.replaceExp(e, repl, NONE);
e1 = VarTransform.replaceExp(e, repl,NONE());
e2 = Exp.simplify(e1);
DAE.CREF(cr1,_) = VarTransform.replaceExp(DAE.CREF(cr,DAE.ET_OTHER()),repl,NONE());
then DAELow.WHEN_EQ(i,cr1,e2,SOME(elsePart2));
Expand All @@ -164,7 +164,7 @@ algorithm
case (DAELow.WHEN_EQ(i,cr,e,SOME(elsePart)),repl) equation
elsePart2 = replaceWhenEquation(elsePart,repl);
DAE.UNARY(DAE.UMINUS(tp),DAE.CREF(cr1,_)) = VarTransform.replaceExp(DAE.CREF(cr,DAE.ET_OTHER()),repl,NONE());
e1 = VarTransform.replaceExp(e, repl, NONE);
e1 = VarTransform.replaceExp(e, repl,NONE());
e2 = Exp.simplify(DAE.UNARY(DAE.UMINUS(tp),e1));
then DAELow.WHEN_EQ(i,cr1,e2,SOME(elsePart2));

Expand Down Expand Up @@ -203,17 +203,17 @@ algorithm
(DAELow.ARRAY_EQUATION(indx,expl2)::es_1);
case ((DAELow.EQUATION(exp = e1,scalar = e2) :: es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e2_1 = VarTransform.replaceExp(e2, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e2_1 = VarTransform.replaceExp(e2, repl,NONE());
e1_2 = Exp.simplify(e1_1);
e2_2 = Exp.simplify(e2_1);
es_1 = replaceEquations(es, repl);
then
(DAELow.EQUATION(e1_2,e2_2) :: es_1);
case ((DAELow.EQUEQUATION(cr1,cr2) :: es),repl)
equation
DAE.CREF(cr1,_) = VarTransform.replaceExp(DAE.CREF(cr1,DAE.ET_OTHER()), repl, NONE);
DAE.CREF(cr2,_) = VarTransform.replaceExp(DAE.CREF(cr2,DAE.ET_OTHER()), repl, NONE);
DAE.CREF(cr1,_) = VarTransform.replaceExp(DAE.CREF(cr1,DAE.ET_OTHER()), repl,NONE());
DAE.CREF(cr2,_) = VarTransform.replaceExp(DAE.CREF(cr2,DAE.ET_OTHER()), repl,NONE());
es_1 = replaceEquations(es, repl);
then
(DAELow.EQUEQUATION(cr1,cr2) :: es_1);
Expand All @@ -229,14 +229,14 @@ algorithm
(DAELow.ALGORITHM(id,expl1,expl2) :: es_1);
case ((DAELow.SOLVED_EQUATION(componentRef = cr,exp = e) :: es),repl)
equation
e_1 = VarTransform.replaceExp(e, repl, NONE);
e_1 = VarTransform.replaceExp(e, repl,NONE());
e_2 = Exp.simplify(e_1);
es_1 = replaceEquations(es, repl);
then
(DAELow.SOLVED_EQUATION(cr,e_2) :: es_1);
case ((DAELow.RESIDUAL_EQUATION(exp = e) :: es),repl)
equation
e_1 = VarTransform.replaceExp(e, repl, NONE);
e_1 = VarTransform.replaceExp(e, repl,NONE());
e_2 = Exp.simplify(e_1);
es_1 = replaceEquations(es, repl);
then
Expand Down Expand Up @@ -327,7 +327,7 @@ algorithm
case ({},_) then {};
case(DAELow.IFEQUATION(conds,tbs,fb) :: es,repl) equation
conds1 = Util.listMap2(conds, VarTransform.replaceExp, repl, NONE);
conds1 = Util.listMap2(conds, VarTransform.replaceExp, repl,NONE());
tbs1 = Util.listMap1(tbs,replaceEquations,repl);
fb1 = replaceEquations(fb,repl);
es = replaceIfEquations(es,repl);
Expand Down Expand Up @@ -365,8 +365,8 @@ algorithm
case ({},_) then {};
case ((DAELow.MULTIDIM_EQUATION(left = e1,right = e2,dimSize = dims,source=source) :: es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e2_1 = VarTransform.replaceExp(e2, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e2_1 = VarTransform.replaceExp(e2, repl,NONE());
e1_2 = Exp.simplify(e1_1);
e2_2 = Exp.simplify(e2_1);
es_1 = replaceMultiDimEquations(es, repl);
Expand Down Expand Up @@ -425,33 +425,33 @@ algorithm
case ({},_) then {};
case ((DAE.STMT_ASSIGN(type_=type_,exp1=e1,exp=e2,source=source)::es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e2_1 = VarTransform.replaceExp(e2, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e2_1 = VarTransform.replaceExp(e2, repl,NONE());
e1_2 = Exp.simplify(e1_1);
e2_2 = Exp.simplify(e2_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_ASSIGN(type_,e1_2,e2_2,source):: es_1);
case ((DAE.STMT_TUPLE_ASSIGN(type_=type_,expExpLst=expExpLst,exp=e2,source=source)::es),repl)
equation
expExpLst_1 = Util.listMap2(expExpLst,VarTransform.replaceExp,repl, NONE);
e2_1 = VarTransform.replaceExp(e2, repl, NONE);
expExpLst_1 = Util.listMap2(expExpLst,VarTransform.replaceExp,repl,NONE());
e2_1 = VarTransform.replaceExp(e2, repl,NONE());
e2_2 = Exp.simplify(e2_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_TUPLE_ASSIGN(type_,expExpLst_1,e2_2,source):: es_1);
case ((DAE.STMT_ASSIGN_ARR(type_=type_,componentRef=cr,exp=e1,source=source)::es),repl)
local DAE.ComponentRef cr;
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_ASSIGN_ARR(type_,cr,e1_2,source):: es_1);
case ((DAE.STMT_IF(exp=e1,statementLst=statementLst,else_=else_,source=source)::es),repl)
equation
statementLst_1 = replaceStatementLst(statementLst, repl);
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
else_1 = replaceElse(else_,repl);
es_1 = replaceStatementLst(es, repl);
Expand All @@ -463,15 +463,15 @@ algorithm
DAE.Ident ident;
equation
statementLst_1 = replaceStatementLst(statementLst, repl);
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_FOR(type_,iterIsArray,ident,e1_2,statementLst_1,source):: es_1);
case ((DAE.STMT_WHILE(exp=e1,statementLst=statementLst,source=source)::es),repl)
equation
statementLst_1 = replaceStatementLst(statementLst, repl);
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
es_1 = replaceStatementLst(es, repl);
then
Expand All @@ -480,7 +480,7 @@ algorithm
local list<Integer> helpVarIndices;
equation
statementLst_1 = replaceStatementLst(statementLst, repl);
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
es_1 = replaceStatementLst(es, repl);
then
Expand All @@ -490,39 +490,39 @@ algorithm
equation
statementLst_1 = replaceStatementLst(statementLst, repl);
statement_1::{} = replaceStatementLst({statement}, repl);
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_WHEN(e1_2,statementLst_1,SOME(statement_1),helpVarIndices,source):: es_1);
case ((DAE.STMT_ASSERT(cond=e1,msg=e2,source=source)::es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e2_1 = VarTransform.replaceExp(e2, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e2_1 = VarTransform.replaceExp(e2, repl,NONE());
e1_2 = Exp.simplify(e1_1);
e2_2 = Exp.simplify(e2_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_ASSERT(e1_2,e2_2,source):: es_1);
case ((DAE.STMT_TERMINATE(msg=e1,source=source)::es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_TERMINATE(e1_2,source):: es_1);
case ((DAE.STMT_REINIT(var=e1,value=e2,source=source)::es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e2_1 = VarTransform.replaceExp(e2, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e2_1 = VarTransform.replaceExp(e2, repl,NONE());
e1_2 = Exp.simplify(e1_1);
e2_2 = Exp.simplify(e2_1);
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_REINIT(e1_2,e2_2,source):: es_1);
case ((DAE.STMT_NORETCALL(exp=e1,source=source)::es),repl)
equation
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
es_1 = replaceStatementLst(es, repl);
then
Expand Down Expand Up @@ -567,8 +567,8 @@ algorithm
(DAE.STMT_LABEL(str,source):: es_1);
case ((DAE.STMT_MATCHCASES(matchType=matchType,inputExps=inputExps,caseStmt=expExpLst,source=source)::es),repl)
equation
inputExps = Util.listMap2(inputExps,VarTransform.replaceExp,repl, NONE);
expExpLst_1 = Util.listMap2(expExpLst,VarTransform.replaceExp,repl, NONE);
inputExps = Util.listMap2(inputExps,VarTransform.replaceExp,repl,NONE());
expExpLst_1 = Util.listMap2(expExpLst,VarTransform.replaceExp,repl,NONE());
es_1 = replaceStatementLst(es, repl);
then
(DAE.STMT_MATCHCASES(matchType,inputExps,expExpLst_1,source):: es_1);
Expand Down Expand Up @@ -600,7 +600,7 @@ algorithm
case (DAE.ELSEIF(exp=e1,statementLst=statementLst,else_=else_),repl)
equation
statementLst_1 = replaceStatementLst(statementLst, repl);
e1_1 = VarTransform.replaceExp(e1, repl, NONE);
e1_1 = VarTransform.replaceExp(e1, repl,NONE());
e1_2 = Exp.simplify(e1_1);
else_1 = replaceElse(else_,repl);
then
Expand Down

0 comments on commit a310414

Please sign in to comment.