From e9c12ab1d019b42e5427e31bfa49f1f799e84165 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Mon, 9 May 2011 12:40:09 +0200 Subject: Rewrite comp/middle/resolve.rs * Cleans up the algorithm * Move first pass to walk (second still folds) * Support part of a type/value namespace split (crate metadata and module indices still need to be taught about this) * Remove a few blatant inefficiencies (import tables being recreated for every lookup, most importantly) --- src/comp/front/ast.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/comp/front/ast.rs') diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs index fc2c04f4..71d187ff 100644 --- a/src/comp/front/ast.rs +++ b/src/comp/front/ast.rs @@ -403,7 +403,7 @@ type variant = spanned[variant_]; type view_item = spanned[view_item_]; tag view_item_ { view_item_use(ident, vec[@meta_item], def_id, Option.t[int]); - view_item_import(ident, vec[ident], def_id, Option.t[def]); + view_item_import(ident, vec[ident], def_id); view_item_export(ident); } @@ -432,7 +432,7 @@ fn index_view_item(mod_index index, @view_item it) { case(ast.view_item_use(?id, _, _, _)) { index.insert(id, ast.mie_view_item(it)); } - case(ast.view_item_import(?def_ident,_,_,_)) { + case(ast.view_item_import(?def_ident,_,_)) { index.insert(def_ident, ast.mie_view_item(it)); } case(ast.view_item_export(_)) { @@ -488,7 +488,7 @@ fn index_native_item(native_mod_index index, @native_item it) { fn index_native_view_item(native_mod_index index, @view_item it) { alt (it.node) { - case(ast.view_item_import(?def_ident,_,_,_)) { + case(ast.view_item_import(?def_ident,_,_)) { index.insert(def_ident, ast.nmie_view_item(it)); } case(ast.view_item_export(_)) { -- cgit v1.2.3