Add support for anonymous functions in Rust.

src/api.rs

@@ -1,9 +1,9 @@
 //! Module that defines the extern API of `Engine`.
 
 use crate::any::{Any, AnyExt, Dynamic};
-use crate::call::FuncArgs;
 use crate::engine::{make_getter, make_setter, Engine, FnAny, FnSpec};
 use crate::error::ParseError;
+use crate::fn_call::FuncArgs;
 use crate::fn_register::RegisterFn;
 use crate::parser::{lex, parse, parse_global_expr, Position, AST};
 use crate::result::EvalAltResult;

src/fn_anonymous.rs

@@ -0,0 +1,118 @@
+//! Module which defines the function registration mechanism.
+#![cfg(not(feature = "no_function"))]
+#![allow(non_snake_case)]
+
+use crate::any::Any;
+use crate::engine::Engine;
+use crate::error::ParseError;
+use crate::parser::AST;
+use crate::result::EvalAltResult;
+use crate::scope::Scope;
+
+/// A trait to create a Rust anonymous function from a script.
+pub trait AnonymousFn<ARGS, RET> {
+    type Output;
+
+    /// Create a Rust anonymous function from an `AST`.
+    /// The `Engine` and `AST` are consumed and basically embedded into the closure.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # fn main() -> Result<(), rhai::EvalAltResult> {
+    /// use rhai::{Engine, AnonymousFn};                // use 'AnonymousFn' for 'create_from_ast'
+    ///
+    /// let engine = Engine::new();                     // create a new 'Engine' just for this
+    ///
+    /// let ast = engine.compile("fn calc(x, y) { x + y.len() < 42 }")?;
+    ///
+    /// // AnonymousFn takes two type parameters:
+    /// //   1) a tuple made up of the types of the script function's parameters
+    /// //   2) the return type of the script function
+    /// //
+    /// // 'func' will have type Box<dyn Fn(i64, String) -> Result<bool, EvalAltResult>> and is callable!
+    /// let func = AnonymousFn::<(i64, String), bool>::create_from_ast(
+    /// //                       ^^^^^^^^^^^^^ function parameter types in tuple
+    ///
+    ///                 engine,                         // the 'Engine' is consumed into the closure
+    ///                 ast,                            // the 'AST'
+    ///                 "calc"                          // the entry-point function name
+    /// );
+    ///
+    /// func(123, "hello".to_string())? == false;       // call the anonymous function
+    /// # Ok(())
+    /// # }
+    fn create_from_ast(self, ast: AST, entry_point: &str) -> Self::Output;
+
+    /// Create a Rust anonymous function from a script.
+    /// The `Engine` is consumed and basically embedded into the closure.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// # fn main() -> Result<(), rhai::EvalAltResult> {
+    /// use rhai::{Engine, AnonymousFn};                // use 'AnonymousFn' for 'create_from_script'
+    ///
+    /// let engine = Engine::new();                     // create a new 'Engine' just for this
+    ///
+    /// let script = "fn calc(x, y) { x + y.len() < 42 }";
+    ///
+    /// // AnonymousFn takes two type parameters:
+    /// //   1) a tuple made up of the types of the script function's parameters
+    /// //   2) the return type of the script function
+    /// //
+    /// // 'func' will have type Box<dyn Fn(i64, String) -> Result<bool, EvalAltResult>> and is callable!
+    /// let func = AnonymousFn::<(i64, String), bool>::create_from_script(
+    /// //                       ^^^^^^^^^^^^^ function parameter types in tuple
+    ///
+    ///                 engine,                         // the 'Engine' is consumed into the closure
+    ///                 script,                         // the script, notice number of parameters must match
+    ///                 "calc"                          // the entry-point function name
+    /// )?;
+    ///
+    /// func(123, "hello".to_string())? == false;       // call the anonymous function
+    /// # Ok(())
+    /// # }
+    /// ```
+    fn create_from_script(
+        self,
+        script: &str,
+        entry_point: &str,
+    ) -> Result<Self::Output, ParseError>;
+}
+
+macro_rules! def_anonymous_fn {
+    () => {
+        def_anonymous_fn!(imp);
+    };
+    (imp $($par:ident),*) => {
+        impl<'e, $($par: Any + Clone,)* RET: Any + Clone> AnonymousFn<($($par,)*), RET> for Engine<'e>
+        {
+            #[cfg(feature = "sync")]
+            type Output = Box<dyn Fn($($par),*) -> Result<RET, EvalAltResult> + Send + Sync + 'e>;
+
+            #[cfg(not(feature = "sync"))]
+            type Output = Box<dyn Fn($($par),*) -> Result<RET, EvalAltResult> + 'e>;
+
+            fn create_from_ast(self, ast: AST, entry_point: &str) -> Self::Output {
+                let name = entry_point.to_string();
+
+                Box::new(move |$($par: $par),*| {
+                    self.call_fn::<_, RET>(&mut Scope::new(), &ast, &name, ($($par,)*))
+                })
+            }
+
+            fn create_from_script(self, script: &str, entry_point: &str) -> Result<Self::Output, ParseError> {
+                let ast = self.compile(script)?;
+                Ok(AnonymousFn::<($($par,)*), RET>::create_from_ast(self, ast, entry_point))
+            }
+        }
+    };
+    ($p0:ident $(, $p:ident)*) => {
+        def_anonymous_fn!(imp $p0 $(, $p)*);
+        def_anonymous_fn!($($p),*);
+    };
+}
+
+#[rustfmt::skip]
+def_anonymous_fn!(A, B, C, D, E, F, G, H, J, K, L, M, N, P, Q, R, S, T, U, V);

src/fn_register.rs

@@ -262,10 +262,6 @@ macro_rules! def_register {
 
         def_register!($($p),*);
     };
-//    (imp_pop) => {};
-//    (imp_pop $head:ident => $head_mark:ty => $head_param:ty $(,$tail:ident => $tail_mark:ty => $tp:ty)*) => {
-//        def_register!(imp $($tail => $tail_mark => $tp),*);
-//    };
 }
 
 #[rustfmt::skip]

src/lib.rs

@@ -61,9 +61,10 @@ extern crate alloc;
 mod any;
 mod api;
 mod builtin;
-mod call;
 mod engine;
 mod error;
+mod fn_anonymous;
+mod fn_call;
 mod fn_register;
 mod optimize;
 mod parser;
@@ -72,14 +73,17 @@ mod scope;
 mod stdlib;
 
 pub use any::{Any, AnyExt, Dynamic, Variant};
-pub use call::FuncArgs;
 pub use engine::Engine;
 pub use error::{ParseError, ParseErrorType};
+pub use fn_call::FuncArgs;
 pub use fn_register::{RegisterDynamicFn, RegisterFn, RegisterResultFn};
 pub use parser::{Position, AST, INT};
 pub use result::EvalAltResult;
 pub use scope::Scope;
 
+#[cfg(not(feature = "no_function"))]
+pub use fn_anonymous::AnonymousFn;
+
 #[cfg(not(feature = "no_index"))]
 pub use engine::Array;