From b2f8eb5b27a95f37509ab6345910ecd62b3c8a90 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Tue, 30 May 2017 09:16:37 +0200 Subject: [PATCH] update to qcheck 0.6 --- src/core/CCList.ml | 16 ++++++++-------- src/data/CCRAL.ml | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/core/CCList.ml b/src/core/CCList.ml index ebdf7cea..ef4254e0 100644 --- a/src/core/CCList.ml +++ b/src/core/CCList.ml @@ -688,9 +688,9 @@ let take_while p l = *) (*$Q - Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \ - let l1 = take_while f l in \ - List.for_all f l1) + Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \ + let l1 = take_while (Q.Fn.apply f) l in \ + List.for_all (Q.Fn.apply f) l1) *) let rec drop_while p l = match l with @@ -698,8 +698,8 @@ let rec drop_while p l = match l with | x :: l' -> if p x then drop_while p l' else l (*$Q - Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \ - take_while f l @ drop_while f l = l) + Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \ + take_while (Q.Fn.apply f) l @ drop_while (Q.Fn.apply f) l = l) *) let take_drop_while p l = @@ -720,9 +720,9 @@ let take_drop_while p l = direct direct_depth_default_ p l (*$Q - Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \ - let l1,l2 = take_drop_while f l in \ - (l1 = take_while f l) && (l2 = drop_while f l)) + Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \ + let l1,l2 = take_drop_while (Q.Fn.apply f) l in \ + (l1 = take_while (Q.Fn.apply f) l) && (l2 = drop_while (Q.Fn.apply f) l)) *) let last n l = diff --git a/src/data/CCRAL.ml b/src/data/CCRAL.ml index 0c00c3a5..5d9aa245 100644 --- a/src/data/CCRAL.ml +++ b/src/data/CCRAL.ml @@ -151,7 +151,8 @@ let mapi ~f l = *) (*$Q - Q.(pair (list small_int)(fun2 int int bool)) (fun (l,f) -> \ + Q.(pair (list small_int)(fun2 Observable.int Observable.int bool)) (fun (l,f) -> \ + let f = Q.Fn.apply f in \ mapi ~f (of_list l) |> to_list = List.mapi f l ) *)