Update tests for new compiler structure

OpenModelica · Jul 2, 2015 · cf4272a · cf4272a
1 parent 2a3c85b
commit cf4272a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/openmodelica/bootstrapping/LoadCompilerSources.mos b/openmodelica/bootstrapping/LoadCompilerSources.mos
@@ -167,7 +167,9 @@ if true then /* Suppress output */
     prefixPath + "SimCode/HpcOmSimCode.mo",
     prefixPath + "SimCode/HpcOmSimCodeMain.mo",
     prefixPath + "SimCode/SimCode.mo",
+    prefixPath + "SimCode/SimCodeFunction.mo",
     prefixPath + "SimCode/SimCodeMain.mo",
+    prefixPath + "SimCode/SimCodeFunctionUtil.mo",
     prefixPath + "SimCode/SimCodeUtil.mo",
     prefixPath + "SimCode/SimCodeVar.mo",
 

diff --git a/openmodelica/bootstrapping/SimCodeTest.mo b/openmodelica/bootstrapping/SimCodeTest.mo
@@ -12,7 +12,7 @@ algorithm
   Flags.new({"+g=Modelica"});
   path:=Absyn.QUALIFIED("SimCodeC",Absyn.IDENT("abc"));
   func:=DAE.FUNCTION(path,{DAE.FUNCTION_DEF({})},DAE.T_FUNCTION({},DAE.T_NORETCALL_DEFAULT,DAE.FUNCTION_ATTRIBUTES_DEFAULT,{path}),SCode.PUBLIC(),false,false,DAE.NO_INLINE(),DAE.emptyElementSource,NONE());
-  SimCodeMain.translateFunctions(Absyn.PROGRAM({},Absyn.TOP()),"SimCodeC_abc", SOME(func), {}, {}, {});
+  SimCodeFunction.translateFunctions(Absyn.PROGRAM({},Absyn.TOP()),"SimCodeC_abc", SOME(func), {}, {}, {});
 end test;
 
 end SimCodeTest;
diff --git a/simulation/modelica/others/ParameterCycle.mos b/simulation/modelica/others/ParameterCycle.mos
@@ -21,6 +21,6 @@ simulate(ParameterCycle); getErrorString();
 //          var1:PARAM(start = 0.1 )  = if bool then var0 else var0 / var2 .ParameterCycle, .Real type: Real []
 //          var2:PARAM(start = 0.1 )  = if bool then var0 / var1 else var0 .ParameterCycle, .Real type: Real []
 // Error: No system for the symbolic initialization was generated
-// [SimCode/SimCodeUtil.mo:1807:7-1807:148:writable] Error: Internal error function createSimCode failed [Transformation from optimised DAE to simulation code structure failed]
+// [SimCode/SimCodeUtil.mo:482:7-482:148:writable] Error: Internal error function createSimCode failed [Transformation from optimised DAE to simulation code structure failed]
 // "
 // endResult