fix boostrapping

- patch Absyn C sources - fix QT api generation - fix MatlabTranslator test - fix testsuite
OpenModelica · Jul 2, 2019 · 212bdd7 · 212bdd7
1 parent d506d8d
commit 212bdd7
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 3 deletions.
diff --git a/OMCompiler/Compiler/Template/GenerateAPIFunctionsTpl.tpl b/OMCompiler/Compiler/Template/GenerateAPIFunctionsTpl.tpl
@@ -8,6 +8,7 @@ template getCevalScriptInterface(list<DAE.Type> tys)
   let funcs = tys |> ty as T_FUNCTION(__) => '<%getCevalScriptInterfaceFunc(pathLastIdent(path), ty.funcArg, ty.funcResultType)%><%\n%>'
   <<
   import Absyn;
+  import AbsynUtil;
   import CevalScript;
   import Parser;
   import SymbolTable;
@@ -62,7 +63,7 @@ template getOutValue(Text name, DAE.Type ty, Text &varDecl, Text &postMatch)
 
     case T_CODE(ty=C_TYPENAME(__)) then
       let &varDecl += 'Absyn.Path <%name%>_path;<%\n%>'
-      let &postMatch += '<%name%> := Absyn.pathString(<%name%>_path);<%\n%>'
+      let &postMatch += '<%name%> := AbsynUtil.pathString(<%name%>_path);<%\n%>'
       'Values.CODE(Absyn.C_TYPENAME(path=<%name%>_path))'
     else error(sourceInfo(), 'getOutValue failed for <%unparseType(ty)%>')
 end getOutValue;

diff --git a/OMCompiler/Compiler/boot/Makefile.common b/OMCompiler/Compiler/boot/Makefile.common
@@ -52,6 +52,8 @@ bootstrap-from-tarball:
 	# Patch _main.c to avoid a new tarball
 	$(MAKE) -f $(defaultMakefileTarget) patch-files
 	$(PATCH_SOURCES)
+	cd build && patch -i ../patches/Absyn.h.1.patch Absyn.h
+	cd build && patch -i ../patches/Absyn.c.1.patch Absyn.c
 	cd build && patch -i ../patches/CevalScript.c.1.patch CevalScript.c
 	cd build && patch -i ../patches/System_includes.h.patch System_includes.h
 	# We have not compiled OpenModelicaScriptingAPI.mo yet

diff --git a/OMCompiler/Compiler/boot/patches/Absyn.c.1.patch.xz b/OMCompiler/Compiler/boot/patches/Absyn.c.1.patch.xz
diff --git a/OMCompiler/Compiler/boot/patches/Absyn.h.1.patch.xz b/OMCompiler/Compiler/boot/patches/Absyn.h.1.patch.xz
diff --git a/testsuite/openmodelica/bootstrapping/DumpTest.mos b/testsuite/openmodelica/bootstrapping/DumpTest.mos
@@ -9,7 +9,7 @@ setCommandLineOptions("-d=rml,noevalfunc,gen");
 echo(false);
 body:=Absyn.PARTS({},{},{},{},NONE());
 restr:=Absyn.R_FUNCTION(Absyn.FR_NORMAL_FUNCTION(Absyn.PURE()));
-prog:=Absyn.PROGRAM({Absyn.CLASS("dummyClass",true,true,true,restr,body,Absyn.dummyInfo)},Absyn.TOP());
+prog:=Absyn.PROGRAM({Absyn.CLASS("dummyClass",true,true,true,restr,body,AbsynUtil.dummyInfo)},Absyn.TOP());
 echo(true);
 "DumpGraphviz.dump";
 DumpGraphviz.dump(prog);

diff --git a/testsuite/openmodelica/bootstrapping/LoadCompilerSources.mos b/testsuite/openmodelica/bootstrapping/LoadCompilerSources.mos
@@ -6,6 +6,7 @@ if true then /* Suppress output */
   setCommandLineOptions("+g=MetaModelica");
   files := {
     prefixPath + "FrontEnd/Absyn.mo",
+    prefixPath + "FrontEnd/AbsynUtil.mo",
     prefixPath + "FrontEnd/Algorithm.mo",
     prefixPath + "FrontEnd/Builtin.mo",
     prefixPath + "FrontEnd/Ceval.mo",

diff --git a/testsuite/simulation/modelica/others/TestSolve18.mos b/testsuite/simulation/modelica/others/TestSolve18.mos
@@ -40,7 +40,7 @@ val(z,1.0);
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // [BackEnd/ExpressionSolve.mo:0:0-0:0:writable] Error: Internal error Failed to solve "(-exp(if y > 0.0 then time else 2.0 * time)) * y = -1.0 - time" w.r.t. "y"
 // [BackEnd/ExpressionSolve.mo:0:0-0:0:writable] Error: Internal error Failed to solve "/*Real*/(sign(1.0 + 2.0 * x)) = log(1.0 - (-0.2) * time)" w.r.t. "x"
-// [BackEnd/Differentiate.mo:198:7-198:147:writable] Error: Derivative of expression "der(z) - (x - y)" w.r.t. "z" is non-existent.
+// [BackEnd/Differentiate.mo:199:7-199:147:writable] Error: Derivative of expression "der(z) - (x - y)" w.r.t. "z" is non-existent.
 // [BackEnd/ExpressionSolve.mo:0:0-0:0:writable] Error: Internal error Failed to solve "der(z) = x - y" w.r.t. "z"
 // "
 //

diff --git a/testsuite/special/MatlabTranslator/LoadCompilerSources.mos b/testsuite/special/MatlabTranslator/LoadCompilerSources.mos
@@ -6,6 +6,7 @@ if true then /* Suppress output */
   setCommandLineOptions("+g=MetaModelica");
   files := {
     prefixPath + "FrontEnd/Absyn.mo",
+    prefixPath + "FrontEnd/AbsynUtil.mo",
     prefixPath + "FrontEnd/Algorithm.mo",
     prefixPath + "FrontEnd/Builtin.mo",
     prefixPath + "FrontEnd/CevalFunction.mo",

diff --git a/testsuite/special/MatlabTranslator/SCRIPT.mos b/testsuite/special/MatlabTranslator/SCRIPT.mos
@@ -12,6 +12,7 @@ files := {
   //"Absyn.mo",
   "AbsynMat.mo",
   "../../../OMCompiler/Compiler/FrontEnd/Absyn.mo",
+  "../../../OMCompiler/Compiler/FrontEnd/AbsynUtil.mo",
   "../../../OMCompiler/Compiler/Util/Autoconf.mo",
   "../../../OMCompiler/Compiler/Util/Error.mo",
   "../../../OMCompiler/Compiler/Util/ErrorExt.mo",