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

correct mismanagement of dynamic database across modules

Browse Source
This commit is contained in:
Mark Thom
2019-03-07 20:27:55 -07:00
parent 72c8807ff1
commit 72f759da40
4 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,11 +211,11 @@ impl Machine {
self.machine_st.flags
}
pub fn check_dynamic_clause_overwrite(&self, name: ClauseName, arity: usize)
pub fn check_dynamic_clause_overwrite(&self, name: ClauseName, arity: usize, module: ClauseName)
-> Result<(), SessionError>
{
if let Some(info) = self.indices.dynamic_code_dir.get(&(name.clone(), arity)) {
if info.module_src != name.owning_module() {
if info.module_src != module {
let err_str = format!("{}/{}", name.as_str(), arity);
let err_str = clause_name!(err_str, self.indices.atom_tbl());
@@ -242,7 +242,8 @@ impl Machine {
};
if dynamic_clause_map.contains_key(&key) {
self.check_dynamic_clause_overwrite(key.0.clone(), key.1)?;
let module = idx.0.borrow().1.clone();
self.check_dynamic_clause_overwrite(key.0.clone(), key.1, module)?;
}
if let Some(ref existing_idx) = self.indices.code_dir.get(&key) {