- Some fixes for compiling SCodeFlatten using bootstrapped OMC

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

Author: sjoelund

Compiler/FrontEnd/Patternm.mo

@@ -171,7 +171,7 @@ protected function elabPattern2
   output Env.Cache outCache;
   output DAE.Pattern pattern;
 algorithm
-  (outCache,pattern) := match (cache,env,lhs,ty,info)
+  (outCache,pattern) := matchcontinue (cache,env,lhs,ty,info)
     local
       list<Absyn.Exp> exps;
       list<DAE.Type> tys;
@@ -291,7 +291,7 @@ algorithm
         str = Dump.printExpStr(lhs) +& " of type " +& Types.unparseType(ty);
         Error.addSourceMessage(Error.META_INVALID_PATTERN, {str}, info);
       then fail();
-  end match;
+  end matchcontinue;
 end elabPattern2;
 
 protected function elabPatternTuple

Compiler/FrontEnd/SCodeEnv.mo

@@ -1223,7 +1223,7 @@ algorithm
       Absyn.Path path;
       Env rest;
 
-    case (FRAME(frameType = IMPLICIT_SCOPE) :: rest)
+    case (FRAME(frameType = IMPLICIT_SCOPE()) :: rest)
       then getEnvPath(rest);
 
     case ({FRAME(name = SOME(name))})
@@ -1361,9 +1361,9 @@ protected function printFrameTypeStr
   output String outString;
 algorithm
   outString := match(inFrame)
-    case NORMAL_SCOPE then "Normal";
-    case ENCAPSULATED_SCOPE then "Encapsulated";
-    case IMPLICIT_SCOPE then "Implicit";
+    case NORMAL_SCOPE() then "Normal";
+    case ENCAPSULATED_SCOPE() then "Encapsulated";
+    case IMPLICIT_SCOPE() then "Implicit";
   end match;
 end printFrameTypeStr;
 

Compiler/FrontEnd/SCodeFlattenImports.mo

@@ -382,7 +382,7 @@ protected function checkNotExtendsDependent
   input Absyn.Info inInfo;
   output Boolean outResult;
 algorithm
-  _ := matchcontinue(inBaseClass, inEnv, inInfo)
+  outResult := matchcontinue(inBaseClass, inEnv, inInfo)
     local
       Absyn.Path bc;
       Absyn.Ident id;