Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elargissement de la spec de la fonction de hash 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4305 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2002-01-23 17:52:46 +00:00
parent 198b607114
commit 1915402f26
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stdlib/hashtbl.ml
View File

@ -193,12 +193,14 @@ module Make(H: HashedType): (S with type key = H.t) =
let clear = clear
let copy = copy
let safehash key = (H.hash key) land max_int
let add h key info =
let i = (H.hash key) mod (Array.length h.data) in
let i = (safehash key) mod (Array.length h.data) in
let bucket = Cons(key, info, h.data.(i)) in
h.data.(i) <- bucket;
h.size <- succ h.size;
if h.size > Array.length h.data lsl 1 then resize H.hash h
if h.size > Array.length h.data lsl 1 then resize safehash h
let remove h key =
let rec remove_bucket = function
@ -208,7 +210,7 @@ module Make(H: HashedType): (S with type key = H.t) =
if H.equal k key
then begin h.size <- pred h.size; next end
else Cons(k, i, remove_bucket next) in
let i = (H.hash key) mod (Array.length h.data) in
let i = (safehash key) mod (Array.length h.data) in
h.data.(i) <- remove_bucket h.data.(i)
let rec find_rec key = function
@ -218,7 +220,7 @@ module Make(H: HashedType): (S with type key = H.t) =
if H.equal key k then d else find_rec key rest
let find h key =
match h.data.((H.hash key) mod (Array.length h.data)) with
match h.data.((safehash key) mod (Array.length h.data)) with
Empty -> raise Not_found
| Cons(k1, d1, rest1) ->
if H.equal key k1 then d1 else
@ -239,7 +241,7 @@ module Make(H: HashedType): (S with type key = H.t) =
if H.equal k key
then d :: find_in_bucket rest
else find_in_bucket rest in
find_in_bucket h.data.((H.hash key) mod (Array.length h.data))
find_in_bucket h.data.((safehash key) mod (Array.length h.data))
let replace h key info =
let rec replace_bucket = function
@ -249,14 +251,14 @@ module Make(H: HashedType): (S with type key = H.t) =
if H.equal k key
then Cons(k, info, next)
else Cons(k, i, replace_bucket next) in
let i = (H.hash key) mod (Array.length h.data) in
let i = (safehash key) mod (Array.length h.data) in
let l = h.data.(i) in
try
h.data.(i) <- replace_bucket l
with Not_found ->
h.data.(i) <- Cons(key, info, l);
h.size <- succ h.size;
if h.size > Array.length h.data lsl 1 then resize H.hash h
if h.size > Array.length h.data lsl 1 then resize safehash h
let mem h key =
let rec mem_in_bucket = function
@ -264,7 +266,7 @@ module Make(H: HashedType): (S with type key = H.t) =
false
| Cons(k, d, rest) ->
H.equal k key || mem_in_bucket rest in
mem_in_bucket h.data.((H.hash key) mod (Array.length h.data))
mem_in_bucket h.data.((safehash key) mod (Array.length h.data))
let iter = iter
let fold = fold

7
stdlib/hashtbl.mli
View File

@ -97,10 +97,9 @@ module type HashedType =
val equal : t -> t -> bool
(** The equality predicate used to compare keys. *)
val hash : t -> int
(** A hashing function on keys, returning a non-negative
integer. It must be such that if two keys are equal according
to [equal], then they must have identical hash values as computed
by [hash].
(** A hashing function on keys. It must be such that if two keys are
equal according to [equal], then they have identical hash values
as computed by [hash].
Examples: suitable ([equal], [hash]) pairs for arbitrary key
types include
([(=)], {!Hashtbl.hash}) for comparing objects by structure, and