Infendro/bytes.kt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Wiki Activity

refactor

Browse Source
This commit is contained in:
Infendro
2025-12-12 21:20:44 +01:00
parent be9a8a4369
commit 01327ef4b2
12 changed files with 197 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/commonMain/kotlin/com/infendro/bytearray/ByteArray.kt
View File

@@ -8,7 +8,8 @@ import kotlin.experimental.xor
infix fun ByteArray.and( infix fun ByteArray.and(
that: ByteArray, that: ByteArray,
): ByteArray { ): ByteArray {
if (this.size != that.size) throw Exception() if (this.size != that.size)
throw IllegalArgumentException()
return ByteArray(size) { i -> return ByteArray(size) { i ->
this[i] and that[i] this[i] and that[i]
@@ -18,7 +19,8 @@ infix fun ByteArray.and(
infix fun ByteArray.or( infix fun ByteArray.or(
that: ByteArray, that: ByteArray,
): ByteArray { ): ByteArray {
if (this.size != that.size) throw Exception() if (this.size != that.size)
throw IllegalArgumentException()
return ByteArray(size) { i -> return ByteArray(size) { i ->
this[i] or that[i] this[i] or that[i]
@@ -28,7 +30,8 @@ infix fun ByteArray.or(
infix fun ByteArray.xor( infix fun ByteArray.xor(
that: ByteArray, that: ByteArray,
): ByteArray { ): ByteArray {
if (this.size != that.size) throw Exception() if (this.size != that.size)
throw IllegalArgumentException()
return ByteArray(size) { i -> return ByteArray(size) { i ->
this[i] xor that[i] this[i] xor that[i]
@@ -62,10 +65,11 @@ fun ByteArray.padEnd(
fun ByteArray.toInt( fun ByteArray.toInt(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): Int { ): Int {
if (size != 4) throw Exception() if (size != 4)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0) { acc, byte -> .fold(0) { acc, byte ->
(acc shl 8) or (byte.toInt() and 0xFF) (acc shl 8) or (byte.toInt() and 0xFF)
} }
} }
@@ -73,7 +77,8 @@ fun ByteArray.toInt(
fun ByteArray.toIntArray( fun ByteArray.toIntArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): IntArray { ): IntArray {
if (size % 4 != 0) throw Exception() if (size % 4 != 0)
throw IllegalArgumentException()
return toList() return toList()
.chunked(4) { it.toByteArray() } .chunked(4) { it.toByteArray() }
@@ -84,10 +89,11 @@ fun ByteArray.toIntArray(
fun ByteArray.toLong( fun ByteArray.toLong(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): Long { ): Long {
if (size != 8) throw Exception() if (size != 8)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0L) { acc, byte -> .fold(0L) { acc, byte ->
(acc shl 8) or (byte.toLong() and 0xFFL) (acc shl 8) or (byte.toLong() and 0xFFL)
} }
} }
@@ -95,7 +101,8 @@ fun ByteArray.toLong(
fun ByteArray.toLongArray( fun ByteArray.toLongArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): LongArray { ): LongArray {
if (size % 8 != 0) throw Exception() if (size % 8 != 0)
throw IllegalArgumentException()
return toList() return toList()
.chunked(8) { it.toByteArray() } .chunked(8) { it.toByteArray() }
@@ -106,10 +113,11 @@ fun ByteArray.toLongArray(
fun ByteArray.toUInt( fun ByteArray.toUInt(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): UInt { ): UInt {
if (size != 4) throw Exception() if (size != 4)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0U) { acc, byte -> .fold(0U) { acc, byte ->
(acc shl 8) or (byte.toUInt() and 0xFFU) (acc shl 8) or (byte.toUInt() and 0xFFU)
} }
} }
@@ -117,7 +125,8 @@ fun ByteArray.toUInt(
fun ByteArray.toUIntArray( fun ByteArray.toUIntArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): UIntArray { ): UIntArray {
if (size % 4 != 0) throw Exception() if (size % 4 != 0)
throw IllegalArgumentException()
return toList() return toList()
.chunked(4) { it.toByteArray() } .chunked(4) { it.toByteArray() }
@@ -128,10 +137,11 @@ fun ByteArray.toUIntArray(
fun ByteArray.toULong( fun ByteArray.toULong(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): ULong { ): ULong {
if (size != 8) throw Exception() if (size != 8)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0UL) { acc, byte -> .fold(0UL) { acc, byte ->
(acc shl 8) or (byte.toULong() and 0xFFUL) (acc shl 8) or (byte.toULong() and 0xFFUL)
} }
} }
@@ -139,7 +149,8 @@ fun ByteArray.toULong(
fun ByteArray.toULongArray( fun ByteArray.toULongArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): ULongArray { ): ULongArray {
if (size % 8 != 0) throw Exception() if (size % 8 != 0)
throw IllegalArgumentException()
return toList() return toList()
.chunked(8) { it.toByteArray() } .chunked(8) { it.toByteArray() }

44
src/commonMain/kotlin/com/infendro/bytearray/ByteOrder.kt
View File

@@ -1,38 +1,22 @@
package com.infendro.bytearray package com.infendro.bytearray
import com.infendro.bytearray.ByteOrder.BIG_ENDIAN
import com.infendro.bytearray.ByteOrder.LITTLE_ENDIAN
enum class ByteOrder { enum class ByteOrder {
BIG_ENDIAN { BIG_ENDIAN, LITTLE_ENDIAN;
override fun normalize(
bytes: ByteArray,
): ByteArray {
return bytes
} }
override fun normalize( fun ByteArray.normalize(
bytes: UByteArray, order: ByteOrder,
): UByteArray { ): ByteArray = when (order) {
return bytes BIG_ENDIAN -> this
} LITTLE_ENDIAN -> reversedArray()
},
LITTLE_ENDIAN {
override fun normalize(
bytes: ByteArray,
): ByteArray {
return bytes.reversedArray()
} }
override fun normalize( fun UByteArray.normalize(
bytes: UByteArray, order: ByteOrder,
): UByteArray { ): UByteArray = when (order) {
return bytes.reversedArray() BIG_ENDIAN -> this
} LITTLE_ENDIAN -> reversedArray()
};
internal abstract fun normalize(
bytes: ByteArray,
): ByteArray
internal abstract fun normalize(
bytes: UByteArray,
): UByteArray
} }

24
src/commonMain/kotlin/com/infendro/bytearray/Int.kt
View File

@@ -9,17 +9,7 @@ fun Int.toByteArray(
val offset = (3 - i) * 8 val offset = (3 - i) * 8
(this ushr offset).toByte() (this ushr offset).toByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun IntArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
} }
fun Int.toUByteArray( fun Int.toUByteArray(
@@ -29,15 +19,5 @@ fun Int.toUByteArray(
val offset = (3 - i) * 8 val offset = (3 - i) * 8
(this ushr offset).toUByte() (this ushr offset).toUByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun IntArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
} }

23
src/commonMain/kotlin/com/infendro/bytearray/IntArray.kt Normal file
View File

@@ -0,0 +1,23 @@
package com.infendro.bytearray
import com.infendro.bytearray.ByteOrder.BIG_ENDIAN
fun IntArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
}
fun IntArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
}

24
src/commonMain/kotlin/com/infendro/bytearray/Long.kt
View File

@@ -9,17 +9,7 @@ fun Long.toByteArray(
val offset = (7 - i) * 8 val offset = (7 - i) * 8
(this ushr offset).toByte() (this ushr offset).toByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun LongArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
} }
fun Long.toUByteArray( fun Long.toUByteArray(
@@ -29,15 +19,5 @@ fun Long.toUByteArray(
val offset = (7 - i) * 8 val offset = (7 - i) * 8
(this ushr offset).toUByte() (this ushr offset).toUByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun LongArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
} }

23
src/commonMain/kotlin/com/infendro/bytearray/LongArray.kt Normal file
View File

@@ -0,0 +1,23 @@
package com.infendro.bytearray
import com.infendro.bytearray.ByteOrder.BIG_ENDIAN
fun LongArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
}
fun LongArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
}

3
src/commonMain/kotlin/com/infendro/bytearray/String.kt
View File

@@ -2,3 +2,6 @@ package com.infendro.bytearray
fun String.encodeToUByteArray(): UByteArray = fun String.encodeToUByteArray(): UByteArray =
encodeToByteArray().toUByteArray() encodeToByteArray().toUByteArray()
fun UByteArray.decodeToString(): String =
toByteArray().decodeToString()

52
src/commonMain/kotlin/com/infendro/bytearray/UByteArray.kt
View File

@@ -2,13 +2,11 @@ package com.infendro.bytearray
import com.infendro.bytearray.ByteOrder.BIG_ENDIAN import com.infendro.bytearray.ByteOrder.BIG_ENDIAN
fun UByteArray.decodeToString(): String =
toByteArray().decodeToString()
infix fun UByteArray.and( infix fun UByteArray.and(
that: UByteArray, that: UByteArray,
): UByteArray { ): UByteArray {
if (this.size != that.size) throw Exception() if (this.size != that.size)
throw IllegalArgumentException()
return UByteArray(size) { i -> return UByteArray(size) { i ->
this[i] and that[i] this[i] and that[i]
@@ -18,7 +16,8 @@ infix fun UByteArray.and(
infix fun UByteArray.or( infix fun UByteArray.or(
that: UByteArray, that: UByteArray,
): UByteArray { ): UByteArray {
if (this.size != that.size) throw Exception() if (this.size != that.size)
throw IllegalArgumentException()
return UByteArray(size) { i -> return UByteArray(size) { i ->
this[i] or that[i] this[i] or that[i]
@@ -28,7 +27,8 @@ infix fun UByteArray.or(
infix fun UByteArray.xor( infix fun UByteArray.xor(
that: UByteArray, that: UByteArray,
): UByteArray { ): UByteArray {
if (this.size != that.size) throw Exception() if (this.size != that.size)
throw IllegalArgumentException()
return UByteArray(size) { i -> return UByteArray(size) { i ->
this[i] xor that[i] this[i] xor that[i]
@@ -62,10 +62,11 @@ fun UByteArray.padEnd(
fun UByteArray.toInt( fun UByteArray.toInt(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): Int { ): Int {
if (size != 4) throw Exception() if (size != 4)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0) { acc, byte -> .fold(0) { acc, byte ->
(acc shl 8) or (byte.toInt() and 0xFF) (acc shl 8) or (byte.toInt() and 0xFF)
} }
} }
@@ -73,7 +74,8 @@ fun UByteArray.toInt(
fun UByteArray.toIntArray( fun UByteArray.toIntArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): IntArray { ): IntArray {
if (size % 4 != 0) throw Exception() if (size % 4 != 0)
throw IllegalArgumentException()
return chunked(4) { it.toUByteArray() } return chunked(4) { it.toUByteArray() }
.map { it.toInt(order) } .map { it.toInt(order) }
@@ -83,10 +85,11 @@ fun UByteArray.toIntArray(
fun UByteArray.toLong( fun UByteArray.toLong(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): Long { ): Long {
if (size != 8) throw Exception() if (size != 8)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0L) { acc, byte -> .fold(0L) { acc, byte ->
(acc shl 8) or (byte.toLong() and 0xFFL) (acc shl 8) or (byte.toLong() and 0xFFL)
} }
} }
@@ -94,7 +97,8 @@ fun UByteArray.toLong(
fun UByteArray.toLongArray( fun UByteArray.toLongArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): LongArray { ): LongArray {
if (size % 8 != 0) throw Exception() if (size % 8 != 0)
throw IllegalArgumentException()
return chunked(8) { it.toUByteArray() } return chunked(8) { it.toUByteArray() }
.map { it.toLong(order) } .map { it.toLong(order) }
@@ -104,10 +108,11 @@ fun UByteArray.toLongArray(
fun UByteArray.toUInt( fun UByteArray.toUInt(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): UInt { ): UInt {
if (size != 4) throw Exception() if (size != 4)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0U) { acc, byte -> .fold(0U) { acc, byte ->
(acc shl 8) or (byte.toUInt() and 0xFFU) (acc shl 8) or (byte.toUInt() and 0xFFU)
} }
} }
@@ -115,7 +120,8 @@ fun UByteArray.toUInt(
fun UByteArray.toUIntArray( fun UByteArray.toUIntArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): UIntArray { ): UIntArray {
if (size % 4 != 0) throw Exception() if (size % 4 != 0)
throw IllegalArgumentException()
return chunked(4) { it.toUByteArray() } return chunked(4) { it.toUByteArray() }
.map { it.toUInt(order) } .map { it.toUInt(order) }
@@ -125,10 +131,11 @@ fun UByteArray.toUIntArray(
fun UByteArray.toULong( fun UByteArray.toULong(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): ULong { ): ULong {
if (size != 8) throw Exception() if (size != 8)
throw IllegalArgumentException()
val bytes = order.normalize(this) return normalize(order)
return bytes.fold(0UL) { acc, byte -> .fold(0UL) { acc, byte ->
(acc shl 8) or (byte.toULong() and 0xFFUL) (acc shl 8) or (byte.toULong() and 0xFFUL)
} }
} }
@@ -136,7 +143,8 @@ fun UByteArray.toULong(
fun UByteArray.toULongArray( fun UByteArray.toULongArray(
order: ByteOrder = BIG_ENDIAN, order: ByteOrder = BIG_ENDIAN,
): ULongArray { ): ULongArray {
if (size % 8 != 0) throw Exception() if (size % 8 != 0)
throw IllegalArgumentException()
return chunked(8) { it.toUByteArray() } return chunked(8) { it.toUByteArray() }
.map { it.toULong(order) } .map { it.toULong(order) }

24
src/commonMain/kotlin/com/infendro/bytearray/UInt.kt
View File

@@ -9,17 +9,7 @@ fun UInt.toByteArray(
val offset = (3 - i) * 8 val offset = (3 - i) * 8
(this shr offset).toByte() (this shr offset).toByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun UIntArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
} }
fun UInt.toUByteArray( fun UInt.toUByteArray(
@@ -29,15 +19,5 @@ fun UInt.toUByteArray(
val offset = (3 - i) * 8 val offset = (3 - i) * 8
(this shr offset).toUByte() (this shr offset).toUByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun UIntArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
} }

23
src/commonMain/kotlin/com/infendro/bytearray/UIntArray.kt Normal file
View File

@@ -0,0 +1,23 @@
package com.infendro.bytearray
import com.infendro.bytearray.ByteOrder.BIG_ENDIAN
fun UIntArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
}
fun UIntArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
}

24
src/commonMain/kotlin/com/infendro/bytearray/ULong.kt
View File

@@ -9,17 +9,7 @@ fun ULong.toByteArray(
val offset = (7 - i) * 8 val offset = (7 - i) * 8
(this shr offset).toByte() (this shr offset).toByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun ULongArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
} }
fun ULong.toUByteArray( fun ULong.toUByteArray(
@@ -29,15 +19,5 @@ fun ULong.toUByteArray(
val offset = (7 - i) * 8 val offset = (7 - i) * 8
(this shr offset).toUByte() (this shr offset).toUByte()
} }
return order.normalize(bytes) return bytes.normalize(order)
}
fun ULongArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
} }

23
src/commonMain/kotlin/com/infendro/bytearray/ULongArray.kt Normal file
View File

@@ -0,0 +1,23 @@
package com.infendro.bytearray
import com.infendro.bytearray.ByteOrder.BIG_ENDIAN
fun ULongArray.toByteArray(
order: ByteOrder = BIG_ENDIAN,
): ByteArray {
val bytes = mutableListOf<Byte>()
for (n in this) {
bytes += n.toByteArray(order).toList()
}
return bytes.toByteArray()
}
fun ULongArray.toUByteArray(
order: ByteOrder = BIG_ENDIAN,
): UByteArray {
val bytes = mutableListOf<UByte>()
for (n in this) {
bytes += n.toUByteArray(order)
}
return bytes.toUByteArray()
}