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

add support for printing cyclic terms.

Browse Source
This commit is contained in:
Mark Thom
2018-05-05 01:53:05 -06:00
parent c369ce9a7f
commit d6495c8195
9 changed files with 279 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/prolog/heap_iter.rs
View File

@@ -179,45 +179,6 @@ where HCIter: Iterator<Item=HeapCellValue> + MutStackHCIterator
}
}
pub struct HCDerefAcyclicIterator<HCIter> {
iter: HCIter,
seen: HashSet<Addr>
}
pub type HCDerefAcyclicPreOrderIterator<'a> = HCDerefAcyclicIterator<HCPreOrderIterator<'a>>;
impl<'a> HCPreOrderIterator<'a> {
pub fn deref_acyclic_iter(self) -> HCDerefAcyclicPreOrderIterator<'a> {
HCDerefAcyclicIterator::new(self)
}
}
impl<HCIter: MutStackHCIterator> HCDerefAcyclicIterator<HCIter>
{
pub fn new(iter: HCIter) -> Self {
HCDerefAcyclicIterator { iter, seen: HashSet::new() }
}
}
impl<HCIter> Iterator for HCDerefAcyclicIterator<HCIter>
where HCIter: Iterator<Item=HeapCellValue> + MutStackHCIterator
{
type Item = HeapCellValue;
fn next(&mut self) -> Option<Self::Item> {
loop {
match self.iter.next() {
Some(HeapCellValue::Addr(addr)) =>
if !self.seen.contains(&addr) {
self.seen.insert(addr.clone());
return Some(HeapCellValue::Addr(addr));
},
item => return item
}
}
}
}
pub struct HCZippedAcyclicIterator<HCIter> {
i1: HCIter,
i2: HCIter,