diff --git a/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateConflictError.java b/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateConflictError.java index f1cd7c1c..b8e262fa 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateConflictError.java +++ b/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateConflictError.java @@ -17,7 +17,7 @@ public StateConflictError(SourcePosition position, Expression state, Translation super("State Conflict Error", "Found multiple disjoint states in state transition: state transition can only go to one state of each state set", position, translationTable); - this.state = state.toSimplifiedString(); + this.state = state.toString(); } public String getState() { diff --git a/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateRefinementError.java b/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateRefinementError.java index df7a54c4..976508cf 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateRefinementError.java +++ b/liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateRefinementError.java @@ -16,10 +16,11 @@ public class StateRefinementError extends LJError { public StateRefinementError(SourcePosition position, Expression expected, Expression found, TranslationTable translationTable, String customMessage) { - super("State Refinement Error", String.format("Expected state %s but found %s", expected.toSimplifiedString(), - found.toSimplifiedString()), position, translationTable, customMessage); - this.expected = expected.toSimplifiedString(); - this.found = found.toSimplifiedString(); + super("State Refinement Error", + String.format("Expected state %s but found %s", expected.toString(), found.toString()), position, + translationTable, customMessage); + this.expected = expected.toString(); + this.found = found.toString(); } public String getExpected() { diff --git a/liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java b/liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java index ebf908a3..c2bd580e 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java +++ b/liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java @@ -296,7 +296,7 @@ private Map checkInvocationRefinements(CtElement invocation, Lis Predicate methodRef = f.getRefReturn(); if (methodRef != null) { - boolean equalsThis = methodRef.toString().equals("(_ == this)"); // TODO change for better + boolean equalsThis = methodRef.toString().equals("_ == this"); // TODO change for better List vars = methodRef.getVariableNames(); for (String s : vars) if (map.containsKey(s)) diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/AliasInvocation.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/AliasInvocation.java index c9e2f58b..2c02734f 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/AliasInvocation.java +++ b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/AliasInvocation.java @@ -34,12 +34,6 @@ public String toString() { return name + "(" + getArgs().stream().map(Expression::toString).collect(Collectors.joining(", ")) + ")"; } - @Override - public String toSimplifiedString() { - return name + "(" + getArgs().stream().map(Expression::toSimplifiedString).collect(Collectors.joining(", ")) - + ")"; - } - @Override public void getVariableNames(List toAdd) { for (Expression e : getArgs()) diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/BinaryExpression.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/BinaryExpression.java index b60ef2ec..a5112c8c 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/BinaryExpression.java +++ b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/BinaryExpression.java @@ -50,11 +50,6 @@ public String toString() { return getFirstOperand().toString() + " " + op + " " + getSecondOperand().toString(); } - @Override - public String toSimplifiedString() { - return getFirstOperand().toSimplifiedString() + " " + op + " " + getSecondOperand().toSimplifiedString(); - } - @Override public void getVariableNames(List toAdd) { getFirstOperand().getVariableNames(toAdd); diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Expression.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Expression.java index 9b4b2e17..58ea8e93 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Expression.java +++ b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Expression.java @@ -36,17 +36,6 @@ public abstract class Expression { public abstract String toString(); - /** - * Returns a simplified string representation of this expression with unqualified names (e.g., - * com.example.State.open => open Default implementation delegates to toString() Subclasses that contain qualified - * names should override this method - * - * @return simplified string representation - */ - public String toSimplifiedString() { - return toString(); - } - List children = new ArrayList<>(); public void addChild(Expression e) { diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/FunctionInvocation.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/FunctionInvocation.java index 71f3febd..d9d53731 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/FunctionInvocation.java +++ b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/FunctionInvocation.java @@ -37,14 +37,8 @@ public T accept(ExpressionVisitor visitor) throws LJError { @Override public String toString() { - return name + "(" + getArgs().stream().map(Expression::toString).collect(Collectors.joining(",")) + ")"; - } - - @Override - public String toSimplifiedString() { - String simpleName = Utils.getSimpleName(name); - return simpleName + "(" - + getArgs().stream().map(Expression::toSimplifiedString).collect(Collectors.joining(",")) + ")"; + return Utils.getSimpleName(name) + "(" + + getArgs().stream().map(Expression::toString).collect(Collectors.joining(",")) + ")"; } @Override diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/GroupExpression.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/GroupExpression.java index c68edaa9..4597a157 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/GroupExpression.java +++ b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/GroupExpression.java @@ -21,12 +21,7 @@ public T accept(ExpressionVisitor visitor) throws LJError { } public String toString() { - return "(" + getExpression().toString() + ")"; - } - - @Override - public String toSimplifiedString() { - return getExpression().toSimplifiedString(); + return getExpression().toString(); } @Override diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Ite.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Ite.java index a779aad4..cf95b730 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Ite.java +++ b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/Ite.java @@ -32,13 +32,7 @@ public T accept(ExpressionVisitor visitor) throws LJError { @Override public String toString() { - return getCondition().toString() + "?" + getThen().toString() + ":" + getElse().toString(); - } - - @Override - public String toSimplifiedString() { - return getCondition().toSimplifiedString() + "?" + getThen().toSimplifiedString() + ":" - + getElse().toSimplifiedString(); + return getCondition().toString() + " ? " + getThen().toString() + " : " + getElse().toString(); } @Override diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/UnaryExpression.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/UnaryExpression.java index 4913e04c..4ffbc2d9 100644 --- a/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/UnaryExpression.java +++ b/liquidjava-verifier/src/main/java/liquidjava/rj_language/ast/UnaryExpression.java @@ -32,11 +32,6 @@ public String toString() { return op + getExpression().toString(); } - @Override - public String toSimplifiedString() { - return op + getExpression().toSimplifiedString(); - } - @Override public void getVariableNames(List toAdd) { getExpression().getVariableNames(toAdd);