diff options
| author | Michael Williamson <mike@zwobble.org> | 2026-07-13 20:48:12 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2026-07-13 20:48:12 +0100 |
| commit | 53a41619641bac555f5fbefc138b4c03bbd0fb18 (patch) | |
| tree | e094f31917fdecc426892e4ab9e842cd32a5bb18 /src/main | |
| parent | ecebc9cbb2bec79abecc068eb5ca740bd36fd0fc (diff) | |
Rename JavaMethodKind to JavaMemberKind
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javapreciselymatchers/JavaPreciselyMatchersGenerator.java | 10 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatransient0/JavaTransient0Generator.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java | 20 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMemberKind.java (renamed from src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodKind.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaMethodDeclaration.java | 10 |
5 files changed, 27 insertions, 27 deletions
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javapreciselymatchers/JavaPreciselyMatchersGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javapreciselymatchers/JavaPreciselyMatchersGenerator.java index 252f421..e4d2e95 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javapreciselymatchers/JavaPreciselyMatchersGenerator.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javapreciselymatchers/JavaPreciselyMatchersGenerator.java @@ -103,7 +103,7 @@ public class JavaPreciselyMatchersGenerator implements Generator { new JavaMethodDeclaration( this.javaGenerator.generateFieldName("is" + lowerCamelCaseToUpperCamelCase(structDefinition.name())), JavaVisibility.PUBLIC, - JavaMethodKind.STATIC, + JavaMemberKind.STATIC, javaMatcherTypeRef, List.of(), List.of(), @@ -143,7 +143,7 @@ public class JavaPreciselyMatchersGenerator implements Generator { new JavaMethodDeclaration( JavaIdentifier.of("match"), JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, MATCH_RESULT_REF, List.of(new JavaParam(JavaTypeRef.OBJECT, JavaIdentifier.of("actual"))), List.of(), @@ -160,7 +160,7 @@ public class JavaPreciselyMatchersGenerator implements Generator { new JavaMethodDeclaration( JavaIdentifier.of("describe"), JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, TEXT_TREE_REF, List.of(), List.of(), @@ -177,7 +177,7 @@ public class JavaPreciselyMatchersGenerator implements Generator { new JavaMethodDeclaration( JavaIdentifier.of("toMatcher"), JavaVisibility.PRIVATE, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, genericMatcherRef(JavaTypeRef.OBJECT), List.of(), List.of(), @@ -203,7 +203,7 @@ public class JavaPreciselyMatchersGenerator implements Generator { methods.add(new JavaMethodDeclaration( this.javaGenerator.generateFieldName("with" + lowerCamelCaseToUpperCamelCase(field.name())), JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, javaMatcherTypeRef, List.of( new JavaParam(genericMatcherRef(JavaTypeArg.superType(javaFieldTypeRef)), javaFieldName) 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 b1533d2..17eb68f 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,7 +504,7 @@ public class JavaTransient0Generator implements Generator { return new JavaMethodDeclaration( encodeMethodName(type), JavaVisibility.PUBLIC, - JavaMethodKind.STATIC, + JavaMemberKind.STATIC, JavaTypeRef.VOID, List.of( new JavaParam(javaTypeRef, VALUE_NAME), @@ -527,7 +527,7 @@ public class JavaTransient0Generator implements Generator { return new JavaMethodDeclaration( decodeMethodName(type), JavaVisibility.PUBLIC, - JavaMethodKind.STATIC, + JavaMemberKind.STATIC, javaTypeRef, List.of( new JavaParam( 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 a008f8b..2a2c7ca 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 @@ -147,7 +147,7 @@ public class JavaTypesGenerator implements Generator { new JavaMethodDeclaration( ARBITRARY_METHOD_NAME, JavaVisibility.PUBLIC, - JavaMethodKind.STATIC, + JavaMemberKind.STATIC, builderJavaTypeRef, List.of(), List.of(), @@ -179,7 +179,7 @@ public class JavaTypesGenerator implements Generator { body.add(new JavaMethodDeclaration( BUILD_METHOD_NAME, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, generateTypeRef(structDefinition.type(), context), List.of(), List.of(), @@ -218,7 +218,7 @@ public class JavaTypesGenerator implements Generator { methods.add(new JavaMethodDeclaration( withMethodName, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, builderJavaTypeRef, List.of( new JavaParam(generateTypeRef(field.type(), context), javaFieldName) @@ -238,7 +238,7 @@ public class JavaTypesGenerator implements Generator { methods.add(new JavaMethodDeclaration( withMethodName, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, builderJavaTypeRef, List.of( new JavaParam(fieldBuilderTypeRef.get(), javaFieldName) @@ -277,7 +277,7 @@ public class JavaTypesGenerator implements Generator { methods.add(new JavaMethodDeclaration( addElementMethodName, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, builderJavaTypeRef, List.of( new JavaParam(javaElementUnboxedType, javaElementName) @@ -310,7 +310,7 @@ public class JavaTypesGenerator implements Generator { methods.add(new JavaMethodDeclaration( addElementMethodName, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, builderJavaTypeRef, List.of( new JavaParam(elementBuilderTypeRef.get(), javaElementName) @@ -349,7 +349,7 @@ public class JavaTypesGenerator implements Generator { methods.add(new JavaMethodDeclaration( withMethodName, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, builderJavaTypeRef, List.of( new JavaParam(javaElementType, javaFieldName) @@ -379,7 +379,7 @@ public class JavaTypesGenerator implements Generator { methods.add(new JavaMethodDeclaration( withMethodName, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, builderJavaTypeRef, List.of( new JavaParam(elementBuilderTypeRef.get(), javaFieldName) @@ -419,7 +419,7 @@ public class JavaTypesGenerator implements Generator { body.add(new JavaMethodDeclaration( generateFieldName(field.name()), JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, generateTypeRef(field.type().value(), context), List.of(), List.of(), @@ -450,7 +450,7 @@ public class JavaTypesGenerator implements Generator { new JavaMethodDeclaration( BUILD_METHOD_NAME, JavaVisibility.PUBLIC, - JavaMethodKind.INSTANCE, + JavaMemberKind.INSTANCE, generateTypeRef(sumDefinition.type(), context), List.of(), List.of(), 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/JavaMemberKind.java index c7f8ca6..e41b1e0 100644 --- 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/JavaMemberKind.java @@ -2,13 +2,13 @@ package org.zwobble.hobgoblin.compiler.output.lang.java.ast; -// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind imports -// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind imports +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind imports -public enum JavaMethodKind { +public enum JavaMemberKind { STATIC, INSTANCE - // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind body - // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind body + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind body } 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 00b8af9..2d0ad26 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 @@ -5,12 +5,12 @@ package org.zwobble.hobgoblin.compiler.output.lang.java.ast; // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration imports // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration imports -public record JavaMethodDeclaration(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier name, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaVisibility visibility, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind kind, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef returnType, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaParam> params, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef> throws_, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlock> body) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassBodyDeclaration { +public record JavaMethodDeclaration(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier name, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaVisibility visibility, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind kind, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef returnType, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaParam> params, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef> throws_, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlock> body) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassBodyDeclaration { public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration.Builder arbitrary() { - return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaVisibility.PUBLIC, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind.STATIC, org.zwobble.hobgoblin.compiler.output.lang.java.ast.HobgoblinNativeAst.arbitraryJavaTypeRef(), java.util.List.of(), java.util.List.of(), java.util.Optional.empty()); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration.Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier.arbitrary().build(), org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaVisibility.PUBLIC, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind.STATIC, org.zwobble.hobgoblin.compiler.output.lang.java.ast.HobgoblinNativeAst.arbitraryJavaTypeRef(), java.util.List.of(), java.util.List.of(), java.util.Optional.empty()); } - public record Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier name, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaVisibility visibility, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind kind, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef returnType, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaParam> params, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef> throws_, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlock> body) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassBodyDeclaration.Builder { + public record Builder(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaIdentifier name, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaVisibility visibility, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind kind, org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef returnType, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaParam> params, java.util.List<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeRef> throws_, java.util.Optional<org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaBlock> body) implements org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaClassBodyDeclaration.Builder { public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration build() { return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration(name, visibility, kind, returnType, params, throws_, body); } @@ -27,7 +27,7 @@ public record JavaMethodDeclaration(org.zwobble.hobgoblin.compiler.output.lang.j return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration.Builder(name, visibility, kind, returnType, params, throws_, body); } - public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration.Builder withKind(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodKind kind) { + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration.Builder withKind(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMemberKind kind) { return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaMethodDeclaration.Builder(name, visibility, kind, returnType, params, throws_, body); } @@ -81,7 +81,7 @@ public record JavaMethodDeclaration(org.zwobble.hobgoblin.compiler.output.lang.j public JavaMethodDeclaration( JavaIdentifier name, JavaVisibility visibility, - JavaMethodKind kind, + JavaMemberKind kind, JavaTypeRef returnType, java.util.List<JavaParam> params, java.util.List<JavaTypeRef> throws_, |
