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

remove intra-module predicates from module code directory when module is being re-defined (#848)

Browse Source
This commit is contained in:
Mark Thom
2021-03-13 23:22:24 -07:00
parent c69807b416
commit 7ea7e5c951
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/tabling/wrapper.pl
View File

@@ -56,8 +56,8 @@
%% table(PIList) :-
%% throw(error(context_error(nodirective, table(PIList)), _)).
instantiation_error(Var) :-
throw(error(instantiation_error(Var), _)).
%% instantiation_error(Var) :-
%% throw(error(instantiation_error(Var), _)).
wrappers(Var) -->
{ var(Var), !,

23
src/machine/load_state.rs
View File

@@ -473,6 +473,27 @@ impl<'a> LoadState<'a> {
}
}
pub(super) fn remove_replaced_module(&mut self, module_name: ClauseName) {
let removed_module = match self.wam.indices.modules.remove(&module_name) {
Some(module) => module,
None => return,
};
for (key, code_index) in &removed_module.code_dir {
if code_index.get() != IndexPtr::Undefined {
let old_index_ptr = code_index.replace(IndexPtr::Undefined);
self.retraction_info.push_record(
RetractionRecord::ReplacedModulePredicate(
module_name.clone(), key.clone(), old_index_ptr,
),
);
}
}
self.wam.indices.modules.insert(module_name, removed_module);
}
pub(super) fn remove_module_exports(&mut self, module_name: ClauseName) {
let removed_module = match self.wam.indices.modules.remove(&module_name) {
Some(module) => module,
@@ -884,7 +905,9 @@ impl<'a> LoadState<'a> {
pub(crate) fn add_module(&mut self, module_decl: ModuleDecl, listing_src: ListingSource) {
let module_name = module_decl.name.clone();
self.remove_module_exports(module_name.clone());
self.remove_replaced_module(module_name.clone());
match self.wam.indices.modules.get_mut(&module_name) {
Some(module) => {