diff options
5 files changed, 41 insertions, 1 deletions
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java index 92c60d4..0b49d87 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java @@ -126,6 +126,7 @@ public class JavaTypesGenerator implements Generator { List.of( new JavaMethodDeclaration( "build", + JavaMethodKind.INSTANCE, generateTypeRef(structDefinition.type()), List.of(), new JavaBlock(List.of( 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 9707ab5..3711837 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 @@ -147,6 +147,13 @@ public class JavaWriter implements AutoCloseable { void writeMethodDeclaration(JavaMethodDeclaration method) throws IOException { this.writer.write("public "); + switch (method.kind()) { + case STATIC -> { + this.writer.write("static "); + } + case INSTANCE -> { + } + } writeTypeRef(method.returnType()); this.writer.write(" "); this.writer.write(method.name()); diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodDeclaration.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodDeclaration.java index c1cc44d..f38625f 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodDeclaration.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodDeclaration.java @@ -4,6 +4,7 @@ import java.util.List; public record JavaMethodDeclaration( String name, + JavaMethodKind kind, JavaTypeRef returnType, List<JavaParam> params, JavaBlock body diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodKind.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodKind.java new file mode 100644 index 0000000..e63a942 --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodKind.java @@ -0,0 +1,6 @@ +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +public enum JavaMethodKind { + STATIC, + INSTANCE +} 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 531a7ff..f54f0bf 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 @@ -36,12 +36,14 @@ public class JavaWriterTests { List.of( new JavaMethodDeclaration( "a", + JavaMethodKind.INSTANCE, JavaTypeRef.VOID, List.of(), JavaBlock.EMPTY ), new JavaMethodDeclaration( "b", + JavaMethodKind.INSTANCE, JavaTypeRef.VOID, List.of(), JavaBlock.EMPTY @@ -178,12 +180,14 @@ public class JavaWriterTests { List.of( new JavaMethodDeclaration( "a", + JavaMethodKind.INSTANCE, JavaTypeRef.VOID, List.of(), JavaBlock.EMPTY ), new JavaMethodDeclaration( "b", + JavaMethodKind.INSTANCE, JavaTypeRef.VOID, List.of(), JavaBlock.EMPTY @@ -206,9 +210,10 @@ public class JavaWriterTests { } @Test - public void emptyMethod() throws IOException { + public void emptyInstanceMethod() throws IOException { var java = new JavaMethodDeclaration( "a", + JavaMethodKind.INSTANCE, JavaTypeRef.VOID, List.of(), JavaBlock.EMPTY @@ -223,9 +228,28 @@ public class JavaWriterTests { } @Test + public void emptyStaticMethod() throws IOException { + var java = new JavaMethodDeclaration( + "a", + JavaMethodKind.STATIC, + JavaTypeRef.VOID, + List.of(), + JavaBlock.EMPTY + ); + + var string = write(writer -> writer.writeMethodDeclaration(java)); + + assertThat(string, equalTo(""" + public static void a() { + }""" + )); + } + + @Test public void methodWithParams() throws IOException { var java = new JavaMethodDeclaration( "a", + JavaMethodKind.INSTANCE, JavaTypeRef.VOID, List.of( new JavaParam(JavaTypeRef.INT, "b"), @@ -246,6 +270,7 @@ public class JavaWriterTests { public void methodWithBody() throws IOException { var java = new JavaMethodDeclaration( "a", + JavaMethodKind.INSTANCE, JavaTypeRef.INT, List.of(), new JavaBlock(List.of( |