- Fix MetaModelica testcases using the new runtime

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10890 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/susan_codegen/SimCode/CodegenC.tpl

@@ -1706,10 +1706,10 @@ case SES_SIMPLE_ASSIGN(__) then
   let &preExp = buffer "" /*BUFD*/
   let expPart = daeExp(exp, context, &preExp /*BUFC*/, &varDecls /*BUFD*/)
   <<
-  /*#modelicaLine <%eqInfoString(eq)%>*/
+  <%modelicaLine(eqInfo(eq))%>
   <%preExp%>
   <%cref(cref)%> = <%expPart%>; <%inlineCref(context,cref)%>
-  /*#endModelicaLine*/
+  <%endModelicaLine()%>
   >>
 end equationSimpleAssign;
 
@@ -1719,7 +1719,7 @@ template equationArrayCallAssign(SimEqSystem eq, Context context,
  "Generates equation on form 'cref_array = call(...)'."
 ::=
 <<
-/*#modelicaLine <%eqInfoString(eq)%>*/
+<%modelicaLine(eqInfo(eq))%>
 <%match eq
 
 case eqn as SES_ARRAY_CALL_ASSIGN(__) then
@@ -1753,7 +1753,7 @@ case eqn as SES_ARRAY_CALL_ASSIGN(__) then
     >>
   else error(sourceInfo(), 'No runtime support for this sort of array call: <%printExpStr(eqn.exp)%>')
 %>
-/*#endModelicaLine*/
+<%endModelicaLine()%>
 >>
 end equationArrayCallAssign;
 
@@ -2188,6 +2188,7 @@ template commonHeader()
 ::=
   <<
   <% if acceptMetaModelicaGrammar() then "#define __OPENMODELICA__METAMODELICA"%>
+  <% if acceptMetaModelicaGrammar() then "#include \"meta_modelica.h\"" %>
   <% if Flags.isSet(Flags.OPENMP) then "#include <omp.h>" else "#define omp_get_thread_num() 0" %>
   #include <stdio.h>
   #include <stdlib.h>
@@ -3702,38 +3703,6 @@ template funStatement(Statement stmt, Text &varDecls /*BUFP*/)
     "NOT IMPLEMENTED FUN STATEMENT"
 end funStatement;
 
-template statementInfoString(DAE.Statement stmt)
-::=
-  match stmt
-  case STMT_ASSIGN(__)
-  case STMT_ASSIGN_ARR(__)
-  case STMT_TUPLE_ASSIGN(__)
-  case STMT_IF(__)
-  case STMT_FOR(__)
-  case STMT_WHILE(__)
-  case STMT_ASSERT(__)
-  case STMT_TERMINATE(__)
-  case STMT_WHEN(__)
-  case STMT_BREAK(__)
-  case STMT_FAILURE(__)
-  case STMT_TRY(__)
-  case STMT_CATCH(__)
-  case STMT_THROW(__)
-  case STMT_RETURN(__)
-  case STMT_NORETCALL(__)
-  case STMT_REINIT(__)
-  then (match source case s as SOURCE(__) then infoStr(s.info))
-end statementInfoString;
-
-template eqInfoString(SimEqSystem eq)
-::=
-  match eq
-  case SES_RESIDUAL(__)
-  case SES_SIMPLE_ASSIGN(__)
-  case SES_ARRAY_CALL_ASSIGN(__)
-  then (match source case s as SOURCE(__) then infoStr(s.info))
-end eqInfoString;
-
 template algStatement(DAE.Statement stmt, Context context, Text &varDecls /*BUFP*/)
  "Generates an algorithm statement."
 ::=
@@ -3758,9 +3727,9 @@ template algStatement(DAE.Statement stmt, Context context, Text &varDecls /*BUFP
   case s as STMT_REINIT(__)         then algStmtReinit(s, context, &varDecls /*BUFD*/)
   else error(sourceInfo(), 'ALG_STATEMENT NYI')
   <<
-  /*#modelicaLine <%statementInfoString(stmt)%>*/
+  <%modelicaLine(getElementSourceFileInfo(getStatementSource(stmt)))%>#
   <%res%>
-  /*#endModelicaLine*/
+  <%endModelicaLine()%>
   >>
 end algStatement;
 
@@ -5822,7 +5791,7 @@ case exp as MATCHEXPRESSION(__) then
   let onPatternFail = match exp.matchType case MATCHCONTINUE(__) then "MMC_THROW()" case MATCH(__) then "break"
   let &preExp +=
       <<
-      /*#endModelicaLine*/
+      <%endModelicaLine()%>
       { /* <% match exp.matchType case MATCHCONTINUE(__) then "matchcontinue expression" case MATCH(__) then "match expression" %> */        
         <%varDeclsInput%>
         <%preExpInput%>
@@ -5895,9 +5864,9 @@ template daeExpMatchCases(list<MatchCase> cases, list<Exp> tupleAssignExps, DAE.
     %>
     <%assignments%>
     <%stmts%>
-    /*#modelicaLine <%infoStr(c.resultInfo)%>*/
+    <%modelicaLine(c.resultInfo)%>
     <% if c.result then '<%preRes%><%caseRes%>' else 'MMC_THROW();<%\n%>' %>
-    /*#endModelicaLine*/
+    <%endModelicaLine()%>
     <%done%> = 1;
     
     /* GC: pop the mark! */
@@ -6885,6 +6854,18 @@ template addRootsTempArray()
       >>
 end addRootsTempArray;
 
+template modelicaLine(Info info)
+::=
+  match info
+  case INFO(columnNumberStart=0) then "/* Dummy Line */"
+  else '/*#modelicaLine <%infoStr(info)%>*/'
+end modelicaLine;
+
+template endModelicaLine()
+::=
+  "/*#endModelicaLine*/"
+end endModelicaLine;
+
 end CodegenC;
 
 // vim: filetype=susan sw=2 sts=2

Makefile.common

@@ -42,7 +42,7 @@ release: omc
 
 oldc_runtime: .testvariables mkbuilddirs
 	$(MAKE) -C c_runtime -f $(defaultMakefileTarget)
-newc_runtime: mkbuilddirs
+newc_runtime: .testvariables mkbuilddirs
 	$(MAKE) -C SimulationRuntime/interactive -f $(defaultMakefileTarget)
 	# Depends on libinteractive.a
 	$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget)