refactor: finish migration to qtest

Author: c-cube

src/data/CCFQueue.ml

@@ -7,10 +7,6 @@ type 'a iter = ('a -> unit) -> unit
 type 'a equal = 'a -> 'a -> bool
 type 'a printer = Format.formatter -> 'a -> unit
 
-(*$inject
-  let pp_ilist = CCFormat.(to_string (list int))
-*)
-
 (** {2 Basics} *)
 
 [@@@warning "-37"]
@@ -34,11 +30,6 @@ type +'a t =
 
 let empty : type a. a t = Shallow Zero
 
-(*$R
-  let q = empty in
-  OUnit2.assert_bool "is_empty" (is_empty q)
-*)
-
 exception Empty
 
 let _empty = Shallow Zero
@@ -68,11 +59,6 @@ let rec cons : type a. a -> a t -> a t
     | Deep (n,Three (y,z,z'), lazy q', tail) ->
       _deep (n+1) (Two (x,y)) (lazy (cons (z,z') q')) tail
 
-(*$Q
-  (Q.pair Q.int (Q.list Q.int)) (fun (x,l) -> \
-    cons x (of_list l) |> to_list = x::l)
-*)
-
 let rec snoc : type a. a t -> a -> a t
   = fun q x -> match q with
     | Shallow Zero -> _single x
@@ -85,19 +71,6 @@ let rec snoc : type a. a t -> a -> a t
     | Deep (n,hd, lazy q', Three (y,z,z')) ->
       _deep (n+1) hd (lazy (snoc q' (y,z))) (Two(z',x))
 
-(*$Q
-  (Q.pair Q.int (Q.list Q.int)) (fun (x,l) -> \
-    snoc (of_list l) x |> to_list = l @ [x])
-*)
-
-(*$R
-  let q = List.fold_left snoc empty [1;2;3;4;5] in
-  let q = tail q in
-  let q = List.fold_left snoc q [6;7;8] in
-  let l = Iter.to_list (to_iter q) in
-  OUnit2.assert_equal ~printer:pp_ilist [2;3;4;5;6;7;8] l
-*)
-
 let rec take_front_exn : 'a. 'a t -> ('a *'a t)
   = fun q -> match q with
     | Shallow Zero -> raise Empty
@@ -115,30 +88,10 @@ let rec take_front_exn : 'a. 'a t -> ('a *'a t)
     | Deep (n,Three (x,y,z), middle, tail) ->
       x, _deep (n-1) (Two(y,z)) middle tail
 
-(*$Q
-  (Q.pair Q.int (Q.list Q.int)) (fun (x,l) -> \
-    let x', q = cons x (of_list l) |> take_front_exn in \
-    x'=x && to_list q = l)
-*)
-
-(*$R
-  let q = of_list [1;2;3;4] in
-  let x, q = take_front_exn q in
-  OUnit2.assert_equal 1 x;
-  let q = List.fold_left snoc q [5;6;7] in
-  OUnit2.assert_equal 2 (first_exn q);
-  let x, q = take_front_exn q in
-  OUnit2.assert_equal 2 x;
-*)
-
 let take_front q =
   try Some (take_front_exn q)
   with Empty -> None
 
-(*$T
-  take_front empty = None
-*)
-
 let take_front_l n q =
   if n<0 then (
     invalid_arg "take_back_l: cannot take negative number of arguments"
@@ -150,11 +103,6 @@ let take_front_l n q =
       aux (x::acc) q' (n-1)
   in aux [] q n
 
-(*$T
-  let l, q = take_front_l 5 (1 -- 10) in \
-  l = [1;2;3;4;5] && to_list q = [6;7;8;9;10]
-*)
-
 let take_front_while p q =
   let rec aux acc q =
     if is_empty q then List.rev acc, q
@@ -163,10 +111,6 @@ let take_front_while p q =
       if p x then aux (x::acc) q' else List.rev acc, q
   in aux [] q
 
-(*$T
-  take_front_while (fun x-> x<5) (1 -- 10) |> fst = [1;2;3;4]
-*)
-
 let rec take_back_exn : 'a. 'a t -> 'a t * 'a
   = fun q -> match q with
     | Shallow Zero -> raise Empty
@@ -182,20 +126,10 @@ let rec take_back_exn : 'a. 'a t -> 'a t * 'a
     | Deep (n, hd, middle, Two(x,y)) -> _deep (n-1) hd middle (One x), y
     | Deep (n, hd, middle, Three(x,y,z)) -> _deep (n-1) hd middle (Two (x,y)), z
 
-(*$Q
-  (Q.pair Q.int (Q.list Q.int)) (fun (x,l) -> \
-    let q,x' = snoc (of_list l) x |> take_back_exn in \
-    x'=x && to_list q = l)
-*)
-
 let take_back q =
   try Some (take_back_exn q)
   with Empty -> None
 
-(*$T
-  take_back empty = None
-*)
-
 let take_back_l n q =
   if n<0 then (
     invalid_arg "take_back_l: cannot take negative number of arguments"
@@ -240,11 +174,6 @@ let size : 'a. 'a t -> int
     | Shallow d -> _size_digit d
     | Deep (n, _, _, _) -> n
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    size (of_list l) = List.length l)
-*)
-
 let _nth_digit : type l. int -> ('a, l) digit -> 'a = fun i d -> match i, d with
   | _, Zero -> raise Not_found
   | 0, One x -> x
@@ -278,51 +207,24 @@ let rec nth_exn : 'a. int -> 'a t -> 'a
         else
           _nth_digit (i'-2*size q') r
 
-(*$T
-  let l = CCList.(0--100) in let q = of_list l in \
-    List.map (fun i->nth_exn i q) l = l
-*)
-
 let nth i q =
   try Some (nth_exn i q)
   with Failure _ -> None
 
-(*$Q & ~count:30
-  (Q.list Q.int) (fun l -> \
-   let len = List.length l in let idx = CCList.(0 -- (len - 1)) in \
-   let q = of_list l in \
-   l = [] || List.for_all (fun i -> nth i q = Some (List.nth l i)) idx)
-*)
-
 let init q =
   try fst (take_back_exn q)
   with Empty -> q
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    l = [] || (of_list l |> init |> to_list = List.rev (List.tl (List.rev l))))
-*)
-
 let tail q =
   try snd (take_front_exn q)
   with Empty -> q
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    l = [] || (of_list l |> tail |> to_list = List.tl l))
-*)
-
 let add_iter_front seq q =
   let l = ref [] in
   (* reversed seq *)
   seq (fun x -> l := x :: !l);
   List.fold_left (fun q x -> cons x q) q !l
 
-(*$Q
-  Q.(pair (list int) (list int)) (fun (l1, l2) -> \
-    add_iter_front (Iter.of_list l1) (of_list l2) |> to_list = l1 @ l2)
-*)
-
 let add_iter_back q seq =
   let q = ref q in
   seq (fun x -> q := snoc !q x);
@@ -342,40 +244,17 @@ let rec to_iter : 'a. 'a t -> 'a iter
       to_iter q' (fun (x,y) -> k x; k y);
       _digit_to_iter tail k
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    of_list l |> to_iter |> Iter.to_list = l)
-*)
-
 let append q1 q2 =
   match q1, q2 with
     | Shallow Zero, _ -> q2
     | _, Shallow Zero -> q1
     | _ -> add_iter_back q1 (to_iter q2)
 
-(*$Q
-  (Q.pair (Q.list Q.int)(Q.list Q.int)) (fun (l1,l2) -> \
-    append (of_list l1) (of_list l2) |> to_list = l1 @ l2)
-*)
-
-(*$R
-  let q1 = of_iter (Iter.of_list [1;2;3;4]) in
-  let q2 = of_iter (Iter.of_list [5;6;7;8]) in
-  let q = append q1 q2 in
-  let l = Iter.to_list (to_iter q) in
-  OUnit2.assert_equal ~printer:pp_ilist [1;2;3;4;5;6;7;8] l
-*)
-
 let add_seq_front seq q =
   (* reversed seq *)
   let l = Seq.fold_left (fun l elt -> elt::l ) [] seq in
   List.fold_left (fun q x -> cons x q) q l
 
-(*$Q
-  Q.(pair (list int) (list int)) (fun (l1, l2) -> \
-    add_seq_front (CCList.to_seq l1) (of_list l2) |> to_list = l1 @ l2)
-*)
-
 let add_seq_back q seq =
   Seq.fold_left (fun q x -> snoc q x) q seq
 
@@ -396,11 +275,6 @@ let rec to_seq : 'a. 'a t -> 'a Seq.t
 
 let of_seq seq = add_seq_front seq empty
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    of_list l |> to_seq |> CCList.of_seq = l)
-*)
-
 let _map_digit : type l. ('a -> 'b) -> ('a, l) digit -> ('b, l) digit = fun f d -> match d with
   | Zero -> Zero
   | One x -> One (f x)
@@ -414,11 +288,6 @@ let rec map : 'a 'b. ('a -> 'b) -> 'a t -> 'b t
       let q'' = map (fun (x,y) -> f x, f y) q' in
       _deep size (_map_digit f hd) (Lazy.from_val q'') (_map_digit f tl)
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    of_list l |> map string_of_int |> to_list = List.map string_of_int l)
-*)
-
 let (>|=) q f = map f q
 
 let _fold_digit : type l. ('acc -> 'a -> 'acc) -> 'acc -> ('a, l) digit -> 'acc = fun f acc d -> match d with
@@ -435,17 +304,6 @@ let rec fold : 'a 'b. ('b -> 'a -> 'b) -> 'b -> 'a t -> 'b
       let acc = fold (fun acc (x,y) -> f (f acc x) y) acc q' in
       _fold_digit f acc tl
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    of_list l |> fold (fun acc x->x::acc) [] = List.rev l)
-*)
-
-(*$R
-  let q = of_iter (Iter.of_list [1;2;3;4]) in
-  let n = fold (+) 0 q in
-  OUnit2.assert_equal 10 n;
-*)
-
 let iter f q = to_iter q f
 
 let of_list l = List.fold_left snoc empty l
@@ -457,21 +315,11 @@ let to_list q =
 
 let of_iter seq = add_iter_front seq empty
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    Iter.of_list l |> of_iter |> to_list = l)
-*)
-
 let rev q =
   let q' = ref empty in
   iter (fun x -> q' := cons x !q') q;
   !q'
 
-(*$Q
-  (Q.list Q.int) (fun l -> \
-    of_list l |> rev |> to_list = List.rev l)
-*)
-
 let rec _equal_seq eq l1 l2 = match l1(), l2() with
   | Seq.Nil, Seq.Nil -> true
   | Seq.Nil, _
@@ -481,11 +329,6 @@ let rec _equal_seq eq l1 l2 = match l1(), l2() with
 
 let equal eq q1 q2 = _equal_seq eq (to_seq q1) (to_seq q2)
 
-(*$T
-  let q1 = 1 -- 10 and q2 = append (1 -- 5) (6 -- 10) in \
-  equal (=) q1 q2
-*)
-
 let (--) a b =
   let rec up_to q a b = if a = b
     then snoc q a
@@ -495,24 +338,11 @@ let (--) a b =
   in
   if a <= b then up_to empty a b else down_to empty a b
 
-(*$T
-  1 -- 5 |> to_list = [1;2;3;4;5]
-  5 -- 1 |> to_list = [5;4;3;2;1]
-  0 -- 0 |> to_list = [0]
-*)
-
 let (--^) a b =
   if a=b then empty
   else if a<b then a -- (b-1)
   else a -- (b+1)
 
-(*$T
-  1 --^ 5 |> to_list = [1;2;3;4]
-  5 --^ 1 |> to_list = [5;4;3;2]
-  1 --^ 2 |> to_list = [1]
-  0 --^ 0 |> to_list = []
-*)
-
 let pp pp_x out d =
   let first = ref true in
   Format.fprintf out "@[<hov2>queue {";