From 5e716345a8863240b87456dd836970ad65a03449 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 12 Jun 2026 16:06:41 +0100 Subject: Add Java static field access --- .../hobgoblin/compiler/output/lang/java/JavaWriter.java | 10 ++++++++++ .../compiler/output/lang/java/ast/JavaExpression.java | 2 +- .../compiler/output/lang/java/ast/JavaStaticFieldAccess.java | 7 +++++++ .../hobgoblin/compiler/output/lang/java/JavaWriterTests.java | 12 ++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaStaticFieldAccess.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 ec4d70f..baed6d4 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 @@ -156,6 +156,10 @@ public class JavaWriter implements AutoCloseable { writeRef(ref); } + case JavaStaticFieldAccess staticFieldAccess -> { + writeStaticFieldAccess(staticFieldAccess); + } + case JavaStaticMethodCall staticMethodCall -> { writeStaticMethodCall(staticMethodCall); } @@ -342,6 +346,12 @@ public class JavaWriter implements AutoCloseable { this.writer.write(";"); } + private void writeStaticFieldAccess(JavaStaticFieldAccess staticFieldAccess) throws IOException { + this.writeTypeRef(staticFieldAccess.type()); + this.writer.write("."); + this.writer.write(staticFieldAccess.fieldName()); + } + private void writeStaticMethodCall(JavaStaticMethodCall call) throws IOException { this.writeTypeRef(call.type()); this.writer.write("."); 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 bbc087d..8bd706f 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 @@ -1,4 +1,4 @@ package org.zwobble.hobgoblin.compiler.output.lang.java.ast; -public sealed interface JavaExpression permits JavaIntegerLiteral, JavaMethodCall, JavaNewExpression, JavaNullLiteral, JavaRef, JavaStaticMethodCall, JavaStringLiteral { +public sealed interface JavaExpression permits JavaIntegerLiteral, JavaMethodCall, JavaNewExpression, JavaNullLiteral, JavaRef, JavaStaticFieldAccess, JavaStaticMethodCall, JavaStringLiteral { } diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaStaticFieldAccess.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaStaticFieldAccess.java new file mode 100644 index 0000000..1a405d1 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaStaticFieldAccess.java @@ -0,0 +1,7 @@ +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +public record JavaStaticFieldAccess( + JavaTypeRef type, + String fieldName +) implements JavaExpression { +} 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 96166b0..426b1c1 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 @@ -625,6 +625,18 @@ public class JavaWriterTests { assertThat(string, equalTo("\"hello\"")); } + @Test + public void staticFieldAccess() throws IOException { + var java = new JavaStaticFieldAccess( + JavaTypeRef.topLevel(List.of("one"), "Two"), + "three" + ); + + var string = write(writer -> writer.writeExpression(java)); + + assertThat(string, equalTo("one.Two.three")); + } + @Test public void newExpression() throws IOException { var java = new JavaNewExpression( -- cgit v1.2.3