simon/iter
1
0
Fork 0
mirror of https://github.com/c-cube/iter.git synced 2025-12-06 03:05:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch exceptions used for control flow from global to local

Browse source 
Signed-off-by: Josh Berdine <josh@berdine.net>
This commit is contained in:
Josh Berdine 2025-02-02 13:19:10 +00:00
parent fc69ce4c91
commit 06d7e26941
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Iter.ml
View file

@ -330,9 +330,8 @@ let sort ?(cmp = Stdlib.compare) seq =
let l = List.fast_sort cmp l in let l = List.fast_sort cmp l in
fun k -> List.iter k l fun k -> List.iter k l
exception Exit_sorted
let sorted ?(cmp = Stdlib.compare) seq = let sorted ?(cmp = Stdlib.compare) seq =
let exception Exit_sorted in
let prev = ref None in let prev = ref None in
try try
seq (fun x -> seq (fun x ->
@ -556,9 +555,8 @@ let diff (type a) ?(eq = ( = )) ?(hash = Hashtbl.hash) c1 c2 =
c2 (fun x -> Tbl.replace tbl x ()); c2 (fun x -> Tbl.replace tbl x ());
fun yield -> c1 (fun x -> if not (Tbl.mem tbl x) then yield x) fun yield -> c1 (fun x -> if not (Tbl.mem tbl x) then yield x)
exception Subset_exit
let subset (type a) ?(eq = ( = )) ?(hash = Hashtbl.hash) c1 c2 = let subset (type a) ?(eq = ( = )) ?(hash = Hashtbl.hash) c1 c2 =
let exception Subset_exit in
let module Tbl = Hashtbl.Make (struct let module Tbl = Hashtbl.Make (struct
type t = a type t = a
@ -630,9 +628,8 @@ let sumf seq : float =
sum := t); sum := t);
!sum !sum
exception ExitHead
let head seq = let head seq =
let exception ExitHead in
let r = ref None in let r = ref None in
try try
seq (fun x -> seq (fun x ->
@ -646,9 +643,8 @@ let head_exn seq =
| None -> invalid_arg "Iter.head_exn" | None -> invalid_arg "Iter.head_exn"
| Some x -> x | Some x -> x
exception ExitTake
let take n seq k = let take n seq k =
let exception ExitTake in
let count = ref 0 in let count = ref 0 in
try try
seq (fun x -> seq (fun x ->
@ -657,9 +653,8 @@ let take n seq k =
k x) k x)
with ExitTake -> () with ExitTake -> ()
exception ExitTakeWhile
let take_while p seq k = let take_while p seq k =
let exception ExitTakeWhile in
try try
seq (fun x -> seq (fun x ->
if p x then if p x then
@ -668,8 +663,6 @@ let take_while p seq k =
raise_notrace ExitTakeWhile) raise_notrace ExitTakeWhile)
with ExitTakeWhile -> () with ExitTakeWhile -> ()
exception ExitFoldWhile
let map_while f seq k = let map_while f seq k =
let exception ExitMapWhile in let exception ExitMapWhile in
let consume x = let consume x =
@ -683,6 +676,7 @@ let map_while f seq k =
try seq consume with ExitMapWhile -> () try seq consume with ExitMapWhile -> ()
let fold_while f s seq = let fold_while f s seq =
let exception ExitFoldWhile in
let state = ref s in let state = ref s in
let consume x = let consume x =
let acc, cont = f !state x in let acc, cont = f !state x in
@ -721,18 +715,16 @@ let rev seq =
let l = MList.of_iter seq in let l = MList.of_iter seq in
fun k -> MList.iter_rev k l fun k -> MList.iter_rev k l
exception ExitForall
let for_all p seq = let for_all p seq =
let exception ExitForall in
try try
seq (fun x -> if not (p x) then raise_notrace ExitForall); seq (fun x -> if not (p x) then raise_notrace ExitForall);
true true
with ExitForall -> false with ExitForall -> false
exception ExitExists
(** Exists there some element satisfying the predicate? *) (** Exists there some element satisfying the predicate? *)
let exists p seq = let exists p seq =
let exception ExitExists in
try try
seq (fun x -> if p x then raise_notrace ExitExists); seq (fun x -> if p x then raise_notrace ExitExists);
false false
@ -740,9 +732,8 @@ let exists p seq =
let mem ?(eq = ( = )) x seq = exists (eq x) seq let mem ?(eq = ( = )) x seq = exists (eq x) seq
exception ExitFind
let find_map f seq = let find_map f seq =
let exception ExitFind in
let r = ref None in let r = ref None in
(try (try
seq (fun x -> seq (fun x ->
@ -757,6 +748,7 @@ let find_map f seq =
let find = find_map let find = find_map
let find_mapi f seq = let find_mapi f seq =
let exception ExitFind in
let i = ref 0 in let i = ref 0 in
let r = ref None in let r = ref None in
(try (try
@ -790,9 +782,8 @@ let[@inline] length seq =
seq (fun _ -> incr r); seq (fun _ -> incr r);
!r !r
exception ExitIsEmpty
let is_empty seq = let is_empty seq =
let exception ExitIsEmpty in
try try
seq (fun _ -> raise_notrace ExitIsEmpty); seq (fun _ -> raise_notrace ExitIsEmpty);
true true