bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "macros: Improve tt fragments"

Browse source 
This reverts commit 41745f30f7.
This commit is contained in:
Jeffrey Seyfried 2016-11-02 22:59:08 +00:00
parent eb3ac29a10
commit 3b71646a60
2 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libsyntax/ext/tt/transcribe.rs
View file

@ -13,7 +13,7 @@ use ast::Ident;
use errors::{Handler, DiagnosticBuilder};
use ext::tt::macro_parser::{NamedMatch, MatchedSeq, MatchedNonterminal};
use parse::token::{DocComment, MatchNt, SubstNt};
use parse::token::{Token, Interpolated, NtIdent, NtTT};
use parse::token::{Token, NtIdent};
use parse::token;
use parse::lexer::TokenAndSpan;
use syntax_pos::{Span, DUMMY_SP};
@ -269,9 +269,9 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
}
// FIXME #2887: think about span stuff here
TokenTree::Token(sp, SubstNt(ident)) => {
r.stack.last_mut().unwrap().idx += 1;
match lookup_cur_matched(r, ident) {
None => {
r.stack.last_mut().unwrap().idx += 1;
r.cur_span = sp;
r.cur_tok = SubstNt(ident);
return ret_val;
@ -283,24 +283,14 @@ pub fn tt_next_token(r: &mut TtReader) -> TokenAndSpan {
// (a) idents can be in lots of places, so it'd be a pain
// (b) we actually can, since it's a token.
NtIdent(ref sn) => {
r.stack.last_mut().unwrap().idx += 1;
r.cur_span = sn.span;
r.cur_tok = token::Ident(sn.node);
return ret_val;
}
NtTT(_) => {
r.stack.push(TtFrame {
forest: TokenTree::Token(sp, Interpolated(nt.clone())),
idx: 0,
dotdotdoted: false,
sep: None,
});
}
_ => {
r.stack.last_mut().unwrap().idx += 1;
// FIXME(pcwalton): Bad copy.
r.cur_span = sp;
r.cur_tok = Interpolated(nt.clone());
r.cur_tok = token::Interpolated(nt.clone());
return ret_val;
}
}

7
src/libsyntax/tokenstream.rs
View file

@ -195,13 +195,6 @@ impl TokenTree {
TokenTree::Token(sp, token::Ident(kind))];
v[index].clone()
}
(&TokenTree::Token(_, token::Interpolated(ref nt)), _) => {
if let Nonterminal::NtTT(ref tt) = **nt {
tt.clone()
} else {
panic!("Cannot expand a token tree");
}
}
(&TokenTree::Sequence(_, ref seq), _) => seq.tts[index].clone(),
_ => panic!("Cannot expand a token tree"),
}