Update test data for tower resolution algorithm

- locals win
- unary calls to plus/minus are not supported in favor of unaryPlus/unaryMinus
- unqualified nested classes are temporarily reported as unresolved
- function without receiver win against extension function
- explicit import win against star import
This commit is contained in:
Alexander Udalov
2015-12-09 22:22:36 +03:00
committed by Stanislav Erokhin
parent 66a031f7a0
commit 239502368a
73 changed files with 163 additions and 173 deletions
@@ -1,5 +1,5 @@
// FILE: root.kt
fun testFun() = 12
fun testFun() = "239"
// FILE: otherPackage.kt
package test
@@ -9,4 +9,4 @@ fun testFun() = 12
// FILE: using.kt
import test.*
val t = <!OVERLOAD_RESOLUTION_AMBIGUITY!>testFun<!>()
val t: String = testFun()
@@ -1,7 +1,7 @@
package
public val t: [ERROR : Type for testFun()]
public fun testFun(): kotlin.Int
public val t: kotlin.String
public fun testFun(): kotlin.String
package test {
public fun testFun(): kotlin.Int
@@ -15,12 +15,12 @@ class A<T> {
inner class I {
init {
<!NESTED_CLASS_SHOULD_BE_QUALIFIED!>T<!>() // todo: fix error message
T() // todo: https://jetbrains.quip.com/hPM5AJcc1nca
}
}
init {
<!NESTED_CLASS_SHOULD_BE_QUALIFIED!>T<!>()
T()
}
}
@@ -47,11 +47,11 @@ class B<T> {
inner class I {
init {
<!NESTED_CLASS_SHOULD_BE_QUALIFIED!>T<!>()
T()
}
}
init {
<!NESTED_CLASS_SHOULD_BE_QUALIFIED!>T<!>()
T()
}
}
@@ -33,8 +33,8 @@ class E: A() {
object Z {
init {
<!NESTED_CLASS_SHOULD_BE_QUALIFIED!>B<!>().<!UNRESOLVED_REFERENCE!>foo<!>() // todo: some resolve hacks
<!NESTED_CLASS_SHOULD_BE_QUALIFIED!>B<!>().bar()
<!UNRESOLVED_REFERENCE!>B<!>().<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo<!>()
<!UNRESOLVED_REFERENCE!>B<!>().<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>bar<!>()
<!UNRESOLVED_REFERENCE!>D<!>()
C()
@@ -31,6 +31,6 @@ public class X extends B {
// FILE: 2.kt
class Y: X() {
init {
val a: Double = <!TYPE_MISMATCH!>foo()<!> // todo
val a: Double = foo()
}
}