[NF] Minor fixes.

- Fix return type of pre, min and max.
- Set ExpOrigin.WHEN bit also in when-statements.

Belonging to [master]:
  - #2070
  - OpenModelica/OpenModelica-testsuite#802

Author: perost

Compiler/NFFrontEnd/NFCall.mo

@@ -958,7 +958,7 @@ protected
     end if;
 
     argtycall as ARG_TYPED_CALL(ComponentRef.CREF(node = fn_node), args, _) := typeNormalCall(call, origin, info);
-    (call, ty) := matchTypedNormalCall(argtycall, info);
+    (call, _) := matchTypedNormalCall(argtycall, info);
     call := unboxArgs(call);
 
     {arg} := args;
@@ -967,6 +967,8 @@ protected
             {"First", "pre", "<REMOVE ME>"}, info);
       fail();
     end if;
+
+    ty := Util.tuple32(arg);
   end typePreCall;
 
   function typeChangeCall
@@ -1046,6 +1048,7 @@ protected
     argtycall as ARG_TYPED_CALL(_, args, _) := typeNormalCall(call, origin, info);
     (call, ty, variability) := matchTypedNormalCall(argtycall, info);
     call := unboxArgs(call);
+    ty := Type.arrayElementType(Util.tuple32(listHead(args)));
     // TODO: check basic type in two argument overload.
     // check arrays of simple types in one argument overload.
     // fix return type.

Compiler/NFFrontEnd/NFTyping.mo

@@ -2085,6 +2085,7 @@ algorithm
       list<tuple<Expression, list<Statement>>> tybrs;
       InstNode iterator;
       MatchKind mk;
+      Integer next_origin;
 
     case Statement.ASSIGNMENT()
       algorithm
@@ -2125,11 +2126,13 @@ algorithm
 
     case Statement.WHEN()
       algorithm
+        next_origin := intBitOr(origin, ExpOrigin.WHEN);
+
         tybrs := list(
           match br case(cond, body)
             algorithm
-              e1 := typeCondition(cond, origin, st.info, Error.WHEN_CONDITION_TYPE_ERROR, allowVector = true);
-              sts1 := list(typeStatement(bst, origin) for bst in body);
+              e1 := typeCondition(cond, next_origin, st.info, Error.WHEN_CONDITION_TYPE_ERROR, allowVector = true);
+              sts1 := list(typeStatement(bst, next_origin) for bst in body);
             then (e1, sts1);
           end match
         for br in st.branches);