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

simplify heap_iter.rs

Browse Source
This commit is contained in:
Mark Thom
2018-03-02 22:31:34 -07:00
parent 8a63623516
commit c4a206da02
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/prolog/heap_iter.rs
View File

@@ -167,9 +167,7 @@ impl<HeapCellIter> Iterator for HeapCellAcyclicIterator<HeapCellIter>
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
while let Some(addr) = self.iter.stack().pop() { while let Some(addr) = self.iter.stack().pop() {
if self.seen.contains(&addr) { if !self.seen.contains(&addr) {
continue;
} else {
self.iter.stack().push(addr.clone()); self.iter.stack().push(addr.clone());
self.seen.insert(addr); self.seen.insert(addr);
break; break;
@@ -201,9 +199,7 @@ impl<HeapCellIter> Iterator for HeapCellZippedAcyclicIterator<HeapCellIter>
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
while let (Some(a1), Some(a2)) = (self.i1.stack().pop(), self.i2.stack().pop()) { while let (Some(a1), Some(a2)) = (self.i1.stack().pop(), self.i2.stack().pop()) {
if self.seen.contains(&(a1.clone(), a2.clone())) { if !self.seen.contains(&(a1.clone(), a2.clone())) {
continue;
} else {
self.i1.stack().push(a1.clone()); self.i1.stack().push(a1.clone());
self.i2.stack().push(a2.clone()); self.i2.stack().push(a2.clone());
self.seen.insert((a1, a2)); self.seen.insert((a1, a2));