jeff/dust
1
0
Fork 0
Code Issues

Replace some "if let" statements with "matches!" macro for better formatting

Browse Source
This commit is contained in:
Jeff 2024-11-05 22:07:54 -05:00
parent 3330939128
commit 9650183c73
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dust-lang/src/parser.rs
View File

@ -222,10 +222,15 @@ impl<'src> Parser<'src> {
} }
fn optimize_statement(&mut self) { fn optimize_statement(&mut self) {
if let Some( if matches!(
[Operation::LoadBoolean | Operation::LoadConstant, Operation::LoadBoolean | Operation::LoadConstant, Operation::Jump, Operation::Equal | Operation::Less | Operation::LessEqual], self.get_end_of_statement(),
) = self.get_end_of_statement() Some([
{ Operation::LoadBoolean | Operation::LoadConstant,
Operation::LoadBoolean | Operation::LoadConstant,
Operation::Jump,
Operation::Equal | Operation::Less | Operation::LessEqual
],)
) {
log::trace!("Optimizing boolean comparison"); log::trace!("Optimizing boolean comparison");
let mut instructions = self let mut instructions = self
@ -1017,10 +1022,15 @@ impl<'src> Parser<'src> {
self.advance()?; self.advance()?;
self.parse_expression()?; self.parse_expression()?;
if let Some( if matches!(
[Operation::LoadBoolean, Operation::LoadBoolean, Operation::Jump, Operation::Equal | Operation::Less | Operation::LessEqual], self.get_end_of_statement(),
) = self.get_end_of_statement() Some([
{ Operation::LoadBoolean,
Operation::LoadBoolean,
Operation::Jump,
Operation::Equal | Operation::Less | Operation::LessEqual
],)
) {
self.chunk.instructions_mut().pop(); self.chunk.instructions_mut().pop();
self.chunk.instructions_mut().pop(); self.chunk.instructions_mut().pop();
} }
@ -1152,10 +1162,15 @@ impl<'src> Parser<'src> {
self.parse_expression()?; self.parse_expression()?;
if let Some( if matches!(
[Operation::LoadBoolean, Operation::LoadBoolean, Operation::Jump, Operation::Equal | Operation::Less | Operation::LessEqual], self.get_end_of_statement(),
) = self.get_end_of_statement() Some([
{ Operation::LoadBoolean,
Operation::LoadBoolean,
Operation::Jump,
Operation::Equal | Operation::Less | Operation::LessEqual
],)
) {
self.chunk.instructions_mut().pop(); self.chunk.instructions_mut().pop();
self.chunk.instructions_mut().pop(); self.chunk.instructions_mut().pop();
self.chunk.instructions_mut().pop(); self.chunk.instructions_mut().pop();