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

mark variable referents in stackful iterator, fix tests (#1408)

Browse Source
This commit is contained in:
Mark Thom
2022-04-10 14:17:33 -06:00
parent d6287fae06
commit 95c192a988
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/heap_iter.rs
View File

@@ -171,8 +171,8 @@ impl<'a> StackfulPreOrderHeapIter<'a> {
return Some(self.heap[h]); return Some(self.heap[h]);
} }
(HeapCellValueTag::AttrVar | HeapCellValueTag::PStrLoc | HeapCellValueTag::Var, vh) => { (HeapCellValueTag::AttrVar | HeapCellValueTag::PStrLoc | HeapCellValueTag::Var, vh) => {
self.push_if_unmarked(h); self.push_if_unmarked(vh);
self.stack.push(IterStackLoc::iterable_heap_loc(vh)); self.stack.push(IterStackLoc::mark_heap_loc(vh));
forward_if_referent_marked(&mut self.heap, vh); forward_if_referent_marked(&mut self.heap, vh);
} }
(HeapCellValueTag::PStrOffset, offset) => { (HeapCellValueTag::PStrOffset, offset) => {
@@ -1467,7 +1467,7 @@ mod tests {
); );
assert_eq!( assert_eq!(
unmark_cell_bits!(iter.next().unwrap()), unmark_cell_bits!(iter.next().unwrap()),
list_loc_as_cell!(1) heap_loc_as_cell!(0)
); );
assert_eq!(iter.next(), None); assert_eq!(iter.next(), None);
@@ -1739,7 +1739,10 @@ mod tests {
cyclic_link.set_forwarding_bit(true); cyclic_link.set_forwarding_bit(true);
cyclic_link.set_mark_bit(true); cyclic_link.set_mark_bit(true);
assert_eq!(iter.next().unwrap(), list_loc_as_cell!(1)); assert_eq!(
unmark_cell_bits!(iter.next().unwrap()),
list_loc_as_cell!(1)
);
assert_eq!( assert_eq!(
unmark_cell_bits!(iter.next().unwrap()), unmark_cell_bits!(iter.next().unwrap()),
list_loc_as_cell!(1) list_loc_as_cell!(1)
@@ -1803,7 +1806,7 @@ mod tests {
assert_eq!( assert_eq!(
unmark_cell_bits!(iter.next().unwrap()), unmark_cell_bits!(iter.next().unwrap()),
str_loc_as_cell!(1) heap_loc_as_cell!(0)
); );
assert_eq!( assert_eq!(
@@ -1975,7 +1978,7 @@ mod tests {
); );
assert_eq!( assert_eq!(
unmark_cell_bits!(iter.next().unwrap()), unmark_cell_bits!(iter.next().unwrap()),
list_loc_as_cell!(1) heap_loc_as_cell!(0)
); );
assert_eq!( assert_eq!(
unmark_cell_bits!(iter.next().unwrap()), unmark_cell_bits!(iter.next().unwrap()),

9
src/loader.pl
View File

@@ -28,11 +28,10 @@ write_error(Error) :-
), ),
( nonvar(Error), ( nonvar(Error),
functor(Error, error, 2) -> functor(Error, error, 2) ->
writeq(Error), writeq(Error)
write('.') ; writeq(throw(Error))
; writeq(throw(Error)), ),
write('.') write('.').
).
'$print_message_and_fail'(Error) :- '$print_message_and_fail'(Error) :-
( ( Error = error(existence_error(procedure, Expansion), Expansion) ( ( Error = error(existence_error(procedure, Expansion), Expansion)