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

Recursively store encapsulated environment into values.

Browse Source
This commit is contained in:
Stephen Chung
2022-12-13 13:06:28 +08:00
parent d350a948e7
commit db7410776a
3 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/module/mod.rs
View File

@@ -2139,19 +2139,37 @@ impl Module {
let _ = result?;
// Encapsulated environment
#[cfg(not(feature = "no_function"))]
let environ = Shared::new(crate::func::EncapsulatedEnviron {
#[cfg(not(feature = "no_function"))]
lib: ast.shared_lib().clone(),
imports: imports.into_boxed_slice(),
#[cfg(not(feature = "no_function"))]
constants,
});
fn update_encapsulated_environ(
value: &mut Dynamic,
environ: &Shared<crate::func::EncapsulatedEnviron>,
) {
match value.0 {
#[cfg(not(feature = "no_index"))]
crate::types::dynamic::Union::Array(ref mut a, _, _) => a
.iter_mut()
.for_each(|v| update_encapsulated_environ(v, environ)),
#[cfg(not(feature = "no_object"))]
crate::types::dynamic::Union::Map(ref mut map, _, _) => map
.values_mut()
.for_each(|v| update_encapsulated_environ(v, environ)),
crate::types::dynamic::Union::FnPtr(ref mut fn_ptr, _, _) => {
fn_ptr.set_encapsulated_environ(Some(environ.clone()))
}
_ => (),
}
}
// Variables with an alias left in the scope become module variables
for (_name, mut value, mut aliases) in scope {
#[cfg(not(feature = "no_function"))]
if let Some(mut fn_ptr) = value.write_lock::<crate::FnPtr>() {
fn_ptr.set_encapsulated_environ(Some(environ.clone()));
}
update_encapsulated_environ(&mut value, &environ);
match aliases.len() {
0 => (),