- add case for simplifyIfExp as workaround for real and integer types, see Ticket #1787

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12679 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: Jens Frenkel

Compiler/FrontEnd/ExpressionSimplify.mo

@@ -515,10 +515,29 @@ protected function simplifyIfExp
   output DAE.Exp exp;
 algorithm
   exp := match (cond,tb,fb)
-    local
+    local 
+      Real r;
+      Integer i;
+      Boolean b,b1;
+      DAE.Exp e;
       // Condition is constant
     case (DAE.BCONST(true),tb,fb) then tb;
     case (DAE.BCONST(false),tb,fb) then fb;
+    // because ther is somewhere an error (maybe eval return reals instead of bools)
+    case (DAE.RCONST(r),tb,fb)
+      equation
+        b = r ==. 1.0;
+        b1 = r ==. 0.0;
+        true = b or b1;
+      then 
+        Util.if_(b,tb,fb);
+    case (DAE.ICONST(i),tb,fb)
+      equation
+        b = i == 1;
+        b1 = i == 0;
+        true = b or b1;
+      then 
+        Util.if_(b,tb,fb);
       // The expression is the condition
     case (exp,DAE.BCONST(true),DAE.BCONST(false)) then exp;
     case (exp,DAE.BCONST(false),DAE.BCONST(true))