Access iterators locally in alg loops as well

See: PowerSystems.Examples.Spot.DrivesAC3ph.SM_ctrl
OpenModelica · Mar 30, 2016 · a37f8ba · a37f8ba
1 parent 630a9d0
commit a37f8ba
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/Compiler/Template/CodegenCppCommon.tpl b/Compiler/Template/CodegenCppCommon.tpl
@@ -23,14 +23,7 @@ template cref(ComponentRef cr, Boolean useFlatArrayNotation)
   case WILD(__) then ''
   else "_"+crefToCStr(cr, useFlatArrayNotation)
 end cref;
-template localcref(ComponentRef cr, Boolean useFlatArrayNotation)
- "Generates C equivalent name for component reference."
-::=
-  match cr
-  case CREF_IDENT(ident = "time") then "_simTime"
-  case WILD(__) then ''
-  else crefToCStr(cr,useFlatArrayNotation)
-end localcref;
+
 template subscriptsToCStr(list<Subscript> subscripts, Boolean useFlatArrayNotation)
 ::=
   if subscripts then
@@ -229,11 +222,10 @@ template representationCref(ComponentRef inCref, SimCode simCode ,Text& extraFun
         case SIMVAR(index=-2) then
           match context
             case JACOBIAN_CONTEXT() then
-              '_<%crefToCStr(inCref,false)%>'
-            case ALGLOOP_CONTEXT(__) then
-              '_system->_<%crefToCStr(inCref,false)%>'
+              '_<%crefToCStr(inCref, false)%>'
             else
-              '<%localcref(inCref, useFlatArrayNotation)%>'
+              // a local variable, like an iterator
+              '<%crefToCStr(inCref, useFlatArrayNotation)%>'
           end match
         else
           match context