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

Minor. trait -> interface in testData

Browse Source
This commit is contained in:
Denis Zharkov
2015-06-17 17:38:47 +03:00
parent d4e5479f0f
commit 1b44f77054
13 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/j+k/types/arrayList.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// FILE: k.kt // FILE: k.kt
trait ML<T> { interface ML<T> {
public fun foo(): MutableList<T> public fun foo(): MutableList<T>
} }
compiler/testData/diagnostics/tests/j+k/types/arrayList.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ internal final class K : J<kotlin.String>, ML<kotlin.String> {
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
} }
internal trait ML</*0*/ T> { internal interface ML</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(): kotlin.MutableList<T> public abstract fun foo(): kotlin.MutableList<T>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/j+k/types/returnCollection.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// FILE: k.kt // FILE: k.kt
trait K { interface K {
fun foo(): List<String> fun foo(): List<String>
} }
compiler/testData/diagnostics/tests/j+k/types/returnCollection.txt
Vendored
+2 -2
View File
@@ -2,14 +2,14 @@ package
public/*package*/ /*synthesized*/ fun J(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): J public/*package*/ /*synthesized*/ fun J(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): J
public/*package*/ trait J : K { public/*package*/ interface J : K {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String> public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
internal trait K { internal interface K {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): kotlin.List<kotlin.String> internal abstract fun foo(): kotlin.List<kotlin.String>
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPosition.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
// FILE: k.kt // FILE: k.kt
trait G<T> interface G<T>
trait SubG : G<String> interface SubG : G<String>
trait K { interface K {
fun foo(): G<String> fun foo(): G<String>
fun bar(): G<String>? fun bar(): G<String>?
} }
compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPosition.txt
Vendored
+4 -4
View File
@@ -1,12 +1,12 @@
package package
internal trait G</*0*/ T> { internal interface G</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public/*package*/ trait J : K { public/*package*/ interface J : K {
public abstract override /*1*/ fun bar(): SubG? public abstract override /*1*/ fun bar(): SubG?
public abstract fun baz(): SubG! public abstract fun baz(): SubG!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ public/*package*/ trait J : K {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
internal trait K { internal interface K {
internal abstract fun bar(): G<kotlin.String>? internal abstract fun bar(): G<kotlin.String>?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): G<kotlin.String> internal abstract fun foo(): G<kotlin.String>
@@ -23,7 +23,7 @@ internal trait K {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
internal trait SubG : G<kotlin.String> { internal interface SubG : G<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPositionGeneric.kt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
// FILE: k.kt // FILE: k.kt
trait G<T> interface G<T>
trait SubG<A, B> : G<String> interface SubG<A, B> : G<String>
trait K<KT> { interface K<KT> {
fun foo(): G<KT> fun foo(): G<KT>
fun bar(): G<KT>? fun bar(): G<KT>?
} }
compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPositionGeneric.txt
Vendored
+4 -4
View File
@@ -1,12 +1,12 @@
package package
internal trait G</*0*/ T> { internal interface G</*0*/ T> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
public/*package*/ trait J : K<kotlin.String!> { public/*package*/ interface J : K<kotlin.String!> {
public abstract override /*1*/ fun bar(): SubG<kotlin.String!, G<kotlin.String!>!>? public abstract override /*1*/ fun bar(): SubG<kotlin.String!, G<kotlin.String!>!>?
public abstract fun baz(): SubG<kotlin.String!, G<kotlin.String!>!>! public abstract fun baz(): SubG<kotlin.String!, G<kotlin.String!>!>!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -15,7 +15,7 @@ public/*package*/ trait J : K<kotlin.String!> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
internal trait K</*0*/ KT> { internal interface K</*0*/ KT> {
internal abstract fun bar(): G<KT>? internal abstract fun bar(): G<KT>?
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): G<KT> internal abstract fun foo(): G<KT>
@@ -23,7 +23,7 @@ internal trait K</*0*/ KT> {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
internal trait SubG</*0*/ A, /*1*/ B> : G<kotlin.String> { internal interface SubG</*0*/ A, /*1*/ B> : G<kotlin.String> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/j+k/types/typeParameter.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// FILE: k.kt // FILE: k.kt
trait K { interface K {
fun <T> foo(t: T) fun <T> foo(t: T)
} }
compiler/testData/diagnostics/tests/j+k/types/typeParameter.txt
Vendored
+2 -2
View File
@@ -1,13 +1,13 @@
package package
public/*package*/ trait J : K { public/*package*/ interface J : K {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ t: T): kotlin.Unit public abstract override /*1*/ fun </*0*/ T> foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
} }
internal trait K { internal interface K {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun </*0*/ T> foo(/*0*/ t: T): kotlin.Unit internal abstract fun </*0*/ T> foo(/*0*/ t: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.txt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ public open class J {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public trait DP { public interface DP {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun get(/*0*/ a: kotlin.Any!, /*1*/ b: kotlin.Any!): kotlin.String! public abstract fun get(/*0*/ a: kotlin.Any!, /*1*/ b: kotlin.Any!): kotlin.String!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public open class J {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public trait Invoke { public interface Invoke {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean 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 hashCode(): kotlin.Int
public abstract fun invoke(): kotlin.Unit public abstract fun invoke(): kotlin.Unit
compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public open class J {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public trait Multi { public interface Multi {
public abstract fun component1(): kotlin.String! public abstract fun component1(): kotlin.String!
public abstract fun component2(): kotlin.String! public abstract fun component2(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean