From d0a86977da222df158778dd7be95873da44ed90a Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 3 Jul 2023 11:43:44 +0100
Subject: Extract constant for builtins namespace name

---
 src/main/java/org/shedlang/compiler/ShedBuiltins.java          | 10 ++++++++++
 src/main/java/org/shedlang/compiler/ShedCompiler.java          |  2 +-
 src/main/java/org/shedlang/compiler/stackir/StackCompiler.java |  6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/shedlang/compiler/ShedBuiltins.java

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/ShedBuiltins.java b/src/main/java/org/shedlang/compiler/ShedBuiltins.java
new file mode 100644
index 00000000..fde2dae6
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/ShedBuiltins.java
@@ -0,0 +1,10 @@
+package org.shedlang.compiler;
+
+import org.shedlang.compiler.types.NamespaceName;
+
+public class ShedBuiltins {
+    private ShedBuiltins() {
+    }
+
+    public static final NamespaceName NAMESPACE_NAME = NamespaceName.of("Shed", "Builtins");
+}
diff --git a/src/main/java/org/shedlang/compiler/ShedCompiler.java b/src/main/java/org/shedlang/compiler/ShedCompiler.java
index 8f63ce75..39250e27 100644
--- a/src/main/java/org/shedlang/compiler/ShedCompiler.java
+++ b/src/main/java/org/shedlang/compiler/ShedCompiler.java
@@ -38,7 +38,7 @@ public class ShedCompiler {
 
         var typeCheckerContext = TypeCheckerContext.EMPTY
             // TODO: remove duplication of builtin namespace definition
-            .addNamespaceFields(NamespaceName.of("Shed", "Builtins"), P.orderedMap(
+            .addNamespaceFields(ShedBuiltins.NAMESPACE_NAME, P.orderedMap(
                 Map.entry("print", new FunctionType(
                     List.of(Types.STRING),
                     List.of(),
diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
index e4c4f3e1..0cae1941 100644
--- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
+++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
@@ -1,9 +1,9 @@
 package org.shedlang.compiler.stackir;
 
 import org.pcollections.PVector;
+import org.shedlang.compiler.ShedBuiltins;
 import org.shedlang.compiler.ast.typed.*;
 import org.shedlang.compiler.stackir.instructions.*;
-import org.shedlang.compiler.types.NamespaceName;
 import org.shedlang.compiler.util.P;
 
 import java.util.stream.Collectors;
@@ -108,8 +108,8 @@ public class StackCompiler {
         var instructions = P.<Instruction>vector();
 
         instructions = instructions
-            .plus(new NamespaceImportInstruction(NamespaceName.of("Shed", "Builtins"), node.source()))
-            .plus(new FieldLoadInstruction(NamespaceName.of("Shed", "Builtins"), "print", node.source()))
+            .plus(new NamespaceImportInstruction(ShedBuiltins.NAMESPACE_NAME, node.source()))
+            .plus(new FieldLoadInstruction(ShedBuiltins.NAMESPACE_NAME, "print", node.source()))
             .plus(new LocalStoreInstruction("print", node.source()));
 
         for (var statement : node.body()) {
-- 
cgit v1.2.3