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

to_val refactor, remove error macros

Browse Source
This commit is contained in:
Andrew Morris
2023-05-26 11:54:43 +10:00
parent 80cd4deac8
commit ea42e94d5d
36 changed files with 632 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
valuescript_vm/src/native_function.rs
View File

@@ -2,12 +2,12 @@ use std::rc::Rc;
use num_bigint::BigInt;
use crate::format_err;
use crate::builtins::error_builtin::ToError;
use crate::builtins::type_error_builtin::ToTypeError;
use crate::vs_array::VsArray;
use crate::vs_class::VsClass;
use crate::vs_object::VsObject;
use crate::vs_value::{LoadFunctionResult, Val, ValTrait, VsType};
use crate::{builtins::type_error_builtin::to_type_error, type_error};
use crate::vs_value::{LoadFunctionResult, ToVal, ToValString, Val, ValTrait, VsType};
pub struct ThisWrapper<'a> {
const_: bool,
@@ -25,7 +25,7 @@ impl<'a> ThisWrapper<'a> {
pub fn get_mut(&mut self) -> Result<&mut Val, Val> {
if self.const_ {
return type_error!("Cannot mutate this because it is const");
return Err("Cannot mutate this because it is const".to_type_error());
}
Ok(self.this)
@@ -53,7 +53,7 @@ impl ValTrait for NativeFunction {
false
}
fn to_primitive(&self) -> Val {
Val::String(Rc::new(self.val_to_string()))
self.to_val_string()
}
fn is_truthy(&self) -> bool {
true
@@ -84,11 +84,11 @@ impl ValTrait for NativeFunction {
}
fn sub(&self, _key: Val) -> Result<Val, Val> {
format_err!("TODO: Subscript native function")
Err("TODO: Subscript native function".to_error())
}
fn submov(&mut self, _key: Val, _value: Val) -> Result<(), Val> {
type_error!("Cannot assign to subscript of native function")
Err("Cannot assign to subscript of native function".to_type_error())
}
fn next(&mut self) -> LoadFunctionResult {
@@ -103,3 +103,9 @@ impl ValTrait for NativeFunction {
"function() { [native code] }".into()
}
}
impl ToVal for &'static NativeFunction {
fn to_val(self) -> Val {
Val::Static(self)
}
}