danog/parser
1
0
Fork 0
mirror of https://github.com/danog/parser.git synced 2024-11-30 04:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

parser: abstract lbrace and rbrace methods for consistency

Browse Source
This commit is contained in:
Ryan Chandler 2022-07-28 00:36:41 +01:00
parent ccc154656f
commit 9f91261298
No known key found for this signature in database
GPG Key ID: F113BCADDB3B0CCA
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
trunk_parser/src/parser/mod.rs
View File

@ -135,7 +135,7 @@ impl Parser {
let name = expect!(self, TokenKind::Identifier(i), i, "expected identifier");
expect!(self, TokenKind::LeftBrace, "expected {");
self.lbrace()?;
let mut body = Block::new();
while self.current.kind != TokenKind::RightBrace {
@ -149,7 +149,7 @@ impl Parser {
}
}
expect!(self, TokenKind::RightBrace, "expected }");
self.rbrace()?;
Statement::Trait { name: name.into(), body }
},
@ -173,7 +173,7 @@ impl Parser {
}
}
expect!(self, TokenKind::LeftBrace, "expected {");
self.lbrace()?;
let mut body = Block::new();
while self.current.kind != TokenKind::RightBrace {
@ -230,7 +230,7 @@ impl Parser {
}
}
expect!(self, TokenKind::RightBrace, "expected }");
self.rbrace()?;
Statement::Interface { name: name.into(), extends, body }
},
@ -269,8 +269,8 @@ impl Parser {
expect!(self, TokenKind::RightParen, "expected )");
expect!(self, TokenKind::LeftBrace, "expected {");
expect!(self, TokenKind::RightBrace, "expected }");
self.lbrace()?;
self.rbrace()?;
self.semi()?;
Statement::Switch { condition }
@ -295,7 +295,7 @@ impl Parser {
};
if braced {
expect!(self, TokenKind::RightBrace, "expected }");
self.rbrace()?;
}
Statement::Namespace { name, body }
@ -320,7 +320,7 @@ impl Parser {
let then = self.block(&body_end_token)?;
if body_end_token == TokenKind::RightBrace {
expect!(self, TokenKind::RightBrace, "expected }");
self.rbrace()?;
}
let mut else_ifs: Vec<ElseIf> = Vec::new();
@ -334,11 +334,11 @@ impl Parser {
expect!(self, TokenKind::RightParen, "expected )");
expect!(self, TokenKind::LeftBrace, "expected {");
self.lbrace()?;
let body = self.block(&TokenKind::RightBrace)?;
expect!(self, TokenKind::RightBrace, "expected }");
self.rbrace()?;
else_ifs.push(ElseIf { condition, body });
} else {
@ -352,11 +352,11 @@ impl Parser {
expect!(self, TokenKind::Else, "expected else");
expect!(self, TokenKind::LeftBrace, "expected {");
self.lbrace()?;
let r#else = self.block(&TokenKind::RightBrace)?;
expect!(self, TokenKind::RightBrace, "expected }");
self.rbrace()?;
Statement::If { condition, then, else_ifs, r#else: Some(r#else) }
},
@ -457,11 +457,11 @@ impl Parser {
return_type = Some(self.type_string()?);
}
expect!(self, TokenKind::LeftBrace, "expected {");
self.lbrace()?;
let body = self.block(&TokenKind::RightBrace)?;
expect!(self, TokenKind::RightBrace, "expected }");
self.rbrace()?;
Ok(Statement::Function { name: name.into(), params, body, return_type })
}
@ -490,14 +490,14 @@ impl Parser {
}
}
expect!(self, TokenKind::LeftBrace, "expected left-brace");
self.lbrace()?;
let mut body = Vec::new();
while self.current.kind != TokenKind::RightBrace && ! self.is_eof() {
body.push(self.class_statement()?);
}
expect!(self, TokenKind::RightBrace, "expected right-brace");
self.rbrace()?;
Ok(Statement::Class { name: name.into(), extends, implements, body, flag: None })
}

8
trunk_parser/src/parser/punc.rs
View File

@ -8,4 +8,12 @@ impl Parser {
pub(crate) fn semi(&mut self) -> ParseResult<()> {
Ok(expect!(self, TokenKind::SemiColon, "expected semi colon"))
}
pub(crate) fn lbrace(&mut self) -> ParseResult<()> {
Ok(expect!(self, TokenKind::LeftBrace, "expected {"))
}
pub(crate) fn rbrace(&mut self) -> ParseResult<()> {
Ok(expect!(self, TokenKind::RightBrace, "expected }"))
}
}