aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-09-17 17:18:49 +0100
committerMichael Williamson <mike@zwobble.org>2023-09-17 17:18:49 +0100
commit743b94d61138eb913a85e1c4b753540e91f5f509 (patch)
tree132388b38a66252e0bdc1a8f7b9ddb26ffbe61e4 /src/main/java
parent0552d676bfa6e6b009132c540ae822e8bd148b4a (diff)
Type check tuple types
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/ast/typed/TypedTupleTypeNode.java10
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java33
-rw-r--r--src/main/java/org/shedlang/compiler/types/TupleType.java19
-rw-r--r--src/main/java/org/shedlang/compiler/types/Type.java2
-rw-r--r--src/main/java/org/shedlang/compiler/types/Types.java4
5 files changed, 65 insertions, 3 deletions
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<TupleType> {
+}
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 <T extends TypeLevelValue> TypedTypeLevelExpressionNode<T> typeCheckTypeLevelExpression(
TypeSetTypeLevelValue<T> 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<T>) 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 <T extends TypeLevelValue> TypedTypeLevelExpressionNode<T> typeCheckTypeLevelReference(
TypeSetTypeLevelValue<T> 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<Type> 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<Type> elements) {
+ return new TupleType(elements);
+ }
+
public static Type metaType(Type type) {
return new TypeLevelValueType(type);
}