Changeset f1e1999 in OpenModelica

Timestamp:

2019-11-20T11:36:38+01:00 (5 years ago)

Author:

Adrian Pop <adrian.pop@…>

Branches:

maintenance/v1.15

Children:

53a929e8

Parents:

5fccefeb

git-author:

Per Östlund <perost86@…> (11/13/19 12:27:33)

git-committer:

Adrian Pop <adrian.pop@…> (11/20/19 11:36:38)

Message:

[NF] Fix some Expression.map*Opt functions.

• Fix mapOpt, mapShallowOpt and mapFoldOpt in Expression, which would return an uninitialized value when given a NONE().

File:

• OMCompiler/Compiler/NFFrontEnd/NFExpression.mo (modified) (3 diffs)

OMCompiler/Compiler/NFFrontEnd/NFExpression.mo

@@ -2000 +2000 @@
     Expression e;
   algorithm
-    if isSome(exp) then
-      SOME(e) := exp;
-      outExp := SOME(map(e, func));
-    end if;
+    outExp := match exp
+      case SOME(e) then SOME(map(e, func));
+      else exp;
+    end match;
   end mapOpt;
 
@@ -2340 +2340 @@
     Expression e;
   algorithm
-    if isSome(exp) then
-      SOME(e) := exp;
-      outExp := SOME(func(e));
-    end if;
+    outExp := match exp
+      case SOME(e) then SOME(func(e));
+      else exp;
+    end match;
   end mapShallowOpt;
 
@@ -3272 +3272 @@
     Expression e;
   algorithm
-    if isSome(exp) then
-      SOME(e) := exp;
-      (e, arg) := mapFold(e, func, arg);
-      outExp := SOME(e);
-    end if;
+    outExp := match exp
+      case SOME(e)
+        algorithm
+          (e, arg) := mapFold(e, func, arg);
+        then
+          SOME(e);
+
+      else exp;
+    end match;
   end mapFoldOpt;