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

TYPE_INFERENCE_FAILED changed in tests

Browse Source 
to concrete type inference error
This commit is contained in:
Svetlana Isakova
2012-07-10 15:12:52 +04:00
parent f2e8f8c9c5
commit 3739301566
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+1 -1
View File
@@ -42,7 +42,7 @@ fun main(args : Array<String>) {
val b = fooT2<Int>()(1) val b = fooT2<Int>()(1)
b : Int b : Int
<!TYPE_INFERENCE_FAILED!>fooT2()<!>(1) // : Any? <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>fooT2<!>()(1) // : Any?
<!CALLEE_NOT_A_FUNCTION!>1<!>() <!CALLEE_NOT_A_FUNCTION!>1<!>()
<!CALLEE_NOT_A_FUNCTION!>1<!>{} <!CALLEE_NOT_A_FUNCTION!>1<!>{}
compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
+1 -2
View File
@@ -1,11 +1,10 @@
// Fixpoint generic in Java: Enum<T extends Enum<T>> // Fixpoint generic in Java: Enum<T extends Enum<T>>
fun test(<!UNUSED_PARAMETER!>a<!> : annotation.RetentionPolicy) { fun test(<!UNUSED_PARAMETER!>a<!> : annotation.RetentionPolicy) {
} }
fun test() { fun test() {
java.util.Collections.<!TYPE_INFERENCE_FAILED!>emptyList()<!> java.util.Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()
val <!UNUSED_VARIABLE!>a<!> : java.util.Collection<String>? = java.util.Collections.emptyList() val <!UNUSED_VARIABLE!>a<!> : java.util.Collection<String>? = java.util.Collections.emptyList()
} }
compiler/testData/diagnostics/tests/ResolveToJava.kt
+2 -2
View File
@@ -18,10 +18,10 @@ fun test(<!UNUSED_PARAMETER!>l<!> : java.util.List<Int>) {
val <!UNUSED_VARIABLE!>f<!> : java.io.File? = null val <!UNUSED_VARIABLE!>f<!> : java.io.File? = null
Collections.<!TYPE_INFERENCE_FAILED, FUNCTION_CALL_EXPECTED!>emptyList<!> Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, FUNCTION_CALL_EXPECTED!>emptyList<!>
Collections.<!FUNCTION_CALL_EXPECTED!>emptyList<Int><!> Collections.<!FUNCTION_CALL_EXPECTED!>emptyList<Int><!>
Collections.emptyList<Int>() Collections.emptyList<Int>()
Collections.<!TYPE_INFERENCE_FAILED!>emptyList()<!> Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()
Collections.singleton<Int>(1) : Set<Int>? Collections.singleton<Int>(1) : Set<Int>?
Collections.singleton<Int>(<!ERROR_COMPILE_TIME_VALUE!>1.0<!>) Collections.singleton<Int>(<!ERROR_COMPILE_TIME_VALUE!>1.0<!>)
compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
+3 -4
View File
@@ -39,10 +39,10 @@ fun main(args : Array<String>) {
joinG(1, "2") joinG(1, "2")
joinG(<!NON_VARARG_SPREAD!>*<!>1, "2") joinG(<!NON_VARARG_SPREAD!>*<!>1, "2")
<!TYPE_INFERENCE_FAILED!>joinG(1, *<!TYPE_MISMATCH!>"2"<!>)<!> <!TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH!>joinG<!>(1, *"2")
joinG(x = 1, a = *a) joinG(x = 1, a = *a)
<!TYPE_INFERENCE_FAILED!>joinG(x = 1, a = <!TYPE_MISMATCH!>"2"<!>)<!> <!TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH!>joinG<!>(x = 1, a = "2")
<!TYPE_INFERENCE_FAILED!>joinG(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)<!> <!TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH!>joinG<!>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *"2")
joinG(1, *a) joinG(1, *a)
joinG(1, *a, "3") joinG(1, *a, "3")
joinG(1, "4", *a, "3") joinG(1, "4", *a, "3")
@@ -89,4 +89,3 @@ fun <T> joinG(x : Int, vararg a : T) : String {
fun <T> joinT(<!UNUSED_PARAMETER!>x<!> : Int, vararg <!UNUSED_PARAMETER!>a<!> : T) : T? { fun <T> joinT(<!UNUSED_PARAMETER!>x<!> : Int, vararg <!UNUSED_PARAMETER!>a<!> : T) : T? {
return null return null
} }
compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt
+1 -1
View File
@@ -3,7 +3,7 @@ fun fooT22<T>() : T? {
} }
fun foo1() { fun foo1() {
<!TYPE_INFERENCE_FAILED!>fooT22()<!> <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>fooT22<!>()
} }
val n : Nothing = null.sure() val n : Nothing = null.sure()
compiler/testData/diagnostics/tests/regressions/kt353.kt
+2 -2
View File
@@ -12,7 +12,7 @@ fun foo(a: A) {
val <!UNUSED_VARIABLE!>u<!>: Unit = a.gen() // Unit should be inferred val <!UNUSED_VARIABLE!>u<!>: Unit = a.gen() // Unit should be inferred
if (true) { if (true) {
a.<!TYPE_INFERENCE_FAILED!>gen()<!> // Shouldn't work: no info for inference a.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>gen<!>() // Shouldn't work: no info for inference
} }
val <!UNUSED_VARIABLE!>b<!> : () -> Unit = { val <!UNUSED_VARIABLE!>b<!> : () -> Unit = {
@@ -28,5 +28,5 @@ fun foo(a: A) {
a.gen() //type mismatch, but Int can be derived a.gen() //type mismatch, but Int can be derived
} }
a.<!TYPE_INFERENCE_FAILED!>gen()<!> // Shouldn't work: no info for inference a.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>gen<!>() // Shouldn't work: no info for inference
} }