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

Make native functions const aware

Browse Source
This commit is contained in:
Andrew Morris
2023-04-04 00:13:04 +10:00
parent de3f247337
commit e54abc981f
23 changed files with 273 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
valuescript_vm/src/array_higher_functions/array_mapping_frame.rs
View File

@@ -1,5 +1,6 @@
use std::rc::Rc;
use crate::native_function::ThisWrapper;
use crate::stack_frame::FrameStepResult;
use crate::stack_frame::{CallResult, FrameStepOk, StackFrameTrait};
use crate::vs_array::VsArray;
@@ -86,7 +87,7 @@ impl StackFrameTrait for ArrayMappingFrame {
array_i,
el,
native_fn(
&mut self.this_arg.clone(),
ThisWrapper::new(false, &mut self.this_arg.clone()),
vec![
el.clone(),
Val::Number(array_i as f64),

3
valuescript_vm/src/array_higher_functions/array_reduce.rs
View File

@@ -1,6 +1,7 @@
use std::rc::Rc;
use crate::native_frame_function::NativeFrameFunction;
use crate::native_function::ThisWrapper;
use crate::stack_frame::{CallResult, FrameStepOk, FrameStepResult, StackFrameTrait};
use crate::vs_array::VsArray;
use crate::vs_value::{LoadFunctionResult, Val, ValTrait};
@@ -67,7 +68,7 @@ impl StackFrameTrait for ReduceFrame {
LoadFunctionResult::NotAFunction => return type_error!("reduce fn is not a function"),
LoadFunctionResult::NativeFunction(native_fn) => {
self.value = Some(native_fn(
&mut Val::Undefined,
ThisWrapper::new(true, &mut Val::Undefined),
vec![
value.clone(),
el.clone(),

3
valuescript_vm/src/array_higher_functions/array_reduce_right.rs
View File

@@ -1,6 +1,7 @@
use std::rc::Rc;
use crate::native_frame_function::NativeFrameFunction;
use crate::native_function::ThisWrapper;
use crate::stack_frame::{CallResult, FrameStepOk, FrameStepResult, StackFrameTrait};
use crate::vs_array::VsArray;
use crate::vs_value::{LoadFunctionResult, Val, ValTrait};
@@ -89,7 +90,7 @@ impl StackFrameTrait for ReduceRightFrame {
}
LoadFunctionResult::NativeFunction(native_fn) => {
self.value = Some(native_fn(
&mut Val::Undefined,
ThisWrapper::new(true, &mut Val::Undefined),
vec![
value.clone(),
el.clone(),

7
valuescript_vm/src/array_higher_functions/array_sort.rs
View File

@@ -1,6 +1,7 @@
use std::rc::Rc;
use crate::native_frame_function::NativeFrameFunction;
use crate::native_function::ThisWrapper;
use crate::stack_frame::FrameStepResult;
use crate::stack_frame::{CallResult, FrameStepOk, StackFrameTrait};
use crate::vs_array::VsArray;
@@ -271,7 +272,11 @@ impl StackFrameTrait for SortFrame {
return type_error!("comparator is not a function");
}
LoadFunctionResult::NativeFunction(native_fn) => {
let res = native_fn(&mut Val::Undefined, vec![left, right])?.to_number();
let res = native_fn(
ThisWrapper::new(true, &mut Val::Undefined),
vec![left, right],
)?
.to_number();
let should_swap = match res.is_nan() {
true => false,