Replace prettyPrint with pattern matching

Thihup · Aug 18, 2021 · b49c9e7 · b49c9e7
1 parent 59d0d79
commit b49c9e7
Show file tree

Hide file tree

Showing 34 changed files with 52 additions and 165 deletions.
diff --git a/io.joel/src/main/java/io/joel/impl/node/AddExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/AddExpressionNode.java
@@ -10,9 +10,4 @@ public Object getValue(ELContext context) {
         var rightValue = right.getValue(context);
         return Operation.ADDITION.calculate(leftValue, rightValue, context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s + %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/AndNode.java b/io.joel/src/main/java/io/joel/impl/node/AndNode.java
@@ -9,9 +9,4 @@ public Object getValue(ELContext context) {
             return false;
         return context.convertToType(right.getValue(context), boolean.class);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s && %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/AssignNode.java b/io.joel/src/main/java/io/joel/impl/node/AssignNode.java
@@ -35,9 +35,4 @@ private Object getValue(ELContext context, Object node) {
             return expressionNode.getValue(context);
         return null;
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s = %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/BooleanNode.java b/io.joel/src/main/java/io/joel/impl/node/BooleanNode.java
@@ -25,12 +25,4 @@ public String toString() {
     public Class<?> getType(ELContext context) {
         return Boolean.class;
     }
-
-    @Override
-    public String prettyPrint() {
-        return switch (this) {
-            case TRUE -> "true";
-            case FALSE -> "false";
-        };
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/CallExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/CallExpressionNode.java
@@ -96,11 +96,6 @@ private static <E extends Throwable> void sneakyThrow(Throwable e) throws E {
         throw (E) e;
     }
 
-    @Override
-    public String prettyPrint() {
-        return "%s(%s)".formatted(callee.prettyPrint(), arguments.stream().map(ExpressionNode::prettyPrint).collect(Collectors.joining(",")));
-    }
-
     public ExpressionNode callee() {
         return callee;
     }

diff --git a/io.joel/src/main/java/io/joel/impl/node/ConcatNode.java b/io.joel/src/main/java/io/joel/impl/node/ConcatNode.java
@@ -12,9 +12,4 @@ public Class<?> getType(ELContext context) {
     public Object getValue(ELContext context) {
         return (String) context.convertToType(left.getValue(context), String.class) + context.convertToType(right.getValue(context), String.class);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s += %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/DeferredExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/DeferredExpressionNode.java
@@ -12,9 +12,4 @@ public Class<?> getType(ELContext context) {
     public Object getValue(ELContext context) {
         return node.getValue(context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "#{%s}".formatted(node.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/DivExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/DivExpressionNode.java
@@ -10,9 +10,4 @@ public Object getValue(ELContext context) {
         var rightValue = right.getValue(context);
         return Operation.DIVISION.calculate(leftValue, rightValue, context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s / %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/DynamicExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/DynamicExpressionNode.java
@@ -12,9 +12,4 @@ public Class<?> getType(ELContext context) {
     public Object getValue(ELContext context) {
         return node.getValue(context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "${%s}".formatted(node.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/EqualNode.java b/io.joel/src/main/java/io/joel/impl/node/EqualNode.java
@@ -44,9 +44,4 @@ public Object getValue(ELContext context) {
         }
         return leftValue.equals(rightValue);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s == %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/ExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/ExpressionNode.java
@@ -3,6 +3,7 @@
 import jakarta.el.ELContext;
 
 import java.io.Serializable;
+import java.util.stream.Collectors;
 
 public sealed interface ExpressionNode extends Serializable
         permits CallExpressionNode,
@@ -25,6 +26,47 @@ public sealed interface ExpressionNode extends Serializable
         UnaryNotNode,
         ObjectNode {
 
+    static String prettyPrint(ExpressionNode node) {
+        return switch (node) {
+            case ObjectNode n -> n.value().toString();
+            case BooleanNode n -> switch (n) {
+                case TRUE -> "true";
+                case FALSE -> "false";
+            };
+            case NullNode ignored -> "null";
+            case IdentifierNode n -> n.value();
+            case StringNode n -> "'%s'".formatted(n.value());
+            case NumberNode n -> n.value().toString();
+            case SetNode n -> n.values().stream().map(ExpressionNode::prettyPrint).collect(Collectors.joining(",", "{", "}"));
+            case ListNode n -> n.values().stream().map(ExpressionNode::prettyPrint).collect(Collectors.joining(",", "[", "]"));
+            case CallExpressionNode n -> "%s(%s)".formatted(prettyPrint(n.callee()), n.arguments().stream().map(ExpressionNode::prettyPrint).collect(Collectors.joining(",")));
+            case DeferredExpressionNode n -> "#{%s}".formatted(prettyPrint(n));
+            case AddExpressionNode n -> "%s + %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case AssignNode n -> "%s = %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case ConcatNode n -> "%s += %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case DivExpressionNode n -> "%s / %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case ModExpressionNode n -> "%s %% %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case MulExpressionNode n -> "%s * %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case SubExpressionNode n -> "%s - %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case DynamicExpressionNode n -> "${%s}".formatted(prettyPrint(n));
+            case LambdaNode n -> "(%s) -> %s".formatted(String.join(",", n.parameters()), prettyPrint(n.expression()));
+            case MemberNode n -> "%s.%s".formatted(prettyPrint(n.object()), prettyPrint(n.property()));
+            case SemicolonNode n -> "%s ; %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case TernaryNode n -> "%s ? %s : %s".formatted(prettyPrint(n.condition()), prettyPrint(n.trueExpression()), prettyPrint(n.falseExpression()));
+            case UnaryEmptyNode n -> "empty %s".formatted(prettyPrint(n.node()));
+            case UnaryMinusNode n -> "- %s".formatted(prettyPrint(n.node()));
+            case UnaryNotNode n -> "! %s".formatted(prettyPrint(n.node()));
+            case AndNode n -> "%s && %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case EqualNode n -> "%s == %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case GreaterEqualNode n -> "%s >= %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case GreaterThanNode n -> "%s > %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case LessEqualNode n -> "%s <= %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case LessThanNode n -> "%s < %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case NotEqualNode n -> "%s != %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+            case OrNode n -> "%s || %s".formatted(prettyPrint(n.left()), prettyPrint(n.right()));
+        };
+    }
+
     default Object getValue(ELContext context) {
         throw new UnsupportedOperationException(this.toString());
     }
@@ -33,7 +75,4 @@ default Class<?> getType(ELContext context) {
         throw new UnsupportedOperationException(this.toString());
     }
 
-    default String prettyPrint() {
-        throw new UnsupportedOperationException();
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/GreaterEqualNode.java b/io.joel/src/main/java/io/joel/impl/node/GreaterEqualNode.java
@@ -41,9 +41,4 @@ public Object getValue(ELContext context) {
         }
         throw new ELException("Cannot compare values: %s >= %s".formatted(leftValue, rightValue));
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s >= %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/GreaterThanNode.java b/io.joel/src/main/java/io/joel/impl/node/GreaterThanNode.java
@@ -37,9 +37,4 @@ public Object getValue(ELContext context) {
         }
         throw new ELException("Cannot compare values: %s > %s".formatted(leftValue, rightValue));
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s > %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/IdentifierNode.java b/io.joel/src/main/java/io/joel/impl/node/IdentifierNode.java
@@ -49,8 +49,4 @@ public Object getValue(ELContext context) {
         throw new PropertyNotFoundException("Property %s not found".formatted(value));
     }
 
-    @Override
-    public String prettyPrint() {
-        return value;
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/LambdaNode.java b/io.joel/src/main/java/io/joel/impl/node/LambdaNode.java
@@ -9,11 +9,6 @@
 public record LambdaNode(List<String> parameters, ExpressionNode expression) implements ExpressionNode {
     @Override
     public Object getValue(ELContext context) {
-        return new LambdaExpression(parameters, new JoelValueExpression(expression.prettyPrint(), expression, Object.class));
-    }
-
-    @Override
-    public String prettyPrint() {
-        return "(%s) -> %s".formatted(String.join(",", parameters), expression.prettyPrint());
+        return new LambdaExpression(parameters, new JoelValueExpression(ExpressionNode.prettyPrint(expression), expression, Object.class));
     }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/LessEqualNode.java b/io.joel/src/main/java/io/joel/impl/node/LessEqualNode.java
@@ -41,9 +41,4 @@ public Object getValue(ELContext context) {
         }
         throw new ELException("Cannot compare values: %s <= %s".formatted(leftValue, rightValue));
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s <= %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/LessThanNode.java b/io.joel/src/main/java/io/joel/impl/node/LessThanNode.java
@@ -37,9 +37,4 @@ public Object getValue(ELContext context) {
         }
         throw new ELException("Cannot compare values: %s < %s".formatted(leftValue, rightValue));
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s < %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/ListNode.java b/io.joel/src/main/java/io/joel/impl/node/ListNode.java
@@ -18,8 +18,4 @@ public Object getValue(ELContext context) {
                 .collect(Collectors.toList());
     }
 
-    @Override
-    public String prettyPrint() {
-        return values.stream().map(ExpressionNode::prettyPrint).collect(Collectors.joining(",", "[", "]"));
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/MemberNode.java b/io.joel/src/main/java/io/joel/impl/node/MemberNode.java
@@ -24,16 +24,11 @@ public Object getValue(ELContext context) {
                         return context.getELResolver().getValue(context, new ELClass(aClass), property instanceof IdentifierNode identifier ? identifier.value() : property.getValue(context));
                 }
             }
-            throw new PropertyNotFoundException(prettyPrint(), rootCause);
+            throw new PropertyNotFoundException(ExpressionNode.prettyPrint(this), rootCause);
         }
     }
 
     public ValueReference valueReference(ELContext context) {
         return new ValueReference(object.getValue(context), property instanceof IdentifierNode node ? node.value() : property.getValue(context));
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s.%s".formatted(object.prettyPrint(), property.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/ModExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/ModExpressionNode.java
@@ -10,9 +10,4 @@ public Object getValue(ELContext context) {
         var rightValue = right.getValue(context);
         return Operation.MODULO.calculate(leftValue, rightValue, context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s %% %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/MulExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/MulExpressionNode.java
@@ -10,9 +10,4 @@ public Object getValue(ELContext context) {
         var rightValue = right.getValue(context);
         return Operation.MULTIPLICATION.calculate(leftValue, rightValue, context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s * %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/NotEqualNode.java b/io.joel/src/main/java/io/joel/impl/node/NotEqualNode.java
@@ -7,9 +7,4 @@ public record NotEqualNode(ExpressionNode left, ExpressionNode right) implements
     public Object getValue(ELContext context) {
         return !(Boolean) new EqualNode(left, right).getValue(context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s != %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/NullNode.java b/io.joel/src/main/java/io/joel/impl/node/NullNode.java
@@ -15,11 +15,6 @@ public Class<?> getType(ELContext context) {
         return null;
     }
 
-    @Override
-    public String prettyPrint() {
-        return "null";
-    }
-
     @Override
     public String toString() {
         return "NullNode[" + super.toString() + "]";

diff --git a/io.joel/src/main/java/io/joel/impl/node/NumberNode.java b/io.joel/src/main/java/io/joel/impl/node/NumberNode.java
@@ -13,8 +13,4 @@ public Object getValue(ELContext context) {
         return value;
     }
 
-    @Override
-    public String prettyPrint() {
-        return value.toString();
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/OrNode.java b/io.joel/src/main/java/io/joel/impl/node/OrNode.java
@@ -9,9 +9,4 @@ public Object getValue(ELContext context) {
             return true;
         return context.convertToType(right.getValue(context), boolean.class);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s || %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/SemicolonNode.java b/io.joel/src/main/java/io/joel/impl/node/SemicolonNode.java
@@ -13,9 +13,4 @@ public Object getValue(ELContext context) {
         left.getValue(context);
         return right.getValue(context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s; %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/SetNode.java b/io.joel/src/main/java/io/joel/impl/node/SetNode.java
@@ -19,8 +19,4 @@ public Object getValue(ELContext context) {
                 .collect(Collectors.toSet());
     }
 
-    @Override
-    public String prettyPrint() {
-        return values.stream().map(ExpressionNode::prettyPrint).collect(Collectors.joining(",", "{", "}"));
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/StringNode.java b/io.joel/src/main/java/io/joel/impl/node/StringNode.java
@@ -12,9 +12,4 @@ public Class<?> getType(ELContext context) {
     public Object getValue(ELContext context) {
         return value;
     }
-
-    @Override
-    public String prettyPrint() {
-        return "'%s'".formatted(value);
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/SubExpressionNode.java b/io.joel/src/main/java/io/joel/impl/node/SubExpressionNode.java
@@ -10,9 +10,4 @@ public Object getValue(ELContext context) {
         var rightValue = right.getValue(context);
         return Operation.SUBTRACTION.calculate(leftValue, rightValue, context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s - %s".formatted(left.prettyPrint(), right.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/TernaryNode.java b/io.joel/src/main/java/io/joel/impl/node/TernaryNode.java
@@ -19,9 +19,4 @@ public Object getValue(ELContext context) {
         }
         return falseExpression.getValue(context);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "%s ? %s : %s".formatted(condition.prettyPrint(), trueExpression.prettyPrint(), falseExpression.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/UnaryEmptyNode.java b/io.joel/src/main/java/io/joel/impl/node/UnaryEmptyNode.java
@@ -25,9 +25,4 @@ public Object getValue(ELContext context) {
             return true;
         return value instanceof Collection<?> newValue && newValue.isEmpty();
     }
-
-    @Override
-    public String prettyPrint() {
-        return "empty %s".formatted(node.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/UnaryMinusNode.java b/io.joel/src/main/java/io/joel/impl/node/UnaryMinusNode.java
@@ -50,9 +50,4 @@ public Object getValue(ELContext context) {
         }
         throw new ELException("Cannot apply the '-' operator to %s".formatted(value));
     }
-
-    @Override
-    public String prettyPrint() {
-        return "-%s".formatted(node.prettyPrint());
-    }
 }
diff --git a/io.joel/src/main/java/io/joel/impl/node/UnaryNotNode.java b/io.joel/src/main/java/io/joel/impl/node/UnaryNotNode.java
@@ -12,9 +12,4 @@ public Class<?> getType(ELContext context) {
     public Object getValue(ELContext context) {
         return !(boolean) context.convertToType(node.getValue(context), boolean.class);
     }
-
-    @Override
-    public String prettyPrint() {
-        return "! %s".formatted(node.prettyPrint());
-    }
 }