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

Choose first non-flexible when selecting most specific

Browse Source
This commit is contained in:
Denis Zharkov
2015-12-11 14:48:45 +03:00
parent 02311538d6
commit 8d0c3281cd
21 changed files with 126 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ public interface D {
public interface E : C, D {
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ b: kotlin.Int): kotlin.Unit
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ a: kotlin.Int): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public/*package*/ /*synthesized*/ fun JavaInterface(/*0*/ function: (kotlin.Int)
public final class BothTraitsSubclass : JavaInterface, KotlinTrait {
public constructor BothTraitsSubclass()
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun foo(/*0*/ someOtherName: kotlin.Int): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun foo(/*0*/ javaName: kotlin.Int): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}