From 399e95b50f76d3ff729c0e3b808bd9d9ce4f03fb Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Tue, 9 Jan 2024 17:39:18 -0500 Subject: [PATCH] reformat --- benchs/dune | 3 ++- examples/dune | 3 ++- src/Iter.ml | 44 ++++++++++++++++++++++++-------------------- src/dune | 1 - tests/unit/dune | 5 ++--- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/benchs/dune b/benchs/dune index a919328..79b354b 100644 --- a/benchs/dune +++ b/benchs/dune @@ -2,6 +2,7 @@ (names bench_persistent_read bench_persistent benchs) (libraries iter benchmark) (optional) - (flags :standard -w +a-4-42-44-48-50-58-32-60-70@8 -safe-string -color always) + (flags :standard -w +a-4-42-44-48-50-58-32-60-70@8 -safe-string -color + always) (ocamlopt_flags :standard -O3 -color always -unbox-closures -unbox-closures-factor 20)) diff --git a/examples/dune b/examples/dune index 9c57323..16644bc 100644 --- a/examples/dune +++ b/examples/dune @@ -1,6 +1,7 @@ (executable (name test_sexpr) (libraries iter) - (flags :standard -w +a-4-42-44-48-50-58-32-60-70@8 -safe-string -color always) + (flags :standard -w +a-4-42-44-48-50-58-32-60-70@8 -safe-string -color + always) (ocamlopt_flags :standard -O3 -color always -unbox-closures -unbox-closures-factor 20)) diff --git a/src/Iter.ml b/src/Iter.ml index 6857276..91252e2 100644 --- a/src/Iter.ml +++ b/src/Iter.ml @@ -189,7 +189,9 @@ let keep_error seq k = (** Mutable unrolled list to serve as intermediate storage *) module MList = struct - type 'a node = Nil | Cons of { a : 'a array; mutable n : int; mutable tl : 'a node } + type 'a node = + | Nil + | Cons of { a: 'a array; mutable n: int; mutable tl: 'a node } (* build and call callback on every element *) let of_iter_with seq k = @@ -198,13 +200,13 @@ module MList = struct let cur = ref Nil in let tail = ref Nil in - let[@inline] replace_tail () = - match !acc with - | Nil -> acc := !cur - | _ -> - match !tail with - | Nil -> () - | Cons r -> r.tl <- !cur + let[@inline] replace_tail () = + match !acc with + | Nil -> acc := !cur + | _ -> + (match !tail with + | Nil -> () + | Cons r -> r.tl <- !cur) in seq (fun x -> @@ -214,7 +216,7 @@ module MList = struct | Nil -> let n = !chunk_size in if n < 4096 then chunk_size := 2 * n; - cur := Cons {a=Array.make n x; n = 1; tl = Nil} + cur := Cons { a = Array.make n x; n = 1; tl = Nil } | Cons r -> assert (r.n < Array.length r.a); r.a.(r.n) <- x; @@ -232,7 +234,7 @@ module MList = struct let rec iter f l = match l with | Nil -> () - | Cons {a; n; tl} -> + | Cons { a; n; tl } -> for i = 0 to n - 1 do f a.(i) done; @@ -242,7 +244,7 @@ module MList = struct let rec iteri i f l = match l with | Nil -> () - | Cons {a; n; tl} -> + | Cons { a; n; tl } -> for j = 0 to n - 1 do f (i + j) a.(j) done; @@ -253,7 +255,7 @@ module MList = struct let rec iter_rev f l = match l with | Nil -> () - | Cons {a; n; tl} -> + | Cons { a; n; tl } -> iter_rev f tl; for i = n - 1 downto 0 do f a.(i) @@ -263,7 +265,7 @@ module MList = struct let rec len acc l = match l with | Nil -> acc - | Cons {n; tl; _} -> len (acc + n) tl + | Cons { n; tl; _ } -> len (acc + n) tl in len 0 l @@ -271,8 +273,8 @@ module MList = struct let rec get l i = match l with | Nil -> raise (Invalid_argument "MList.get") - | Cons {a; n; _} when i < n -> a.(i) - | Cons {n; tl; _} -> get tl (i - n) + | Cons { a; n; _ } when i < n -> a.(i) + | Cons { n; tl; _ } -> get tl (i - n) let to_iter l k = iter k l @@ -283,11 +285,11 @@ module MList = struct let rec get_next _ = match !cur with | Nil -> None - | Cons {n; tl; _} when !i = n -> + | Cons { n; tl; _ } when !i = n -> cur := tl; i := 0; get_next arg - | Cons {a; _} -> + | Cons { a; _ } -> let x = a.(!i) in incr i; Some x @@ -300,8 +302,8 @@ module MList = struct let rec make (l, i) () = match l with | Nil -> Seq.Nil - | Cons {n; tl; _} when i = n -> make (tl, 0) () - | Cons {a;_} -> Seq.Cons (a.(i), make (l, i + 1)) + | Cons { n; tl; _ } when i = n -> make (tl, 0) () + | Cons { a; _ } -> Seq.Cons (a.(i), make (l, i + 1)) in make (l, 0) end @@ -673,7 +675,9 @@ let map_while f seq k = let consume x = match f x with | `Yield y -> k y - | `Return y -> k y; raise_notrace ExitMapWhile + | `Return y -> + k y; + raise_notrace ExitMapWhile | `Stop -> raise_notrace ExitMapWhile in try seq consume with ExitMapWhile -> () diff --git a/src/dune b/src/dune index fe593fc..957b57a 100644 --- a/src/dune +++ b/src/dune @@ -1,4 +1,3 @@ - (library (name iter) (public_name iter) diff --git a/tests/unit/dune b/tests/unit/dune index f1160d0..7c723bc 100644 --- a/tests/unit/dune +++ b/tests/unit/dune @@ -1,4 +1,3 @@ - (tests - (names t_iter) - (libraries iter qcheck-core qcheck-core.runner ounit2)) + (names t_iter) + (libraries iter qcheck-core qcheck-core.runner ounit2))