-fix in cpp template giveZeroFunc

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12341 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jul 18, 2012 · a532cf7 · a532cf7
1 parent b0d80ac
commit a532cf7
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -6024,13 +6024,15 @@ end zeroCrossingOpFunc;
 template giveZeroFunc1(list<ZeroCrossing> zeroCrossings,SimCode simCode)
 ::=
   let &varDecls = buffer "" /*BUFD*/
-  let zeroCrossingsCode = giveZeroFunc2(zeroCrossings, &varDecls /*BUFD*/, simCode)
+  let &prexp = buffer "" /*BUFD*/
+  let zeroCrossingsCode = giveZeroFunc2(zeroCrossings, &varDecls /*BUFD*/,prexp, simCode)
   match simCode
   case SIMCODE(modelInfo = MODELINFO(__)) then
 <<
  void <%lastIdentOfPath(modelInfo.name)%>::giveZeroFunc(double* f)
   {
    <%varDecls%>
+   <%prexp%>
    <%zeroCrossingsCode%>
   }   
 >>
@@ -6073,17 +6075,17 @@ template saveConditions(SimCode simCode)
 >>
 end saveConditions;
 
-template giveZeroFunc2(list<ZeroCrossing> zeroCrossings, Text &varDecls /*BUFP*/,SimCode simCode)
+template giveZeroFunc2(list<ZeroCrossing> zeroCrossings, Text &varDecls /*BUFP*/,Text &preExp,SimCode simCode)
 ::=
 
   (zeroCrossings |> ZERO_CROSSING(__) hasindex i0 =>
-    giveZeroFunc3(i0, relation_, &varDecls /*BUFD*/,simCode)
+    giveZeroFunc3(i0, relation_, &varDecls /*BUFD*/,&preExp,simCode)
   ;separator="\n")
 end giveZeroFunc2;
 
-template giveZeroFunc3(Integer index1, Exp relation, Text &varDecls /*BUFP*/,SimCode simCode)
+template giveZeroFunc3(Integer index1, Exp relation, Text &varDecls /*BUFP*/,Text &preExp ,SimCode simCode)
 ::=
- let &preExp = buffer "" /*BUFD*/
+
   match relation
   case rel as  RELATION(index=zerocrossingIndex) then
        let e1 = daeExp(exp1, contextOther, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode)