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

refactor so tt_fold only requires an ident->ident fn

Browse Source
This commit is contained in:
John Clements
2013-05-28 15:13:57 -07:00
parent 93337f0daa
commit b7c0512b27
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libsyntax/fold.rs
View File

@@ -118,35 +118,37 @@ fn fold_mac_(m: &mac, fld: @ast_fold) -> mac {
node: match m.node { node: match m.node {
mac_invoc_tt(ref p,ref tts) => mac_invoc_tt(ref p,ref tts) =>
mac_invoc_tt(fld.fold_path(p), mac_invoc_tt(fld.fold_path(p),
fold_tts(*tts,fld)) fold_tts(*tts,|id|{fld.fold_ident(id)}))
}, },
span: fld.new_span(m.span) span: fld.new_span(m.span)
} }
} }
fn fold_tts(tts : &[token_tree], fld: @ast_fold) -> ~[token_tree] { // build a new vector of tts by appling the given function to
// all of the identifiers in the token trees.
pub fn fold_tts(tts : &[token_tree], f: @fn(ident)->ident) -> ~[token_tree] {
do tts.map |tt| { do tts.map |tt| {
match *tt { match *tt {
tt_tok(span, ref tok) => tt_tok(span, ref tok) =>
tt_tok(span,maybe_fold_ident(tok,fld)), tt_tok(span,maybe_fold_ident(tok,f)),
tt_delim(ref tts) => tt_delim(ref tts) =>
tt_delim(@mut fold_tts(**tts, fld)), tt_delim(@mut fold_tts(**tts, f)),
tt_seq(span, ref pattern, ref sep, is_optional) => tt_seq(span, ref pattern, ref sep, is_optional) =>
tt_seq(span, tt_seq(span,
@mut fold_tts(**pattern, fld), @mut fold_tts(**pattern, f),
sep.map(|tok|maybe_fold_ident(tok,fld)), sep.map(|tok|maybe_fold_ident(tok,f)),
is_optional), is_optional),
tt_nonterminal(sp,ref ident) => tt_nonterminal(sp,ref ident) =>
tt_nonterminal(sp,fld.fold_ident(*ident)) tt_nonterminal(sp,f(*ident))
} }
} }
} }
// apply ident folder if it's an ident, otherwise leave it alone // apply ident folder if it's an ident, otherwise leave it alone
fn maybe_fold_ident(t: &token::Token, fld: @ast_fold) -> token::Token { fn maybe_fold_ident(t : &token::Token, f: @fn(ident)->ident) -> token::Token {
match *t { match *t {
token::IDENT(id,followed_by_colons) => token::IDENT(id,followed_by_colons) =>
token::IDENT(fld.fold_ident(id),followed_by_colons), token::IDENT(f(id),followed_by_colons),
_ => (*t).clone() _ => (*t).clone()
} }
} }