bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Attach TokenStream to ast::Block

Browse source 
A `Block` does not have outer attributes, so we only capture tokens when
parsing a `macro_rules!` matcher
This commit is contained in:
Aaron Hill 2020-08-21 17:52:52 -04:00
parent ad3a6f70ac
commit de4bd9f0f8
No known key found for this signature in database
GPG key ID: B4087E510E98B164
8 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_parse/src/parser/nonterminal.rs
View file

@ -111,7 +111,14 @@ impl<'a> Parser<'a> {
return Err(self.struct_span_err(self.token.span, "expected an item keyword"));
}
},
NonterminalKind::Block => token::NtBlock(self.parse_block()?),
NonterminalKind::Block => {
let (mut block, tokens) = self.collect_tokens(|this| this.parse_block())?;
// We have have eaten an NtBlock, which could already have tokens
if block.tokens.is_none() {
block.tokens = Some(tokens);
}
token::NtBlock(block)
}
NonterminalKind::Stmt => match self.parse_stmt()? {
Some(s) => token::NtStmt(s),
None => return Err(self.struct_span_err(self.token.span, "expected a statement")),

2
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -411,7 +411,7 @@ impl<'a> Parser<'a> {
}
pub(super) fn mk_block(&self, stmts: Vec<Stmt>, rules: BlockCheckMode, span: Span) -> P<Block> {
P(Block { stmts, id: DUMMY_NODE_ID, rules, span })
P(Block { stmts, id: DUMMY_NODE_ID, rules, span, tokens: None })
}
pub(super) fn mk_stmt(&self, span: Span, kind: StmtKind) -> Stmt {