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

Fix variance in Progression and Range

Browse Source
This commit is contained in:
Alexander Udalov
2014-01-28 20:20:04 +04:00
parent 4a0bfa5434
commit 1538191c66
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/builtin-classes.txt
+2 -2
View File
@@ -1567,7 +1567,7 @@ public abstract class Number : jet.Hashable {
public abstract fun toShort(): jet.Short public abstract fun toShort(): jet.Short
} }
public trait Progression</*0*/ N : jet.Any> : jet.Iterable<N> { public trait Progression</*0*/ out N : jet.Any> : jet.Iterable<N> {
public abstract val end: N public abstract val end: N
public abstract fun <get-end>(): N public abstract fun <get-end>(): N
public abstract val increment: jet.Number public abstract val increment: jet.Number
@@ -1588,7 +1588,7 @@ public final class PropertyMetadataImpl : jet.PropertyMetadata {
public open override /*1*/ fun <get-name>(): jet.String public open override /*1*/ fun <get-name>(): jet.String
} }
public trait Range</*0*/ in T : jet.Comparable<T>> { public trait Range</*0*/ T : jet.Comparable<T>> {
public abstract val end: T public abstract val end: T
public abstract fun <get-end>(): T public abstract fun <get-end>(): T
public abstract val start: T public abstract val start: T
core/builtins/src/jet/Progression.kt
+1 -1
View File
@@ -16,7 +16,7 @@
package jet package jet
public trait Progression<N : Any> : Iterable<N> { public trait Progression<out N : Any> : Iterable<N> {
public val start: N public val start: N
public val end: N public val end: N
core/builtins/src/jet/Range.kt
+1 -1
View File
@@ -16,7 +16,7 @@
package jet package jet
public trait Range<in T : Comparable<T>> { public trait Range<T : Comparable<T>> {
public val start: T public val start: T
public val end: T public val end: T