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

record cyclic terms in printer

Browse Source
This commit is contained in:
Mark Thom
2018-05-07 00:44:42 -06:00
parent 30926a71ab
commit 7573a8fb10
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/prolog/heap_print.rs
View File

@@ -183,16 +183,20 @@ impl<'a, Formatter: HCValueFormatter, Outputter: HCValueOutputter>
printer
}
fn print_offset(&mut self, addr: Addr) {
fn offset_as_string(&self, addr: Addr) -> Option<String> {
match addr {
Addr::HeapCell(h) | Addr::Lis(h) | Addr::Str(h) =>
self.outputter.append(format!("_{}", h).as_str()),
Some(format!("_{}", h)),
Addr::StackCell(fr, sc) =>
self.outputter.append(format!("s_{}_{}", fr, sc).as_str()),
_ => {}
Some(format!("s_{}_{}", fr, sc)),
_ => None
}
}
fn print_offset(&mut self, addr: Addr) {
self.offset_as_string(addr).map(|s| self.outputter.append(s.as_str()));
}
fn check_for_seen(&mut self, iter: &mut HCPreOrderIterator) -> Option<HeapCellValue> {
iter.stack().last().cloned().and_then(|addr| {
let addr = self.machine_st.store(self.machine_st.deref(addr));
@@ -214,6 +218,11 @@ impl<'a, Formatter: HCValueFormatter, Outputter: HCValueOutputter>
None
} else {
if let Some(s) = self.offset_as_string(addr.clone()) {
let var = Rc::new(s);
self.heap_locs.insert(addr.clone(), var);
}
self.printed_vars.insert(addr);
iter.next()
}