From 2a5ef0bee11157101829e88caa9a30992a9bae97 Mon Sep 17 00:00:00 2001
From: Stephen Chung <schungx@live.com>
Date: Thu, 3 Nov 2022 12:00:56 +0800
Subject: [PATCH] Refactor is_anonymous.

---
 src/api/call_fn.rs  | 13 +++++++------
 src/func/call.rs    | 12 ++++++++++--
 src/func/mod.rs     |  2 ++
 src/func/native.rs  |  8 ++++++--
 src/types/fn_ptr.rs |  2 +-
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/api/call_fn.rs b/src/api/call_fn.rs
index 8c0139e8..1207c522 100644
--- a/src/api/call_fn.rs
+++ b/src/api/call_fn.rs
@@ -259,17 +259,18 @@ impl Engine {
             ast.resolver().cloned(),
         );
 
-        let mut result = Ok(Dynamic::UNIT);
-
-        if eval_ast && !statements.is_empty() {
-            result = self.eval_global_statements(scope, global, caches, statements, lib, 0);
+        let result = if eval_ast && !statements.is_empty() {
+            let r = self.eval_global_statements(scope, global, caches, statements, lib, 0);
 
             if rewind_scope {
                 scope.rewind(orig_scope_len);
             }
-        }
 
-        result = result.and_then(|_| {
+            r
+        } else {
+            Ok(Dynamic::UNIT)
+        }
+        .and_then(|_| {
             let mut args: StaticVec<_> = arg_values.iter_mut().collect();
 
             // Check for data race.
diff --git a/src/func/call.rs b/src/func/call.rs
index 882060e9..22661345 100644
--- a/src/func/call.rs
+++ b/src/func/call.rs
@@ -4,8 +4,8 @@ use super::{get_builtin_binary_op_fn, get_builtin_op_assignment_fn, CallableFunc
 use crate::api::default_limits::MAX_DYNAMIC_PARAMETERS;
 use crate::ast::{Expr, FnCallExpr, FnCallHashes};
 use crate::engine::{
-    KEYWORD_DEBUG, KEYWORD_EVAL, KEYWORD_FN_PTR, KEYWORD_FN_PTR_CALL, KEYWORD_FN_PTR_CURRY,
-    KEYWORD_IS_DEF_VAR, KEYWORD_PRINT, KEYWORD_TYPE_OF,
+    FN_ANONYMOUS, KEYWORD_DEBUG, KEYWORD_EVAL, KEYWORD_FN_PTR, KEYWORD_FN_PTR_CALL,
+    KEYWORD_FN_PTR_CURRY, KEYWORD_IS_DEF_VAR, KEYWORD_PRINT, KEYWORD_TYPE_OF,
 };
 use crate::eval::{Caches, FnResolutionCacheEntry, GlobalRuntimeState};
 use crate::tokenizer::{is_valid_function_name, Token};
@@ -127,6 +127,14 @@ pub fn ensure_no_data_race(fn_name: &str, args: &FnCallArgs, is_ref_mut: bool) -
     Ok(())
 }
 
+/// Is a function name an anonymous function?
+#[cfg(not(feature = "no_function"))]
+#[inline]
+#[must_use]
+pub fn is_anonymous_fn(name: &str) -> bool {
+    name.starts_with(FN_ANONYMOUS)
+}
+
 impl Engine {
     /// Generate the signature for a function call.
     #[inline]
diff --git a/src/func/mod.rs b/src/func/mod.rs
index 0d886513..54652e74 100644
--- a/src/func/mod.rs
+++ b/src/func/mod.rs
@@ -15,6 +15,8 @@ pub use args::FuncArgs;
 pub use builtin::{get_builtin_binary_op_fn, get_builtin_op_assignment_fn};
 #[cfg(not(feature = "no_closure"))]
 pub use call::ensure_no_data_race;
+#[cfg(not(feature = "no_function"))]
+pub use call::is_anonymous_fn;
 pub use call::FnCallArgs;
 pub use callable_function::CallableFunction;
 #[cfg(not(feature = "no_function"))]
diff --git a/src/func/native.rs b/src/func/native.rs
index ba7f5ef8..70c84d11 100644
--- a/src/func/native.rs
+++ b/src/func/native.rs
@@ -3,8 +3,9 @@
 use super::call::FnCallArgs;
 use crate::ast::FnCallHashes;
 use crate::eval::{Caches, GlobalRuntimeState};
+use crate::parser::is_anonymous_fn;
 use crate::plugin::PluginFunction;
-use crate::tokenizer::{Token, TokenizeState};
+use crate::tokenizer::{is_valid_function_name, Token, TokenizeState};
 use crate::types::dynamic::Variant;
 use crate::{
     calc_fn_hash, Dynamic, Engine, EvalContext, FuncArgs, Module, Position, RhaiResult,
@@ -329,7 +330,10 @@ impl<'a> NativeCallContext<'a> {
         is_method_call: bool,
         args: &mut [&mut Dynamic],
     ) -> RhaiResult {
-        self._call_fn_raw(fn_name, false, is_ref_mut, is_method_call, args)
+        let name = fn_name.as_ref();
+        let native_only = !is_valid_function_name(name) && !is_anonymous_fn(name);
+
+        self._call_fn_raw(fn_name, native_only, is_ref_mut, is_method_call, args)
     }
     /// Call a registered native Rust function inside the call context.
     ///
diff --git a/src/types/fn_ptr.rs b/src/types/fn_ptr.rs
index 2c2bd7d2..5938b7a6 100644
--- a/src/types/fn_ptr.rs
+++ b/src/types/fn_ptr.rs
@@ -106,7 +106,7 @@ impl FnPtr {
     #[inline(always)]
     #[must_use]
     pub fn is_anonymous(&self) -> bool {
-        self.name.starts_with(crate::engine::FN_ANONYMOUS)
+        crate::func::is_anonymous_fn(&self.name)
     }
     /// Call the function pointer with curried arguments (if any).
     /// The function may be script-defined (not available under `no_function`) or native Rust.