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

fix conformity tests #279 and #296

Browse Source
This commit is contained in:
Mark Thom
2019-04-14 09:45:04 -06:00
parent fb47423c77
commit d3eec10fc5
6 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/prolog/heap_print.rs
View File

@@ -438,7 +438,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
} else { // if is_infix!(spec.assoc())
match ct.name().as_str() {
"|" => {
self.format_infix_op_with_space(ct.name(), spec);
self.format_bar_separator_op_with_space(ct.name(), spec);
return;
},
_ => {}
@@ -477,13 +477,12 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
self.state_stack.push(TokenOrRedirect::Atom(name));
}
fn format_infix_op_with_space(&mut self, name: ClauseName, spec: SharedOpDesc)
fn format_bar_separator_op_with_space(&mut self, name: ClauseName, spec: SharedOpDesc)
{
let left_directed_op = DirectedOp::Left(name.clone(), spec.clone());
let right_directed_op = DirectedOp::Right(name.clone(), spec.clone());
self.state_stack.push(TokenOrRedirect::CompositeRedirect(left_directed_op));
// self.state_stack.push(TokenOrRedirect::Op(name.clone(), spec));
self.state_stack.push(TokenOrRedirect::HeadTailSeparator);
self.state_stack.push(TokenOrRedirect::CompositeRedirect(right_directed_op));
}
@@ -516,7 +515,7 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
return;
}
}
if let Some(spec) = ct.spec() {
if "." == ct.name().as_str() && is_infix!(spec.assoc()) {
if !self.ignore_ops {