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

Fix currying in map closure calls.

Browse Source
This commit is contained in:
Stephen Chung 2020-08-04 18:38:33 +08:00
parent ac90b7f246
commit b0ab6e95f5
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fn_call.rs
View File

@ -705,12 +705,25 @@ impl Engine {
#[cfg(not(feature = "no_object"))] #[cfg(not(feature = "no_object"))]
if let Some(map) = obj.read_lock::<Map>() { if let Some(map) = obj.read_lock::<Map>() {
if let Some(val) = map.get(_fn_name) { if let Some(val) = map.get(_fn_name) {
if let Some(f) = val.read_lock::<FnPtr>() { if let Some(fn_ptr) = val.read_lock::<FnPtr>() {
// Remap the function name // Remap the function name
redirected = f.get_fn_name().clone(); redirected = fn_ptr.get_fn_name().clone();
_fn_name = &redirected; _fn_name = &redirected;
// Recalculate the hash based on the new function name // Add curried arguments
_hash = calc_fn_hash(empty(), _fn_name, idx.len(), empty()); if !fn_ptr.curry().is_empty() {
fn_ptr
.curry()
.iter()
.cloned()
.enumerate()
.for_each(|(i, v)| idx.insert(i, v));
}
// Recalculate the hash based on the new function name and new arguments
_hash = if native {
0
} else {
calc_fn_hash(empty(), _fn_name, idx.len(), empty())
};
} }
} }
}; };