simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-07 03:35:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #151 from quicquid/ccfqueue-bugfix

Browse source 
bugfix for `CCFQueue.take_back_exn` : wrong exception
This commit is contained in:
Simon Cruanes 2017-09-18 10:43:54 +02:00 • committed by GitHub
commit 9a2dab6802
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/data/CCFQueue.ml
View file

@ -131,6 +131,10 @@ let take_front q =
try Some (take_front_exn q) try Some (take_front_exn q)
with Empty -> None with Empty -> None
(*$T
take_front empty = None
*)
let take_front_l n q = let take_front_l n q =
if n<0 then ( if n<0 then (
invalid_arg "take_back_l: cannot take negative number of arguments" invalid_arg "take_back_l: cannot take negative number of arguments"
@ -161,7 +165,7 @@ let take_front_while p q =
let rec take_back_exn : 'a. 'a t -> 'a t * 'a let rec take_back_exn : 'a. 'a t -> 'a t * 'a
= fun q -> match q with = fun q -> match q with
| Shallow Zero -> invalid_arg "FQueue.take_back_exn" | Shallow Zero -> raise Empty
| Shallow (One x) -> empty, x | Shallow (One x) -> empty, x
| Shallow (Two (x,y)) -> _single x, y | Shallow (Two (x,y)) -> _single x, y
| Shallow (Three (x,y,z)) -> Shallow (Two(x,y)), z | Shallow (Three (x,y,z)) -> Shallow (Two(x,y)), z
@ -185,6 +189,10 @@ let take_back q =
try Some (take_back_exn q) try Some (take_back_exn q)
with Empty -> None with Empty -> None
(*$T
take_back empty = None
*)
let take_back_l n q = let take_back_l n q =
if n<0 then ( if n<0 then (
invalid_arg "take_back_l: cannot take negative number of arguments" invalid_arg "take_back_l: cannot take negative number of arguments"