diff options
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java | 13 |
2 files changed, 6 insertions, 11 deletions
@@ -63,12 +63,12 @@ <dependency> <groupId>org.zwobble.source-text</groupId> <artifactId>source-text</artifactId> - <version>0.1.0</version> + <version>0.1.1</version> </dependency> <dependency> <groupId>org.zwobble.json5</groupId> <artifactId>zwobble-json5</artifactId> - <version>0.1.1</version> + <version>0.1.2</version> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> 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 ced72bf..6e09b7d 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 @@ -11,7 +11,6 @@ import org.zwobble.hobgoblin.compiler.parser.Parser; import org.zwobble.hobgoblin.compiler.typechecker.TypesInfo; import org.zwobble.hobgoblin.compiler.types.*; import org.zwobble.json5.reader.Json5ObjectReader; -import org.zwobble.sourcetext.SourceText; import java.io.File; import java.io.IOException; @@ -43,10 +42,8 @@ public class JavaTypesGenerator implements Generator { var namespaceConfigs = new HashMap<NamespaceName, JavaNamespaceConfig>(); output.getArrayOfObjects("namespaces").ifPresent(namespacesJson -> { for (var namespaceJson : namespacesJson) { - var hobgoblinNamespaceString = namespaceJson.getString("hobgoblin").value(); - var hobgoblinNamespace = Parser.parseNamespaceName( - SourceText.fromString("<string>", hobgoblinNamespaceString) - ); + var hobgoblinNamespaceString = namespaceJson.getString("hobgoblin").valueAsSourceText(); + var hobgoblinNamespace = Parser.parseNamespaceName(hobgoblinNamespaceString); var javaPackageString = namespaceJson.getString("java").value(); var javaPackage = Arrays.asList(javaPackageString.split("\\.")); @@ -62,10 +59,8 @@ public class JavaTypesGenerator implements Generator { var nativeTypeConfigs = new HashMap<SimpleNativeType, JavaNativeTypeConfig>(DEFAULT_NATIVE_TYPE_CONFIGS); output.getArrayOfObjects("nativeTypes").ifPresent(nativeTypesJson -> { for (var nativeTypeJson : nativeTypesJson) { - var hobgoblinTypeString = nativeTypeJson.getString("hobgoblin").value(); - var hobgoblinTypeName = Parser.parseQualifiedTypeName( - SourceText.fromString("<string>", hobgoblinTypeString) - ); + var hobgoblinTypeString = nativeTypeJson.getString("hobgoblin").valueAsSourceText(); + var hobgoblinTypeName = Parser.parseQualifiedTypeName(hobgoblinTypeString); var hobgoblinType = new SimpleNativeType( hobgoblinTypeName.namespaceName(), hobgoblinTypeName.name() |