From c88aea4655fb8396741dba4fa13a2315e30d14d2 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 3 Jan 2024 22:21:36 +0000 Subject: Add subtyping between sum types --- .../compiler/typechecker/TypeCheckerSubTyping.java | 18 +++++++++++++++++ .../typechecker/TypeCheckerIsSubTypeTests.java | 23 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) (limited to 'src') 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 @@ -195,6 +195,29 @@ public class TypeCheckerIsSubTypeTests { assertThat(isSubType(sumType, variantType2, typeInfos), equalTo(false)); } + @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"); -- cgit v1.2.3