azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support '+' in front of parsed unsigned string values

Browse Source 
#KT-26161
This commit is contained in:
Ilya Gorbunov
2018-08-17 06:08:18 +03:00
parent 2530a8e98c
commit d99f97ad96
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/unsigned/src/kotlin/UStringNumberConversions.kt
+16 -4
View File
@@ -186,14 +186,20 @@ public fun String.toUIntOrNull(radix: Int): UInt? {
if (length == 0) return null
val limit: UInt = UInt.MAX_VALUE
val start: Int
val firstChar = this[0]
if (firstChar < '0') return null
if (firstChar < '0') {
if (length == 1 || firstChar != '+') return null
start = 1
} else {
start = 0
}
val uradix = radix.toUInt()
val limitBeforeMul = limit / uradix
var result = 0u
for (i in 0 until length) {
for (i in start until length) {
val digit = digitOf(this[i], radix)
if (digit < 0) return null
@@ -232,15 +238,21 @@ public fun String.toULongOrNull(radix: Int): ULong? {
if (length == 0) return null
val limit: ULong = ULong.MAX_VALUE
val start: Int
val firstChar = this[0]
if (firstChar < '0') return null
if (firstChar < '0') {
if (length == 1 || firstChar != '+') return null
start = 1
} else {
start = 0
}
val uradix = radix.toUInt()
val limitBeforeMul = limit / uradix
var result = 0uL
for (i in 0 until length) {
for (i in start until length) {
val digit = digitOf(this[i], radix)
if (digit < 0) return null