From bab3189ae3e5050afd8bcbc81e936a6ee56f0377 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 11 Jul 2026 16:33:56 +0100
Subject: Add array access to Java AST

---
 .../compiler/output/lang/java/JavaWriter.java      | 17 +++++++++
 .../output/lang/java/ast/JavaArrayAccess.java      | 40 ++++++++++++++++++++++
 .../output/lang/java/ast/JavaExpression.java       |  2 +-
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaArrayAccess.java

(limited to 'src/main/java')

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();
 
-- 
cgit v1.2.3