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

clean up print_list_like

Browse Source
This commit is contained in:
Mark Thom
2020-04-14 14:26:30 -06:00
parent a059a9fbdc
commit f6c995157e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/prolog/heap_print.rs
View File

@@ -1057,10 +1057,10 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
addr: Addr, addr: Addr,
mut max_depth: usize, mut max_depth: usize,
) { ) {
let a1 = iter.stack().pop();
let a2 = iter.stack().pop();
if self.check_max_depth(&mut max_depth) { if self.check_max_depth(&mut max_depth) {
iter.stack().pop();
iter.stack().pop();
self.state_stack.push(TokenOrRedirect::Atom(clause_name!("..."))); self.state_stack.push(TokenOrRedirect::Atom(clause_name!("...")));
return; return;
} }
@@ -1071,13 +1071,13 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
let buf = heap_pstr_iter.to_string(); let buf = heap_pstr_iter.to_string();
if buf.is_empty() { if buf.is_empty() {
iter.stack().push(a2.unwrap());
iter.stack().push(a1.unwrap());
self.push_list(iter, max_depth); self.push_list(iter, max_depth);
return; return;
} }
iter.stack().pop();
iter.stack().pop();
let end_addr = heap_pstr_iter.focus(); let end_addr = heap_pstr_iter.focus();
let at_cdr = self.at_cdr(","); let at_cdr = self.at_cdr(",");
@@ -1349,7 +1349,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
if self.ignore_ops { if self.ignore_ops {
self.format_struct(iter, max_depth, 2, clause_name!(".")); self.format_struct(iter, max_depth, 2, clause_name!("."));
} else { } else {
self.print_list_like(iter, Addr::Lis(l), max_depth); //self.push_list(iter, max_depth); self.print_list_like(iter, Addr::Lis(l), max_depth);
} }
} }
&HeapCellValue::Addr(addr) => { &HeapCellValue::Addr(addr) => {