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

Allow to import members from object by name

Browse Source 
Wrap object members so they do not require dispatch receiver
Hack jvm backend to make it work
This commit is contained in:
Pavel V. Talanov
2015-10-02 16:01:09 +03:00
parent 507293e1ff
commit 37d5c4b223
22 changed files with 713 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/imports/ImportFromObject.txt
Vendored
+68 -1
View File
@@ -2,6 +2,39 @@ package
package a {
public open class Base {
public constructor Base()
public final val p: kotlin.Int = 1
public final val kotlin.Int.ext: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun f(): kotlin.Unit
public final fun </*0*/ T> g(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface BaseI</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun fromI(): kotlin.Int
public open fun genericFromI(/*0*/ t: T): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public object K : a.Base, a.BaseI<kotlin.Int> {
private constructor K()
public final val own: kotlin.String = ""
public final override /*1*/ /*fake_override*/ val p: kotlin.Int
public final override /*1*/ /*fake_override*/ val kotlin.Int.ext: kotlin.Int
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun fromI(): kotlin.Int
public final override /*1*/ /*fake_override*/ fun </*0*/ T> g(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun genericFromI(/*0*/ t: kotlin.Int): kotlin.Int
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
public object O {
private constructor O()
public final fun bar(): kotlin.Unit
@@ -23,8 +56,42 @@ package a {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
public object S {
private constructor S()
public final val prop: kotlin.String = ""
public final var kotlin.String.ext: kotlin.Int
public final fun A(/*0*/ c: kotlin.Int): a.S.A
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun </*0*/ T> genericFun(/*0*/ t: T, /*1*/ t2: T): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final fun o(/*0*/ i: kotlin.Int): kotlin.Unit
public final fun o(/*0*/ s: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final fun kotlin.Int.ext(): kotlin.Unit
public final class A {
public 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
}
}
}
package b {
public fun test(): kotlin.Unit
public fun testErroneusAllUnderImportFromObject(): kotlin.Unit
}
package c {
public fun </*0*/ T> t(/*0*/ t: T): T
public fun testImportFromObjectByName(): kotlin.Unit
}
package d {
public fun testFunImportedFromObjectHasNoDispatchReceiver(/*0*/ l: a.S): kotlin.Unit
}
package e {
public fun testMembersFromSupertypes(): kotlin.Unit
}