mod -> rem

Author: elect86

.idea/vcs.xml

@@ -5,40 +5,40 @@ import java.math.BigInteger
  */
 
 infix fun Byte.udiv(b: Byte) = (toUInt() / b.toUInt()).toByte()
-infix fun Byte.umod(b: Byte) = (toUInt() % b.toUInt()).toByte()
+infix fun Byte.urem(b: Byte) = (toUInt() % b.toUInt()).toByte()
 infix fun Byte.ucmp(b: Byte) = toUInt().compareTo(b.toUInt())
 infix fun Byte.ushr(b: Byte) = (toUInt() ushr b.toUInt()).toByte()
 
 infix fun Byte.udiv(b: Int) = (toUInt() / b).toByte()
-infix fun Byte.umod(b: Int) = (toUInt() % b).toByte()
+infix fun Byte.urem(b: Int) = (toUInt() % b).toByte()
 infix fun Byte.ucmp(b: Int) = toUInt().compareTo(b)
 infix fun Byte.ushr(b: Int) = (toUInt() ushr b).toByte()
 
 infix fun Short.udiv(b: Short) = (toUInt() / b.toUInt()).toShort()
-infix fun Short.umod(b: Short) = (toUInt() % b.toUInt()).toShort()
+infix fun Short.urem(b: Short) = (toUInt() % b.toUInt()).toShort()
 infix fun Short.ucmp(b: Short) = toUInt().compareTo(b.toUInt())
 infix fun Short.ushr(b: Short) = (toUInt() ushr b.toUInt()).toShort()
 
 infix fun Short.udiv(b: Int) = (toUInt() / b).toShort()
-infix fun Short.umod(b: Int) = (toUInt() % b).toShort()
+infix fun Short.urem(b: Int) = (toUInt() % b).toShort()
 infix fun Short.ucmp(b: Int) = toUInt().compareTo(b)
 infix fun Short.ushr(b: Int) = (toUInt() ushr b).toShort()
 
 infix fun Int.udiv(b: Byte) = Integer.divideUnsigned(this, b.toUInt())
-infix fun Int.umod(b: Byte) = Integer.remainderUnsigned(this, b.toUInt())
+infix fun Int.urem(b: Byte) = Integer.remainderUnsigned(this, b.toUInt())
 infix fun Int.ucmp(b: Byte) = Integer.compareUnsigned(this, b.toUInt())
 // Int.ushl(b: Int) is already provided by Kotlin lib
 infix fun Int.udiv(b: Short) = Integer.divideUnsigned(this, b.toUInt())
-infix fun Int.umod(b: Short) = Integer.remainderUnsigned(this, b.toUInt())
+infix fun Int.urem(b: Short) = Integer.remainderUnsigned(this, b.toUInt())
 infix fun Int.ucmp(b: Short) = Integer.compareUnsigned(this, b.toUInt())
 // Int.ushl(b: Int) is already provided by Kotlin lib
 infix fun Int.udiv(b: Int) = Integer.divideUnsigned(this, b)
-infix fun Int.umod(b: Int) = Integer.remainderUnsigned(this, b)
+infix fun Int.urem(b: Int) = Integer.remainderUnsigned(this, b)
 infix fun Int.ucmp(b: Int) = Integer.compareUnsigned(this, b)
 // Int.ushl(b: Int) is already provided by Kotlin lib
 
 infix fun Long.udiv(b: Long) = java.lang.Long.divideUnsigned(this, b)
-infix fun Long.umod(b: Long) = java.lang.Long.remainderUnsigned(this, b)
+infix fun Long.urem(b: Long) = java.lang.Long.remainderUnsigned(this, b)
 infix fun Long.ucmp(b: Long) = java.lang.Long.compareUnsigned(this, b)
 // Long.ushl(b: Long) is already provided by Kotlin lib
 

src/main/kotlin/unsigned.kt

@@ -42,24 +42,24 @@ class unsigned : StringSpec() {
         "primitive" {
 
             250.b udiv 50.b shouldBe 5.b
-            250.b umod 200.b shouldBe 50.b
+            250.b urem 200.b shouldBe 50.b
             250.b ucmp 251.b should be lt 1
             (250.b ucmp 250.b) shouldBe 0
             0b1010_1010.b ushr 4 shouldBe 0b1010.b
 
             65500.s udiv 500.s shouldBe 131.s
-            65500.s umod 65000.s shouldBe 500.s
+            65500.s urem 65000.s shouldBe 500.s
             65500.s ucmp 65501.s should be lt 1
             65500.s ucmp 65500.s shouldBe 0
             0b0100_1100_0011_1101.s ushr 8 shouldBe 0b100_1100.s
 
             4_000_000_000.i udiv 2 shouldBe 2_000_000_000
-            2_750_000_000.i umod 2_000_000_000 shouldBe 750_000_000
+            2_750_000_000.i urem 2_000_000_000 shouldBe 750_000_000
             4_000_000_000.i ucmp 4_000_000_001.i should be lt 1
             4_000_000_000.i ucmp 4_000_000_000.i shouldBe 0
 
             "18_000_000_000_000_000_000".L udiv 2L shouldBe "9'000'000'000'000'000'000".L
-            "17'000'000'000'000'000'000".L umod "9'000'000'000'000'000'000".L shouldBe "8'000'000'000'000'000'000".L
+            "17'000'000'000'000'000'000".L urem "9'000'000'000'000'000'000".L shouldBe "8'000'000'000'000'000'000".L
             "18'000'000'000'000'000'000".L ucmp "18'000'000'000'000'000'001".L should be lt 1
             "18'000'000'000'000'000'001".L ucmp "18'000'000'000'000'000'001".L shouldBe 0
         }