Changeset 8481cc5 in OpenModelica

Timestamp:

2019-01-14T15:13:35+01:00 (5 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

d681d71

Parents:

3c1d34e

git-author:

Per Östlund <per.ostlund@…> (01/14/19 15:13:35)

git-committer:

hudson <openmodelica@…> (01/14/19 15:13:35)

Message:

[NF] Fix type in Ceval.evalArrayConstructor.

• Create a new type based on the actual sizes of the created arrays in evalArrayConstructor, instead of using the original type which might have non-constant dimensions.

Belonging to [master]:

• OpenModelica/OMCompiler#2870

File:

• Compiler/NFFrontEnd/NFCeval.mo (modified) (4 diffs)

Compiler/NFFrontEnd/NFCeval.mo

@@ -2708 +2708 @@
   e := evalExpPartial(exp);
   (e, ranges, iters) := createIterationRanges(e, iterators);
-  result := evalArrayConstructor2(e, ty, ranges, iters);
+  result := evalArrayConstructor2(e, ranges, iters);
 end evalArrayConstructor;
 
@@ -2732 +2732 @@
 function evalArrayConstructor2
   input Expression exp;
-  input Type ty;
   input list<Expression> ranges;
   input list<Mutable<Expression>> iterators;
   output Expression result;
 protected
-  Expression range;
+  Expression range, e;
   list<Expression> ranges_rest, expl = {};
   Mutable<Expression> iter;
@@ -2743 +2742 @@
   ExpressionIterator range_iter;
   Expression value;
-  Type el_ty;
+  Type ty;
 algorithm
   if listEmpty(ranges) then
@@ -2751 +2750 @@
     iter :: iters_rest := iterators;
     range_iter := ExpressionIterator.fromExp(range);
-    el_ty := Type.unliftArray(ty);
 
     while ExpressionIterator.hasNext(range_iter) loop
       (range_iter, value) := ExpressionIterator.next(range_iter);
       Mutable.update(iter, value);
-      expl := evalArrayConstructor2(exp, el_ty, ranges_rest, iters_rest) :: expl;
+      expl := evalArrayConstructor2(exp, ranges_rest, iters_rest) :: expl;
     end while;
 
+    if listEmpty(expl) then
+      ty := Type.unliftArray(Expression.typeOf(exp));
+    else
+      ty := Expression.typeOf(listHead(expl));
+    end if;
+
+    ty := Type.liftArrayLeft(ty, Dimension.fromInteger(listLength(expl)));
     result := Expression.makeArray(ty, listReverseInPlace(expl), literal = true);
   end if;