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

stop module dynamic predicate modifications from taking on the user module index.

Browse Source
This commit is contained in:
Mark Thom
2019-03-09 00:37:58 -07:00
parent 92c36aa0d9
commit adf9629333
4 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/prolog/machine/compile.rs
View File

@@ -159,8 +159,7 @@ pub fn compile_term(wam: &mut Machine, packet: TopLevelPacket) -> EvalSession
}
pub(super)
fn compile_into_module<R: Read>(wam: &mut Machine, module_name: ClauseName, src: R,
name: ClauseName, arity: usize)
fn compile_into_module<R: Read>(wam: &mut Machine, module_name: ClauseName, src: R, name: ClauseName)
-> EvalSession
{
let mut indices = default_index_store!(wam.atom_tbl_of(&name));
@@ -178,21 +177,15 @@ fn compile_into_module<R: Read>(wam: &mut Machine, module_name: ClauseName, src:
match wam.indices.modules.get_mut(&module_name) {
Some(module) => {
let code_dir = mem::replace(&mut indices.code_dir, CodeDir::new());
module.code_dir.extend(code_dir);
let mut code_dir = mem::replace(&mut indices.code_dir, CodeDir::new());
if module.module_decl.exports.contains(&(name.clone(), arity)) {
if let Some(idx) = wam.indices.code_dir.get(&(name.clone(), arity)) {
if module.module_decl.name == module_name {
if module_code.len() > 0 {
set_code_index!(idx, IndexPtr::Index(wam.code_repo.code.len()),
module_name.clone());
} else {
set_code_index!(idx, IndexPtr::Undefined, module_name.clone());
}
}
}
// replace the "user" module src's in the indices with module_name.
for (_, idx) in code_dir.iter_mut() {
let p = idx.0.borrow().0;
set_code_index!(idx, p, module_name.clone());
}
module.code_dir.extend(code_dir);
},
_ => unreachable!()
};

4
src/prolog/machine/dynamic_database.rs
View File

@@ -26,12 +26,12 @@ impl Machine {
match module.as_str() {
"user" => compile_user_module(self, src),
_ => compile_into_module(self, module, src, name, arity)
_ => compile_into_module(self, module, src, name)
}
},
None => compile_user_module(self, src)
},
_ => compile_into_module(self, name.owning_module(), src, name, arity)
_ => compile_into_module(self, name.owning_module(), src, name)
}
}

2
src/prolog/machine/mod.rs
View File

@@ -113,7 +113,7 @@ impl SubModuleUser for IndexStore {
println!("warning: overwriting {}/{}", &name, arity);
}
let (p, module_name) = idx.0.borrow().clone();
let (p, module_name) = idx.0.borrow().clone();
set_code_index!(code_idx, p, module_name);
return;
}

4
src/prolog/machine/modules.rs
View File

@@ -121,7 +121,7 @@ pub trait SubModuleUser
if let Some(code_data) = submodule.code_dir.get(&(name.clone(), arity)) {
let name = name.with_table(submodule.atom_tbl.clone());
let mut atom_tbl = self.atom_tbl();
atom_tbl.borrow_mut().insert(name.to_rc());
self.insert_dir_entry(name, arity, code_data.clone());
@@ -176,7 +176,7 @@ impl SubModuleUser for Module {
}
fn get_code_index(&self, key: PredicateKey, _: ClauseName) -> Option<CodeIndex> {
self.code_dir.get(&key).cloned().map(CodeIndex::from)
self.code_dir.get(&key).cloned()
}
fn remove_code_index(&mut self, key: PredicateKey) {