diff options
| author | Michael Williamson <mike@zwobble.org> | 2024-01-05 23:46:58 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2024-01-05 23:46:58 +0000 |
| commit | 87a79dc241771b8b1ab72f27ecd2bcb63c9e8eb8 (patch) | |
| tree | 0faabce5781e028ee21463d132abd9d6b11e1ae9 /src | |
| parent | 87a5266dc5224abe7d2755f6b5072898ce18aeb2 (diff) | |
Use upper bound in the absence of lower bounds
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java | 6 | ||||
| -rw-r--r-- | src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java index 75b49f39..cacb1c78 100644 --- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java +++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java @@ -95,7 +95,11 @@ public class TypeCheckerSubTyping { throw new IllegalStateException("Incompatible type bounds"); } - return Map.entry(typeParam, lowerBound); + var inferredType = typeParamBounds.lower.isEmpty() && !typeParamBounds.upper.isEmpty() + ? upperBound + : lowerBound; + + return Map.entry(typeParam, inferredType); }) .collect(Collectors.toMap(x -> x.getKey(), x -> x.getValue())); diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java index 7edff026..8f6af248 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java @@ -576,7 +576,7 @@ public class TypeCheckerIsSubTypeTests { // == Constraint solving == @Test - public void whenTypeParamHasUpperBoundThenTypeParamIsResolvedToBottom() { + public void whenTypeParamHasUpperBoundThenTypeParamIsResolvedToUpperBound() { var typeParam = TypeParam.forStructType( Types.struct(NamespaceName.of("Example"), "Struct"), "T" @@ -587,7 +587,7 @@ public class TypeCheckerIsSubTypeTests { var result = constraints.solve(Sources.NULL); assertThat(result, equalTo(TypeSubstitutionMap.of( - Map.entry(typeParam, Types.BOTTOM) + Map.entry(typeParam, Types.INT) ))); } |
