aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2024-12-23 10:45:10 +0000
committerMichael Williamson <mike@zwobble.org>2024-12-23 10:45:10 +0000
commit50a74171bad57572bb70d78854bff177fbe206a7 (patch)
tree8a6caf951de31bddd5752edbd8b62a0505c37405 /src/main/java
parent9bbd81270311255f8c09e49e062ef4961368a4d2 (diff)
Check TOML value types when getting shed.bins
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/config/ProjectConfig.java31
-rw-r--r--src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java11
-rw-r--r--src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java25
-rw-r--r--src/main/java/org/shedlang/compiler/config/toml/TomlSource.java20
-rw-r--r--src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java59
5 files changed, 124 insertions, 22 deletions
diff --git a/src/main/java/org/shedlang/compiler/config/ProjectConfig.java b/src/main/java/org/shedlang/compiler/config/ProjectConfig.java
index 1eacf446..c45725cc 100644
--- a/src/main/java/org/shedlang/compiler/config/ProjectConfig.java
+++ b/src/main/java/org/shedlang/compiler/config/ProjectConfig.java
@@ -1,11 +1,12 @@
package org.shedlang.compiler.config;
import org.shedlang.compiler.config.errors.TomlSyntaxConfigError;
+import org.shedlang.compiler.config.toml.TomlTableWithSource;
import org.shedlang.compiler.sources.Source;
import org.shedlang.compiler.sources.Sources;
+import org.shedlang.compiler.util.P;
import org.tomlj.Toml;
import org.tomlj.TomlParseResult;
-import org.tomlj.TomlTable;
import java.io.IOException;
import java.nio.file.Files;
@@ -41,10 +42,10 @@ public record ProjectConfig(
throw TomlSyntaxConfigError.fromTomljError(error, source);
}
- return fromToml(projectPath, result);
+ return fromToml(projectPath, new TomlTableWithSource(result, P.vector(), source));
}
- public static ProjectConfig fromToml(Path root, TomlTable table) {
+ public static ProjectConfig fromToml(Path root, TomlTableWithSource table) {
return new ProjectConfig(
root,
binsFromToml(table),
@@ -53,24 +54,28 @@ public record ProjectConfig(
);
}
- private static List<BinConfig> binsFromToml(TomlTable table) {
- var binsArray = table.getArrayOrEmpty(List.of("shed", "bins"));
-
- return IntStream.range(0, binsArray.size())
- .mapToObj(binIndex -> BinConfig.fromToml(binsArray.getTable(binIndex)))
- .toList();
+ private static List<BinConfig> binsFromToml(TomlTableWithSource table) {
+ return table
+ .getTable("shed")
+ .flatMap(shed -> shed.getArray("bins"))
+ .map(bins ->
+ IntStream.range(0, bins.size())
+ .mapToObj(binIndex -> BinConfig.fromToml(bins.getTable(binIndex)))
+ .toList()
+ )
+ .orElseGet(() -> List.of());
}
- public static List<ExampleConfig> examplesFromToml(TomlTable table) {
- var examplesArray = table.getArrayOrEmpty(List.of("shed", "examples"));
+ public static List<ExampleConfig> examplesFromToml(TomlTableWithSource table) {
+ var examplesArray = table.table().getArrayOrEmpty(List.of("shed", "examples"));
return IntStream.range(0, examplesArray.size())
.mapToObj(exampleIndex -> ExampleConfig.fromToml(examplesArray.getTable(exampleIndex)))
.toList();
}
- public static List<ProfileConfig> profilesFromToml(TomlTable table) {
- var profilesArray = table.getArrayOrEmpty(List.of("shed", "profiles"));
+ public static List<ProfileConfig> profilesFromToml(TomlTableWithSource table) {
+ var profilesArray = table.table().getArrayOrEmpty(List.of("shed", "profiles"));
return IntStream.range(0, profilesArray.size())
.mapToObj(profileIndex -> ProfileConfig.fromToml(profilesArray.getTable(profileIndex)))
diff --git a/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java b/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java
index b4edf660..aa034738 100644
--- a/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java
+++ b/src/main/java/org/shedlang/compiler/config/errors/TomlSyntaxConfigError.java
@@ -1,22 +1,15 @@
package org.shedlang.compiler.config.errors;
+import org.shedlang.compiler.config.toml.TomlSource;
import org.shedlang.compiler.sources.Source;
import org.tomlj.TomlParseError;
-import java.util.Arrays;
-
public class TomlSyntaxConfigError extends ConfigError {
public static TomlSyntaxConfigError fromTomljError(
TomlParseError error,
Source fullSource
) {
- var lines = fullSource.contents().split("\n");
- var lineCharacterIndex = Arrays.stream(lines)
- .limit(error.position().line() - 1)
- .mapToInt(line -> line.length() + 1)
- .sum();
- var characterIndex = lineCharacterIndex + error.position().column() - 1;
- var source = fullSource.at(characterIndex, characterIndex);
+ var source = TomlSource.sourceAtTomlPosition(fullSource, error.position());
return new TomlSyntaxConfigError(error.getMessage(), source);
}
diff --git a/src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java b/src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java
new file mode 100644
index 00000000..4c3ba6c5
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/config/errors/UnexpectedTypeConfigError.java
@@ -0,0 +1,25 @@
+package org.shedlang.compiler.config.errors;
+
+import org.shedlang.compiler.sources.Source;
+
+import java.text.MessageFormat;
+import java.util.List;
+
+public class UnexpectedTypeConfigError extends ConfigError {
+ public UnexpectedTypeConfigError(
+ List<String> path,
+ String expectedType,
+ Class<?> actualType,
+ Source source
+ ) {
+ super(
+ MessageFormat.format(
+ "Expected {0} to be {1}, but was {2}",
+ String.join(".", path),
+ expectedType,
+ actualType.getSimpleName()
+ ),
+ source
+ );
+ }
+}
diff --git a/src/main/java/org/shedlang/compiler/config/toml/TomlSource.java b/src/main/java/org/shedlang/compiler/config/toml/TomlSource.java
new file mode 100644
index 00000000..e72fbb45
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/config/toml/TomlSource.java
@@ -0,0 +1,20 @@
+package org.shedlang.compiler.config.toml;
+
+import org.shedlang.compiler.sources.Source;
+import org.tomlj.TomlPosition;
+
+import java.util.Arrays;
+
+public class TomlSource {
+ private TomlSource() {}
+
+ public static Source sourceAtTomlPosition(Source fullSource, TomlPosition position) {
+ var lines = fullSource.contents().split("\n");
+ var lineCharacterIndex = Arrays.stream(lines)
+ .limit(position.line() - 1)
+ .mapToInt(line -> line.length() + 1)
+ .sum();
+ var characterIndex = lineCharacterIndex + position.column() - 1;
+ return fullSource.at(characterIndex, characterIndex);
+ }
+}
diff --git a/src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java b/src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java
new file mode 100644
index 00000000..4fac6f88
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/config/toml/TomlTableWithSource.java
@@ -0,0 +1,59 @@
+package org.shedlang.compiler.config.toml;
+
+import org.pcollections.PVector;
+import org.shedlang.compiler.config.errors.UnexpectedTypeConfigError;
+import org.shedlang.compiler.sources.Source;
+import org.tomlj.TomlArray;
+import org.tomlj.TomlTable;
+
+import java.util.Optional;
+
+public record TomlTableWithSource(
+ TomlTable table,
+ PVector<String> path,
+ Source fullSource
+) {
+ public Optional<TomlTableWithSource> getTable(String key) {
+ var value = table.get(key);
+ var position = table.inputPositionOf(key);
+
+ if (value == null || position == null) {
+ return Optional.empty();
+ }
+
+ if (value instanceof TomlTable valueTable) {
+ return Optional.of(new TomlTableWithSource(
+ valueTable,
+ path.plus(key),
+ fullSource
+ ));
+ }
+
+ throw new UnexpectedTypeConfigError(
+ path.plus(key),
+ "a table",
+ value.getClass(),
+ TomlSource.sourceAtTomlPosition(fullSource, position)
+ );
+ }
+
+ public Optional<TomlArray> getArray(String key) {
+ var value = table.get(key);
+ var position = table.inputPositionOf(key);
+
+ if (value == null || position == null) {
+ return Optional.empty();
+ }
+
+ if (value instanceof TomlArray valueArray) {
+ return Optional.of(valueArray);
+ }
+
+ throw new UnexpectedTypeConfigError(
+ path.plus(key),
+ "an array",
+ value.getClass(),
+ TomlSource.sourceAtTomlPosition(fullSource, position)
+ );
+ }
+}