- Renamed SCodeFlatten.flatten to flattenProgram and added flattenClass.

- Added flattening of functions in Interactive (disabled by default).
- Renamed some functions in SCodeFlattenImports to be grammatically correct.
- Added fail as a builtin MetaModelica function in MetaModelicaBuiltin.
- Added missing declarations in test case parser/MetaModelicaMatchElse.


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

Author: perost

Compiler/FrontEnd/Inst.mo

@@ -204,7 +204,7 @@ algorithm
       InstanceHierarchy oIH1, oIH2, iIH;
     case (cache,iIH,p)
       equation
-        //p = SCodeFlatten.flatten(p);
+        //p = SCodeFlatten.flattenProgram(p);
         // Debug.fprintln("insttr", "instantiate");
         pnofunc = Util.listSelect(p, isNotFunction);
         pfunc = Util.listSelect(p, SCode.isFunction);
@@ -307,7 +307,7 @@ algorithm
 
     case (cache,ih,(cdecls as (_ :: _)),(path as Absyn.IDENT(name = name2))) /* top level class */
       equation
-        //cdecls = SCodeFlatten.flatten(cdecls);
+        //cdecls = SCodeFlatten.flattenProgram(cdecls);
         (cache,env) = Builtin.initialEnv(cache);
         (cache,env_1,ih,dae1) = instClassDecls(cache, env, ih, cdecls, path);
         (cache,env_2,ih,dae2) = instClassInProgram(cache, env_1, ih, cdecls, path);
@@ -327,7 +327,7 @@ algorithm
 
     case (cache,ih,(cdecls as (_ :: _)),(path as Absyn.QUALIFIED(name = name))) /* class in package */
       equation
-        //cdecls = SCodeFlatten.flatten(cdecls);
+        //cdecls = SCodeFlatten.flattenProgram(cdecls);
         pathstr = Absyn.pathString(path);
 
         //System.startTimer();

Compiler/FrontEnd/MetaModelicaBuiltin.mo

@@ -853,3 +853,7 @@ function realSqrt
   output Real y(unit = "'p(1/2)");
 external "builtin" y=sqrt(x);
 end realSqrt;
+
+function fail
+  external "builtin";
+end fail;

Compiler/FrontEnd/SCodeFlatten.mo

@@ -49,7 +49,7 @@ protected import SCodeEnv;
 
 protected type Env = SCodeEnv.Env;
 
-public function flatten
+public function flattenProgram
   input SCode.Program inProgram;
   output SCode.Program outProgram;
 protected
@@ -67,7 +67,25 @@ algorithm
   //System.stopTimer();
   //print("flatten took " +& realString(System.getTimerIntervalTime()) +& 
   //  " seconds\n");
-end flatten;
+end flattenProgram;
 
+public function flattenClass
+  input SCode.Class inClass;
+  output SCode.Class outClass;
+algorithm
+  outClass := matchcontinue(inClass)
+    local
+      SCode.Class cls;
+
+    case _ then inClass;
+
+    case _
+      equation
+        {cls} = flattenProgram({inClass});
+      then
+        cls;
+
+  end matchcontinue;
+end flattenClass;
 
 end SCodeFlatten;

Compiler/FrontEnd/SCodeFlattenImports.mo

@@ -67,10 +67,10 @@ public function flattenProgram
   input Env inEnv;
   output SCode.Program outProgram;
 algorithm
-  outProgram := Util.listMap1(inProgram, flattenClasses, inEnv);
+  outProgram := Util.listMap1(inProgram, flattenClass, inEnv);
 end flattenProgram;
 
-protected function flattenClasses
+public function flattenClass
   input SCode.Class inClass;
   input Env inEnv;
   output SCode.Class outClass;
@@ -84,11 +84,11 @@ protected
 algorithm
   SCode.CLASS(name, part_pre, encap_pre, restriction, cdef, info) := inClass;
   env := SCodeEnv.enterScope(inEnv, name);
-  cdef := flattenClassDefs(cdef, env, info);
+  cdef := flattenClassDef(cdef, env, info);
   outClass := SCode.CLASS(name, part_pre, encap_pre, restriction, cdef, info);
-end flattenClasses;
+end flattenClass;
 
-protected function flattenClassDefs
+protected function flattenClassDef
   input SCode.ClassDef inClassDef;
   input Env inEnv;
   input Absyn.Info inInfo;
@@ -131,7 +131,7 @@ algorithm
 
     else then inClassDef;
   end match;
-end flattenClassDefs;
+end flattenClassDef;
 
 protected function checkRecursiveShortDefinition
   input Absyn.TypeSpec inTypeSpec;
@@ -223,7 +223,7 @@ protected
   Option<Absyn.ConstrainClass> cc;
 algorithm
   SCode.CLASSDEF(name, fp, rp, cls, cc) := inClassDefElement;
-  cls := flattenClasses(cls, inEnv);
+  cls := flattenClass(cls, inEnv);
   outClassDefElement := SCode.CLASSDEF(name, fp, rp, cls, cc);
 end flattenClassDefElements;
 

Compiler/FrontEnd/SCodeLookup.mo

@@ -622,7 +622,7 @@ algorithm
         (item, new_path, env) = lookupSimpleName(id, inEnv);
       then
         (item, new_path, SOME(env));
-
+        
     // Qualified name.
     case (Absyn.QUALIFIED(name = id, path = path), _, _, _)
       equation

Compiler/Script/Interactive.mo

@@ -49,27 +49,28 @@ encapsulated package Interactive
 //public imports
 public import Absyn;
 public import AbsynDep;
+public import ConnectionGraph;
+public import DAE;
+public import Env;
 public import OptManager;
 public import SCode;
 public import SCodeUtil;
-public import DAE;
-public import Env;
 public import Settings;
-public import ConnectionGraph;
 public import Values;
 
 // protected imports
 protected import ComponentReference;
 protected import DAEUtil;
+protected import Dependency;
 protected import ErrorExt;
 protected import Expression;
 protected import ExpressionDump;
 protected import InnerOuter;
 protected import MetaUtil;
+protected import SCodeFlatten;
 protected import Types;
 protected import UnitAbsyn;
 protected import ValuesUtil;
-protected import Dependency;
 
 /*
 ** CompiledCFunction
@@ -413,6 +414,8 @@ algorithm
       equation
         env = buildEnvFromSymboltable(st);
         scode_class = SCodeUtil.translateClass(absyn_class);
+        scode_class = SCodeFlatten.flattenClass(scode_class);
+
         (_,env_1,_) =
           Inst.implicitFunctionInstantiation(Env.emptyCache(),env,InnerOuter.emptyInstHierarchy,
                                              DAE.NOMOD(), Prefix.NOPRE(), Connect.emptySet, scode_class, {});