bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge branch 'master' of git@github.com:graydon/rust

Browse source
This commit is contained in:
Graydon Hoare 2010-08-03 19:02:09 -07:00
commit 22c0776247
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/map.rs
View file

@ -13,7 +13,7 @@ type hashfn[K] = fn(&K) -> uint;
type eqfn[K] = fn(&K, &K) -> bool; type eqfn[K] = fn(&K, &K) -> bool;
type hashmap[K, V] = obj { type hashmap[K, V] = obj {
fn insert(&K key, &V val); fn insert(&K key, &V val) -> bool;
fn contains_key(&K key) -> bool; fn contains_key(&K key) -> bool;
fn get(&K key) -> V; fn get(&K key) -> V;
fn find(&K key) -> util.option[V]; fn find(&K key) -> util.option[V];
@ -80,6 +80,7 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
alt (bkts.(j)) { alt (bkts.(j)) {
case (some[K, V](k, _)) { case (some[K, V](k, _)) {
if (eqer(key, k)) { if (eqer(key, k)) {
bkts.(j) = some[K, V](k, val);
ret false; ret false;
} }
i += 1u; i += 1u;
@ -143,7 +144,7 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
mutable uint nelts, mutable uint nelts,
util.rational lf) util.rational lf)
{ {
fn insert(&K key, &V val) { fn insert(&K key, &V val) -> bool {
let util.rational load = rec(num=(nelts + 1u) as int, den=nbkts as int); let util.rational load = rec(num=(nelts + 1u) as int, den=nbkts as int);
if (!util.rational_leq(load, lf)) { if (!util.rational_leq(load, lf)) {
let uint nnewbkts = _int.next_power_of_two(nbkts + 1u); let uint nnewbkts = _int.next_power_of_two(nbkts + 1u);
@ -154,8 +155,11 @@ fn mk_hashmap[K, V](&hashfn[K] hasher, &eqfn[K] eqer) -> hashmap[K, V] {
let vec[mutable bucket[K, V]] newbkts = make_buckets[K, V](nnewbkts); let vec[mutable bucket[K, V]] newbkts = make_buckets[K, V](nnewbkts);
rehash[K, V](hasher, eqer, bkts, nbkts, newbkts, nnewbkts); rehash[K, V](hasher, eqer, bkts, nbkts, newbkts, nnewbkts);
} }
insert_common[K, V](hasher, eqer, bkts, nbkts, key, val); if (insert_common[K, V](hasher, eqer, bkts, nbkts, key, val)) {
nelts += 1u; nelts += 1u;
ret true;
}
ret false;
} }
fn contains_key(&K key) -> bool { fn contains_key(&K key) -> bool {