-
Notifications
You must be signed in to change notification settings - Fork 14k
Port cfg_select! to the new attribute parsing system
#148712
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| use rustc_ast::token::Token; | ||
| use rustc_ast::tokenstream::TokenStream; | ||
| use rustc_ast::{AttrStyle, NodeId, token}; | ||
| use rustc_feature::{AttributeTemplate, Features}; | ||
| use rustc_hir::AttrPath; | ||
| use rustc_hir::attrs::CfgEntry; | ||
| use rustc_parse::exp; | ||
| use rustc_parse::parser::Parser; | ||
| use rustc_session::Session; | ||
| use rustc_span::{ErrorGuaranteed, Ident, Span}; | ||
|
|
||
| use crate::parser::MetaItemOrLitParser; | ||
| use crate::{AttributeParser, ParsedDescription, ShouldEmit, parse_cfg_entry}; | ||
|
|
||
| pub enum CfgSelectPredicate { | ||
| Cfg(CfgEntry), | ||
| Wildcard(Token), | ||
| } | ||
|
|
||
| #[derive(Default)] | ||
| pub struct CfgSelectBranches { | ||
| /// All the conditional branches. | ||
| pub reachable: Vec<(CfgEntry, TokenStream, Span)>, | ||
| /// The first wildcard `_ => { ... }` branch. | ||
| pub wildcard: Option<(Token, TokenStream, Span)>, | ||
| /// All branches after the first wildcard, including further wildcards. | ||
| /// These branches are kept for formatting. | ||
| pub unreachable: Vec<(CfgSelectPredicate, TokenStream, Span)>, | ||
| } | ||
|
|
||
| pub fn parse_cfg_select( | ||
| p: &mut Parser<'_>, | ||
| sess: &Session, | ||
| features: Option<&Features>, | ||
| lint_node_id: NodeId, | ||
| ) -> Result<CfgSelectBranches, ErrorGuaranteed> { | ||
| let mut branches = CfgSelectBranches::default(); | ||
|
|
||
| while p.token != token::Eof { | ||
| if p.eat_keyword(exp!(Underscore)) { | ||
| let underscore = p.prev_token; | ||
| p.expect(exp!(FatArrow)).map_err(|e| e.emit())?; | ||
|
|
||
| let tts = p.parse_delimited_token_tree().map_err(|e| e.emit())?; | ||
| let span = underscore.span.to(p.token.span); | ||
|
|
||
| match branches.wildcard { | ||
| None => branches.wildcard = Some((underscore, tts, span)), | ||
| Some(_) => { | ||
| branches.unreachable.push((CfgSelectPredicate::Wildcard(underscore), tts, span)) | ||
| } | ||
| } | ||
| } else { | ||
| let meta = MetaItemOrLitParser::parse_single(p, ShouldEmit::ErrorsAndLints) | ||
| .map_err(|diag| diag.emit())?; | ||
| let cfg_span = meta.span(); | ||
| let cfg = AttributeParser::parse_single_args( | ||
| sess, | ||
| cfg_span, | ||
| cfg_span, | ||
| AttrStyle::Inner, | ||
| AttrPath { | ||
| segments: vec![Ident::from_str("cfg_select")].into_boxed_slice(), | ||
| span: cfg_span, | ||
| }, | ||
| ParsedDescription::Macro, | ||
| cfg_span, | ||
| lint_node_id, | ||
| features, | ||
| ShouldEmit::ErrorsAndLints, | ||
| &meta, | ||
| parse_cfg_entry, | ||
| &AttributeTemplate::default(), | ||
| )?; | ||
|
|
||
| p.expect(exp!(FatArrow)).map_err(|e| e.emit())?; | ||
|
|
||
| let tts = p.parse_delimited_token_tree().map_err(|e| e.emit())?; | ||
| let span = cfg_span.to(p.token.span); | ||
|
|
||
| match branches.wildcard { | ||
| None => branches.reachable.push((cfg, tts, span)), | ||
| Some(_) => branches.unreachable.push((CfgSelectPredicate::Cfg(cfg), tts, span)), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Ok(branches) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JonathanBrouwer marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,34 @@ | ||
| use rustc_ast::token::Token; | ||
| use rustc_ast::token; | ||
| use rustc_ast::tokenstream::{TokenStream, TokenTree}; | ||
| use rustc_ast::util::classify; | ||
| use rustc_ast::{MetaItemInner, token}; | ||
| use rustc_errors::PResult; | ||
| use rustc_span::Span; | ||
|
|
||
| use crate::exp; | ||
| use crate::parser::{AttrWrapper, ForceCollect, Parser, Restrictions, Trailing, UsePreAttrPos}; | ||
|
|
||
| pub enum CfgSelectPredicate { | ||
| Cfg(MetaItemInner), | ||
| Wildcard(Token), | ||
| } | ||
|
|
||
| #[derive(Default)] | ||
| pub struct CfgSelectBranches { | ||
| /// All the conditional branches. | ||
| pub reachable: Vec<(MetaItemInner, TokenStream, Span)>, | ||
| /// The first wildcard `_ => { ... }` branch. | ||
| pub wildcard: Option<(Token, TokenStream, Span)>, | ||
| /// All branches after the first wildcard, including further wildcards. | ||
| /// These branches are kept for formatting. | ||
| pub unreachable: Vec<(CfgSelectPredicate, TokenStream, Span)>, | ||
| } | ||
|
|
||
| /// Parses a `TokenTree` consisting either of `{ /* ... */ }` (and strip the braces) or an | ||
| /// expression followed by a comma (and strip the comma). | ||
| fn parse_token_tree<'a>(p: &mut Parser<'a>) -> PResult<'a, TokenStream> { | ||
| if p.token == token::OpenBrace { | ||
| // Strip the outer '{' and '}'. | ||
| match p.parse_token_tree() { | ||
| TokenTree::Token(..) => unreachable!("because of the expect above"), | ||
| TokenTree::Delimited(.., tts) => return Ok(tts), | ||
| } | ||
| } | ||
| let expr = p.collect_tokens(None, AttrWrapper::empty(), ForceCollect::Yes, |p, _| { | ||
| p.parse_expr_res(Restrictions::STMT_EXPR, AttrWrapper::empty()) | ||
| .map(|(expr, _)| (expr, Trailing::No, UsePreAttrPos::No)) | ||
| })?; | ||
| if !classify::expr_is_complete(&expr) && p.token != token::CloseBrace && p.token != token::Eof { | ||
| p.expect(exp!(Comma))?; | ||
| } else { | ||
| let _ = p.eat(exp!(Comma)); | ||
| } | ||
| Ok(TokenStream::from_ast(&expr)) | ||
| } | ||
|
|
||
| pub fn parse_cfg_select<'a>(p: &mut Parser<'a>) -> PResult<'a, CfgSelectBranches> { | ||
| let mut branches = CfgSelectBranches::default(); | ||
|
|
||
| while p.token != token::Eof { | ||
| if p.eat_keyword(exp!(Underscore)) { | ||
| let underscore = p.prev_token; | ||
| p.expect(exp!(FatArrow))?; | ||
|
|
||
| let tts = parse_token_tree(p)?; | ||
| let span = underscore.span.to(p.token.span); | ||
|
|
||
| match branches.wildcard { | ||
| None => branches.wildcard = Some((underscore, tts, span)), | ||
| Some(_) => { | ||
| branches.unreachable.push((CfgSelectPredicate::Wildcard(underscore), tts, span)) | ||
| } | ||
| impl<'a> Parser<'a> { | ||
| /// Parses a `TokenTree` consisting either of `{ /* ... */ }` (and strip the braces) or an | ||
| /// expression followed by a comma (and strip the comma). | ||
| pub fn parse_delimited_token_tree(&mut self) -> PResult<'a, TokenStream> { | ||
| if self.token == token::OpenBrace { | ||
| // Strip the outer '{' and '}'. | ||
| match self.parse_token_tree() { | ||
| TokenTree::Token(..) => unreachable!("because of the expect above"), | ||
| TokenTree::Delimited(.., tts) => return Ok(tts), | ||
| } | ||
| } | ||
| let expr = self.collect_tokens(None, AttrWrapper::empty(), ForceCollect::Yes, |p, _| { | ||
| p.parse_expr_res(Restrictions::STMT_EXPR, AttrWrapper::empty()) | ||
| .map(|(expr, _)| (expr, Trailing::No, UsePreAttrPos::No)) | ||
| })?; | ||
| if !classify::expr_is_complete(&expr) | ||
| && self.token != token::CloseBrace | ||
| && self.token != token::Eof | ||
| { | ||
| self.expect(exp!(Comma))?; | ||
| } else { | ||
| let meta_item = p.parse_meta_item_inner()?; | ||
| p.expect(exp!(FatArrow))?; | ||
|
|
||
| let tts = parse_token_tree(p)?; | ||
| let span = meta_item.span().to(p.token.span); | ||
|
|
||
| match branches.wildcard { | ||
| None => branches.reachable.push((meta_item, tts, span)), | ||
| Some(_) => { | ||
| branches.unreachable.push((CfgSelectPredicate::Cfg(meta_item), tts, span)) | ||
| } | ||
| } | ||
| let _ = self.eat(exp!(Comma)); | ||
| } | ||
| Ok(TokenStream::from_ast(&expr)) | ||
| } | ||
|
|
||
| Ok(branches) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this makes me so sad but for now we'll have to...