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

Make bound check helpers top-level so they are compiled as static on JVM

Browse Source 
Improve empty range exception text in nextInt/nextLong(range)
This commit is contained in:
Ilya Gorbunov
2018-07-06 16:48:23 +03:00
parent 35c927214d
commit 2ce0bca34e
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/random/Random.kt
+9 -7
View File
@@ -87,6 +87,7 @@ public abstract class Random {
* @throws IllegalArgumentException if [range] is empty. * @throws IllegalArgumentException if [range] is empty.
*/ */
public open fun nextInt(range: IntRange): Int = when { public open fun nextInt(range: IntRange): Int = when {
range.isEmpty() -> throw IllegalArgumentException("Cannot get random in empty range: $range")
range.last < Int.MAX_VALUE -> nextInt(range.first, range.last + 1) range.last < Int.MAX_VALUE -> nextInt(range.first, range.last + 1)
range.first > Int.MIN_VALUE -> nextInt(range.first - 1, range.last) + 1 range.first > Int.MIN_VALUE -> nextInt(range.first - 1, range.last) + 1
else -> nextInt() else -> nextInt()
@@ -165,7 +166,7 @@ public abstract class Random {
* @throws IllegalArgumentException if [range] is empty. * @throws IllegalArgumentException if [range] is empty.
*/ */
public open fun nextLong(range: LongRange): Long = when { public open fun nextLong(range: LongRange): Long = when {
// range.isEmpty() -> throw IllegalArgumentException("Cannot get random in empty range: $range") range.isEmpty() -> throw IllegalArgumentException("Cannot get random in empty range: $range")
range.last < Long.MAX_VALUE -> nextLong(range.start, range.endInclusive + 1) range.last < Long.MAX_VALUE -> nextLong(range.start, range.endInclusive + 1)
range.start > Long.MIN_VALUE -> nextLong(range.start - 1, range.endInclusive) + 1 range.start > Long.MIN_VALUE -> nextLong(range.start - 1, range.endInclusive) + 1
else -> nextLong() else -> nextLong()
@@ -296,11 +297,6 @@ public abstract class Random {
override fun nextBytes(array: ByteArray, fromIndex: Int, toIndex: Int): ByteArray = defaultRandom.nextBytes(array, fromIndex, toIndex) override fun nextBytes(array: ByteArray, fromIndex: Int, toIndex: Int): ByteArray = defaultRandom.nextBytes(array, fromIndex, toIndex)
internal fun checkRangeBounds(origin: Int, bound: Int) = require(bound > origin) { boundsErrorMessage(origin, bound) }
internal fun checkRangeBounds(origin: Long, bound: Long) = require(bound > origin) { boundsErrorMessage(origin, bound) }
internal fun checkRangeBounds(origin: Double, bound: Double) = require(bound > origin) { boundsErrorMessage(origin, bound) }
private fun boundsErrorMessage(origin: Any, bound: Any) = "Random range is empty: [$origin, $bound)."
} }
} }
@@ -331,4 +327,10 @@ internal expect fun doubleFromParts(hi26: Int, low27: Int): Double
/** Takes upper [bitCount] bits (0..32) from this number. */ /** Takes upper [bitCount] bits (0..32) from this number. */
internal fun Int.takeUpperBits(bitCount: Int): Int = internal fun Int.takeUpperBits(bitCount: Int): Int =
this.ushr(32 - bitCount) and (-bitCount).shr(31) this.ushr(32 - bitCount) and (-bitCount).shr(31)
internal fun checkRangeBounds(origin: Int, bound: Int) = require(bound > origin) { boundsErrorMessage(origin, bound) }
internal fun checkRangeBounds(origin: Long, bound: Long) = require(bound > origin) { boundsErrorMessage(origin, bound) }
internal fun checkRangeBounds(origin: Double, bound: Double) = require(bound > origin) { boundsErrorMessage(origin, bound) }
private fun boundsErrorMessage(origin: Any, bound: Any) = "Random range is empty: [$origin, $bound)."