From 032cdc6462ad575f62b349152f31e87b187e974d Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 25 Apr 2026 10:33:55 +0100 Subject: Generate struct type for struct definition --- .../compiler/typechecker/TypeChecker.java | 34 ++++++++++++++++++---- .../compiler/typechecker/TypeCheckerContext.java | 19 ++++++++++-- 2 files changed, 45 insertions(+), 8 deletions(-) (limited to 'src/main') 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 cfce407..0a301c6 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java @@ -1,11 +1,8 @@ package org.zwobble.hobgoblin.compiler.typechecker; -import org.zwobble.hobgoblin.compiler.ast.typed.TypedNamespaceNode; -import org.zwobble.hobgoblin.compiler.ast.typed.TypedTypeLevelExpressionNode; -import org.zwobble.hobgoblin.compiler.ast.typed.TypedTypeLevelReferenceNode; -import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNamespaceNode; -import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeLevelExpressionNode; -import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedTypeLevelReferenceNode; +import org.zwobble.hobgoblin.compiler.ast.typed.*; +import org.zwobble.hobgoblin.compiler.ast.untyped.*; +import org.zwobble.hobgoblin.compiler.types.StructType; import org.zwobble.hobgoblin.compiler.types.TypeLevelValue; import org.zwobble.hobgoblin.compiler.types.TypeLevelValueType; import org.zwobble.hobgoblin.compiler.types.TypeSet; @@ -27,6 +24,31 @@ public class TypeChecker { ); } + static TypedNamespaceStatementNode typeCheckNamespaceStatement( + UntypedNamespaceStatementNode untyped, + TypeCheckerContext context + ) { + return switch (untyped) { + case UntypedStructDefinitionNode untypedStructDefinition -> + typeCheckStructDefinition(untypedStructDefinition, context); + }; + } + + private static TypedStructDefinitionNode typeCheckStructDefinition( + UntypedStructDefinitionNode untyped, + TypeCheckerContext context + ) { + // TODO: better error when not in namespace + var namespaceName = context.namespaceName().orElseThrow(); + var structType = new StructType(namespaceName, untyped.name()); + + return new TypedStructDefinitionNode( + structType, + List.of(), + untyped.source() + ); + } + static TypedTypeLevelExpressionNode typeCheckTypeLevelExpression( UntypedTypeLevelExpressionNode untyped, TypeCheckerContext context diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerContext.java index b80246a..e1109f9 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerContext.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerContext.java @@ -1,5 +1,6 @@ package org.zwobble.hobgoblin.compiler.typechecker; +import org.zwobble.hobgoblin.compiler.types.NamespaceName; import org.zwobble.hobgoblin.compiler.types.Type; import java.util.HashMap; @@ -7,10 +8,20 @@ import java.util.Map; import java.util.Optional; public class TypeCheckerContext { - private final Map variables = new HashMap<>(); + private Optional namespaceName; + private final Map variables; + + private TypeCheckerContext(Optional namespaceName, Map variables) { + this.namespaceName = namespaceName; + this.variables = variables; + } public static TypeCheckerContext initial() { - return new TypeCheckerContext(); + return new TypeCheckerContext(Optional.empty(), new HashMap<>()); + } + + public Optional namespaceName() { + return this.namespaceName; } public void declare(String name) { @@ -26,4 +37,8 @@ public class TypeCheckerContext { public Optional lookup(String name) { return Optional.ofNullable(this.variables.get(name)); } + + public void enterNamespace(NamespaceName namespaceName) { + this.namespaceName = Optional.of(namespaceName); + } } -- cgit v1.2.3