(parser) rev: display

Author: t-webber

src/parser/tree/binary.rs

@@ -13,13 +13,22 @@ pub struct Binary {
 #[allow(clippy::min_ident_chars)]
 impl fmt::Display for Binary {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "({} {} {})",
-            self.arg_l,
-            self.op,
-            repr_option_node(self.arg_r.as_ref())
-        )
+        if self.op == BinaryOperator::ArraySubscript {
+            write!(
+                f,
+                "({}[{}])",
+                self.arg_l,
+                repr_option_node(self.arg_r.as_ref())
+            )
+        } else {
+            write!(
+                f,
+                "({} {} {})",
+                self.arg_l,
+                self.op,
+                repr_option_node(self.arg_r.as_ref())
+            )
+        }
     }
 }
 

src/parser/tree/mod.rs

@@ -135,7 +135,7 @@ impl fmt::Display for Literal {
             f,
             "{}",
             match self {
-                Self::Empty => "\u{2205}".to_owned(),
+                Self::Empty => "\u{2205} ".to_owned(),
                 Self::String(val) | Self::Variable(val) | Self::Str(val) => val.to_string(),
                 Self::Char(val) => val.to_string(),
                 Self::Number(val) => format!("{val}"),
@@ -146,7 +146,7 @@ impl fmt::Display for Literal {
 
 #[allow(clippy::borrowed_box)]
 fn repr_option_node(opt: Option<&Box<Node>>) -> String {
-    opt.map_or_else(|| '\u{2205}'.to_string(), Box::<Node>::to_string)
+    opt.map_or_else(|| "\u{2205} ".to_owned(), Box::<Node>::to_string)
 }
 
 fn repr_vec_node(vec: &[Node]) -> String {

src/parser/tree/node.rs

@@ -212,7 +212,7 @@ impl Node {
 impl fmt::Display for Node {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::Empty => write!(f, "\u{2205}"),
+            Self::Empty => write!(f, "\u{2205} "),
             Self::Binary(val) => val.fmt(f),
             Self::FunctionCall(val) => val.fmt(f),
             Self::Leaf(val) => val.fmt(f),