remove superfluous matchcontinue

Belonging to [master]: - OpenModelica/OMCompiler#2787
OpenModelica · Nov 15, 2018 · 8fe98ae · 8fe98ae
1 parent 565b72f
commit 8fe98ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/Compiler/FrontEnd/SCode.mo b/Compiler/FrontEnd/SCode.mo
@@ -4492,35 +4492,32 @@ protected function getElementWithId
   input String inId;
   output Element outElement;
 algorithm
-  outElement := matchcontinue(inProgram, inId)
+  outElement := match(inProgram, inId)
     local
       Program sp, rest;
       Element c, e;
       Absyn.Path p;
       Absyn.Ident i, n;
 
     case ((e as CLASS(name = n))::_, i)
-      equation
-        true = stringEq(n, i);
+      guard stringEq(n, i)
       then
         e;
 
     case ((e as COMPONENT(name = n))::_, i)
-      equation
-        true = stringEq(n, i);
+      guard stringEq(n, i)
       then
         e;
 
     case ((e as EXTENDS(baseClassPath = p))::_, i)
-      equation
-        true = stringEq(Absyn.pathString(p), i);
+      guard stringEq(Absyn.pathString(p), i)
       then
         e;
 
     case (_::rest, i)
       then getElementWithId(rest, i);
 
-  end matchcontinue;
+  end match;
 end getElementWithId;
 
 public function getElementWithPath

diff --git a/Compiler/Script/CevalScriptBackend.mo b/Compiler/Script/CevalScriptBackend.mo
@@ -7243,7 +7243,7 @@ function getClassComment "Returns the class comment of a Absyn.ClassDef"
   output String outString;
 algorithm
   outString:=
-  matchcontinue (inClassDef)
+  match (inClassDef)
     local
       String str,res;
       Option<Absyn.Comment> cmt;
@@ -7258,7 +7258,7 @@ algorithm
       then Interactive.getStringComment(cmt);
     case (Absyn.CLASS_EXTENDS(comment = SOME(str))) then str;
     else "";
-  end matchcontinue;
+  end match;
 end getClassComment;
 
 protected function getAnnotationInEquation