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

Fix imports in eval.

Browse Source
This commit is contained in:
Stephen Chung
2022-10-14 11:57:36 +08:00
parent e2699aa058
commit 31d045279f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/func/call.rs
View File

@@ -1137,6 +1137,7 @@ impl Engine {
KEYWORD_EVAL if total_args == 1 => {
// eval - only in function call style
let orig_scope_len = scope.len();
let orig_imports_len = global.num_imports();
let arg = first_arg.unwrap();
let (arg_value, pos) =
self.get_arg_value(scope, global, caches, lib, this_ptr, arg, level)?;
@@ -1155,7 +1156,8 @@ impl Engine {
// IMPORTANT! If the eval defines new variables in the current scope,
// all variable offsets from this point on will be mis-aligned.
if scope.len() != orig_scope_len {
// The same is true for imports.
if scope.len() != orig_scope_len || global.num_imports() != orig_imports_len {
global.always_search_scope = true;
}