merging with dev
This commit is contained in:
parent
5a77b08aa7
commit
c7056d200d
@ -658,14 +658,8 @@ let loop () : unit result =
|
|||||||
let make_input = e_nat in
|
let make_input = e_nat in
|
||||||
let make_expected = fun n -> e_nat (n * (n + 1) / 2) in
|
let make_expected = fun n -> e_nat (n * (n + 1) / 2) in
|
||||||
expect_eq_n_pos_mid program "while_sum" make_input make_expected
|
expect_eq_n_pos_mid program "while_sum" make_input make_expected
|
||||||
<<<<<<< HEAD
|
|
||||||
in(* For loop is currently unsupported
|
|
||||||
|
|
||||||
let%bind () =
|
|
||||||
=======
|
|
||||||
in
|
in
|
||||||
let%bind () =
|
let%bind () =
|
||||||
>>>>>>> First version for ForInt loops
|
|
||||||
let make_input = e_nat in
|
let make_input = e_nat in
|
||||||
let make_expected = fun n -> e_int (n * (n + 1) / 2) in
|
let make_expected = fun n -> e_int (n * (n + 1) / 2) in
|
||||||
expect_eq_n_pos_mid program "for_sum" make_input make_expected
|
expect_eq_n_pos_mid program "for_sum" make_input make_expected
|
||||||
|
Loading…
Reference in New Issue
Block a user