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

check for free variables in locations removed from iterator stack in ground_test (#2075)

Browse Source
This commit is contained in:
Mark
2023-10-03 15:31:01 -06:00
parent fd14869ddc
commit f9d44c93fd
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/machine/machine_state_impl.rs
View File

@@ -1637,21 +1637,33 @@ impl MachineState {
let mut iter = stackful_preorder_iter::<NonListElider>(&mut self.heap, &mut self.stack, value);
let mut stack_len = 0;
while let Some(value) = iter.next() {
let mut value = unmark_cell_bits!(value);
let is_var = |heap: &Heap, value: HeapCellValue| -> bool {
let value = unmark_cell_bits!(value);
if value.is_var() {
value = heap_bound_store(iter.heap, heap_bound_deref(iter.heap, value));
let value = heap_bound_store(heap, heap_bound_deref(heap, value));
if value.is_var() {
return true;
}
}
false
};
while let Some(value) = iter.next() {
if is_var(iter.heap, value) {
return true;
}
if value.is_ref() {
if visited.contains(&value) {
for _ in stack_len..iter.stack_len() {
iter.pop_stack();
while iter.stack_len() > stack_len {
if let Some(value) = iter.pop_stack() {
if is_var(iter.heap, value) {
return true;
}
}
}
} else {
visited.insert(value);