diff options
2 files changed, 12 insertions, 3 deletions
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/java/JavaGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/java/JavaGenerator.java index d3914de..a04605e 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/java/JavaGenerator.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/java/JavaGenerator.java @@ -2,10 +2,12 @@ package org.zwobble.hobgoblin.compiler.output.generators.java; import org.zwobble.hobgoblin.compiler.output.lang.java.JavaWriter; import org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaCompilationUnit; +import org.zwobble.hobgoblin.compiler.types.NamespaceName; import java.io.File; import java.io.IOException; import java.nio.file.Path; +import java.util.ArrayList; import java.util.List; public class JavaGenerator { @@ -27,4 +29,13 @@ public class JavaGenerator { } } } + + public static List<String> namespaceToJavaPackageParts( + List<String> packageName, + NamespaceName namespaceName + ) { + var packageParts = new ArrayList<>(packageName); + packageParts.addAll(namespaceName.parts()); + return packageParts; + } } 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 9d50bed..2b56e87 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 @@ -296,9 +296,7 @@ public class JavaTypesGenerator implements Generator { return namespaceConfig.packageName(); } - var packageParts = new ArrayList<>(this.packageName); - packageParts.addAll(namespaceName.parts()); - return packageParts; + return JavaGenerator.namespaceToJavaPackageParts(this.packageName, namespaceName); } private JavaTypeRef generateTypeRef( |