rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

export loader's public predicates from builtins, handle module resolution from DCGs

Browse Source
This commit is contained in:
Mark Thom
2021-02-02 15:43:52 -07:00
parent 8900df6f13
commit 4e29099ed9
4 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/machine/loader.rs
View File

@@ -1733,11 +1733,12 @@ fn load_module(
code_dir: &mut CodeDir,
op_dir: &mut OpDir,
meta_predicate_dir: &mut MetaPredicateDir,
compilation_target: &CompilationTarget,
module: &Module,
) {
import_module_exports(
&mut RetractionInfo::new(0),
&CompilationTarget::User,
&compilation_target,
module,
code_dir,
op_dir,

25
src/machine/mod.rs
View File

@@ -230,6 +230,7 @@ impl Machine {
&mut self.indices.code_dir,
&mut self.indices.op_dir,
&mut self.indices.meta_predicates,
&CompilationTarget::User,
toplevel,
);
} else {
@@ -337,6 +338,7 @@ impl Machine {
&mut wam.indices.code_dir,
&mut wam.indices.op_dir,
&mut wam.indices.meta_predicates,
&CompilationTarget::User,
builtins,
);
} else {
@@ -354,13 +356,32 @@ impl Machine {
),
).unwrap();
if let Some(loader) = wam.indices.modules.get(&clause_name!("loader")) {
if let Some(loader) = wam.indices.modules.swap_remove(&clause_name!("loader")) {
if let Some(builtins) = wam.indices.modules.get_mut(&clause_name!("builtins")) {
// Import loader's exports into the builtins module so they will be
// implicitly included every further module.
load_module(
&mut builtins.code_dir,
&mut builtins.op_dir,
&mut builtins.meta_predicates,
&CompilationTarget::Module(clause_name!("builtins")),
&loader,
);
for export in &loader.module_decl.exports {
builtins.module_decl.exports.push(export.clone());
}
}
load_module(
&mut wam.indices.code_dir,
&mut wam.indices.op_dir,
&mut wam.indices.meta_predicates,
loader,
&CompilationTarget::User,
&loader,
);
wam.indices.modules.insert(clause_name!("loader"), loader);
} else {
unreachable!()
}