mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: Refactor parser method finish_parsing_statement -> parse_full_stmt.

Browse Source
This commit is contained in:
Jeffrey Seyfried 2016-07-07 04:12:20 +00:00
parent 759b8a8e7d
commit c1b850d304
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax/ext/tt/macro_rules.rs
View File

@ -118,18 +118,12 @@ impl<'a> MacResult for ParserAnyMacro<'a> {
fn make_stmts(self: Box<ParserAnyMacro<'a>>)
-> Option<SmallVector<ast::Stmt>> {
let parse_stmt = |parser: &mut Parser<'a>| -> ::parse::PResult<'a, _> {
Ok(match parser.parse_stmt()? {
Some(stmt) => Some(parser.finish_parsing_statement(stmt)?),
None => None,
})
};
let mut ret = SmallVector::zero();
loop {
let mut parser = self.parser.borrow_mut();
match parser.token {
token::Eof => break,
_ => match parse_stmt(&mut parser) {
_ => match parser.parse_full_stmt() {
Ok(maybe_stmt) => match maybe_stmt {
Some(stmt) => ret.push(stmt),
None => (),

18
src/libsyntax/parse/parser.rs
View File

@ -4044,8 +4044,8 @@ impl<'a> Parser<'a> {
let mut stmts = vec![];
while !self.eat(&token::CloseDelim(token::Brace)) {
if let Some(stmt) = self.parse_stmt_() {
stmts.push(self.finish_parsing_statement(stmt)?);
if let Some(stmt) = self.parse_full_stmt()? {
stmts.push(stmt);
} else if self.token == token::Eof {
break;
} else {
@ -4062,9 +4062,14 @@ impl<'a> Parser<'a> {
}))
}
/// Finish parsing expressions that start with macros and handle trailing semicolons
/// (or the lack thereof) -- c.f. `parse_stmt`.
pub fn finish_parsing_statement(&mut self, mut stmt: Stmt) -> PResult<'a, Stmt> {
/// Parse a statement, including the trailing semicolon.
/// This parses expression statements that begin with macros correctly (c.f. `parse_stmt`).
pub fn parse_full_stmt(&mut self) -> PResult<'a, Option<Stmt>> {
let mut stmt = match self.parse_stmt_() {
Some(stmt) => stmt,
None => return Ok(None),
};
if let StmtKind::Mac(mac) = stmt.node {
if mac.1 != MacStmtStyle::NoBraces ||
self.token == token::Semi || self.token == token::Eof {
@ -4078,7 +4083,8 @@ impl<'a> Parser<'a> {
}
}
self.handle_trailing_semicolon(stmt)
stmt = self.handle_trailing_semicolon(stmt)?;
Ok(Some(stmt))
}
fn handle_trailing_semicolon(&mut self, mut stmt: Stmt) -> PResult<'a, Stmt> {