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

Merge ConstantExpressionEvaluator and CompileTimeConstantResolver

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(5.5, 5.0, 4.5, 4.0)) {
if (list7 != listOf<Float>(5.5.toFloat(), 5.0.toFloat(), 4.5.toFloat(), 4.0.toFloat())) {
return "Wrong elements for 5.5.toFloat() downTo 3.7.toFloat() step 0.5.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(4.0, 4.5, 5.0, 5.5)) {
if (list7 != listOf<Float>(4.0.toFloat(), 4.5.toFloat(), 5.0.toFloat(), 5.5.toFloat())) {
return "Wrong elements for 4.0.toFloat()..5.8.toFloat() step 0.5.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt
+2 -2
View File
@@ -19,7 +19,7 @@ fun box(): String {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Float>(0.0)) {
if (list2 != listOf<Float>(0.0.toFloat())) {
return "Wrong elements for 0.0.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY: $list2"
}
@@ -39,7 +39,7 @@ fun box(): String {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Float>(5.0)) {
if (list4 != listOf<Float>(5.0.toFloat())) {
return "Wrong elements for 5.0.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY: $list4"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(3.0, 4.0, 5.0)) {
if (list7 != listOf<Float>(3.0.toFloat(), 4.0.toFloat(), 5.0.toFloat())) {
return "Wrong elements for (5.0.toFloat() downTo 3.0.toFloat()).reversed(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt
+3 -3
View File
@@ -64,13 +64,13 @@ fun box(): String {
}
val list7 = ArrayList<Float>()
val range7 = (5.8.toFloat() downTo 4.0.toFloat() step 0.5).reversed()
val range7 = (5.8.toFloat() downTo 4.0.toFloat() step 0.5.toFloat()).reversed()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(4.0, 4.5, 5.0, 5.5)) {
return "Wrong elements for (5.8.toFloat() downTo 4.0.toFloat() step 0.5).reversed(): $list7"
if (list7 != listOf<Float>(4.0.toFloat(), 4.5.toFloat(), 5.0.toFloat(), 5.5.toFloat())) {
return "Wrong elements for (5.8.toFloat() downTo 4.0.toFloat() step 0.5.toFloat()).reversed(): $list7"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(5.0, 4.0, 3.0)) {
if (list7 != listOf<Float>(5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
return "Wrong elements for (3.0.toFloat()..5.0.toFloat()).reversed(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
+3 -3
View File
@@ -64,13 +64,13 @@ fun box(): String {
}
val list7 = ArrayList<Float>()
val range7 = (4.0.toFloat()..6.0.toFloat() step 0.5).reversed()
val range7 = (4.0.toFloat()..6.0.toFloat() step 0.5.toFloat()).reversed()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(6.0, 5.5, 5.0, 4.5, 4.0)) {
return "Wrong elements for (4.0.toFloat()..6.0.toFloat() step 0.5).reversed(): $list7"
if (list7 != listOf<Float>(6.0.toFloat(), 5.5.toFloat(), 5.0.toFloat(), 4.5.toFloat(), 4.0.toFloat())) {
return "Wrong elements for (4.0.toFloat()..6.0.toFloat() step 0.5.toFloat()).reversed(): $list7"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(9.0, 8.0, 7.0, 6.0, 5.0, 4.0, 3.0)) {
if (list7 != listOf<Float>(9.0.toFloat(), 8.0.toFloat(), 7.0.toFloat(), 6.0.toFloat(), 5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
return "Wrong elements for 9.0.toFloat() downTo 3.0.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0)) {
if (list7 != listOf<Float>(3.0.toFloat(), 4.0.toFloat(), 5.0.toFloat(), 6.0.toFloat(), 7.0.toFloat(), 8.0.toFloat(), 9.0.toFloat())) {
return "Wrong elements for 3.0.toFloat()..9.0.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0)) {
if (list7 != listOf<Float>(3.0.toFloat(), 4.0.toFloat(), 5.0.toFloat(), 6.0.toFloat(), 7.0.toFloat(), 8.0.toFloat(), 9.0.toFloat())) {
return "Wrong elements for (1.5.toFloat() * 2.toFloat())..(3.0.toFloat() * 3.0.toFloat()): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(6.0, 5.5, 5.0, 4.5, 4.0)) {
if (list7 != listOf<Float>(6.0.toFloat(), 5.5.toFloat(), 5.0.toFloat(), 4.5.toFloat(), 4.0.toFloat())) {
return "Wrong elements for 6.0.toFloat() downTo 4.0.toFloat() step 0.5.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
+1 -1
View File
@@ -69,7 +69,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(4.0, 4.5, 5.0, 5.5, 6.0)) {
if (list7 != listOf<Float>(4.0.toFloat(), 4.5.toFloat(), 5.0.toFloat(), 5.5.toFloat(), 6.0.toFloat())) {
return "Wrong elements for 4.0.toFloat()..6.0.toFloat() step 0.5.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(5.5, 5.0, 4.5, 4.0)) {
if (list7 != listOf<Float>(5.5.toFloat(), 5.0.toFloat(), 4.5.toFloat(), 4.0.toFloat())) {
return "Wrong elements for 5.5.toFloat() downTo 3.7.toFloat() step 0.5.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(4.0, 4.5, 5.0, 5.5)) {
if (list7 != listOf<Float>(4.0.toFloat(), 4.5.toFloat(), 5.0.toFloat(), 5.5.toFloat())) {
return "Wrong elements for 4.0.toFloat()..5.8.toFloat() step 0.5.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt
+2 -2
View File
@@ -17,7 +17,7 @@ fun box(): String {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Float>(0.0)) {
if (list2 != listOf<Float>(0.0.toFloat())) {
return "Wrong elements for 0.0.toFloat()..5.0.toFloat() step j.Float.POSITIVE_INFINITY: $list2"
}
@@ -35,7 +35,7 @@ fun box(): String {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Float>(5.0)) {
if (list4 != listOf<Float>(5.0.toFloat())) {
return "Wrong elements for 5.0.toFloat() downTo 0.0.toFloat() step j.Float.POSITIVE_INFINITY: $list4"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(3.0, 4.0, 5.0)) {
if (list7 != listOf<Float>(3.0.toFloat(), 4.0.toFloat(), 5.0.toFloat())) {
return "Wrong elements for (5.0.toFloat() downTo 3.0.toFloat()).reversed(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt
+3 -3
View File
@@ -58,12 +58,12 @@ fun box(): String {
}
val list7 = ArrayList<Float>()
for (i in (5.8.toFloat() downTo 4.0.toFloat() step 0.5).reversed()) {
for (i in (5.8.toFloat() downTo 4.0.toFloat() step 0.5.toFloat()).reversed()) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(4.0, 4.5, 5.0, 5.5)) {
return "Wrong elements for (5.8.toFloat() downTo 4.0.toFloat() step 0.5).reversed(): $list7"
if (list7 != listOf<Float>(4.0.toFloat(), 4.5.toFloat(), 5.0.toFloat(), 5.5.toFloat())) {
return "Wrong elements for (5.8.toFloat() downTo 4.0.toFloat() step 0.5.toFloat()).reversed(): $list7"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(5.0, 4.0, 3.0)) {
if (list7 != listOf<Float>(5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
return "Wrong elements for (3.0.toFloat()..5.0.toFloat()).reversed(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt
+3 -3
View File
@@ -58,12 +58,12 @@ fun box(): String {
}
val list7 = ArrayList<Float>()
for (i in (4.0.toFloat()..6.0.toFloat() step 0.5).reversed()) {
for (i in (4.0.toFloat()..6.0.toFloat() step 0.5.toFloat()).reversed()) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(6.0, 5.5, 5.0, 4.5, 4.0)) {
return "Wrong elements for (4.0.toFloat()..6.0.toFloat() step 0.5).reversed(): $list7"
if (list7 != listOf<Float>(6.0.toFloat(), 5.5.toFloat(), 5.0.toFloat(), 4.5.toFloat(), 4.0.toFloat())) {
return "Wrong elements for (4.0.toFloat()..6.0.toFloat() step 0.5.toFloat()).reversed(): $list7"
}
return "OK"
compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(9.0, 8.0, 7.0, 6.0, 5.0, 4.0, 3.0)) {
if (list7 != listOf<Float>(9.0.toFloat(), 8.0.toFloat(), 7.0.toFloat(), 6.0.toFloat(), 5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
return "Wrong elements for 9.0.toFloat() downTo 3.0.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0)) {
if (list7 != listOf<Float>(3.0.toFloat(), 4.0.toFloat(), 5.0.toFloat(), 6.0.toFloat(), 7.0.toFloat(), 8.0.toFloat(), 9.0.toFloat())) {
return "Wrong elements for 3.0.toFloat()..9.0.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0)) {
if (list7 != listOf<Float>(3.0.toFloat(), 4.0.toFloat(), 5.0.toFloat(), 6.0.toFloat(), 7.0.toFloat(), 8.0.toFloat(), 9.0.toFloat())) {
return "Wrong elements for (1.5.toFloat() * 2.toFloat())..(3.0.toFloat() * 3.0.toFloat()): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(6.0, 5.5, 5.0, 4.5, 4.0)) {
if (list7 != listOf<Float>(6.0.toFloat(), 5.5.toFloat(), 5.0.toFloat(), 4.5.toFloat(), 4.0.toFloat())) {
return "Wrong elements for 6.0.toFloat() downTo 4.0.toFloat() step 0.5.toFloat(): $list7"
}
compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt
+1 -1
View File
@@ -62,7 +62,7 @@ fun box(): String {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(4.0, 4.5, 5.0, 5.5, 6.0)) {
if (list7 != listOf<Float>(4.0.toFloat(), 4.5.toFloat(), 5.0.toFloat(), 5.5.toFloat(), 6.0.toFloat())) {
return "Wrong elements for 4.0.toFloat()..6.0.toFloat() step 0.5.toFloat(): $list7"
}