- Simplify after doing type-conversion

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

Author: sjoelund

Compiler/FrontEnd/DAE.mo

@@ -1130,7 +1130,7 @@ uniontype Exp "Expressions
   end TUPLE;
 
   record CAST "Cast operator"
-    ExpType ty;
+    ExpType ty "This is the full type of this expression, i.e. ET_ARRAY(...) for arrays and matrices";
     Exp exp;
   end CAST;
 

Compiler/FrontEnd/ExpressionDump.mo

@@ -780,23 +780,6 @@ algorithm
       then
         s;
 
-    case (DAE.CAST(ty = DAE.ET_REAL(),exp = DAE.ICONST(integer = ival)), _, _, _)
-      equation
-        false = RTOpts.modelicaOutput();
-        rval = intReal(ival);
-        res = realString(rval);
-      then
-        res;
-    
-    case (DAE.CAST(ty = DAE.ET_REAL(),exp = DAE.UNARY(operator = DAE.UMINUS(ty = _),exp = DAE.ICONST(integer = ival))), _, _, _)
-      equation
-        false = RTOpts.modelicaOutput();
-        rval = intReal(ival);
-        res = realString(rval);
-        res2 = stringAppend("-", res);
-      then
-        res2;
-    
     case (DAE.CAST(ty = DAE.ET_REAL(),exp = e), _, _, _)
       equation
         s = printExp2Str(e, stringDelimiter, opcreffunc, opcallfunc);
@@ -2036,15 +2019,6 @@ algorithm
       then
         ();
 
-    case (DAE.CAST(ty = DAE.ET_REAL(),exp = DAE.ICONST(integer = i)),_)
-      equation
-        false = RTOpts.modelicaOutput();
-        r = intReal(i);
-        rstr = realString(r);
-        Print.printBuf(rstr);
-      then
-        ();
-    
     case (DAE.CAST(ty = expTy,exp = e),_)
       equation
         false = RTOpts.modelicaOutput();

Compiler/FrontEnd/Types.mo

@@ -81,6 +81,7 @@ protected import Debug;
 protected import Error;
 protected import Expression;
 protected import ExpressionDump;
+protected import ExpressionSimplify;
 protected import Patternm;
 protected import Print;
 protected import Util;
@@ -5406,6 +5407,7 @@ algorithm
       equation
         false = subtype(e_type, expected_type);
         (e_1,e_type_1) = typeConvert(e,e_type,expected_type,printFailtrace);
+        (e_1,_) = ExpressionSimplify.simplify1(e_1);
       then
         (e_1,e_type_1);
     case (e,e_type,expected_type,true)