KT-10375, KT-19523: Fix J2K hex literal number conversion issues.

#KT-10375, #KT-19523 fixed
This commit is contained in:
Dimach
2017-08-23 20:19:57 +03:00
committed by Simon Ogorodnik
parent 08e090bf5e
commit 0920b2574c
4 changed files with 29 additions and 17 deletions
+2
View File
@@ -9,5 +9,7 @@ class Test {
long l1 = 0xffffffff;
Long l2 = 0xffffffffl;
long l3 = 0xffffffffffL;
long l4 = 0xFFFFFFFFFFFFFFFFL;
long l5 = 0xF000000000000000L;
}
}
+4 -2
View File
@@ -2,11 +2,13 @@ internal class Test {
fun test() {
val i1 = 0x21
val i2 = 0x33
val i3 = 0xffffffff.toInt()
val i3 = -0x1
val i4 = 0XCCCC
val i5 = 0x6fffffff
val l1: Long = 0xffffffff
val l1: Long = -0x1
val l2 = 0xffffffffL
val l3 = 0xffffffffffL
val l4 = -0x1L
val l5 = -0x1000000000000000L
}
}
+4 -4
View File
@@ -73,10 +73,10 @@ object SwitchDemo {
val status = ""
when (status) {
"init", "dial", "transmit" -> return 0x111111
"ok" -> return 0xFF006600.toInt()
"cancel" -> return 0xFF666666.toInt()
"fail", "busy", "error" -> return 0xFF660000.toInt()
else -> return 0xFF660000.toInt()
"ok" -> return -0xff9a00
"cancel" -> return -0x99999a
"fail", "busy", "error" -> return -0x9a0000
else -> return -0x9a0000
}
}
}