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

finish #214, add needed ambiguity checks if 0 is the final character

Browse Source
This commit is contained in:
Mark Thom
2019-10-27 19:23:35 -06:00
parent 0dcd9e5805
commit e594ade84d
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,14 +456,15 @@ impl Machine {
};
let result = load_result.and_then(|name| {
let module = self.indices.take_module(name.clone()).unwrap();
let module = self.indices.take_module(name.clone()).unwrap();
self.indices.use_module(&mut self.code_repo, self.machine_st.flags,
&module)?;
Ok(self.indices.insert_module(module))
if !module.is_impromptu_module {
self.indices.use_module(&mut self.code_repo, self.machine_st.flags, &module)?;
}
Ok(self.indices.insert_module(module))
});
self.code_repo.cached_query = cached_query;
if let Err(e) = result {
@@ -502,10 +503,12 @@ impl Machine {
let result = load_result.and_then(|name| {
let module = self.indices.take_module(name.clone()).unwrap();
self.indices.use_qualified_module(&mut self.code_repo,
self.machine_st.flags,
&module,
&exports)?;
if !module.is_impromptu_module {
self.indices.use_qualified_module(&mut self.code_repo,
self.machine_st.flags,
&module,
&exports)?;
}
Ok(self.indices.insert_module(module))
});