language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Group toplevel expects by module, run them separately

Browse source
This commit is contained in:
Jonathan Schear 2024-03-05 21:43:45 -05:00
parent 09b40a1cc3
commit 504e00d44d
No known key found for this signature in database
GPG key ID: 0F4D841667534076
6 changed files with 203 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

30
crates/repl_expect/src/lib.rs
View file

@ -150,7 +150,7 @@ mod test {
let interns = loaded.interns.clone();
let (lib, expects, layout_interner) = expect_mono_module_to_dylib(
let (lib, expects_by_module, layout_interner) = expect_mono_module_to_dylib(
arena,
target.clone(),
loaded,
@ -173,18 +173,22 @@ mod test {
unsafe { set_shared_buffer((shared_buffer.as_mut_ptr(), BUFFER_SIZE), &mut result) };
let mut writer = Vec::with_capacity(1024);
let (_failed, _passed) = crate::run::run_expects_with_memory(
&mut writer,
RenderTarget::ColorTerminal,
arena,
interns,
&layout_interner.into_global(),
&lib,
&mut expectations,
expects,
&mut memory,
)
.unwrap();
let global_layout_interner = layout_interner.into_global();
for (_, expects) in expects_by_module {
let (_failed, _passed) = crate::run::run_expects_with_memory(
&mut writer,
RenderTarget::ColorTerminal,
arena,
interns,
&global_layout_interner,
&lib,
&mut expectations,
expects,
&mut memory,
)
.unwrap();
}
// Remove ANSI escape codes from the answer - for example:
//

92
crates/repl_expect/src/run.rs
View file

@ -11,7 +11,7 @@ use bumpalo::Bump;
use inkwell::context::Context;
use roc_build::link::llvm_module_to_dylib;
use roc_can::expr::ExpectLookup;
use roc_collections::{MutSet, VecMap};
use roc_collections::{MutMap, MutSet, VecMap};
use roc_error_macros::internal_error;
use roc_gen_llvm::{
llvm::{build::LlvmBackendMode, externs::add_default_roc_externs},
@ -620,7 +620,7 @@ pub fn expect_mono_module_to_dylib<'a>(
) -> Result<
(
libloading::Library,
ExpectFunctions<'a>,
MutMap<ModuleId, ExpectFunctions<'a>>,
STLayoutInterner<'a>,
),
libloading::Error,
@ -666,50 +666,67 @@ pub fn expect_mono_module_to_dylib<'a>(
// platform to provide them.
add_default_roc_externs(&env);
let capacity = toplevel_expects.pure.len() + toplevel_expects.fx.len();
let mut expect_symbols = BumpVec::with_capacity_in(capacity, env.arena);
expect_symbols.extend(toplevel_expects.pure.keys().copied());
expect_symbols.extend(toplevel_expects.fx.keys().copied());
let expects_symbols = toplevel_expects
.iter()
.map(|(module_id, expects)| {
(
*module_id,
bumpalo::collections::Vec::from_iter_in(
expects
.pure
.keys()
.copied()
.chain(expects.fx.keys().copied()),
env.arena,
),
)
})
.collect();
let expect_names = roc_gen_llvm::llvm::build::build_procedures_expose_expects(
&env,
&layout_interner,
opt_level,
expect_symbols.into_bump_slice(),
expects_symbols,
procedures,
);
let expects_fx = bumpalo::collections::Vec::from_iter_in(
toplevel_expects
.fx
.into_iter()
.zip(expect_names.iter().skip(toplevel_expects.pure.len()))
.map(|((symbol, region), name)| ToplevelExpect {
symbol,
region,
name,
}),
env.arena,
);
let mut result_expects: MutMap<ModuleId, ExpectFunctions> = MutMap::default();
for (module_id, expects) in toplevel_expects.into_iter() {
let expect_names = expect_names.get(&module_id).unwrap();
let expects_pure = bumpalo::collections::Vec::from_iter_in(
toplevel_expects
.pure
.into_iter()
.zip(expect_names.iter())
.map(|((symbol, region), name)| ToplevelExpect {
symbol,
region,
name,
}),
env.arena,
);
let expects_fx = bumpalo::collections::Vec::from_iter_in(
expects
.fx
.into_iter()
.zip(expect_names.iter().skip(expects.pure.len()))
.map(|((symbol, region), name)| ToplevelExpect {
symbol,
region,
name,
}),
env.arena,
);
let expects = ExpectFunctions {
pure: expects_pure,
fx: expects_fx,
};
let expects_pure =
bumpalo::collections::Vec::from_iter_in(
expects.pure.into_iter().zip(expect_names.iter()).map(
|((symbol, region), name)| ToplevelExpect {
symbol,
region,
name,
},
),
env.arena,
);
let expects = ExpectFunctions {
pure: expects_pure,
fx: expects_fx,
};
result_expects.insert(module_id, expects);
}
env.dibuilder.finalize();
@ -735,5 +752,6 @@ pub fn expect_mono_module_to_dylib<'a>(
env.module.print_to_file(path).unwrap();
}
llvm_module_to_dylib(env.module, &target, opt_level).map(|lib| (lib, expects, layout_interner))
llvm_module_to_dylib(env.module, &target, opt_level)
.map(|lib| (lib, result_expects, layout_interner))
}