From 6d9a2f0b07204debf78f70e3d1ed5078ee4e54c0 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 28 Sep 2023 11:38:44 +0100 Subject: Basic type checking for field access --- .../shedlang/compiler/typechecker/TypeChecker.java | 27 ++++++++++++- .../compiler/typechecker/TypeCheckerContext.java | 5 +++ .../shedlang/compiler/types/StructTypeInfo.java | 5 +++ src/main/java/org/shedlang/compiler/util/P.java | 9 +++++ .../compiler/ast/typed/TypedNodeMatchers.java | 13 +++++++ .../org/shedlang/compiler/ast/untyped/Untyped.java | 7 ++++ .../typechecker/TypeCheckerFieldAccessTests.java | 44 ++++++++++++++++++++++ 7 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFieldAccessTests.java (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 042fb614..f11b0e1e 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -361,8 +361,8 @@ public class TypeChecker { case UntypedCallNode untypedCall -> typeCheckCall(untypedCall, context); - case UntypedFieldAccessNode untypedFieldAccessNode -> - throw new UnsupportedOperationException("TODO"); + case UntypedFieldAccessNode untypedFieldAccess -> + typeCheckFieldAccess(untypedFieldAccess, context); case UntypedIfNode untypedIf -> typeCheckIf(untypedIf, context); @@ -393,6 +393,29 @@ public class TypeChecker { }); } + private static TypeCheckerResult typeCheckFieldAccess( + UntypedFieldAccessNode untyped, + TypeCheckerContext context + ) { + var typedReceiverResult = typeCheckExpression(untyped.receiver(), context); + var typedReceiver = typedReceiverResult.value(); + context = typedReceiverResult.context(); + + var structTypeInfo = context.structTypeInfo( + (StructType) typedReceiver.type(), + untyped.fieldName() + ); + + var fieldType = structTypeInfo.orElseThrow().fieldType(untyped.fieldName()).orElseThrow(); + + return context.toResult(new TypedFieldAccessNode( + typedReceiver, + untyped.fieldName(), + fieldType, + untyped.source() + )); + } + private static TypeCheckSteps typeCheckStepsFunctionDefinition( UntypedFunctionDefinitionNode untyped ) { diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java index 06b237e1..18b030f8 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java @@ -361,6 +361,11 @@ public class TypeCheckerContext { ); } + public Optional structTypeInfo(StructType type, String fieldName) { + return Optional.ofNullable(this.structTypeInfo.get(type)); + } + + public PMap structTypeInfo() { return structTypeInfo; } diff --git a/src/main/java/org/shedlang/compiler/types/StructTypeInfo.java b/src/main/java/org/shedlang/compiler/types/StructTypeInfo.java index fb776091..f0c3eff7 100644 --- a/src/main/java/org/shedlang/compiler/types/StructTypeInfo.java +++ b/src/main/java/org/shedlang/compiler/types/StructTypeInfo.java @@ -2,5 +2,10 @@ package org.shedlang.compiler.types; import org.pcollections.OrderedPMap; +import java.util.Optional; + public record StructTypeInfo(OrderedPMap fields) { + public Optional fieldType(String fieldName) { + return Optional.ofNullable(this.fields.get(fieldName)); + } } diff --git a/src/main/java/org/shedlang/compiler/util/P.java b/src/main/java/org/shedlang/compiler/util/P.java index fc822614..5d40d596 100644 --- a/src/main/java/org/shedlang/compiler/util/P.java +++ b/src/main/java/org/shedlang/compiler/util/P.java @@ -28,6 +28,15 @@ public class P { return map; } + @SafeVarargs + public static OrderedPMap orderedPMap(Map.Entry... entries) { + var map = OrderedPMap.empty(); + for (var entry : entries) { + map = map.plus(entry.getKey(), entry.getValue()); + } + return map; + } + @SafeVarargs public static OrderedPSet orderedSet(T... values) { return OrderedPSet.from(Arrays.asList(values)); 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 259c3215..a21e3375 100644 --- a/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedNodeMatchers.java @@ -92,6 +92,19 @@ public class TypedNodeMatchers { ); } + public static Matcher isTypedFieldAccessNode( + Matcher receiver, + String fieldName, + Type type + ) { + return instanceOf( + TypedFieldAccessNode.class, + has("receiver", x -> x.receiver(), receiver), + has("fieldName", x -> x.fieldName(), equalTo(fieldName)), + has("type", x -> x.type(), equalTo(type)) + ); + } + public static TypedFunctionDefinitionNodeMatcher isTypedFunctionDefinitionNode() { return TypedFunctionDefinitionNodeMatcher.empty(); } diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java b/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java index dcdb9f46..6480af7b 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/Untyped.java @@ -84,6 +84,13 @@ public class Untyped { return new UntypedExpressionStatementNode(expression, Sources.NULL); } + public static UntypedExpressionNode fieldAccess( + UntypedExpressionNode receiver, + String fieldName + ) { + return new UntypedFieldAccessNode(receiver, fieldName, Sources.NULL); + } + public static UntypedFunctionReturnNode functionReturn(UntypedExpressionNode expression) { return new UntypedFunctionReturnNode(expression, Sources.NULL); } diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFieldAccessTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFieldAccessTests.java new file mode 100644 index 00000000..f560cfce --- /dev/null +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFieldAccessTests.java @@ -0,0 +1,44 @@ +package org.shedlang.compiler.typechecker; + +import org.junit.jupiter.api.Test; +import org.shedlang.compiler.ast.untyped.Untyped; +import org.shedlang.compiler.ast.untyped.UntypedCallNode; +import org.shedlang.compiler.typechecker.errors.*; +import org.shedlang.compiler.typechecker.typesets.TypeSets; +import org.shedlang.compiler.types.*; +import org.shedlang.compiler.util.P; + +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.shedlang.compiler.ast.typed.TypedNodeMatchers.*; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.equalTo; +import static org.zwobble.precisely.Matchers.isSequence; + +public class TypeCheckerFieldAccessTests { + @Test + public void canAccessFieldOnStructType() { + var untyped = Untyped.fieldAccess( + Untyped.reference("user"), + "name" + ); + var structType = Types.struct(NamespaceName.of("Example"), "User"); + var structTypeInfo = new StructTypeInfo(P.orderedPMap(Map.entry("name", Types.STRING))); + var context = TypeCheckerContext.EMPTY + .enterGlobal(P.map(Map.entry("user", structType))) + .addStructTypeInfo(structType, structTypeInfo); + + var typed = TypeChecker.typeCheckExpression(untyped, context); + + assertThat( + typed.value(), + isTypedFieldAccessNode( + isTypedReferenceNode("user", structType), + "name", + Types.STRING + ) + ); + } +} -- cgit v1.2.3