j2k: Adjust annotation converter to last changes

Only parameter named `value` can be marked vararg
This commit is contained in:
Denis Zharkov
2015-04-07 11:19:36 +03:00
parent 37d7327482
commit f85e92a247
8 changed files with 83 additions and 19 deletions
@@ -1,4 +1,4 @@
annotation class Anon(public val s: String = "a", public val stringArray: Array<String> = array("a", "b"), public vararg val intArray: Int)
annotation class Anon(public val s: String = "a", public val stringArray: Array<String> = array("a", "b"), public val intArray: IntArray)
Anon(intArray = *intArray(1, 2))
Anon(intArray = intArray(1, 2))
class A
@@ -0,0 +1,24 @@
@interface Anon {
String[] value();
int x() default 1;
}
@Anon("a", "b")
interface I1 {
}
@Anon("c", "d", x = 1)
interface I2 {
}
@Anon({"c", "d"}, x = 1)
interface I3 {
}
@Anon(value = {"c", "d"})
interface I4 {
}
@@ -0,0 +1,13 @@
annotation class Anon(public vararg val value: String, public val x: Int = 1)
Anon("a", "b")
trait I1
Anon("c", "d", x = 1)
trait I2
Anon("c", "d", x = 1)
trait I3
Anon(value = *array("c", "d"))
trait I4
@@ -1,13 +1,13 @@
import javaApi.*
Anon1(value = array("a"), stringArray = array("b"), intArray = intArray(1, 2), string = "x")
Anon1(value = *array("a"), stringArray = array("b"), intArray = intArray(1, 2), string = "x")
Anon2(value = "a", intValue = 1, charValue = 'a')
Anon3(e = E.A, stringArray = array(), value = *array("a", "b"))
Anon4("x", "y")
Anon5(1)
Anon6(array("x", "y"))
Anon6("x", "y")
Anon7(javaClass<String>(), javaClass<StringBuilder>())
Anon8(classes = *array(javaClass<String>(), javaClass<StringBuilder>()))
Anon8(classes = array(javaClass<String>(), javaClass<StringBuilder>()))
class C {
Anon5(1) deprecated("") private val field1 = 0
@@ -19,7 +19,7 @@ class C {
Anon5(1)
var field4 = 0
Anon6(array())
Anon6
fun foo(deprecated("") p1: Int, deprecated("") Anon5(2) p2: Char) {
[deprecated("")] [Anon5(3)] val c = 'a'
}