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

warn when overwriting a predicate (#848)

Browse Source
This commit is contained in:
Mark Thom
2021-03-02 11:43:47 -07:00
parent 5976e2d873
commit 7ea9706c94
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/machine/compile.rs
View File

@@ -1293,6 +1293,26 @@ fn mergeable_indexed_subsequences(
false
}
fn print_overwrite_warning(
compilation_target: &CompilationTarget,
code_ptr: IndexPtr,
key: &PredicateKey,
) {
if let CompilationTarget::Module(ref module_name) = compilation_target {
match module_name.as_str() {
"builtins" | "loader" => return,
_ => {}
}
}
match code_ptr {
IndexPtr::DynamicUndefined | IndexPtr::Undefined => return,
_ => {}
}
println!("Warning: overwriting {}/{}", key.0, key.1);
}
impl<'a> LoadState<'a> {
fn compile_standalone_clause(
&mut self,
@@ -1403,7 +1423,7 @@ impl<'a> LoadState<'a> {
predicates.compilation_target.clone(),
);
}
}
};
match self
.wam
@@ -1440,6 +1460,8 @@ impl<'a> LoadState<'a> {
}
}
print_overwrite_warning(&predicates.compilation_target, code_index.get(), &key);
set_code_index(
&mut self.retraction_info,
&predicates.compilation_target,

2
src/machine/load_state.rs
View File

@@ -35,7 +35,6 @@ pub(super) fn set_code_index(
code_index.set(code_ptr);
RetractionRecord::AddedUserPredicate(key)
} else {
// TODO: emit warning about overwriting previous record
let replaced = code_index.replace(code_ptr);
RetractionRecord::ReplacedUserPredicate(key, replaced)
}
@@ -45,7 +44,6 @@ pub(super) fn set_code_index(
code_index.set(code_ptr);
RetractionRecord::AddedModulePredicate(module_name.clone(), key)
} else {
// TODO: emit warning about overwriting previous record
let replaced = code_index.replace(code_ptr);
RetractionRecord::ReplacedModulePredicate(module_name.clone(), key, replaced)
}