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

Handle iterators in CatStackFrame

Browse Source
This commit is contained in:
Andrew Morris
2023-05-30 14:00:51 +10:00
parent c12a27a1ff
commit 4729d006a3
12 changed files with 134 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
valuescript_vm/src/bytecode_stack_frame.rs
View File

@@ -306,13 +306,10 @@ impl StackFrameTrait for BytecodeStackFrame {
let subscript = self.decoder.decode_val(&self.registers);
let fn_ = operations::op_sub(
match &obj {
ThisArg::Register(reg_i) => self.registers[reg_i.clone()].clone(),
ThisArg::Val(val) => val.clone(),
},
subscript,
)?;
let fn_ = match &obj {
ThisArg::Register(reg_i) => self.registers[reg_i.clone()].sub(subscript)?,
ThisArg::Val(val) => val.sub(subscript)?,
};
match fn_.load_function() {
LoadFunctionResult::NotAFunction => {
@@ -480,7 +477,7 @@ impl StackFrameTrait for BytecodeStackFrame {
let res_i = self.decoder.decode_register_index();
let next_fn = operations::op_sub(self.registers[iter_i].clone(), "next".to_val())?;
let next_fn = self.registers[iter_i].sub("next".to_val())?;
match next_fn.load_function() {
LoadFunctionResult::NotAFunction => {
@@ -511,13 +508,11 @@ impl StackFrameTrait for BytecodeStackFrame {
};
if let Some(value_i) = self.decoder.decode_register_index() {
self.registers[value_i] =
operations::op_sub(self.registers[iter_res_i].clone(), "value".to_val())?;
self.registers[value_i] = self.registers[iter_res_i].sub("value".to_val())?;
}
if let Some(done_i) = self.decoder.decode_register_index() {
self.registers[done_i] =
operations::op_sub(self.registers[iter_res_i].clone(), "done".to_val())?;
self.registers[done_i] = self.registers[iter_res_i].sub("done".to_val())?;
}
}
@@ -527,11 +522,7 @@ impl StackFrameTrait for BytecodeStackFrame {
"TODO: cat non-inline arrays"
);
let cat_frame = CatStackFrame {
args: self.decoder.decode_vec_val(&self.registers),
i: 0,
res: vec![],
};
let cat_frame = CatStackFrame::from_args(self.decoder.decode_vec_val(&self.registers));
self.return_target = self.decoder.decode_register_index();