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

Minor: extract a couple of platform-specific functions.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-11-26 10:14:07 +03:00
parent 4d6c5bcdcf
commit 410e85ef79
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/text/ParsePrimitivesJVM.kt
+10 -6
View File
@@ -128,8 +128,7 @@ public fun String.toIntOrNull(): Int? = toIntOrNull(radix = 10)
* or `null` if the string is not a valid representation of a number. * or `null` if the string is not a valid representation of a number.
*/ */
public fun String.toIntOrNull(radix: Int): Int? { public fun String.toIntOrNull(radix: Int): Int? {
if (radix < Character.MIN_RADIX) throw NumberFormatException("radix $radix less than Character.MIN_RADIX") checkRadix(radix)
if (radix > Character.MAX_RADIX) throw NumberFormatException("radix $radix greater than Character.MAX_RADIX")
val length = this.length val length = this.length
if (length == 0) return null if (length == 0) return null
@@ -162,7 +161,7 @@ public fun String.toIntOrNull(radix: Int): Int? {
val limitBeforeMul = limit / radix val limitBeforeMul = limit / radix
var result = 0 var result = 0
for (i in start..(length - 1)) { for (i in start..(length - 1)) {
val digit = Character.digit(this[i], radix) val digit = digitOf(this[i], radix)
if (digit < 0) return null if (digit < 0) return null
if (result < limitBeforeMul) return null if (result < limitBeforeMul) return null
@@ -188,8 +187,7 @@ public fun String.toLongOrNull(): Long? = toLongOrNull(radix = 10)
* or `null` if the string is not a valid representation of a number. * or `null` if the string is not a valid representation of a number.
*/ */
public fun String.toLongOrNull(radix: Int): Long? { public fun String.toLongOrNull(radix: Int): Long? {
if (radix < Character.MIN_RADIX) throw NumberFormatException("radix $radix less than Character.MIN_RADIX") checkRadix(radix)
if (radix > Character.MAX_RADIX) throw NumberFormatException("radix $radix greater than Character.MAX_RADIX")
val length = this.length val length = this.length
if (length == 0) return null if (length == 0) return null
@@ -222,7 +220,7 @@ public fun String.toLongOrNull(radix: Int): Long? {
val limitBeforeMul = limit / radix val limitBeforeMul = limit / radix
var result = 0L var result = 0L
for (i in start..(length - 1)) { for (i in start..(length - 1)) {
val digit = Character.digit(this[i], radix) val digit = digitOf(this[i], radix)
if (digit < 0) return null if (digit < 0) return null
if (result < limitBeforeMul) return null if (result < limitBeforeMul) return null
@@ -282,3 +280,9 @@ private inline fun <T> screenFloatValue(str: String, parse: (String) -> T): T? {
} }
} }
internal fun digitOf(char: Char, radix: Int): Int = Character.digit(char.toInt(), radix)
internal fun checkRadix(radix: Int) {
if(radix !in Character.MIN_RADIX..Character.MAX_RADIX) {
throw NumberFormatException("radix $radix was not in valid range ${Character.MIN_RADIX..Character.MAX_RADIX}")
}
}