Changeset ed50d7d in OpenModelica

Timestamp:

2022-05-17T20:22:23+02:00 (2 years ago)

Author:

kabdelhak <karim.abdelhak@…>

Children:

e668b3ca

Parents:

3de80511

git-author:

perost <perost86@…> (05/06/22 18:24:55)

git-committer:

kabdelhak <karim.abdelhak@…> (05/17/22 20:22:23)

Message:

Evaluate min/max of empty arrays (#8904)

Files:

• OMCompiler/Compiler/NFFrontEnd/NFCeval.mo (modified) (2 diffs)
• testsuite/flattening/modelica/scodeinst/FuncBuiltinMax.mo (modified) (2 diffs)
• testsuite/flattening/modelica/scodeinst/FuncBuiltinMin.mo (modified) (2 diffs)

OMCompiler/Compiler/NFFrontEnd/NFCeval.mo

@@ -2416 +2416 @@
 
         if Expression.isEmpty(result) then
-          result := Expression.CALL(Call.makeTypedCall(fn,
-            {Expression.makeEmptyArray(ty)}, Variability.CONSTANT, Purity.PURE, Type.arrayElementType(ty)));
+          result := Expression.makeMinValue(Type.arrayElementType(ty));
         end if;
       then
@@ -2464 +2463 @@
 
         if Expression.isEmpty(result) then
-          result := Expression.CALL(Call.makeTypedCall(fn,
-            {Expression.makeEmptyArray(ty)}, Variability.CONSTANT, Purity.PURE, Type.arrayElementType(ty)));
+          result := Expression.makeMaxValue(Type.arrayElementType(ty));
         end if;
       then

testsuite/flattening/modelica/scodeinst/FuncBuiltinMax.mo

@@ -14 +14 @@
   Real r3 = max(r1, r2);
   Real r4 = max(1, r2);
+  Real r5 = max(zeros(0));
 
   Integer i1 = max(5, 6);
   Integer i2 = max({4, 2, 1});
   Integer i3 = max(i2, i1);
+  Integer i4 = max(zeros(0));
 
   Boolean b1 = max(true, false);
   Boolean b2 = max({false, true});
   Boolean b3 = max(b1, b2);
+  Boolean b4 = max(fill(true, 0));
 
   E e1 = max(E.one, E.three);
   E e2 = max({E.one, E.two, E.three});
   E e3 = max(e1, e2);
+  E e4 = max(fill(E.one, 0));
 end FuncBuiltinMax;
 
@@ -34 +38 @@
 //   Real r3 = max(r1, r2);
 //   Real r4 = max(1.0, r2);
+//   Real r5 = -4.611686018427388e+18;
 //   Integer i1 = 6;
 //   Integer i2 = 4;
 //   Integer i3 = max(i2, i1);
+//   Integer i4 = -4611686018427387903;
 //   Boolean b1 = true;
 //   Boolean b2 = true;
 //   Boolean b3 = max(b1, b2);
+//   Boolean b4 = false;
 //   enumeration(one, two, three) e1 = E.three;
 //   enumeration(one, two, three) e2 = E.three;
 //   enumeration(one, two, three) e3 = max(e1, e2);
+//   enumeration(one, two, three) e4 = E.one;
 // end FuncBuiltinMax;
 // endResult

testsuite/flattening/modelica/scodeinst/FuncBuiltinMin.mo

@@ -14 +14 @@
   Real r3 = min(r1, r2);
   Real r4 = min(r1, 100);
+  Real r5 = min(zeros(0));
 
   Integer i1 = min(5, 6);
   Integer i2 = min({4, 2, 1});
   Integer i3 = min(i2, i1);
+  Integer i4 = min(zeros(0));
 
   Boolean b1 = min(true, false);
   Boolean b2 = min({false, true});
   Boolean b3 = min(b1, b2);
+  Boolean b4 = min(fill(true, 0));
 
   E e1 = min(E.one, E.three);
   E e2 = min({E.one, E.two, E.three});
   E e3 = min(e1, e2);
+  E e4 = min(fill(E.one, 0));
 end FuncBuiltinMin;
 
@@ -34 +38 @@
 //   Real r3 = min(r1, r2);
 //   Real r4 = min(r1, 100.0);
+//   Real r5 = 4.611686018427388e+18;
 //   Integer i1 = 5;
 //   Integer i2 = 1;
 //   Integer i3 = min(i2, i1);
+//   Integer i4 = 4611686018427387903;
 //   Boolean b1 = false;
 //   Boolean b2 = false;
 //   Boolean b3 = min(b1, b2);
+//   Boolean b4 = true;
 //   enumeration(one, two, three) e1 = E.one;
 //   enumeration(one, two, three) e2 = E.one;
 //   enumeration(one, two, three) e3 = min(e1, e2);
+//   enumeration(one, two, three) e4 = E.three;
 // end FuncBuiltinMin;
 // endResult