fix tests and build

This commit is contained in:
Simon Cruanes 2020-11-10 18:06:30 -05:00
parent 057427cb72
commit 9068cbc1cc
2 changed files with 11 additions and 11 deletions

View file

@ -586,14 +586,14 @@ let combine_shortest l1 l2 =
direct direct_depth_default_ l1 l2
(*$T
(combine_chop [] []) = []
(combine_chop [1] []) = []
(combine_chop [] [1]) = []
(combine_chop (1--1025) (1--1026)) = List.combine (1--1025) (1--1025)
(combine_chop (1--1026) (1--1025)) = List.combine (1--1025) (1--1025)
combine_chop [1;2;3] [3;2;1] = List.combine [1;2;3] [3;2;1]
combine_chop (1 -- 100_000) (1 -- 100_000) = List.combine (1 -- 100_000) (1 -- 100_000)
combine_chop (1 -- 100_001) (1 -- 100_000) = List.combine (1 -- 100_000) (1 -- 100_000)
(combine_shortest [] []) = []
(combine_shortest [1] []) = []
(combine_shortest [] [1]) = []
(combine_shortest (1--1025) (1--1026)) = List.combine (1--1025) (1--1025)
(combine_shortest (1--1026) (1--1025)) = List.combine (1--1025) (1--1025)
combine_shortest [1;2;3] [3;2;1] = List.combine [1;2;3] [3;2;1]
combine_shortest (1 -- 100_000) (1 -- 100_000) = List.combine (1 -- 100_000) (1 -- 100_000)
combine_shortest (1 -- 100_001) (1 -- 100_000) = List.combine (1 -- 100_000) (1 -- 100_000)
*)

View file

@ -142,9 +142,9 @@ val combine_gen : 'a list -> 'b list -> ('a * 'b) gen
@since 1.2, but only
@since 2.2 with labels *)
val combine_chop : 'a list -> 'b list -> ('a * 'b) list
(** [combine [a1; …; am] [b1; …; bn]] is [[(a1,b1); …; (am,bm)]] if m <= n.
Like {!combine} but stops at the shortest list rather than raising.
val combine_shortest : 'a list -> 'b list -> ('a * 'b) list
(** [combine_shortest [a1; …; am] [b1; …; bn]] is [[(a1,b1); …; (am,bm)]] if m <= n.
Like {!combine} but stops at the shortest list rather than raising.
@since 3.1 *)
val split : ('a * 'b) t -> 'a t * 'b t