ensure compatibility with ocaml 4.00

Makefile

@@ -67,9 +67,11 @@ QTESTABLE=$(filter-out $(DONTTEST), \
 qtest-clean:
 	@rm -rf qtest/
 
+QTEST_PREAMBLE='open CCFun;; '
+
 qtest-build: qtest-clean build
 	@mkdir -p qtest
-	@qtest extract -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null
+	@qtest extract --preamble $(QTEST_PREAMBLE) -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null
 	@ocamlbuild $(OPTIONS) -pkg oUnit,QTest2Lib \
 		-I core -I misc -I string \
 		qtest/qtest_all.native

core/CCIO.ml

@@ -471,17 +471,17 @@ module File = struct
     if Sys.is_directory d
     then
       let arr = Sys.readdir d in
-      Seq.of_array arr
+      Seq.map_pure make (Seq.of_array arr)
-      |> Seq.map_pure make
     else Seq.empty
 
   let rec _walk d () =
     if Sys.is_directory d
     then
       let arr = Sys.readdir d in
-      let tail = Seq.of_array arr
+      let tail = Seq.of_array arr in
-        |> Seq.flat_map
+      let tail = Seq.flat_map
-          (fun s -> return (_walk (Filename.concat d s) ()))
+        (fun s -> return (_walk (Filename.concat d s) ()))
+        tail
       in Seq.cons (`Dir,d) tail
     else Seq.singleton (`File, d)
 
@@ -501,14 +501,14 @@ module File = struct
     if Sys.is_directory d
     then
       let arr = Sys.readdir d in
-      Seq.of_array arr
+      let arr = Seq.of_array arr in
-      |> Seq.map_pure (fun s -> Filename.concat d s)
+      let arr = Seq.map_pure (fun s -> Filename.concat d s) arr in
-      |> Seq.flat_map
+      Seq.flat_map
         (fun s ->
           if Sys.is_directory s
             then return (_read_dir_rec s ())
             else return (Seq.singleton s)
-        )
+        ) arr
     else Seq.empty
 end
 

core/CCKTree.ml

@@ -178,7 +178,7 @@ let find ?pset f t =
         | None -> _find_kl f l'
         | Some _ as res -> res
   in
-  bfs ?pset t |> _find_kl f
+  _find_kl f (bfs ?pset t)
 
 (** {2 Pretty printing in the DOT (graphviz) format} *)
 

core/CCLinq.ml

@@ -173,25 +173,23 @@ module PMap = struct
     );
   }
 
-  let to_list m = m.to_seq |> CCSequence.to_rev_list
+  let to_list m = CCSequence.to_rev_list m.to_seq
 
   let to_coll m = Seq m.to_seq
 
   let reverse ~build m =
     let build = make ~build () in
-    to_seq m
+    let seq = CCSequence.map (fun (x,y) -> y,x) (to_seq m) in
-      |> CCSequence.map (fun (x,y) -> y,x)
+    multimap_of_seq ~build seq
-      |> multimap_of_seq ~build
 
   let reverse_multimap ~build m =
     let build = make ~build () in
-    to_seq m
+    let seq = to_seq m in
-      |> CCSequence.flatMap
+    let seq = CCSequence.flat_map
-        (fun (x,l) -> 
+        (fun (x,l) -> CCSequence.map (fun y -> y,x) (CCSequence.of_list l)
-          CCSequence.of_list l
+        ) seq
-          |> CCSequence.map (fun y -> y,x)
+    in
-        )
+    multimap_of_seq ~build seq
-      |> multimap_of_seq ~build
 end
 
 type 'a search_result =
@@ -280,7 +278,7 @@ module Coll = struct
     | List [] -> fail ()
     | List (x::_) -> x
     | Seq s ->
-        begin match CCSequence.take 1 s |> CCSequence.to_list with
+        begin match CCSequence.to_list (CCSequence.take 1 s) with
         | [x] -> x
         | _ -> fail ()
         end
@@ -304,15 +302,14 @@ module Coll = struct
     with MySurpriseExit -> ()
 
   let take_while p c =
-    to_seq c |> _seq_take_while p |> of_seq
+    of_seq (_seq_take_while p (to_seq c))
 
   let distinct ~cmp c = set_of_seq ~cmp (to_seq c)
 
   let sort cmp c = match c with
     | List l -> List (List.sort cmp l)
     | Seq s -> List (List.sort cmp (CCSequence.to_rev_list s))
-    | _ ->
+    | _ -> set_of_seq ~cmp (to_seq c)
-        to_seq c |> set_of_seq ~cmp
 
   let search obj c =
     let _search_seq obj seq =
@@ -327,7 +324,7 @@ module Coll = struct
       | None -> obj#failure
       | Some x -> x
     in
-    to_seq c |> _search_seq obj
+    _search_seq obj (to_seq c)
 
   let contains (type elt) ~eq x c = match c with
     | List l -> List.exists (eq x) l
@@ -336,17 +333,13 @@ module Coll = struct
         let module S = (val m : CCSequence.Set.S
              with type elt = elt and type t = 'b) in
         (* XXX: here we don't use the equality relation *)
-        try
+        S.mem x set
-          let y = S.find x set in
-          assert (eq x y);
-          true
-        with Not_found -> false
 
   let do_join ~join c1 c2 =
     let build1 =
-      to_seq c1
+      let seq = to_seq c1 in
-      |> CCSequence.map (fun x -> join.join_key1 x, x)
+      let seq = CCSequence.map (fun x -> join.join_key1 x, x) seq in
-      |> PMap.multimap_of_seq ~build:(PMap.make ~build:join.join_build ())
+      PMap.multimap_of_seq ~build:(PMap.make ~build:join.join_build ()) seq
     in
     let l = CCSequence.fold
       (fun acc y ->
@@ -386,9 +379,8 @@ module Coll = struct
     let build = PMap.make ~build () in
     to_seq c1 (fun x -> PMap.add build x ());
     to_seq c2 (fun x -> PMap.add build x ());
-    PMap.to_seq (PMap.build_get build)
+    let seq = PMap.to_seq (PMap.build_get build) in
-      |> CCSequence.map fst
+    of_seq (CCSequence.map fst seq)
-      |> of_seq
 
   type inter_status =
     | InterLeft
@@ -415,9 +407,8 @@ module Coll = struct
     to_seq c2 (fun x -> PMap.add build x ());
     let map = PMap.build_get build in
     (* output elements of [c1] not in [map] *)
-    to_seq c1
+    let seq = to_seq c1 in
-      |> CCSequence.filter (fun x -> not (PMap.mem map x))
+    of_seq (CCSequence.filter (fun x -> not (PMap.mem map x)) seq)
-      |> of_seq
 end
 
 (** {2 Query operators} *)
@@ -487,7 +478,7 @@ let of_array a =
   Start (Coll.of_array a)
 
 let of_array_i a =
-  Start (CCSequence.of_array_i a |> Coll.of_seq)
+  Start (Coll.of_seq (CCSequence.of_array_i a))
 
 let of_hashtbl h =
   Start (Coll.of_seq (CCSequence.of_hashtbl h))
@@ -496,13 +487,13 @@ let of_seq seq =
   Start (Coll.of_seq seq)
 
 let of_queue q =
-  Start (CCSequence.of_queue q |> Coll.of_seq)
+  Start (Coll.of_seq (CCSequence.of_queue q))
 
 let of_stack s =
-  Start (CCSequence.of_stack s |> Coll.of_seq)
+  Start (Coll.of_seq (CCSequence.of_stack s))
 
 let of_string s =
-  Start (CCSequence.of_str s |> Coll.of_seq)
+  Start (Coll.of_seq (CCSequence.of_str s))
 
 (** {6 Execution} *)
 
@@ -562,12 +553,11 @@ let _do_unary : type a b. (a,b) unary -> a -> b
   | Fold (f, acc) -> Coll.fold f acc c
   | FoldMap (f, acc) -> PMap.fold f acc c
   | Reduce (safety, start, mix, stop) ->
-      let acc = Coll.to_seq c
+      let acc = CCSequence.fold
-        |> CCSequence.fold
+        (fun acc x -> match acc with
-          (fun acc x -> match acc with
+          | None -> Some (start x)
-            | None -> Some (start x)
+          | Some acc -> Some (mix x acc)
-            | Some acc -> Some (mix x acc)
+        ) None (Coll.to_seq c)
-          ) None
       in
       begin match acc, safety with
       | Some x, Implicit -> stop x
@@ -588,13 +578,11 @@ let _do_unary : type a b. (a,b) unary -> a -> b
   | Get (Implicit, k) -> PMap.get_exn c k
   | Get (Explicit, k) -> PMap.get_err c k
   | GroupBy (build,f) ->
-      Coll.to_seq c
+      let seq = CCSequence.map (fun x -> f x, x) (Coll.to_seq c) in
-      |> CCSequence.map (fun x -> f x, x)
+      PMap.multimap_of_seq ~build:(PMap.make ~build ()) seq
-      |> PMap.multimap_of_seq ~build:(PMap.make ~build ())
   | Contains (eq, x) -> Coll.contains ~eq x c
   | Count build ->
-      Coll.to_seq c
+      PMap.count_of_seq ~build:(PMap.make ~build ()) (Coll.to_seq c)
-      |> PMap.count_of_seq ~build:(PMap.make ~build ())
   | Lazy -> Lazy.force c
 
 let _do_binary : type a b c. (a, b, c) binary -> a -> b -> c
@@ -706,18 +694,20 @@ module M = struct
     Unary (GeneralMap (fun m -> Coll.of_seq m.PMap.to_seq), q)
 
   let flatten q =
-    let f m = m.PMap.to_seq
+    let f m =
-        |> CCSequence.flatMap
+      let seq = CCSequence.flat_map
-          (fun (k,v) -> Coll.to_seq v |> CCSequence.map (fun v' -> k,v'))
+        (fun (k,v) -> CCSequence.map (fun v' -> k,v') (Coll.to_seq v))
-        |> Coll.of_seq
+         m.PMap.to_seq
+      in Coll.of_seq seq
     in
     Unary (GeneralMap f, q)
 
   let flatten' q =
-    let f m = m.PMap.to_seq
+    let f m =
-        |> CCSequence.flatMap
+      let seq = CCSequence.flatMap
-          (fun (k,v) -> CCSequence.of_list v |> CCSequence.map (fun v' -> k,v'))
+          (fun (k,v) -> CCSequence.map (fun v' -> k,v') (CCSequence.of_list v))
-        |> Coll.of_seq
+          m.PMap.to_seq
+      in Coll.of_seq seq
     in
     Unary (GeneralMap f, q)
 
@@ -895,7 +885,7 @@ let to_array q =
   QueryMap ((fun c -> Array.of_list (Coll.to_list c)), q)
 
 let to_seq q =
-  QueryMap ((fun c -> Coll.to_seq c |> CCSequence.persistent), q)
+  QueryMap ((fun c -> CCSequence.persistent (Coll.to_seq c)), q)
 
 let to_hashtbl q =
   QueryMap ((fun c -> CCSequence.to_hashtbl (Coll.to_seq c)), q)
@@ -919,9 +909,7 @@ module AdaptSet(S : Set.S) = struct
     return (Coll.of_seq (fun k -> S.iter k set))
 
   let to_set q =
-    let f c =
+    let f c = CCSequence.fold (fun set x -> S.add x set) S.empty (Coll.to_seq c) in
-      Coll.to_seq c |> CCSequence.fold (fun set x -> S.add x set) S.empty
-    in
     query_map f q
 
   let run q = run (to_set q)
@@ -944,13 +932,12 @@ module AdaptMap(M : Map.S) = struct
 
   let to_map q =
     let f c =
-      Coll.to_seq c
+      CCSequence.fold (fun m (x,y) -> M.add x y m) M.empty (Coll.to_seq c)
-      |> CCSequence.fold (fun m (x,y) -> M.add x y m) M.empty
     in
     query_map f q
 
-  let run q = run (q |> to_map)
+  let run q = run (to_map q)
-  let run_exn q = run_exn (q |> to_map)
+  let run_exn q = run_exn (to_map q)
 end
 
 module IO = struct
@@ -1017,20 +1004,21 @@ module IO = struct
 
   let lines q =
     (* sequence of lines *)
-    let f s = _lines s 0 |> Coll.of_seq in
+    let f s = Coll.of_seq (_lines s 0) in
     query_map f q
-      
+
   let lines' q =
-    let f s = lazy (_lines s 0 |> CCSequence.to_list) in
+    let f s = lazy (CCSequence.to_list (_lines s 0)) in
     lazy_ (query_map f q)
 
   let _join ~sep ?(stop="") l =
     let buf = Buffer.create 128 in
-    Coll.to_seq l
+    let seq = Coll.to_seq l in
-      |> CCSequence.iteri
+    CCSequence.iteri
-        (fun i x ->
+      (fun i x ->
-          if i>0 then Buffer.add_string buf sep;
+        if i>0 then Buffer.add_string buf sep;
-          Buffer.add_string buf x);
+        Buffer.add_string buf x)
+      seq;
     Buffer.add_string buf stop;
     Buffer.contents buf
 
@@ -1043,12 +1031,11 @@ module IO = struct
     lazy_ (query_map f q)
 
   let out oc q =
-    run_exn q |> output_string oc
+    output_string oc (run_exn q)
 
   let out_lines oc q =
-    run_exn q
+    let x = run_exn q in
-    |> Coll.to_seq
+    CCSequence.iter (fun l -> output_string oc l; output_char oc '\n') (Coll.to_seq x)
-    |> CCSequence.iter (fun l -> output_string oc l; output_char oc '\n')
 
   let to_file_exn filename q =
     _with_file_out filename (fun oc -> out oc q)

core/CCTrie.ml

@@ -471,13 +471,14 @@ module Make(W : WORD) = struct
             else None, alternatives
       | Some (Node (_, map), trail) ->
           let alternatives =
-            _seq_map map
+            let seq = _seq_map map in
-            |> _filter_map_seq
+            let seq = _filter_map_seq
               (fun (c', t') -> if p c c'
                 then Some (t', _difflist_add trail c')
                 else None
-              )
+              ) seq
-            |> _seq_append_list alternatives
+            in
+            _seq_append_list alternatives seq
           in
           begin try
             let t' = M.find c map in

misc/conv.ml

@@ -546,6 +546,8 @@ end
 
 (* tests *)
 
+let (@@) f x = f x
+
 module Point = struct
   type t = {
     x : int;

tests/test_gen.ml

@@ -1,5 +1,6 @@
 
 open OUnit
+open CCFun
 
 module Gen = CCGen
 module GR = Gen.Restart

tests/test_levenshtein.ml

@@ -1,6 +1,7 @@
 (* quickcheck for Levenshtein *)
 
 module Levenshtein = Containers_string.Levenshtein
+open CCFun
 
 (* test that automaton accepts its string *)
 let test_automaton =