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

Remove duplicated functions lookup for script function call.

Browse Source
This commit is contained in:
Stephen Chung 2021-02-11 12:13:30 +08:00
parent 645e1fe583
commit d49581356d
1 changed files with 76 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
src/fn_call.rs
View File

@ -577,7 +577,7 @@ impl Engine {
// Qualifiers (none) + function name + number of arguments + argument `TypeId`'s. // Qualifiers (none) + function name + number of arguments + argument `TypeId`'s.
let arg_types = args.iter().map(|a| a.type_id()); let arg_types = args.iter().map(|a| a.type_id());
let hash_fn = calc_native_fn_hash(empty(), fn_name, arg_types); let hash_fn = calc_native_fn_hash(empty(), fn_name, arg_types).unwrap();
match fn_name { match fn_name {
// type_of // type_of
@ -587,7 +587,7 @@ impl Engine {
Some(mods), Some(mods),
Some(state), Some(state),
lib, lib,
hash_fn, Some(hash_fn),
hash_script, hash_script,
pub_only, pub_only,
) => ) =>
@ -606,7 +606,7 @@ impl Engine {
Some(mods), Some(mods),
Some(state), Some(state),
lib, lib,
hash_fn, Some(hash_fn),
hash_script, hash_script,
pub_only, pub_only,
) => ) =>
@ -622,14 +622,11 @@ impl Engine {
.into() .into()
} }
// Script-like function found
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]
_ if hash_script.is_some() _ if hash_script.is_some() => {
&& self.has_override(Some(mods), Some(state), lib, None, hash_script, pub_only) =>
{
let hash_script = hash_script.unwrap(); let hash_script = hash_script.unwrap();
// Check if function access already in the cache // Check if script function access already in the cache
let (func, source) = state let (func, source) = state
.fn_resolution_cache_mut() .fn_resolution_cache_mut()
.entry(hash_script) .entry(hash_script)
@ -649,92 +646,92 @@ impl Engine {
//.or_else(|| mods.iter().find_map(|(_, m)| m.get_qualified_fn(hash_script).map(|f| (f, m.id_raw().clone())))) //.or_else(|| mods.iter().find_map(|(_, m)| m.get_qualified_fn(hash_script).map(|f| (f, m.id_raw().clone()))))
}) })
.as_ref() .as_ref()
.map(|(f, s)| (f.clone(), s.clone())) .map(|(f, s)| (Some(f.clone()), s.clone()))
.unwrap(); .unwrap_or((None, None));
assert!(func.is_script()); if let Some(func) = func {
// Script function call
assert!(func.is_script());
let func = func.get_fn_def(); let func = func.get_fn_def();
let scope: &mut Scope = &mut Default::default(); let scope: &mut Scope = &mut Default::default();
// Move captured variables into scope // Move captured variables into scope
#[cfg(not(feature = "no_closure"))] #[cfg(not(feature = "no_closure"))]
if let Some(captured) = _capture_scope { if let Some(captured) = _capture_scope {
if !func.externals.is_empty() { if !func.externals.is_empty() {
captured captured
.into_iter() .into_iter()
.filter(|(name, _, _)| func.externals.iter().any(|ex| ex == name)) .filter(|(name, _, _)| func.externals.iter().any(|ex| ex == name))
.for_each(|(name, value, _)| { .for_each(|(name, value, _)| {
// Consume the scope values. // Consume the scope values.
scope.push_dynamic(name, value); scope.push_dynamic(name, value);
}); });
}
} }
}
let result = if _is_method { let result = if _is_method {
// Method call of script function - map first argument to `this` // Method call of script function - map first argument to `this`
let (first, rest) = args.split_first_mut().unwrap(); let (first, rest) = args.split_first_mut().unwrap();
let orig_source = mem::take(&mut state.source); let orig_source = mem::take(&mut state.source);
state.source = source; state.source = source;
let level = _level + 1; let level = _level + 1;
let result = self.call_script_fn( let result = self.call_script_fn(
scope, scope,
mods, mods,
state, state,
lib, lib,
&mut Some(*first), &mut Some(*first),
func, func,
rest, rest,
pos, pos,
level, level,
); );
// Restore the original source // Restore the original source
state.source = orig_source; state.source = orig_source;
result? result?
} else {
// Normal call of script function
// The first argument is a reference?
let mut backup: ArgBackup = Default::default();
backup.change_first_arg_to_copy(is_ref, args);
let orig_source = mem::take(&mut state.source);
state.source = source;
let level = _level + 1;
let result = self.call_script_fn(
scope, mods, state, lib, &mut None, func, args, pos, level,
);
// Restore the original source
state.source = orig_source;
// Restore the original reference
backup.restore_first_arg(args);
result?
};
Ok((result, false))
} else { } else {
// Normal call of script function // Native function call
// The first argument is a reference? self.call_native_fn(
let mut backup: ArgBackup = Default::default(); mods, state, lib, fn_name, hash_fn, args, is_ref, pub_only, pos, def_val,
backup.change_first_arg_to_copy(is_ref, args); )
}
let orig_source = mem::take(&mut state.source);
state.source = source;
let level = _level + 1;
let result = self
.call_script_fn(scope, mods, state, lib, &mut None, func, args, pos, level);
// Restore the original source
state.source = orig_source;
// Restore the original reference
backup.restore_first_arg(args);
result?
};
Ok((result, false))
} }
// Normal native function call // Native function call
_ => self.call_native_fn( _ => self.call_native_fn(
mods, mods, state, lib, fn_name, hash_fn, args, is_ref, pub_only, pos, def_val,
state,
lib,
fn_name,
hash_fn.unwrap(),
args,
is_ref,
pub_only,
pos,
def_val,
), ),
} }
} }