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

make max_depth checking in heap_print.rs consistent across atomics

Browse Source
This commit is contained in:
Mark Thom
2025-08-23 14:20:00 -07:00
parent eed0a5babb
commit e168b31963
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/heap_print.rs
View File

@@ -1468,6 +1468,11 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
} }
fn print_tcp_listener(&mut self, tcp_listener: &TcpListener, max_depth: usize) { fn print_tcp_listener(&mut self, tcp_listener: &TcpListener, max_depth: usize) {
if self.max_depth_exhausted(max_depth) {
self.state_stack.push(TokenOrRedirect::Atom(atom!("...")));
return;
}
let (ip, port) = if let Ok(addr) = tcp_listener.local_addr() { let (ip, port) = if let Ok(addr) = tcp_listener.local_addr() {
(addr.ip(), addr.port()) (addr.ip(), addr.port())
} else { } else {
@@ -1531,6 +1536,11 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
} }
fn print_stream(&mut self, stream: Stream, max_depth: usize) { fn print_stream(&mut self, stream: Stream, max_depth: usize) {
if self.max_depth_exhausted(max_depth) {
self.state_stack.push(TokenOrRedirect::Atom(atom!("...")));
return;
}
if let Some(alias) = stream.options().get_alias() { if let Some(alias) = stream.options().get_alias() {
self.print_impromptu_atom(alias); self.print_impromptu_atom(alias);
} else { } else {
@@ -1704,8 +1714,12 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
self.print_number(max_depth, NumberFocus::Unfocused(Number::Fixnum(n)), &op); self.print_number(max_depth, NumberFocus::Unfocused(Number::Fixnum(n)), &op);
} }
(HeapCellValueTag::F64Offset, offset) => { (HeapCellValueTag::F64Offset, offset) => {
let f = self.arena.f64_tbl.get_entry(offset); if self.max_depth_exhausted(max_depth) {
self.print_number(max_depth, NumberFocus::Unfocused(Number::Float(f)), &op); self.state_stack.push(TokenOrRedirect::Atom(atom!("...")));
} else {
let f = self.arena.f64_tbl.get_entry(offset);
self.print_number(max_depth, NumberFocus::Unfocused(Number::Float(f)), &op);
}
} }
(HeapCellValueTag::PStrLoc) => { (HeapCellValueTag::PStrLoc) => {
self.print_list_like(max_depth); self.print_list_like(max_depth);
@@ -1719,12 +1733,16 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
} }
} }
(HeapCellValueTag::Var | HeapCellValueTag::AttrVar | HeapCellValueTag::StackVar) => { (HeapCellValueTag::Var | HeapCellValueTag::AttrVar | HeapCellValueTag::StackVar) => {
let h = self.iter.focus(); if self.max_depth_exhausted(max_depth) {
self.state_stack.push(TokenOrRedirect::Atom(atom!("...")));
} else {
let h = self.iter.focus();
if let Some(offset_str) = self.offset_as_string(h) { if let Some(offset_str) = self.offset_as_string(h) {
push_space_if_amb!(self, &offset_str, { push_space_if_amb!(self, &offset_str, {
append_str!(self, offset_str.as_str()); append_str!(self, offset_str.as_str());
}) })
}
} }
} }
(HeapCellValueTag::Cons, c) => { (HeapCellValueTag::Cons, c) => {
@@ -1742,7 +1760,11 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
self.print_tcp_listener(&listener, max_depth); self.print_tcp_listener(&listener, max_depth);
} }
(ArenaHeaderTag::Dropped, _value) => { (ArenaHeaderTag::Dropped, _value) => {
self.print_impromptu_atom(atom!("$dropped_value")); if self.max_depth_exhausted(max_depth) {
self.state_stack.push(TokenOrRedirect::Atom(atom!("...")));
} else {
self.print_impromptu_atom(atom!("$dropped_value"));
}
} }
(ArenaHeaderTag::ChildProcess, process) => { (ArenaHeaderTag::ChildProcess, process) => {
@@ -2087,7 +2109,7 @@ mod tests {
let output = printer.print(); let output = printer.print();
assert_eq!(output.result(), "[_1,_3,_5,_7,_9|...]"); assert_eq!(output.result(), "[_1,_3,_5,_7,...|...]");
} }
all_cells_unmarked(&wam.machine_st.heap); all_cells_unmarked(&wam.machine_st.heap);