Merge ConstantExpressionEvaluator and CompileTimeConstantResolver

This commit is contained in:
Natalia Ukhorskaya
2013-11-22 16:13:26 +04:00
parent e6923ba29e
commit d63f6843c8
55 changed files with 296 additions and 355 deletions
@@ -35,7 +35,7 @@ class Foo {
class object {
val i: Int = 2
val s: Short = 2
val f: Float = 2.0
val f: Float = 2.0.toFloat()
val d: Double = 2.0
val l: Long = 2
val b: Byte = 2
@@ -33,7 +33,7 @@ annotation class Ann(
val i: Int = 2
val s: Short = 2
val f: Float = 2.0
val f: Float = 2.0.toFloat()
val d: Double = 2.0
val l: Long = 2
val b: Byte = 2
@@ -27,4 +27,4 @@ fun box(): String {
return "OK"
}
Ann(1, 1, 1, 1.0, 1.0, 1, 'c', true) class MyClass
Ann(1, 1, 1, 1.0.toFloat(), 1.0, 1, 'c', true) class MyClass