Skip to content

Switch exceptions used for control flow from global to local #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Switch exceptions used for control flow from global to local #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions src/Iter.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,8 @@ let sort ?(cmp = Stdlib.compare) seq =
let l = List.fast_sort cmp l in
fun k -> List.iter k l

exception Exit_sorted

let sorted ?(cmp = Stdlib.compare) seq =
let exception Exit_sorted in
let prev = ref None in
try
seq (fun x ->
Expand Down Expand Up @@ -556,9 +555,8 @@ let diff (type a) ?(eq = ( = )) ?(hash = Hashtbl.hash) c1 c2 =
c2 (fun x -> Tbl.replace tbl 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 exception Subset_exit in
let module Tbl = Hashtbl.Make (struct
type t = a

Expand Down Expand Up @@ -630,9 +628,8 @@ let sumf seq : float =
sum := t);
!sum

exception ExitHead

let head seq =
let exception ExitHead in
let r = ref None in
try
seq (fun x ->
Expand All @@ -646,9 +643,8 @@ let head_exn seq =
| None -> invalid_arg "Iter.head_exn"
| Some x -> x

exception ExitTake

let take n seq k =
let exception ExitTake in
let count = ref 0 in
try
seq (fun x ->
Expand All @@ -657,9 +653,8 @@ let take n seq k =
k x)
with ExitTake -> ()

exception ExitTakeWhile

let take_while p seq k =
let exception ExitTakeWhile in
try
seq (fun x ->
if p x then
Expand All @@ -668,8 +663,6 @@ let take_while p seq k =
raise_notrace ExitTakeWhile)
with ExitTakeWhile -> ()

exception ExitFoldWhile

let map_while f seq k =
let exception ExitMapWhile in
let consume x =
Expand All @@ -683,6 +676,7 @@ let map_while f seq k =
try seq consume with ExitMapWhile -> ()

let fold_while f s seq =
let exception ExitFoldWhile in
let state = ref s in
let consume x =
let acc, cont = f !state x in
Expand Down Expand Up @@ -721,28 +715,25 @@ let rev seq =
let l = MList.of_iter seq in
fun k -> MList.iter_rev k l

exception ExitForall

let for_all p seq =
let exception ExitForall in
try
seq (fun x -> if not (p x) then raise_notrace ExitForall);
true
with ExitForall -> false

exception ExitExists

(** Exists there some element satisfying the predicate? *)
let exists p seq =
let exception ExitExists in
try
seq (fun x -> if p x then raise_notrace ExitExists);
false
with ExitExists -> true

let mem ?(eq = ( = )) x seq = exists (eq x) seq

exception ExitFind

let find_map f seq =
let exception ExitFind in
let r = ref None in
(try
seq (fun x ->
Expand All @@ -757,6 +748,7 @@ let find_map f seq =
let find = find_map

let find_mapi f seq =
let exception ExitFind in
let i = ref 0 in
let r = ref None in
(try
Expand Down Expand Up @@ -790,9 +782,8 @@ let[@inline] length seq =
seq (fun _ -> incr r);
!r

exception ExitIsEmpty

let is_empty seq =
let exception ExitIsEmpty in
try
seq (fun _ -> raise_notrace ExitIsEmpty);
true
Expand Down
Loading