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

Fix deprecated ranges and range member usages in tests.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-19 16:43:14 +03:00
parent 5ebb3d20e8
commit 5f675c55ed
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/QualifiedExpressions.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ fun test(s: IntRange?) {
val <!UNUSED_VARIABLE!>c<!>: Int = s?.start ?: -11
val <!UNUSED_VARIABLE!>d<!>: Int = s?.start ?: <!TYPE_MISMATCH!>"empty"<!>
val e: String = <!TYPE_MISMATCH!>s?.start<!> ?: "empty"
val <!UNUSED_VARIABLE!>f<!>: Int = s?.end ?: b ?: 1
val <!UNUSED_VARIABLE!>f<!>: Int = s?.endInclusive ?: b ?: 1
val <!UNUSED_VARIABLE!>g<!>: Boolean? = e.startsWith("s")//?.length
}
compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt
Vendored
+1 -1
View File
@@ -9,6 +9,6 @@ fun test(a1: A, a2: A) {
}
public operator fun <T: Comparable<T>> T.rangeTo(<!UNUSED_PARAMETER!>that<!>: T): Range<T> {
public operator fun <T: Comparable<T>> T.rangeTo(<!UNUSED_PARAMETER!>that<!>: T): ClosedRange<T> {
throw UnsupportedOperationException()
}
compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
package a {
public fun test(/*0*/ a1: a.A, /*1*/ a2: a.A): kotlin.Unit
public operator fun </*0*/ T : kotlin.Comparable<T>> T.rangeTo(/*0*/ that: T): kotlin.Range<T>
public operator fun </*0*/ T : kotlin.Comparable<T>> T.rangeTo(/*0*/ that: T): kotlin.ClosedRange<T>
public final class A {
public constructor A()
compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.kt
Vendored
+3 -3
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -RECURSION_IN_INLINE
inline operator fun <T, U> Function1<T, U>.rangeTo(p: Function1<T, U>): Range<Int> {
inline operator fun <T, U> Function1<T, U>.rangeTo(p: Function1<T, U>): ClosedRange<Int> {
this..p
p..this
return 1..2
@@ -12,11 +12,11 @@ inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U) {
}
operator fun <T, U, V> Function2<T, U, V>.rangeTo(p: Function2<T, U, V>): Range<Int> {
operator fun <T, U, V> Function2<T, U, V>.rangeTo(p: Function2<T, U, V>): ClosedRange<Int> {
return 1..2
}
operator fun <T, U, V, W> @Extension Function3<T, U, V, W>.rangeTo(ext: @Extension Function3<T, U, V, W>): Range<Int> {
operator fun <T, U, V, W> @Extension Function3<T, U, V, W>.rangeTo(ext: @Extension Function3<T, U, V, W>): ClosedRange<Int> {
return 1..2
}
compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
Vendored
+3 -3
View File
@@ -2,6 +2,6 @@ package
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (T, U) -> U, /*1*/ ext: T.(U, U) -> V): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.Range<kotlin.Int>
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).rangeTo(/*0*/ p: (T, U) -> V): kotlin.Range<kotlin.Int>
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).rangeTo(/*0*/ ext: T.(U, V) -> W): kotlin.Range<kotlin.Int>
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ClosedRange<kotlin.Int>
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).rangeTo(/*0*/ p: (T, U) -> V): kotlin.ClosedRange<kotlin.Int>
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).rangeTo(/*0*/ ext: T.(U, V) -> W): kotlin.ClosedRange<kotlin.Int>
idea/testData/checker/QualifiedExpressions.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ fun test(s: IntRange?) {
val <warning>c</warning>: Int = s?.start ?: -11
val <warning>d</warning>: Int = s?.start ?: <error>"empty"</error>
val e: String = <error>s?.start</error> ?: "empty"
val <warning>f</warning>: Int = s?.end ?: b ?: 1
val <warning>f</warning>: Int = s?.endInclusive ?: b ?: 1
val <warning>g</warning>: Boolean? = e.startsWith("s")//?.length
}