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

fixes for pvec

Browse source
This commit is contained in:
Simon Cruanes 2024-01-05 21:54:38 -05:00
parent 209ee3a3ed
commit 66b42ea944
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/pvec/containers_pvec.ml
View file

@ -66,8 +66,6 @@ type 'a t = {
- all leaves in [t] are at depth shift/5 - all leaves in [t] are at depth shift/5
*) *)
(* FIXME: remove *)
let dbg_ = ref (fun _ _ _ -> assert false)
let empty_tree = Empty let empty_tree = Empty
let empty = { t = empty_tree; size = 0; shift = 0; tail = [||] } let empty = { t = empty_tree; size = 0; shift = 0; tail = [||] }
@ -110,9 +108,6 @@ let rec build_new_tail_spine_ shift tail : _ tree =
Node [| build_new_tail_spine_ (shift - num_bits) tail |] Node [| build_new_tail_spine_ (shift - num_bits) tail |]
let rec insert_tail_ (self : _ tree) shift i (tail : _ A.t) : _ tree = let rec insert_tail_ (self : _ tree) shift i (tail : _ A.t) : _ tree =
Format.printf "insert tail shift=%d i=0x%x into %a@." shift i
(!dbg_ Format.pp_print_int)
(Obj.magic self : int tree);
match self with match self with
| Empty -> | Empty ->
if shift = 0 then if shift = 0 then
@ -126,7 +121,6 @@ let rec insert_tail_ (self : _ tree) shift i (tail : _ A.t) : _ tree =
(* would be in the {!build_new_tail_spine_} case *) (* would be in the {!build_new_tail_spine_} case *)
assert (i <> 0); assert (i <> 0);
let idx = (i lsr shift) land bitmask in let idx = (i lsr shift) land bitmask in
Printf.printf "insert tail rec at idx=%d shift=%d i=0x%x\n%!" idx shift i;
let sub, must_push = let sub, must_push =
if idx < A.length a then if idx < A.length a then
A.get a idx, false A.get a idx, false
@ -161,9 +155,6 @@ let[@inline] push (self : _ t) x : _ t =
{ self with tail = A.push self.tail x; size = self.size + 1 } { self with tail = A.push self.tail x; size = self.size + 1 }
let rec pop_tail_from_tree_ (self : _ tree) shift i : 'a A.t * 'a tree = let rec pop_tail_from_tree_ (self : _ tree) shift i : 'a A.t * 'a tree =
Format.printf "pop tail shift=%d i=0x%x from %a@." shift i
(!dbg_ Format.pp_print_int)
(Obj.magic self : int tree);
match self with match self with
| Empty -> assert false | Empty -> assert false
| Leaf tail -> | Leaf tail ->
@ -191,13 +182,14 @@ let[@inline never] move_last_leaf_to_tail (self : _ t) : _ t =
(* back to empty *) (* back to empty *)
empty empty
else ( else (
(* before pop *) (* idx of the beginning of the tail *)
let tail, t = pop_tail_from_tree_ self.t self.shift (self.size - 1) in let idx = self.size - 1 - branching_factor in
let tail, t = pop_tail_from_tree_ self.t self.shift idx in
let t, shift = let t, shift =
match t with match t with
| Node [| t' |] -> | Node [| t' |] ->
(* all indices have 00000 as MSB, remove one level *) (* all indices have 00000 as MSB, remove one level *)
t', self.shift - 1 t', self.shift - num_bits
| _ -> t, self.shift | _ -> t, self.shift
in in
{ tail; size = self.size - 1; shift; t } { tail; size = self.size - 1; shift; t }
@ -363,6 +355,4 @@ module Private_ = struct
"@[<v>pvec {@ size: %d; shift: %d;@ @[<2>tree:@ %a@];@ @[<2>tail:@ \ "@[<v>pvec {@ size: %d; shift: %d;@ @[<2>tree:@ %a@];@ @[<2>tail:@ \
%a@]@]}" %a@]@]}"
self.size self.shift (debugtree ppx) self.t (pp_array ppx) self.tail self.size self.shift (debugtree ppx) self.t (pp_array ppx) self.tail
let () = dbg_ := debugtree
end end