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

OpenModelica · Jul 2, 2015 · bf98442 · bf98442
2 parents 1b61666 + 509f225
commit bf98442
Show file tree

Hide file tree

Showing 12 changed files with 6,647 additions and 6,687 deletions.
diff --git a/Compiler/Script/CevalScript.mo b/Compiler/Script/CevalScript.mo
@@ -77,7 +77,7 @@ import CheckModel;
 import ClassInf;
 import ClassLoader;
 import ClockIndexes;
-import CodegenC;
+import CodegenCFunctions;
 import Config;
 import Corba;
 import DAEQuery;
@@ -2260,7 +2260,7 @@ algorithm
 
     case (cache,_,"generateEntryPoint",{Values.STRING(filename),Values.CODE(Absyn.C_TYPENAME(path)),Values.STRING(str)},st as GlobalScript.SYMBOLTABLE(),_)
       equation
-        str = Tpl.tplString2(CodegenC.generateEntryPoint, path, str);
+        str = Tpl.tplString2(CodegenCFunctions.generateEntryPoint, path, str);
         System.writeFile(filename,str);
       then (cache,Values.BOOL(true),st);
 

diff --git a/Compiler/SimCode/SimCodeFunction.mo b/Compiler/SimCode/SimCodeFunction.mo
@@ -43,7 +43,7 @@ import SimCode;
 // protected imports
 protected
 import BaseHashTable;
-import CodegenC;
+import CodegenCFunctions;
 import SimCodeFunctionUtil;
 
 public function translateFunctions "
@@ -77,7 +77,7 @@ algorithm
         makefileParams = SimCodeFunctionUtil.createMakefileParams(includeDirs, libs,libPaths, true);
         fnCode = SimCode.FUNCTIONCODE(name, SOME(mainFunction), fns, literals, includes, makefileParams, extraRecordDecls);
         // Generate code
-        _ = Tpl.tplString(CodegenC.translateFunctions, fnCode);
+        _ = Tpl.tplString(CodegenCFunctions.translateFunctions, fnCode);
       then
         ();
     case (_, _, NONE(), daeElements, _, includes)
@@ -92,7 +92,7 @@ algorithm
 
         fnCode = SimCode.FUNCTIONCODE(name, NONE(), fns, literals, includes, makefileParams, extraRecordDecls);
         // Generate code
-        _ = Tpl.tplString(CodegenC.translateFunctions, fnCode);
+        _ = Tpl.tplString(CodegenCFunctions.translateFunctions, fnCode);
       then
         ();
   end match;

diff --git a/Compiler/Stubs/HpcOmSimCodeMain.mo b/Compiler/Stubs/HpcOmSimCodeMain.mo