give dynamic predicates a better respect for module bounds

This commit is contained in:
Mark Thom
2019-03-06 00:51:21 -07:00
parent 6439d09733
commit c8ea788720
4 changed files with 25 additions and 15 deletions

View File

@@ -71,7 +71,8 @@ pub trait SubModuleUser
fn insert_dir_entry(&mut self, ClauseName, usize, ModuleCodeIndex);
fn remove_module(&mut self, mod_name: ClauseName, module: &Module) {
fn remove_module(&mut self, mod_name: ClauseName, module: &Module)
{
for (name, arity) in module.module_decl.exports.iter().cloned() {
let name = name.defrock_brackets();
@@ -83,6 +84,7 @@ pub trait SubModuleUser
self.remove_code_index((name.clone(), arity));
// remove or respecify ops.
if arity == 2 {
if let Some((_, _, mod_name)) = self.op_dir().get(&(name.clone(), Fixity::In)).cloned()
@@ -113,7 +115,8 @@ pub trait SubModuleUser
}
// returns true on successful import.
fn import_decl(&mut self, name: ClauseName, arity: usize, submodule: &Module) -> bool {
fn import_decl(&mut self, name: ClauseName, arity: usize, submodule: &Module) -> bool
{
let name = name.defrock_brackets();
let mut found_op = false;