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

clean up heap_print.rs

Browse Source
This commit is contained in:
Mark Thom
2019-03-31 02:17:50 -06:00
parent a2f531eeb7
commit 252873694b
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/prolog/heap_print.rs
View File

@@ -444,28 +444,24 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
false
}
fn format_clause(&mut self, iter: &mut HCPreOrderIterator, arity: usize, ct: ClauseType)
{
if let Some(spec) = ct.spec() {
if self.numbervars && is_numbered_var(&ct, arity) {
if self.format_numbered_vars(iter) {
return;
}
}
if !self.ignore_ops {
return self.enqueue_op(ct, spec);
}
} else if self.numbervars && is_numbered_var(&ct, arity) {
if self.numbervars && is_numbered_var(&ct, arity) {
if self.format_numbered_vars(iter) {
return;
}
}
if let Some(spec) = ct.spec() {
if !self.ignore_ops {
return self.enqueue_op(ct, spec);
}
}
match (ct.name().as_str(), arity) {
("{}", 1) if !self.ignore_ops => self.format_curly_braces(),
_ => self.format_struct(arity, ct.name())
_ => self.format_struct(arity, ct.name())
};
}
@@ -541,7 +537,6 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
push_space_if_amb!(self, atom.as_str(), {
match atom.as_str() {
"" => self.append_str("''"),
//"," => self.append_str("(,)"),
s => self.print_op_addendum(s)
}
});
@@ -562,9 +557,9 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
if self.quoted {
self.push_char('\'');
}
}
}
}
fn print_op(&mut self, atom: &str) {
if atom == "," {
self.push_char(',');