Skip to content

Commit 1a496f3

Browse files
petrochenkovpetrochenkov
committed
syntax: Use ast::MacArgs for attributes
1 parent 0fac567 commit 1a496f3

File tree

17 files changed

+102
-109
lines changed

17 files changed

+102
-109
lines changed

‎src/librustc/hir/lowering.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ impl<'a> LoweringContext<'a> {
10031003
AttrKind::Normal(ref item) => {
10041004
AttrKind::Normal(AttrItem {
10051005
path: item.path.clone(),
1006-
tokens: self.lower_token_stream(item.tokens.clone()),
1006+
args: self.lower_mac_args(&item.args),
10071007
})
10081008
}
10091009
AttrKind::DocComment(comment) => AttrKind::DocComment(comment)
@@ -1017,6 +1017,16 @@ impl<'a> LoweringContext<'a> {
10171017
}
10181018
}
10191019

1020+
fn lower_mac_args(&mut self, args: &MacArgs) -> MacArgs {
1021+
match *args {
1022+
MacArgs::Empty => MacArgs::Empty,
1023+
MacArgs::Delimited(dspan, delim, ref tokens) =>
1024+
MacArgs::Delimited(dspan, delim, self.lower_token_stream(tokens.clone())),
1025+
MacArgs::Eq(eq_span, ref tokens) =>
1026+
MacArgs::Eq(eq_span, self.lower_token_stream(tokens.clone())),
1027+
}
1028+
}
1029+
10201030
fn lower_token_stream(&mut self, tokens: TokenStream) -> TokenStream {
10211031
tokens
10221032
.into_trees()

‎src/librustc_parse/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl<'a> StripUnconfigured<'a> {
101101
if !attr.has_name(sym::cfg_attr) {
102102
return vec![attr];
103103
}
104-
if attr.get_normal_item().tokens.is_empty() {
104+
if let ast::MacArgs::Empty = attr.get_normal_item().args {
105105
self.sess.span_diagnostic
106106
.struct_span_err(
107107
attr.span,

‎src/librustc_parse/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ pub fn parse_in_attr<'a, T>(
277277
) -> PResult<'a, T> {
278278
let mut parser = Parser::new(
279279
sess,
280-
attr.get_normal_item().tokens.clone(),
280+
attr.get_normal_item().args.outer_tokens(),
281281
None,
282282
false,
283283
false,
@@ -409,7 +409,7 @@ fn prepend_attrs(
409409
brackets.push(stream);
410410
}
411411

412-
brackets.push(item.tokens.clone());
412+
brackets.push(item.args.outer_tokens());
413413

414414
// The span we list here for `#` and for `[ ... ]` are both wrong in
415415
// that it encompasses more than each token, but it hopefully is "good

‎src/librustc_parse/parser/attr.rs

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use super::{SeqSep, Parser, TokenType, PathStyle};
22
use syntax::attr;
33
use syntax::ast;
44
use syntax::util::comments;
5-
use syntax::token::{self, Nonterminal, DelimToken};
6-
use syntax::tokenstream::{TokenStream, TokenTree};
5+
use syntax::token::{self, Nonterminal};
76
use syntax_pos::{Span, Symbol};
87
use errors::PResult;
98

@@ -181,31 +180,8 @@ impl<'a> Parser<'a> {
181180
item
182181
} else {
183182
let path = self.parse_path(PathStyle::Mod)?;
184-
let tokens = if self.check(&token::OpenDelim(DelimToken::Paren)) ||
185-
self.check(&token::OpenDelim(DelimToken::Bracket)) ||
186-
self.check(&token::OpenDelim(DelimToken::Brace)) {
187-
self.parse_token_tree().into()
188-
} else if self.eat(&token::Eq) {
189-
let eq = TokenTree::token(token::Eq, self.prev_span);
190-
let mut is_interpolated_expr = false;
191-
if let token::Interpolated(nt) = &self.token.kind {
192-
if let token::NtExpr(..) = **nt {
193-
is_interpolated_expr = true;
194-
}
195-
}
196-
let token_tree = if is_interpolated_expr {
197-
// We need to accept arbitrary interpolated expressions to continue
198-
// supporting things like `doc = $expr` that work on stable.
199-
// Non-literal interpolated expressions are rejected after expansion.
200-
self.parse_token_tree()
201-
} else {
202-
self.parse_unsuffixed_lit()?.token_tree()
203-
};
204-
TokenStream::new(vec![eq.into(), token_tree.into()])
205-
} else {
206-
TokenStream::default()
207-
};
208-
ast::AttrItem { path, tokens }
183+
let args = self.parse_attr_args()?;
184+
ast::AttrItem { path, args }
209185
})
210186
}
211187

‎src/librustc_parse/parser/mod.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,16 +1011,15 @@ impl<'a> Parser<'a> {
10111011
}
10121012

10131013
fn parse_mac_args(&mut self) -> PResult<'a, P<MacArgs>> {
1014-
self.parse_mac_args_common(true)
1014+
self.parse_mac_args_common(true).map(P)
10151015
}
10161016

1017-
#[allow(dead_code)]
1018-
fn parse_attr_args(&mut self) -> PResult<'a, P<MacArgs>> {
1017+
fn parse_attr_args(&mut self) -> PResult<'a, MacArgs> {
10191018
self.parse_mac_args_common(false)
10201019
}
10211020

1022-
fn parse_mac_args_common(&mut self, delimited_only: bool) -> PResult<'a, P<MacArgs>> {
1023-
Ok(P(if self.check(&token::OpenDelim(DelimToken::Paren)) ||
1021+
fn parse_mac_args_common(&mut self, delimited_only: bool) -> PResult<'a, MacArgs> {
1022+
Ok(if self.check(&token::OpenDelim(DelimToken::Paren)) ||
10241023
self.check(&token::OpenDelim(DelimToken::Bracket)) ||
10251024
self.check(&token::OpenDelim(DelimToken::Brace)) {
10261025
match self.parse_token_tree() {
@@ -1052,7 +1051,7 @@ impl<'a> Parser<'a> {
10521051
}
10531052
} else {
10541053
return self.unexpected();
1055-
}))
1054+
})
10561055
}
10571056

10581057
fn parse_or_use_outer_attributes(

‎src/librustc_parse/parser/path.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use super::{Parser, TokenType};
22
use crate::maybe_whole;
33
use syntax::ast::{self, QSelf, Path, PathSegment, Ident, ParenthesizedArgs, AngleBracketedArgs};
44
use syntax::ast::{AnonConst, GenericArg, AssocTyConstraint, AssocTyConstraintKind, BlockCheckMode};
5+
use syntax::ast::MacArgs;
56
use syntax::ThinVec;
67
use syntax::token::{self, Token};
78
use syntax::source_map::{Span, BytePos};
@@ -114,9 +115,9 @@ impl<'a> Parser<'a> {
114115
fn parse_path_allowing_meta(&mut self, style: PathStyle) -> PResult<'a, Path> {
115116
let meta_ident = match self.token.kind {
116117
token::Interpolated(ref nt) => match **nt {
117-
token::NtMeta(ref item) => match item.tokens.is_empty() {
118-
true => Some(item.path.clone()),
119-
false => None,
118+
token::NtMeta(ref item) => match item.args {
119+
MacArgs::Empty => Some(item.path.clone()),
120+
_ => None,
120121
},
121122
_ => None,
122123
},

‎src/librustc_parse/validate_attr.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22
33
use errors::{PResult, Applicability};
44
use rustc_feature::{AttributeTemplate, BUILTIN_ATTRIBUTE_MAP};
5-
use syntax::ast::{self, Attribute, AttrKind, Ident, MetaItem, MetaItemKind};
5+
use syntax::ast::{self, Attribute, AttrKind, Ident, MacArgs, MetaItem, MetaItemKind};
66
use syntax::attr::mk_name_value_item_str;
77
use syntax::early_buffered_lints::BufferedEarlyLintId;
8-
use syntax::token;
9-
use syntax::tokenstream::TokenTree;
108
use syntax::sess::ParseSess;
119
use syntax_pos::{Symbol, sym};
1210

@@ -19,11 +17,9 @@ pub fn check_meta(sess: &ParseSess, attr: &Attribute) {
1917
// `rustc_dummy` doesn't have any restrictions specific to built-in attributes.
2018
Some((name, _, template, _)) if name != sym::rustc_dummy =>
2119
check_builtin_attribute(sess, attr, name, template),
22-
_ => if let Some(TokenTree::Token(token)) = attr.get_normal_item().tokens.trees().next() {
23-
if token == token::Eq {
24-
// All key-value attributes are restricted to meta-item syntax.
25-
parse_meta(sess, attr).map_err(|mut err| err.emit()).ok();
26-
}
20+
_ => if let MacArgs::Eq(..) = attr.get_normal_item().args {
21+
// All key-value attributes are restricted to meta-item syntax.
22+
parse_meta(sess, attr).map_err(|mut err| err.emit()).ok();
2723
}
2824
}
2925
}

‎src/libsyntax/ast.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ impl Mac {
13891389
}
13901390

13911391
/// Arguments passed to an attribute or a function-like macro.
1392-
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
1392+
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
13931393
pub enum MacArgs {
13941394
/// No arguments - `#[attr]`.
13951395
Empty,
@@ -1427,7 +1427,7 @@ impl MacArgs {
14271427
}
14281428

14291429
/// Tokens together with the delimiters or `=`.
1430-
/// Use of this functions generally means that something suspicious or hacky is happening.
1430+
/// Use of this functions generally means that something suboptimal or hacky is happening.
14311431
pub fn outer_tokens(&self) -> TokenStream {
14321432
match *self {
14331433
MacArgs::Empty => TokenStream::default(),
@@ -1445,7 +1445,7 @@ impl MacArgs {
14451445
}
14461446
}
14471447

1448-
#[derive(Copy, Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Debug)]
1448+
#[derive(Copy, Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
14491449
pub enum MacDelimiter {
14501450
Parenthesis,
14511451
Bracket,
@@ -2384,7 +2384,7 @@ impl rustc_serialize::Decodable for AttrId {
23842384
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
23852385
pub struct AttrItem {
23862386
pub path: Path,
2387-
pub tokens: TokenStream,
2387+
pub args: MacArgs,
23882388
}
23892389

23902390
/// Metadata associated with an item.

‎src/libsyntax/attr/mod.rs

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub use crate::ast::Attribute;
1010

1111
use crate::ast;
1212
use crate::ast::{AttrItem, AttrId, AttrKind, AttrStyle, Name, Ident, Path, PathSegment};
13-
use crate::ast::{MetaItem, MetaItemKind, NestedMetaItem};
13+
use crate::ast::{MacArgs, MacDelimiter, MetaItem, MetaItemKind, NestedMetaItem};
1414
use crate::ast::{Lit, LitKind, Expr, Item, Local, Stmt, StmtKind, GenericParam};
1515
use crate::mut_visit::visit_clobber;
1616
use crate::source_map::{BytePos, Spanned};
@@ -198,7 +198,7 @@ impl Attribute {
198198

199199
pub fn is_word(&self) -> bool {
200200
if let AttrKind::Normal(item) = &self.kind {
201-
item.tokens.is_empty()
201+
matches!(item.args, MacArgs::Empty)
202202
} else {
203203
false
204204
}
@@ -278,7 +278,7 @@ impl MetaItem {
278278

279279
impl AttrItem {
280280
pub fn meta(&self, span: Span) -> Option<MetaItem> {
281-
let mut tokens = self.tokens.trees().peekable();
281+
let mut tokens = self.args.outer_tokens().trees().peekable();
282282
Some(MetaItem {
283283
path: self.path.clone(),
284284
kind: if let Some(kind) = MetaItemKind::from_tokens(&mut tokens) {
@@ -362,8 +362,8 @@ crate fn mk_attr_id() -> AttrId {
362362
AttrId(id)
363363
}
364364

365-
pub fn mk_attr(style: AttrStyle, path: Path, tokens: TokenStream, span: Span) -> Attribute {
366-
mk_attr_from_item(style, AttrItem { path, tokens }, span)
365+
pub fn mk_attr(style: AttrStyle, path: Path, args: MacArgs, span: Span) -> Attribute {
366+
mk_attr_from_item(style, AttrItem { path, args }, span)
367367
}
368368

369369
pub fn mk_attr_from_item(style: AttrStyle, item: AttrItem, span: Span) -> Attribute {
@@ -377,12 +377,12 @@ pub fn mk_attr_from_item(style: AttrStyle, item: AttrItem, span: Span) -> Attrib
377377

378378
/// Returns an inner attribute with the given value and span.
379379
pub fn mk_attr_inner(item: MetaItem) -> Attribute {
380-
mk_attr(AttrStyle::Inner, item.path, item.kind.tokens(item.span), item.span)
380+
mk_attr(AttrStyle::Inner, item.path, item.kind.mac_args(item.span), item.span)
381381
}
382382

383383
/// Returns an outer attribute with the given value and span.
384384
pub fn mk_attr_outer(item: MetaItem) -> Attribute {
385-
mk_attr(AttrStyle::Outer, item.path, item.kind.tokens(item.span), item.span)
385+
mk_attr(AttrStyle::Outer, item.path, item.kind.mac_args(item.span), item.span)
386386
}
387387

388388
pub fn mk_doc_comment(style: AttrStyle, comment: Symbol, span: Span) -> Attribute {
@@ -520,7 +520,26 @@ impl MetaItem {
520520
}
521521

522522
impl MetaItemKind {
523-
pub fn token_trees_and_joints(&self, span: Span) -> Vec<TreeAndJoint> {
523+
pub fn mac_args(&self, span: Span) -> MacArgs {
524+
match self {
525+
MetaItemKind::Word => MacArgs::Empty,
526+
MetaItemKind::NameValue(lit) => MacArgs::Eq(span, lit.token_tree().into()),
527+
MetaItemKind::List(list) => {
528+
let mut tts = Vec::new();
529+
for (i, item) in list.iter().enumerate() {
530+
if i > 0 {
531+
tts.push(TokenTree::token(token::Comma, span).into());
532+
}
533+
tts.extend(item.token_trees_and_joints())
534+
}
535+
MacArgs::Delimited(
536+
DelimSpan::from_single(span), MacDelimiter::Parenthesis, TokenStream::new(tts)
537+
)
538+
}
539+
}
540+
}
541+
542+
fn token_trees_and_joints(&self, span: Span) -> Vec<TreeAndJoint> {
524543
match *self {
525544
MetaItemKind::Word => vec![],
526545
MetaItemKind::NameValue(ref lit) => {
@@ -548,13 +567,6 @@ impl MetaItemKind {
548567
}
549568
}
550569

551-
// Premature conversions of `TokenTree`s to `TokenStream`s can hurt
552-
// performance. Do not use this function if `token_trees_and_joints()` can
553-
// be used instead.
554-
pub fn tokens(&self, span: Span) -> TokenStream {
555-
TokenStream::new(self.token_trees_and_joints(span))
556-
}
557-
558570
fn from_tokens<I>(tokens: &mut iter::Peekable<I>) -> Option<MetaItemKind>
559571
where I: Iterator<Item = TokenTree>,
560572
{

‎src/libsyntax/mut_visit.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,9 @@ pub fn noop_visit_local<T: MutVisitor>(local: &mut P<Local>, vis: &mut T) {
570570
pub fn noop_visit_attribute<T: MutVisitor>(attr: &mut Attribute, vis: &mut T) {
571571
let Attribute { kind, id: _, style: _, span } = attr;
572572
match kind {
573-
AttrKind::Normal(AttrItem { path, tokens }) => {
573+
AttrKind::Normal(AttrItem { path, args }) => {
574574
vis.visit_path(path);
575-
vis.visit_tts(tokens);
575+
visit_mac_args(args, vis);
576576
}
577577
AttrKind::DocComment(_) => {}
578578
}
@@ -701,9 +701,9 @@ pub fn noop_visit_interpolated<T: MutVisitor>(nt: &mut token::Nonterminal, vis:
701701
token::NtIdent(ident, _is_raw) => vis.visit_ident(ident),
702702
token::NtLifetime(ident) => vis.visit_ident(ident),
703703
token::NtLiteral(expr) => vis.visit_expr(expr),
704-
token::NtMeta(AttrItem { path, tokens }) => {
704+
token::NtMeta(AttrItem { path, args }) => {
705705
vis.visit_path(path);
706-
vis.visit_tts(tokens);
706+
visit_mac_args(args, vis);
707707
}
708708
token::NtPath(path) => vis.visit_path(path),
709709
token::NtTT(tt) => vis.visit_tt(tt),

‎src/libsyntax/print/pprust.rs

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::ast::{self, BlockCheckMode, PatKind, RangeEnd, RangeSyntax};
22
use crate::ast::{SelfKind, GenericBound, TraitBoundModifier};
3-
use crate::ast::{Attribute, GenericArg};
3+
use crate::ast::{Attribute, GenericArg, MacArgs};
44
use crate::util::parser::{self, AssocOp, Fixity};
55
use crate::util::comments;
66
use crate::attr;
@@ -639,17 +639,22 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
639639

640640
fn print_attr_item(&mut self, item: &ast::AttrItem, span: Span) {
641641
self.ibox(0);
642-
match item.tokens.trees().next() {
643-
Some(TokenTree::Delimited(_, delim, tts)) => {
644-
self.print_mac_common(
645-
Some(MacHeader::Path(&item.path)), false, None, delim, tts, true, span
646-
);
647-
}
648-
tree => {
642+
match &item.args {
643+
MacArgs::Delimited(_, delim, tokens) => self.print_mac_common(
644+
Some(MacHeader::Path(&item.path)),
645+
false,
646+
None,
647+
delim.to_token(),
648+
tokens.clone(),
649+
true,
650+
span,
651+
),
652+
MacArgs::Empty | MacArgs::Eq(..) => {
649653
self.print_path(&item.path, false, 0);
650-
if tree.is_some() {
654+
if let MacArgs::Eq(_, tokens) = &item.args {
651655
self.space();
652-
self.print_tts(item.tokens.clone(), true);
656+
self.word_space("=");
657+
self.print_tts(tokens.clone(), true);
653658
}
654659
}
655660
}

‎src/libsyntax/visit.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,11 +841,19 @@ pub fn walk_vis<'a, V: Visitor<'a>>(visitor: &mut V, vis: &'a Visibility) {
841841

842842
pub fn walk_attribute<'a, V: Visitor<'a>>(visitor: &mut V, attr: &'a Attribute) {
843843
match attr.kind {
844-
AttrKind::Normal(ref item) => visitor.visit_tts(item.tokens.clone()),
844+
AttrKind::Normal(ref item) => walk_mac_args(visitor, &item.args),
845845
AttrKind::DocComment(_) => {}
846846
}
847847
}
848848

849+
pub fn walk_mac_args<'a, V: Visitor<'a>>(visitor: &mut V, args: &'a MacArgs) {
850+
match args {
851+
MacArgs::Empty => {}
852+
MacArgs::Delimited(_dspan, _delim, tokens) => visitor.visit_tts(tokens.clone()),
853+
MacArgs::Eq(_eq_span, tokens) => visitor.visit_tts(tokens.clone()),
854+
}
855+
}
856+
849857
pub fn walk_tt<'a, V: Visitor<'a>>(visitor: &mut V, tt: TokenTree) {
850858
match tt {
851859
TokenTree::Token(token) => visitor.visit_token(token),

0 commit comments

Comments
 (0)