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

raise Inv_arg, change semantics of vec.resize_with/with_init

Browse source
This commit is contained in:
Dario Pinto 2021-10-20 16:55:18 +02:00
parent 04ab484d64
commit 69a6d42abe
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/core/CCVector.ml
View file

@ -203,14 +203,13 @@ let push v x =
let resize_with v f size = let resize_with v f size =
if size > Sys.max_array_length then if size > Sys.max_array_length then
failwith "vec.resize_with: size too big" raise (Invalid_argument "vec.resize_with: size too big")
else if size <= Array.length v.vec then else if size <= Array.length v.vec then
for i = 0 to v.size - 1 do ()
Array.unsafe_set v.vec i (f i)
done
else else
let new_vec = Array.make size (f 0) in let new_vec = Array.make size (f 0) in
for i = 0 to size - 1 do Array.blit v.vec 0 new_vec 0 (v.size - 1);
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;
v.vec <- new_vec; v.vec <- new_vec;
@ -221,20 +220,21 @@ let resize_with v f size =
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 to_list (resize_with v (fun i -> i) 5) = [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 length (resize_with v (fun i -> i) 5) = 5
let v = make 5 0 in to_list (resize_with v (fun i -> i) 5) = [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 to_list (resize_with v (fun i -> i) -1) = [0;1;2;3;4] 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 to_list (resize_with v (fun i -> i) -1) = [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 length (resize_with v (fun i -> i) 5) = 5
*) *)
let resize_with_init v ~init size = let resize_with_init v ~init size =
if size > Sys.max_array_length then if size > Sys.max_array_length then
failwith "vec.resize_with_init: size too big" raise (Invalid_argument "vec.resize_with_init: size too big")
else if size <= Array.length v.vec then else if size <= Array.length v.vec then
for i = 0 to v.size - 1 do ()
Array.unsafe_set v.vec i init
done
else else
v.vec <- Array.make size init; let new_vec = Array.make size init in
Array.blit v.vec 0 new_vec 0 (v.size - 1);
v.vec <- new_vec;
v.size <- size; v.size <- size;
() ()

16
src/core/CCVector.mli
View file

@ -81,16 +81,20 @@ val push : ('a, rw) t -> 'a -> unit
val resize_with : ('a, rw) t -> (int -> 'a) -> int -> unit val resize_with : ('a, rw) t -> (int -> 'a) -> int -> unit
(** [resize_with vec f size] resizes vector [vec] up to [size], fills vector (** [resize_with vec f size] resizes vector [vec] up to [size], fills vector
with calls to [f] on indexes [[0.. size - 1]]. with calls to [f] on indexes [[vec.size-1.. size - 1]].
The contents of [vec] are merely overwritten with calls to [f] if [size] The contents and size of vec are untouched if [size] is inferior or equal
is inferior or equal to the current size of [vec]. to [length vec].
@raise Invalid_argument if the size is too big
@since NEXT_RELEASE *) @since NEXT_RELEASE *)
val resize_with_init : ('a, rw) t -> init:'a -> int -> unit val resize_with_init : ('a, rw) t -> init:'a -> int -> unit
(** [resize_with_init vec init size] resizes vector [vec] up to [size], (** [resize_with_init vec init size] resizes vector [vec] up to [size],
fills vector with value [init]. fills vector with calls to [init] on indexes [[length vec -1.. size - 1]].
The contents of [vec] are merely overwritten with [init] if [size] The contents and size of vec are untouched if [size] is inferior or equal
is inferior or equal to the current size of [vec]. to [length vec].
@raise Invalid_argument if the size is too big
@since NEXT_RELEASE *) @since NEXT_RELEASE *)
val append : ('a, rw) t -> ('a, _) t -> unit val append : ('a, rw) t -> ('a, _) t -> unit