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

Fix builds.

Browse Source
This commit is contained in:
Stephen Chung 2023-05-11 00:23:42 +08:00
parent 2fcb1e510c
commit d84008dda0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/func/call.rs
View File

@ -1288,14 +1288,16 @@ impl Engine {
} }
// Call with blank scope // Call with blank scope
#[cfg(not(feature = "no_closure"))]
let this_ptr_not_shared = this_ptr.as_ref().map_or(false, |v| !v.is_shared());
#[cfg(feature = "no_closure")]
let this_ptr_not_shared = true;
// If the first argument is a variable, and there are no curried arguments, // If the first argument is a variable, and there are no curried arguments,
// convert to method-call style in order to leverage potential &mut first argument // convert to method-call style in order to leverage potential &mut first argument
// and avoid cloning the value. // and avoid cloning the value.
match first_arg { match first_arg {
Some(_first_expr @ Expr::ThisPtr(pos)) Some(_first_expr @ Expr::ThisPtr(pos)) if curry.is_empty() && this_ptr_not_shared => {
if curry.is_empty() && this_ptr.as_ref().map_or(false, |v| !v.is_shared()) =>
{
// Turn it into a method call only if the object is not shared // Turn it into a method call only if the object is not shared
self.track_operation(global, *pos)?; self.track_operation(global, *pos)?;
@ -1378,13 +1380,16 @@ impl Engine {
let args = &mut FnArgsVec::with_capacity(args_expr.len()); let args = &mut FnArgsVec::with_capacity(args_expr.len());
let mut first_arg_value = None; let mut first_arg_value = None;
#[cfg(not(feature = "no_closure"))]
let this_ptr_not_shared = this_ptr.as_ref().map_or(false, |v| !v.is_shared());
#[cfg(feature = "no_closure")]
let this_ptr_not_shared = true;
// See if the first argument is a variable. // See if the first argument is a variable.
// If so, convert to method-call style in order to leverage potential // If so, convert to method-call style in order to leverage potential
// &mut first argument and avoid cloning the value. // &mut first argument and avoid cloning the value.
match args_expr.get(0) { match args_expr.get(0) {
Some(_first_expr @ Expr::ThisPtr(pos)) Some(_first_expr @ Expr::ThisPtr(pos)) if this_ptr_not_shared => {
if this_ptr.as_ref().map_or(false, |v| v.is_shared()) =>
{
self.track_operation(global, *pos)?; self.track_operation(global, *pos)?;
#[cfg(feature = "debugging")] #[cfg(feature = "debugging")]