aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-09-30 18:12:54 +0100
committerMichael Williamson <mike@zwobble.org>2023-09-30 18:12:54 +0100
commit3ff9c7c74c904dc3ff71040be3df206c9d67d33a (patch)
tree2f3300e3073f0a66047a085d266872c41682379b /src
parentce146e1a71652db658234d3d92180ed4f7a76427 (diff)
Add subtyping for sum types
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java1
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java10
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java8
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/errors/MissingSumTypeInfoError.java18
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java28
5 files changed, 61 insertions, 4 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index c9413be8..d10531ad 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -928,6 +928,7 @@ public class TypeChecker {
public TypeCheckerContext defineTypes(TypeCheckerContext context) {
var type = context.getLexicalState(SumType.class, untyped.name());
+ // TODO: restrict variants to structs. Do we allow other sum types?
var variants = untyped.variants().stream()
.map(untypedVariant -> typeCheckTypeLevelExpression(
TypeSets.META_TYPE,
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
index 348380cb..7d1f77cc 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerContext.java
@@ -5,10 +5,7 @@ import org.pcollections.PMap;
import org.pcollections.PStack;
import org.shedlang.compiler.ast.typed.FreeVariables;
import org.shedlang.compiler.sources.Source;
-import org.shedlang.compiler.typechecker.errors.CannotDefineVariableDeclaredInOuterScopeError;
-import org.shedlang.compiler.typechecker.errors.MissingStructTypeInfoError;
-import org.shedlang.compiler.typechecker.errors.UnknownVariableError;
-import org.shedlang.compiler.typechecker.errors.VariableIsAlreadyDefinedError;
+import org.shedlang.compiler.typechecker.errors.*;
import org.shedlang.compiler.types.*;
import org.shedlang.compiler.util.P;
import org.shedlang.compiler.util.PCollectors;
@@ -362,6 +359,11 @@ public class TypeCheckerContext {
);
}
+ public SumTypeInfo sumTypeInfo(SumType type, Source source) {
+ return this.typeInfos.sumTypeInfo(type)
+ .orElseThrow(() -> new MissingSumTypeInfoError(type, source));
+ }
+
public <T> TypeCheckerResult<T> toResult(T value) {
return new TypeCheckerResult<>(value, this);
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
index b73011ce..e0d6fe78 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
@@ -1,5 +1,7 @@
package org.shedlang.compiler.typechecker;
+import org.shedlang.compiler.sources.Sources;
+import org.shedlang.compiler.types.SumType;
import org.shedlang.compiler.types.Type;
import org.shedlang.compiler.types.Types;
@@ -20,6 +22,12 @@ public class TypeCheckerSubTyping {
return true;
}
+ if (superType instanceof SumType superTypeSum) {
+ var superTypeInfo = context.sumTypeInfo(superTypeSum, Sources.NULL);
+ return superTypeInfo.variants().stream()
+ .anyMatch(superTypeVariant -> isSubType(subType, superTypeVariant, context));
+ }
+
return false;
}
}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/MissingSumTypeInfoError.java b/src/main/java/org/shedlang/compiler/typechecker/errors/MissingSumTypeInfoError.java
new file mode 100644
index 00000000..04eb6c6a
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/typechecker/errors/MissingSumTypeInfoError.java
@@ -0,0 +1,18 @@
+package org.shedlang.compiler.typechecker.errors;
+
+import org.shedlang.compiler.errors.InternalCompilerError;
+import org.shedlang.compiler.sources.Source;
+import org.shedlang.compiler.types.SumType;
+
+public class MissingSumTypeInfoError extends InternalCompilerError {
+ private final SumType type;
+
+ public MissingSumTypeInfoError(SumType type, Source source) {
+ super("Missing type info for sum type " + type, source);
+ this.type = type;
+ }
+
+ public SumType type() {
+ return type;
+ }
+}
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
index b7da683c..a144b78c 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
@@ -3,7 +3,9 @@ package org.shedlang.compiler.typechecker;
import org.junit.jupiter.api.Test;
import org.shedlang.compiler.types.NamespaceName;
import org.shedlang.compiler.types.StructType;
+import org.shedlang.compiler.types.SumTypeInfo;
import org.shedlang.compiler.types.Types;
+import org.shedlang.compiler.util.P;
import static org.shedlang.compiler.typechecker.TypeCheckerSubTyping.isSubType;
import static org.zwobble.precisely.AssertThat.assertThat;
@@ -105,4 +107,30 @@ public class TypeCheckerIsSubTypeTests {
equalTo(false)
);
}
+
+ @Test
+ public void variantIsSubTypeOfSumType() {
+ var namespaceName = NamespaceName.of("Example", "Project");
+ var sumType = Types.sum(namespaceName, "Sum");
+ var variantType1 = Types.struct(namespaceName, "Variant1");
+ var variantType2 = Types.struct(namespaceName, "Variant2");
+ var context = TypeCheckerContext.EMPTY
+ .addSumTypeInfo(sumType, new SumTypeInfo(P.orderedSet(variantType1, variantType2)));
+
+ assertThat(isSubType(variantType1, sumType, context), equalTo(true));
+ assertThat(isSubType(variantType2, sumType, context), equalTo(true));
+ }
+
+ @Test
+ public void variantIsNotSuperTypeOfSumType() {
+ var namespaceName = NamespaceName.of("Example", "Project");
+ var sumType = Types.sum(namespaceName, "Sum");
+ var variantType1 = Types.struct(namespaceName, "Variant1");
+ var variantType2 = Types.struct(namespaceName, "Variant2");
+ var context = TypeCheckerContext.EMPTY
+ .addSumTypeInfo(sumType, new SumTypeInfo(P.orderedSet(variantType1, variantType2)));
+
+ assertThat(isSubType(sumType, variantType1, context), equalTo(false));
+ assertThat(isSubType(sumType, variantType2, context), equalTo(false));
+ }
}