aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-09-17 17:40:57 +0100
committerMichael Williamson <mike@zwobble.org>2023-09-17 17:40:57 +0100
commit15cce94576557de13db6d855f8ac47a2a2b652be (patch)
tree64ed6ff05f2bfc2e6046b584e1524525ddc044f8 /src/main/java
parentf544626a85a2e5fedaec200c231b69728fbf99e9 (diff)
Check expression is tuple
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java9
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSet.java2
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSetTuple.java13
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSets.java1
4 files changed, 23 insertions, 2 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index eafa9f47..435de6de 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -865,7 +865,14 @@ public class TypeChecker {
}
case UntypedTargetNode.Tuple targetTuple -> {
- var tupleType = (TupleType) expressionType;
+ if (!(expressionType instanceof TupleType tupleType)) {
+ throw new UnexpectedTypeError(
+ TypeSets.TUPLE,
+ expressionType,
+ // TODO: should the source be the target or the expression?
+ targetTuple.source()
+ );
+ }
var typedTargetElements = new ArrayList<TypedTargetNode>();
diff --git a/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSet.java b/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSet.java
index 01899978..5a0350f4 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSet.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSet.java
@@ -1,5 +1,5 @@
package org.shedlang.compiler.typechecker.typesets;
-public sealed interface TypeSet permits TypeSetFunction, TypeSetType, TypeSetTypeLevelValue {
+public sealed interface TypeSet permits TypeSetFunction, TypeSetTuple, TypeSetType, TypeSetTypeLevelValue {
String describe();
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSetTuple.java b/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSetTuple.java
new file mode 100644
index 00000000..dc8773b5
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSetTuple.java
@@ -0,0 +1,13 @@
+package org.shedlang.compiler.typechecker.typesets;
+
+public final class TypeSetTuple implements TypeSet {
+ static final TypeSetTuple INSTANCE = new TypeSetTuple();
+
+ private TypeSetTuple() {
+ }
+
+ @Override
+ public String describe() {
+ return "tuple";
+ }
+}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSets.java b/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSets.java
index 3dd47cae..6b6d2d69 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSets.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/typesets/TypeSets.java
@@ -9,6 +9,7 @@ public class TypeSets {
public static final TypeSetEffect EFFECT = TypeSetEffect.INSTANCE;
public static final TypeSet FUNCTION = TypeSetFunction.INSTANCE;
public static final TypeSetMetaType META_TYPE = TypeSetMetaType.INSTANCE;
+ public static final TypeSetTuple TUPLE = TypeSetTuple.INSTANCE;
public static TypeSet type(Type type) {
return new TypeSetType(type);