up

Author: elect86

.idea/modules/kotlin-unsigned.iml

@@ -5,7 +5,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.51'
+    ext.kotlinVersion = '1.3-M1'
 
     repositories {
         jcenter()   // shadow

build.gradle

@@ -12,14 +12,15 @@ import kotlin.experimental.inv
  * Created by GBarbieri on 20.03.2017.
  */
 
-data class Ubyte(var v: Byte = 0) : Number() {
+@Suppress("NON_PUBLIC_PRIMARY_CONSTRUCTOR_OF_INLINE_CLASS")
+public inline class Ubyte(val v: Byte) : Number() {
 
     companion object {
 
         /** A constant holding the minimum value an <code>unsigned byte</code> can have, 0. */
         const val MIN_VALUE = 0x00
         /** A constant holding the maximum value an <code>unsigned byte</code> can have, 2<sup>8</sup>-1.   */
-        const val MAX_VALUE = 0xff
+        const val MAX_VALUE: Int = 0xff
 
         fun checkSigned(v: Number) = v.toInt() in MIN_VALUE..MAX_VALUE
     }

src/main/kotlin/unsigned/Ubyte.kt

@@ -19,19 +19,17 @@ fun compare(a: Int, b: Int) = if (a < b) -1 else if (a == b) 0 else 1
 fun String.parseUnsignedInt(radix: Int): Int {
 
     if (length > 0) {
-        val firstChar = this[0]
-        if (firstChar == '-')
-            throw NumberFormatException(String.format("Illegal leading minus sign " + "on unsigned string %s.", this))
-        else {
-            if (length <= 5 || // Integer.MAX_VALUE in Character.MAX_RADIX is 6 digits
-                    radix == 10 && length <= 9) // Integer.MAX_VALUE in base 10 is 10 digits
-                return this.toInt(radix)
-            else {
-                val ell = this.toLong(radix)
-                if (ell and BigInteger("ffffffff00000000", 16).toLong() == 0L)
-                    return ell.toInt()
-                else
-                    throw NumberFormatException(String.format("String value %s exceeds " + "range of unsigned int.", this))
+        return when (this[0]) {
+            '-' -> throw NumberFormatException(String.format("Illegal leading minus sign " + "on unsigned string %s.", this))
+            else -> when {
+                length <= 5 || /* Integer.MAX_VALUE in Character.MAX_RADIX is 6 digits */ radix == 10 && length <= 9 /* Integer.MAX_VALUE in base 10 is 10 digits*/ -> this.toInt(radix)
+                else -> {
+                    val ell = this.toLong(radix)
+                    when {
+                        ell and BigInteger("ffffffff00000000", 16).toLong() == 0L -> ell.toInt()
+                        else -> throw NumberFormatException(String.format("String value %s exceeds " + "range of unsigned int.", this))
+                    }
+                }
             }
         }
     } else throw NumberFormatException("For input string: $this")

src/main/kotlin/unsigned/java_1_7/int.kt

@@ -1,5 +1,8 @@
 package unsigned
 
+
+import kotlin.UByte
+
 /**
  * Created by GBarbieri on 06.10.2016.
  */
@@ -18,3 +21,8 @@ fun Char.toUint() = Uint(toInt())
 fun Char.toUlong() = Ulong(toLong())
 fun Char.toUshort() = Ushort(toShort())
 
+
+fun main(args: Array<String>) {
+
+    val a = Int
+}