diff options
| author | Michael Williamson <mike@zwobble.org> | 2024-12-23 11:49:47 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2024-12-23 11:49:47 +0000 |
| commit | 0d6fa0bd65e3ce2cdf94ce3867d3be15ec44c69e (patch) | |
| tree | 9699becb62335a7d78df3c314e8362613a4e5727 /src/main/java | |
| parent | a6d0482bee074c9bfe7cf617b2fb8189ddc7a987 (diff) | |
Use TomlTableWithSource in ExampleConfig
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/org/shedlang/compiler/config/ExampleConfig.java | 8 | ||||
| -rw-r--r-- | src/main/java/org/shedlang/compiler/config/ProjectConfig.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/shedlang/compiler/config/ExampleConfig.java b/src/main/java/org/shedlang/compiler/config/ExampleConfig.java index 7805feff..f9f8dd35 100644 --- a/src/main/java/org/shedlang/compiler/config/ExampleConfig.java +++ b/src/main/java/org/shedlang/compiler/config/ExampleConfig.java @@ -1,6 +1,6 @@ package org.shedlang.compiler.config; -import org.tomlj.TomlTable; +import org.shedlang.compiler.config.toml.TomlTableWithSource; import java.util.Optional; @@ -9,11 +9,11 @@ public record ExampleConfig( Optional<String> expectedOutput, Optional<String> expectedError ) { - public static ExampleConfig fromToml(TomlTable table) { + public static ExampleConfig fromToml(TomlTableWithSource table) { return new ExampleConfig( table.getString("bin"), - Optional.ofNullable(table.getString("expected-output")), - Optional.ofNullable(table.getString("expected-error")) + table.getStringOrNone("expected-output"), + table.getStringOrNone("expected-error") ); } } diff --git a/src/main/java/org/shedlang/compiler/config/ProjectConfig.java b/src/main/java/org/shedlang/compiler/config/ProjectConfig.java index ef84af2b..5b34843a 100644 --- a/src/main/java/org/shedlang/compiler/config/ProjectConfig.java +++ b/src/main/java/org/shedlang/compiler/config/ProjectConfig.java @@ -53,7 +53,7 @@ public record ProjectConfig( .flatMap(shed -> shed.getArrayOfTables("examples")) .orElseGet(() -> List.of()) .stream() - .map(example -> ExampleConfig.fromToml(example.table())) + .map(example -> ExampleConfig.fromToml(example)) .toList(); } |
