ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preserve mem

Browse Source
This commit is contained in:
Paul Tagliamonte
2025-04-07 21:54:49 -04:00
parent 0357113031
commit 1f5845833c
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rust/kcl-lib/src/execution/exec_ast.rs
View File

@ -475,7 +475,7 @@ impl ExecutorContext {
ModuleRepr::Root => Err(exec_state.circular_import_error(&path, source_range)), ModuleRepr::Root => Err(exec_state.circular_import_error(&path, source_range)),
ModuleRepr::Kcl(_, Some((_, env_ref, items))) => Ok((*env_ref, items.clone())), ModuleRepr::Kcl(_, Some((_, env_ref, items))) => Ok((*env_ref, items.clone())),
ModuleRepr::Kcl(program, cache) => self ModuleRepr::Kcl(program, cache) => self
.exec_module_from_ast(program, module_id, &path, exec_state, source_range) .exec_module_from_ast(program, module_id, &path, exec_state, source_range, false)
.await .await
.map(|(val, er, items)| { .map(|(val, er, items)| {
*cache = Some((val, er, items.clone())); *cache = Some((val, er, items.clone()));
@ -516,7 +516,7 @@ impl ExecutorContext {
ModuleRepr::Kcl(_, Some((val, _, _))) => Ok(val.clone()), ModuleRepr::Kcl(_, Some((val, _, _))) => Ok(val.clone()),
ModuleRepr::Kcl(program, cached_items) => { ModuleRepr::Kcl(program, cached_items) => {
let result = self let result = self
.exec_module_from_ast(program, module_id, &path, exec_state, source_range) .exec_module_from_ast(program, module_id, &path, exec_state, source_range, false)
.await; .await;
match result { match result {
Ok((val, env, items)) => { Ok((val, env, items)) => {
@ -546,9 +546,12 @@ impl ExecutorContext {
path: &ModulePath, path: &ModulePath,
exec_state: &mut ExecState, exec_state: &mut ExecState,
source_range: SourceRange, source_range: SourceRange,
preserve_mem: bool,
) -> Result<(Option<KclValue>, EnvironmentRef, Vec<String>), KclError> { ) -> Result<(Option<KclValue>, EnvironmentRef, Vec<String>), KclError> {
exec_state.global.mod_loader.enter_module(path); exec_state.global.mod_loader.enter_module(path);
let result = self.exec_module_body(program, exec_state, false, module_id, path).await; let result = self
.exec_module_body(program, exec_state, preserve_mem, module_id, path)
.await;
exec_state.global.mod_loader.leave_module(path); exec_state.global.mod_loader.leave_module(path);
result.map_err(|err| { result.map_err(|err| {

20
rust/kcl-lib/src/execution/mod.rs
View File

@ -806,7 +806,14 @@ impl ExecutorContext {
let exec_ctxt = exec_ctxt; let exec_ctxt = exec_ctxt;
let result = exec_ctxt let result = exec_ctxt
.exec_module_from_ast(&program, module_id, &module_path, &mut exec_state, source_range) .exec_module_from_ast(
&program,
module_id,
&module_path,
&mut exec_state,
source_range,
preserve_mem,
)
.await; .await;
results_tx results_tx
@ -822,7 +829,14 @@ impl ExecutorContext {
let exec_ctxt = exec_ctxt; let exec_ctxt = exec_ctxt;
let result = exec_ctxt let result = exec_ctxt
.exec_module_from_ast(&program, module_id, &module_path, &mut exec_state, source_range) .exec_module_from_ast(
&program,
module_id,
&module_path,
&mut exec_state,
source_range,
preserve_mem,
)
.await; .await;
results_tx results_tx
@ -843,7 +857,7 @@ impl ExecutorContext {
let ModuleRepr::Kcl(_, cache) = &mut repr else { let ModuleRepr::Kcl(_, cache) = &mut repr else {
continue; continue;
}; };
*cache = Some((val, session_data, variables.clone())); *cache = Some((val, session_data, variables));
exec_state.global.module_infos[&module_id].restore_repr(repr); exec_state.global.module_infos[&module_id].restore_repr(repr);
} }