- Load builtins in new instantiation.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18429 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 6, 2013 · 76c4c63 · 76c4c63
1 parent 258a82c
commit 76c4c63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Compiler/FrontEnd/NFEnv.mo b/Compiler/FrontEnd/NFEnv.mo
@@ -1110,16 +1110,16 @@ end setScopePrefixOpt;
 
 public function buildInitialEnv
   input SCode.Program inProgram;
+  input SCode.Program inBuiltin;
   output Env outEnv;
 protected
   Env env;
   SCode.Program prog, builtin;
 algorithm
   env := openScope(NONE(), NFInstTypes.BUILTIN_SCOPE(), emptyEnv);
-  (builtin, prog) := List.splitOnTrue(inProgram, SCode.isBuiltinElement);
-  env := List.fold1(builtin, insertElementWithOrigin, {NFInstTypes.BUILTIN_ORIGIN()}, env);
+  env := List.fold1(inBuiltin, insertElementWithOrigin, {NFInstTypes.BUILTIN_ORIGIN()}, env);
   env := openScope(NONE(), NFInstTypes.TOP_SCOPE(), env);
-  outEnv := List.fold(prog, insertElement, env);
+  outEnv := List.fold(inProgram, insertElement, env);
 end buildInitialEnv;
 
 end NFEnv;
diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -3308,9 +3308,9 @@ algorithm
       Absyn.Class absynClass;
       String str,re;
       Option<SCode.Program> fp;
-      SCode.Program scodeP, scodePNew;
+      SCode.Program scodeP, scodePNew, scode_builtin;
       list<GlobalScript.InstantiatedClass> ic,ic_1;
-      Absyn.Program p,ptot;
+      Absyn.Program p,ptot,p_builtin;
       list<GlobalScript.Variable> iv;
       list<GlobalScript.CompiledCFunction> cf;
       list<GlobalScript.LoadedFile> lf;
@@ -3345,7 +3345,10 @@ algorithm
         // remove extends Modelica.Icons.*
         //scodeP = SCodeSimplify.simplifyProgram(scodeP);
 
-        nfenv = NFEnv.buildInitialEnv(scodeP);
+        p_builtin = Builtin.getInitialFunctions();
+        scode_builtin = SCodeUtil.translateAbsyn2SCode(p_builtin);
+
+        nfenv = NFEnv.buildInitialEnv(scodeP, scode_builtin);
         (dae, funcs) = NFInst.instClass(className, nfenv);
 
         cache = Env.emptyCache();