Requested Changes

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/rj_language/SimplifiedPredicate.java

@@ -8,7 +8,6 @@
 
 public class SimplifiedPredicate extends Predicate {
 
-    private final Predicate simplified;
     private final Predicate origin;
     private final List<Binder> binders;
 
@@ -18,13 +17,12 @@ public SimplifiedPredicate(Predicate simplified, Predicate origin) {
 
     public SimplifiedPredicate(Predicate simplified, Predicate origin, List<Binder> binders) {
         super(simplified.getExpression());
-        this.simplified = simplified;
         this.origin = origin;
         this.binders = new ArrayList<>(binders);
     }
 
     public Predicate getSimplifiedPredicate() {
-        return simplified;
+        return new Predicate(getExpression());
     }
 
     public Predicate getOrigin() {
@@ -35,24 +33,14 @@ public List<Binder> getBinders() {
         return binders;
     }
 
-    @Override
-    public boolean isBooleanTrue() {
-        return getSimplifiedPredicate().isBooleanTrue();
-    }
-
     @Override
     public SimplifiedPredicate clone() {
-        return new SimplifiedPredicate(getSimplifiedPredicate().clone(), origin.clone(), binders);
-    }
-
-    @Override
-    public String toString() {
-        return getSimplifiedPredicate().toString();
+        return new SimplifiedPredicate(new Predicate(getExpression().clone()), origin.clone(), binders);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getSimplifiedPredicate(), origin, binders);
+        return Objects.hash(getExpression(), origin, binders);
     }
 
     @Override
@@ -64,7 +52,7 @@ public boolean equals(Object obj) {
         if (getClass() != obj.getClass())
             return false;
         SimplifiedPredicate other = (SimplifiedPredicate) obj;
-        return getSimplifiedPredicate().equals(other.getSimplifiedPredicate()) && origin.equals(other.origin)
+        return getExpression().equals(other.getExpression()) && origin.equals(other.origin)
                 && binders.equals(other.binders);
     }
 

liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/formatter/ExpressionFormatter.java

@@ -61,9 +61,8 @@ private String formatArguments(List<Expression> args) {
     }
 
     private Expression unwrapGroup(Expression expression) {
-        while (expression instanceof GroupExpression) {
-            if (expression instanceof GroupExpression group)
-                expression = group.getExpression();
+        while (expression instanceof GroupExpression group) {
+            expression = group.getExpression();
         }
         return expression;
     }