- Refactoring

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12532 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 15, 2012 · 748da59 · 748da59
1 parent aaad0c7
commit 748da59
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/Compiler/BackEnd/BackendQSS.mo b/Compiler/BackEnd/BackendQSS.mo
@@ -693,7 +693,7 @@ algorithm
     /* TODO: Check matrix A for discrete values */
     vars_cref = List.intersectionOnTrue(listAppend(states,listAppend(disc,algs)),vars_cref,ComponentReference.crefEqual);
     then vars_cref;
-  end matchcontinue;
+  end match;
 end getRHSVars;
 
 function getInitExp
@@ -900,7 +900,7 @@ algorithm
     /* TODO: Check matrix A for discrete values */
     vars_cref = List.intersectionOnTrue(listAppend(states,listAppend(disc,algs)),vars_cref,ComponentReference.crefEqual);
     then vars_cref;
-  end matchcontinue;
+  end match;
 
 end getDiscRHSVars;
 

diff --git a/Compiler/BackEnd/MathematicaDump.mo b/Compiler/BackEnd/MathematicaDump.mo
@@ -540,11 +540,10 @@ protected function lbinopSymbolMma "Return string representation of logical bina
   input DAE.Operator inOperator;
   output String outString;
 algorithm 
-  outString:=
-  matchcontinue (inOperator)
+  outString := match (inOperator)
     case (DAE.AND(_)) then " && "; 
     case (DAE.OR(_)) then " || "; 
-  end matchcontinue;
+  end match;
 end lbinopSymbolMma;
 
 protected function lunaryopSymbolMma "
@@ -553,10 +552,9 @@ protected function lunaryopSymbolMma "
   input DAE.Operator inOperator;
   output String outString;
 algorithm 
-  outString:=
-  matchcontinue (inOperator)
+  outString := match (inOperator)
     case (DAE.NOT(_)) then " ! "; 
-  end matchcontinue;
+  end match;
 end lunaryopSymbolMma;
 
 protected function relopSymbolMma "
@@ -565,8 +563,7 @@ protected function relopSymbolMma "
   input DAE.Operator inOperator;
   output String outString;
 algorithm 
-  outString:=
-  matchcontinue (inOperator)
+  outString := matchcontinue (inOperator)
     case (DAE.LESS(ty = _)) then " < "; 
     case (DAE.LESSEQ(ty = _)) then " <= "; 
     case (DAE.GREATER(ty = _)) then " > "; 

diff --git a/Compiler/BackEnd/Uncertainties.mo b/Compiler/BackEnd/Uncertainties.mo
@@ -599,7 +599,7 @@ outEq:=matchcontinue(dae,uncertainVariables)
   case (BackendDAE.DAE(BackendDAE.EQSYSTEM(_,_,SOME(m),_,_)::_,_),uncertainVariables)
    then
      getEquationsWithOneVariable2(arrayList(m),uncertainVariables,1);
-end matchcontinue;     
+end match;     
 end getEquationsWithOneVariable;
 
 protected function getEquationsWithOneVariable2