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

compiler testdata: s/trait/interface

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-12 12:38:49 +02:00
parent a5ed5d4269
commit 4bdf598bfe
803 changed files with 1456 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/variance/Class.kt
+13 -13
View File
@@ -1,18 +1,18 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
interface In<in T>
interface Out<out T>
interface Inv<T>
trait TypeBounds1<in I, out O, P, X : <!TYPE_VARIANCE_CONFLICT(I; in; out; I)!>I<!>>
trait TypeBounds2<in I, out O, P, X : O>
trait TypeBounds3<in I, out O, P, X : P>
trait TypeBounds4<in I, out O, P, X : In<I>>
trait TypeBounds5<in I, out O, P, X : In<<!TYPE_VARIANCE_CONFLICT(O; out; in; In<O>)!>O<!>>>
interface TypeBounds1<in I, out O, P, X : <!TYPE_VARIANCE_CONFLICT(I; in; out; I)!>I<!>>
interface TypeBounds2<in I, out O, P, X : O>
interface TypeBounds3<in I, out O, P, X : P>
interface TypeBounds4<in I, out O, P, X : In<I>>
interface TypeBounds5<in I, out O, P, X : In<<!TYPE_VARIANCE_CONFLICT(O; out; in; In<O>)!>O<!>>>
trait WhereTypeBounds1<in I, out O, P, X> where X : <!TYPE_VARIANCE_CONFLICT(I; in; out; I)!>I<!>
trait WhereTypeBounds2<in I, out O, P, X> where X : O
trait WhereTypeBounds3<in I, out O, P, X> where X : P
trait WhereTypeBounds4<in I, out O, P, X> where X : In<I>
trait WhereTypeBounds5<in I, out O, P, X> where X : In<<!TYPE_VARIANCE_CONFLICT(O; out; in; In<O>)!>O<!>>
interface WhereTypeBounds1<in I, out O, P, X> where X : <!TYPE_VARIANCE_CONFLICT(I; in; out; I)!>I<!>
interface WhereTypeBounds2<in I, out O, P, X> where X : O
interface WhereTypeBounds3<in I, out O, P, X> where X : P
interface WhereTypeBounds4<in I, out O, P, X> where X : In<I>
interface WhereTypeBounds5<in I, out O, P, X> where X : In<<!TYPE_VARIANCE_CONFLICT(O; out; in; In<O>)!>O<!>>
class SubClass1<in I, out O, P> : Out<<!TYPE_VARIANCE_CONFLICT(I; in; out; Out<I>)!>I<!>>
class SubClass2<in I, out O, P> : Out<O>
compiler/testData/diagnostics/tests/variance/Function.kt
+4 -4
View File
@@ -1,9 +1,9 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
interface In<in T>
interface Out<out T>
interface Inv<T>
fun <T> getT(): T = null!!
trait Test<in I, out O, P> {
interface Test<in I, out O, P> {
fun parameters1(i: I, o: <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>, p: P)
fun parameters2(i: In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>)
fun parameters3(i: In<O>)
compiler/testData/diagnostics/tests/variance/FunctionTypes.kt
+2 -2
View File
@@ -1,7 +1,7 @@
trait In<in T>
interface In<in T>
fun <T> getT(): T = null!!
trait Test<in I, out O, P> {
interface Test<in I, out O, P> {
fun ok1(i: (O) -> I) : (I) -> O
fun ok2(i: (P) -> P) : (P) -> P
fun ok3(i: (In<I>) -> In<O>) = getT<(In<O>) -> In<I>>()
compiler/testData/diagnostics/tests/variance/InPosition.kt
+5 -5
View File
@@ -1,9 +1,9 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
trait Pair<out X, out Y>
interface In<in T>
interface Out<out T>
interface Inv<T>
interface Pair<out X, out Y>
trait Test<in I, out O, P> {
interface Test<in I, out O, P> {
fun ok1(i: I)
fun ok2(i: In<O>)
fun ok3(i: In<In<I>>)
compiler/testData/diagnostics/tests/variance/InvariantPosition.kt
+5 -5
View File
@@ -1,9 +1,9 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
trait Pair<out X, out Y>
interface In<in T>
interface Out<out T>
interface Inv<T>
interface Pair<out X, out Y>
trait Test<in I, out O, P> {
interface Test<in I, out O, P> {
var ok1: Inv<P>
var ok2: P
var ok3: Out<In<P>>
compiler/testData/diagnostics/tests/variance/NullableTypes.kt
+4 -4
View File
@@ -1,10 +1,10 @@
trait In<in I>
trait Out<out O>
trait Inv<P>
interface In<in I>
interface Out<out O>
interface Inv<P>
fun <T> getT(): T = null!!
trait Test<in I : Any, out O : Any, P : Any> {
interface Test<in I : Any, out O : Any, P : Any> {
fun ok1(i: I?) : O?
fun ok2(i: In<O?>?) : Out<O?>?
fun ok3(i: Inv<in O?>) = getT<Inv<in I?>>()
compiler/testData/diagnostics/tests/variance/OutPosition.kt
+5 -5
View File
@@ -1,9 +1,9 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
trait Pair<out X, out Y>
interface In<in T>
interface Out<out T>
interface Inv<T>
interface Pair<out X, out Y>
trait Test<in I, out O, P> {
interface Test<in I, out O, P> {
fun ok1(): O
fun ok2(): In<I>
fun ok3(): In<In<O>>
compiler/testData/diagnostics/tests/variance/PrimaryConstructor.kt
+3 -3
View File
@@ -1,6 +1,6 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
interface In<in T>
interface Out<out T>
interface Inv<T>
fun <T> getT(): T = null!!
compiler/testData/diagnostics/tests/variance/ValProperty.kt
+3 -3
View File
@@ -1,6 +1,6 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
interface In<in T>
interface Out<out T>
interface Inv<T>
class Delegate<T> {
fun get(t: Any, p: PropertyMetadata): T = null!!
compiler/testData/diagnostics/tests/variance/VarProperty.kt
+3 -3
View File
@@ -1,6 +1,6 @@
trait In<in T>
trait Out<out T>
trait Inv<T>
interface In<in T>
interface Out<out T>
interface Inv<T>
class Delegate<T> {
fun get(t: Any, p: PropertyMetadata): T = null!!
compiler/testData/diagnostics/tests/variance/Visibility.kt
+1 -1
View File
@@ -1,4 +1,4 @@
trait Test<in I, out O> {
interface Test<in I, out O> {
val internal_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
public val public_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
protected val protected_val: <!TYPE_VARIANCE_CONFLICT!>I<!>
compiler/testData/diagnostics/tests/variance/privateToThis/Trait.kt
+1 -1
View File
@@ -1,4 +1,4 @@
internal trait Test</*0*/ in I> {
internal interface Test</*0*/ in I> {
private/*private to this*/ final fun foo(): I {
throw Exception()
}