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

Allow use expression of array type as named argument for vararg

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-12-17 13:04:42 +03:00
parent 0cb48999ff
commit ee36fb903f
15 changed files with 253 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
Vendored
+35
View File
@@ -0,0 +1,35 @@
// !LANGUAGE: -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.EXPRESSION)
annotation class Ann(vararg val s: String, val x: Int)
fun withVararg(vararg s: String) {}
fun foo() {}
fun test_fun(s: String, arr: Array<String>) {
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(arr) // Error
withVararg(*arr) // OK
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(s = arr) // Error
withVararg(s = *arr) // OK
withVararg(s) // OK
withVararg(s = s) // Error
}
fun test_ann(s: String, arr: Array<String>) {
@Ann([""], x = 1)
foo()
@Ann(*[""], x = 1)
foo()
@Ann(s = [""], x = 1)
foo()
@Ann(s = *[""], x = 1)
foo()
@Ann("", x = 1)
foo()
@Ann(s = "", x = 1)
foo()
}
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
Vendored
+35
View File
@@ -0,0 +1,35 @@
// !LANGUAGE: -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
// !DIAGNOSTICS: -UNUSED_PARAMETER
@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.EXPRESSION)
annotation class Ann(vararg val s: String, val x: Int)
fun withVararg(vararg s: String) {}
fun foo() {}
fun test_fun(s: String, arr: Array<String>) {
withVararg(<!TYPE_MISMATCH!>arr<!>) // Error
withVararg(*arr) // OK
withVararg(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH!>arr<!>) // Error
withVararg(s = *arr) // OK
withVararg(s) // OK
withVararg(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>s<!>) // Error
}
fun test_ann(s: String, arr: Array<String>) {
@Ann(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
foo()
@Ann(*[""], x = 1)
foo()
@Ann(s = [""], x = 1)
foo()
@Ann(s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_ANNOTATION!>[""]<!>, x = 1)
foo()
@Ann("", x = 1)
foo()
@Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR!>""<!>, x = 1)
foo()
}
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.txt
Vendored
+15
View File
@@ -0,0 +1,15 @@
package
public fun foo(): kotlin.Unit
public fun test_ann(/*0*/ s: kotlin.String, /*1*/ arr: kotlin.Array<kotlin.String>): kotlin.Unit
public fun test_fun(/*0*/ s: kotlin.String, /*1*/ arr: kotlin.Array<kotlin.String>): kotlin.Unit
public fun withVararg(/*0*/ vararg s: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ vararg s: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ x: kotlin.Int)
public final val s: kotlin.Array<out kotlin.String>
public final val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.fir.kt
Vendored
+36
View File
@@ -0,0 +1,36 @@
// !LANGUAGE: +AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !WITH_NEW_INFERENCE
@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.EXPRESSION)
annotation class Ann(vararg val s: String, val x: Int)
fun withVararg(vararg s: String) {}
fun foo() {}
fun test_fun(s: String, arr: Array<String>) {
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(arr) // Error
withVararg(*arr) // OK
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(s = arr) // OK
withVararg(s = *arr) // Warning
withVararg(s) // OK
withVararg(s = s) // Error
}
fun test_ann(s: String, arr: Array<String>) {
@Ann([""], x = 1)
foo()
@Ann(*[""], x = 1)
foo()
@Ann(s = [""], x = 1)
foo()
@Ann(s = *[""], x = 1)
foo()
@Ann("", x = 1)
foo()
@Ann(s = "", x = 1)
foo()
}
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
Vendored
+36
View File
@@ -0,0 +1,36 @@
// !LANGUAGE: +AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
// !DIAGNOSTICS: -UNUSED_PARAMETER
// !WITH_NEW_INFERENCE
@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.EXPRESSION)
annotation class Ann(vararg val s: String, val x: Int)
fun withVararg(vararg s: String) {}
fun foo() {}
fun test_fun(s: String, arr: Array<String>) {
withVararg(<!TYPE_MISMATCH!>arr<!>) // Error
withVararg(*arr) // OK
withVararg(s = arr) // OK
withVararg(s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION!>arr<!>) // Warning
withVararg(s) // OK
withVararg(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>s<!>) // Error
}
fun test_ann(s: String, arr: Array<String>) {
@Ann(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, OI;TYPE_MISMATCH!>[""]<!>, x = 1)
foo()
@Ann(*[""], x = 1)
foo()
@Ann(s = [""], x = 1)
foo()
@Ann(s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_ANNOTATION!>[""]<!>, x = 1)
foo()
@Ann("", x = 1)
foo()
@Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR!>""<!>, x = 1)
foo()
}
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.txt
Vendored
+15
View File
@@ -0,0 +1,15 @@
package
public fun foo(): kotlin.Unit
public fun test_ann(/*0*/ s: kotlin.String, /*1*/ arr: kotlin.Array<kotlin.String>): kotlin.Unit
public fun test_fun(/*0*/ s: kotlin.String, /*1*/ arr: kotlin.Array<kotlin.String>): kotlin.Unit
public fun withVararg(/*0*/ vararg s: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE) @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.EXPRESSION}) public final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ vararg s: kotlin.String /*kotlin.Array<out kotlin.String>*/, /*1*/ x: kotlin.Int)
public final val s: kotlin.Array<out kotlin.String>
public final val x: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}