From 743b94d61138eb913a85e1c4b753540e91f5f509 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 17 Sep 2023 17:18:49 +0100 Subject: Type check tuple types --- .../compiler/ast/typed/TypedTupleTypeNode.java | 10 +++++++ .../shedlang/compiler/typechecker/TypeChecker.java | 33 ++++++++++++++++++++-- .../org/shedlang/compiler/types/TupleType.java | 19 +++++++++++++ .../java/org/shedlang/compiler/types/Type.java | 2 +- .../java/org/shedlang/compiler/types/Types.java | 4 +++ 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/shedlang/compiler/ast/typed/TypedTupleTypeNode.java create mode 100644 src/main/java/org/shedlang/compiler/types/TupleType.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedTupleTypeNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedTupleTypeNode.java new file mode 100644 index 00000000..62ace3ee --- /dev/null +++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedTupleTypeNode.java @@ -0,0 +1,10 @@ +package org.shedlang.compiler.ast.typed; + +import org.shedlang.compiler.sources.Source; +import org.shedlang.compiler.types.TupleType; + +public record TypedTupleTypeNode( + TupleType value, + Source source +) implements TypedTypeLevelExpressionNode { +} diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java index 6839b500..2c2a9e0b 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java @@ -770,20 +770,49 @@ public class TypeChecker { )); } + @SuppressWarnings("unchecked") static TypedTypeLevelExpressionNode typeCheckTypeLevelExpression( TypeSetTypeLevelValue valueType, UntypedTypeLevelExpressionNode untyped, TypeCheckerContext context ) { return switch (untyped) { - case UntypedTupleTypeNode tuple -> - throw new UnsupportedOperationException("TODO"); + case UntypedTupleTypeNode tuple -> { + var typedTupleNode = typeCheckTupleType(tuple, context); + + if (valueType.valueClass().equals(Type.class)) { + yield (TypedTypeLevelExpressionNode) typedTupleNode; + } else { + throw new UnexpectedTypeError( + valueType, + Types.metaType(typedTupleNode.value()), + untyped.source() + ); + } + } case UntypedTypeLevelReferenceNode reference -> typeCheckTypeLevelReference(valueType, reference, context); }; } + private static TypedTupleTypeNode typeCheckTupleType( + UntypedTupleTypeNode untyped, + TypeCheckerContext context + ) { + var elementTypes = untyped.elements().stream() + .map(elementType -> typeCheckTypeLevelExpression( + TypeSets.META_TYPE, + elementType, + context + ).value()) + .toList(); + + var tupleType = new TupleType(elementTypes); + + return new TypedTupleTypeNode(tupleType, untyped.source()); + } + private static TypedTypeLevelExpressionNode typeCheckTypeLevelReference( TypeSetTypeLevelValue valueType, UntypedTypeLevelReferenceNode untyped, diff --git a/src/main/java/org/shedlang/compiler/types/TupleType.java b/src/main/java/org/shedlang/compiler/types/TupleType.java new file mode 100644 index 00000000..a2eeb0b0 --- /dev/null +++ b/src/main/java/org/shedlang/compiler/types/TupleType.java @@ -0,0 +1,19 @@ +package org.shedlang.compiler.types; + +import java.util.List; + +/** + * A tuple type, representing tuples with elements of the given types. + */ +public record TupleType(List elements) implements Type { + @Override + public String describe() { + // TODO: finish this + return "Tuple"; + } + + @Override + public String toString() { + return describe(); + } +} diff --git a/src/main/java/org/shedlang/compiler/types/Type.java b/src/main/java/org/shedlang/compiler/types/Type.java index 92948b15..d4aea52f 100644 --- a/src/main/java/org/shedlang/compiler/types/Type.java +++ b/src/main/java/org/shedlang/compiler/types/Type.java @@ -6,5 +6,5 @@ package org.shedlang.compiler.types; * found through auxiliary data. */ public sealed interface Type extends TypeLevelValue - permits BoolType, BottomType, FunctionType, IntType, NamespaceType, StringType, TopType, TypeLevelValueType, UnitType { + permits BoolType, BottomType, FunctionType, IntType, NamespaceType, StringType, TopType, TupleType, TypeLevelValueType, UnitType { } diff --git a/src/main/java/org/shedlang/compiler/types/Types.java b/src/main/java/org/shedlang/compiler/types/Types.java index 92ae294d..2f07133a 100644 --- a/src/main/java/org/shedlang/compiler/types/Types.java +++ b/src/main/java/org/shedlang/compiler/types/Types.java @@ -14,6 +14,10 @@ public class Types { public static final Type TOP = TopType.INSTANCE; public static final Type UNIT = UnitType.INSTANCE; + public static TupleType tuple(List elements) { + return new TupleType(elements); + } + public static Type metaType(Type type) { return new TypeLevelValueType(type); } -- cgit v1.2.3