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

Test data: adjust test data after prohibiting properties with typeparameters not used in receiver

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-10-13 20:28:41 +03:00
parent 3468e83671
commit 47cca7db1f
39 changed files with 109 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/variance/ValProperty.kt
Vendored
+10 -10
View File
@@ -34,15 +34,15 @@ abstract class Test<in I, out O, P> {
abstract val In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>.receiver4: Int
abstract val In<O>.receiver5: Int
val <X : I> typeParameter1 = 8
val <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> typeParameter2 = 13
val <X : P> typeParameter3 = 21
val <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> typeParameter4 = 34
val <X : In<O>> typeParameter5 = 55
val <X : I> X.typeParameter1: Int get() = 0
val <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> X.typeParameter2: Int get() = 0
val <X : P> X.typeParameter3: Int get() = 0
val <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> X.typeParameter4: Int get() = 0
val <X : In<O>> X.typeParameter5: Int get() = 0
val <X> typeParameter6 where X : I = 1
val <X> typeParameter7 where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> = 1
val <X> typeParameter8 where X : P = 2
val <X> typeParameter9 where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> = 3
val <X> typeParameter0 where X : In<O> = 5
val <X> X.typeParameter6: Int where X : I get() = 0
val <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> get() = 0
val <X> X.typeParameter8: Int where X : P get() = 0
val <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> get() = 0
val <X> X.typeParameter0: Int where X : In<O> get() = 0
}
compiler/testData/diagnostics/tests/variance/ValProperty.txt
Vendored
+10 -10
View File
@@ -46,21 +46,21 @@ public abstract class Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
public abstract val type3: P
public abstract val type4: In<I>
public abstract val type5: In<O>
public final val </*0*/ X : In<O>> typeParameter0: kotlin.Int = 5
public final val </*0*/ X : I> typeParameter1: kotlin.Int = 8
public final val </*0*/ X : O> typeParameter2: kotlin.Int = 13
public final val </*0*/ X : P> typeParameter3: kotlin.Int = 21
public final val </*0*/ X : In<I>> typeParameter4: kotlin.Int = 34
public final val </*0*/ X : In<O>> typeParameter5: kotlin.Int = 55
public final val </*0*/ X : I> typeParameter6: kotlin.Int = 1
public final val </*0*/ X : O> typeParameter7: kotlin.Int = 1
public final val </*0*/ X : P> typeParameter8: kotlin.Int = 2
public final val </*0*/ X : In<I>> typeParameter9: kotlin.Int = 3
public abstract val I.receiver1: kotlin.Int
public abstract val O.receiver2: kotlin.Int
public abstract val P.receiver3: kotlin.Int
public abstract val In<I>.receiver4: kotlin.Int
public abstract val In<O>.receiver5: kotlin.Int
public final val </*0*/ X : In<O>> X.typeParameter0: kotlin.Int
public final val </*0*/ X : I> X.typeParameter1: kotlin.Int
public final val </*0*/ X : O> X.typeParameter2: kotlin.Int
public final val </*0*/ X : P> X.typeParameter3: kotlin.Int
public final val </*0*/ X : In<I>> X.typeParameter4: kotlin.Int
public final val </*0*/ X : In<O>> X.typeParameter5: kotlin.Int
public final val </*0*/ X : I> X.typeParameter6: kotlin.Int
public final val </*0*/ X : O> X.typeParameter7: kotlin.Int
public final val </*0*/ X : P> X.typeParameter8: kotlin.Int
public final val </*0*/ X : In<I>> X.typeParameter9: kotlin.Int
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/variance/VarProperty.kt
Vendored
+10 -10
View File
@@ -34,15 +34,15 @@ abstract class Test<in I, out O, P> {
abstract var In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>.receiver4: Int
abstract var In<O>.receiver5: Int
var <X : I> typeParameter1 = 8
var <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> typeParameter2 = 13
var <X : P> typeParameter3 = 21
var <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> typeParameter4 = 34
var <X : In<O>> typeParameter5 = 55
var <X : I> X.typeParameter1: Int get() = 0; set(i) {}
var <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> X.typeParameter2: Int get() = 0; set(i) {}
var <X : P> X.typeParameter3: Int get() = 0; set(i) {}
var <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> X.typeParameter4: Int get() = 0; set(i) {}
var <X : In<O>> X.typeParameter5: Int get() = 0; set(i) {}
var <X> typeParameter6 where X : I = 1
var <X> typeParameter7 where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> = 1
var <X> typeParameter8 where X : P = 2
var <X> typeParameter9 where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> = 3
var <X> typeParameter0 where X : In<O> = 5
var <X> X.typeParameter6: Int where X : I get() = 0; set(i) {}
var <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> get() = 0; set(i) {}
var <X> X.typeParameter8: Int where X : P get() = 0; set(i) {}
var <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> get() = 0; set(i) {}
var <X> X.typeParameter0: Int where X : In<O> get() = 0; set(i) {}
}
compiler/testData/diagnostics/tests/variance/VarProperty.txt
Vendored
+10 -10
View File
@@ -46,21 +46,21 @@ public abstract class Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
public abstract var type3: P
public abstract var type4: In<I>
public abstract var type5: In<O>
public final var </*0*/ X : In<O>> typeParameter0: kotlin.Int
public final var </*0*/ X : I> typeParameter1: kotlin.Int
public final var </*0*/ X : O> typeParameter2: kotlin.Int
public final var </*0*/ X : P> typeParameter3: kotlin.Int
public final var </*0*/ X : In<I>> typeParameter4: kotlin.Int
public final var </*0*/ X : In<O>> typeParameter5: kotlin.Int
public final var </*0*/ X : I> typeParameter6: kotlin.Int
public final var </*0*/ X : O> typeParameter7: kotlin.Int
public final var </*0*/ X : P> typeParameter8: kotlin.Int
public final var </*0*/ X : In<I>> typeParameter9: kotlin.Int
public abstract var I.receiver1: kotlin.Int
public abstract var O.receiver2: kotlin.Int
public abstract var P.receiver3: kotlin.Int
public abstract var In<I>.receiver4: kotlin.Int
public abstract var In<O>.receiver5: kotlin.Int
public final var </*0*/ X : In<O>> X.typeParameter0: kotlin.Int
public final var </*0*/ X : I> X.typeParameter1: kotlin.Int
public final var </*0*/ X : O> X.typeParameter2: kotlin.Int
public final var </*0*/ X : P> X.typeParameter3: kotlin.Int
public final var </*0*/ X : In<I>> X.typeParameter4: kotlin.Int
public final var </*0*/ X : In<O>> X.typeParameter5: kotlin.Int
public final var </*0*/ X : I> X.typeParameter6: kotlin.Int
public final var </*0*/ X : O> X.typeParameter7: kotlin.Int
public final var </*0*/ X : P> X.typeParameter8: kotlin.Int
public final var </*0*/ X : In<I>> X.typeParameter9: kotlin.Int
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