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

Change to struct variants for better flexibility.

Browse Source
This commit is contained in:
Stephen Chung 2022-12-14 12:07:33 +08:00
parent 82a455b4d7
commit da7a887f67
5 changed files with 144 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ast/stmt.rs
View File

@ -573,8 +573,8 @@ pub enum Stmt {
Assignment(Box<(OpAssignment, BinaryExpr)>), Assignment(Box<(OpAssignment, BinaryExpr)>),
/// func `(` expr `,` ... `)` /// func `(` expr `,` ... `)`
/// ///
/// Note - this is a duplicate of [`Expr::FnCall`] to cover the very common pattern of a single /// This is a duplicate of [`Expr::FnCall`] to cover the very common pattern of a single
/// function call forming one statement. /// function call forming one statement.
FnCall(Box<FnCallExpr>, Position), FnCall(Box<FnCallExpr>, Position),
/// `{` stmt`;` ... `}` /// `{` stmt`;` ... `}`
Block(Box<StmtBlock>), Block(Box<StmtBlock>),

38
src/func/call.rs
View File

@ -270,25 +270,31 @@ impl Engine {
} }
// Try to find a built-in version // Try to find a built-in version
let builtin = let builtin = args.and_then(|args| match op_token {
args.and_then(|args| match op_token { Token::NONE => None,
Token::NONE => None, token if token.is_op_assignment() => {
token if token.is_op_assignment() => { let (first_arg, rest_args) = args.split_first().unwrap();
let (first_arg, rest_args) = args.split_first().unwrap();
get_builtin_op_assignment_fn(token, first_arg, rest_args[0]) get_builtin_op_assignment_fn(token, first_arg, rest_args[0]).map(
.map(|(f, ctx)| FnResolutionCacheEntry { |(f, has_context)| FnResolutionCacheEntry {
func: CallableFunction::Method(Shared::new(f), ctx), func: CallableFunction::Method {
source: None, func: Shared::new(f),
}) has_context,
} },
token => get_builtin_binary_op_fn(token, args[0], args[1]).map(
|(f, ctx)| FnResolutionCacheEntry {
func: CallableFunction::Method(Shared::new(f), ctx),
source: None, source: None,
}, },
), )
}); }
token => get_builtin_binary_op_fn(token, args[0], args[1]).map(
|(f, has_context)| FnResolutionCacheEntry {
func: CallableFunction::Method {
func: Shared::new(f),
has_context,
},
source: None,
},
),
});
return if cache.filter.is_absent_and_set(hash) { return if cache.filter.is_absent_and_set(hash) {
// Do not cache "one-hit wonders" // Do not cache "one-hit wonders"

167
src/func/callable_function.rs
View File

@ -21,7 +21,7 @@ pub struct EncapsulatedEnviron {
pub lib: crate::SharedModule, pub lib: crate::SharedModule,
/// Imported [modules][crate::Module]. /// Imported [modules][crate::Module].
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
pub imports: Box<[(crate::ImmutableString, crate::SharedModule)]>, pub imports: Box<crate::StaticVec<(crate::ImmutableString, crate::SharedModule)>>,
/// Globally-defined constants. /// Globally-defined constants.
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
@ -34,20 +34,38 @@ pub struct EncapsulatedEnviron {
#[non_exhaustive] #[non_exhaustive]
pub enum CallableFunction { pub enum CallableFunction {
/// A pure native Rust function with all arguments passed by value. /// A pure native Rust function with all arguments passed by value.
Pure(Shared<FnAny>, bool), Pure {
/// Shared function pointer.
func: Shared<FnAny>,
/// Does the function take a [`NativeCallContext`][crate::NativeCallContext] parameter?
has_context: bool,
},
/// A native Rust object method with the first argument passed by reference, /// A native Rust object method with the first argument passed by reference,
/// and the rest passed by value. /// and the rest passed by value.
Method(Shared<FnAny>, bool), Method {
/// Shared function pointer.
func: Shared<FnAny>,
/// Does the function take a [`NativeCallContext`][crate::NativeCallContext] parameter?
has_context: bool,
},
/// An iterator function. /// An iterator function.
Iterator(Shared<IteratorFn>), Iterator {
/// Shared function pointer.
func: Shared<IteratorFn>,
},
/// A plugin function, /// A plugin function,
Plugin(Shared<FnPlugin>), Plugin {
/// Shared function pointer.
func: Shared<FnPlugin>,
},
/// A script-defined function. /// A script-defined function.
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Script( Script {
Shared<crate::ast::ScriptFnDef>, /// Shared reference to the [`ScriptFnDef`][crate::ast::ScriptFnDef] function definition.
Option<Shared<EncapsulatedEnviron>>, fn_def: Shared<crate::ast::ScriptFnDef>,
), /// Encapsulated environment, if any.
environ: Option<Shared<EncapsulatedEnviron>>,
},
} }
impl fmt::Debug for CallableFunction { impl fmt::Debug for CallableFunction {
@ -55,13 +73,13 @@ impl fmt::Debug for CallableFunction {
#[inline(never)] #[inline(never)]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::Pure(..) => f.write_str("NativePureFunction"), Self::Pure { .. } => f.write_str("NativePureFunction"),
Self::Method(..) => f.write_str("NativeMethod"), Self::Method { .. } => f.write_str("NativeMethod"),
Self::Iterator(..) => f.write_str("NativeIterator"), Self::Iterator { .. } => f.write_str("NativeIterator"),
Self::Plugin(..) => f.write_str("PluginFunction"), Self::Plugin { .. } => f.write_str("PluginFunction"),
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(fn_def, ..) => fmt::Debug::fmt(fn_def, f), Self::Script { fn_def, .. } => fmt::Debug::fmt(fn_def, f),
} }
} }
} }
@ -69,13 +87,13 @@ impl fmt::Debug for CallableFunction {
impl fmt::Display for CallableFunction { impl fmt::Display for CallableFunction {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::Pure(..) => f.write_str("NativePureFunction"), Self::Pure { .. } => f.write_str("NativePureFunction"),
Self::Method(..) => f.write_str("NativeMethod"), Self::Method { .. } => f.write_str("NativeMethod"),
Self::Iterator(..) => f.write_str("NativeIterator"), Self::Iterator { .. } => f.write_str("NativeIterator"),
Self::Plugin(..) => f.write_str("PluginFunction"), Self::Plugin { .. } => f.write_str("PluginFunction"),
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(fn_def, ..) => fmt::Display::fmt(fn_def, f), Self::Script { fn_def, .. } => fmt::Display::fmt(fn_def, f),
} }
} }
} }
@ -86,13 +104,13 @@ impl CallableFunction {
#[must_use] #[must_use]
pub fn is_pure(&self) -> bool { pub fn is_pure(&self) -> bool {
match self { match self {
Self::Pure(..) => true, Self::Pure { .. } => true,
Self::Method(..) | Self::Iterator(..) => false, Self::Method { .. } | Self::Iterator { .. } => false,
Self::Plugin(p) => !p.is_method_call(), Self::Plugin { func, .. } => !func.is_method_call(),
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => false, Self::Script { .. } => false,
} }
} }
/// Is this a native Rust method function? /// Is this a native Rust method function?
@ -100,13 +118,13 @@ impl CallableFunction {
#[must_use] #[must_use]
pub fn is_method(&self) -> bool { pub fn is_method(&self) -> bool {
match self { match self {
Self::Method(..) => true, Self::Method { .. } => true,
Self::Pure(..) | Self::Iterator(..) => false, Self::Pure { .. } | Self::Iterator { .. } => false,
Self::Plugin(p) => p.is_method_call(), Self::Plugin { func, .. } => func.is_method_call(),
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => false, Self::Script { .. } => false,
} }
} }
/// Is this an iterator function? /// Is this an iterator function?
@ -114,11 +132,11 @@ impl CallableFunction {
#[must_use] #[must_use]
pub const fn is_iter(&self) -> bool { pub const fn is_iter(&self) -> bool {
match self { match self {
Self::Iterator(..) => true, Self::Iterator { .. } => true,
Self::Pure(..) | Self::Method(..) | Self::Plugin(..) => false, Self::Pure { .. } | Self::Method { .. } | Self::Plugin { .. } => false,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => false, Self::Script { .. } => false,
} }
} }
/// Is this a script-defined function? /// Is this a script-defined function?
@ -130,8 +148,11 @@ impl CallableFunction {
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
match self { match self {
Self::Script(..) => true, Self::Script { .. } => true,
Self::Pure(..) | Self::Method(..) | Self::Iterator(..) | Self::Plugin(..) => false, Self::Pure { .. }
| Self::Method { .. }
| Self::Iterator { .. }
| Self::Plugin { .. } => false,
} }
} }
/// Is this a plugin function? /// Is this a plugin function?
@ -139,11 +160,11 @@ impl CallableFunction {
#[must_use] #[must_use]
pub const fn is_plugin_fn(&self) -> bool { pub const fn is_plugin_fn(&self) -> bool {
match self { match self {
Self::Plugin(..) => true, Self::Plugin { .. } => true,
Self::Pure(..) | Self::Method(..) | Self::Iterator(..) => false, Self::Pure { .. } | Self::Method { .. } | Self::Iterator { .. } => false,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => false, Self::Script { .. } => false,
} }
} }
/// Is this a native Rust function? /// Is this a native Rust function?
@ -155,8 +176,11 @@ impl CallableFunction {
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
match self { match self {
Self::Pure(..) | Self::Method(..) | Self::Plugin(..) | Self::Iterator(..) => true, Self::Pure { .. }
Self::Script(..) => false, | Self::Method { .. }
| Self::Plugin { .. }
| Self::Iterator { .. } => true,
Self::Script { .. } => false,
} }
} }
/// Is there a [`NativeCallContext`][crate::NativeCallContext] parameter? /// Is there a [`NativeCallContext`][crate::NativeCallContext] parameter?
@ -164,11 +188,11 @@ impl CallableFunction {
#[must_use] #[must_use]
pub fn has_context(&self) -> bool { pub fn has_context(&self) -> bool {
match self { match self {
Self::Pure(.., ctx) | Self::Method(.., ctx) => *ctx, Self::Pure { has_context, .. } | Self::Method { has_context, .. } => *has_context,
Self::Plugin(f) => f.has_context(), Self::Plugin { func, .. } => func.has_context(),
Self::Iterator(..) => false, Self::Iterator { .. } => false,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => false, Self::Script { .. } => false,
} }
} }
/// Get the access mode. /// Get the access mode.
@ -180,10 +204,11 @@ impl CallableFunction {
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
match self { match self {
Self::Plugin(..) | Self::Pure(..) | Self::Method(..) | Self::Iterator(..) => { Self::Plugin { .. }
FnAccess::Public | Self::Pure { .. }
} | Self::Method { .. }
Self::Script(f, ..) => f.access, | Self::Iterator { .. } => FnAccess::Public,
Self::Script { fn_def, .. } => fn_def.access,
} }
} }
/// Get a shared reference to a native Rust function. /// Get a shared reference to a native Rust function.
@ -191,11 +216,11 @@ impl CallableFunction {
#[must_use] #[must_use]
pub fn get_native_fn(&self) -> Option<&Shared<FnAny>> { pub fn get_native_fn(&self) -> Option<&Shared<FnAny>> {
match self { match self {
Self::Pure(f, ..) | Self::Method(f, ..) => Some(f), Self::Pure { func, .. } | Self::Method { func, .. } => Some(func),
Self::Iterator(..) | Self::Plugin(..) => None, Self::Iterator { .. } | Self::Plugin { .. } => None,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => None, Self::Script { .. } => None,
} }
} }
/// Get a shared reference to a script-defined function definition. /// Get a shared reference to a script-defined function definition.
@ -206,8 +231,11 @@ impl CallableFunction {
#[must_use] #[must_use]
pub const fn get_script_fn_def(&self) -> Option<&Shared<crate::ast::ScriptFnDef>> { pub const fn get_script_fn_def(&self) -> Option<&Shared<crate::ast::ScriptFnDef>> {
match self { match self {
Self::Pure(..) | Self::Method(..) | Self::Iterator(..) | Self::Plugin(..) => None, Self::Pure { .. }
Self::Script(f, ..) => Some(f), | Self::Method { .. }
| Self::Iterator { .. }
| Self::Plugin { .. } => None,
Self::Script { fn_def, .. } => Some(fn_def),
} }
} }
/// Get a reference to the shared encapsulated environment of the function definition. /// Get a reference to the shared encapsulated environment of the function definition.
@ -217,10 +245,13 @@ impl CallableFunction {
#[must_use] #[must_use]
pub fn get_encapsulated_environ(&self) -> Option<&EncapsulatedEnviron> { pub fn get_encapsulated_environ(&self) -> Option<&EncapsulatedEnviron> {
match self { match self {
Self::Pure(..) | Self::Method(..) | Self::Iterator(..) | Self::Plugin(..) => None, Self::Pure { .. }
| Self::Method { .. }
| Self::Iterator { .. }
| Self::Plugin { .. } => None,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(.., environ) => environ.as_deref(), Self::Script { environ, .. } => environ.as_deref(),
} }
} }
/// Get a reference to an iterator function. /// Get a reference to an iterator function.
@ -228,11 +259,11 @@ impl CallableFunction {
#[must_use] #[must_use]
pub fn get_iter_fn(&self) -> Option<&IteratorFn> { pub fn get_iter_fn(&self) -> Option<&IteratorFn> {
match self { match self {
Self::Iterator(f) => Some(&**f), Self::Iterator { func, .. } => Some(&**func),
Self::Pure(..) | Self::Method(..) | Self::Plugin(..) => None, Self::Pure { .. } | Self::Method { .. } | Self::Plugin { .. } => None,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => None, Self::Script { .. } => None,
} }
} }
/// Get a shared reference to a plugin function. /// Get a shared reference to a plugin function.
@ -240,11 +271,11 @@ impl CallableFunction {
#[must_use] #[must_use]
pub fn get_plugin_fn(&self) -> Option<&Shared<FnPlugin>> { pub fn get_plugin_fn(&self) -> Option<&Shared<FnPlugin>> {
match self { match self {
Self::Plugin(f) => Some(f), Self::Plugin { func, .. } => Some(func),
Self::Pure(..) | Self::Method(..) | Self::Iterator(..) => None, Self::Pure { .. } | Self::Method { .. } | Self::Iterator { .. } => None,
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
Self::Script(..) => None, Self::Script { .. } => None,
} }
} }
} }
@ -252,29 +283,37 @@ impl CallableFunction {
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
impl From<crate::ast::ScriptFnDef> for CallableFunction { impl From<crate::ast::ScriptFnDef> for CallableFunction {
#[inline(always)] #[inline(always)]
fn from(func: crate::ast::ScriptFnDef) -> Self { fn from(fn_def: crate::ast::ScriptFnDef) -> Self {
Self::Script(func.into(), None) Self::Script {
fn_def: fn_def.into(),
environ: None,
}
} }
} }
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
impl From<Shared<crate::ast::ScriptFnDef>> for CallableFunction { impl From<Shared<crate::ast::ScriptFnDef>> for CallableFunction {
#[inline(always)] #[inline(always)]
fn from(func: Shared<crate::ast::ScriptFnDef>) -> Self { fn from(fn_def: Shared<crate::ast::ScriptFnDef>) -> Self {
Self::Script(func, None) Self::Script {
fn_def,
environ: None,
}
} }
} }
impl<T: PluginFunction + 'static + SendSync> From<T> for CallableFunction { impl<T: PluginFunction + 'static + SendSync> From<T> for CallableFunction {
#[inline(always)] #[inline(always)]
fn from(func: T) -> Self { fn from(func: T) -> Self {
Self::Plugin(Shared::new(func)) Self::Plugin {
func: Shared::new(func),
}
} }
} }
impl From<Shared<FnPlugin>> for CallableFunction { impl From<Shared<FnPlugin>> for CallableFunction {
#[inline(always)] #[inline(always)]
fn from(func: Shared<FnPlugin>) -> Self { fn from(func: Shared<FnPlugin>) -> Self {
Self::Plugin(func) Self::Plugin { func }
} }
} }

16
src/func/register.rs
View File

@ -162,7 +162,7 @@ macro_rules! def_register {
#[inline(always)] fn param_types() -> [TypeId;$n] { [$(TypeId::of::<$par>()),*] } #[inline(always)] fn param_types() -> [TypeId;$n] { [$(TypeId::of::<$par>()),*] }
#[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] } #[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] }
#[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction { #[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction {
CallableFunction::$abi(Shared::new(move |_, args: &mut FnCallArgs| { CallableFunction::$abi { func: Shared::new(move |_, args: &mut FnCallArgs| {
// The arguments are assumed to be of the correct number and types! // The arguments are assumed to be of the correct number and types!
check_constant!($abi, $n, fn_name, no_const, args); check_constant!($abi, $n, fn_name, no_const, args);
@ -174,7 +174,7 @@ macro_rules! def_register {
// Map the result // Map the result
Ok(Dynamic::from(r)) Ok(Dynamic::from(r))
}), false) }), has_context: false }
} }
} }
@ -186,7 +186,7 @@ macro_rules! def_register {
#[inline(always)] fn param_types() -> [TypeId;$n] { [$(TypeId::of::<$par>()),*] } #[inline(always)] fn param_types() -> [TypeId;$n] { [$(TypeId::of::<$par>()),*] }
#[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] } #[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] }
#[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction { #[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction {
CallableFunction::$abi(Shared::new(move |ctx: Option<NativeCallContext>, args: &mut FnCallArgs| { CallableFunction::$abi { func: Shared::new(move |ctx: Option<NativeCallContext>, args: &mut FnCallArgs| {
let ctx = ctx.unwrap(); let ctx = ctx.unwrap();
// The arguments are assumed to be of the correct number and types! // The arguments are assumed to be of the correct number and types!
@ -200,7 +200,7 @@ macro_rules! def_register {
// Map the result // Map the result
Ok(Dynamic::from(r)) Ok(Dynamic::from(r))
}), true) }), has_context: true }
} }
} }
@ -213,7 +213,7 @@ macro_rules! def_register {
#[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] } #[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] }
#[cfg(feature = "metadata")] #[inline(always)] fn return_type_name() -> &'static str { type_name::<RhaiResultOf<RET>>() } #[cfg(feature = "metadata")] #[inline(always)] fn return_type_name() -> &'static str { type_name::<RhaiResultOf<RET>>() }
#[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction { #[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction {
CallableFunction::$abi(Shared::new(move |_, args: &mut FnCallArgs| { CallableFunction::$abi { func: Shared::new(move |_, args: &mut FnCallArgs| {
// The arguments are assumed to be of the correct number and types! // The arguments are assumed to be of the correct number and types!
check_constant!($abi, $n, fn_name, no_const, args); check_constant!($abi, $n, fn_name, no_const, args);
@ -222,7 +222,7 @@ macro_rules! def_register {
// Call the function with each argument value // Call the function with each argument value
self($($arg),*).map(Dynamic::from) self($($arg),*).map(Dynamic::from)
}), false) }), has_context: false }
} }
} }
@ -235,7 +235,7 @@ macro_rules! def_register {
#[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] } #[cfg(feature = "metadata")] #[inline(always)] fn param_names() -> [&'static str;$n] { [$(type_name::<$param>()),*] }
#[cfg(feature = "metadata")] #[inline(always)] fn return_type_name() -> &'static str { type_name::<RhaiResultOf<RET>>() } #[cfg(feature = "metadata")] #[inline(always)] fn return_type_name() -> &'static str { type_name::<RhaiResultOf<RET>>() }
#[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction { #[inline(always)] fn into_callable_function(self, fn_name: Identifier, no_const: bool) -> CallableFunction {
CallableFunction::$abi(Shared::new(move |ctx: Option<NativeCallContext>, args: &mut FnCallArgs| { CallableFunction::$abi { func: Shared::new(move |ctx: Option<NativeCallContext>, args: &mut FnCallArgs| {
let ctx = ctx.unwrap(); let ctx = ctx.unwrap();
// The arguments are assumed to be of the correct number and types! // The arguments are assumed to be of the correct number and types!
@ -246,7 +246,7 @@ macro_rules! def_register {
// Call the function with each argument value // Call the function with each argument value
self(ctx, $($arg),*).map(Dynamic::from) self(ctx, $($arg),*).map(Dynamic::from)
}), true) }), has_context: true }
} }
} }

15
src/module/mod.rs
View File

@ -9,7 +9,7 @@ use crate::func::{
}; };
use crate::types::{dynamic::Variant, BloomFilterU64, CustomTypesCollection}; use crate::types::{dynamic::Variant, BloomFilterU64, CustomTypesCollection};
use crate::{ use crate::{
calc_fn_hash, calc_fn_hash_full, Dynamic, FnArgsVec, FnPtr, Identifier, ImmutableString, calc_fn_hash, calc_fn_hash_full, Dynamic, FnArgsVec, Identifier, ImmutableString,
NativeCallContext, RhaiResultOf, Shared, SharedModule, SmartString, NativeCallContext, RhaiResultOf, Shared, SharedModule, SmartString,
}; };
use bitflags::bitflags; use bitflags::bitflags;
@ -1221,7 +1221,10 @@ impl Module {
access, access,
None, None,
arg_types, arg_types,
CallableFunction::Method(Shared::new(f), true), CallableFunction::Method {
func: Shared::new(f),
has_context: true,
},
) )
} }
@ -2142,7 +2145,7 @@ impl Module {
let environ = Shared::new(crate::func::EncapsulatedEnviron { let environ = Shared::new(crate::func::EncapsulatedEnviron {
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
lib: ast.shared_lib().clone(), lib: ast.shared_lib().clone(),
imports: imports.into_boxed_slice(), imports: imports.into(),
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
constants, constants,
}); });
@ -2150,7 +2153,7 @@ impl Module {
// Variables with an alias left in the scope become module variables // Variables with an alias left in the scope become module variables
for (_name, mut value, mut aliases) in scope { for (_name, mut value, mut aliases) in scope {
value.deep_scan(|v| { value.deep_scan(|v| {
if let Some(fn_ptr) = v.downcast_mut::<FnPtr>() { if let Some(fn_ptr) = v.downcast_mut::<crate::FnPtr>() {
fn_ptr.set_encapsulated_environ(Some(environ.clone())); fn_ptr.set_encapsulated_environ(Some(environ.clone()));
} }
}); });
@ -2184,8 +2187,8 @@ impl Module {
let f = module.functions.as_mut().unwrap().get_mut(&hash).unwrap(); let f = module.functions.as_mut().unwrap().get_mut(&hash).unwrap();
// Encapsulate AST environment // Encapsulate AST environment
match f.func { match &mut f.func {
CallableFunction::Script(.., ref mut e) => *e = Some(environ.clone()), CallableFunction::Script { environ: e, .. } => *e = Some(environ.clone()),
_ => (), _ => (),
} }
}); });