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

Type<*> is inferred now if Type<A> and Type<B> common supertype is Type<X> and X is not within parameter upper bound. #KT-7585 Fixed. #EA-68943 Fixed.

Browse Source 
It provides also a fix for KT-7585 (empty type intersection assertion).
A set of relevant tests, one fixed test
This commit is contained in:
Mikhail Glukhikh
2015-04-27 11:27:57 +03:00
parent c90bcb41f3
commit 754f8af3fc
12 changed files with 418 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/regressions/kt7585/java.txt
Vendored
+53
View File
@@ -0,0 +1,53 @@
package
internal fun foo(): kotlin.String
public/*package*/ open class A {
public/*package*/ constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class E {
public constructor E()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class MyWrapper : Wrapper<A> {
public constructor MyWrapper(/*0*/ a: A)
protected/*protected and package*/ final override /*1*/ /*fake_override*/ var t: A!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
kotlin.data() internal final class Pair</*0*/ out T> {
public constructor Pair</*0*/ out T>(/*0*/ a: T, /*1*/ b: T)
internal final val a: T
internal final val b: T
internal final /*synthesized*/ fun component1(): T
internal final /*synthesized*/ fun component2(): T
public final /*synthesized*/ fun copy(/*0*/ a: T = ..., /*1*/ b: T = ...): Pair<T>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class TheirWrapper : Wrapper<E> {
public constructor TheirWrapper(/*0*/ e: E)
protected/*protected and package*/ final override /*1*/ /*fake_override*/ var t: E!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public/*package*/ abstract class Wrapper</*0*/ T : A!> {
public/*package*/ constructor Wrapper</*0*/ T : A!>(/*0*/ t: T!)
protected/*protected and package*/ final var t: T!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}