From 4e34463f83f7ca08070565351df06eb06f67be94 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 28 Sep 2023 10:13:17 +0100 Subject: Add basic type checking for struct definitions --- .../ast/typed/TypedNamespaceStatementNode.java | 2 +- .../ast/typed/TypedStructDefinitionNode.java | 12 ++++++ .../ast/typed/TypedStructFieldDefinitionNode.java | 11 ++++++ .../ast/untyped/UntypedStructDefinitionNode.java | 26 +++++++++++++ .../shedlang/compiler/typechecker/TypeChecker.java | 17 ++++++++- .../compiler/ast/typed/TypedNodeMatchers.java | 4 ++ .../typed/TypedStructDefinitionNodeMatcher.java | 43 ++++++++++++++++++++++ .../TypeCheckerStructDefinitionTests.java | 43 ++++++++++++++++++++++ 8 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNode.java create mode 100644 src/main/java/org/shedlang/compiler/ast/typed/TypedStructFieldDefinitionNode.java create mode 100644 src/test/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNodeMatcher.java create mode 100644 src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceStatementNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceStatementNode.java index f2186711..9a5e766a 100644 --- a/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceStatementNode.java +++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedNamespaceStatementNode.java @@ -1,4 +1,4 @@ package org.shedlang.compiler.ast.typed; -public sealed interface TypedNamespaceStatementNode extends TypedNode permits TypedAssignNode, TypedFunctionDefinitionNode { +public sealed interface TypedNamespaceStatementNode extends TypedNode permits TypedAssignNode, TypedFunctionDefinitionNode, TypedStructDefinitionNode { } diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNode.java new file mode 100644 index 00000000..4a956ee3 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNode.java @@ -0,0 +1,12 @@ +package org.shedlang.compiler.ast.typed; + +import org.shedlang.compiler.sources.Source; + +import java.util.List; + +public record TypedStructDefinitionNode( + String name, + List fields, + Source source +) implements TypedNamespaceStatementNode { +} diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedStructFieldDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedStructFieldDefinitionNode.java new file mode 100644 index 00000000..a84517a0 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedStructFieldDefinitionNode.java @@ -0,0 +1,11 @@ +package org.shedlang.compiler.ast.typed; + +import org.shedlang.compiler.sources.Source; +import org.shedlang.compiler.types.Type; + +public record TypedStructFieldDefinitionNode( + String name, + TypedTypeLevelExpressionNode type, + Source source +) implements TypedNode { +} diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java index 49490b8d..210c29ee 100644 --- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java +++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedStructDefinitionNode.java @@ -1,6 +1,9 @@ package org.shedlang.compiler.ast.untyped; +import org.pcollections.PVector; import org.shedlang.compiler.sources.Source; +import org.shedlang.compiler.sources.Sources; +import org.shedlang.compiler.util.P; import java.util.List; @@ -9,4 +12,27 @@ public record UntypedStructDefinitionNode( List fields, Source source ) implements UntypedNamespaceStatementNode { + public static Builder builder() { + return new Builder("X", P.vector()); + } + + public record Builder( + String name, + PVector fields + ) { + public UntypedStructDefinitionNode build() { + return new UntypedStructDefinitionNode( + this.name, + this.fields, + Sources.NULL + ); + } + + public Builder withName(String name) { + return new Builder( + name, + this.fields + ); + } + } } diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 930efd85..5af83d5f 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -728,7 +728,7 @@ public class TypeChecker { typeCheckStepsFunctionDefinition(functionDefinition); case UntypedStructDefinitionNode structDefinition -> - throw new UnsupportedOperationException("TODO"); + typeCheckStepsStructDefinition(structDefinition); }; } @@ -781,6 +781,21 @@ public class TypeChecker { )); } + private static TypeCheckSteps typeCheckStepsStructDefinition( + UntypedStructDefinitionNode untyped + ) { + return new TypeCheckSteps() { + @Override + public TypeCheckerResult define(TypeCheckerContext context) { + return context.toResult(new TypedStructDefinitionNode( + untyped.name(), + List.of(), + untyped.source() + )); + } + }; + } + @SuppressWarnings("unchecked") static TypedTypeLevelExpressionNode typeCheckTypeLevelExpression( TypeSetTypeLevelValue valueType, diff --git a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java index 52d91cdf..bc5da178 100644 --- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java @@ -221,6 +221,10 @@ public class TypedNodeMatchers { ); } + public static TypedStructDefinitionNodeMatcher isTypedStructDefinitionNode() { + return TypedStructDefinitionNodeMatcher.empty(); + } + public static Matcher isTypedTargetIgnore() { return instanceOf(TypedTargetNode.Ignore.class); } diff --git a/src/test/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNodeMatcher.java new file mode 100644 index 00000000..489fb558 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedStructDefinitionNodeMatcher.java @@ -0,0 +1,43 @@ +package org.shedlang.compiler.ast.typed; + +import org.pcollections.PVector; +import org.shedlang.compiler.testing.MatcherBuilder; +import org.shedlang.compiler.util.P; +import org.zwobble.precisely.Matcher; + +import static org.zwobble.precisely.Matchers.equalTo; +import static org.zwobble.precisely.Matchers.has; + +public class TypedStructDefinitionNodeMatcher extends MatcherBuilder< + TypedNamespaceStatementNode, + TypedStructDefinitionNode, + TypedStructDefinitionNodeMatcher +> { + public static TypedStructDefinitionNodeMatcher empty() { + return new TypedStructDefinitionNodeMatcher(P.vector()); + } + + private TypedStructDefinitionNodeMatcher(PVector> submatchers) { + super(submatchers); + } + + @Override + protected Class expectedType() { + return TypedStructDefinitionNode.class; + } + + @Override + protected TypedStructDefinitionNodeMatcher create(PVector> submatchers) { + return new TypedStructDefinitionNodeMatcher(submatchers); + } + + public TypedStructDefinitionNodeMatcher withName(String name) { + return with(has("name", x -> x.name(), equalTo(name))); + } + + public TypedStructDefinitionNodeMatcher withFields( + Matcher> fields + ) { + return with(has("fields", x -> x.fields(), fields)); + } +} diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java new file mode 100644 index 00000000..ac361f79 --- /dev/null +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java @@ -0,0 +1,43 @@ +package org.shedlang.compiler.typechecker; + +import org.junit.jupiter.api.Test; +import org.shedlang.compiler.ast.typed.TypedNamespaceStatementNode; +import org.shedlang.compiler.ast.untyped.UntypedNamespaceStatementNode; +import org.shedlang.compiler.ast.untyped.UntypedStructDefinitionNode; +import org.shedlang.compiler.util.P; + +import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.isTypedStructDefinitionNode; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.isSequence; + +public class TypeCheckerStructDefinitionTests { + @Test + public void canTypeCheckStructDefinitionWithNoFields() { + var untyped = UntypedStructDefinitionNode.builder() + .withName("ExampleStruct") + .build(); + var context = TypeCheckerContext.EMPTY; + + var typed = typeCheckNamespaceStatement(untyped, context); + + assertThat( + typed.value(), + isTypedStructDefinitionNode() + .withName("ExampleStruct") + .withFields(isSequence()) + ); + } + + private static TypeCheckerResult typeCheckNamespaceStatement( + UntypedNamespaceStatementNode untyped, + TypeCheckerContext context + ) { + // TODO: remove duplication of this method + var declaredVariables = DeclaredVariables.forNamespaceStatement(untyped, P.vector()); + var environment = EnvironmentBuilder.EMPTY.addUndefined(declaredVariables); + + context = context.enterNamespace(environment.build()); + + return TypeChecker.typeCheckNamespaceStatement(untyped).typeCheckAllPhases(context); + } +} -- cgit v1.2.3