kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Move to FnPtr.

Browse Source
This commit is contained in:
Stephen Chung 2022-12-20 14:43:30 +08:00
parent cabab14475
commit 99080be91d
2 changed files with 120 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/packages/array_basic.rs
View File

@ -26,52 +26,6 @@ def_package! {
}
}
/// Make a call to a function pointer.
///
/// If the function pointer is linked to a scripted function definition, use the appropriate number
/// of arguments to call it directly (one version attaches an extra numeric argument).
fn make_dual_arity_fn_ptr_call<const N: usize>(
fn_name: &str,
fn_ptr: &FnPtr,
ctx: &NativeCallContext,
items: [Dynamic; N],
number: usize,
) -> RhaiResult {
#[cfg(not(feature = "no_function"))]
{
let arity = fn_ptr.fn_def().map(|f| f.params.len()).unwrap_or(0);
if arity == N {
return fn_ptr.call_raw(&ctx, None, items);
} else if arity == N + 1 {
let mut items2 = crate::StaticVec::new_const();
items2.extend(IntoIterator::into_iter(items));
items2.push((number as INT).into());
return fn_ptr.call_raw(&ctx, None, items2);
}
}
fn_ptr
.call_raw(&ctx, None, items.clone())
.or_else(|err| match *err {
ERR::ErrorFunctionNotFound(sig, ..) if sig.starts_with(fn_ptr.fn_name()) => {
let mut items2 = crate::StaticVec::new_const();
items2.extend(IntoIterator::into_iter(items));
items2.push((number as INT).into());
fn_ptr.call_raw(&ctx, None, items2)
}
_ => Err(err),
})
.map_err(|err| {
Box::new(ERR::ErrorInFunctionCall(
fn_name.to_string(),
ctx.source().unwrap_or("").to_string(),
err,
Position::NONE,
))
})
}
#[export_module]
pub mod array_functions {
/// Number of elements in the array.
@ -698,7 +652,7 @@ pub mod array_functions {
/// print(y); // prints "[0, 2, 6, 12, 20]"
/// ```
#[rhai_fn(return_raw)]
pub fn map(ctx: NativeCallContext, array: Array, mapper: FnPtr) -> RhaiResultOf<Array> {
pub fn map(ctx: NativeCallContext, array: Array, map: FnPtr) -> RhaiResultOf<Array> {
if array.is_empty() {
return Ok(array);
}
@ -706,13 +660,9 @@ pub mod array_functions {
let mut ar = Array::with_capacity(array.len());
for (i, item) in array.into_iter().enumerate() {
ar.push(make_dual_arity_fn_ptr_call(
"map",
&mapper,
&ctx,
[item],
i,
)?);
let ex = [(i as INT).into()];
ar.push(map.call_raw_with_extra_args("map", &ctx, None, [item], ex)?);
}
Ok(ar)
@ -748,7 +698,10 @@ pub mod array_functions {
let mut ar = Array::new();
for (i, item) in array.into_iter().enumerate() {
if make_dual_arity_fn_ptr_call("filter", &filter, &ctx, [item.clone()], i)?
let ex = [(i as INT).into()];
if filter
.call_raw_with_extra_args("filter", &ctx, None, [item.clone()], ex)?
.as_bool()
.unwrap_or(false)
{
@ -976,7 +929,10 @@ pub mod array_functions {
let (start, ..) = calc_offset_len(array.len(), start, 0);
for (i, item) in array.iter().enumerate().skip(start) {
if make_dual_arity_fn_ptr_call("index_of", &filter, &ctx, [item.clone()], i)?
let ex = [(i as INT).into()];
if filter
.call_raw_with_extra_args("index_of", &ctx, None, [item.clone()], ex)?
.as_bool()
.unwrap_or(false)
{
@ -1011,7 +967,10 @@ pub mod array_functions {
}
for (i, item) in array.iter().enumerate() {
if make_dual_arity_fn_ptr_call("some", &filter, &ctx, [item.clone()], i)?
let ex = [(i as INT).into()];
if filter
.call_raw_with_extra_args("some", &ctx, None, [item.clone()], ex)?
.as_bool()
.unwrap_or(false)
{
@ -1046,7 +1005,10 @@ pub mod array_functions {
}
for (i, item) in array.iter().enumerate() {
if !make_dual_arity_fn_ptr_call("all", &filter, &ctx, [item.clone()], i)?
let ex = [(i as INT).into()];
if !filter
.call_raw_with_extra_args("all", &ctx, None, [item.clone()], ex)?
.as_bool()
.unwrap_or(false)
{
@ -1172,7 +1134,8 @@ pub mod array_functions {
.iter()
.enumerate()
.try_fold(initial, |result, (i, item)| {
make_dual_arity_fn_ptr_call("reduce", &reducer, &ctx, [result, item.clone()], i)
let ex = [(i as INT).into()];
reducer.call_raw_with_extra_args("reduce", &ctx, None, [result, item.clone()], ex)
})
}
/// Reduce an array by iterating through all elements, in _reverse_ order,
@ -1239,12 +1202,14 @@ pub mod array_functions {
.rev()
.enumerate()
.try_fold(initial, |result, (i, item)| {
make_dual_arity_fn_ptr_call(
let ex = [((array.len() - 1 - i) as INT).into()];
reducer.call_raw_with_extra_args(
"reduce_rev",
&reducer,
&ctx,
None,
[result, item.clone()],
array.len() - 1 - i,
ex,
)
})
}
@ -1427,7 +1392,10 @@ pub mod array_functions {
let mut x = 0;
while x < array.len() {
if make_dual_arity_fn_ptr_call("drain", &filter, &ctx, [array[x].clone()], i)?
let ex = [(i as INT).into()];
if filter
.call_raw_with_extra_args("drain", &ctx, None, [array[x].clone()], ex)?
.as_bool()
.unwrap_or(false)
{
@ -1567,7 +1535,10 @@ pub mod array_functions {
let mut x = 0;
while x < array.len() {
if make_dual_arity_fn_ptr_call("retain", &filter, &ctx, [array[x].clone()], i)?
let ex = [(i as INT).into()];
if filter
.call_raw_with_extra_args("retain", &ctx, None, [array[x].clone()], ex)?
.as_bool()
.unwrap_or(false)
{

85
src/types/fn_ptr.rs
View File

@ -357,6 +357,91 @@ impl FnPtr {
pub(crate) fn set_fn_def(&mut self, value: Option<impl Into<Shared<crate::ast::ScriptFnDef>>>) {
self.fn_def = value.map(Into::into);
}
/// Make a call to a function pointer with either a specified number of arguments, or with extra
/// arguments attached.
///
/// This is useful for calling predicate closures within an iteration loop where the extra argument
/// is the current element's index.
///
/// If the function pointer is linked to a scripted function definition, use the appropriate number
/// of arguments to call it directly (one version attaches extra arguments).
#[cfg(not(feature = "internals"))]
#[inline(always)]
pub(crate) fn call_raw_with_extra_args<const N: usize, const E: usize>(
&self,
fn_name: &str,
ctx: &NativeCallContext,
this_ptr: Option<&mut Dynamic>,
items: [Dynamic; N],
extras: [Dynamic; E],
) -> RhaiResult {
self._call_with_extra_args(fn_name, ctx, this_ptr, items, extras)
}
/// _(internals)_ Make a call to a function pointer with either a specified number of arguments,
/// or with extra arguments attached.
/// Exported under the `internals` feature only.
///
/// This is useful for calling predicate closures within an iteration loop where the extra
/// argument is the current element's index.
///
/// If the function pointer is linked to a scripted function definition, use the appropriate
/// number of arguments to call it directly (one version attaches extra arguments).
#[cfg(feature = "internals")]
#[inline(always)]
pub fn call_raw_with_extra_args<const N: usize, const E: usize>(
&self,
fn_name: &str,
ctx: &NativeCallContext,
this_ptr: Option<&mut Dynamic>,
items: [Dynamic; N],
extras: [Dynamic; E],
) -> RhaiResult {
self._call_with_extra_args(fn_name, ctx, this_ptr, items, extras)
}
/// Make a call to a function pointer with either a specified number of arguments, or with extra
/// arguments attached.
fn _call_with_extra_args<const N: usize, const E: usize>(
&self,
fn_name: &str,
ctx: &NativeCallContext,
mut this_ptr: Option<&mut Dynamic>,
items: [Dynamic; N],
extras: [Dynamic; E],
) -> RhaiResult {
#[cfg(not(feature = "no_function"))]
{
let arity = self.fn_def().map(|f| f.params.len()).unwrap_or(0);
if arity == N {
return self.call_raw(&ctx, None, items);
} else if arity == N + E {
let mut items2 = FnArgsVec::with_capacity(items.len() + extras.len());
items2.extend(IntoIterator::into_iter(items));
items2.extend(IntoIterator::into_iter(extras));
return self.call_raw(&ctx, this_ptr, items2);
}
}
self.call_raw(&ctx, this_ptr.as_deref_mut(), items.clone())
.or_else(|err| match *err {
ERR::ErrorFunctionNotFound(sig, ..) if sig.starts_with(self.fn_name()) => {
let mut items2 = FnArgsVec::with_capacity(items.len() + extras.len());
items2.extend(IntoIterator::into_iter(items));
items2.extend(IntoIterator::into_iter(extras));
self.call_raw(&ctx, this_ptr, items2)
}
_ => Err(err),
})
.map_err(|err| {
Box::new(ERR::ErrorInFunctionCall(
fn_name.to_string(),
ctx.source().unwrap_or("").to_string(),
err,
Position::NONE,
))
})
}
}
impl fmt::Display for FnPtr {