aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2024-01-03 22:21:36 +0000
committerMichael Williamson <mike@zwobble.org>2024-01-03 22:22:04 +0000
commitc88aea4655fb8396741dba4fa13a2315e30d14d2 (patch)
treecae214b5fe5d5d91bd6f91b6781b77577f899a48 /src
parent98f33d0f843c88c404b525134986393a1b1569cb (diff)
Add subtyping between sum types
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java18
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java23
2 files changed, 41 insertions, 0 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
index 4ee16c4d..4f1a283e 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
@@ -120,6 +120,24 @@ public class TypeCheckerSubTyping {
return Optional.of(constraints);
}
+ if (subtype instanceof SumType subtypeSum) {
+ var subtypeInfo = constraints.typeInfos
+ .sumTypeInfo(subtypeSum)
+ .orElseThrow();
+
+ for (var subtypeVariant : subtypeInfo.variants()) {
+ var result = tryAddSubtypeConstraint(subtypeVariant, supertype, constraints);
+ if (result.isPresent()) {
+ // TODO: test assignment
+ constraints = result.get();
+ } else {
+ return result;
+ }
+ }
+
+ return Optional.of(constraints);
+ }
+
if (supertype instanceof SumType supertypeSum) {
var superTypeInfo = constraints.typeInfos.sumTypeInfo(supertypeSum).orElseThrow();
return tryAddVariantSubtypeConstraint(subtype, superTypeInfo, constraints);
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
index 580be580..d758cd96 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
@@ -196,6 +196,29 @@ public class TypeCheckerIsSubTypeTests {
}
@Test
+ public void sumTypeIsSubtypeOfOtherSumtypeIfVariantsAreSubsetOfOtherVariants() {
+ var namespaceName = NamespaceName.of("Example", "Project");
+ var sumType1 = Types.sum(namespaceName, "Sum1");
+ var sumType2 = Types.sum(namespaceName, "Sum2");
+ var variantType1 = Types.struct(namespaceName, "Variant1");
+ var variantType2 = Types.struct(namespaceName, "Variant2");
+ var variantType3 = Types.struct(namespaceName, "Variant3");
+ var typeInfos = TypeInfos.EMPTY
+ .addSumTypeInfo(sumType1, new SumTypeInfo(P.orderedSet(
+ variantType1,
+ variantType2
+ )))
+ .addSumTypeInfo(sumType2, new SumTypeInfo(P.orderedSet(
+ variantType1,
+ variantType2,
+ variantType3
+ )));
+
+ assertThat(isSubType(sumType1, sumType2, typeInfos), equalTo(true));
+ assertThat(isSubType(sumType2, sumType1, typeInfos), equalTo(false));
+ }
+
+ @Test
public void variantWithoutTypeLevelArgIsSubTypeOfConstructedSumType() {
var namespaceName = NamespaceName.of("Example", "Project");
var sumType = Types.sum(namespaceName, "Sum");