3.3.1+1

Author: elect86

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    val build = "0.7.3+7"
+    val build = "0.7.3+9"
     id("kx.kotlin") version build
     //    id("kx.dokka") version build
     id("kx.publish") version build

settings.gradle.kts

@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 gradle.rootProject {
-    version = "3.3.1"
+    version = "3.3.1+1"
 }
 
 //includeBuild("../build-logic")

src/main/kotlin/unsigned/Ulong.kt

@@ -38,7 +38,7 @@ data class Ulong(var v: Long = 0) : Number(), Comparable<Ulong> {
     override fun toDouble() = toBigInt().toDouble()
     override fun toFloat() = toBigInt().toFloat()
 
-    override fun toChar() = v.toChar()
+    override fun toChar() = v.toInt().toChar()
 
     operator fun inc() = Ulong(v + 1)
     operator fun dec() = Ulong(v - 1)

src/main/kotlin/unsigned/Ushort.kt

@@ -44,7 +44,7 @@ data class Ushort(var v: Short = 0) : Number(), Comparable<Ushort> {
     override fun toDouble() = toInt().toDouble()
     override fun toFloat() = toInt().toFloat()
 
-    override fun toChar() = v.toChar()
+    override fun toChar() = v.toInt().toChar()
 
     operator fun inc() = Ushort(v + 1)
     operator fun dec() = Ushort(v - 1)

src/main/kotlin/unsigned/arrays.kt

@@ -4,7 +4,8 @@ package unsigned
 fun UbyteArray(size: Int) = UbyteArray(ByteArray(size))
 fun UbyteArray(size: Int, init: (Int) -> Byte) = UbyteArray(ByteArray(size, init))
 
-inline class UbyteArray(val data: ByteArray) {
+@JvmInline
+value class UbyteArray(val data: ByteArray) {
 
     operator fun get(index: Int) = Ubyte(data[index])
 
@@ -17,7 +18,8 @@ inline class UbyteArray(val data: ByteArray) {
 fun UshortArray(size: Int) = UshortArray(ShortArray(size))
 fun UshortArray(size: Int, init: (Int) -> Short) = UshortArray(ShortArray(size, init))
 
-inline class UshortArray(val data: ShortArray) {
+@JvmInline
+value class UshortArray(val data: ShortArray) {
 
     operator fun get(index: Int) = Ushort(data[index])
 
@@ -30,7 +32,8 @@ inline class UshortArray(val data: ShortArray) {
 fun UintArray(size: Int) = UintArray(IntArray(size))
 fun UintArray(size: Int, init: (Int) -> Int) = UintArray(IntArray(size, init))
 
-inline class UintArray(val data: IntArray) {
+@JvmInline
+value class UintArray(val data: IntArray) {
 
     operator fun get(index: Int) = Uint(data[index])
 
@@ -42,7 +45,8 @@ inline class UintArray(val data: IntArray) {
 fun UlongArray(size: Int) = UlongArray(LongArray(size))
 fun UlongArray(size: Int, init: (Int) -> Long) = UlongArray(LongArray(size, init))
 
-inline class UlongArray(val data: LongArray) {
+@JvmInline
+value class UlongArray(val data: LongArray) {
 
     operator fun get(index: Int) = Ulong(data[index])
 

src/main/kotlin/unsigned/unsigned.kt

@@ -13,7 +13,7 @@ fun Number.toUshort() = Ushort(toShort())
 
 // TODO char?
 
-fun Char.toUbyte() = Ubyte(toByte())
-fun Char.toUint() = Uint(toInt())
-fun Char.toUlong() = Ulong(toLong())
-fun Char.toUshort() = Ushort(toShort())
+fun Char.toUbyte() = Ubyte(code.toByte())
+fun Char.toUint() = Uint(code)
+fun Char.toUlong() = Ulong(code.toLong())
+fun Char.toUshort() = Ushort(code.toShort())

src/test/kotlin/unsigned/uint.kt

@@ -23,9 +23,9 @@ class `Uint test` : StringSpec() {
             a.toBigInt() shouldBe BigInteger.valueOf(0xffff_ffff)
             a.toDouble() shouldBe 0xffff_ffff.toDouble()
             a.toFloat() shouldBe 0xffff_ffff.toFloat()
-            a.toLong() shouldBe 0xffff_ffff.toLong()
+            a.toLong() shouldBe 0xffff_ffff
             a.toInt() shouldBe 0xffff_ffff.toInt()
-            a.toChar() shouldBe 0xffff_ffff.toChar()
+            a.toChar() shouldBe 0xffff_ffff.toInt().toChar()
             a.toShort() shouldBe 0xffff_ffff.s
             a.toByte() shouldBe 0xffff_ffff.b
 

src/test/kotlin/unsigned/ulong.kt

@@ -20,9 +20,9 @@ class `Ulong test` : StringSpec() {
             a.toBigInt() shouldBe max.toUBigInt()
             a.toDouble() shouldBe max.toUBigInt().toDouble()
             a.toFloat() shouldBe max.toUBigInt().toFloat()
-            a.toLong() shouldBe max.toLong()
+            a.toLong() shouldBe max
             a.toInt() shouldBe max.toInt()
-            a.toChar() shouldBe max.toChar()
+            a.toChar() shouldBe max.toInt().toChar()
             a.toShort() shouldBe max.s
             a.toByte() shouldBe max.b