diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-12-03 22:42:41 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-12-03 22:42:41 +0000 |
| commit | bd28cf3a13da913dba4ced5ba9f1f165d787e3ba (patch) | |
| tree | bfb3763de0f05016e86ed29eeca21354154ef1bf /src | |
| parent | 1812ae776a4e1906b20c7845e17d8a0e103eb275 (diff) | |
Write target name instead of backend name to target directory
Diffstat (limited to 'src')
7 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/org/shedlang/compiler/ShedCompiler.java b/src/main/java/org/shedlang/compiler/ShedCompiler.java index f07ead28..168db252 100644 --- a/src/main/java/org/shedlang/compiler/ShedCompiler.java +++ b/src/main/java/org/shedlang/compiler/ShedCompiler.java @@ -71,7 +71,7 @@ public class ShedCompiler { config, namespaces, typeInfos, - config.targetDir().resolve(backend.name()) + config.targetDir().resolve(backend.targetName()) ); } diff --git a/src/main/java/org/shedlang/compiler/backends/Backend.java b/src/main/java/org/shedlang/compiler/backends/Backend.java index 40a00fbf..370e73ba 100644 --- a/src/main/java/org/shedlang/compiler/backends/Backend.java +++ b/src/main/java/org/shedlang/compiler/backends/Backend.java @@ -9,7 +9,7 @@ import java.nio.file.Path; import java.util.List; public interface Backend { - String name(); + String targetName(); void compile( ProjectConfig config, diff --git a/src/main/java/org/shedlang/compiler/backends/GenerateInstructionsBackend.java b/src/main/java/org/shedlang/compiler/backends/GenerateInstructionsBackend.java index 0a3dca5e..4e80c8ae 100644 --- a/src/main/java/org/shedlang/compiler/backends/GenerateInstructionsBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/GenerateInstructionsBackend.java @@ -31,7 +31,7 @@ public class GenerateInstructionsBackend implements Backend { } @Override - public String name() { + public String targetName() { return "generate-instructions"; } } diff --git a/src/main/java/org/shedlang/compiler/backends/PatioBackend.java b/src/main/java/org/shedlang/compiler/backends/PatioBackend.java index f9ae1695..24c034b9 100644 --- a/src/main/java/org/shedlang/compiler/backends/PatioBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/PatioBackend.java @@ -37,7 +37,7 @@ public class PatioBackend implements Backend { } @Override - public String name() { + public String targetName() { return "patio"; } } diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java index 97e1917f..be6d115b 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java @@ -35,8 +35,8 @@ public class LlvmBackend implements Backend { } @Override - public String name() { - return "llvm"; + public String targetName() { + return "amd64"; } @Override diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java index 2006fe83..2b0d31f0 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java @@ -31,7 +31,7 @@ public class WasmBackend implements Backend { public static final WasmBackend INSTANCE = new WasmBackend(); @Override - public String name() { + public String targetName() { return "wasm32"; } diff --git a/src/test/java/org/shedlang/compiler/backends/ExampleTests.java b/src/test/java/org/shedlang/compiler/backends/ExampleTests.java index 1b6f7536..5479338f 100644 --- a/src/test/java/org/shedlang/compiler/backends/ExampleTests.java +++ b/src/test/java/org/shedlang/compiler/backends/ExampleTests.java @@ -45,7 +45,7 @@ public abstract class ExampleTests { throw error; } - var binPath = config.targetDir().resolve(backend.name()).resolve(example.bin()).toString(); + var binPath = config.targetDir().resolve(backend.targetName()).resolve(example.bin()).toString(); var result = runExampleBinary(binPath).throwOnError(); assertThat(result.stdout(), equalTo(example.expectedOutput().orElseThrow())); } |
