Now that we also generate conjunctions, use parentheses in disjunctions

This commit is contained in:
Nick Rolfe
2020-10-30 10:34:42 +00:00
parent f198dc530f
commit d47bd32b58

View File

@@ -108,7 +108,7 @@ impl fmt::Display for Expression {
if index > 0 {
write!(f, " or ")?;
}
write!(f, "{}", disjunct)?;
write!(f, "({})", disjunct)?;
}
Ok(())
}
@@ -117,11 +117,11 @@ impl fmt::Display for Expression {
if conjuncts.is_empty() {
write!(f, "any()")
} else {
for (index, disjunct) in conjuncts.iter().enumerate() {
for (index, conjunct) in conjuncts.iter().enumerate() {
if index > 0 {
write!(f, " and ")?;
}
write!(f, "{}", disjunct)?;
write!(f, "{}", conjunct)?;
}
Ok(())
}