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

Adjust testData to new labels syntax

Browse Source
This commit is contained in:
Denis Zharkov
2015-04-27 14:39:46 +03:00
parent 5977302465
commit 44a55e5bf6
191 changed files with 747 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt
+1 -1
View File
@@ -9,7 +9,7 @@ fun foo<T>(<!UNUSED_PARAMETER!>a<!>: A, f: () -> T): T = f()
fun foo<T>(<!UNUSED_PARAMETER!>b<!>: B, f: () -> T): T = f()
fun test(c: C) {
<!CANNOT_COMPLETE_RESOLVE!>foo<!>(c) @f {
<!CANNOT_COMPLETE_RESOLVE!>foo<!>(c) f@ {
c<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
}
}
compiler/testData/diagnostics/tests/functionLiterals/return/IfInReturnedExpression.kt
+1 -1
View File
@@ -1,5 +1,5 @@
val flag = true
val a/*: () -> Comparable<out Any?>*/ = @l {
val a/*: () -> Comparable<out Any?>*/ = l@ {
return@l if (flag) "OK" else 4
}
compiler/testData/diagnostics/tests/functionLiterals/return/IfWithoutElse.kt
+3 -3
View File
@@ -1,15 +1,15 @@
val flag = true
// type of a was checked by txt
val a/*: () -> Any*/ = @l { // commonSupertype(Int, Unit) = Any
val a/*: () -> Any*/ = l@ { // commonSupertype(Int, Unit) = Any
if (flag) return@l 4
}
val b/*: () -> Int */ = @l {
val b/*: () -> Int */ = l@ {
if (flag) return@l 4
5
}
val c/*: () -> Unit */ = @l {
val c/*: () -> Unit */ = l@ {
if (flag) <!UNUSED_EXPRESSION!>4<!>
}
compiler/testData/diagnostics/tests/functionLiterals/return/IfWithoutElseWithExplicitType.kt
+5 -5
View File
@@ -1,22 +1,22 @@
val flag = true
val a: () -> Int = @l {
val a: () -> Int = l@ {
<!TYPE_MISMATCH!>if (flag) return@l 4<!>
}
val b: () -> Unit = @l {
val b: () -> Unit = l@ {
if (flag) return@l <!CONSTANT_EXPECTED_TYPE_MISMATCH!>4<!>
}
val c: () -> Any = @l {
val c: () -> Any = l@ {
if (flag) return@l 4
}
val d: () -> Int = @l {
val d: () -> Int = l@ {
if (flag) return@l 4
5
}
val e: () -> Int = @l {
val e: () -> Int = l@ {
<!TYPE_MISMATCH!>if (flag) <!UNUSED_EXPRESSION!>4<!><!>
}
compiler/testData/diagnostics/tests/functionLiterals/return/LambdaWithParameter.kt
+1 -1
View File
@@ -1,6 +1,6 @@
val flag = true
val a /*: (Int) -> String */ = @l {
val a /*: (Int) -> String */ = l@ {
i: Int ->
if (i == 0) return@l i.toString()
compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test2(a: Int) {
val x = run @f{
val x = run f@{
if (a > 0) <!RETURN_NOT_ALLOWED!>return<!>
return@f 1
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test2() {
val x = run @f{return@f 1}
val x = run f@{return@f 1}
x: Int
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.kt
+2 -2
View File
@@ -1,11 +1,11 @@
fun test() {
val x = run(@f{return@f 1})
val x = run(f@{return@f 1})
x: Int
}
fun test1() {
val x = run(@l{return@l 1})
val x = run(l@{return@l 1})
x: Int
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test() {
run1 @f{
run1 f@{
(return@f 1)<!UNREACHABLE_CODE!>: Nothing<!>
}
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test() {
val x = run @f{
val x = run f@{
fun local(a: Int): String {
if (a > 0) return "2"
return@local "3"
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.kt
+2 -2
View File
@@ -1,6 +1,6 @@
fun test() {
val x = run @f{
run @ff {
val x = run f@{
run ff@ {
return@ff "2"
}
return@f 1
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test(a: Int) {
run @f{
run f@{
if (a > 0) return@f
else return@f <!RETURN_TYPE_MISMATCH!>1<!>
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNull.kt
+2 -2
View File
@@ -1,13 +1,13 @@
class A
val flag = true
val a /*: () -> A?*/ = @l {
val a /*: () -> A?*/ = l@ {
if (flag) return@l null
A()
}
val b /*: () -> A?*/ = @l {
val b /*: () -> A?*/ = l@ {
if (flag) return@l null
return@l A()
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnSecondUnit.kt
+1 -1
View File
@@ -1,6 +1,6 @@
val flag = true
val a = @b {
val a = b@ {
if (flag) return@b <!RETURN_TYPE_MISMATCH!>4<!>
return@b
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test(a: Int) {
val x = run @f{
val x = run f@{
if (a > 0) return@f
else return@f Unit
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitWithBodyExpression.kt
+1 -1
View File
@@ -1,7 +1,7 @@
val flag = true
// type of lambda was checked by txt
val a = @b { // () -> Unit
val a = b@ { // () -> Unit
if (flag) return@b
else <!UNUSED_EXPRESSION!>54<!>
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExpectedType.kt
+1 -1
View File
@@ -3,7 +3,7 @@ fun listOf<T>(vararg <!UNUSED_PARAMETER!>values<!>: T): List<T> = null!!
val flag = true
val a: () -> List<Int> = @l {
val a: () -> List<Int> = l@ {
if (flag) return@l listOf()
listOf(5)
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExplicitUnit.kt
+3 -3
View File
@@ -1,16 +1,16 @@
val flag = true
// type of lambda was checked by txt
val a = @l { // () -> Any
val a = l@ { // () -> Any
if (flag) return@l 4
return@l Unit
}
val b = @l { // () -> Any
val b = l@ { // () -> Any
if (flag) return@l Unit
5
}
val c = @l { // () -> Unit
val c = l@ { // () -> Unit
if (flag) return@l Unit
}
compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test(a: Int) {
run @f{ <!DEPRECATED_LAMBDA_SYNTAX!>(): Int<!> ->
run f@{ <!DEPRECATED_LAMBDA_SYNTAX!>(): Int<!> ->
if (a > 0) return@f <!TYPE_MISMATCH!>""<!>
return@f 1
}
compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.kt
+1 -1
View File
@@ -4,7 +4,7 @@ trait C: A
fun test(a: C, b: B) {
val x = run @f{
val x = run f@{
if (a != b) return@f a
b
}
compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// KT-6822 Smart cast doesn't work inside local returned expression in lambda
val a /* :(Int?) -> Int? */ = @l { it: Int? -> // but must be (Int?) -> Int
val a /* :(Int?) -> Int? */ = l@ { it: Int? -> // but must be (Int?) -> Int
if (it != null) return@l it
5
}
compiler/testData/diagnostics/tests/functionLiterals/return/SmartCastWithExplicitType.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// KT-6822 Smart cast doesn't work inside local returned expression in lambda
val a : (Int?) -> Int = @l {
val a : (Int?) -> Int = l@ {
if (it != null) return@l <!DEBUG_INFO_SMARTCAST!>it<!>
5
}
compiler/testData/diagnostics/tests/functionLiterals/return/unresolvedReferenceInReturnBlock.kt
+2 -2
View File
@@ -1,8 +1,8 @@
val a = @l {
val a = l@ {
return@l <!UNRESOLVED_REFERENCE!>r<!>
}
val b = @l {
val b = l@ {
if ("" == "OK") return@l
return@l <!UNRESOLVED_REFERENCE, RETURN_TYPE_MISMATCH!>r<!>
compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt
+1 -1
View File
@@ -4,7 +4,7 @@ trait Element
fun test(handlers: Map<String, Element.()->Unit>) {
handlers.getOrElse("name", @l { return@l <!NULL_FOR_NONNULL_TYPE!>null<!> })
handlers.getOrElse("name", l@ { return@l <!NULL_FOR_NONNULL_TYPE!>null<!> })
}
fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V = throw Exception("$key $defaultValue")