Merge pull request kind2-mc#996 from daniel-larraz/fix-call-proj-ite

Fix projection of call output in ITE condition

src/lustre/lustreArrayDependencies.ml

@@ -146,8 +146,10 @@ and process_expr ind_vars ctx ns proj indices expr =
   (* Operators *)
   | UnaryOp (_, _, e) -> r e
   | BinaryOp (_, _, e1, e2) -> union_ (r e1) (r e2)
-  | TernaryOp (_, _, e1, e2, e3) ->
-    union_ (union_ (r e1) (r e2)) (r e3)
+  | TernaryOp (_, Ite, e1, e2, e3) ->
+    let r_e1 = process_expr ind_vars ctx ns 0 indices e1 in
+    union_ (union_ (r_e1) (r e2)) (r e3)
+  | TernaryOp (_, With, _, _, _) -> assert false
   | NArityOp (_, _, es) ->
     es |> (List.map r) |> (List.fold_left union_ empty_)
   | ConvOp (_, _, e) -> r e

tests/regression/success/group_expr_01.lus

@@ -11,9 +11,10 @@ let
   z2 = x + 2;
 tel
 
-node N(c:bool) returns (x1,x2,y1,y2,y3,z1,z2:int);
+node N(c:bool) returns (w1,w2,x1,x2,y1,y2,y3,z1,z2:int);
 let
   y1, y2, y3 = if c then (1,(2,3)) else (4,(5,6));
   z1, z2 = (M(c), M(not c));
   x1, x2 = R(M(c));
+  w1, w2 = if M(c)=7 then R(0) else R(1);
 tel