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

Replaced sure() invocations with '!!' operator in diagnostic tests.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-09-14 17:22:34 +04:00
parent 6e62212727
commit 5de734c9f3
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.kt
+2 -2
View File
@@ -3,7 +3,7 @@ package kt1189
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T { inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
val rl = readLock().sure() val rl = readLock()!!
var readCount = 0 var readCount = 0
val writeCount = getWriteHoldCount() val writeCount = getWriteHoldCount()
if(writeCount == 0) { if(writeCount == 0) {
@@ -13,7 +13,7 @@ inline fun <T> ReentrantReadWriteLock.write(action: ()->T) : T {
rl.unlock() rl.unlock()
} }
val wl = writeLock().sure() val wl = writeLock()!!
wl.lock() wl.lock()
try { try {
return action() return action()
compiler/testData/diagnostics/tests/extensions/GenericIterator.kt
+1 -1
View File
@@ -14,7 +14,7 @@ fun <T : Any> T?.iterator() = object {
fun next() : T { fun next() : T {
if (hasNext) { if (hasNext) {
hasNext = false hasNext = false
return this@iterator.sure() return this@iterator!!
} }
throw java.util.NoSuchElementException() throw java.util.NoSuchElementException()
} }
compiler/testData/diagnostics/tests/inference/regressions/kt702.kt
+1 -1
View File
@@ -7,7 +7,7 @@ fun getJavaClass<T>() : java.lang.Class<T> { <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_
public class Throwables() { public class Throwables() {
class object { class object {
public fun propagateIfInstanceOf<X : Throwable?>(throwable : Throwable?, declaredType : Class<X?>?) : Unit { public fun propagateIfInstanceOf<X : Throwable?>(throwable : Throwable?, declaredType : Class<X?>?) : Unit {
if (((throwable != null) && declaredType?.isInstance(throwable).sure())) if (((throwable != null) && declaredType?.isInstance(throwable)!!))
{ {
throw declaredType?.cast(throwable)!! throw declaredType?.cast(throwable)!!
} }
compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.kt
+1 -1
View File
@@ -27,5 +27,5 @@ fun test(a : List<Int>, m : Map<String, Int>) {
) )
HashMap<Int, Int>().get(0) HashMap<Int, Int>().get(0)
if (m.get("") != null) if (m.get("") != null)
System.out.println(m.get("").sure().plus(1)) System.out.println(m.get("")!!.plus(1))
} }
compiler/testData/diagnostics/tests/regressions/kt701.kt
+2 -2
View File
@@ -4,9 +4,9 @@ fun getJavaClass<T>() : java.lang.Class<T> { return "" <!CAST_NEVER_SUCCEEDS!>as
public class Throwables() { public class Throwables() {
class object { class object {
public fun propagateIfInstanceOf<X : Throwable?>(throwable : Throwable?, declaredType : Class<X?>?) { public fun propagateIfInstanceOf<X : Throwable?>(throwable : Throwable?, declaredType : Class<X?>?) {
if (((throwable != null) && declaredType?.isInstance(throwable).sure())) if (((throwable != null) && declaredType?.isInstance(throwable)!!))
{ {
throw declaredType?.cast(throwable).sure() throw declaredType?.cast(throwable)!!
} }
} }
public fun propagateIfPossible(throwable : Throwable?) { public fun propagateIfPossible(throwable : Throwable?) {