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

Add NaN-propagation in coerceIn(ClosedComparableRange<Double>)

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-12-08 01:40:52 +03:00
parent ea77673dde
commit 8ec2a2e6fe
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Ranges.kt
+4 -2
View File
@@ -871,8 +871,10 @@ public fun Double.coerceIn(minimumValue: Double, maximumValue: Double): Double {
public fun <T: Comparable<T>> T.coerceIn(range: ClosedComparableRange<T>): T { public fun <T: Comparable<T>> T.coerceIn(range: ClosedComparableRange<T>): T {
if (range.isEmpty()) throw IllegalArgumentException("Cannot coerce value to an empty range: $range.") if (range.isEmpty()) throw IllegalArgumentException("Cannot coerce value to an empty range: $range.")
return when { return when {
!range.lessThanOrEquals(range.start, this) -> range.start // this < start equiv to this <= start && !(this >= start)
!range.lessThanOrEquals(this, range.endInclusive) -> range.endInclusive range.lessThanOrEquals(this, range.start) && !range.lessThanOrEquals(range.start, this) -> range.start
// this > end equiv to this >= end && !(this <= end)
range.lessThanOrEquals(range.endInclusive, this) && !range.lessThanOrEquals(this, range.endInclusive) -> range.endInclusive
else -> this else -> this
} }
} }
libraries/stdlib/test/ranges/CoercionTest.kt
+7
View File
@@ -67,8 +67,11 @@ class CoercionTest {
fun coercionsDouble() { fun coercionsDouble() {
expect(5.0) { 5.0.coerceAtLeast(1.0) } expect(5.0) { 5.0.coerceAtLeast(1.0) }
expect(5.0) { 1.0.coerceAtLeast(5.0) } expect(5.0) { 1.0.coerceAtLeast(5.0) }
assertTrue { Double.NaN.coerceAtLeast(1.0).isNaN() }
expect(1.0) { 5.0.coerceAtMost(1.0) } expect(1.0) { 5.0.coerceAtMost(1.0) }
expect(1.0) { 1.0.coerceAtMost(5.0) } expect(1.0) { 1.0.coerceAtMost(5.0) }
assertTrue { Double.NaN.coerceAtMost(5.0).isNaN() }
for (value in (0..10).map { it.toDouble() }) { for (value in (0..10).map { it.toDouble() }) {
expect(value) { value.coerceIn(null, null) } expect(value) { value.coerceIn(null, null) }
@@ -84,8 +87,12 @@ class CoercionTest {
assertFails { 1.0.coerceIn(1.0, 0.0) } assertFails { 1.0.coerceIn(1.0, 0.0) }
assertFails { 1.0.coerceIn(1.0..0.0) } assertFails { 1.0.coerceIn(1.0..0.0) }
assertTrue(0.0.equals(0.0.coerceIn(0.0, -0.0))) assertTrue(0.0.equals(0.0.coerceIn(0.0, -0.0)))
assertTrue((-0.0).equals((-0.0).coerceIn(0.0..-0.0))) assertTrue((-0.0).equals((-0.0).coerceIn(0.0..-0.0)))
assertTrue(Double.NaN.coerceIn(0.0, 1.0).isNaN())
assertTrue(Double.NaN.coerceIn(0.0..1.0).isNaN())
} }
@Test @Test
libraries/tools/kotlin-stdlib-gen/src/templates/Comparables.kt
+4 -2
View File
@@ -103,8 +103,10 @@ fun comparables(): List<GenericFunction> {
""" """
if (range.isEmpty()) throw IllegalArgumentException("Cannot coerce value to an empty range: ${'$'}range.") if (range.isEmpty()) throw IllegalArgumentException("Cannot coerce value to an empty range: ${'$'}range.")
return when { return when {
!range.lessThanOrEquals(range.start, this) -> range.start // this < start equiv to this <= start && !(this >= start)
!range.lessThanOrEquals(this, range.endInclusive) -> range.endInclusive range.lessThanOrEquals(this, range.start) && !range.lessThanOrEquals(range.start, this) -> range.start
// this > end equiv to this >= end && !(this <= end)
range.lessThanOrEquals(range.endInclusive, this) && !range.lessThanOrEquals(this, range.endInclusive) -> range.endInclusive
else -> this else -> this
} }
""" """