simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-09 12:45:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

applye reviews, fix bug, add test

Browse source
This commit is contained in:
Dario Pinto 2021-10-21 12:58:08 +02:00
parent 4114f1a7e4
commit 2a6259e5ec
1 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/core/CCVector.ml
View file

@ -202,11 +202,14 @@ let push v x =
*) *)
let resize_with v f size = let resize_with v f size =
if size > Sys.max_array_length then let new_vec =
invalid_arg "vec.resize_with: size too big" if size >= Array.length v.vec then
else if size > Array.length v.vec then
let new_vec = Array.make size (f 0) in let new_vec = Array.make size (f 0) in
Array.blit v.vec 0 new_vec 0 (v.size - 1); Array.blit v.vec 0 new_vec 0 (v.size - 1);
new_vec
else
v.vec
in
for i = v.size to size - 1 do for i = v.size to size - 1 do
Array.unsafe_set new_vec i (f i) Array.unsafe_set new_vec i (f i)
done; done;
@ -214,31 +217,37 @@ let resize_with v f size =
v.size <- size v.size <- size
(*$T (*$T
let v = make 1 0 in to_list (resize_with v (fun i -> i) 5) = [0;1;2;3;4] let v = make 1 0 in resize_with v (fun i -> i) 5; to_list v = [0;1;2;3;4]
let v = make 1 0 in length (resize_with v (fun i -> i) 5) = 5 let v = make 1 0 in resize_with v (fun i -> i) 5; CCList.length (to_list v) = 5
let v = create_with ~capacity:2 0 in resize_with v (fun i -> i) 5; to_list v = [0;1;2;3;4]
let v = make 5 0 in to_list (resize_with v (fun i -> i) 5) = [0;0;0;0;0] let v = make 5 0 in resize_with v (fun i -> i) 5; to_list v = [0;0;0;0;0]
let v = make 5 0 in to_list (resize_with v (fun i -> i) 6) = [0;0;0;0;0;6] let v = make 5 0 in resize_with v (fun i -> i) 6; to_list v = [0;0;0;0;0;6]
let v = make 5 0 in to_list (resize_with v (fun i -> i) -1) = [0;0;0;0;0] let v = make 5 0 in resize_with v (fun i -> i) 4; to_list v = [0;0;0;0;0]
let v = make 5 0 in length (resize_with v (fun i -> i) 5) = 5 let v = make 5 0 in resize_with v (fun i -> i) 5; CCList.length (to_list v) = 5
*) *)
let resize_with_init v ~init size = let resize_with_init v ~init size =
if size > Sys.max_array_length then let new_vec =
invalid_arg "vec.resize_with_init: size too big" if size >= Array.length v.vec then
else if size > Array.length v.vec then
let new_vec = Array.make size init in let new_vec = Array.make size init in
Array.blit v.vec 0 new_vec 0 (v.size - 1); Array.blit v.vec 0 new_vec 0 (v.size - 1);
new_vec
else
v.vec
in
for i = v.size to size - 1 do
Array.unsafe_set new_vec i init
done;
v.vec <- new_vec; v.vec <- new_vec;
v.size <- size v.size <- size
(*$T (*$T
let v = make 1 0 in to_list (resize_with_init v ~init:1 5) = [1;1;1;1;1] let v = make 1 0 in resize_with_init v ~init:1 5; to_list v = [1;1;1;1;1]
let v = make 1 0 in length (resize_with_init v ~init:1 5) = 5 let v = make 1 0 in resize_with_init v ~init:1 5; CCList.length (to_list v) = 5
let v = create_with ~capacity:2 0 in resize_with v ~init:1 5; to_list v = [1;1;1;1;1]
let v = make 5 0 in to_list (resize_with_init v ~init:1 5) = [1;1;1;1;1] let v = make 5 0 in resize_with_init v ~init:1 5; to_list v = [1;1;1;1;1]
let v = make 5 0 in to_list (resize_with_init v ~init:1 -1) = [1;1;1;1;1] let v = make 5 0 in resize_with_init v ~init:1 4; to_list v = [1;1;1;1;1]
let v = make 5 0 in length (resize_with_init v ~init:1 5) = 5 let v = make 5 0 in resize_with_init v ~init:1 5; CCList.length (to_list v) = 5
*) *)
(** Add all elements of b to a *) (** Add all elements of b to a *)