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

allow characters as atoms in Machine::use_module and Machine::use_qualified_module

Browse Source
This commit is contained in:
Mark Thom
2020-04-15 10:32:23 -06:00
parent 474fa9b3ec
commit 37f1f8ac14
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -632,8 +632,12 @@ impl Machine {
let addr = self.machine_st.store(self.machine_st.deref(module_spec)); let addr = self.machine_st.store(self.machine_st.deref(module_spec));
match self.machine_st.heap.index_addr(&addr).as_ref() { match self.machine_st.heap.index_addr(&addr).as_ref() {
HeapCellValue::Atom(name, _) => name.clone(), HeapCellValue::Atom(name, _) =>
_ => unreachable!(), name.clone(),
HeapCellValue::Addr(Addr::Char(c)) =>
clause_name!(c.to_string(), self.indices.atom_tbl),
_ =>
unreachable!(),
} }
}; };
@@ -679,8 +683,12 @@ impl Machine {
let addr = self.machine_st.store(self.machine_st.deref(module_spec)); let addr = self.machine_st.store(self.machine_st.deref(module_spec));
match self.machine_st.heap.index_addr(&addr).as_ref() { match self.machine_st.heap.index_addr(&addr).as_ref() {
HeapCellValue::Atom(name, _) => name.clone(), HeapCellValue::Atom(name, _) =>
_ => unreachable!(), name.clone(),
HeapCellValue::Addr(Addr::Char(c)) =>
clause_name!(c.to_string(), self.indices.atom_tbl),
_ =>
unreachable!(),
} }
}; };