Skip to content

Commit

Permalink
- typo
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23287 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
lochel committed Nov 10, 2014
1 parent 736de63 commit ff215b5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
38 changes: 19 additions & 19 deletions Compiler/BackEnd/BackendDAEUtil.mo
Expand Up @@ -2113,7 +2113,7 @@ algorithm
BackendDAE.SHARED(info=einfo) := shared;
end getExtraInfo;

public function removediscreteAssingments "
public function removeDiscreteAssignments "
Author: wbraun
Function tarverse Statements and remove discrete one"
input list<DAE.Statement> inStmts;
Expand Down Expand Up @@ -2146,7 +2146,7 @@ algorithm
cref = Expression.expCref(e);
({v},_) = BackendVariable.getVar(cref,vars);
true = BackendVariable.isVarDiscrete(v);
xs = removediscreteAssingments(rest,vars);
xs = removeDiscreteAssignments(rest,vars);
then xs;

/*case ((DAE.STMT_TUPLE_ASSIGN(expExpLst = expl1)::rest),vars)
Expand All @@ -2155,54 +2155,54 @@ algorithm
(vlst,_) = List.map1_2(crefLst,BackendVariable.getVar,vars);
//blst = List.map(vlst,BackendVariable.isVarDiscrete);
//true = boolOrList(blst);
xs = removediscreteAssingments(rest,vars);
xs = removeDiscreteAssignments(rest,vars);
then xs;
*/
case ((DAE.STMT_ASSIGN_ARR(componentRef = cref)::rest),vars)
equation
({v},_) = BackendVariable.getVar(cref,vars);
true = BackendVariable.isVarDiscrete(v);
xs = removediscreteAssingments(rest,vars);
xs = removeDiscreteAssignments(rest,vars);
then xs;

case (((DAE.STMT_IF(exp=e,statementLst=stmts,else_ = algElse, source = source))::rest),vars)
equation
stmts = removediscreteAssingments(stmts,vars);
stmts = removeDiscreteAssignments(stmts,vars);
algElse = removediscreteAssingmentsElse(algElse,vars);
xs = removediscreteAssingments(rest,vars);
xs = removeDiscreteAssignments(rest,vars);
then DAE.STMT_IF(e,stmts,algElse,source)::xs;

case (((DAE.STMT_FOR(type_=tp,iterIsArray=b1,iter=id1,index=index,range=e,statementLst=stmts, source = source))::rest),vars)
equation
stmts = removediscreteAssingments(stmts,vars);
xs = removediscreteAssingments(rest,vars);
stmts = removeDiscreteAssignments(stmts,vars);
xs = removeDiscreteAssignments(rest,vars);
then DAE.STMT_FOR(tp,b1,id1,index,e,stmts,source)::xs;

case (((DAE.STMT_WHILE(exp=e,statementLst=stmts, source = source))::rest),vars)
equation
stmts = removediscreteAssingments(stmts,vars);
xs = removediscreteAssingments(rest,vars);
stmts = removeDiscreteAssignments(stmts,vars);
xs = removeDiscreteAssignments(rest,vars);
then DAE.STMT_WHILE(e,stmts,source)::xs;

case (((DAE.STMT_WHEN(exp=e,conditions=conditions,initialCall=initialCall,statementLst=stmts,elseWhen=NONE(),source=source))::rest),vars)
equation
stmts = removediscreteAssingments(stmts,vars);
xs = removediscreteAssingments(rest,vars);
stmts = removeDiscreteAssignments(stmts,vars);
xs = removeDiscreteAssignments(rest,vars);
then DAE.STMT_WHEN(e,conditions,initialCall,stmts,NONE(),source)::xs;

case (((DAE.STMT_WHEN(exp=e,conditions=conditions,initialCall=initialCall,statementLst=stmts,elseWhen=SOME(ew),source=source))::rest),vars)
equation
stmts = removediscreteAssingments(stmts,vars);
{ew} = removediscreteAssingments({ew},vars);
xs = removediscreteAssingments(rest,vars);
stmts = removeDiscreteAssignments(stmts,vars);
{ew} = removeDiscreteAssignments({ew},vars);
xs = removeDiscreteAssignments(rest,vars);
then DAE.STMT_WHEN(e,conditions,initialCall,stmts,SOME(ew),source)::xs;

case ((stmt::rest),vars)
equation
xs = removediscreteAssingments(rest,vars);
xs = removeDiscreteAssignments(rest,vars);
then stmt::xs;
end matchcontinue;
end removediscreteAssingments;
end removeDiscreteAssignments;

protected function removediscreteAssingmentsElse "author: wbraun
Helper function for traverseDAEEquationsELse"
Expand All @@ -2220,11 +2220,11 @@ algorithm
case(DAE.ELSEIF(e,st,el),vars)
equation
el = removediscreteAssingmentsElse(el,vars);
st = removediscreteAssingments(st,vars);
st = removeDiscreteAssignments(st,vars);
then DAE.ELSEIF(e,st,el);
case(DAE.ELSE(st),vars)
equation
st = removediscreteAssingments(st,vars);
st = removeDiscreteAssignments(st,vars);
then DAE.ELSE(st);
end match;
end removediscreteAssingmentsElse;
Expand Down
4 changes: 2 additions & 2 deletions Compiler/SimCode/SimCodeUtil.mo
Expand Up @@ -3035,7 +3035,7 @@ algorithm
// section.
true = ComponentReference.crefEqualNoStringCompare(BackendVariable.varCref(v), varOutput);
DAE.ALGORITHM_STMTS(algStatements) = BackendDAEUtil.collateAlgorithm(alg, NONE());
algStatements = BackendDAEUtil.removediscreteAssingments(algStatements, vars);
algStatements = BackendDAEUtil.removeDiscreteAssignments(algStatements, vars);
then
({SimCode.SES_ALGORITHM(iuniqueEqIndex, algStatements)}, iuniqueEqIndex+1, itempvars);

Expand Down Expand Up @@ -6180,7 +6180,7 @@ algorithm
// The variables solved for musst all be part of the output variables of the algorithm.
List.map2AllValue(solvedVars, List.isMemberOnTrue, true, algOutVars, ComponentReference.crefEqualNoStringCompare);
DAE.ALGORITHM_STMTS(algStatements) = BackendDAEUtil.collateAlgorithm(alg, NONE());
algStatements = BackendDAEUtil.removediscreteAssingments(algStatements, BackendVariable.listVar1(vars));
algStatements = BackendDAEUtil.removeDiscreteAssignments(algStatements, BackendVariable.listVar1(vars));
then
({SimCode.SES_ALGORITHM(iuniqueEqIndex, algStatements)}, iuniqueEqIndex+1);

Expand Down

0 comments on commit ff215b5

Please sign in to comment.