- Cleaned up some code.

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

Compiler/BackEnd/BackendDAECreate.mo

@@ -2531,7 +2531,7 @@ algorithm
         b = Expression.isConst(e1);
         v1 = Debug.bcallret2(not b, BackendVariable.setBindExp, v, SOME(e1), v);
       then ((v1, repl));
-    else then inTpl;
+    else inTpl;
   end matchcontinue;
 end replaceAliasVarTraverser;
 
@@ -3302,7 +3302,7 @@ algorithm
         (v, e) = addOptimizationVarsEqns2(inConstraint, 1, v, e, true);
 
     then (v, e);
-    else then (inVars, inEqns);
+    else (inVars, inEqns);
   end match;
 end addOptimizationVarsEqns;
 
@@ -3335,7 +3335,7 @@ algorithm
     eqns = listAppend(conEqn, inEqns);
     (v, eqns)= addOptimizationVarsEqns1(conLst, inI + 1, v, eqns, b);
    then (v, eqns);
-   else then (inVars, inEqns);
+   else (inVars, inEqns);
    end match;
 end addOptimizationVarsEqns1;
 
@@ -3356,7 +3356,7 @@ algorithm
     case({DAE.CONSTRAINT_EXPS(constraintLst = constraintLst)}, _, _, _, _) equation
       (v, e) = addOptimizationVarsEqns1(constraintLst, inI, inVars, inEqns, b);
       then (v, e);
-  else then (inVars, inEqns);
+  else (inVars, inEqns);
   end match;
 end addOptimizationVarsEqns2;
 

Compiler/BackEnd/BackendDAEOptimize.mo

@@ -1537,7 +1537,7 @@ algorithm
          treelst = DAEUtil.avlTreeToList(usedfuncs2);
          usedfuncs = DAEUtil.avlTreeAddLst(treelst, usedfuncs);
       then removeUnusedFunctionsSymJacs(rest,(funcs,usedfuncs));
-      //else then inFuncsTpl;
+      //else inFuncsTpl;
   end match;
 end removeUnusedFunctionsSymJacs;
 
@@ -2134,7 +2134,7 @@ algorithm
         (_, maxdegree) = List.mapFold(sparsepatternT, findDegrees, 1);
         print("analytical Jacobians[SPARSE] -> got sparse pattern nonZeroElements: "+& intString(nonZeroElements) +& " maxNodeDegree: " +& intString(maxdegree) +& " time : " +& realString(clock()) +& "\n");
       then ();
-    else then ();
+    else ();
   end match;
 end dumpSparsePatternStatistics;
 
@@ -2560,7 +2560,7 @@ algorithm
       eqn = BackendDAE.RESIDUAL_EQUATION(e1, DAE.emptyElementSource,false,BackendDAE.INITIAL_EQUATION());
     then ((var,eqn::eqns));
 
-    else then inTpl;
+    else inTpl;
   end matchcontinue;
 end generateImplicitInitialEquations;
 
@@ -2589,7 +2589,7 @@ algorithm
       eqn = BackendDAE.RESIDUAL_EQUATION(e1, DAE.emptyElementSource,false,BackendDAE.INITIAL_EQUATION());
     then ((var,eqn::eqns));
 
-    else then inTpl;
+    else inTpl;
   end matchcontinue;
 end generateImplicitInitialEquationsForParameters;
 
@@ -2669,7 +2669,7 @@ algorithm
         //true = BackendVariable.isVarOnTopLevelAndOutput(variable);
         var = BackendVariable.setVarDirection(var, DAE.BIDIR());
       then ((var,i));
-    else then inTpl;
+    else inTpl;
   end matchcontinue;
 end redirectOutputToBiDir;
 
@@ -2935,7 +2935,7 @@ algorithm
     _ = System.realtimeTock(GlobalScript.RT_CLOCK_EXECSTAT_JACOBIANS);
   then outBackendDAE;
 
-  else then inBackendDAE;
+  else inBackendDAE;
   end matchcontinue;
 end generateSymbolicJacobianPast;
 
@@ -2969,7 +2969,7 @@ algorithm
     _  = System.realtimeTock(GlobalScript.RT_CLOCK_EXECSTAT_JACOBIANS);
   then outBackendDAE;
 
-  else then inBackendDAE;
+  else inBackendDAE;
   end matchcontinue;
 end generateSymbolicLinearizationPast;
 
@@ -4086,7 +4086,7 @@ algorithm
         Error.addMessage(Error.INTERNAL_ERROR, {errorMessage});
       then (BackendDAE.EMPTY_JACOBIAN(), inShared);
 
-        else then (BackendDAE.EMPTY_JACOBIAN(), inShared);
+        else (BackendDAE.EMPTY_JACOBIAN(), inShared);
   end matchcontinue;
 end getSymbolicJacobian;
 
@@ -4262,7 +4262,7 @@ algorithm
   b := match(inEqn)
     case BackendDAE.ARRAY_EQUATION(source=DAE.SOURCE(info=Absyn.INFO(fileName="stateselection"))) then false;
     case BackendDAE.EQUATION(source=DAE.SOURCE(info=Absyn.INFO(fileName="stateselection"))) then false;
-    else then true;
+    else true;
   end match;
 end removeStateSetEqn;
 
@@ -4771,7 +4771,7 @@ algorithm
         (outDAE,_) = BackendDAEUtil.mapEqSystemAndFold(inDAE,countOperations0,false);
       then
         outDAE;
-    else then inDAE;
+    else inDAE;
   end matchcontinue;
 end countOperations;
 
@@ -6431,7 +6431,7 @@ algorithm
       repl_1 = BackendVarTransform.addReplacement(repl, varName, exp, NONE());
     then ((v, repl_1));
 
-    else then inTpl;
+    else inTpl;
   end matchcontinue;
 end removeConstantsFinder;
 
@@ -6471,7 +6471,7 @@ algorithm
       _ = BackendDAEUtil.traverseBackendDAEExpsEqnsWithUpdate(orderedEqs, traverserreplaceEdgeChange, false);
     then (BackendDAE.EQSYSTEM(orderedVars, orderedEqs, m, mT, matching, stateSets), (shared, true));
 
-    else then (isyst, sharedChanged);
+    else (isyst, sharedChanged);
   end matchcontinue;
 end replaceEdgeChange0;
 
@@ -6505,7 +6505,7 @@ algorithm
       ty = Expression.typeof(e);
     then ((DAE.LBINARY(e, DAE.AND(ty), DAE.LUNARY(DAE.NOT(ty), DAE.CALL(Absyn.IDENT("pre"), {e}, DAE.CALL_ATTR(ty, false, true, false, DAE.NO_INLINE(), DAE.NO_TAIL())))), true));
 
-    else then tpl;
+    else tpl;
   end matchcontinue;
 end traverserExpreplaceEdgeChange;
 
@@ -7622,7 +7622,7 @@ algorithm
     then
       (BackendDAE.EQSYSTEM(orderedVars, orderedEqs, m, mT, matching, stateSets), (shared, true));
 
-    else then (isyst, sharedChanged);
+    else (isyst, sharedChanged);
   end matchcontinue;
 end applyRewriteRulesBackend0;
 
@@ -7655,7 +7655,7 @@ algorithm
     then
       ((e, true));
 
-    else then tpl;
+    else tpl;
   end matchcontinue;
 end traverserExpapplyRewriteRulesBackend;
 

Compiler/BackEnd/BackendDAETransform.mo

@@ -548,7 +548,7 @@ algorithm
         Debug.bcall2(intLt(linInfo,0), Error.addMessage, Error.LINEAR_SYSTEM_INVALID, {"LAPACK/dgesv",syst});
       then
         false;
-    else then true;
+    else true;
   end matchcontinue;
 end analyzeConstantJacobian;
 
@@ -589,7 +589,7 @@ algorithm
       then
         BackendDAE.VAR(cr,BackendDAE.STATE_DER(),dir,prl,tp,exp,v,dim,source,attr,comment,ct);
 
-    else then inVar;
+    else inVar;
   end match;
 end transformXToXd;
 
@@ -1355,7 +1355,7 @@ algorithm
         (stack,comps) = checkStack(nv, istack, number, stackflag, {});
       then
         (stack,comps);
-    else then (istack,{});
+    else (istack,{});
   end matchcontinue;
 end checkRoot;
 
@@ -1386,7 +1386,7 @@ algorithm
         (stack,comp) = checkStack(vn, rest, number, stackflag, top :: icomp);
       then
         (stack,comp);
-    else then (istack,listReverse(icomp));
+    else (istack,listReverse(icomp));
   end matchcontinue;
 end checkStack;
 

Compiler/BackEnd/BackendDAEUtil.mo

@@ -115,7 +115,7 @@ public function isInitializationDAE
 algorithm
   res := match(inShared)
    case (BackendDAE.SHARED(backendDAEType=BackendDAE.INITIALSYSTEM())) then true;
-    else then false;
+    else false;
   end match;
 end isInitializationDAE;
 
@@ -6104,7 +6104,7 @@ algorithm
         (jac, shared) = calculateJacobianRows(eqn_lst,vars,m,1,1,differentiateIfExp,iShared,varsInEqn,{});
       then
         (SOME(jac),shared);
-    else then (NONE(), iShared);  /* no analytic jacobian available */
+    else (NONE(), iShared);  /* no analytic jacobian available */
   end matchcontinue;
 end calculateJacobian;
 
@@ -6130,7 +6130,7 @@ algorithm
         (jac, shared) = calculateJacobianRows(eqn_lst,vars,m,1,1,differentiateIfExp,iShared,varsInEqnEnhanced,{});
       then
         (SOME(jac), shared);
-    else then (NONE(), iShared);  /* no analytic jacobian available */
+    else (NONE(), iShared);  /* no analytic jacobian available */
   end matchcontinue;
 end calculateJacobianEnhanced;
 
@@ -6741,7 +6741,7 @@ algorithm
         true = Expression.isConst(e);
       then
         jacobianConstant(eqns);
-    else then false;
+    else false;
   end matchcontinue;
 end jacobianConstant;
 
@@ -6769,7 +6769,7 @@ algorithm
       then
         jacobianNonlinear(vars, xs);
     case (_,{}) then false;
-    else then true;
+    else true;
   end matchcontinue;
 end jacobianNonlinear;
 
@@ -7099,7 +7099,7 @@ algorithm
         repl1 = BackendVarTransform.addReplacement(repl,cr,Expression.makeConstZero(ComponentReference.crefLastType(cr)),NONE());
       then
         ((var,repl1));
-    else then inTpl;
+    else inTpl;
   end matchcontinue;
 end makeZeroReplacement;
 
@@ -8452,7 +8452,7 @@ algorithm
         Debug.execStat("transformDAE -> state selection " +& methodstr,GlobalScript.RT_CLOCK_EXECSTAT_BACKEND_MODULES);
       then
          outDAE;
-    else then inDAE;
+    else inDAE;
   end match;
 end stateDeselectionDAE;
 

Compiler/BackEnd/BackendDump.mo

@@ -1504,7 +1504,7 @@ algorithm
       str2 = stringAppendList({str," in equations [",eq_s,"] and when conditions [",wc_s,"]"});
     then str2;
 
-    else then "";
+    else "";
   end match;
 end zeroCrossingString;
 
@@ -1542,7 +1542,7 @@ algorithm
       str = stringAppendList({" whenclause = ",sc," then ",s1});
     then str;
 
-    else then "";
+    else "";
   end match;
 end whenClauseString;
 
@@ -1988,7 +1988,7 @@ algorithm
     local
       Type_A a;
     case (SOME(a), _) equation infunc(a); then();
-    else then ();
+    else ();
   end match;
 end dumpOption;
 

Compiler/BackEnd/BackendEquation.mo

@@ -2214,7 +2214,7 @@ algorithm
     DAE.ComponentRef lhs;
     case (lhs, SOME(rhs), _)
       then {BackendDAE.SOLVED_EQUATION(lhs,rhs,Source,false,BackendDAE.UNKNOWN_EQUATION_KIND())};
-    else then {};
+    else {};
   end match;
 end generateSolvedEqnsfromOption;
 
@@ -2241,7 +2241,7 @@ algorithm
     case (lhs, DAE.RELATION(e1,DAE.GREATEREQ(_),e2,_,_), _) equation
       (rhs,_) = ExpressionSimplify.simplify(DAE.BINARY(e2,DAE.SUB(DAE.T_REAL_DEFAULT),e1));
       then {BackendDAE.SOLVED_EQUATION(lhs, rhs,Source,false,BackendDAE.UNKNOWN_EQUATION_KIND())};
-    else then {};
+    else {};
   end match;
 end generateResidualfromRealtion;
 
@@ -2782,7 +2782,7 @@ public function isWhenEquation
 algorithm
   b := match(inEqn)
     case BackendDAE.WHEN_EQUATION(whenEquation=_) then true;
-    else then false;
+    else false;
   end match;
 end isWhenEquation;
 
@@ -2792,7 +2792,7 @@ public function isArrayEquation
 algorithm
   b := match(inEqn)
     case BackendDAE.ARRAY_EQUATION(source=_) then true;
-    else then false;
+    else false;
   end match;
 end isArrayEquation;
 
@@ -2802,7 +2802,7 @@ public function isAlgorithm
 algorithm
   b := match(inEqn)
     case BackendDAE.ALGORITHM(source=_) then true;
-    else then false;
+    else false;
   end match;
 end isAlgorithm;
 

Compiler/BackEnd/BackendVarTransform.mo

@@ -482,7 +482,7 @@ algorithm
         repl_1 = makeTransitive12(lst,repl,singleRepl,inFuncTypeExpExpToBooleanOption,HashSet.emptyHashSet());
       then
         (repl_1,src,dst);
-    else then (repl,src,dst);
+    else (repl,src,dst);
   end matchcontinue;
 end makeTransitive1;
 
@@ -1498,7 +1498,7 @@ algorithm
     case DAE.CREF_QUAL(ident = "$pDER") then true;
     // keep same a while untill we know which are needed
     //case DAE.CREF_QUAL(ident = "$DER") then true;
-    else then false;
+    else false;
   end match;
 end selfGeneratedVar;
 
@@ -2586,7 +2586,7 @@ algorithm
         print("\n");
       then
         ();
-    else then ();
+    else ();
   end match;
 end dumpDerConstReplacements;