Reactivate Cpp code generation for SimCode.SES_FOR_LOOP

Belonging to [master]: - OpenModelica/OMCompiler#2692 - OpenModelica/OpenModelica-testsuite#1044
OpenModelica · Oct 4, 2018 · 3f4c043 · 3f4c043
1 parent 6952465
commit 3f4c043
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -11577,34 +11577,15 @@ template equationForLoop(SimEqSystem eq, Context context, Text &varDecls, SimCod
       let endExp = daeExp(endIt, context, preExp, varDecls, simCode, extraFuncs, extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, false)
       let expPart = daeExp(exp, context, preExp, varDecls, simCode, extraFuncs, extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, false)
       let crefPart = daeExp(crefExp(cref), context, preExp, varDecls, simCode, extraFuncs, extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, false)
-      let crefWithIdx = crefWithIndex(cref, context, varDecls, simCode, extraFuncs, extraFuncsDecl, extraFuncsNamespace, stateDerVectorName /*=__zDot*/, useFlatArrayNotation)
-      let lhs = getLHS(cref, startExp, useFlatArrayNotation)
       <<
-      <%preExp%>
-      //double *result = &<%cref(cref, false)%>[0];
-      double *result = &<%lhs%>;
-      for(int <%iterExp%> = <%startExp%>; <%iterExp%> != <%endExp%>+1; <%iterExp%>++)
-        result[i] = <%expPart%>;
+      for (int <%iterExp%> = <%startExp%>; <%iterExp%> <= <%endExp%>; <%iterExp%>++) {
+        <%preExp%>
+        <%crefPart%> = <%expPart%>;
+      }
       >>
 end equationForLoop;
 
 
-template getLHS(ComponentRef cr, Text startExp, Boolean useFlatArrayNotation)
- "Returns the left hand side of a for loop with the right var index, e.g., _resistor1_P_i.
-  Assumption: lhs = 'cref' + 'startIndex of for loop'."
-::=
-  match cr
-    case CREF_QUAL(__) then
-      //"_" + '<%ident%><%startExp%><%subscriptsToCStrForArray(subscriptLst)%>_P_<%crefToCStr(componentRef,useFlatArrayNotation)%>'
-      "_" + '<%crefAppendedSubs(cr)%>'
-    else "CREF_NOT_QUAL"
-  end match
-end getLHS;
-
-
-
-
-
 template testDaeDimensionExp(Exp exp)
  "Generates code for an expression."
 ::=

diff --git a/Compiler/Template/CodegenCppCommon.tpl b/Compiler/Template/CodegenCppCommon.tpl
@@ -53,6 +53,7 @@ template subscriptToCStr(Subscript subscript)
    match exp
     case ICONST(integer=i) then i
     case ENUM_LITERAL(index=i) then i
+    case CREF(componentRef=cr) then crefToCStr(cr, false)
     end match
   else "UNKNOWN_SUBSCRIPT"
 end subscriptToCStr;

diff --git a/Compiler/Template/CodegenUtil.tpl b/Compiler/Template/CodegenUtil.tpl
@@ -124,12 +124,13 @@ end subscriptsStr;
 
 template subscriptStr(Subscript subscript)
  "Generates a single subscript.
-  Only works for constant integer indicies."
+  Only works for constant integer and cref indicies."
 
 ::=
   match subscript
   case INDEX(exp=ICONST(integer=i)) then i
   case INDEX(exp=ENUM_LITERAL(name=n)) then dotPath(n)
+  case INDEX(exp=CREF()) then printExpStr(exp)
   case SLICE(exp=ICONST(integer=i)) then i
   case INDEX(__)
   case SLICE(__) then 'UNKNOWN_SUBSCRIPT /* <%escapeCComments(printExpStr(exp))%> */'