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

Make NativeFunction use exceptions (panics not converted though)

Browse Source
This commit is contained in:
Andrew Morris
2023-03-21 12:07:04 +11:00
parent 79534a8d38
commit a59b577cd3
19 changed files with 335 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
valuescript_vm/src/bytecode_stack_frame.rs
View File

@@ -178,7 +178,7 @@ impl StackFrameTrait for BytecodeStackFrame {
return Ok(FrameStepOk::Push(new_frame));
}
LoadFunctionResult::NativeFunction(native_fn) => {
let res = native_fn(&mut Val::Undefined, self.decode_parameters());
let res = native_fn(&mut Val::Undefined, self.decode_parameters())?;
match self.decoder.decode_register_index() {
Some(return_target) => {
@@ -308,9 +308,9 @@ impl StackFrameTrait for BytecodeStackFrame {
let res = match &mut obj {
ThisArg::Register(reg_i) => {
native_fn(self.registers.get_mut(reg_i.clone()).unwrap(), params)
native_fn(self.registers.get_mut(reg_i.clone()).unwrap(), params)?
}
ThisArg::Val(val) => native_fn(val, params),
ThisArg::Val(val) => native_fn(val, params)?,
};
match self.decoder.decode_register_index() {
@@ -379,7 +379,7 @@ impl StackFrameTrait for BytecodeStackFrame {
return Ok(FrameStepOk::Push(new_frame));
}
LoadFunctionResult::NativeFunction(native_fn) => {
native_fn(&mut instance, self.decode_parameters());
native_fn(&mut instance, self.decode_parameters())?;
match self.decoder.decode_register_index() {
Some(target) => {