Handle replacement of qualified crefs when simplifying iterators

- `{c.r for c in cs}` now simplifies to `{cs[1].r,...,cs[n].r}` - `{c.r for c in cs}` previously simplified to `{c[1].r,...,c[n].r}` git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20517 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 9, 2014 · 014309c · 014309c
1 parent 77053a0
commit 014309c
Showing 1 changed file with 51 additions and 2 deletions.
diff --git a/Compiler/FrontEnd/ExpressionSimplify.mo b/Compiler/FrontEnd/ExpressionSimplify.mo
@@ -4779,8 +4779,7 @@ algorithm
         //ty = Types.unliftArray(ty);
         ety = Types.simplifyType(ty);
         cref = DAE.CREF(DAE.CREF_IDENT(iter_name, ety, {}), ety);
-        values = List.map(List.map2r(values, Expression.replaceExp, expr, cref), Util.tuple21);
-
+        values = List.map2(values, replaceIteratorWithExp, expr, iter_name);
         expr = simplifyReductionFoldPhase(str,ety,values,defaultValue);
       then expr;
 
@@ -4789,6 +4788,56 @@ algorithm
   end matchcontinue;
 end simplifyReduction;
 
+protected function replaceIteratorWithExp
+  input DAE.Exp iterExp;
+  input DAE.Exp exp;
+  input String name;
+  output DAE.Exp outExp;
+algorithm
+  ((outExp,(_,_,true))) := Expression.traverseExp(exp, replaceIteratorWithExpTraverser, (name,iterExp,true));
+end replaceIteratorWithExp;
+
+protected function replaceIteratorWithExpTraverser
+  input tuple<DAE.Exp,tuple<String,DAE.Exp,Boolean>> inTpl;
+  output tuple<DAE.Exp,tuple<String,DAE.Exp,Boolean>> outTpl;
+algorithm
+  outTpl := matchcontinue inTpl
+    local
+      String id,name,replName;
+      DAE.Exp iterExp;
+      DAE.Type ty,ty1;
+      list<DAE.Subscript> ss;
+      Boolean b;
+      DAE.ComponentRef cr;
+      DAE.Exp exp;
+      tuple<String,DAE.Exp,Boolean> tpl;
+    case ((_,(_,_,false))) then inTpl;
+    case ((DAE.CREF(DAE.CREF_IDENT(id,_,{}),_),tpl as (name,iterExp,_)))
+      equation
+        true = stringEq(name,id);
+      then ((iterExp,tpl));
+    case ((exp as DAE.CREF(componentRef=DAE.CREF_IDENT(ident=id)),(name,iterExp,_)))
+      equation
+        true = stringEq(name,id);
+      then ((exp,(name,iterExp,false)));
+    case ((DAE.CREF(DAE.CREF_QUAL(id,ty1,ss,cr),ty),tpl as (name,DAE.CREF(componentRef=DAE.CREF_IDENT(ident=replName,subscriptLst={})),_)))
+      equation
+        true = stringEq(name,id);
+        exp = DAE.CREF(DAE.CREF_QUAL(replName,ty1,ss,cr),ty);
+      then ((exp,tpl));
+    case ((DAE.CREF(DAE.CREF_QUAL(id,ty1,{},cr),ty),tpl as (name,DAE.CREF(componentRef=DAE.CREF_IDENT(ident=replName,subscriptLst=ss)),_)))
+      equation
+        true = stringEq(name,id);
+        exp = DAE.CREF(DAE.CREF_QUAL(replName,ty1,ss,cr),ty);
+      then ((exp,tpl));
+    case ((exp as DAE.CREF(componentRef=DAE.CREF_QUAL(ident=id)),(name,iterExp,_)))
+      equation
+        true = stringEq(name,id);
+      then ((exp,(name,iterExp,false)));
+    else inTpl;
+  end matchcontinue;
+end replaceIteratorWithExpTraverser;
+
 protected function simplifyReductionFoldPhase
   input String str;
   input DAE.Type ty;