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

rollup merge of #19430: pczarn/interp_tt-cleanup

Browse Source 
Conflicts:
	src/libsyntax/parse/parser.rs
This commit is contained in:
Alex Crichton
2015-01-06 15:38:10 -08:00
parent 771fe9026a d85c017f92
commit 0631b466c2
12 changed files with 170 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsyntax/ast.rs
View File

@@ -880,7 +880,6 @@ impl TokenTree {
pub fn len(&self) -> uint {
match *self {
TtToken(_, token::DocComment(_)) => 2,
TtToken(_, token::SubstNt(..)) => 2,
TtToken(_, token::SpecialVarNt(..)) => 2,
TtToken(_, token::MatchNt(..)) => 3,
TtDelimited(_, ref delimed) => {
@@ -918,11 +917,6 @@ impl TokenTree {
}
delimed.tts[index - 1].clone()
}
(&TtToken(sp, token::SubstNt(name, name_st)), _) => {
let v = [TtToken(sp, token::Dollar),
TtToken(sp, token::Ident(name, name_st))];
v[index]
}
(&TtToken(sp, token::SpecialVarNt(var)), _) => {
let v = [TtToken(sp, token::Dollar),
TtToken(sp, token::Ident(token::str_to_ident(var.as_str()),