Report warning on usages of non-const vals in places where constants expected

This commit is contained in:
Denis Zharkov
2015-09-21 18:14:35 +03:00
parent 8d13f08271
commit afd4e644a3
21 changed files with 105 additions and 29 deletions
@@ -10,7 +10,7 @@ annotation class Ann(val i: IntArray)
class Test
var i = 1
val i2 = 1
const val i2 = 1
val i3 = foo()
fun foo(): Int = 1
@@ -1,7 +1,7 @@
package
public var i: kotlin.Int
public val i2: kotlin.Int = 1
public const val i2: kotlin.Int = 1
public val i3: kotlin.Int
public val iAnn: Ann
public fun foo(): kotlin.Int
@@ -0,0 +1,16 @@
val nonConst = 1
const val constConst = <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst * nonConst + 2<!>
annotation class Ann(val x: Int, val y: String)
@Ann(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst<!>, <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>"${nonConst}"<!>)
fun foo1() {}
@Ann(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst + constConst<!>, "${constConst}")
fun foo2() {}
annotation class ArrayAnn(val x: IntArray)
@ArrayAnn(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>intArrayOf(1, constConst, <!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>nonConst<!>)<!>)
fun foo3() {}
@@ -0,0 +1,24 @@
package
public const val constConst: kotlin.Int = 3
public val nonConst: kotlin.Int = 1
@Ann(x = 1, y = "1") public fun foo1(): kotlin.Unit
@Ann(x = 4, y = "3") public fun foo2(): kotlin.Unit
@ArrayAnn(x = {1, 3, 1}) public fun foo3(): kotlin.Unit
@kotlin.annotation.annotation() public final class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String)
public final val x: kotlin.Int
public final val y: kotlin.String
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
}
@kotlin.annotation.annotation() public final class ArrayAnn : kotlin.Annotation {
public constructor ArrayAnn(/*0*/ x: kotlin.IntArray)
public final val x: kotlin.IntArray
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
}
@@ -13,7 +13,7 @@ annotation class Ann(vararg val i: Int)
class Test
var i = 1
val i2 = 1
const val i2 = 1
val i3 = foo()
fun foo(): Int = 1
@@ -1,7 +1,7 @@
package
public var i: kotlin.Int
public val i2: kotlin.Int = 1
public const val i2: kotlin.Int = 1
public val i3: kotlin.Int
public val iAnn: Ann
public fun foo(): kotlin.Int