From f98ea69c9d401217af2a6a5d7ab42dae0ae65b6d Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 5 Nov 2023 20:29:44 +0000 Subject: Introduce FieldInfo --- src/main/java/org/shedlang/compiler/ShedCompiler.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/org/shedlang/compiler/ShedCompiler.java') diff --git a/src/main/java/org/shedlang/compiler/ShedCompiler.java b/src/main/java/org/shedlang/compiler/ShedCompiler.java index 6e7f187a..1c2a471f 100644 --- a/src/main/java/org/shedlang/compiler/ShedCompiler.java +++ b/src/main/java/org/shedlang/compiler/ShedCompiler.java @@ -10,10 +10,7 @@ import org.shedlang.compiler.stackir.StackCompiler; import org.shedlang.compiler.stackir.StackIrNamespace; import org.shedlang.compiler.typechecker.TypeChecker; import org.shedlang.compiler.typechecker.TypeCheckerContext; -import org.shedlang.compiler.typechecker.TypeInfos; -import org.shedlang.compiler.types.Effects; -import org.shedlang.compiler.types.NamespaceName; -import org.shedlang.compiler.types.Types; +import org.shedlang.compiler.types.*; import org.shedlang.compiler.util.P; import java.io.IOException; @@ -42,9 +39,12 @@ public class ShedCompiler { var namespaces = new ArrayList(); var typeCheckerContext = TypeCheckerContext.EMPTY - .addNamespaceFields(ShedBuiltins.NAMESPACE_NAME, P.orderedMap( - Map.entry(ShedBuiltins.PRINT_NAME, ShedBuiltins.PRINT_TYPE) - )) + .addNamespaceTypeInfo( + ShedBuiltins.NAMESPACE_NAME, + new NamespaceTypeInfo(FieldsInfo.of( + new FieldInfo<>(ShedBuiltins.PRINT_NAME, ShedBuiltins.PRINT_TYPE) + )) + ) .enterGlobal(P.map( Map.entry("Bool", Types.metaType(Types.BOOL)), Map.entry("Int", Types.metaType(Types.INT)), -- cgit v1.2.3