[NF] Collect more functions during flattening.

- Collect functions in the type of equality equations and assignments as
  well as in for statement ranges.
- Add type to Statement.ASSIGNMENT.

Belonging to [master]:
  - #2558
  - OpenModelica/OpenModelica-testsuite#998

Author: perost

Compiler/NFFrontEnd/NFConvertDAE.mo

@@ -735,8 +735,7 @@ protected
   DAE.Exp dlhs, drhs;
   list<Expression> expl;
 algorithm
-  Statement.ASSIGNMENT(lhs, rhs, src) := stmt;
-  ty := Expression.typeOf(lhs);
+  Statement.ASSIGNMENT(lhs, rhs, ty, src) := stmt;
 
   if Type.isTuple(ty) then
     Expression.TUPLE(elements = expl) := lhs;
@@ -748,7 +747,6 @@ algorithm
       // (lhs) := call(...) => lhs := TSUB[call(...), 1]
       case {lhs}
         algorithm
-          ty := Expression.typeOf(lhs);
           dty := Type.toDAE(ty);
           dlhs := Expression.toDAE(lhs);
           drhs := DAE.Exp.TSUB(Expression.toDAE(rhs), 1, dty);

Compiler/NFFrontEnd/NFFlatten.mo

@@ -1042,16 +1042,20 @@ algorithm
       algorithm
         funcs := collectExpFuncs(eq.lhs, funcs);
         funcs := collectExpFuncs(eq.rhs, funcs);
+        funcs := collectTypeFuncs(eq.ty, funcs);
       then
         ();
 
     case Equation.ARRAY_EQUALITY()
       algorithm
         // Lhs is always a cref, no need to check it.
         funcs := collectExpFuncs(eq.rhs, funcs);
+        funcs := collectTypeFuncs(eq.ty, funcs);
       then
         ();
 
+    // For equations are always unrolled, so functions in the range doesn't
+    // matter since they are always evaluated.
     case Equation.FOR()
       algorithm
         funcs := List.fold(eq.body, collectEquationFuncs, funcs);
@@ -1132,12 +1136,14 @@ algorithm
       algorithm
         funcs := collectExpFuncs(stmt.lhs, funcs);
         funcs := collectExpFuncs(stmt.rhs, funcs);
+        funcs := collectTypeFuncs(stmt.ty, funcs);
       then
         ();
 
     case Statement.FOR()
       algorithm
         funcs := List.fold(stmt.body, collectStatementFuncs, funcs);
+        funcs := collectExpFuncs(Util.getOption(stmt.range), funcs);
       then
         ();
 

Compiler/NFFrontEnd/NFInst.mo

@@ -2660,7 +2660,7 @@ algorithm
         exp1 := instExp(scodeStmt.assignComponent, scope, info);
         exp2 := instExp(scodeStmt.value, scope, info);
       then
-        Statement.ASSIGNMENT(exp1, exp2, makeSource(scodeStmt.comment, info));
+        Statement.ASSIGNMENT(exp1, exp2, Type.UNKNOWN(), makeSource(scodeStmt.comment, info));
 
     case SCode.Statement.ALG_FOR(info = info)
       algorithm

Compiler/NFFrontEnd/NFStatement.mo

@@ -45,6 +45,7 @@ public
   record ASSIGNMENT
     Expression lhs "The asignee";
     Expression rhs "The expression";
+    Type ty;
     DAE.ElementSource source;
   end ASSIGNMENT;
 
@@ -229,7 +230,7 @@ public
           e2 := func(stmt.rhs);
         then
           if referenceEq(e1, stmt.lhs) and referenceEq(e2, stmt.rhs) then
-            stmt else ASSIGNMENT(e1, e2, stmt.source);
+            stmt else ASSIGNMENT(e1, e2, stmt.ty, stmt.source);
 
       case FOR()
         algorithm

Compiler/NFFrontEnd/NFTyping.mo

@@ -2427,7 +2427,7 @@ algorithm
         (e2, ty2) := typeExp(st.rhs, intBitOr(origin, ExpOrigin.RHS), info);
 
         // TODO: Should probably only be allowUnknown = true if in a function.
-        (e2,_, mk) := TypeCheck.matchTypes(ty2, ty1, e2, allowUnknown = true);
+        (e2, ty3, mk) := TypeCheck.matchTypes(ty2, ty1, e2, allowUnknown = true);
 
         if TypeCheck.isIncompatibleMatch(mk) then
           Error.addSourceMessage(Error.ASSIGN_TYPE_MISMATCH_ERROR,
@@ -2436,7 +2436,7 @@ algorithm
           fail();
         end if;
       then
-        Statement.ASSIGNMENT(e1, e2, st.source);
+        Statement.ASSIGNMENT(e1, e2, ty3, st.source);
 
     case Statement.FOR()
       algorithm