Changeset 8066773 in OpenModelica

Timestamp:

2020-06-17T21:21:23+02:00 (4 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

maintenance/v1.16

Children:

302444f

Parents:

ed49d5f

git-author:

Per Östlund <perost86@…> (06/02/20 12:59:40)

git-committer:

Adrian Pop <adrian.pop@…> (06/17/20 21:21:23)

Message:

[NF] Retype conditional array expressions.

• When doing branch selection on if-expressions where the branches have different dimensions, also do branch selection on the type of the if-expression.

Location:

OMCompiler/Compiler/NFFrontEnd

Files:

• NFEvalConstants.mo (modified) (2 diffs)
• NFExpression.mo (modified) (2 diffs)
• NFType.mo (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFEvalConstants.mo

@@ -235 +235 @@
             fail();
           end if;
+
+          outExp := evaluateExpTraverser(if cond.value then tb else fb, info);
         then
-          evaluateExpTraverser(if cond.value then tb else fb, info);
+          (outExp, true);
 
       else
@@ -253 +255 @@
       // condition is a literal boolean value.
       case Expression.BOOLEAN()
-        then evaluateExpTraverser(if cond.value then tb else fb, info);
+        algorithm
+          outExp := evaluateExpTraverser(if cond.value then tb else fb, info);
+        then
+          (outExp, true);
 
       // Otherwise evaluate constants in both branches and return the whole

OMCompiler/Compiler/NFFrontEnd/NFExpression.mo

@@ -4341 +4341 @@
       local
         list<Dimension> dims;
+        Type ty;
 
       case RANGE()
@@ -4355 +4356 @@
           ();
 
-      else ();
+      else
+        algorithm
+          ty := typeOf(exp);
+
+          if Type.isConditionalArray(ty) then
+            ty := Type.simplifyConditionalArray(ty);
+            exp := setType(ty, exp);
+          end if;
+        then
+          ();
+
     end match;
   end retype;

OMCompiler/Compiler/NFFrontEnd/NFType.mo

@@ -345 +345 @@
     end if;
   end isMatchedBranch;
+
+  function simplifyConditionalArray
+    input Type ty;
+    output Type outType;
+  algorithm
+    outType := match ty
+      case CONDITIONAL_ARRAY()
+        then match ty.matchedBranch
+            case Branch.TRUE then ty.trueType;
+            case Branch.FALSE then ty.falseType;
+            else ty;
+          end match;
+
+      else ty;
+    end match;
+  end simplifyConditionalArray;
 
   function isVector