#2757 Fix the types set when simplifying reductions

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

Author: sjoelund

Compiler/FrontEnd/ExpressionSimplify.mo

@@ -1129,7 +1129,7 @@ algorithm
         tp1 = Expression.liftArrayLeft(tp1,DAE.DIM_INTEGER(dim));
         e = DAE.ARRAY(tp1,sc,es);
         e = Expression.makePureBuiltinCall("sum",{e},tp2);
-        // print("Matrix sum: " +& boolString(sc) +& ExpressionDump.typeString(tp1) +& " " +& ExpressionDump.printExpStr(e) +& "\n");
+        // print("Matrix sum: " +& boolString(sc) +& Types.unparseType(tp1) +& " " +& ExpressionDump.printExpStr(e) +& "\n");
       then e;
     // Then try array concatenation
     case DAE.CALL(path=Absyn.IDENT("sum"),expLst={DAE.ARRAY(array=es,ty=tp1,scalar=false)},attr=DAE.CALL_ATTR(ty=tp2))
@@ -1143,7 +1143,7 @@ algorithm
         tp1 = Expression.liftArrayLeft(tp1,DAE.DIM_INTEGER(dim));
         e = DAE.ARRAY(tp1,sc,es);
         e = Expression.makePureBuiltinCall("sum",{e},tp2);
-        // print("Array sum: " +& boolString(sc) +& ExpressionDump.typeString(tp1) +& " " +& ExpressionDump.printExpStr(e) +& "\n");
+        // print("Array sum: " +& boolString(sc) +& Types.unparseType(tp1) +& " " +& ExpressionDump.printExpStr(e) +& "\n");
       then e;
     // Try to reduce the number of dimensions
     case DAE.CALL(path=Absyn.IDENT("sum"),expLst={DAE.ARRAY(array={e},scalar=false)},attr=DAE.CALL_ATTR(ty=tp2))
@@ -5046,13 +5046,15 @@ algorithm
     local
       Values.Value val;
       DAE.Exp arr_exp,foldExp;
-      DAE.Type aty;
+      DAE.Type aty,ty2;
       list<DAE.Exp> exps;
 
     case (Absyn.IDENT("array"),_,_,_,_,_,_)
       equation
-        aty = Types.unliftArray(ty);
-      then Expression.makeScalarArray(inExps, aty);
+        aty = Types.unliftArray(Types.expTypetoTypesType(ty));
+        ty2 = Types.liftArray(aty, DAE.DIM_INTEGER(listLength(inExps))); // The size can be unknown before the reduction...
+        exp = Expression.makeArray(inExps, ty2, not Types.isArray(aty,{}));
+      then exp;
 
     case (_,_,_,_,_,{},SOME(val)) then ValuesUtil.valueExp(val);
     case (_,_,_,_,_,{},NONE()) then fail();

Compiler/FrontEnd/InstSection.mo

@@ -1348,9 +1348,7 @@ algorithm
         info = DAEUtil.getElementSourceFileInfo(source);
         Types.typeErrorSanityCheck(t1_str, t2_str, info);
         Error.addSourceMessage(Error.EQUATION_TYPE_MISMATCH_ERROR, {s1,s2}, info);
-        Debug.fprintln(Flags.FAILTRACE, "- InstSection.instEqEquation failed with type mismatch in equation: " +& s1 +& " tys: " +& s2);
-      then
-        fail();
+      then fail();
   end matchcontinue;
 end instEqEquation;
 

SimulationRuntime/c/util/omc_msvc.h

@@ -36,6 +36,10 @@ extern "C" {
 
 #include <math.h> /* Make sure we try to get INFINITY and NAN from the system. They are way cooler */
 
+#ifndef NaN
+#define NaN NAN
+#endif
+
 union MSVC_FLOAT_HACK
 {
    unsigned char Bytes[4];