azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incorrect comparison to default bound fixed

Browse Source
This commit is contained in:
Andrey Breslav
2012-10-17 12:21:10 +04:00
parent 3121f1ad5c
commit ee5b50cb1b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+1 -1
View File
@@ -599,7 +599,7 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
renderName(descriptor, builder);
if (descriptor.getUpperBounds().size() == 1) {
JetType upperBound = descriptor.getUpperBounds().iterator().next();
if (upperBound != KotlinBuiltIns.getInstance().getDefaultBound()) {
if (!KotlinBuiltIns.getInstance().getDefaultBound().equals(upperBound)) {
builder.append(" : ").append(renderType(upperBound));
}
}
compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java
+2 -2
View File
@@ -43,12 +43,12 @@ public class BoundsSubstitutorTest extends KotlinTestWithEnvironment {
public void testSimpleSubstitution() throws Exception {
doTest("fun <T> f(l: List<T>): T",
"fun <T : jet.Any?> f(l : jet.List<jet.Any?>) : jet.Any?");
"fun <T> f(l : jet.List<jet.Any?>) : jet.Any?");
}
public void testParameterInBound() throws Exception {
doTest("fun <T, R : List<T>> f(l: List<R>): R",
"fun <T : jet.Any?, R : jet.List<jet.Any?>> f(l : jet.List<jet.List<jet.Any?>>) : jet.List<jet.Any?>");
"fun <T, R : jet.List<jet.Any?>> f(l : jet.List<jet.List<jet.Any?>>) : jet.List<jet.Any?>");
}
public void testWithWhere() throws Exception {