Minor restructuring

This commit is contained in:
Patrick Lühne 2020-02-04 23:47:12 +01:00
parent 09e16edbe4
commit 1694a2d0f4
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 32 additions and 32 deletions

View File

@ -1,35 +1,3 @@
struct TermDisplay<'term>
{
parent_precedence: Option<i32>,
term: &'term crate::Term,
}
fn display_term<'term>(term: &'term crate::Term, parent_precedence: Option<i32>)
-> TermDisplay<'term>
{
TermDisplay
{
parent_precedence,
term,
}
}
struct FormulaDisplay<'formula>
{
parent_precedence: Option<i32>,
formula: &'formula crate::Formula,
}
fn display_formula<'formula>(formula: &'formula crate::Formula, parent_precedence: Option<i32>)
-> FormulaDisplay<'formula>
{
FormulaDisplay
{
parent_precedence,
formula,
}
}
trait Precedence
{
fn precedence(&self) -> i32;
@ -108,6 +76,22 @@ impl std::fmt::Display for crate::VariableDeclaration
}
}
struct TermDisplay<'term>
{
parent_precedence: Option<i32>,
term: &'term crate::Term,
}
fn display_term<'term>(term: &'term crate::Term, parent_precedence: Option<i32>)
-> TermDisplay<'term>
{
TermDisplay
{
parent_precedence,
term,
}
}
impl<'term> std::fmt::Debug for TermDisplay<'term>
{
fn fmt(&self, format: &mut std::fmt::Formatter) -> std::fmt::Result
@ -195,6 +179,22 @@ impl<'term> std::fmt::Display for TermDisplay<'term>
}
}
struct FormulaDisplay<'formula>
{
parent_precedence: Option<i32>,
formula: &'formula crate::Formula,
}
fn display_formula<'formula>(formula: &'formula crate::Formula, parent_precedence: Option<i32>)
-> FormulaDisplay<'formula>
{
FormulaDisplay
{
parent_precedence,
formula,
}
}
impl<'formula> std::fmt::Debug for FormulaDisplay<'formula>
{
fn fmt(&self, format: &mut std::fmt::Formatter) -> std::fmt::Result