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

don't print superfluous round brackets in curly braces (#1416)

Browse Source
This commit is contained in:
Mark Thom
2022-05-31 23:34:55 -06:00
parent 5e1faeb5d2
commit 4b5c22864e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/heap_print.rs
View File

@@ -202,6 +202,7 @@ enum TokenOrRedirect {
Op(Atom, OpDesc), Op(Atom, OpDesc),
NumberedVar(String), NumberedVar(String),
CompositeRedirect(usize, DirectedOp), CompositeRedirect(usize, DirectedOp),
CurlyBracketRedirect(usize),
FunctorRedirect(usize), FunctorRedirect(usize),
#[allow(unused)] IpAddr(IpAddr), #[allow(unused)] IpAddr(IpAddr),
NumberFocus(usize, NumberFocus, Option<DirectedOp>), NumberFocus(usize, NumberFocus, Option<DirectedOp>),
@@ -735,8 +736,9 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
return false; return false;
} }
self.state_stack.push(TokenOrRedirect::RightCurly); self.state_stack.push(TokenOrRedirect::RightCurly);
self.state_stack.push(TokenOrRedirect::FunctorRedirect(max_depth)); self.state_stack.push(TokenOrRedirect::CurlyBracketRedirect(max_depth));
self.state_stack.push(TokenOrRedirect::LeftCurly); self.state_stack.push(TokenOrRedirect::LeftCurly);
true true
@@ -791,8 +793,8 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
} }
} }
return match (name.as_str(), arity) { return match (name, arity) {
("{}", 1) if !self.ignore_ops => self.format_curly_braces(max_depth), (atom!("{}"), 1) if !self.ignore_ops => self.format_curly_braces(max_depth),
_ => self.format_struct(max_depth, arity, name), _ => self.format_struct(max_depth, arity, name),
}; };
} }
@@ -1305,8 +1307,8 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
max_depth: usize, max_depth: usize,
) { ) {
let add_brackets = if !self.ignore_ops { let add_brackets = if !self.ignore_ops {
negated_operand negated_operand ||
|| if let Some(ref op) = op { if let Some(ref op) = op {
if self.numbervars && arity == 1 && name == atom!("$VAR") { if self.numbervars && arity == 1 && name == atom!("$VAR") {
!self.iter.immediate_leaf_has_property(|addr| { !self.iter.immediate_leaf_has_property(|addr| {
match Number::try_from(addr) { match Number::try_from(addr) {
@@ -1571,6 +1573,9 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter> {
TokenOrRedirect::CompositeRedirect(max_depth, op) => { TokenOrRedirect::CompositeRedirect(max_depth, op) => {
self.handle_heap_term(Some(op), false, max_depth) self.handle_heap_term(Some(op), false, max_depth)
} }
TokenOrRedirect::CurlyBracketRedirect(max_depth) => {
self.handle_heap_term(None, false, max_depth)
}
TokenOrRedirect::FunctorRedirect(max_depth) => { TokenOrRedirect::FunctorRedirect(max_depth) => {
self.handle_heap_term(None, true, max_depth) self.handle_heap_term(None, true, max_depth)
} }