Add call_fn_with_global_raw.
This commit is contained in:
parent
63592ed648
commit
d61f7fa7c2
@ -24,6 +24,7 @@ Enhancements
|
|||||||
* `to_json` is added to object maps to cheaply convert it to JSON format (`()` is mapped to `null`, all other data types must be supported by JSON)
|
* `to_json` is added to object maps to cheaply convert it to JSON format (`()` is mapped to `null`, all other data types must be supported by JSON)
|
||||||
* A global function `format_map_as_json` is provided which is the same as `to_json` for object maps.
|
* A global function `format_map_as_json` is provided which is the same as `to_json` for object maps.
|
||||||
* `FileModuleResolver` now accepts a custom `Scope` to provide constants for optimization.
|
* `FileModuleResolver` now accepts a custom `Scope` to provide constants for optimization.
|
||||||
|
* A new low-level method `Engine::call_fn_with_global_raw` is added to add speed to repeated function calls.
|
||||||
|
|
||||||
|
|
||||||
Version 1.6.1
|
Version 1.6.1
|
||||||
|
@ -83,8 +83,9 @@ impl Engine {
|
|||||||
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
|
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
/// Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments and the
|
/// Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments.
|
||||||
/// following options:
|
///
|
||||||
|
/// The following options are available:
|
||||||
///
|
///
|
||||||
/// * whether to evaluate the [`AST`] to load necessary modules before calling the function
|
/// * whether to evaluate the [`AST`] to load necessary modules before calling the function
|
||||||
/// * whether to rewind the [`Scope`] after the function call
|
/// * whether to rewind the [`Scope`] after the function call
|
||||||
@ -148,7 +149,7 @@ impl Engine {
|
|||||||
/// # Ok(())
|
/// # Ok(())
|
||||||
/// # }
|
/// # }
|
||||||
/// ```
|
/// ```
|
||||||
#[inline]
|
#[inline(always)]
|
||||||
pub fn call_fn_raw(
|
pub fn call_fn_raw(
|
||||||
&self,
|
&self,
|
||||||
scope: &mut Scope,
|
scope: &mut Scope,
|
||||||
@ -158,9 +159,83 @@ impl Engine {
|
|||||||
name: impl AsRef<str>,
|
name: impl AsRef<str>,
|
||||||
this_ptr: Option<&mut Dynamic>,
|
this_ptr: Option<&mut Dynamic>,
|
||||||
arg_values: impl AsMut<[Dynamic]>,
|
arg_values: impl AsMut<[Dynamic]>,
|
||||||
|
) -> RhaiResult {
|
||||||
|
self.call_fn_internal(
|
||||||
|
scope,
|
||||||
|
&mut GlobalRuntimeState::new(self),
|
||||||
|
ast,
|
||||||
|
eval_ast,
|
||||||
|
rewind_scope,
|
||||||
|
name,
|
||||||
|
this_ptr,
|
||||||
|
arg_values,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/// _(internals)_ Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments.
|
||||||
|
/// Exported under the `internals` feature only.
|
||||||
|
///
|
||||||
|
/// The following options are available:
|
||||||
|
///
|
||||||
|
/// * whether to evaluate the [`AST`] to load necessary modules before calling the function
|
||||||
|
/// * whether to rewind the [`Scope`] after the function call
|
||||||
|
/// * a value for binding to the `this` pointer (if any)
|
||||||
|
///
|
||||||
|
/// Not available under `no_function`.
|
||||||
|
///
|
||||||
|
/// # WARNING - Low Level API
|
||||||
|
///
|
||||||
|
/// This function is very low level.
|
||||||
|
///
|
||||||
|
/// A [`GlobalRuntimeState`] needs to be passed into the function, which can be created via
|
||||||
|
/// [`GlobalRuntimeState::new`]. This makes repeatedly calling particular functions
|
||||||
|
/// extremely efficient as the functions resolution cache inside the [`GlobalRuntimeState`]
|
||||||
|
/// is kept intact.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
///
|
||||||
|
/// All the arguments are _consumed_, meaning that they're replaced by `()`.
|
||||||
|
/// This is to avoid unnecessarily cloning the arguments.
|
||||||
|
///
|
||||||
|
/// Do not use the arguments after this call. If they are needed afterwards, clone them _before_
|
||||||
|
/// calling this function.
|
||||||
|
#[cfg(feature = "internals")]
|
||||||
|
#[inline(always)]
|
||||||
|
pub fn call_fn_with_global_raw(
|
||||||
|
&self,
|
||||||
|
scope: &mut Scope,
|
||||||
|
global: &mut GlobalRuntimeState,
|
||||||
|
ast: &AST,
|
||||||
|
eval_ast: bool,
|
||||||
|
rewind_scope: bool,
|
||||||
|
name: impl AsRef<str>,
|
||||||
|
this_ptr: Option<&mut Dynamic>,
|
||||||
|
arg_values: impl AsMut<[Dynamic]>,
|
||||||
|
) -> RhaiResult {
|
||||||
|
self.call_fn_internal(
|
||||||
|
scope,
|
||||||
|
global,
|
||||||
|
ast,
|
||||||
|
eval_ast,
|
||||||
|
rewind_scope,
|
||||||
|
name,
|
||||||
|
this_ptr,
|
||||||
|
arg_values,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments.
|
||||||
|
fn call_fn_internal(
|
||||||
|
&self,
|
||||||
|
scope: &mut Scope,
|
||||||
|
global: &mut GlobalRuntimeState,
|
||||||
|
ast: &AST,
|
||||||
|
eval_ast: bool,
|
||||||
|
rewind_scope: bool,
|
||||||
|
name: impl AsRef<str>,
|
||||||
|
this_ptr: Option<&mut Dynamic>,
|
||||||
|
arg_values: impl AsMut<[Dynamic]>,
|
||||||
) -> RhaiResult {
|
) -> RhaiResult {
|
||||||
let caches = &mut Caches::new();
|
let caches = &mut Caches::new();
|
||||||
let global = &mut GlobalRuntimeState::new(self);
|
|
||||||
|
|
||||||
let statements = ast.statements();
|
let statements = ast.statements();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user