Noratrieb/dilaria
1
0
Fork 0
mirror of https://github.com/Noratrieb/dilaria.git synced 2026-01-15 18:05:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

while!

Browse source
This commit is contained in:
nora 2022-01-04 21:35:45 +01:00
parent a4dfbb5cd3
commit 48f2bee7f0
8 changed files with 85 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bytecode.rs
View file

@ -67,8 +67,8 @@ pub enum Instr {
/// Println the value on top of the stack
Print,
/// If the current stack value is true, skip `usize` instructions. When jumping backwards
JumpFalse(isize),
/// Same as `JumpCond`, but unconditional
/// If the current stack value is false, skip `usize` instructions.
JmpFalse(isize),
/// Same as `JmpFalse`, but unconditional
Jmp(isize),
}

19
src/compile.rs
View file

@ -163,7 +163,7 @@ impl<'ast, 'bc, 'gc> Compiler<'ast, 'bc, 'gc> {
self.compile_expr(&if_stmt.cond)?;
// the offset will be fixed later
let jmp_idx = self.push_instr(Instr::JumpFalse(0), StackChange::Shrink, if_stmt.span);
let jmp_idx = self.push_instr(Instr::JmpFalse(0), StackChange::Shrink, if_stmt.span);
self.compile_block(&if_stmt.body)?;
@ -172,7 +172,7 @@ impl<'ast, 'bc, 'gc> Compiler<'ast, 'bc, 'gc> {
let jmp_pos = self.forward_jmp_offset(jmp_idx as isize);
self.change_instr(jmp_idx, Instr::JumpFalse(jmp_pos));
self.change_instr(jmp_idx, Instr::JmpFalse(jmp_pos));
match else_part {
ElsePart::Else(block, _) => {
@ -188,7 +188,7 @@ impl<'ast, 'bc, 'gc> Compiler<'ast, 'bc, 'gc> {
self.change_instr(else_skip_jmp_idx, Instr::Jmp(jmp_pos));
} else {
let jmp_pos = self.forward_jmp_offset(jmp_idx as isize);
self.change_instr(jmp_idx, Instr::JumpFalse(jmp_pos));
self.change_instr(jmp_idx, Instr::JmpFalse(jmp_pos));
}
Ok(())
@ -222,17 +222,18 @@ impl<'ast, 'bc, 'gc> Compiler<'ast, 'bc, 'gc> {
let cond_index = self.code_len();
self.compile_expr(&while_stmt.cond)?;
let cond_jmp_index = self.push_instr(Instr::Jmp(0), StackChange::Shrink, while_stmt.span);
let jmp_false_idx =
self.push_instr(Instr::JmpFalse(0), StackChange::Shrink, while_stmt.span);
self.compile_block(&while_stmt.body)?;
let index_of_jmp = self.code_len();
let jmp_offset = -(index_of_jmp - (cond_index as isize) + 1);
let jmp_offset = self.back_jmp_offset(cond_index);
self.push_instr(Instr::Jmp(jmp_offset), StackChange::None, while_stmt.span);
let skip_amount = self.back_jmp_offset(cond_jmp_index as isize);
self.change_instr(cond_jmp_index, Instr::Jmp(skip_amount));
todo!()
let jmp_offset = self.forward_jmp_offset(jmp_false_idx as isize);
self.change_instr(jmp_false_idx, Instr::JmpFalse(jmp_offset));
Ok(())
}
fn compile_break(&mut self, _: Span) -> CResult {

2
src/vm.rs
View file

@ -151,7 +151,7 @@ impl<'bc> Vm<'bc, '_> {
let val = self.stack.pop().unwrap();
writeln!(self.stdout, "{}", val).map_err(|_| "failed to write to stdout")?;
}
Instr::JumpFalse(pos) => {
Instr::JmpFalse(pos) => {
let val = self.stack.pop().unwrap();
match val {
Value::Bool(false) => self.pc = (self.pc as isize + pos) as usize,