- kotlin 1.1 beta

- fixed byte extensions

Author: elect86

build.gradle.kts

@@ -1,13 +1,11 @@
-val kotlinVersion = "1.1-M04"
-
 buildscript {
 
     repositories {
         gradleScriptKotlin()
     }
 
     dependencies {
-        classpath(kotlinModule("gradle-plugin", "1.1-M04"))
+        classpath(kotlinModule("gradle-plugin", "1.1.0-beta-17"))
     }
 }
 
@@ -21,11 +19,6 @@ repositories {
 }
 
 dependencies {
-    compile(kotlinModule("stdlib", "1.1-M04"))
+    compile(kotlinModule("stdlib", "1.1.0-beta-17"))
     testCompile("io.kotlintest:kotlintest:1.3.5")
-}
-
-
-task("embeddedKotlinVersion") {
-    println("$embeddedKotlinVersion")
 }

src/main/kotlin/Byte.kt

@@ -0,0 +1,28 @@
+/**
+ * Created by elect on 19/01/2017.
+ */
+
+infix fun Byte.udiv(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.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()
+
+fun Byte.toUbyte() = Ubyte(this)
+fun Byte.toUint() = Uint(toUInt())
+fun Byte.toUlong() = Ulong(toUInt())
+fun Byte.toUshort() = Ushort(toUInt())
+
+val Byte.ub
+    get() = toUbyte()
+val Byte.ui
+    get() = toUint()
+val Byte.ul
+    get() = toUlong()
+val Byte.us
+    get() = toUshort()

src/main/kotlin/unsigned.kt

@@ -4,15 +4,7 @@ import java.math.BigInteger
  * Created by GBarbieri on 06.10.2016.
  */
 
-infix fun Byte.udiv(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.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.urem(b: Short) = (toUInt() % b.toUInt()).toShort()
@@ -44,7 +36,7 @@ infix fun Long.ucmp(b: Long) = java.lang.Long.compareUnsigned(this, b)
 
 // TODO if == Ubyte?
 fun Number.toUbyte() = Ubyte(toByte())
-fun Number.toUint() = Uint(toInt())
+fun Number.toUint() = Uint(this)
 fun Number.toUlong() = Ulong(toLong())
 fun Number.toUshort() = Ushort(toShort())
 

src/test/kotlin/test.kt

@@ -0,0 +1,16 @@
+/**
+ * Created by elect on 19/01/2017.
+ */
+
+val Number.ui
+    get() = toUint()
+val Int.b
+    get() = toByte()
+
+fun main(args: Array<String>) {
+
+    val b = 255.b
+    println(b.toUInt())
+    println(b.toUint())
+    println(b.ui)
+}

src/test/kotlin/unsigned.kt

@@ -1,5 +1,4 @@
 import io.kotlintest.KTestJUnitRunner
-import io.kotlintest.matchers.Matchers
 import io.kotlintest.matchers.be
 import io.kotlintest.specs.StringSpec
 import org.junit.runner.RunWith
@@ -12,18 +11,19 @@ import java.math.BigInteger
 @RunWith(KTestJUnitRunner::class)
 class unsigned : StringSpec() {
 
-    val Int.b: Byte
-        get() = this.toByte()
-    val Int.s: Short
-        get() = this.toShort()
-    val Long.b: Byte
-        get() = this.toByte()
-    val Long.s: Short
-        get() = this.toShort()
-    val Long.i: Int
-        get() = this.toInt()
-    val BigInteger.L: Long
-        get() = this.toLong()
+    val Int.b
+        get() = toByte()
+    val Int.s
+        get() = toShort()
+    val Long.b
+        get() = toByte()
+    val Long.s
+        get() = toShort()
+    val Long.i
+        get() = toInt()
+    val BigInteger.L
+        get() = toLong()
+
     /**
      * BUG, 0xffffffffffffffff is outside Long range
      * https://youtrack.jetbrains.com/issue/KT-4749