1
Fork 0

rename resolve to mtwt_resolve

This commit is contained in:
John Clements 2013-07-09 14:09:30 -07:00
parent acad9f35b3
commit e1734f6d38
2 changed files with 3 additions and 4 deletions

View file

@ -915,7 +915,7 @@ fn idx_push<T>(vec: &mut ~[T], val: T) -> uint {
} }
/// Resolve a syntax object to a name, per MTWT. /// Resolve a syntax object to a name, per MTWT.
pub fn resolve(id : Ident) -> Name { pub fn mtwt_resolve(id : Ident) -> Name {
resolve_internal(id, get_sctable()) resolve_internal(id, get_sctable())
} }

View file

@ -12,7 +12,7 @@ use ast::{Block, Crate, NodeId, Expr_, ExprMac, Ident, mac_invoc_tt};
use ast::{item_mac, Stmt_, StmtMac, StmtExpr, StmtSemi}; use ast::{item_mac, Stmt_, StmtMac, StmtExpr, StmtSemi};
use ast::{ILLEGAL_CTXT}; use ast::{ILLEGAL_CTXT};
use ast; use ast;
use ast_util::{new_rename, new_mark, resolve}; use ast_util::{new_rename, new_mark, mtwt_resolve};
use attr; use attr;
use attr::AttrMetaMethods; use attr::AttrMetaMethods;
use codemap; use codemap;
@ -1218,12 +1218,11 @@ pub fn new_ident_resolver() ->
@fn(ast::Ident)->ast::Ident { @fn(ast::Ident)->ast::Ident {
|id : ast::Ident| |id : ast::Ident|
ast::Ident { ast::Ident {
name : resolve(id), name : mtwt_resolve(id),
ctxt : ILLEGAL_CTXT ctxt : ILLEGAL_CTXT
} }
} }
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::*; use super::*;