remove module from toplevel in unqualified use_module

2019-10-26 12:39:42 -06:00
parent 2eea0528b1
commit ccfcc654a5
1 changed files with 7 additions and 4 deletions
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -443,10 +443,13 @@ impl Machine {

 	let load_result = match to_src(name) {
 	    ModuleSource::Library(name) =>
-		if !self.indices.modules.contains_key(&name) {
-		    load_library(self, name, false)
-		} else {
+                if let Some(module) = self.indices.take_module(name.clone()) {
+                    self.indices.remove_module(clause_name!("user"), &module);
+                    self.indices.modules.insert(name.clone(), module);
+
 		    Ok(name)
+		} else {
+		    load_library(self, name, false)
 		},
 	    ModuleSource::File(name) =>
                load_module_from_file(self, name.as_str(), false)
@@ -489,7 +492,7 @@ impl Machine {
                    self.indices.modules.insert(name.clone(), module);

 		    Ok(name)
-		} else {		
+		} else {
 		    load_library(self, name, false)
 		},
 	    ModuleSource::File(name) =>