OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustc: Move the interner over to interior vectors

Browse Source
This commit is contained in:
Patrick Walton 2011-07-01 16:59:03 -07:00
parent 717ac3df77
commit e066bae56e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/comp/middle/ty.rs
View File

@ -378,7 +378,7 @@ fn populate_type_store(&ctxt cx) {
intern(cx, ty_task, none[str]);
intern(cx, ty_type, none[str]);
intern(cx, ty_bot, none[str]);
assert (vec::len(cx.ts.vect) == idx_first_others);
assert (ivec::len(cx.ts.vect) == idx_first_others);
}
fn mk_rcache() -> creader_cache {

12
src/comp/syntax/util/interner.rs
View File

@ -1,7 +1,7 @@
// An "interner" is a data structure that associates values with uint tags and
// allows bidirectional lookup; i.e. given a value, one can easily find the
// type, and vice versa.
import std::vec;
import std::ivec;
import std::map;
import std::map::hashmap;
import std::map::hashfn;
@ -12,24 +12,24 @@ import std::option::some;
type interner[T] =
rec(hashmap[T, uint] map,
mutable vec[T] vect,
mutable T[] vect,
hashfn[T] hasher,
eqfn[T] eqer);
fn mk[T](hashfn[T] hasher, eqfn[T] eqer) -> interner[T] {
auto m = map::mk_hashmap[T, uint](hasher, eqer);
let vec[T] vect = [];
ret rec(map=m, mutable vect=vect, hasher=hasher, eqer=eqer);
ret rec(map=m, mutable vect=~[], hasher=hasher, eqer=eqer);
}
fn intern[T](&interner[T] itr, &T val) -> uint {
alt (itr.map.find(val)) {
case (some(?idx)) { ret idx; }
case (none) {
auto new_idx = vec::len[T](itr.vect);
auto new_idx = ivec::len[T](itr.vect);
itr.map.insert(val, new_idx);
itr.vect += [val];
itr.vect += ~[val];
ret new_idx;
}
}
}
fn get[T](&interner[T] itr, uint idx) -> T { ret itr.vect.(idx); }