wip: convert tests into testlib

Author: c-cube

src/data/CCBV.ml

@@ -117,17 +117,3 @@ module Make(L : OrderedType)(R : OrderedType) = struct
 
   let to_iter m yield = MapL.iter (fun k v -> yield (k,v)) m.left
 end
-
-(*$inject
-  open Containers
-  module M = Make(Int)(String)
-
-*)
-
-(*$=
-  2     (M.of_list [1,"1"; 2, "2"] |> M.cardinal)
-  "1"   (M.of_list [1,"1"; 2, "2"] |> M.find_left 1)
-  "2"   (M.of_list [1,"1"; 2, "2"] |> M.find_left 2)
-  1     (M.of_list [1,"1"; 2, "2"] |> M.find_right "1")
-  2     (M.of_list [1,"1"; 2, "2"] |> M.find_right "2")
-*)

src/data/CCBijection.ml

@@ -7,59 +7,6 @@ exception Frozen
 
 let max_width = Sys.word_size - 2
 
-(*$R
-  let module B = CCBitField.Make(struct end) in
-  let x = B.mk_field () in
-  let y = B.mk_field () in
-  let z = B.mk_field () in
-
-  let f = B.empty |> B.set x true |> B.set y true in
-
-  assert_bool "z_false" (not (B.get z f)) ;
-
-  assert_bool "z_true" (f |> B.set z true |> B.get z);
-*)
-
-(*$R
-  let module B = CCBitField.Make(struct end) in
-  let _ = B.mk_field () in
-  B.freeze();
-  assert_bool "must raise"
-    (try ignore (B.mk_field()); false with Frozen -> true);
-
-*)
-
-(*$R
-  let module B = CCBitField.Make(struct end) in
-
-  let x = B.mk_field () in
-  let y = B.mk_field () in
-  let z = B.mk_field () in
-  let u = B.mk_field () in
-  B.freeze();
-
-  let f = B.empty
-    |> B.set y true
-    |> B.set z true
-  in
-
-  assert_equal ~printer:CCInt.to_string 6 (f :> int) ;
-
-  assert_equal false (B.get x f) ;
-  assert_equal true (B.get y f) ;
-  assert_equal true (B.get z f);
-
-  let f' = B.set u true f in
-
-  assert_equal false (B.get x f') ;
-  assert_equal true (B.get y f') ;
-  assert_equal true (B.get z f');
-  assert_equal true (B.get u f');
-
-  ()
-*)
-
-
 module type S = sig
   type t = private int
   (** Generative type of bitfields. Each instantiation of the functor
@@ -94,13 +41,6 @@ let rec all_bits_ acc w =
     let acc = acc lor (1 lsl w-1) in
     all_bits_ acc (w-1)
 
-(*$T
-  all_bits_ 0 1 = 1
-  all_bits_ 0 2 = 3
-  all_bits_ 0 3 = 7
-  all_bits_ 0 4 = 15
-*)
-
 (* increment and return previous value *)
 let get_then_incr n =
   let x = !n in

src/data/CCBitField.ml

@@ -55,20 +55,6 @@ let with_cache_rec ?(cb=default_callback_) c f =
   let rec f' x = with_cache ~cb c (f f') x in
   f'
 
-(*$R
-  let c = unbounded ~eq:Int64.equal 256 in
-  let fib = with_cache_rec c
-    (fun self n -> match n with
-      | 1L | 2L -> 1L
-      | _ -> CCInt64.(self (n-1L) + self (n-2L))
-    )
-  in
-  assert_equal 55L (fib 10L);
-  assert_equal 832040L (fib 30L);
-  assert_equal 12586269025L (fib 50L);
-  assert_equal 190392490709135L (fib 70L)
-*)
-
 let size c = c.size ()
 
 let iter c f = c.iter f
@@ -311,36 +297,6 @@ let lru (type a) ~eq ?(hash=default_hash_) size =
     iter=L.iter c;
   }
 
-(*$T
-  let eq (i1,_)(i2,_) = i1=i2 and hash (i,_) = CCInt.hash i in \
-  let c = lru ~eq ~hash 2 in \
-  ignore (with_cache c CCFun.id (1, true)); \
-  ignore (with_cache c CCFun.id (1, false)); \
-  with_cache c CCFun.id (1, false) = (1, true)
-*)
-
-(*$T
-  let f = (let r = ref 0 in fun _ -> incr r; !r) in \
-  let c = lru ~eq:CCInt.equal 2 in \
-  let res1 = with_cache c f 1 in \
-  let res2 = with_cache c f 2 in \
-  let res3 = with_cache c f 3 in \
-  let res1_bis = with_cache c f 1 in \
-  res1 <> res2 && res2 <> res3 && res3 <> res1_bis && res1_bis <> res1
-*)
-
-(*$R
-  let f = (let r = ref 0 in fun _ -> incr r; !r) in
-  let c = lru ~eq:CCEqual.unit 2 in
-  let x = with_cache c f () in
-  assert_equal 1 x;
-  assert_equal 1 (size c);
-  clear c ;
-  assert_equal 0 (size c);
-  let y = with_cache c f () in
-  assert_equal 2 y ;
-*)
-
 module UNBOUNDED(X:HASH) = struct
   module H = Hashtbl.Make(X)