summaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2026-06-06 09:48:13 +0100
committerMichael Williamson <mike@zwobble.org>2026-06-06 09:48:13 +0100
commita1c4c7f89107deb3f59d8569d2463281e6179fb4 (patch)
tree861e827331e967f4e9cbfc12e5ad3e3a38df683d /src/main/java
parent4ff1c2d997d907cb6ace838775ed936a23320b1b (diff)
Improve error reporting for java-types config
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java13
1 files changed, 4 insertions, 9 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 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()