github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-01-14 07:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow passing non-inline arrays as parameters

Browse Source
This commit is contained in:
Andrew Morris
2023-05-30 16:47:17 +10:00
parent 61e947df04
commit 7a8b388c69
1 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
valuescript_vm/src/bytecode_stack_frame.rs
View File

@@ -57,36 +57,56 @@ impl BytecodeStackFrame {
}
pub fn transfer_parameters(&mut self, new_frame: &mut StackFrame) {
let bytecode_type = self.decoder.decode_type();
let bytecode_type = self.decoder.peek_type();
if bytecode_type != BytecodeType::Array {
panic!("Not implemented: call instruction not using inline array");
if bytecode_type == BytecodeType::Array {
self.decoder.decode_type();
while self.decoder.peek_type() != BytecodeType::End {
let p = self.decoder.decode_val(&self.registers);
new_frame.write_param(p);
}
self.decoder.decode_type(); // End (TODO: assert)
return;
}
while self.decoder.peek_type() != BytecodeType::End {
let p = self.decoder.decode_val(&self.registers);
new_frame.write_param(p);
}
let params = self.decoder.decode_val(&self.registers);
self.decoder.decode_type(); // End (TODO: assert)
match params {
Val::Array(array_data) => {
for param in &array_data.elements {
new_frame.write_param(param.clone())
}
}
_ => panic!("Unexpected non-array params"),
}
}
pub fn decode_parameters(&mut self) -> Vec<Val> {
let mut res = Vec::<Val>::new();
let bytecode_type = self.decoder.decode_type();
let bytecode_type = self.decoder.peek_type();
if bytecode_type != BytecodeType::Array {
panic!("Not implemented: call instruction not using inline array");
if bytecode_type == BytecodeType::Array {
self.decoder.decode_type();
while self.decoder.peek_type() != BytecodeType::End {
res.push(self.decoder.decode_val(&self.registers));
}
self.decoder.decode_type(); // End (TODO: assert)
return res;
}
while self.decoder.peek_type() != BytecodeType::End {
res.push(self.decoder.decode_val(&self.registers));
let params = self.decoder.decode_val(&self.registers);
match params {
Val::Array(array_data) => array_data.elements.clone(),
_ => panic!("Unexpected non-array params"),
}
self.decoder.decode_type(); // End (TODO: assert)
return res;
}
}