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

Simplify differenceModulo for unsigned operands

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-05-04 04:48:21 +03:00
parent f2c01a9d9b
commit e4216099b3
1 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/unsigned/src/kotlin/UProgressionUtil.kt
+12 -31
View File
@@ -5,36 +5,17 @@
package kotlin.internal package kotlin.internal
import kotlin.jvm.JvmName
// a mod b (in arithmetical sense)
@JvmName("umod")
private fun mod(a: UInt, b: Int): Int = (a % b.toUInt()).toInt()
private fun mod(a: Int, b: Int): Int {
val mod = a % b
return if (mod >= 0) mod else mod + b
}
@JvmName("umod")
private fun mod(a: ULong, b: Long): Long = (a % b.toULong()).toLong()
private fun mod(a: Long, b: Long): Long {
val mod = a % b
return if (mod >= 0) mod else mod + b
}
// (a - b) mod c // (a - b) mod c
private fun differenceModulo(a: UInt, b: UInt, c: Int): UInt { private fun differenceModulo(a: UInt, b: UInt, c: UInt): UInt {
return mod(mod(a, c) - mod(b, c), c).toUInt() val ac = a % c
val bc = b % c
return if (ac >= bc) ac - bc else ac - bc + c
} }
private fun differenceModulo(a: ULong, b: ULong, c: Long): ULong { private fun differenceModulo(a: ULong, b: ULong, c: ULong): ULong {
return mod(mod(a, c) - mod(b, c), c).toULong() val ac = a % c
val bc = b % c
return if (ac >= bc) ac - bc else ac - bc + c
} }
/** /**
@@ -55,8 +36,8 @@ private fun differenceModulo(a: ULong, b: ULong, c: Long): ULong {
*/ */
@PublishedApi @PublishedApi
internal fun getProgressionLastElement(start: UInt, end: UInt, step: Int): UInt = when { internal fun getProgressionLastElement(start: UInt, end: UInt, step: Int): UInt = when {
step > 0 -> if (start >= end) end else end - differenceModulo(end, start, step) step > 0 -> if (start >= end) end else end - differenceModulo(end, start, step.toUInt())
step < 0 -> if (start <= end) end else end + differenceModulo(start, end, -step) step < 0 -> if (start <= end) end else end + differenceModulo(start, end, (-step).toUInt())
else -> throw kotlin.IllegalArgumentException("Step is zero.") else -> throw kotlin.IllegalArgumentException("Step is zero.")
} }
@@ -78,7 +59,7 @@ internal fun getProgressionLastElement(start: UInt, end: UInt, step: Int): UInt
*/ */
@PublishedApi @PublishedApi
internal fun getProgressionLastElement(start: ULong, end: ULong, step: Long): ULong = when { internal fun getProgressionLastElement(start: ULong, end: ULong, step: Long): ULong = when {
step > 0 -> if (start >= end) end else end - differenceModulo(end, start, step) step > 0 -> if (start >= end) end else end - differenceModulo(end, start, step.toULong())
step < 0 -> if (start <= end) end else end + differenceModulo(start, end, -step) step < 0 -> if (start <= end) end else end + differenceModulo(start, end, (-step).toULong())
else -> throw kotlin.IllegalArgumentException("Step is zero.") else -> throw kotlin.IllegalArgumentException("Step is zero.")
} }