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

unify '' to [] in unify_complete_string (#1292, #1288)

Browse Source
This commit is contained in:
Mark Thom
2022-02-25 23:01:08 -07:00
parent d92d8bce89
commit 775bd3a08b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/machine/machine_state_impl.rs
View File

@@ -333,11 +333,20 @@ impl MachineState {
pub fn unify_complete_string(&mut self, atom: Atom, value: HeapCellValue) { pub fn unify_complete_string(&mut self, atom: Atom, value: HeapCellValue) {
if let Some(r) = value.as_var() { if let Some(r) = value.as_var() {
self.bind(r, atom_as_cstr_cell!(atom)); if atom == atom!("") {
self.bind(r, atom_as_cell!(atom!("[]")));
} else {
self.bind(r, atom_as_cstr_cell!(atom));
}
return; return;
} }
read_heap_cell!(value, read_heap_cell!(value,
(HeapCellValueTag::Atom, (cstr_atom, arity)) if atom == atom!("") => {
debug_assert_eq!(arity, 0);
self.fail = cstr_atom != atom!("[]");
}
(HeapCellValueTag::CStr, cstr_atom) => { (HeapCellValueTag::CStr, cstr_atom) => {
self.fail = atom != cstr_atom; self.fail = atom != cstr_atom;
} }
@@ -713,7 +722,6 @@ impl MachineState {
pub fn unify(&mut self) { pub fn unify(&mut self) {
let mut tabu_list: IndexSet<(usize, usize)> = IndexSet::new(); let mut tabu_list: IndexSet<(usize, usize)> = IndexSet::new();
// self.fail = false;
while !(self.pdl.is_empty() || self.fail) { while !(self.pdl.is_empty() || self.fail) {
let s1 = self.pdl.pop().unwrap(); let s1 = self.pdl.pop().unwrap();