diff options
6 files changed, 133 insertions, 1 deletions
diff --git a/hobgoblin/src/output/lang/java/ast.hob b/hobgoblin/src/output/lang/java/ast.hob index 18c86f0..c6b9afd 100644 --- a/hobgoblin/src/output/lang/java/ast.hob +++ b/hobgoblin/src/output/lang/java/ast.hob @@ -168,6 +168,7 @@ sum JavaExpression { variant JavaStaticFieldAccess; variant JavaStaticMethodCall; variant JavaStringLiteral; + variant JavaTernaryConditional; } struct JavaBinaryOperation { @@ -242,6 +243,12 @@ struct JavaStringLiteral { field value: String; } +struct JavaTernaryConditional { + field condition: JavaExpression; + field ifTrue: JavaExpression; + field ifFalse: JavaExpression; +} + // == Identifiers == struct JavaIdentifier { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java index 1e13863..9eea1ca 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriter.java @@ -318,6 +318,10 @@ public class JavaWriter implements AutoCloseable { case JavaStringLiteral stringLiteral -> { writeStringLiteral(stringLiteral); } + + case JavaTernaryConditional ternaryConditional -> { + writeTernaryConditional(ternaryConditional); + } } } @@ -358,6 +362,7 @@ public class JavaWriter implements AutoCloseable { case JavaStaticFieldAccess staticFieldAccess -> JavaPrecedence.PRIMARY; case JavaStaticMethodCall staticMethodCall -> JavaPrecedence.PRIMARY; case JavaStringLiteral stringLiteral -> JavaPrecedence.PRIMARY; + case JavaTernaryConditional _ -> JavaPrecedence.TERNARY; }; } @@ -640,6 +645,14 @@ public class JavaWriter implements AutoCloseable { this.writer.write("\""); } + private void writeTernaryConditional(JavaTernaryConditional ternaryConditional) throws IOException { + this.writeSubExpression(ternaryConditional.condition(), JavaPrecedence.TERNARY, false); + this.writer.write(" ? "); + this.writeSubExpression(ternaryConditional.ifTrue(), JavaPrecedence.TERNARY, false); + this.writer.write(" : "); + this.writeSubExpression(ternaryConditional.ifFalse(), JavaPrecedence.TERNARY, true); + } + private static void writeTypeArg(JavaTypeArg arg, WriteString writer) throws IOException { switch (arg.variance()) { case INVARIANT -> { diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java index 7e72b25..1f1d743 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaExpression.java @@ -5,7 +5,7 @@ package org.zwobble.hobgoblin.compiler.output.lang.java.ast; // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression imports -public sealed interface JavaExpression permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBinaryOperation, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNewExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNullLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStringLiteral { +public sealed interface JavaExpression permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBinaryOperation, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIntegerLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNewExpression, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaNullLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaRef, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStaticMethodCall, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaStringLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression build(); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTernaryConditional.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTernaryConditional.java new file mode 100644 index 0000000..6c08c95 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTernaryConditional.java @@ -0,0 +1,48 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional imports + +public record JavaTernaryConditional(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression condition, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression ifTrue, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression ifFalse) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression condition, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression ifTrue, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression ifFalse) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional build() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional(condition, ifTrue, ifFalse); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder withCondition(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression condition) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder(condition, ifTrue, ifFalse); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder withCondition(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder condition) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder(condition.build(), ifTrue, ifFalse); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder withIfTrue(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression ifTrue) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder(condition, ifTrue, ifFalse); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder withIfTrue(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder ifTrue) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder(condition, ifTrue.build(), ifFalse); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder withIfFalse(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression ifFalse) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder(condition, ifTrue, ifFalse); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder withIfFalse(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder ifFalse) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder(condition, ifTrue, ifFalse.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional body +} diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java index 1ce78ea..0b5f959 100644 --- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java @@ -1016,6 +1016,19 @@ public class JavaWriterTests { } @Test + public void ternaryConditional() throws IOException { + var java = new JavaTernaryConditional( + new JavaRef(JavaIdentifier.of("x")), + new JavaRef(JavaIdentifier.of("y")), + new JavaRef(JavaIdentifier.of("z")) + ); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("x ? y : z")); + } + + @Test public void whenSubExpressionHasLowerPrecedenceThenSubExpressionIsParenthesized() throws IOException { var java = JavaBinaryOperation.arbitrary() .withOperator(JavaBinaryOperator.BITWISE_AND) diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTernaryConditionalMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTernaryConditionalMatcher.java new file mode 100644 index 0000000..5f39a26 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTernaryConditionalMatcher.java @@ -0,0 +1,51 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher imports + +public class JavaTernaryConditionalMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher isJavaTernaryConditional() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional>> submatchers; + + private JavaTernaryConditionalMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional>> submatchers) { + this.submatchers = submatchers; + } + + public org.zwobble.precisely.MatchResult match(java.lang.Object actual) { + return this.toMatcher().match(actual); + } + + public org.zwobble.precisely.TextTree describe() { + return this.toMatcher().describe(); + } + + private org.zwobble.precisely.Matcher<java.lang.Object> toMatcher() { + return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher withCondition(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> condition) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("condition", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional::condition, condition)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher withIfTrue(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> ifTrue) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("ifTrue", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional::ifTrue, ifTrue)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher withIfFalse(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> ifFalse) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("ifFalse", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditional::ifFalse, ifFalse)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTernaryConditionalMatcher body +} |