rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustc: Use linked lists instead of hash tables for region binding scopes

Browse Source 
Hash tables are overkill.
This commit is contained in:
Patrick Walton
2012-03-12 18:47:18 -07:00
parent 4571175568
commit afa046a56b
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/rustc/middle/region.rs
View File

@@ -8,6 +8,8 @@ import middle::ty;
import syntax::{ast, visit}; import syntax::{ast, visit};
import util::common::new_def_hash; import util::common::new_def_hash;
import std::list;
import std::list::list;
import std::map; import std::map;
import std::map::hashmap; import std::map::hashmap;
@@ -19,6 +21,12 @@ enum parent {
pa_crate pa_crate
} }
/* Records the binding site of a region name. */
type binding = {
name: str,
id: ast::def_id
};
type region_map = { type region_map = {
/* /*
* Mapping from blocks and function expression to their parent block or * Mapping from blocks and function expression to their parent block or
@@ -37,7 +45,7 @@ type ctxt = {
sess: session, sess: session,
def_map: resolve::def_map, def_map: resolve::def_map,
region_map: @region_map, region_map: @region_map,
names_in_scope: hashmap<str,ast::def_id>, mut bindings: @list<binding>,
/* /*
* A list of local IDs that will be parented to the next block we * A list of local IDs that will be parented to the next block we
@@ -106,12 +114,14 @@ fn resolve_ty(ty: @ast::ty, cx: ctxt, visitor: visit::vt<ctxt>) {
ast::re_named(ident) { ast::re_named(ident) {
// If at item scope, introduce or reuse a binding. If at // If at item scope, introduce or reuse a binding. If at
// block scope, require that the binding be introduced. // block scope, require that the binding be introduced.
alt cx.names_in_scope.find(ident) { let bindings = cx.bindings;
some(def_id) { region = ty::re_named(def_id); } alt list::find(*bindings, {|b| ident == b.name}) {
some(binding) { region = ty::re_named(binding.id); }
none { none {
let def_id = {crate: ast::local_crate, let def_id = {crate: ast::local_crate,
node: region_id}; node: region_id};
cx.names_in_scope.insert(ident, def_id); let binding = {name: ident, id: def_id};
cx.bindings = @list::cons(binding, cx.bindings);
region = ty::re_named(def_id); region = ty::re_named(def_id);
alt cx.parent { alt cx.parent {
@@ -248,7 +258,7 @@ fn resolve_expr(expr: @ast::expr, cx: ctxt, visitor: visit::vt<ctxt>) {
fn resolve_item(item: @ast::item, cx: ctxt, visitor: visit::vt<ctxt>) { fn resolve_item(item: @ast::item, cx: ctxt, visitor: visit::vt<ctxt>) {
// Items create a new outer block scope as far as we're concerned. // Items create a new outer block scope as far as we're concerned.
let new_cx: ctxt = {names_in_scope: map::new_str_hash(), let new_cx: ctxt = {bindings: @list::nil,
parent: pa_item(item.id), parent: pa_item(item.id),
in_alt: false in_alt: false
with cx}; with cx};
@@ -263,7 +273,7 @@ fn resolve_crate(sess: session, def_map: resolve::def_map, crate: @ast::crate)
ast_type_to_region: map::new_int_hash(), ast_type_to_region: map::new_int_hash(),
local_blocks: map::new_int_hash(), local_blocks: map::new_int_hash(),
region_name_to_fn: new_def_hash()}, region_name_to_fn: new_def_hash()},
names_in_scope: map::new_str_hash(), mut bindings: @list::nil,
mut queued_locals: [], mut queued_locals: [],
parent: pa_crate, parent: pa_crate,
in_alt: false}; in_alt: false};