github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-04-18 03:00:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert most vm panics into exceptions

Browse Source
This commit is contained in:
Andrew Morris
2023-03-21 13:45:22 +11:00
parent a59b577cd3
commit f75b0c7152
27 changed files with 319 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
valuescript_vm/src/vs_pointer.rs
View File

@@ -3,6 +3,8 @@ use std::rc::Rc;
use num_bigint::BigInt;
use crate::format_err;
use super::bytecode_decoder::{BytecodeDecoder, BytecodeType};
use super::vs_array::VsArray;
use super::vs_class::VsClass;
@@ -54,8 +56,8 @@ impl ValTrait for VsPointer {
};
return match bd.decode_type() {
BytecodeType::End => std::panic!("Invalid: pointer to end"),
BytecodeType::Void => std::panic!("Invalid: pointer to void"),
BytecodeType::End => panic!("Invalid: pointer to end"),
BytecodeType::Void => panic!("Invalid: pointer to void"),
BytecodeType::Undefined => VsType::Undefined,
BytecodeType::Null => VsType::Null,
BytecodeType::False => VsType::Bool,
@@ -66,12 +68,12 @@ impl ValTrait for VsPointer {
BytecodeType::Array => VsType::Array,
BytecodeType::Object => VsType::Object,
BytecodeType::Function => VsType::Function,
BytecodeType::Pointer => std::panic!("Invalid: pointer to pointer"),
BytecodeType::Register => std::panic!("Invalid: pointer to register"),
BytecodeType::Builtin => std::panic!("Invalid: pointer to builtin"),
BytecodeType::Pointer => panic!("Invalid: pointer to pointer"),
BytecodeType::Register => panic!("Invalid: pointer to register"),
BytecodeType::Builtin => panic!("Invalid: pointer to builtin"),
BytecodeType::Class => VsType::Class,
BytecodeType::BigInt => VsType::BigInt,
BytecodeType::Unrecognized => std::panic!("Unrecognized bytecode type at {}", self.pos - 1),
BytecodeType::Unrecognized => panic!("Unrecognized bytecode type at {}", self.pos - 1),
};
}
@@ -138,12 +140,12 @@ impl ValTrait for VsPointer {
return self.resolve().load_function();
}
fn sub(&self, subscript: Val) -> Val {
return self.resolve().sub(subscript);
fn sub(&self, subscript: Val) -> Result<Val, Val> {
self.resolve().sub(subscript)
}
fn submov(&mut self, _subscript: Val, _value: Val) {
std::panic!("Not implemented");
fn submov(&mut self, _subscript: Val, _value: Val) -> Result<(), Val> {
format_err!("TODO: Probably an exception, but might be possible")
}
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {