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/scopes/VisibilityInheritModifier.txt
+4 -4
View File
@@ -108,21 +108,21 @@ package b {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait P : b.R {
internal interface P : b.R {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait Q : b.R {
internal interface Q : b.R {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
protected open override /*1*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait R {
internal interface R {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
protected open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -137,7 +137,7 @@ package b {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/scopes/kt1248.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
package kt1248 {
internal trait ParseResult</*0*/ out T> {
internal interface ParseResult</*0*/ out T> {
public abstract val success: kotlin.Boolean
public abstract val value: T
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/scopes/kt151.txt
+1 -1
View File
@@ -59,7 +59,7 @@ package kt151 {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
protected open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/scopes/kt1579.txt
+2 -2
View File
@@ -2,12 +2,12 @@ package
package lib {
internal trait WithInner {
internal interface WithInner {
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
internal trait Inner {
internal interface Inner {
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
compiler/testData/diagnostics/tests/scopes/kt1580.txt
+2 -2
View File
@@ -2,12 +2,12 @@ package
package lib {
internal trait WithInner {
internal interface WithInner {
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
internal trait Inner {
internal interface Inner {
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
compiler/testData/diagnostics/tests/scopes/kt1822.txt
+3 -3
View File
@@ -10,7 +10,7 @@ package kt1822 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait B {
internal interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
protected open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -25,7 +25,7 @@ package kt1822 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait D {
internal interface D {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -48,7 +48,7 @@ package kt1822 {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
internal trait T {
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
protected open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.txt
+1 -1
View File
@@ -4,7 +4,7 @@ package c {
internal fun test(/*0*/ a: kotlin.Any?): kotlin.Unit
internal fun kotlin.Any?.bar(): kotlin.Unit
internal trait B {
internal interface B {
internal open fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/scopes/visibility.txt
+2 -2
View File
@@ -86,13 +86,13 @@ package test_visibility {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
protected trait ProtectedTrait {
protected interface ProtectedTrait {
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
}
internal trait T {
internal interface 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String