From 36aad08599b78b8ec034f567ee41ec7fa3dc5a02 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 2 Mar 2024 15:24:31 +0000 Subject: Handle effect constraints in function subtyping --- .../shedlang/compiler/typechecker/TypeCheckerSubTyping.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java index 935d1078..89b73f84 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java @@ -353,7 +353,16 @@ public class TypeCheckerSubTyping { } } - if (!isSubEffect(subtypeFunction.effect(), supertypeFunction.effect(), constraints.typeInfos)) { + var effectResult = tryAddSubeffectConstraint( + subtypeFunction.effect(), + supertypeFunction.effect(), + constraints + ); + + if (effectResult.isPresent()) { + // TODO: test assignment + constraints = effectResult.get(); + } else { return Optional.empty(); } -- cgit v1.2.3