From 6eb0ceb5720763a3a2f9e1c8e07087ede83c23d4 Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Tue, 28 Mar 2017 10:47:01 +0300
Subject: [PATCH] fixup! Implement interop integer conversions to be used with
 type inference

---
 .../jvm/kotlin/kotlinx/cinterop/JvmUtils.kt   | 92 +++++++++++--------
 samples/socket/EchoServer.kt                  |  2 +-
 2 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt
index e38e19ce54d..fefdd69d1fd 100644
--- a/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt
+++ b/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt
@@ -8,42 +8,62 @@ fun bitsToDouble(bits: Long): Double = java.lang.Double.longBitsToDouble(bits)
 
 // TODO: the functions below should eventually be intrinsified
 
-inline fun <reified R : Number> Number.signExtend(): R {
-    val returnValueClass = R::class.java
-    when (returnValueClass) {
-        java.lang.Byte::class.java -> if (this is Byte) {
-            return this.toByte() as R
-        }
-        java.lang.Short::class.java -> if (this is Byte || this is Short) {
-            return this.toShort() as R
-        }
-        java.lang.Integer::class.java -> if (this is Byte || this is Short || this is Int) {
-            return this.toInt() as R
-        }
-        java.lang.Long::class.java -> if (this is Byte || this is Short || this is Int || this is Long) {
-            return this.toLong() as R
-        }
-    }
-
-    throw Error("unable to sign extend ${this.javaClass.simpleName} \"$this\" to ${returnValueClass.simpleName}")
+inline fun <reified R : Number> Byte.signExtend(): R = when (R::class.java) {
+    java.lang.Byte::class.java -> this.toByte() as R
+    java.lang.Short::class.java -> this.toShort() as R
+    java.lang.Integer::class.java -> this.toInt() as R
+    java.lang.Long::class.java -> this.toLong() as R
+    else -> this.invalidSignExtension()
 }
 
-inline fun <reified R : Number> Number.narrow(): R {
-    val returnValueClass = R::class.java
-    when (returnValueClass) {
-        java.lang.Byte::class.java -> if (this is Byte || this is Short || this is Int || this is Long) {
-            return this.toByte() as R
-        }
-        java.lang.Short::class.java -> if (this is Short || this is Int || this is Long) {
-            return this.toShort() as R
-        }
-        java.lang.Integer::class.java -> if (this is Int || this is Long) {
-            return this.toInt() as R
-        }
-        java.lang.Long::class.java -> if (this is Long) {
-            return this.toLong() as R
-        }
-    }
-
-    throw Error("unable to narrow ${this.javaClass.simpleName} \"$this\" to ${returnValueClass.simpleName}")
+inline fun <reified R : Number> Short.signExtend(): R = when (R::class.java) {
+    java.lang.Short::class.java -> this.toShort() as R
+    java.lang.Integer::class.java -> this.toInt() as R
+    java.lang.Long::class.java -> this.toLong() as R
+    else -> this.invalidSignExtension()
+}
+
+inline fun <reified R : Number> Int.signExtend(): R = when (R::class.java) {
+    java.lang.Integer::class.java -> this.toInt() as R
+    java.lang.Long::class.java -> this.toLong() as R
+    else -> this.invalidSignExtension()
+}
+
+inline fun <reified R : Number> Long.signExtend(): R = when (R::class.java) {
+    java.lang.Long::class.java -> this.toLong() as R
+    else -> this.invalidSignExtension()
+}
+
+inline fun <reified R : Number> Number.invalidSignExtension(): R {
+    throw Error("unable to sign extend ${this.javaClass.simpleName} \"${this}\" to ${R::class.java.simpleName}")
+}
+
+inline fun <reified R : Number> Byte.narrow(): R = when (R::class.java) {
+    java.lang.Byte::class.java -> this.toByte() as R
+    else -> this.invalidNarrowing()
+}
+
+inline fun <reified R : Number> Short.narrow(): R = when (R::class.java) {
+    java.lang.Byte::class.java -> this.toByte() as R
+    java.lang.Short::class.java -> this.toShort() as R
+    else -> this.invalidNarrowing()
+}
+
+inline fun <reified R : Number> Int.narrow(): R = when (R::class.java) {
+    java.lang.Byte::class.java -> this.toByte() as R
+    java.lang.Short::class.java -> this.toShort() as R
+    java.lang.Integer::class.java -> this.toInt() as R
+    else -> this.invalidNarrowing()
+}
+
+inline fun <reified R : Number> Long.narrow(): R = when (R::class.java) {
+    java.lang.Byte::class.java -> this.toByte() as R
+    java.lang.Short::class.java -> this.toShort() as R
+    java.lang.Integer::class.java -> this.toInt() as R
+    java.lang.Long::class.java -> this.toLong() as R
+    else -> this.invalidNarrowing()
+}
+
+inline fun <reified R : Number> Number.invalidNarrowing(): R {
+    throw Error("unable to narrow ${this.javaClass.simpleName} \"${this}\" to ${R::class.java.simpleName}")
 }
diff --git a/samples/socket/EchoServer.kt b/samples/socket/EchoServer.kt
index bec850a660e..090e277bbb4 100644
--- a/samples/socket/EchoServer.kt
+++ b/samples/socket/EchoServer.kt
@@ -20,7 +20,7 @@ fun main(args: Array<String>) {
 
         with(serverAddr) {
             memset(this.ptr, 0, sockaddr_in.size)
-            sin_family.value = AF_INET.toByte()
+            sin_family.value = AF_INET.narrow()
             sin_addr.s_addr.value = htons(0).toInt()
             sin_port.value = htons(port)
         }