diff options
6 files changed, 110 insertions, 1 deletions
diff --git a/hobgoblin/src/output/lang/java/ast.hob b/hobgoblin/src/output/lang/java/ast.hob index 54f6144..7910f79 100644 --- a/hobgoblin/src/output/lang/java/ast.hob +++ b/hobgoblin/src/output/lang/java/ast.hob @@ -157,6 +157,7 @@ struct JavaReturn { sum JavaExpression { variant JavaBinaryOperation; variant JavaBooleanLiteral; + variant JavaCast; variant JavaFieldAccess; variant JavaIntegerLiteral; variant JavaMethodCall; @@ -187,6 +188,11 @@ struct JavaBooleanLiteral { field value: Bool; } +struct JavaCast { + field type: JavaTypeRef; + field operand: JavaExpression; +} + struct JavaFieldAccess { field receiver: JavaExpression; field fieldName: 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 3024a55..04f7736 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 @@ -137,6 +137,14 @@ public class JavaWriter implements AutoCloseable { } } + private void writeCast(JavaCast cast) throws IOException { + this.writer.write("("); + this.writeTypeRef(cast.type()); + this.writer.write(") "); + + this.writeSubExpression(cast.operand(), JavaPrecedence.PRIMARY, true); + } + private void writeDocComment(DocComment docComment) throws IOException { for (var line : docComment.lines()) { this.writer.write("/// "); @@ -263,6 +271,10 @@ public class JavaWriter implements AutoCloseable { writeBooleanLiteral(booleanLiteral); } + case JavaCast cast -> { + writeCast(cast); + } + case JavaFieldAccess fieldAccess -> { writeFieldAccess(fieldAccess); } @@ -331,6 +343,7 @@ public class JavaWriter implements AutoCloseable { return switch (expression) { case JavaBinaryOperation binaryOperation -> precedence(binaryOperation); case JavaBooleanLiteral booleanLiteral -> JavaPrecedence.PRIMARY; + case JavaCast cast -> JavaPrecedence.PRIMARY; case JavaFieldAccess fieldAccess -> JavaPrecedence.PRIMARY; case JavaIntegerLiteral integerLiteral -> JavaPrecedence.PRIMARY; case JavaMethodCall methodCall -> JavaPrecedence.PRIMARY; diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCast.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCast.java new file mode 100644 index 0000000..99c8315 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCast.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.JavaCast imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast imports + +public record JavaCast(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type, 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.JavaCast.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.HobgoblinNativeAst.arbitraryJavaTypeRef(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBooleanLiteral.arbitrary().build()); + } + + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type, 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.JavaCast build() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast(type, operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder(type, operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder withOperand(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression operand) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder(type, operand); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder withOperand(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaExpression.Builder operand) { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder(type, operand.build()); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast 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 7652041..7e72b25 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.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 { +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 { 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 5b07ecb..b888375 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 @@ -832,6 +832,15 @@ public class JavaWriterTests { } @Test + public void cast() throws IOException { + var java = new JavaCast(JavaTypeRef.INT, new JavaIntegerLiteral(42)); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("(int) 42")); + } + + @Test public void integerLiteral() throws IOException { var java = new JavaIntegerLiteral(42); diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCastMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCastMatcher.java new file mode 100644 index 0000000..4edd959 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCastMatcher.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.JavaCastMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher imports + +public class JavaCastMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher isJavaCast() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast>> submatchers; + + private JavaCastMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast>> 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.JavaCast.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher withType(org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef> type) { + var submatchers = new java.util.ArrayList<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("type", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast::type, type)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher(submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher 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.JavaCast>>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("operand", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCast::operand, operand)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCastMatcher body +} |