diff options
| author | Patrick Walton <[email protected]> | 2010-11-03 15:53:53 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2010-11-03 15:54:46 -0700 |
| commit | a3d666bfdf3ef87a91eace7b533e433945b06d76 (patch) | |
| tree | f8bffa03b37a27dead809b9e00aec3eba733ae8a /src/comp/middle/resolve.rs | |
| parent | Fix documentation: it's (&str s) not (str &s). (diff) | |
| download | rust-a3d666bfdf3ef87a91eace7b533e433945b06d76.tar.xz rust-a3d666bfdf3ef87a91eace7b533e433945b06d76.zip | |
rustc: Use an extensible annotation field instead of putting option[@ty] everywhere
Diffstat (limited to 'src/comp/middle/resolve.rs')
| -rw-r--r-- | src/comp/middle/resolve.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index 31aca9cc..5741bac4 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -1,6 +1,7 @@ import front.ast; import front.ast.ident; import front.ast.def; +import front.ast.ann; import driver.session; import util.common.span; import std.map.hashmap; @@ -102,7 +103,7 @@ fn lookup_name(&env e, ast.ident i) -> option[def] { } fn fold_expr_name(&env e, &span sp, &ast.name n, - &option[def] d, option[@ast.ty] t) -> @ast.expr { + &option[def] d, ann a) -> @ast.expr { auto d_ = lookup_name(e, n.node.ident); @@ -115,7 +116,7 @@ fn fold_expr_name(&env e, &span sp, &ast.name n, } } - ret @fold.respan[ast.expr_](sp, ast.expr_name(n, d_, t)); + ret @fold.respan[ast.expr_](sp, ast.expr_name(n, d_, a)); } fn update_env_for_crate(&env e, @ast.crate c) -> env { |