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

replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-11 19:37:38 +02:00
parent 25959fefdc
commit 9975bb8935
704 changed files with 1684 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/substitutions/starProjections.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package
internal fun testA(/*0*/ a: A<*, *>): kotlin.Unit
internal fun testB(/*0*/ b: B<*, *>): kotlin.Unit
internal trait A</*0*/ R, /*1*/ T : A<R, T>> {
internal interface A</*0*/ R, /*1*/ T : A<R, 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
internal abstract fun r(): R
@@ -11,7 +11,7 @@ internal trait A</*0*/ R, /*1*/ T : A<R, T>> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait B</*0*/ R, /*1*/ T : B<kotlin.List<R>, T>> {
internal interface B</*0*/ R, /*1*/ T : B<kotlin.List<R>, 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
internal abstract fun r(): R