From 7ad6474c2ade77aba7d1fff358102b92b30d1554 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 1 Aug 2026 11:13:27 +0100 Subject: Add class literal to Java AST --- .../compiler/output/lang/java/JavaWriter.java | 10 ++++++ .../output/lang/java/ast/JavaClassLiteral.java | 32 +++++++++++++++++ .../output/lang/java/ast/JavaExpression.java | 2 +- .../compiler/output/lang/java/JavaWriterTests.java | 13 +++++++ .../lang/java/ast/JavaClassLiteralMatcher.java | 41 ++++++++++++++++++++++ 5 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteral.java create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteralMatcher.java (limited to 'src') 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 d46511b..d580f14 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 @@ -622,6 +622,10 @@ public class JavaWriter implements AutoCloseable { writeCast(cast); } + case JavaClassLiteral classLiteral -> { + writeClassLiteral(classLiteral); + } + case JavaFieldAccess fieldAccess -> { writeFieldAccess(fieldAccess); } @@ -704,6 +708,7 @@ public class JavaWriter implements AutoCloseable { case JavaBinaryOperation binaryOperation -> precedence(binaryOperation); case JavaBooleanLiteral booleanLiteral -> JavaPrecedence.PRIMARY; case JavaCast cast -> JavaPrecedence.PRIMARY; + case JavaClassLiteral _ -> JavaPrecedence.PRIMARY; case JavaFieldAccess fieldAccess -> JavaPrecedence.PRIMARY; case JavaInstanceofExpression instanceofExpression -> JavaPrecedence.RELATIONAL; case JavaIntegerLiteral integerLiteral -> JavaPrecedence.PRIMARY; @@ -807,6 +812,11 @@ public class JavaWriter implements AutoCloseable { this.writeSubExpression(cast.operand(), JavaPrecedence.PRIMARY, true); } + private void writeClassLiteral(JavaClassLiteral classLiteral) throws IOException { + this.writeTypeRef(classLiteral.type()); + this.writer.write(".class"); + } + private void writeFieldAccess(JavaFieldAccess fieldAccess) throws IOException { this.writeSubExpression(fieldAccess.receiver(), JavaPrecedence.PRIMARY, true); this.writer.write("."); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteral.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteral.java new file mode 100644 index 0000000..b1a0ff6 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteral.java @@ -0,0 +1,32 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral imports + +public record JavaClassLiteral( + org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type +) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.HobgoblinNativeAst.arbitraryJavaTypeRef()); + } + + public record Builder( + org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type + ) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral build() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral(type); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral.Builder(type); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral 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 233b136..0cd2893 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.JavaInstanceofExpression, 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 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.JavaClassLiteral, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaFieldAccess, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInstanceofExpression, 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/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 f45a432..15dbbbd 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 @@ -1457,6 +1457,19 @@ public class JavaWriterTests { assertThat(string, equalTo("(int) 42")); } + // === Class literals === + + @Test + public void classLiterals() throws IOException { + var java = JavaClassLiteral.arbitrary() + .withType(JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("X"))) + .build(); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("X.class")); + } + // === Field accesses === @Test diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteralMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteralMatcher.java new file mode 100644 index 0000000..4ecbab6 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaClassLiteralMatcher.java @@ -0,0 +1,41 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher imports + +public final class JavaClassLiteralMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher isJavaClassLiteral() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private JavaClassLiteralMatcher( + java.util.List> 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 toMatcher() { + return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher withType(org.zwobble.precisely.Matcher type) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("type", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteral::type, type)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassLiteralMatcher body +} -- cgit v1.2.3