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

Implement unsigned arithmetic operations including ulong division and remainder

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-05-04 23:52:37 +03:00
parent e01895fb0a
commit e988ea5a1c
6 changed files with 148 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/unsigned/src/kotlin/UByte.kt
+22 -22
View File
@@ -52,54 +52,54 @@ public inline class UByte internal constructor(private val data: Byte) : Compara
public operator fun compareTo(other: ULong): Int = this.toULong().compareTo(other)
/** Adds the other value to this value. */
public operator fun plus(other: UByte): UInt = TODO()
public operator fun plus(other: UByte): UInt = this.toUInt().plus(other.toUInt())
/** Adds the other value to this value. */
public operator fun plus(other: UShort): UInt = TODO()
public operator fun plus(other: UShort): UInt = this.toUInt().plus(other.toUInt())
/** Adds the other value to this value. */
public operator fun plus(other: UInt): UInt = TODO()
public operator fun plus(other: UInt): UInt = this.toUInt().plus(other)
/** Adds the other value to this value. */
public operator fun plus(other: ULong): ULong = TODO()
public operator fun plus(other: ULong): ULong = this.toULong().plus(other)
/** Subtracts the other value from this value. */
public operator fun minus(other: UByte): UInt = TODO()
public operator fun minus(other: UByte): UInt = this.toUInt().minus(other.toUInt())
/** Subtracts the other value from this value. */
public operator fun minus(other: UShort): UInt = TODO()
public operator fun minus(other: UShort): UInt = this.toUInt().minus(other.toUInt())
/** Subtracts the other value from this value. */
public operator fun minus(other: UInt): UInt = TODO()
public operator fun minus(other: UInt): UInt = this.toUInt().minus(other)
/** Subtracts the other value from this value. */
public operator fun minus(other: ULong): ULong = TODO()
public operator fun minus(other: ULong): ULong = this.toULong().minus(other)
/** Multiplies this value by the other value. */
public operator fun times(other: UByte): UInt = TODO()
public operator fun times(other: UByte): UInt = this.toUInt().times(other.toUInt())
/** Multiplies this value by the other value. */
public operator fun times(other: UShort): UInt = TODO()
public operator fun times(other: UShort): UInt = this.toUInt().times(other.toUInt())
/** Multiplies this value by the other value. */
public operator fun times(other: UInt): UInt = TODO()
public operator fun times(other: UInt): UInt = this.toUInt().times(other)
/** Multiplies this value by the other value. */
public operator fun times(other: ULong): ULong = TODO()
public operator fun times(other: ULong): ULong = this.toULong().times(other)
/** Divides this value by the other value. */
public operator fun div(other: UByte): UInt = TODO()
public operator fun div(other: UByte): UInt = this.toUInt().div(other.toUInt())
/** Divides this value by the other value. */
public operator fun div(other: UShort): UInt = TODO()
public operator fun div(other: UShort): UInt = this.toUInt().div(other.toUInt())
/** Divides this value by the other value. */
public operator fun div(other: UInt): UInt = TODO()
public operator fun div(other: UInt): UInt = this.toUInt().div(other)
/** Divides this value by the other value. */
public operator fun div(other: ULong): ULong = TODO()
public operator fun div(other: ULong): ULong = this.toULong().div(other)
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UByte): UInt = TODO()
public operator fun rem(other: UByte): UInt = this.toUInt().rem(other.toUInt())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UShort): UInt = TODO()
public operator fun rem(other: UShort): UInt = this.toUInt().rem(other.toUInt())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UInt): UInt = TODO()
public operator fun rem(other: UInt): UInt = this.toUInt().rem(other)
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: ULong): ULong = TODO()
public operator fun rem(other: ULong): ULong = this.toULong().rem(other)
/** Increments this value. */
public operator fun inc(): UByte = TODO()
public operator fun inc(): UByte = UByte(data.inc())
/** Decrements this value. */
public operator fun dec(): UByte = TODO()
public operator fun dec(): UByte = UByte(data.dec())
/** Creates a range from this value to the specified [other] value. */
public operator fun rangeTo(other: UByte): UIntRange = UIntRange(this.toUInt(), other.toUInt())
libraries/stdlib/unsigned/src/kotlin/UInt.kt
+22 -22
View File
@@ -52,54 +52,54 @@ public inline class UInt internal constructor(private val data: Int) : Comparabl
public operator fun compareTo(other: ULong): Int = this.toULong().compareTo(other)
/** Adds the other value to this value. */
public operator fun plus(other: UByte): UInt = TODO()
public operator fun plus(other: UByte): UInt = this.plus(other.toUInt())
/** Adds the other value to this value. */
public operator fun plus(other: UShort): UInt = TODO()
public operator fun plus(other: UShort): UInt = this.plus(other.toUInt())
/** Adds the other value to this value. */
public operator fun plus(other: UInt): UInt = TODO()
public operator fun plus(other: UInt): UInt = UInt(this.data.plus(other.data))
/** Adds the other value to this value. */
public operator fun plus(other: ULong): ULong = TODO()
public operator fun plus(other: ULong): ULong = this.toULong().plus(other)
/** Subtracts the other value from this value. */
public operator fun minus(other: UByte): UInt = TODO()
public operator fun minus(other: UByte): UInt = this.minus(other.toUInt())
/** Subtracts the other value from this value. */
public operator fun minus(other: UShort): UInt = TODO()
public operator fun minus(other: UShort): UInt = this.minus(other.toUInt())
/** Subtracts the other value from this value. */
public operator fun minus(other: UInt): UInt = TODO()
public operator fun minus(other: UInt): UInt = UInt(this.data.minus(other.data))
/** Subtracts the other value from this value. */
public operator fun minus(other: ULong): ULong = TODO()
public operator fun minus(other: ULong): ULong = this.toULong().minus(other)
/** Multiplies this value by the other value. */
public operator fun times(other: UByte): UInt = TODO()
public operator fun times(other: UByte): UInt = this.times(other.toUInt())
/** Multiplies this value by the other value. */
public operator fun times(other: UShort): UInt = TODO()
public operator fun times(other: UShort): UInt = this.times(other.toUInt())
/** Multiplies this value by the other value. */
public operator fun times(other: UInt): UInt = TODO()
public operator fun times(other: UInt): UInt = UInt(this.data.times(other.data))
/** Multiplies this value by the other value. */
public operator fun times(other: ULong): ULong = TODO()
public operator fun times(other: ULong): ULong = this.toULong().times(other)
/** Divides this value by the other value. */
public operator fun div(other: UByte): UInt = TODO()
public operator fun div(other: UByte): UInt = this.div(other.toUInt())
/** Divides this value by the other value. */
public operator fun div(other: UShort): UInt = TODO()
public operator fun div(other: UShort): UInt = this.div(other.toUInt())
/** Divides this value by the other value. */
public operator fun div(other: UInt): UInt = TODO()
public operator fun div(other: UInt): UInt = uintDivide(this, other)
/** Divides this value by the other value. */
public operator fun div(other: ULong): ULong = TODO()
public operator fun div(other: ULong): ULong = this.toULong().div(other)
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UByte): UInt = TODO()
public operator fun rem(other: UByte): UInt = this.rem(other.toUInt())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UShort): UInt = TODO()
public operator fun rem(other: UShort): UInt = this.rem(other.toUInt())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UInt): UInt = TODO()
public operator fun rem(other: UInt): UInt = uintRemainder(this, other)
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: ULong): ULong = TODO()
public operator fun rem(other: ULong): ULong = this.toULong().rem(other)
/** Increments this value. */
public operator fun inc(): UInt = TODO()
public operator fun inc(): UInt = UInt(data.inc())
/** Decrements this value. */
public operator fun dec(): UInt = TODO()
public operator fun dec(): UInt = UInt(data.dec())
/** Creates a range from this value to the specified [other] value. */
public operator fun rangeTo(other: UInt): UIntRange = UIntRange(this, other)
libraries/stdlib/unsigned/src/kotlin/ULong.kt
+22 -22
View File
@@ -52,54 +52,54 @@ public inline class ULong internal constructor(private val data: Long) : Compara
public override operator fun compareTo(other: ULong): Int = ulongCompare(this.data, other.data)
/** Adds the other value to this value. */
public operator fun plus(other: UByte): ULong = TODO()
public operator fun plus(other: UByte): ULong = this.plus(other.toULong())
/** Adds the other value to this value. */
public operator fun plus(other: UShort): ULong = TODO()
public operator fun plus(other: UShort): ULong = this.plus(other.toULong())
/** Adds the other value to this value. */
public operator fun plus(other: UInt): ULong = TODO()
public operator fun plus(other: UInt): ULong = this.plus(other.toULong())
/** Adds the other value to this value. */
public operator fun plus(other: ULong): ULong = TODO()
public operator fun plus(other: ULong): ULong = ULong(this.data.plus(other.data))
/** Subtracts the other value from this value. */
public operator fun minus(other: UByte): ULong = TODO()
public operator fun minus(other: UByte): ULong = this.minus(other.toULong())
/** Subtracts the other value from this value. */
public operator fun minus(other: UShort): ULong = TODO()
public operator fun minus(other: UShort): ULong = this.minus(other.toULong())
/** Subtracts the other value from this value. */
public operator fun minus(other: UInt): ULong = TODO()
public operator fun minus(other: UInt): ULong = this.minus(other.toULong())
/** Subtracts the other value from this value. */
public operator fun minus(other: ULong): ULong = TODO()
public operator fun minus(other: ULong): ULong = ULong(this.data.minus(other.data))
/** Multiplies this value by the other value. */
public operator fun times(other: UByte): ULong = TODO()
public operator fun times(other: UByte): ULong = this.times(other.toULong())
/** Multiplies this value by the other value. */
public operator fun times(other: UShort): ULong = TODO()
public operator fun times(other: UShort): ULong = this.times(other.toULong())
/** Multiplies this value by the other value. */
public operator fun times(other: UInt): ULong = TODO()
public operator fun times(other: UInt): ULong = this.times(other.toULong())
/** Multiplies this value by the other value. */
public operator fun times(other: ULong): ULong = TODO()
public operator fun times(other: ULong): ULong = ULong(this.data.times(other.data))
/** Divides this value by the other value. */
public operator fun div(other: UByte): ULong = TODO()
public operator fun div(other: UByte): ULong = this.div(other.toULong())
/** Divides this value by the other value. */
public operator fun div(other: UShort): ULong = TODO()
public operator fun div(other: UShort): ULong = this.div(other.toULong())
/** Divides this value by the other value. */
public operator fun div(other: UInt): ULong = TODO()
public operator fun div(other: UInt): ULong = this.div(other.toULong())
/** Divides this value by the other value. */
public operator fun div(other: ULong): ULong = TODO()
public operator fun div(other: ULong): ULong = ulongDivide(this, other)
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UByte): ULong = TODO()
public operator fun rem(other: UByte): ULong = this.rem(other.toULong())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UShort): ULong = TODO()
public operator fun rem(other: UShort): ULong = this.rem(other.toULong())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UInt): ULong = TODO()
public operator fun rem(other: UInt): ULong = this.rem(other.toULong())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: ULong): ULong = TODO()
public operator fun rem(other: ULong): ULong = ulongRemainder(this, other)
/** Increments this value. */
public operator fun inc(): ULong = TODO()
public operator fun inc(): ULong = ULong(data.inc())
/** Decrements this value. */
public operator fun dec(): ULong = TODO()
public operator fun dec(): ULong = ULong(data.dec())
/** Creates a range from this value to the specified [other] value. */
public operator fun rangeTo(other: ULong): ULongRange = ULongRange(this, other)
libraries/stdlib/unsigned/src/kotlin/UShort.kt
+22 -22
View File
@@ -52,54 +52,54 @@ public inline class UShort internal constructor(private val data: Short) : Compa
public operator fun compareTo(other: ULong): Int = this.toULong().compareTo(other)
/** Adds the other value to this value. */
public operator fun plus(other: UByte): UInt = TODO()
public operator fun plus(other: UByte): UInt = this.toUInt().plus(other.toUInt())
/** Adds the other value to this value. */
public operator fun plus(other: UShort): UInt = TODO()
public operator fun plus(other: UShort): UInt = this.toUInt().plus(other.toUInt())
/** Adds the other value to this value. */
public operator fun plus(other: UInt): UInt = TODO()
public operator fun plus(other: UInt): UInt = this.toUInt().plus(other)
/** Adds the other value to this value. */
public operator fun plus(other: ULong): ULong = TODO()
public operator fun plus(other: ULong): ULong = this.toULong().plus(other)
/** Subtracts the other value from this value. */
public operator fun minus(other: UByte): UInt = TODO()
public operator fun minus(other: UByte): UInt = this.toUInt().minus(other.toUInt())
/** Subtracts the other value from this value. */
public operator fun minus(other: UShort): UInt = TODO()
public operator fun minus(other: UShort): UInt = this.toUInt().minus(other.toUInt())
/** Subtracts the other value from this value. */
public operator fun minus(other: UInt): UInt = TODO()
public operator fun minus(other: UInt): UInt = this.toUInt().minus(other)
/** Subtracts the other value from this value. */
public operator fun minus(other: ULong): ULong = TODO()
public operator fun minus(other: ULong): ULong = this.toULong().minus(other)
/** Multiplies this value by the other value. */
public operator fun times(other: UByte): UInt = TODO()
public operator fun times(other: UByte): UInt = this.toUInt().times(other.toUInt())
/** Multiplies this value by the other value. */
public operator fun times(other: UShort): UInt = TODO()
public operator fun times(other: UShort): UInt = this.toUInt().times(other.toUInt())
/** Multiplies this value by the other value. */
public operator fun times(other: UInt): UInt = TODO()
public operator fun times(other: UInt): UInt = this.toUInt().times(other)
/** Multiplies this value by the other value. */
public operator fun times(other: ULong): ULong = TODO()
public operator fun times(other: ULong): ULong = this.toULong().times(other)
/** Divides this value by the other value. */
public operator fun div(other: UByte): UInt = TODO()
public operator fun div(other: UByte): UInt = this.toUInt().div(other.toUInt())
/** Divides this value by the other value. */
public operator fun div(other: UShort): UInt = TODO()
public operator fun div(other: UShort): UInt = this.toUInt().div(other.toUInt())
/** Divides this value by the other value. */
public operator fun div(other: UInt): UInt = TODO()
public operator fun div(other: UInt): UInt = this.toUInt().div(other)
/** Divides this value by the other value. */
public operator fun div(other: ULong): ULong = TODO()
public operator fun div(other: ULong): ULong = this.toULong().div(other)
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UByte): UInt = TODO()
public operator fun rem(other: UByte): UInt = this.toUInt().rem(other.toUInt())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UShort): UInt = TODO()
public operator fun rem(other: UShort): UInt = this.toUInt().rem(other.toUInt())
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: UInt): UInt = TODO()
public operator fun rem(other: UInt): UInt = this.toUInt().rem(other)
/** Calculates the remainder of dividing this value by the other value. */
public operator fun rem(other: ULong): ULong = TODO()
public operator fun rem(other: ULong): ULong = this.toULong().rem(other)
/** Increments this value. */
public operator fun inc(): UShort = TODO()
public operator fun inc(): UShort = UShort(data.inc())
/** Decrements this value. */
public operator fun dec(): UShort = TODO()
public operator fun dec(): UShort = UShort(data.dec())
/** Creates a range from this value to the specified [other] value. */
public operator fun rangeTo(other: UShort): UIntRange = UIntRange(this.toUInt(), other.toUInt())
libraries/stdlib/unsigned/src/kotlin/UnsignedUtils.kt
+46 -1
View File
@@ -6,4 +6,49 @@
package kotlin
internal fun uintCompare(v1: Int, v2: Int): Int = (v1 xor Int.MIN_VALUE).compareTo(v2 xor Int.MIN_VALUE)
internal fun ulongCompare(v1: Long, v2: Long): Int = (v1 xor Long.MIN_VALUE).compareTo(v2 xor Long.MIN_VALUE)
internal fun ulongCompare(v1: Long, v2: Long): Int = (v1 xor Long.MIN_VALUE).compareTo(v2 xor Long.MIN_VALUE)
internal fun uintDivide(v1: UInt, v2: UInt): UInt = (v1.toLong() / v2.toLong()).toUInt()
internal fun uintRemainder(v1: UInt, v2: UInt): UInt = (v1.toLong() / v2.toLong()).toUInt()
// TODO: Add reference to Guava implementation source
internal fun ulongDivide(v1: ULong, v2: ULong): ULong {
val dividend = v1.toLong()
val divisor = v2.toLong()
if (divisor < 0) { // i.e., divisor >= 2^63:
return if (v1 < v2) ULong(0) else ULong(1)
}
// Optimization - use signed division if both dividend and divisor < 2^63
if (dividend >= 0) {
return ULong(dividend / divisor)
}
// Otherwise, approximate the quotient, check, and correct if necessary.
val quotient = ((dividend ushr 1) / divisor) shl 1
val rem = dividend - quotient * divisor
return ULong(quotient + if (ULong(rem) >= ULong(divisor)) 1 else 0)
}
internal fun ulongRemainder(v1: ULong, v2: ULong): ULong {
val dividend = v1.toLong()
val divisor = v2.toLong()
if (divisor < 0) { // i.e., divisor >= 2^63:
return if (v1 < v2) {
v1 // dividend < divisor
} else {
v1 - v2 // dividend >= divisor
}
}
// Optimization - use signed modulus if both dividend and divisor < 2^63
if (dividend >= 0) {
return ULong(dividend % divisor)
}
// Otherwise, approximate the quotient, check, and correct if necessary.
val quotient = ((dividend ushr 1) / divisor) shl 1
val rem = dividend - quotient * divisor
return ULong(rem - if (ULong(rem) >= ULong(divisor)) divisor else 0)
}