Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vm conditional #29

Merged
merged 4 commits into from
Sep 22, 2023
Merged

Vm conditional #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
886e0dc
feat(vm): evaluate conditional statements
taizu-jin Sep 22, 2023
af3ec82
test(vm): test conditional statements
taizu-jin Sep 22, 2023
fc5eb17
ref(compiler): remove unnecessary OP_NULL from if statement compilation
taizu-jin Sep 22, 2023
750228f
test(vm): test conditional without a block evaluation
taizu-jin Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions src/code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,19 @@ define_constant!(OP_TRUE, 0x09);
define_constant!(OP_FALSE, 0x0A);
define_constant!(OP_JUMP_NOT_TRUTH, 0x0B, 2);
define_constant!(OP_JUMP, 0x0C, 2);
define_constant!(OP_NULL, 0x0D);
define_constant!(OP_NOT, 0x0E);
define_constant!(OP_MINUS, 0x0F);
define_constant!(OP_GET_GLOBAL, 0x10, 2);
define_constant!(OP_SET_GLOBAL, 0x11, 2);
define_constant!(OP_GET_LOCAL, 0x12, 1);
define_constant!(OP_SET_LOCAL, 0x13, 1);
define_constant!(OP_CURRENT_CLOSURE, 0x14, 1);
define_constant!(OP_AND, 0x15);
define_constant!(OP_OR, 0x16);
define_constant!(OP_STRING_TEMPLATE, 0x17, 2);
define_constant!(OP_WRITE, 0x18, 2);
define_constant!(OP_FUNCTION, 0x19, 2);
define_constant!(OP_CALL, 0x1A, 1);
define_constant!(OP_NOT, 0x0D);
define_constant!(OP_MINUS, 0x0E);
define_constant!(OP_GET_GLOBAL, 0x0F, 2);
define_constant!(OP_SET_GLOBAL, 0x10, 2);
define_constant!(OP_GET_LOCAL, 0x11, 1);
define_constant!(OP_SET_LOCAL, 0x12, 1);
define_constant!(OP_CURRENT_CLOSURE, 0x13, 1);
define_constant!(OP_AND, 0x14);
define_constant!(OP_OR, 0x15);
define_constant!(OP_STRING_TEMPLATE, 0x16, 2);
define_constant!(OP_WRITE, 0x17, 2);
define_constant!(OP_FUNCTION, 0x18, 2);
define_constant!(OP_CALL, 0x19, 1);

static DEFINITIONS: OnceLock<HashMap<u8, &'static Opcode>> = OnceLock::new();

Expand Down Expand Up @@ -132,7 +131,6 @@ impl<'a> Opcode {
map.insert(OP_FALSE.into(), &OP_FALSE);
map.insert(OP_JUMP_NOT_TRUTH.into(), &OP_JUMP_NOT_TRUTH);
map.insert(OP_JUMP.into(), &OP_JUMP);
map.insert(OP_NULL.into(), &OP_NULL);
map.insert(OP_NOT.into(), &OP_NOT);
map.insert(OP_MINUS.into(), &OP_MINUS);
map.insert(OP_GET_GLOBAL.into(), &OP_GET_GLOBAL);
Expand Down
41 changes: 23 additions & 18 deletions src/compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,27 +126,34 @@ impl Compiler {

self.compile(is.consequence)?;

let jump_pos = self.emit(OP_JUMP, &[9999]);

let after_pos: u16 = self
.current_instructions()
.len()
.try_into()
.expect("max jump index reached");
self.change_operand(jump_not_truth_pos, after_pos as i32)?;
let after_not_truth_pos: u16;

if let Some(alternative) = is.alternative {
let jump_pos = self.emit(OP_JUMP, &[9999]);

after_not_truth_pos = self
.current_instructions()
.len()
.try_into()
.expect("max jump index reached");

self.compile(alternative)?;

let after_pos: u16 = self
.current_instructions()
.len()
.try_into()
.expect("max jump index reached");
self.change_operand(jump_pos, after_pos as i32)?;
} else {
self.emit(OP_NULL, &[]);
after_not_truth_pos = self
.current_instructions()
.len()
.try_into()
.expect("max jump index reached");
}

let after_pos: u16 = self
.current_instructions()
.len()
.try_into()
.expect("max jump index reached");
self.change_operand(jump_pos, after_pos as i32)?;
self.change_operand(jump_not_truth_pos, after_not_truth_pos as i32)?;
}
Statement::Function(f) => {
self.symbol_table.define(
Expand Down Expand Up @@ -720,11 +727,9 @@ mod tests {
define_case!("IF rbap_true. 10. ENDIF. 20.";
Object::Int(10), Object::Int(20);
[make(&OP_TRUE, &[]),
make(&OP_JUMP_NOT_TRUTH, &[11]),
make(&OP_JUMP_NOT_TRUTH, &[8]),
make(&OP_CONSTANT, &[0]),
make(&OP_POP, &[]),
make(&OP_JUMP, &[12]),
make(&OP_NULL, &[]),
make(&OP_CONSTANT, &[1]),
make(&OP_POP, &[])].concat().into()),
define_case!("IF rbap_true. 10. ELSE. 15. ENDIF. 20.";
Expand Down
54 changes: 54 additions & 0 deletions src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,26 @@ impl VM {
opcode if matches!(opcode, &OP_EQUAL | &OP_NOT_EQUAL | &OP_GREATER_THAN) => {
self.execute_comparison(opcode)?
}
&OP_JUMP => {
let slice: [u8; 2] = ins[ip + 1..=ip + 2].try_into().unwrap();
let pos = u16::from_be_bytes(slice) as usize;
self.current_frame_mut().ip = pos - 1;
}
&OP_JUMP_NOT_TRUTH => {
let slice: [u8; 2] = ins[ip + 1..=ip + 2].try_into().unwrap();
let pos = u16::from_be_bytes(slice) as usize;
self.current_frame_mut().ip += 2;

let condition = if let Object::Bool(condition) = self.pop()? {
condition
} else {
unreachable!("there will always be a condition as last element")
};

if !condition {
self.current_frame_mut().ip = pos - 1;
}
}
opcode => unimplemented!("handling for {} not implemented", opcode),
}

Expand Down Expand Up @@ -565,4 +585,38 @@ mod tests {

run_vm_tests(tests)
}

#[test]
fn test_conditionals() -> Result<()> {
let tests = def_case_int!(
"IF rbap_true. 10. ENDIF.",
10,
"IF rbap_true. 10. ELSE. 20. ENDIF.",
10,
"IF rbap_false. 10. ELSE. 20. ENDIF.",
20,
"IF 1 < 2. 10. ENDIF.",
10,
"IF 1 < 2. 10. ELSE. 20. ENDIF.",
10,
"IF 1 > 2. 10. ELSE. 20. ENDIF.",
20
);

run_vm_tests(tests)
}

#[test]
fn test_conditionals_without_bock() -> Result<()> {
let tests = def_case_bool!(
"IF rbap_false. 10. ENDIF.",
false,
"IF rbap_true. ELSE. 20. ENDIF.",
true,
"IF rbap_true. ELSE. ENDIF.",
true
);

run_vm_tests(tests)
}
}
Loading