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/multimodule/duplicateMethod/classGenericsInParams.txt
+6 -6
View File
@@ -3,7 +3,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -17,11 +17,11 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m1> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(/*0*/ a: X): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -35,7 +35,7 @@ package
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ a: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -51,11 +51,11 @@ internal fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
package p {
public trait B</*0*/ T> {
public interface B</*0*/ T> {
// -- Module: <m3> --
}
public trait C</*0*/ X> : p.B<X> {
public interface C</*0*/ X> : p.B<X> {
// -- Module: <m2> --
}
}