diff options
5 files changed, 81 insertions, 3 deletions
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedNamespaceStatementNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedNamespaceStatementNode.java index 6cab80c..7e96716 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedNamespaceStatementNode.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedNamespaceStatementNode.java @@ -1,4 +1,4 @@ package org.zwobble.hobgoblin.compiler.ast.typed; -public sealed interface TypedNamespaceStatementNode extends TypedNode permits TypedStructDefinitionNode, TypedSumDefinitionNode { +public sealed interface TypedNamespaceStatementNode extends TypedNode permits TypedNativeTypeDefinitionNode, TypedStructDefinitionNode, TypedSumDefinitionNode { } diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedNativeTypeDefinitionNode.java b/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedNativeTypeDefinitionNode.java new file mode 100644 index 0000000..e81705b --- /dev/null +++ b/src/main/java/org/zwobble/hobgoblin/compiler/ast/typed/TypedNativeTypeDefinitionNode.java @@ -0,0 +1,15 @@ +package org.zwobble.hobgoblin.compiler.ast.typed; + +import org.zwobble.hobgoblin.compiler.ast.DocComment; +import org.zwobble.hobgoblin.compiler.sources.Source; +import org.zwobble.hobgoblin.compiler.types.SimpleNativeType; + +public record TypedNativeTypeDefinitionNode( + SimpleNativeType type, + DocComment docComment, + Source source +) implements TypedNamespaceStatementNode { + public String name() { + return this.type.name(); + } +} diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java index e859170..5d4ffb6 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/output/generators/javatypes/JavaTypesGenerator.java @@ -69,6 +69,10 @@ public class JavaTypesGenerator implements Generator { for (var statement : namespace.body()) { switch (statement) { + case TypedNativeTypeDefinitionNode nativeTypeDefinition -> { + throw new UnsupportedOperationException("TODO"); + } + case TypedStructDefinitionNode structDefinition -> { var javaCompilationUnit = new JavaCompilationUnit( packageParts, 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 29bcbf8..2579fbe 100644 --- a/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/zwobble/hobgoblin/compiler/typechecker/TypeChecker.java @@ -41,7 +41,7 @@ public class TypeChecker { ) { switch (untyped) { case UntypedNativeTypeDefinitionNode untypedNativeTypeDefinition -> - throw new UnsupportedOperationException("TODO"); + declareNativeTypeDefinition(untypedNativeTypeDefinition, context); case UntypedStructDefinitionNode untypedStructDefinition -> declareStructDefinition(untypedStructDefinition, context); @@ -57,7 +57,7 @@ public class TypeChecker { ) { return switch (untyped) { case UntypedNativeTypeDefinitionNode untypedNativeTypeDefinition -> - throw new UnsupportedOperationException("TODO"); + defineNativeTypeDefinition(untypedNativeTypeDefinition, context); case UntypedStructDefinitionNode untypedStructDefinition -> defineStructDefinition(untypedStructDefinition, context); @@ -67,6 +67,29 @@ public class TypeChecker { }; } + private static void declareNativeTypeDefinition( + UntypedNativeTypeDefinitionNode untyped, + TypeCheckerNamespaceContext context + ) { + var nativeType = new SimpleNativeType(context.namespaceName(), untyped.name()); + // TODO: tidy up declare vs define + context.declare(untyped.name()); + context.define(untyped.name(), new TypeLevelValueType(nativeType)); + } + + private static TypedNativeTypeDefinitionNode defineNativeTypeDefinition( + UntypedNativeTypeDefinitionNode untyped, + TypeCheckerNamespaceContext context + ) { + var nativeType = (SimpleNativeType) lookupMetaType(untyped.name(), untyped.source(), context); + + return new TypedNativeTypeDefinitionNode( + nativeType, + untyped.docComment(), + untyped.source() + ); + } + private static void declareStructDefinition( UntypedStructDefinitionNode untyped, TypeCheckerNamespaceContext context diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNativeTypeDefinitionTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNativeTypeDefinitionTests.java new file mode 100644 index 0000000..bd08e40 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNativeTypeDefinitionTests.java @@ -0,0 +1,36 @@ +package org.zwobble.hobgoblin.compiler.typechecker; + +import org.junit.jupiter.api.Test; +import org.zwobble.hobgoblin.compiler.ast.DocComment; +import org.zwobble.hobgoblin.compiler.ast.typed.TypedNativeTypeDefinitionNode; +import org.zwobble.hobgoblin.compiler.ast.untyped.UntypedNativeTypeDefinitionNode; +import org.zwobble.hobgoblin.compiler.sources.NullSource; +import org.zwobble.hobgoblin.compiler.types.NamespaceName; +import org.zwobble.hobgoblin.compiler.types.SimpleNativeType; + +import static org.zwobble.hobgoblin.compiler.typechecker.TypeCheckerTesting.typeCheckNamespaceStatement; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.*; + +public class TypeCheckerNativeTypeDefinitionTests { + @Test + public void nativeTypeHasNamespaceFromContext() { + var untyped = new UntypedNativeTypeDefinitionNode( + "X", + DocComment.EMPTY, + NullSource.INSTANCE + ); + var context = TypeCheckerContextArb.namespaceContext(NamespaceName.of("a", "b")); + + var typed = typeCheckNamespaceStatement(untyped, context); + + assertThat(typed, instanceOf( + TypedNativeTypeDefinitionNode.class, + has( + "type", + TypedNativeTypeDefinitionNode::type, + equalTo(new SimpleNativeType(NamespaceName.of("a", "b"), "X")) + ) + )); + } +} |