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

consume whitespace before reading a term in loader.pl, modify prolog_load_context at file key to better reflect loading context, use it when reporting singleton variables (#812)

Browse Source
This commit is contained in:
Mark Thom
2021-02-22 13:23:22 -07:00
parent 5f8bdc564b
commit 1a9f6f06df
6 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/machine/loader.rs
View File

@@ -1612,20 +1612,26 @@ impl Machine {
pub(crate) fn load_context_file(&mut self) {
if let Some(load_context) = self.load_contexts.last() {
if let Some(file_name) = load_context.path.file_name() {
let file_name_str = file_name.to_str().unwrap();
let file_name_atom =
clause_name!(file_name_str.to_string(), self.machine_st.atom_tbl);
match load_context.path.file_name() {
Some(file_name) if load_context.path.is_file() => {
let file_name_str = file_name.to_str().unwrap();
let file_name_atom =
clause_name!(file_name_str.to_string(), self.machine_st.atom_tbl);
let file_name_addr = Addr::Con(
self.machine_st
.heap
.push(HeapCellValue::Atom(file_name_atom, None)),
);
let file_name_addr = Addr::Con(
self.machine_st
.heap
.push(HeapCellValue::Atom(file_name_atom, None)),
);
.unify(file_name_addr, self.machine_st[temp_v!(1)]);
self.machine_st
.unify(file_name_addr, self.machine_st[temp_v!(1)]);
return;
return;
}
_ => {
return self.load_context_module();
}
}
}