Merge branch 'master' of https://github.com/OpenModelica/OMCompiler

OpenModelica · Jul 2, 2015 · ff50eb2 · ff50eb2
2 parents bf98442 + a5ea4c9
commit ff50eb2
Show file tree

Hide file tree

Showing 74 changed files with 7,875 additions and 7,551 deletions.
diff --git a/.gitignore b/.gitignore
@@ -141,6 +141,7 @@ Compiler/boot/LoadCompilerInterface.mos
 Compiler/boot/Makefile
 Compiler/boot/Makefile.depends
 Compiler/boot/Makefile.sources
+Compiler/boot/patches/*.patch
 Compiler/runtime/Makefile
 Compiler/runtime/config.unix.h
 Compiler/runtime/omc_communication.cc

diff --git a/Compiler/BackEnd/HpcOmScheduler.mo b/Compiler/BackEnd/HpcOmScheduler.mo
diff --git a/Compiler/BackEnd/HpcOmTaskGraph.mo b/Compiler/BackEnd/HpcOmTaskGraph.mo
diff --git a/Compiler/BackEnd/OpenTURNS.mo b/Compiler/BackEnd/OpenTURNS.mo
@@ -54,6 +54,7 @@ import BackendEquation;
 import BackendVariable;
 import ClockIndexes;
 import CevalScript;
+import CevalScriptBackend;
 import ComponentReference;
 import DAEUtil;
 import Expression;
@@ -96,8 +97,8 @@ algorithm
   cname_last_str := Absyn.pathLastIdent(inPath);
   fileNamePrefix := cname_str;
 
-  simSettings := CevalScript.convertSimulationOptionsToSimCode(
-    CevalScript.buildSimulationOptionsFromModelExperimentAnnotation(
+  simSettings := CevalScriptBackend.convertSimulationOptionsToSimCode(
+    CevalScriptBackend.buildSimulationOptionsFromModelExperimentAnnotation(
       GlobalScriptUtil.setSymbolTableAST(GlobalScript.emptySymboltable,inProgram),inPath,fileNamePrefix,NONE())
   );
   // correlation matrix form (vector of records) currently not supported by OpenModelica backend, remove it .

diff --git a/Compiler/Main/Main.mo b/Compiler/Main/Main.mo
@@ -47,6 +47,7 @@ import BackendDAE;
 import BackendDAECreate;
 import BackendDAEUtil;
 import CevalScript;
+import CevalScriptBackend;
 import ClockIndexes;
 import Config;
 import Corba;
@@ -579,7 +580,7 @@ algorithm
   // program. Otherwise, instantiate the given class name.
   cname := if stringLength(cls) == 0 then Absyn.lastClassname(program) else Absyn.stringPath(cls);
   st := GlobalScriptUtil.setSymbolTableAST(GlobalScript.emptySymboltable, program);
-  (cache, env, dae) := CevalScript.runFrontEnd(FCore.emptyCache(), FGraph.empty(), cname, st, true);
+  (cache, env, dae) := CevalScriptBackend.runFrontEnd(FCore.emptyCache(), FGraph.empty(), cname, st, true);
 end instantiate;
 
 protected function optimizeDae