diff options
7 files changed, 146 insertions, 1 deletions
diff --git a/hobgoblin/src/output/lang/java/ast.hob b/hobgoblin/src/output/lang/java/ast.hob index acb862a..f8c163d 100644 --- a/hobgoblin/src/output/lang/java/ast.hob +++ b/hobgoblin/src/output/lang/java/ast.hob @@ -206,6 +206,7 @@ sum JavaExpression { variant JavaMethodRef; variant JavaNewExpression; variant JavaNullLiteral; + variant JavaPostfixExpression; variant JavaRef; variant JavaStaticFieldAccess; variant JavaStaticMethodCall; @@ -273,6 +274,16 @@ struct JavaNewExpression { struct JavaNullLiteral { } +struct JavaPostfixExpression { + field operator: JavaPostfixOperator; + field operand: JavaExpression; +} + +enum JavaPostfixOperator { + variant decrement; + variant increment; +} + struct JavaRef { field name: 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 893b055..9d9dbaa 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 @@ -609,6 +609,10 @@ public class JavaWriter implements AutoCloseable { writeNullLiteral(null); } + case JavaPostfixExpression postfixExpression -> { + writePostfixExpression(postfixExpression); + } + case JavaRef ref -> { writeRef(ref); } @@ -665,6 +669,7 @@ public class JavaWriter implements AutoCloseable { case JavaMethodRef methodRef -> JavaPrecedence.PRIMARY; case JavaNewExpression newExpression -> JavaPrecedence.PRIMARY; case JavaNullLiteral nullLiteral -> JavaPrecedence.PRIMARY; + case JavaPostfixExpression _ -> JavaPrecedence.UNARY; case JavaRef ref -> JavaPrecedence.PRIMARY; case JavaStaticFieldAccess staticFieldAccess -> JavaPrecedence.PRIMARY; case JavaStaticMethodCall staticMethodCall -> JavaPrecedence.PRIMARY; @@ -799,6 +804,14 @@ public class JavaWriter implements AutoCloseable { this.writer.write("null"); } + private void writePostfixExpression(JavaPostfixExpression postfixExpression) throws IOException { + this.writeSubExpression(postfixExpression.operand(), JavaPrecedence.PRIMARY, true); + this.writer.write(switch (postfixExpression.operator()) { + case DECREMENT -> "--"; + case INCREMENT -> "++"; + }); + } + private void writeRef(JavaRef ref) throws IOException { this.writeIdentifier(ref.name()); } 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 feab9e8..5d992af 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.JavaArrayAccess, 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 sealed interface JavaExpression permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess, 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.JavaPostfixExpression, 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/JavaPostfixExpression.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixExpression.java new file mode 100644 index 0000000..0df6f6f --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixExpression.java @@ -0,0 +1,36 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression imports + +public record JavaPostfixExpression(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator operator, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression operand) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator.DECREMENT, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator operator, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression operand) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression build() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression(operator, operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder withOperator(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator operator) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder(operator, operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder withOperand(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression operand) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder(operator, operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder withOperand(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder operand) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder(operator, operand.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression body +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixOperator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixOperator.java new file mode 100644 index 0000000..2feec47 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixOperator.java @@ -0,0 +1,14 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator imports + +public enum JavaPostfixOperator { + DECREMENT, + INCREMENT + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator 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 b8bfe5c..8eb738a 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 @@ -1372,6 +1372,32 @@ public class JavaWriterTests { assertThat(string, equalTo("null")); } + // === Postfix expressions === + + @Test + public void postfixDecrement() throws IOException { + var java = JavaPostfixExpression.arbitrary() + .withOperator(JavaPostfixOperator.DECREMENT) + .withOperand(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) + .build(); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("x--")); + } + + @Test + public void postfixIncrement() throws IOException { + var java = JavaPostfixExpression.arbitrary() + .withOperator(JavaPostfixOperator.INCREMENT) + .withOperand(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) + .build(); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("x++")); + } + // === Refs === @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixExpressionMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixExpressionMatcher.java new file mode 100644 index 0000000..2a0cb13 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPostfixExpressionMatcher.java @@ -0,0 +1,45 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher imports + +public class JavaPostfixExpressionMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher isJavaPostfixExpression() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression>> submatchers; + + private JavaPostfixExpressionMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression>> 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.JavaPostfixExpression.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher withOperator(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixOperator> operator) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("operator", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression::operator, operator)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher withOperand(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> operand) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("operand", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpression::operand, operand)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPostfixExpressionMatcher body +} |