Skip to content

Commit 475f91f

Browse files
borsbors
committed
Auto merge of #29582 - oli-obk:token_tree, r=sfackler
2 parents b14dc5b + fcc7067 commit 475f91f

File tree

15 files changed

+219
-209
lines changed

15 files changed

+219
-209
lines changed

‎src/doc/trpl/compiler-plugins.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extern crate rustc;
4646
4747
use syntax::codemap::Span;
4848
use syntax::parse::token;
49-
use syntax::ast::{TokenTree, TtToken};
49+
use syntax::ast::TokenTree;
5050
use syntax::ext::base::{ExtCtxt, MacResult, DummyResult, MacEager};
5151
use syntax::ext::build::AstBuilder; // trait for expr_usize
5252
use rustc::plugin::Registry;
@@ -61,7 +61,7 @@ fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
6161
("I", 1)];
6262
6363
let text = match args {
64-
[TtToken(_, token::Ident(s, _))] => s.to_string(),
64+
[TokenTree::Token(_, token::Ident(s, _))] => s.to_string(),
6565
_ => {
6666
cx.span_err(sp, "argument should be a single identifier");
6767
return DummyResult::any(sp);

‎src/libsyntax/ast.rs‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ pub use self::Sign::*;
3636
pub use self::Stmt_::*;
3737
pub use self::StrStyle::*;
3838
pub use self::StructFieldKind::*;
39-
pub use self::TokenTree::*;
4039
pub use self::TraitItem_::*;
4140
pub use self::Ty_::*;
4241
pub use self::TyParamBound::*;
@@ -954,12 +953,12 @@ impl Delimited {
954953

955954
/// Returns the opening delimiter as a token tree.
956955
pub fn open_tt(&self) -> TokenTree {
957-
TtToken(self.open_span, self.open_token())
956+
TokenTree::Token(self.open_span, self.open_token())
958957
}
959958

960959
/// Returns the closing delimiter as a token tree.
961960
pub fn close_tt(&self) -> TokenTree {
962-
TtToken(self.close_span, self.close_token())
961+
TokenTree::Token(self.close_span, self.close_token())
963962
}
964963
}
965964

@@ -999,61 +998,61 @@ pub enum KleeneOp {
999998
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
1000999
pub enum TokenTree {
10011000
/// A single token
1002-
TtToken(Span, token::Token),
1001+
Token(Span, token::Token),
10031002
/// A delimited sequence of token trees
1004-
TtDelimited(Span, Rc<Delimited>),
1003+
Delimited(Span, Rc<Delimited>),
10051004

10061005
// This only makes sense in MBE macros.
10071006

10081007
/// A kleene-style repetition sequence with a span
10091008
// FIXME(eddyb) #12938 Use DST.
1010-
TtSequence(Span, Rc<SequenceRepetition>),
1009+
Sequence(Span, Rc<SequenceRepetition>),
10111010
}
10121011

10131012
impl TokenTree {
10141013
pub fn len(&self) -> usize {
10151014
match *self {
1016-
TtToken(_, token::DocComment(name)) => {
1015+
TokenTree::Token(_, token::DocComment(name)) => {
10171016
match doc_comment_style(&name.as_str()) {
10181017
AttrStyle::Outer => 2,
10191018
AttrStyle::Inner => 3
10201019
}
10211020
}
1022-
TtToken(_, token::SpecialVarNt(..)) => 2,
1023-
TtToken(_, token::MatchNt(..)) => 3,
1024-
TtDelimited(_, ref delimed) => {
1021+
TokenTree::Token(_, token::SpecialVarNt(..)) => 2,
1022+
TokenTree::Token(_, token::MatchNt(..)) => 3,
1023+
TokenTree::Delimited(_, ref delimed) => {
10251024
delimed.tts.len() + 2
10261025
}
1027-
TtSequence(_, ref seq) => {
1026+
TokenTree::Sequence(_, ref seq) => {
10281027
seq.tts.len()
10291028
}
1030-
TtToken(..) => 0
1029+
TokenTree::Token(..) => 0
10311030
}
10321031
}
10331032

10341033
pub fn get_tt(&self, index: usize) -> TokenTree {
10351034
match (self, index) {
1036-
(&TtToken(sp, token::DocComment(_)), 0) => {
1037-
TtToken(sp, token::Pound)
1035+
(&TokenTree::Token(sp, token::DocComment(_)), 0) => {
1036+
TokenTree::Token(sp, token::Pound)
10381037
}
1039-
(&TtToken(sp, token::DocComment(name)), 1)
1038+
(&TokenTree::Token(sp, token::DocComment(name)), 1)
10401039
if doc_comment_style(&name.as_str()) == AttrStyle::Inner => {
1041-
TtToken(sp, token::Not)
1040+
TokenTree::Token(sp, token::Not)
10421041
}
1043-
(&TtToken(sp, token::DocComment(name)), _) => {
1042+
(&TokenTree::Token(sp, token::DocComment(name)), _) => {
10441043
let stripped = strip_doc_comment_decoration(&name.as_str());
1045-
TtDelimited(sp, Rc::new(Delimited {
1044+
TokenTree::Delimited(sp, Rc::new(Delimited {
10461045
delim: token::Bracket,
10471046
open_span: sp,
1048-
tts: vec![TtToken(sp, token::Ident(token::str_to_ident("doc"),
1049-
token::Plain)),
1050-
TtToken(sp, token::Eq),
1051-
TtToken(sp, token::Literal(
1047+
tts: vec![TokenTree::Token(sp, token::Ident(token::str_to_ident("doc"),
1048+
token::Plain)),
1049+
TokenTree::Token(sp, token::Eq),
1050+
TokenTree::Token(sp, token::Literal(
10521051
token::StrRaw(token::intern(&stripped), 0), None))],
10531052
close_span: sp,
10541053
}))
10551054
}
1056-
(&TtDelimited(_, ref delimed), _) => {
1055+
(&TokenTree::Delimited(_, ref delimed), _) => {
10571056
if index == 0 {
10581057
return delimed.open_tt();
10591058
}
@@ -1062,19 +1061,19 @@ impl TokenTree {
10621061
}
10631062
delimed.tts[index - 1].clone()
10641063
}
1065-
(&TtToken(sp, token::SpecialVarNt(var)), _) => {
1066-
let v = [TtToken(sp, token::Dollar),
1067-
TtToken(sp, token::Ident(token::str_to_ident(var.as_str()),
1064+
(&TokenTree::Token(sp, token::SpecialVarNt(var)), _) => {
1065+
let v = [TokenTree::Token(sp, token::Dollar),
1066+
TokenTree::Token(sp, token::Ident(token::str_to_ident(var.as_str()),
10681067
token::Plain))];
10691068
v[index].clone()
10701069
}
1071-
(&TtToken(sp, token::MatchNt(name, kind, name_st, kind_st)), _) => {
1072-
let v = [TtToken(sp, token::SubstNt(name, name_st)),
1073-
TtToken(sp, token::Colon),
1074-
TtToken(sp, token::Ident(kind, kind_st))];
1070+
(&TokenTree::Token(sp, token::MatchNt(name, kind, name_st, kind_st)), _) => {
1071+
let v = [TokenTree::Token(sp, token::SubstNt(name, name_st)),
1072+
TokenTree::Token(sp, token::Colon),
1073+
TokenTree::Token(sp, token::Ident(kind, kind_st))];
10751074
v[index].clone()
10761075
}
1077-
(&TtSequence(_, ref seq), _) => {
1076+
(&TokenTree::Sequence(_, ref seq), _) => {
10781077
seq.tts[index].clone()
10791078
}
10801079
_ => panic!("Cannot expand a token tree")
@@ -1084,9 +1083,9 @@ impl TokenTree {
10841083
/// Returns the `Span` corresponding to this token tree.
10851084
pub fn get_span(&self) -> Span {
10861085
match *self {
1087-
TtToken(span, _) => span,
1088-
TtDelimited(span, _) => span,
1089-
TtSequence(span, _) => span,
1086+
TokenTree::Token(span, _) => span,
1087+
TokenTree::Delimited(span, _) => span,
1088+
TokenTree::Sequence(span, _) => span,
10901089
}
10911090
}
10921091

‎src/libsyntax/diagnostics/plugin.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub fn expand_diagnostic_used<'cx>(ecx: &'cx mut ExtCtxt,
5454
token_tree: &[TokenTree])
5555
-> Box<MacResult+'cx> {
5656
let code = match (token_tree.len(), token_tree.get(0)) {
57-
(1, Some(&ast::TtToken(_, token::Ident(code, _)))) => code,
57+
(1, Some(&TokenTree::Token(_, token::Ident(code, _)))) => code,
5858
_ => unreachable!()
5959
};
6060

@@ -92,12 +92,12 @@ pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt,
9292
token_tree.get(1),
9393
token_tree.get(2)
9494
) {
95-
(1, Some(&ast::TtToken(_, token::Ident(ref code, _))), None, None) => {
95+
(1, Some(&TokenTree::Token(_, token::Ident(ref code, _))), None, None) => {
9696
(code, None)
9797
},
98-
(3, Some(&ast::TtToken(_, token::Ident(ref code, _))),
99-
Some(&ast::TtToken(_, token::Comma)),
100-
Some(&ast::TtToken(_, token::Literal(token::StrRaw(description, _), None)))) => {
98+
(3, Some(&TokenTree::Token(_, token::Ident(ref code, _))),
99+
Some(&TokenTree::Token(_, token::Comma)),
100+
Some(&TokenTree::Token(_, token::Literal(token::StrRaw(description, _), None)))) => {
101101
(code, Some(description))
102102
}
103103
_ => unreachable!()
@@ -160,9 +160,9 @@ pub fn expand_build_diagnostic_array<'cx>(ecx: &'cx mut ExtCtxt,
160160
let (crate_name, name) = match (&token_tree[0], &token_tree[2]) {
161161
(
162162
// Crate name.
163-
&ast::TtToken(_, token::Ident(ref crate_name, _)),
163+
&TokenTree::Token(_, token::Ident(ref crate_name, _)),
164164
// DIAGNOSTICS ident.
165-
&ast::TtToken(_, token::Ident(ref name, _))
165+
&TokenTree::Token(_, token::Ident(ref name, _))
166166
) => (*&crate_name, name),
167167
_ => unreachable!()
168168
};

‎src/libsyntax/ext/concat_idents.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use ast;
11+
use ast::{self, TokenTree};
1212
use codemap::Span;
1313
use ext::base::*;
1414
use ext::base;
@@ -17,7 +17,7 @@ use parse::token;
1717
use parse::token::str_to_ident;
1818
use ptr::P;
1919

20-
pub fn expand_syntax_ext<'cx>(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
20+
pub fn expand_syntax_ext<'cx>(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
2121
-> Box<base::MacResult+'cx> {
2222
if !cx.ecfg.enable_concat_idents() {
2323
feature_gate::emit_feature_err(&cx.parse_sess.span_diagnostic,
@@ -32,15 +32,15 @@ pub fn expand_syntax_ext<'cx>(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]
3232
for (i, e) in tts.iter().enumerate() {
3333
if i & 1 == 1 {
3434
match *e {
35-
ast::TtToken(_, token::Comma) => {},
35+
TokenTree::Token(_, token::Comma) => {},
3636
_ => {
3737
cx.span_err(sp, "concat_idents! expecting comma.");
3838
return DummyResult::expr(sp);
3939
},
4040
}
4141
} else {
4242
match *e {
43-
ast::TtToken(_, token::Ident(ident, _)) => {
43+
TokenTree::Token(_, token::Ident(ident, _)) => {
4444
res_str.push_str(&ident.name.as_str())
4545
},
4646
_ => {

0 commit comments

Comments
 (0)