Simplify more statements in functions (#11607)

- Simplify more statements such as asserts in functions to make sure we don't get any `getInstanceName` calls in the flat model.
OpenModelica · Nov 18, 2023 · 5b94ed1 · 5b94ed1
1 parent 8fef40a
commit 5b94ed1
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 15 deletions.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFCeval.mo b/OMCompiler/Compiler/NFFrontEnd/NFCeval.mo
@@ -3073,7 +3073,7 @@ algorithm
   end match;
 end evalSolverClock;
 
-function evalGetInstanceName
+public function evalGetInstanceName
   input Expression scopeArg;
   output Expression result;
 protected
@@ -3086,7 +3086,7 @@ algorithm
   result := Expression.STRING(AbsynUtil.pathString(InstNode.rootPath(ComponentRef.node(cref))));
 end evalGetInstanceName;
 
-function evalArrayConstructor
+protected function evalArrayConstructor
   input Expression callExp;
   output Expression result;
 protected

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFSimplifyExp.mo b/OMCompiler/Compiler/NFFrontEnd/NFSimplifyExp.mo
@@ -251,19 +251,20 @@ algorithm
       then
         exp;
 
-    case "delay"        then simplifyDelay(args, call);
-    case "der"          then simplifyDer(listHead(args), call);
-    case "fill"         then simplifyFill(listHead(args), listRest(args), call, expand);
-    case "homotopy"     then simplifyHomotopy(args, call);
-    case "max"          then simplifyMinMax(args, call, isMin = false);
-    case "min"          then simplifyMinMax(args, call, isMin = true);
-    case "ones"         then simplifyFill(Expression.INTEGER(1), args, call, expand);
-    case "product"      then simplifySumProduct(listHead(args), call, expand, isSum = false);
-    case "sum"          then simplifySumProduct(listHead(args), call, expand, isSum = true);
-    case "transpose"    then simplifyTranspose(listHead(args), call, expand);
-    case "vector"       then simplifyVector(listHead(args), call);
-    case "zeros"        then simplifyFill(Expression.INTEGER(0), args, call, expand);
-    case "semiLinear"   then simplifySemiLinear(args, call);
+    case "delay"           then simplifyDelay(args, call);
+    case "der"             then simplifyDer(listHead(args), call);
+    case "fill"            then simplifyFill(listHead(args), listRest(args), call, expand);
+    case "homotopy"        then simplifyHomotopy(args, call);
+    case "max"             then simplifyMinMax(args, call, isMin = false);
+    case "min"             then simplifyMinMax(args, call, isMin = true);
+    case "ones"            then simplifyFill(Expression.INTEGER(1), args, call, expand);
+    case "product"         then simplifySumProduct(listHead(args), call, expand, isSum = false);
+    case "sum"             then simplifySumProduct(listHead(args), call, expand, isSum = true);
+    case "transpose"       then simplifyTranspose(listHead(args), call, expand);
+    case "vector"          then simplifyVector(listHead(args), call);
+    case "zeros"           then simplifyFill(Expression.INTEGER(0), args, call, expand);
+    case "semiLinear"      then simplifySemiLinear(args, call);
+    case "getInstanceName" then Ceval.evalGetInstanceName(listHead(args));
 
     else Expression.CALL(call);
   end match;

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo b/OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo
@@ -340,6 +340,27 @@ algorithm
       then
         stmt :: statements;
 
+    case Statement.ASSERT()
+      algorithm
+        stmt.condition := SimplifyExp.simplify(stmt.condition);
+        stmt.message := SimplifyExp.simplify(stmt.message);
+        stmt.level := SimplifyExp.simplify(stmt.level);
+      then
+        stmt :: statements;
+
+    case Statement.TERMINATE()
+      algorithm
+        stmt.message := SimplifyExp.simplify(stmt.message);
+      then
+        stmt :: statements;
+
+    case Statement.WHILE()
+      algorithm
+        stmt.condition := SimplifyExp.simplify(stmt.condition);
+        stmt.body := simplifyStatements(stmt.body);
+      then
+        stmt :: statements;
+
     case Statement.NORETCALL()
       algorithm
         e := SimplifyExp.simplify(stmt.exp);

diff --git a/testsuite/flattening/modelica/scodeinst/FuncBuiltinGetInstanceName.mo b/testsuite/flattening/modelica/scodeinst/FuncBuiltinGetInstanceName.mo
@@ -29,6 +29,12 @@ model FuncBuiltinGetInstanceName
     output String s = getInstanceName();
   end f;
 
+  function f2
+    input Real dummy;
+  algorithm
+    assert(true, getInstanceName());
+  end f2;
+
   String s = getInstanceName();
   A a;
   A a1[2];
@@ -38,9 +44,17 @@ model FuncBuiltinGetInstanceName
   String pas = P.a.s;
   constant String fs = f();
   Real rs(displayUnit = getInstanceName());
+equation
+  f2(time);
 end FuncBuiltinGetInstanceName;
 
 // Result:
+// function FuncBuiltinGetInstanceName.f2
+//   input Real dummy;
+// algorithm
+//   assert(true, "FuncBuiltinGetInstanceName.f2");
+// end FuncBuiltinGetInstanceName.f2;
+//
 // class FuncBuiltinGetInstanceName
 //   String s = "FuncBuiltinGetInstanceName";
 //   String a.b.s = "FuncBuiltinGetInstanceName.a.b";
@@ -59,5 +73,7 @@ end FuncBuiltinGetInstanceName;
 //   String pas = "P.a";
 //   constant String fs = "FuncBuiltinGetInstanceName.f";
 //   Real rs(displayUnit = "FuncBuiltinGetInstanceName");
+// equation
+//   FuncBuiltinGetInstanceName.f2(time);
 // end FuncBuiltinGetInstanceName;
 // endResult