From b37d9ec888545fbae43771436db36ebbdc6678b8 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 20 Oct 2023 17:43:26 +0100 Subject: Rename main-module to main-namespace --- .../java/org/shedlang/compiler/backends/llvm/LlvmBackend.java | 2 +- .../java/org/shedlang/compiler/backends/wasm/WasmBackend.java | 2 +- src/main/java/org/shedlang/compiler/config/BinConfig.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java') 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 80015357..ee4df5fc 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java @@ -64,7 +64,7 @@ public class LlvmBackend implements Backend { } for (var bin : config.bins()) { - var mainModule = this.generateMain(bin.mainModule(), typeInfos); + var mainModule = this.generateMain(bin.mainNamespace(), typeInfos); var mainObjectPath = compileLlvmModule(mainModule, targetDir.resolve("bins"), bin.name()); var gccArgs = new ArrayList(); 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 06e4bc25..40ed0fba 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java @@ -66,7 +66,7 @@ public class WasmBackend implements Backend { ldArgs.add(objectFilePath.toString()); } - var mainModule = this.generateMain(bin.mainModule(), typeInfos); + var mainModule = this.generateMain(bin.mainNamespace(), typeInfos); var mainObjectPath = writeObjectFile(mainModule, targetDir.resolve("bins"), bin.name()); ldArgs.add(mainObjectPath.toString()); diff --git a/src/main/java/org/shedlang/compiler/config/BinConfig.java b/src/main/java/org/shedlang/compiler/config/BinConfig.java index 1d2a0677..1fe9b17e 100644 --- a/src/main/java/org/shedlang/compiler/config/BinConfig.java +++ b/src/main/java/org/shedlang/compiler/config/BinConfig.java @@ -5,15 +5,15 @@ import org.tomlj.TomlTable; import java.util.Arrays; -public record BinConfig(String name, NamespaceName mainModule) { +public record BinConfig(String name, NamespaceName mainNamespace) { public static BinConfig fromToml(TomlTable table) { var name = table.getString("name"); - var mainModuleString = table.getString("main-module"); + var mainNamespaceString = table.getString("main-namespace"); // TODO: error checking // TODO: extract namespace name parsing - var mainModule = new NamespaceName(Arrays.asList(mainModuleString.split("/"))); + var mainNamespace = new NamespaceName(Arrays.asList(mainNamespaceString.split("/"))); - return new BinConfig(name, mainModule); + return new BinConfig(name, mainNamespace); } } -- cgit v1.2.3