simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 11:15:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(funvec): error in pop

Browse source 
close #298
This commit is contained in:
Simon Cruanes 2020-04-18 22:10:35 -04:00
parent d34b7588b0
commit 15fb26249f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/data/CCFun_vec.ml
View file

@ -226,10 +226,10 @@ let pop_ i (m:'a t) : 'a * 'a t =
let sub = A.get m.subs x in
let y, sub' = aux l sub in
if is_empty sub' then (
assert (i+1 = A.length m.subs); (* last one *)
assert (x+1 = A.length m.subs); (* last one *)
y, {m with size=m.size-1; subs=A.pop m.subs}
) else (
y, {m with size=m.size-1; subs=A.set ~mut:false m.subs x sub}
y, {m with size=m.size-1; subs=A.set ~mut:false m.subs x sub'}
)
in
aux (split_idx i) m
@ -241,6 +241,15 @@ let pop_exn (v:'a t) : 'a * 'a t =
let pop (v:'a t) : ('a * 'a t) option =
if v.size=0 then None else Some (pop_ (v.size-1) v)
(* regression test for #298 *)
(*$R
let rec consume x = match CCFun_vec.pop x with
| None -> () | Some (_, x) -> consume x
in
consume (of_list (CCList.(1 -- 100)));
()
*)
let iteri ~f (m : 'a t) : unit =
(* basically, a 32-way BFS traversal.
The queue contains subtrees to explore, along with their high_idx_ offsets *)