Changeset c1c920a9 in OpenModelica

Timestamp:

2020-02-07T15:24:45+01:00 (4 years ago)

Author:

Per Östlund <per.ostlund@…>

Parents:

de5194e

git-author:

Per Östlund <per.ostlund@…> (02/07/20 15:20:31)

git-committer:

Per Östlund <per.ostlund@…> (02/07/20 15:24:45)

Message:

[NF] More function evaluation fixes.

• Use the type of the evaluated expression instead of the cached type when evaluating reductions, since the cached type isn't evaluated.
• Handle _-assignments in EvalFunction.assignVariable.
• Fix handling of : subscripts in EvalFunction.assignArrayElement.

Location:

OMCompiler/Compiler/NFFrontEnd

Files:

• NFCeval.mo (modified) (5 diffs)
• NFEvalFunction.mo (modified) (5 diffs)

OMCompiler/Compiler/NFFrontEnd/NFCeval.mo

@@ -1803 +1803 @@
 
     case Call.TYPED_REDUCTION()
-      then evalReduction(c.fn, c.exp, c.ty, c.iters);
+      then evalReduction(c.fn, c.exp, c.iters);
 
     else
@@ -3157 +3157 @@
   input Function fn;
   input Expression exp;
-  input Type ty;
   input list<tuple<InstNode, Expression>> iterators;
   output Expression result;
@@ -3163 +3162 @@
   result := evalExpPartial(exp);
   result := Expression.bindingExpMap(result,
-    function evalReduction2(fn = fn, ty = ty, iterators = iterators));
+    function evalReduction2(fn = fn, iterators = iterators));
 end evalReduction;
 
@@ -3169 +3168 @@
   input Function fn;
   input Expression exp;
-  input Type ty;
   input list<tuple<InstNode, Expression>> iterators;
   output Expression result;
@@ -3177 +3175 @@
   list<Mutable<Expression>> iters;
   ReductionFn red_fn;
+  Type ty;
 algorithm
   (e, ranges, iters) := createIterationRanges(exp, iterators);
+  ty := Expression.typeOf(e);
 
   (red_fn, default_exp) := match AbsynUtil.pathString(Function.name(fn))

OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo

@@ -538 +538 @@
       Mutable<Expression> var_ptr;
 
+    // variable := value
     case (Expression.MUTABLE(exp = var_ptr), _)
       algorithm
@@ -544 +545 @@
         ();
 
+    // (var1, var2, ...) := (value1, value2, ...)
     case (Expression.TUPLE(), Expression.TUPLE(elements = vals))
       algorithm
@@ -553 +555 @@
         ();
 
+    // variable[subscript1, subscript2, ...] := value
     case (Expression.SUBSCRIPTED_EXP(exp = Expression.MUTABLE(exp = var_ptr)), _)
       algorithm
@@ -558 +561 @@
       then
         ();
+
+    // _ := value
+    case (Expression.CREF(cref = ComponentRef.WILD()), _)
+      then ();
 
     else
@@ -630 +637 @@
     case (Expression.ARRAY(), Subscript.WHOLE() :: rest_subs)
       algorithm
-        if not listEmpty(rest_subs) then
+        if listEmpty(rest_subs) then
+          arrayExp.elements := Expression.arrayElements(value);
+        else
           arrayExp.elements := list(assignArrayElement(e, rest_subs, v) threaded for
             e in arrayExp.elements, v in Expression.arrayElements(value));