Skip to content

Expression Pretty Printing #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rcosta358 merged 13 commits into from
Apr 11, 2026
Merged

Expression Pretty Printing #200

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9c7ed97
Fix Expression Parentheses
rcosta358 Mar 31, 2026
0aa749a
Add ExpressionPrinter for Pretty Printing
rcosta358 Mar 31, 2026
a08e169
Code Refactoring
rcosta358 Mar 31, 2026
516f795
Add Javadocs
rcosta358 Mar 31, 2026
2d2fc97
Update Javadoc
rcosta358 Mar 31, 2026
f455e97
Simplify ExpressionPrinter
rcosta358 Apr 1, 2026
3db15e9
Add ExpressionPrecendence
rcosta358 Apr 1, 2026
1a12837
Renaming
rcosta358 Apr 1, 2026
76041fe
Formatting
rcosta358 Apr 1, 2026
51024ef
Rename Test Class
rcosta358 Apr 1, 2026
774a4ad
Add Format Predicate Overload
rcosta358 Apr 1, 2026
7240cb2
Minor Change
rcosta358 Apr 1, 2026
3b05d78
Rename Tests
rcosta358 Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify ExpressionPrinter
  • Loading branch information
@rcosta358
rcosta358 committed Apr 1, 2026
commit f455e9705032728919350d235f88f1eac3837cd8
32 changes: 15 additions & 17 deletions ...a-verifier/src/main/java/liquidjava/rj_language/ast/prettyprinting/ExpressionPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package liquidjava.rj_language.ast.prettyprinting;

import java.util.List;
import java.util.stream.Collectors;

import liquidjava.rj_language.ast.AliasInvocation;
Expand Down Expand Up @@ -41,34 +42,28 @@ private String render(Expression expression) {
return expression.accept(this);
}

private String renderChild(Expression child) {
private String renderWithOptionalParentheses(Expression child, boolean shouldWrap) {
if (shouldWrap)
return "(" + render(child) + ")";
if (child instanceof GroupExpression group)
return "(" + render(group.getExpression()) + ")";
return render(child);
}

private String renderOperand(Expression parent, Expression child) {
if (needsParentheses(parent, child))
return "(" + render(child) + ")";
return renderChild(child);
return renderWithOptionalParentheses(child, needsParentheses(parent, child));
}

private String renderRightOperand(BinaryExpression parent, Expression child) {
if (needsRightParentheses(parent, child))
return "(" + render(child) + ")";
return renderChild(child);
return renderWithOptionalParentheses(child, needsRightParentheses(parent, child));
}

private String renderConditionOperand(Expression child) {
if (child instanceof Ite)
return "(" + render(child) + ")";
return renderChild(child);
return renderWithOptionalParentheses(child, child instanceof Ite);
}

private boolean needsParentheses(Expression parent, Expression child) {
if (precedence(child).isLowerThan(precedence(parent)))
return true;
return false;
return precedence(child).isLowerThan(precedence(parent));
}

private boolean needsRightParentheses(BinaryExpression parent, Expression child) {
Expand Down Expand Up @@ -114,8 +109,7 @@ private boolean isAssociative(String operator) {

@Override
public String visitAliasInvocation(AliasInvocation alias) {
return alias.getName() + "(" + alias.getArgs().stream().map(this::renderChild).collect(Collectors.joining(", "))
+ ")";
return alias.getName() + "(" + renderArguments(alias.getArgs(), ", ") + ")";
}

@Override
Expand All @@ -126,8 +120,7 @@ public String visitBinaryExpression(BinaryExpression exp) {

@Override
public String visitFunctionInvocation(FunctionInvocation fun) {
return Utils.getSimpleName(fun.getName()) + "("
+ fun.getArgs().stream().map(this::renderChild).collect(Collectors.joining(",")) + ")";
return Utils.getSimpleName(fun.getName()) + "(" + renderArguments(fun.getArgs(), ",") + ")";
}

@Override
Expand Down Expand Up @@ -180,4 +173,9 @@ public String visitUnaryExpression(UnaryExpression exp) {
public String visitVar(Var var) {
return VariableFormatter.format(var.getName());
}

private String renderArguments(List<Expression> args, String separator) {
return args.stream().map(expression -> renderWithOptionalParentheses(expression, false))
.collect(Collectors.joining(separator));
}
}
Loading