diff options
6 files changed, 121 insertions, 1 deletions
diff --git a/hobgoblin/src/output/lang/java/ast.hob b/hobgoblin/src/output/lang/java/ast.hob index 0e33e96..16000ed 100644 --- a/hobgoblin/src/output/lang/java/ast.hob +++ b/hobgoblin/src/output/lang/java/ast.hob @@ -171,6 +171,7 @@ struct JavaReturn { // == Expressions == sum JavaExpression { + variant JavaArrayAccess; variant JavaBinaryOperation; variant JavaBooleanLiteral; variant JavaCast; @@ -187,6 +188,11 @@ sum JavaExpression { variant JavaTernaryConditional; } +struct JavaArrayAccess { + field arrayReference: JavaExpression; + field index: JavaExpression; +} + struct JavaBinaryOperation { field operator: JavaBinaryOperator; field left: JavaExpression; 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 41fe29c..0b24366 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 @@ -534,6 +534,10 @@ public class JavaWriter implements AutoCloseable { void writeTopLevelExpression(JavaExpression expression) throws IOException { switch (expression) { + case JavaArrayAccess arrayAccess -> { + writeArrayAccess(arrayAccess); + } + case JavaBinaryOperation binaryOperation -> { writeBinaryOperation(binaryOperation); } @@ -616,6 +620,7 @@ public class JavaWriter implements AutoCloseable { private JavaPrecedence precedence(JavaExpression expression) { return switch (expression) { + case JavaArrayAccess arrayAccess -> JavaPrecedence.PRIMARY; case JavaBinaryOperation binaryOperation -> precedence(binaryOperation); case JavaBooleanLiteral booleanLiteral -> JavaPrecedence.PRIMARY; case JavaCast cast -> JavaPrecedence.PRIMARY; @@ -647,6 +652,18 @@ public class JavaWriter implements AutoCloseable { }; } + private void writeArrayAccess(JavaArrayAccess arrayAccess) throws IOException { + this.writeSubExpression( + arrayAccess.arrayReference(), + JavaPrecedence.PRIMARY, + true + ); + + this.writer.write("["); + this.writeTopLevelExpression(arrayAccess.index()); + this.writer.write("]"); + } + private void writeBinaryOperation(JavaBinaryOperation binaryOperation) throws IOException { var precedence = precedence(binaryOperation); var isLeftAssociative = isLeftAssociative(binaryOperation.operator()); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaArrayAccess.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaArrayAccess.java new file mode 100644 index 0000000..0982b2a --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaArrayAccess.java @@ -0,0 +1,40 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess imports + +public record JavaArrayAccess(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression arrayReference, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression index) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder(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 arrayReference, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression index) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess build() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess(arrayReference, index); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder withArrayReference(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression arrayReference) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder(arrayReference, index); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder withArrayReference(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder arrayReference) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder(arrayReference.build(), index); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder withIndex(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression index) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder(arrayReference, index); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder withIndex(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder index) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder(arrayReference, index.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess body +} 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 1f1d743..feab9e8 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, 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.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/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 f768827..b26b8f5 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 @@ -1075,6 +1075,18 @@ public class JavaWriterTests { // === Binary operations === @Test + public void arrayAccess() throws IOException { + var java = JavaArrayAccess.arbitrary() + .withArrayReference(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) + .withIndex(JavaIntegerLiteral.arbitrary().withValue(42)) + .build(); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("x[42]")); + } + + @Test public void binaryOperationAdd() throws IOException { var java = new JavaBinaryOperation( JavaBinaryOperator.ADD, diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaArrayAccessMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaArrayAccessMatcher.java new file mode 100644 index 0000000..1d6887e --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaArrayAccessMatcher.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.JavaArrayAccessMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher imports + +public class JavaArrayAccessMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher isJavaArrayAccess() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess>> submatchers; + + private JavaArrayAccessMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess>> 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.JavaArrayAccess.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher withArrayReference(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> arrayReference) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("arrayReference", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess::arrayReference, arrayReference)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher withIndex(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression> index) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("index", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccess::index, index)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaArrayAccessMatcher body +} |