Type check namespace bodies

4 files changed, 45 insertions, 23 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/HobgoblinCompiler.java b/src/main/java/org/zwobble/hobgoblin/compiler/HobgoblinCompiler.java
index 6daa31b..4f56fb1 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/HobgoblinCompiler.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/HobgoblinCompiler.java
@@ -2,7 +2,7 @@ package org.zwobble.hobgoblin.compiler;
 
 import org.zwobble.hobgoblin.compiler.parser.Parser;
 import org.zwobble.hobgoblin.compiler.typechecker.TypeChecker;
-import org.zwobble.hobgoblin.compiler.typechecker.TypeCheckerContext;
+import org.zwobble.hobgoblin.compiler.typechecker.TypeCheckerGlobalContext;
 import org.zwobble.hobgoblin.compiler.types.NamespaceName;
 import org.zwobble.sourcetext.SourceText;
 
@@ -28,7 +28,7 @@ public class HobgoblinCompiler {
             var sourceText = SourceText.fromString(sourceFile.toPath().toString(), sourceContents);
             var untypedNamespaceNode = Parser.parseNamespace(sourceText, namespaceName);
 
-            var typeCheckerContext = TypeCheckerContext.initial();
+            var typeCheckerContext = TypeCheckerGlobalContext.initial();
             var typedNamespaceNode = TypeChecker.typeCheckNamespace(untypedNamespaceNode, typeCheckerContext);
         }
     }
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java
index 0a301c6..b8bdd7f 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java
@@ -7,6 +7,7 @@ import org.zwobble.hobgoblin.compiler.types.TypeLevelValue;
 import org.zwobble.hobgoblin.compiler.types.TypeLevelValueType;
 import org.zwobble.hobgoblin.compiler.types.TypeSet;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class TypeChecker {
@@ -15,18 +16,26 @@ public class TypeChecker {
 
     public static TypedNamespaceNode typeCheckNamespace(
         UntypedNamespaceNode untyped,
-        TypeCheckerContext context
+        TypeCheckerGlobalContext context
     ) {
+        var namespaceContext = context.enterNamespace(untyped.namespaceName());
+
+        var typedBody = new ArrayList<TypedNamespaceStatementNode>();
+        for (var untypedStatement : untyped.body()) {
+            var typedStatement = typeCheckNamespaceStatement(untypedStatement, namespaceContext);
+            typedBody.add(typedStatement);
+        }
+
         return new TypedNamespaceNode(
             untyped.namespaceName(),
-            List.of(),
+            typedBody,
             untyped.source()
         );
     }
 
     static TypedNamespaceStatementNode typeCheckNamespaceStatement(
         UntypedNamespaceStatementNode untyped,
-        TypeCheckerContext context
+        TypeCheckerNamespaceContext context
     ) {
         return switch (untyped) {
             case UntypedStructDefinitionNode untypedStructDefinition ->
@@ -36,11 +45,9 @@ public class TypeChecker {
 
     private static TypedStructDefinitionNode typeCheckStructDefinition(
         UntypedStructDefinitionNode untyped,
-        TypeCheckerContext context
+        TypeCheckerNamespaceContext context
     ) {
-        // TODO: better error when not in namespace
-        var namespaceName = context.namespaceName().orElseThrow();
-        var structType = new StructType(namespaceName, untyped.name());
+        var structType = new StructType(context.namespaceName(), untyped.name());
 
         return new TypedStructDefinitionNode(
             structType,
@@ -51,7 +58,7 @@ public class TypeChecker {
 
     static TypedTypeLevelExpressionNode<? extends TypeLevelValue> typeCheckTypeLevelExpression(
         UntypedTypeLevelExpressionNode untyped,
-        TypeCheckerContext context
+        TypeCheckerNamespaceContext context
     ) {
         return switch (untyped) {
             case UntypedTypeLevelReferenceNode untypedTypeLevelReference ->
@@ -61,7 +68,7 @@ public class TypeChecker {
 
     private static TypedTypeLevelExpressionNode<? extends TypeLevelValue> typeCheckTypeLevelReference(
         UntypedTypeLevelReferenceNode untyped,
-        TypeCheckerContext context
+        TypeCheckerNamespaceContext context
     ) {
         var variable = context.lookup(untyped.name())
             .orElseThrow(() -> new UndeclaredVariableError(untyped.name(), untyped.source()));
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerGlobalContext.java b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerGlobalContext.java
new file mode 100644
index 0000000..3915767
--- /dev/null
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerGlobalContext.java
@@ -0,0 +1,16 @@
+package org.zwobble.hobgoblin.compiler.typechecker;
+
+import org.zwobble.hobgoblin.compiler.types.NamespaceName;
+
+public class TypeCheckerGlobalContext {
+    public static TypeCheckerGlobalContext initial() {
+        return new TypeCheckerGlobalContext();
+    }
+
+    private TypeCheckerGlobalContext() {
+    }
+
+    public TypeCheckerNamespaceContext enterNamespace(NamespaceName namespaceName) {
+        return TypeCheckerNamespaceContext.initial(namespaceName);
+    }
+}
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNamespaceContext.java
index e1109f9..c1a23fd 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerContext.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNamespaceContext.java
@@ -7,20 +7,23 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-public class TypeCheckerContext {
-    private Optional<NamespaceName> namespaceName;
+public class TypeCheckerNamespaceContext {
+    public static TypeCheckerNamespaceContext initial(NamespaceName namespaceName) {
+        return new TypeCheckerNamespaceContext(namespaceName, new HashMap<>());
+    }
+
+    private final NamespaceName namespaceName;
     private final Map<String, Variable> variables;
 
-    private TypeCheckerContext(Optional<NamespaceName> namespaceName, Map<String, Variable> variables) {
+    private TypeCheckerNamespaceContext(
+        NamespaceName namespaceName,
+        Map<String, Variable> variables
+    ) {
         this.namespaceName = namespaceName;
         this.variables = variables;
     }
 
-    public static TypeCheckerContext initial() {
-        return new TypeCheckerContext(Optional.empty(), new HashMap<>());
-    }
-
-    public Optional<NamespaceName> namespaceName() {
+    public NamespaceName namespaceName() {
         return this.namespaceName;
     }
 
@@ -37,8 +40,4 @@ public class TypeCheckerContext {
     public Optional<Variable> lookup(String name) {
         return Optional.ofNullable(this.variables.get(name));
     }
-
-    public void enterNamespace(NamespaceName namespaceName) {
-        this.namespaceName = Optional.of(namespaceName);
-    }
 }