diff options
6 files changed, 102 insertions, 2 deletions
diff --git a/hobgoblin/src/output/lang/java/ast.hob b/hobgoblin/src/output/lang/java/ast.hob index f8c163d..16a7aaf 100644 --- a/hobgoblin/src/output/lang/java/ast.hob +++ b/hobgoblin/src/output/lang/java/ast.hob @@ -181,6 +181,7 @@ struct JavaSwitchRule { sum JavaSwitchLabel { variant JavaCaseConstant; + variant JavaCaseDefault; variant JavaCasePattern; } @@ -188,6 +189,9 @@ struct JavaCaseConstant { field value: JavaExpression; } +struct JavaCaseDefault { +} + struct JavaCasePattern { field type: JavaTypeRef; field variableName: 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 9d9dbaa..e85230a 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 @@ -541,12 +541,18 @@ public class JavaWriter implements AutoCloseable { this.writer.indent(); for (var rule : switchStatement.rules()) { this.writer.newLine(); - this.writer.write("case "); switch (rule.label()) { case JavaCaseConstant caseConstant -> { + this.writer.write("case "); this.writeTopLevelExpression(caseConstant.value()); } + + case JavaCaseDefault _ -> { + this.writer.write("default"); + } + case JavaCasePattern casePattern -> { + this.writer.write("case "); this.writeTypeRef(casePattern.type()); this.writer.write(" "); this.writeIdentifier(casePattern.variableName()); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCaseDefault.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCaseDefault.java new file mode 100644 index 0000000..2e46012 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCaseDefault.java @@ -0,0 +1,24 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault imports + +public record JavaCaseDefault() implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchLabel { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault.Builder arbitrary() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault.Builder(); + } + + public record Builder() implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchLabel.Builder { + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault build() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault(); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault.Builder body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault.Builder body + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault body +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchLabel.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchLabel.java index 7978458..92de383 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchLabel.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaSwitchLabel.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.JavaSwitchLabel imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchLabel imports -public sealed interface JavaSwitchLabel permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseConstant, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern { +public sealed interface JavaSwitchLabel permits org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseConstant, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern { public interface Builder { public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchLabel 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 8eb738a..58fd7a4 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 @@ -1106,6 +1106,39 @@ public class JavaWriterTests { } @Test + public void switchStatementWithDefault() throws IOException { + var java = new JavaSwitchStatement( + new JavaRef(JavaIdentifier.of("x")), + List.of( + new JavaSwitchRule( + new JavaCaseConstant(new JavaIntegerLiteral(0)), + new JavaBlock(List.of( + new JavaReturn(new JavaIntegerLiteral(10)) + )) + ), + new JavaSwitchRule( + new JavaCaseDefault(), + new JavaBlock(List.of( + new JavaReturn(new JavaIntegerLiteral(11)) + )) + ) + ) + ); + + var string = write(writer -> writer.writeBlockStatement(java)); + + assertThat(string, equalTo(""" + switch (x) { + case 0 -> { + return 10; + } + default -> { + return 11; + } + }""")); + } + + @Test public void switchStatementWithCasePatterns() throws IOException { var java = new JavaSwitchStatement( new JavaRef(JavaIdentifier.of("x")), diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCaseDefaultMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCaseDefaultMatcher.java new file mode 100644 index 0000000..27b3d32 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCaseDefaultMatcher.java @@ -0,0 +1,33 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefaultMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefaultMatcher imports + +public class JavaCaseDefaultMatcher implements org.zwobble.precisely.Matcher<java.lang.Object> { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefaultMatcher isJavaCaseDefault() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefaultMatcher(java.util.List.of()); + } + + private final java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault>> submatchers; + + private JavaCaseDefaultMatcher(java.util.List<org.zwobble.precisely.Matcher<? super org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefault>> 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.JavaCaseDefault.class, this.submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefaultMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCaseDefaultMatcher body +} |