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

Drop Ranges, Progressions, ProgressionIterators for Double and Float.

Browse Source 
Undeprecate generic Comparable.rangeTo, but return private implementation instead.
Undeprecate contains and coerceIn for generic ranges.
This commit is contained in:
Ilya Gorbunov
2015-11-06 18:22:31 +03:00
parent 4d2f9b82da
commit 6bac3e1986
54 changed files with 30 additions and 1630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'a' downTo 'z': $list5"
}
val list6 = ArrayList<Double>()
val range6 = -1.0 downTo 5.0
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>()) {
return "Wrong elements for -1.0 downTo 5.0: $list6"
}
val list7 = ArrayList<Float>()
val range7 = -1.0.toFloat() downTo 5.0.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>()) {
return "Wrong elements for -1.0.toFloat() downTo 5.0.toFloat(): $list7"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'z'..'a': $list5"
}
val list6 = ArrayList<Double>()
val range6 = 5.0..-1.0
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>()) {
return "Wrong elements for 5.0..-1.0: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 5.0.toFloat()..-1.0.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>()) {
return "Wrong elements for 5.0.toFloat()..-1.0.toFloat(): $list7"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'd' downTo 'a' step 2: $list5"
}
val list6 = ArrayList<Double>()
val range6 = 5.5 downTo 3.7 step 0.5
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(5.5, 5.0, 4.5, 4.0)) {
return "Wrong elements for 5.5 downTo 3.7 step 0.5: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 5.5.toFloat() downTo 3.7.toFloat() step 0.5.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'a'..'d' step 2: $list5"
}
val list6 = ArrayList<Double>()
val range6 = 4.0..5.8 step 0.5
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(4.0, 4.5, 5.0, 5.5)) {
return "Wrong elements for 4.0..5.8 step 0.5: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 4.0.toFloat()..5.8.toFloat() step 0.5.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt
Vendored
-46
View File
@@ -1,46 +0,0 @@
// Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
fun box(): String {
val list1 = ArrayList<Double>()
val range1 = 0.0..5.0 step java.lang.Double.POSITIVE_INFINITY
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Double>(0.0)) {
return "Wrong elements for 0.0..5.0 step java.lang.Double.POSITIVE_INFINITY: $list1"
}
val list2 = ArrayList<Float>()
val range2 = 0.0.toFloat()..5.0.toFloat() step java.lang.Float.POSITIVE_INFINITY
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Float>(0.0.toFloat())) {
return "Wrong elements for 0.0.toFloat()..5.0.toFloat() step java.lang.Float.POSITIVE_INFINITY: $list2"
}
val list3 = ArrayList<Double>()
val range3 = 5.0 downTo 0.0 step java.lang.Double.POSITIVE_INFINITY
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Double>(5.0)) {
return "Wrong elements for 5.0 downTo 0.0 step java.lang.Double.POSITIVE_INFINITY: $list3"
}
val list4 = ArrayList<Float>()
val range4 = 5.0.toFloat() downTo 0.0.toFloat() step java.lang.Float.POSITIVE_INFINITY
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Float>(5.0.toFloat())) {
return "Wrong elements for 5.0.toFloat() downTo 0.0.toFloat() step java.lang.Float.POSITIVE_INFINITY: $list4"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt
Vendored
-126
View File
@@ -1,126 +0,0 @@
// Auto-generated by org.jetbrains.kotlin.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
fun box(): String {
val list1 = ArrayList<Double>()
val range1 = java.lang.Double.NaN..5.0
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Double>()) {
return "Wrong elements for java.lang.Double.NaN..5.0: $list1"
}
val list2 = ArrayList<Float>()
val range2 = java.lang.Float.NaN.toFloat()..5.0.toFloat()
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Float>()) {
return "Wrong elements for java.lang.Float.NaN.toFloat()..5.0.toFloat(): $list2"
}
val list3 = ArrayList<Double>()
val range3 = java.lang.Double.NaN downTo 0.0
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Double>()) {
return "Wrong elements for java.lang.Double.NaN downTo 0.0: $list3"
}
val list4 = ArrayList<Float>()
val range4 = java.lang.Float.NaN.toFloat() downTo 0.0.toFloat()
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Float>()) {
return "Wrong elements for java.lang.Float.NaN.toFloat() downTo 0.0.toFloat(): $list4"
}
val list5 = ArrayList<Double>()
val range5 = 0.0..java.lang.Double.NaN
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Double>()) {
return "Wrong elements for 0.0..java.lang.Double.NaN: $list5"
}
val list6 = ArrayList<Float>()
val range6 = 0.0.toFloat()..java.lang.Float.NaN
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Float>()) {
return "Wrong elements for 0.0.toFloat()..java.lang.Float.NaN: $list6"
}
val list7 = ArrayList<Double>()
val range7 = 5.0 downTo java.lang.Double.NaN
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Double>()) {
return "Wrong elements for 5.0 downTo java.lang.Double.NaN: $list7"
}
val list8 = ArrayList<Float>()
val range8 = 5.0.toFloat() downTo java.lang.Float.NaN
for (i in range8) {
list8.add(i)
if (list8.size() > 23) break
}
if (list8 != listOf<Float>()) {
return "Wrong elements for 5.0.toFloat() downTo java.lang.Float.NaN: $list8"
}
val list9 = ArrayList<Double>()
val range9 = java.lang.Double.NaN..java.lang.Double.NaN
for (i in range9) {
list9.add(i)
if (list9.size() > 23) break
}
if (list9 != listOf<Double>()) {
return "Wrong elements for java.lang.Double.NaN..java.lang.Double.NaN: $list9"
}
val list10 = ArrayList<Float>()
val range10 = java.lang.Float.NaN..java.lang.Float.NaN
for (i in range10) {
list10.add(i)
if (list10.size() > 23) break
}
if (list10 != listOf<Float>()) {
return "Wrong elements for java.lang.Float.NaN..java.lang.Float.NaN: $list10"
}
val list11 = ArrayList<Double>()
val range11 = java.lang.Double.NaN downTo java.lang.Double.NaN
for (i in range11) {
list11.add(i)
if (list11.size() > 23) break
}
if (list11 != listOf<Double>()) {
return "Wrong elements for java.lang.Double.NaN downTo java.lang.Double.NaN: $list11"
}
val list12 = ArrayList<Float>()
val range12 = java.lang.Float.NaN downTo java.lang.Float.NaN
for (i in range12) {
list12.add(i)
if (list12.size() > 23) break
}
if (list12 != listOf<Float>()) {
return "Wrong elements for java.lang.Float.NaN downTo java.lang.Float.NaN: $list12"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'k' downTo 'k': $list5"
}
val list6 = ArrayList<Double>()
val range6 = 5.0 downTo 5.0
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(5.0)) {
return "Wrong elements for 5.0 downTo 5.0: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 5.0.toFloat() downTo 5.0.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(5.0.toFloat())) {
return "Wrong elements for 5.0.toFloat() downTo 5.0.toFloat(): $list7"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'k'..'k': $list5"
}
val list6 = ArrayList<Double>()
val range6 = 5.0..5.0
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(5.0)) {
return "Wrong elements for 5.0..5.0: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 5.0.toFloat()..5.0.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>(5.0.toFloat())) {
return "Wrong elements for 5.0.toFloat()..5.0.toFloat(): $list7"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for ('c' downTo 'a').reversed(): $list5"
}
val list6 = ArrayList<Double>()
val range6 = (5.0 downTo 3.0).reversed()
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(3.0, 4.0, 5.0)) {
return "Wrong elements for (5.0 downTo 3.0).reversed(): $list6"
}
val list7 = ArrayList<Float>()
val range7 = (5.0.toFloat() downTo 3.0.toFloat()).reversed()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for ('a' downTo 'c').reversed(): $list5"
}
val list6 = ArrayList<Double>()
val range6 = (3.0 downTo 5.0).reversed()
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>()) {
return "Wrong elements for (3.0 downTo 5.0).reversed(): $list6"
}
val list7 = ArrayList<Float>()
val range7 = (3.0.toFloat() downTo 5.0.toFloat()).reversed()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>()) {
return "Wrong elements for (3.0.toFloat() downTo 5.0.toFloat()).reversed(): $list7"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for ('c'..'a').reversed(): $list5"
}
val list6 = ArrayList<Double>()
val range6 = (5.0..3.0).reversed()
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>()) {
return "Wrong elements for (5.0..3.0).reversed(): $list6"
}
val list7 = ArrayList<Float>()
val range7 = (5.0.toFloat()..3.0.toFloat()).reversed()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
if (list7 != listOf<Float>()) {
return "Wrong elements for (5.0.toFloat()..3.0.toFloat()).reversed(): $list7"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt
Vendored
-20
View File
@@ -42,25 +42,5 @@ fun box(): String {
return "Wrong elements for ('a'..'c').reversed(): $list4"
}
val list5 = ArrayList<Double>()
val range5 = (3.0..5.0).reversed()
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Double>(5.0, 4.0, 3.0)) {
return "Wrong elements for (3.0..5.0).reversed(): $list5"
}
val list6 = ArrayList<Float>()
val range6 = (3.0.toFloat()..5.0.toFloat()).reversed()
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Float>(5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
return "Wrong elements for (3.0.toFloat()..5.0.toFloat()).reversed(): $list6"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for ('c'..'g' step 2).reversed(): $list5"
}
val list6 = ArrayList<Double>()
val range6 = (4.0..6.0 step 0.5).reversed()
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(6.0, 5.5, 5.0, 4.5, 4.0)) {
return "Wrong elements for (4.0..6.0 step 0.5).reversed(): $list6"
}
val list7 = ArrayList<Float>()
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.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
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'g' downTo 'c': $list5"
}
val list6 = ArrayList<Double>()
val range6 = 9.0 downTo 3.0
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(9.0, 8.0, 7.0, 6.0, 5.0, 4.0, 3.0)) {
return "Wrong elements for 9.0 downTo 3.0: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 9.0.toFloat() downTo 3.0.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'c'..'g': $list5"
}
val list6 = ArrayList<Double>()
val range6 = 3.0..9.0
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0)) {
return "Wrong elements for 3.0..9.0: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 3.0.toFloat()..9.0.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for (\"ace\"[1])..(\"age\"[1]): $list5"
}
val list6 = ArrayList<Double>()
val range6 = (1.5 * 2)..(3.0 * 3.0)
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0)) {
return "Wrong elements for (1.5 * 2)..(3.0 * 3.0): $list6"
}
val list7 = ArrayList<Float>()
val range7 = (1.5.toFloat() * 2.toFloat())..(3.0.toFloat() * 3.0.toFloat())
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'g' downTo 'c' step 2: $list5"
}
val list6 = ArrayList<Double>()
val range6 = 6.0 downTo 4.0 step 0.5
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(6.0, 5.5, 5.0, 4.5, 4.0)) {
return "Wrong elements for 6.0 downTo 4.0 step 0.5: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 6.0.toFloat() downTo 4.0.toFloat() step 0.5.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt
Vendored
-20
View File
@@ -52,25 +52,5 @@ fun box(): String {
return "Wrong elements for 'c'..'g' step 2: $list5"
}
val list6 = ArrayList<Double>()
val range6 = 4.0..6.0 step 0.5
for (i in range6) {
list6.add(i)
if (list6.size() > 23) break
}
if (list6 != listOf<Double>(4.0, 4.5, 5.0, 5.5, 6.0)) {
return "Wrong elements for 4.0..6.0 step 0.5: $list6"
}
val list7 = ArrayList<Float>()
val range7 = 4.0.toFloat()..6.0.toFloat() step 0.5.toFloat()
for (i in range7) {
list7.add(i)
if (list7.size() > 23) break
}
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"
}
return "OK"
}