Extract JavaPattern from JavaCasePattern

4 files changed, 61 insertions, 19 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatransient0/JavaTransient0Generator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatransient0/JavaTransient0Generator.java
index 7a27e52..05ce8f1 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatransient0/JavaTransient0Generator.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatransient0/JavaTransient0Generator.java
@@ -504,10 +504,10 @@ public class JavaTransient0Generator implements Generator {
                     ));
 
                     return new JavaSwitchRule(
-                        new JavaCasePattern(
+                        new JavaCasePattern(new JavaPattern(
                             this.javaGenerator.generateTypeRef(variant.type().value()),
                             variantVariable
-                        ),
+                        )),
                         new JavaBlock(statements)
                     );
                 })
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 1ca3abd..e13290f 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
@@ -571,9 +571,7 @@ public class JavaWriter implements AutoCloseable {
 
                 case JavaCasePattern casePattern -> {
                     this.writer.write("case ");
-                    this.writeTypeRef(casePattern.type());
-                    this.writer.write(" ");
-                    this.writeIdentifier(casePattern.variableName());
+                    this.writePattern(casePattern.pattern());
                 }
             }
             this.writer.write(" -> ");
@@ -590,6 +588,14 @@ public class JavaWriter implements AutoCloseable {
         this.writer.write(";");
     }
 
+    // == Patterns ==
+
+    private void writePattern(JavaPattern pattern) throws IOException {
+        this.writeTypeRef(pattern.type());
+        this.writer.write(" ");
+        this.writeIdentifier(pattern.variableName());
+    }
+
     // == Expressions ==
 
     void writeTopLevelExpression(JavaExpression expression) throws IOException {
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCasePattern.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCasePattern.java
index 4b93726..aa50c86 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCasePattern.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaCasePattern.java
@@ -6,31 +6,25 @@ package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
 // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern imports
 
 public record JavaCasePattern(
-    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type,
-    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier variableName
+    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern pattern
 ) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchLabel {
     public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder arbitrary() {
-        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.HobgoblinNativeAst.arbitraryJavaTypeRef(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier.arbitrary().build());
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.arbitrary().build());
     }
 
     public record Builder(
-        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type,
-        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier variableName
+        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern pattern
     ) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaSwitchLabel.Builder {
         public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern build() {
-            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern(type, variableName);
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern(pattern);
         }
 
-        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder(type, variableName);
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder withPattern(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern pattern) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder(pattern);
         }
 
-        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder withVariableName(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier variableName) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder(type, variableName);
-        }
-
-        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder withVariableName(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier.Builder variableName) {
-            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder(type, variableName.build());
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder withPattern(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder pattern) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder(pattern.build());
         }
 
         // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCasePattern.Builder body
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPattern.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPattern.java
new file mode 100644
index 0000000..dff6691
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaPattern.java
@@ -0,0 +1,42 @@
+// Generated by hobgoblin.
+
+package org.zwobble.hobgoblin.compiler.output.lang.java.ast;
+
+// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern imports
+// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern imports
+
+public record JavaPattern(
+    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type,
+    org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier variableName
+) {
+    public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder arbitrary() {
+        return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.HobgoblinNativeAst.arbitraryJavaTypeRef(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier.arbitrary().build());
+    }
+
+    public record Builder(
+        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type,
+        org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier variableName
+    ) {
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern build() {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern(type, variableName);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder withType(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef type) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder(type, variableName);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder withVariableName(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier variableName) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder(type, variableName);
+        }
+
+        public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder withVariableName(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier.Builder variableName) {
+            return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder(type, variableName.build());
+        }
+
+        // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder body
+        // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern.Builder body
+    }
+
+    // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern body
+    // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaPattern body
+}