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

Added additional parameter for default methods

Browse Source
This commit is contained in:
Michael Bogdanov
2016-01-20 17:32:47 +03:00
parent 875287574f
commit 829978a37d
18 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
import kotlin.jvm.JvmStatic
open class Base {
fun `foo$default`(i: Int, mask: Int) {}
fun `foo$default`(i: Int, mask: Int, mh: Any) {}
}
object Derived : Base() {
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ package
public open class Base {
public constructor Base()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int): kotlin.Unit
public final fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int, /*2*/ mh: kotlin.Any): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -12,7 +12,7 @@ public object Derived : Base {
private constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmStatic() public final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int, /*2*/ mh: kotlin.Any): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}