Skip to content

Commit d73c85e

Browse files
petrochenkovpetrochenkov
committed
syntax: Support modern attribute syntax in the meta matcher
1 parent 12e6bea commit d73c85e

File tree

10 files changed

+68
-56
lines changed

10 files changed

+68
-56
lines changed

‎src/libsyntax/attr/mod.rs

+13-7
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,8 @@ impl MetaItem {
254254
}
255255
}
256256

257-
impl Attribute {
258-
/// Extracts the MetaItem from inside this Attribute.
259-
pub fn meta(&self) -> Option<MetaItem> {
257+
impl AttrItem {
258+
crate fn meta(&self, span: Span) -> Option<MetaItem> {
260259
let mut tokens = self.tokens.trees().peekable();
261260
Some(MetaItem {
262261
path: self.path.clone(),
@@ -268,9 +267,16 @@ impl Attribute {
268267
} else {
269268
return None;
270269
},
271-
span: self.span,
270+
span,
272271
})
273272
}
273+
}
274+
275+
impl Attribute {
276+
/// Extracts the MetaItem from inside this Attribute.
277+
pub fn meta(&self) -> Option<MetaItem> {
278+
self.item.meta(self.span)
279+
}
274280

275281
pub fn parse<'a, T, F>(&self, sess: &'a ParseSess, mut f: F) -> PResult<'a, T>
276282
where F: FnMut(&mut Parser<'a>) -> PResult<'a, T>,
@@ -501,7 +507,7 @@ impl MetaItem {
501507
}
502508
Some(TokenTree::Token(Token { kind: token::Interpolated(nt), .. })) => match *nt {
503509
token::Nonterminal::NtIdent(ident, _) => Path::from_ident(ident),
504-
token::Nonterminal::NtMeta(ref meta) => return Some(meta.clone()),
510+
token::Nonterminal::NtMeta(ref item) => return item.meta(item.path.span),
505511
token::Nonterminal::NtPath(ref path) => path.clone(),
506512
_ => return None,
507513
},
@@ -725,7 +731,7 @@ pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) -
725731
);
726732

727733
let start_span = parser.token.span;
728-
let (path, tokens) = panictry!(parser.parse_meta_item_unrestricted());
734+
let item = panictry!(parser.parse_attr_item());
729735
let end_span = parser.token.span;
730736
if parser.token != token::Eof {
731737
parse_sess.span_diagnostic
@@ -734,7 +740,7 @@ pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) -
734740
}
735741

736742
krate.attrs.push(Attribute {
737-
item: AttrItem { path, tokens },
743+
item,
738744
id: mk_attr_id(),
739745
style: AttrStyle::Inner,
740746
is_sugared_doc: false,

‎src/libsyntax/config.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ impl<'a> StripUnconfigured<'a> {
122122

123123
while !parser.check(&token::CloseDelim(token::Paren)) {
124124
let lo = parser.token.span.lo();
125-
let (path, tokens) = parser.parse_meta_item_unrestricted()?;
126-
expanded_attrs.push((path, tokens, parser.prev_span.with_lo(lo)));
125+
let item = parser.parse_attr_item()?;
126+
expanded_attrs.push((item, parser.prev_span.with_lo(lo)));
127127
parser.expect_one_of(&[token::Comma], &[token::CloseDelim(token::Paren)])?;
128128
}
129129

@@ -150,8 +150,8 @@ impl<'a> StripUnconfigured<'a> {
150150
// `cfg_attr` inside of another `cfg_attr`. E.g.
151151
// `#[cfg_attr(false, cfg_attr(true, some_attr))]`.
152152
expanded_attrs.into_iter()
153-
.flat_map(|(path, tokens, span)| self.process_cfg_attr(ast::Attribute {
154-
item: ast::AttrItem { path, tokens },
153+
.flat_map(|(item, span)| self.process_cfg_attr(ast::Attribute {
154+
item,
155155
id: attr::mk_attr_id(),
156156
style: attr.style,
157157
is_sugared_doc: false,

‎src/libsyntax/ext/tt/macro_parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ fn parse_nt(p: &mut Parser<'_>, sp: Span, name: Symbol) -> Nonterminal {
936936
FatalError.raise()
937937
}
938938
sym::path => token::NtPath(panictry!(p.parse_path(PathStyle::Type))),
939-
sym::meta => token::NtMeta(panictry!(p.parse_meta_item())),
939+
sym::meta => token::NtMeta(panictry!(p.parse_attr_item())),
940940
sym::vis => token::NtVis(panictry!(p.parse_visibility(true))),
941941
sym::lifetime => if p.check_lifetime() {
942942
token::NtLifetime(p.expect_lifetime().ident)

‎src/libsyntax/mut_visit.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,10 @@ pub fn noop_visit_interpolated<T: MutVisitor>(nt: &mut token::Nonterminal, vis:
657657
token::NtIdent(ident, _is_raw) => vis.visit_ident(ident),
658658
token::NtLifetime(ident) => vis.visit_ident(ident),
659659
token::NtLiteral(expr) => vis.visit_expr(expr),
660-
token::NtMeta(meta) => vis.visit_meta_item(meta),
660+
token::NtMeta(AttrItem { path, tokens }) => {
661+
vis.visit_path(path);
662+
vis.visit_tts(tokens);
663+
}
661664
token::NtPath(path) => vis.visit_path(path),
662665
token::NtTT(tt) => vis.visit_tt(tt),
663666
token::NtImplItem(item) =>

‎src/libsyntax/parse/attr.rs

+18-13
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl<'a> Parser<'a> {
9898
debug!("parse_attribute_with_inner_parse_policy: inner_parse_policy={:?} self.token={:?}",
9999
inner_parse_policy,
100100
self.token);
101-
let (span, path, tokens, style) = match self.token.kind {
101+
let (span, item, style) = match self.token.kind {
102102
token::Pound => {
103103
let lo = self.token.span;
104104
self.bump();
@@ -115,7 +115,7 @@ impl<'a> Parser<'a> {
115115
};
116116

117117
self.expect(&token::OpenDelim(token::Bracket))?;
118-
let (path, tokens) = self.parse_meta_item_unrestricted()?;
118+
let item = self.parse_attr_item()?;
119119
self.expect(&token::CloseDelim(token::Bracket))?;
120120
let hi = self.prev_span;
121121

@@ -150,7 +150,7 @@ impl<'a> Parser<'a> {
150150
}
151151
}
152152

153-
(attr_sp, path, tokens, style)
153+
(attr_sp, item, style)
154154
}
155155
_ => {
156156
let token_str = self.this_token_to_string();
@@ -159,7 +159,7 @@ impl<'a> Parser<'a> {
159159
};
160160

161161
Ok(ast::Attribute {
162-
item: ast::AttrItem { path, tokens },
162+
item,
163163
id: attr::mk_attr_id(),
164164
style,
165165
is_sugared_doc: false,
@@ -176,17 +176,17 @@ impl<'a> Parser<'a> {
176176
/// PATH
177177
/// PATH `=` TOKEN_TREE
178178
/// The delimiters or `=` are still put into the resulting token stream.
179-
crate fn parse_meta_item_unrestricted(&mut self) -> PResult<'a, (ast::Path, TokenStream)> {
180-
let meta = match self.token.kind {
179+
crate fn parse_attr_item(&mut self) -> PResult<'a, ast::AttrItem> {
180+
let item = match self.token.kind {
181181
token::Interpolated(ref nt) => match **nt {
182-
Nonterminal::NtMeta(ref meta) => Some(meta.clone()),
182+
Nonterminal::NtMeta(ref item) => Some(item.clone()),
183183
_ => None,
184184
},
185185
_ => None,
186186
};
187-
Ok(if let Some(meta) = meta {
187+
Ok(if let Some(item) = item {
188188
self.bump();
189-
(meta.path, meta.node.tokens(meta.span))
189+
item
190190
} else {
191191
let path = self.parse_path(PathStyle::Mod)?;
192192
let tokens = if self.check(&token::OpenDelim(DelimToken::Paren)) ||
@@ -213,7 +213,7 @@ impl<'a> Parser<'a> {
213213
} else {
214214
TokenStream::empty()
215215
};
216-
(path, tokens)
216+
ast::AttrItem { path, tokens }
217217
})
218218
}
219219

@@ -281,9 +281,14 @@ impl<'a> Parser<'a> {
281281
_ => None,
282282
};
283283

284-
if let Some(meta) = nt_meta {
285-
self.bump();
286-
return Ok(meta);
284+
if let Some(item) = nt_meta {
285+
return match item.meta(item.path.span) {
286+
Some(meta) => {
287+
self.bump();
288+
Ok(meta)
289+
}
290+
None => self.unexpected(),
291+
}
287292
}
288293

289294
let lo = self.token.span;

‎src/libsyntax/parse/parser/path.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ impl<'a> Parser<'a> {
114114
pub fn parse_path_allowing_meta(&mut self, style: PathStyle) -> PResult<'a, Path> {
115115
let meta_ident = match self.token.kind {
116116
token::Interpolated(ref nt) => match **nt {
117-
token::NtMeta(ref meta) => match meta.node {
118-
ast::MetaItemKind::Word => Some(meta.path.clone()),
119-
_ => None,
117+
token::NtMeta(ref item) => match item.tokens.is_empty() {
118+
true => Some(item.path.clone()),
119+
false => None,
120120
},
121121
_ => None,
122122
},

‎src/libsyntax/parse/token.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ pub enum Nonterminal {
690690
NtLifetime(ast::Ident),
691691
NtLiteral(P<ast::Expr>),
692692
/// Stuff inside brackets for attributes
693-
NtMeta(ast::MetaItem),
693+
NtMeta(ast::AttrItem),
694694
NtPath(ast::Path),
695695
NtVis(ast::Visibility),
696696
NtTT(TokenTree),

‎src/libsyntax/print/pprust.rs

+22-18
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ fn token_to_string_ext(token: &Token, convert_dollar_crate: bool) -> String {
306306
crate fn nonterminal_to_string(nt: &Nonterminal) -> String {
307307
match *nt {
308308
token::NtExpr(ref e) => expr_to_string(e),
309-
token::NtMeta(ref e) => meta_item_to_string(e),
309+
token::NtMeta(ref e) => attr_item_to_string(e),
310310
token::NtTy(ref e) => ty_to_string(e),
311311
token::NtPath(ref e) => path_to_string(e),
312312
token::NtItem(ref e) => item_to_string(e),
@@ -398,8 +398,8 @@ pub fn meta_list_item_to_string(li: &ast::NestedMetaItem) -> String {
398398
to_string(|s| s.print_meta_list_item(li))
399399
}
400400

401-
pub fn meta_item_to_string(mi: &ast::MetaItem) -> String {
402-
to_string(|s| s.print_meta_item(mi))
401+
fn attr_item_to_string(ai: &ast::AttrItem) -> String {
402+
to_string(|s| s.print_attr_item(ai, ai.path.span))
403403
}
404404

405405
pub fn attribute_to_string(attr: &ast::Attribute) -> String {
@@ -603,24 +603,28 @@ pub trait PrintState<'a>: std::ops::Deref<Target=pp::Printer> + std::ops::DerefM
603603
ast::AttrStyle::Inner => self.word("#!["),
604604
ast::AttrStyle::Outer => self.word("#["),
605605
}
606-
self.ibox(0);
607-
match attr.tokens.trees().next() {
608-
Some(TokenTree::Delimited(_, delim, tts)) => {
609-
self.print_mac_common(
610-
Some(MacHeader::Path(&attr.path)), false, None, delim, tts, true, attr.span
611-
);
612-
}
613-
tree => {
614-
self.print_path(&attr.path, false, 0);
615-
if tree.is_some() {
616-
self.space();
617-
self.print_tts(attr.tokens.clone(), true);
618-
}
606+
self.print_attr_item(&attr.item, attr.span);
607+
self.word("]");
608+
}
609+
}
610+
611+
fn print_attr_item(&mut self, item: &ast::AttrItem, span: Span) {
612+
self.ibox(0);
613+
match item.tokens.trees().next() {
614+
Some(TokenTree::Delimited(_, delim, tts)) => {
615+
self.print_mac_common(
616+
Some(MacHeader::Path(&item.path)), false, None, delim, tts, true, span
617+
);
618+
}
619+
tree => {
620+
self.print_path(&item.path, false, 0);
621+
if tree.is_some() {
622+
self.space();
623+
self.print_tts(item.tokens.clone(), true);
619624
}
620625
}
621-
self.end();
622-
self.word("]");
623626
}
627+
self.end();
624628
}
625629

626630
fn print_meta_list_item(&mut self, item: &ast::NestedMetaItem) {

‎src/test/ui/cfg/cfg_stmt_expr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn main() {
5757
// check that macro expanded code works
5858

5959
macro_rules! if_cfg {
60-
($cfg:meta $ib:block else $eb:block) => {
60+
($cfg:meta? $ib:block else $eb:block) => {
6161
{
6262
let r;
6363
#[cfg($cfg)]
@@ -69,7 +69,7 @@ fn main() {
6969
}
7070
}
7171

72-
let n = if_cfg!(unset {
72+
let n = if_cfg!(unset? {
7373
413
7474
} else {
7575
612

‎src/test/ui/macros/macro-first-set.rs

-6
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,6 @@ test_path!(::std);
252252
test_path!(std::u8,);
253253
test_path!(any, super, super::super::self::path, X<Y>::Z<'a, T=U>);
254254

255-
macro_rules! test_meta_block {
256-
($($m:meta)* $b:block) => {};
257-
}
258-
259-
test_meta_block!(windows {});
260-
261255
macro_rules! test_lifetime {
262256
(1. $($l:lifetime)* $($b:block)*) => {};
263257
(2. $($b:block)* $($l:lifetime)*) => {};

0 commit comments

Comments
 (0)