Rust constr enum

ast/src/analyzed/display.rs

@@ -304,7 +304,7 @@ fn format_outer_function(e: &Expression, f: &mut Formatter<'_>) -> Result {
     }
 }
 
-impl<Expr: Display> Display for SelectedExpressions<Expr> {
+impl<T: Display> Display for SelectedExpressions<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         write!(
             f,
@@ -318,24 +318,44 @@ impl<Expr: Display> Display for SelectedExpressions<Expr> {
     }
 }
 
-impl<T: Display> Display for Identity<SelectedExpressions<AlgebraicExpression<T>>> {
+impl<T: Display> Display for PolynomialIdentity<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
-        match self.kind {
-            IdentityKind::Polynomial => {
-                let (left, right) = self.as_polynomial_identity();
-                let right = right
-                    .as_ref()
-                    .map(|r| r.to_string())
-                    .unwrap_or_else(|| "0".into());
+        match &self.expression {
+            AlgebraicExpression::BinaryOperation(AlgebraicBinaryOperation {
+                left,
+                op: AlgebraicBinaryOperator::Sub,
+                right,
+            }) => {
                 write!(f, "{left} = {right};")
             }
-            IdentityKind::Plookup => write!(f, "{} in {};", self.left, self.right),
-            IdentityKind::Permutation => write!(f, "{} is {};", self.left, self.right),
-            IdentityKind::Connect => write!(f, "{} connect {};", self.left, self.right),
+            e => write!(f, "{e} = 0;"),
         }
     }
 }
 
+impl<T: Display> Display for LookupIdentity<T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        write!(f, "{} in {};", self.left, self.right)
+    }
+}
+
+impl<T: Display> Display for PermutationIdentity<T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        write!(f, "{} is {};", self.left, self.right)
+    }
+}
+
+impl<T: Display> Display for ConnectIdentity<T> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        write!(
+            f,
+            "[{}] connect [{}];",
+            self.left.iter().format(", "),
+            self.right.iter().format(", ")
+        )
+    }
+}
+
 impl Display for Reference {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {