Dmitriy Novozhilov
c80cfb0fdb
This big refactoring is needed to cleanup building of overrides
mappings and prevent creating redundant intersection overrides in
cases when there is no need in them:
```kotlin
interface A {
fun foo()
}
interface B {
fun foo()
}
interface C : A, B {
override fun foo()
}
```
Before this refactoring there was next override tree:
C.foo
intersection override (A.foo, B.foo)
A.foo
B.foo
Also this commit fixes special mapping of overrides in jvm scopes
for declarations which have kotlin builtins in supertypes with
special java mapping rules (collections, for example)
29 lines
670 B
Kotlin
Vendored
29 lines
670 B
Kotlin
Vendored
// SCOPE_DUMP: Some:toByte;byteValue MyNumber:toByte;byteValue
|
|
// -SCOPE_DUMP: Some:toInt;intValue;toByte;byteValue;toLong;longValue
|
|
|
|
// FILE: MyBaseNumber.java
|
|
public interface MyBaseNumber {
|
|
byte byteValue(); // (1)
|
|
}
|
|
|
|
// FILE: MyNumber.java
|
|
public interface MyNumber extends MyBaseNumber {
|
|
@Override
|
|
byte byteValue(); // (2)
|
|
}
|
|
|
|
// FILE: Some.java
|
|
public abstract class Some extends Number implements MyNumber {
|
|
@Override
|
|
public abstract byte byteValue() // (3)
|
|
}
|
|
|
|
/*
|
|
* Some.toByte() (3', renamed) overrides Number.toByte & MyNumber.toByte(2', renamed)
|
|
* MyNumber.toByte(2', renamed) overrides ???
|
|
*/
|
|
|
|
fun test(some: Some) {
|
|
some.toByte()
|
|
}
|