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

wip: fix(vec): release elements after their removal

Browse source 
see #235
This commit is contained in:
Simon Cruanes 2018-11-07 12:30:15 -06:00
parent 4c5010d381
commit b21ca4e0d8
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/CCVector.ml
View file

@ -324,8 +324,10 @@ exception Empty
let pop_exn v = let pop_exn v =
if v.size = 0 then raise Empty; if v.size = 0 then raise Empty;
v.size <- v.size - 1; let new_size = v.size - 1 in
let x = v.vec.(v.size) in v.size <- new_size;
let x = v.vec.(new_size) in
if new_size > 0 then v.vec.(new_size) <- v.vec.(0); (* free last element *)
x x
let pop v = let pop v =
@ -374,7 +376,14 @@ let copy v = {
*) *)
let shrink v n = let shrink v n =
if n < v.size then v.size <- n let old_size = v.size in
if n < old_size then (
v.size <- n;
if n > 0 then (
(* free elements by erasing them *)
Array.fill v.vec n (old_size-n) v.vec.(0);
)
)
(*$R (*$R
let v = of_seq Sequence.(1 -- 10) in let v = of_seq Sequence.(1 -- 10) in
@ -501,6 +510,8 @@ let map_in_place f v =
to_list v = List.map f l) to_list v = List.map f l)
*) *)
(* TODO: free elements *)
let filter' p v = let filter' p v =
let i = ref 0 in (* cur element *) let i = ref 0 in (* cur element *)
let j = ref 0 in (* cur insertion point *) let j = ref 0 in (* cur insertion point *)
@ -656,6 +667,7 @@ let filter_map f v =
to_list (filter_map f v) = CCList.filter_map f l) to_list (filter_map f v) = CCList.filter_map f l)
*) *)
(* TODO: free elements *)
let filter_map_in_place f v = let filter_map_in_place f v =
let i = ref 0 in (* cur element *) let i = ref 0 in (* cur element *)
let j = ref 0 in (* cur insertion point *) let j = ref 0 in (* cur insertion point *)