jeff/dust
1
0
Fork 0
Code

Fix binary expressions with variables

Browse Source
This commit is contained in:
Jeff 2024-09-18 01:21:40 -04:00
parent 2f8c46f0a5
commit 0a16c5e0ca
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dust-lang/src/parser/mod.rs
View File

@ -289,12 +289,6 @@ impl<'src> Parser<'src> {
} }
fn parse_binary(&mut self) -> Result<(), ParseError> { fn parse_binary(&mut self) -> Result<(), ParseError> {
let operator_position = self.current_position;
let operator = self.current_token;
let rule = ParseRule::from(&operator.kind());
self.advance()?;
let (left_instruction, left_position) = let (left_instruction, left_position) =
self.chunk.pop_instruction(self.current_position)?; self.chunk.pop_instruction(self.current_position)?;
let mut push_back_left = false; let mut push_back_left = false;
@ -313,10 +307,16 @@ impl<'src> Parser<'src> {
_ => { _ => {
push_back_left = true; push_back_left = true;
self.current_register - 1 self.current_register
} }
}; };
let operator_position = self.current_position;
let operator = self.current_token;
let rule = ParseRule::from(&operator.kind());
self.advance()?;
self.parse(rule.precedence.increment())?; self.parse(rule.precedence.increment())?;
let (right_instruction, right_position) = let (right_instruction, right_position) =
@ -337,7 +337,7 @@ impl<'src> Parser<'src> {
_ => { _ => {
push_back_right = true; push_back_right = true;
self.current_register - 1 self.current_register
} }
}; };
@ -414,7 +414,6 @@ impl<'src> Parser<'src> {
if let Some(register_index) = previous_register { if let Some(register_index) = previous_register {
previous_instruction.set_destination(register_index); previous_instruction.set_destination(register_index);
self.emit_instruction(previous_instruction, self.current_position); self.emit_instruction(previous_instruction, self.current_position);
self.decrement_register()?;
} else { } else {
self.emit_instruction(previous_instruction, previous_position); self.emit_instruction(previous_instruction, previous_position);
self.emit_instruction( self.emit_instruction(
@ -434,6 +433,7 @@ impl<'src> Parser<'src> {
Instruction::get_local(self.current_register, local_index), Instruction::get_local(self.current_register, local_index),
self.current_position, self.current_position,
); );
self.increment_register()?;
} }
Ok(()) Ok(())
@ -575,29 +575,11 @@ impl<'src> Parser<'src> {
self.parse_expression()?; self.parse_expression()?;
let register = self.chunk.get_last_instruction(position)?.0.destination(); let register = self.chunk.get_last_instruction(position)?.0.destination();
let local_index = self let local_index = self
.chunk .chunk
.declare_local(identifier, register, self.current_position)?; .declare_local(identifier, register, self.current_position)?;
let (previous_instruction, previous_position) = self.emit_instruction(Instruction::declare_local(register, local_index), position);
self.chunk.pop_instruction(self.current_position)?;
if let Operation::GetLocal = previous_instruction.operation() {
let move_instruction = Instruction::r#move(
previous_instruction.destination(),
previous_instruction.first_argument(),
);
self.emit_instruction(move_instruction, position);
} else {
self.emit_instruction(previous_instruction, previous_position);
}
self.emit_instruction(
Instruction::declare_local(self.current_register - 1, local_index),
position,
);
Ok(()) Ok(())
} }