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: use the proper array module in CCRingBuffer

Browse source
This commit is contained in:
Simon Cruanes 2015-06-23 15:01:04 +02:00
parent 56d53bfef6
commit 48aba9e49e
1 changed files with 56 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
src/data/CCRingBuffer.ml
View file

@ -203,8 +203,8 @@ module type S = sig
@since 0.11 *) @since 0.11 *)
end end
module MakeFromArray(Array:Array.S) = struct module MakeFromArray(A:Array.S) = struct
module Array = Array module Array = A
type t = { type t = {
mutable start : int; mutable start : int;
@ -221,11 +221,11 @@ module MakeFromArray(Array:Array.S) = struct
stop=0; stop=0;
bounded; bounded;
size; size;
buf = Array.empty buf = A.empty
} }
let copy b = let copy b =
{ b with buf=Array.copy b.buf; } { b with buf=A.copy b.buf; }
(*$Q (*$Q
Q.printable_string (fun s -> \ Q.printable_string (fun s -> \
@ -244,7 +244,7 @@ module MakeFromArray(Array:Array.S) = struct
*) *)
let capacity b = let capacity b =
let len = Array.length b.buf in let len = A.length b.buf in
match len with 0 -> 0 | l -> l - 1 match len with 0 -> 0 | l -> l - 1
(*$Q (*$Q
@ -283,7 +283,7 @@ module MakeFromArray(Array:Array.S) = struct
let length b = let length b =
if b.stop >= b.start if b.stop >= b.start
then b.stop - b.start then b.stop - b.start
else (Array.length b.buf - b.start) + b.stop else (A.length b.buf - b.start) + b.stop
(*$Q (*$Q
(Q.pair Q.small_int Q.printable_string) (fun (i, s) -> \ (Q.pair Q.small_int Q.printable_string) (fun (i, s) -> \
@ -305,16 +305,16 @@ module MakeFromArray(Array:Array.S) = struct
(* resize [b] so that inner capacity is [cap] *) (* resize [b] so that inner capacity is [cap] *)
let resize b cap elem = let resize b cap elem =
assert (cap >= Array.length b.buf); assert (cap >= A.length b.buf);
let buf' = Array.make cap elem in let buf' = A.make cap elem in
(* copy into buf' *) (* copy into buf' *)
if b.stop >= b.start if b.stop >= b.start
then then
Array.blit b.buf b.start buf' 0 (b.stop - b.start) A.blit b.buf b.start buf' 0 (b.stop - b.start)
else begin else begin
let len_end = Array.length b.buf - b.start in let len_end = A.length b.buf - b.start in
Array.blit b.buf b.start buf' 0 len_end; A.blit b.buf b.start buf' 0 len_end;
Array.blit b.buf 0 buf' len_end b.stop; A.blit b.buf 0 buf' len_end b.stop;
end; end;
b.buf <- buf' b.buf <- buf'
@ -323,48 +323,49 @@ module MakeFromArray(Array:Array.S) = struct
(* resize if needed, with a constant to amortize *) (* resize if needed, with a constant to amortize *)
if cap < len then ( if cap < len then (
let new_size = let new_size =
let desired = Array.length b.buf + len + 24 in let desired = A.length b.buf + len + 24 in
min (b.size+1) desired in min (b.size+1) desired in
resize b new_size from_buf.(0); resize b new_size (A.get from_buf 0);
let good = capacity b = b.size || capacity b - length b >= len in let good = capacity b = b.size || capacity b - length b >= len in
assert good; assert good;
); );
let sub = Array.sub from_buf o len in let sub = A.sub from_buf o len in
let iter x = let iter x =
let capacity = Array.length b.buf in let capacity = A.length b.buf in
Array.set b.buf b.stop x; A.set b.buf b.stop x;
if b.stop = capacity-1 then b.stop <- 0 else b.stop <- b.stop + 1; if b.stop = capacity-1 then b.stop <- 0 else b.stop <- b.stop + 1;
if b.start = b.stop then if b.start = b.stop then
if b.start = capacity-1 then b.start <- 0 else b.start <- b.start + 1 if b.start = capacity-1 then b.start <- 0 else b.start <- b.start + 1
in in
Array.iter iter sub A.iter iter sub
let blit_from_unbounded b from_buf o len = let blit_from_unbounded b from_buf o len =
let cap = capacity b - length b in let cap = capacity b - length b in
(* resize if needed, with a constant to amortize *) (* resize if needed, with a constant to amortize *)
if cap < len then resize b (max (b.size+1) (Array.length b.buf + len + 24)) from_buf.(0); if cap < len
then resize b (max (b.size+1) (A.length b.buf + len + 24)) (A.get from_buf 0);
let good = capacity b - length b >= len in let good = capacity b - length b >= len in
assert good; assert good;
if b.stop >= b.start if b.stop >= b.start
then (* [_______ start xxxxxxxxx stop ______] *) then (* [_______ start xxxxxxxxx stop ______] *)
let len_end = Array.length b.buf - b.stop in let len_end = A.length b.buf - b.stop in
if len_end >= len if len_end >= len
then (Array.blit from_buf o b.buf b.stop len; then (A.blit from_buf o b.buf b.stop len;
b.stop <- b.stop + len) b.stop <- b.stop + len)
else (Array.blit from_buf o b.buf b.stop len_end; else (A.blit from_buf o b.buf b.stop len_end;
Array.blit from_buf (o+len_end) b.buf 0 (len-len_end); A.blit from_buf (o+len_end) b.buf 0 (len-len_end);
b.stop <- len-len_end) b.stop <- len-len_end)
else begin (* [xxxxx stop ____________ start xxxxxx] *) else begin (* [xxxxx stop ____________ start xxxxxx] *)
let len_middle = b.start - b.stop in let len_middle = b.start - b.stop in
assert (len_middle >= len); assert (len_middle >= len);
Array.blit from_buf o b.buf b.stop len; A.blit from_buf o b.buf b.stop len;
b.stop <- b.stop + len b.stop <- b.stop + len
end; end;
() ()
let blit_from b from_buf o len = let blit_from b from_buf o len =
if Array.length from_buf = 0 then () else if A.length from_buf = 0 then () else
if b.bounded then if b.bounded then
blit_from_bounded b from_buf o len blit_from_bounded b from_buf o len
else else
@ -389,21 +390,21 @@ module MakeFromArray(Array:Array.S) = struct
let blit_into b to_buf o len = let blit_into b to_buf o len =
if o+len > Array.length to_buf if o+len > A.length to_buf
then invalid_arg "RingBuffer.blit_into"; then invalid_arg "RingBuffer.blit_into";
if b.stop >= b.start if b.stop >= b.start
then then
let n = min (b.stop - b.start) len in let n = min (b.stop - b.start) len in
let _ = Array.blit b.buf b.start to_buf o n in let _ = A.blit b.buf b.start to_buf o n in
n n
else begin else begin
let len_end = Array.length b.buf - b.start in let len_end = A.length b.buf - b.start in
Array.blit b.buf b.start to_buf o (min len_end len); A.blit b.buf b.start to_buf o (min len_end len);
if len_end >= len if len_end >= len
then len (* done *) then len (* done *)
else begin else begin
let n = min b.stop (len - len_end) in let n = min b.stop (len - len_end) in
Array.blit b.buf 0 to_buf (o+len_end) n; A.blit b.buf 0 to_buf (o+len_end) n;
n + len_end n + len_end
end end
end end
@ -434,7 +435,7 @@ module MakeFromArray(Array:Array.S) = struct
let reset b = let reset b =
clear b; clear b;
b.buf <- Array.empty b.buf <- A.empty
(*$Q (*$Q
Q.printable_string (fun s -> \ Q.printable_string (fun s -> \
@ -459,8 +460,8 @@ module MakeFromArray(Array:Array.S) = struct
let take_front_exn b = let take_front_exn b =
if b.start = b.stop then raise Empty; if b.start = b.stop then raise Empty;
let c = b.buf.(b.start) in let c = A.get b.buf b.start in
if b.start + 1 = Array.length b.buf if b.start + 1 = A.length b.buf
then b.start <- 0 then b.start <- 0
else b.start <- b.start + 1; else b.start <- b.start + 1;
c c
@ -479,9 +480,9 @@ module MakeFromArray(Array:Array.S) = struct
let take_back_exn b = let take_back_exn b =
if b.start = b.stop then raise Empty; if b.start = b.stop then raise Empty;
if b.stop - 1 = 0 if b.stop - 1 = 0
then b.stop <- Array.length b.buf - 1 then b.stop <- A.length b.buf - 1
else b.stop <- b.stop - 1; else b.stop <- b.stop - 1;
b.buf.(b.stop) A.get b.buf b.stop
let take_back b = try Some (take_back_exn b) with Empty -> None let take_back b = try Some (take_back_exn b) with Empty -> None
@ -496,7 +497,7 @@ module MakeFromArray(Array:Array.S) = struct
let junk_front b = let junk_front b =
if b.start = b.stop then raise Empty; if b.start = b.stop then raise Empty;
if b.start + 1 = Array.length b.buf if b.start + 1 = A.length b.buf
then b.start <- 0 then b.start <- 0
else b.start <- b.start + 1 else b.start <- b.start + 1
@ -512,7 +513,7 @@ module MakeFromArray(Array:Array.S) = struct
let junk_back b = let junk_back b =
if b.start = b.stop then raise Empty; if b.start = b.stop then raise Empty;
if b.stop = 0 if b.stop = 0
then b.stop <- Array.length b.buf - 1 then b.stop <- A.length b.buf - 1
else b.stop <- b.stop - 1 else b.stop <- b.stop - 1
(*$Q (*$Q
@ -530,7 +531,7 @@ module MakeFromArray(Array:Array.S) = struct
if b.stop >= b.start if b.stop >= b.start
then b.start <- b.start + len then b.start <- b.start + len
else else
let len_end = Array.length b.buf - b.start in let len_end = A.length b.buf - b.start in
if len > len_end if len > len_end
then b.start <- len-len_end (* wrap to the beginning *) then b.start <- len-len_end (* wrap to the beginning *)
else b.start <- b.start + len else b.start <- b.start + len
@ -547,18 +548,18 @@ module MakeFromArray(Array:Array.S) = struct
let iter b ~f = let iter b ~f =
if b.stop >= b.start if b.stop >= b.start
then for i = b.start to b.stop - 1 do f b.buf.(i) done then for i = b.start to b.stop - 1 do f (A.get b.buf i) done
else ( else (
for i = b.start to Array.length b.buf -1 do f b.buf.(i) done; for i = b.start to A.length b.buf -1 do f (A.get b.buf i) done;
for i = 0 to b.stop - 1 do f b.buf.(i) done; for i = 0 to b.stop - 1 do f (A.get b.buf i) done;
) )
let iteri b ~f = let iteri b ~f =
if b.stop >= b.start if b.stop >= b.start
then for i = b.start to b.stop - 1 do f i b.buf.(i) done then for i = b.start to b.stop - 1 do f i (A.get b.buf i) done
else ( else (
for i = b.start to Array.length b.buf -1 do f i b.buf.(i) done; for i = b.start to A.length b.buf -1 do f i (A.get b.buf i) done;
for i = 0 to b.stop - 1 do f i b.buf.(i) done; for i = 0 to b.stop - 1 do f i (A.get b.buf i) done;
) )
(*$Q (*$Q
@ -575,14 +576,14 @@ module MakeFromArray(Array:Array.S) = struct
then then
if i >= b.stop - b.start if i >= b.stop - b.start
then invalid_arg ("CCRingBuffer.get:" ^ string_of_int i) then invalid_arg ("CCRingBuffer.get:" ^ string_of_int i)
else b.buf.(b.start + i) else A.get b.buf (b.start + i)
else else
let len_end = Array.length b.buf - b.start in let len_end = A.length b.buf - b.start in
if i < len_end if i < len_end
then b.buf.(b.start + i) then A.get b.buf (b.start + i)
else if i - len_end > b.stop else if i - len_end > b.stop
then invalid_arg ("CCRingBuffer.get: " ^ string_of_int i) then invalid_arg ("CCRingBuffer.get: " ^ string_of_int i)
else b.buf.(i - len_end) else A.get b.buf (i - len_end)
let get_front b i = let get_front b i =
if is_empty b then if is_empty b then
@ -638,7 +639,7 @@ module MakeFromArray(Array:Array.S) = struct
explode s = l) explode s = l)
*) *)
let push_back b e = blit_from b (Array.make 1 e) 0 1 let push_back b e = blit_from b (A.make 1 e) 0 1
(*$Q (*$Q
Q.printable_string (fun s -> \ Q.printable_string (fun s -> \
@ -655,7 +656,7 @@ module MakeFromArray(Array:Array.S) = struct
let peek_front b = let peek_front b =
if is_empty b then raise Empty if is_empty b then raise Empty
else Array.get b.buf b.start else A.get b.buf b.start
(*$Q (*$Q
Q.printable_string (fun s -> \ Q.printable_string (fun s -> \
@ -668,7 +669,7 @@ module MakeFromArray(Array:Array.S) = struct
let peek_back b = if is_empty b let peek_back b = if is_empty b
then raise Empty then raise Empty
else Array.get b.buf else A.get b.buf
(if b.stop = 0 then capacity b - 1 else b.stop-1) (if b.stop = 0 then capacity b - 1 else b.stop-1)
(*$Q (*$Q
@ -681,14 +682,14 @@ module MakeFromArray(Array:Array.S) = struct
*) *)
let of_array a = let of_array a =
let b = create (max (Array.length a) 16) in let b = create (max (A.length a) 16) in
blit_from b a 0 (Array.length a); blit_from b a 0 (A.length a);
b b
let to_array b = let to_array b =
if is_empty b then Array.empty if is_empty b then A.empty
else ( else (
let a = Array.make (length b) (peek_front b) in let a = A.make (length b) (peek_front b) in
let n = blit_into b a 0 (length b) in let n = blit_into b a 0 (length b) in
assert (n = length b); assert (n = length b);
a a