Add builder for NamespaceTypeInfo

3 files changed, 21 insertions, 20 deletions

diff --git a/src/test/java/org/shedlang/compiler/config/ConfigCheckerTests.java b/src/test/java/org/shedlang/compiler/config/ConfigCheckerTests.java
index 404e57e6..3c53df73 100644
--- a/src/test/java/org/shedlang/compiler/config/ConfigCheckerTests.java
+++ b/src/test/java/org/shedlang/compiler/config/ConfigCheckerTests.java
@@ -4,11 +4,9 @@ import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.config.errors.ConfigError;
 import org.shedlang.compiler.typechecker.TypeInfos;
 import org.shedlang.compiler.types.*;
-import org.shedlang.compiler.util.P;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.zwobble.precisely.AssertThat.assertThat;
@@ -21,12 +19,12 @@ public class ConfigCheckerTests {
         var typeInfos = TypeInfos.EMPTY
             .addNamespaceTypeInfo(
                 NamespaceName.of("Main"),
-                NamespaceTypeInfo.fromFields(P.orderedMap(
-                    Map.entry(
+                NamespaceTypeInfo.builder()
+                    .addField(
                         "main",
                         new FunctionType(List.of(), List.of(), Effects.IO, Types.UNIT)
                     )
-                ))
+                    .build()
             );
 
         ConfigChecker.configCheckBin(binConfig, typeInfos);
@@ -51,12 +49,12 @@ public class ConfigCheckerTests {
         var typeInfos = TypeInfos.EMPTY
             .addNamespaceTypeInfo(
                 NamespaceName.of("Main"),
-                NamespaceTypeInfo.fromFields(P.orderedMap(
-                    Map.entry(
+                NamespaceTypeInfo.builder()
+                    .addField(
                         "main2",
                         new FunctionType(List.of(), List.of(), Effects.IO, Types.UNIT)
                     )
-                ))
+                    .build()
             );
 
         var error = assertThrows(
@@ -73,12 +71,12 @@ public class ConfigCheckerTests {
         var typeInfos = TypeInfos.EMPTY
             .addNamespaceTypeInfo(
                 NamespaceName.of("Main"),
-                NamespaceTypeInfo.fromFields(P.orderedMap(
-                    Map.entry(
+                NamespaceTypeInfo.builder()
+                    .addField(
                         "main",
                         new FunctionType(List.of(), List.of(), Effects.IO, Types.STRING)
                     )
-                ))
+                    .build()
             );
 
         var error = assertThrows(
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java
index 5d192172..2a3154ef 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java
@@ -14,11 +14,9 @@ import org.shedlang.compiler.typechecker.TypeInfos;
 import org.shedlang.compiler.types.NamespaceName;
 import org.shedlang.compiler.types.NamespaceTypeInfo;
 import org.shedlang.compiler.types.Types;
-import org.shedlang.compiler.util.P;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 import static org.shedlang.compiler.patio.PatioTesting.serializeCompilationUnit;
 
@@ -40,10 +38,13 @@ public class PatioCodeGenNamespaceTests {
         var instructions = List.<Instruction>of(instruction);
         var namespaceName = NamespaceName.of("An","Example");
         var typeInfos = TypeInfos.EMPTY
-            .addNamespaceTypeInfo(namespaceName, NamespaceTypeInfo.fromFields(P.orderedMap(
-                Map.entry("x", Types.INT),
-                Map.entry("y", Types.STRING)
-            )));
+            .addNamespaceTypeInfo(
+                namespaceName,
+                NamespaceTypeInfo.builder()
+                    .addField("x", Types.INT)
+                    .addField("y", Types.STRING)
+                    .build()
+            );
         var context = PatioCodeGenContext.forTypeInfos(typeInfos);
         var stackIrNamespace = new StackIrNamespace(namespaceName, instructions);
 
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
index 948fdd3b..82ec14f7 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
@@ -545,9 +545,11 @@ public class TypeCheckerNamespaceTests {
             .orElseThrow();
         assertThat(
             namespaceTypeInfo,
-            equalTo(NamespaceTypeInfo.fromFields(P.orderedMap(
-                Map.entry("g", new FunctionType(List.of(), List.of(), Effects.NONE, Types.UNIT))
-            )))
+            equalTo(
+                NamespaceTypeInfo.builder()
+                    .addField("g", new FunctionType(List.of(), List.of(), Effects.NONE, Types.UNIT))
+                    .build()
+            )
         );
     }
 }