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

Duration parsing: simplify range checks

Browse Source
This commit is contained in:
Ilya Gorbunov
2021-07-07 03:59:59 +03:00
committed by Space
parent 0427eec20f
commit 7551719b85
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/time/Duration.kt
+3 -4
View File
@@ -1080,7 +1080,7 @@ private fun parseDuration(value: String, strictIso: Boolean): Duration {
throw IllegalArgumentException("No components") throw IllegalArgumentException("No components")
value[index] == 'P' -> { value[index] == 'P' -> {
if (++index == length) throw IllegalArgumentException() if (++index == length) throw IllegalArgumentException()
val signedDigits = "+-0123456789." val nonDigitSymbols = "+-."
var isTimeComponent = false var isTimeComponent = false
var prevUnit: DurationUnit? = null var prevUnit: DurationUnit? = null
while (index < length) { while (index < length) {
@@ -1089,7 +1089,7 @@ private fun parseDuration(value: String, strictIso: Boolean): Duration {
isTimeComponent = true isTimeComponent = true
continue continue
} }
val component = value.substringWhile(index) { it in signedDigits } val component = value.substringWhile(index) { it in '0'..'9' || it in nonDigitSymbols }
if (component.isEmpty()) throw IllegalArgumentException() if (component.isEmpty()) throw IllegalArgumentException()
index += component.length index += component.length
val unitChar = value.getOrElse(index) { throw IllegalArgumentException("Missing unit for value $component") } val unitChar = value.getOrElse(index) { throw IllegalArgumentException("Missing unit for value $component") }
@@ -1114,7 +1114,6 @@ private fun parseDuration(value: String, strictIso: Boolean): Duration {
} }
else -> { else -> {
// parse default string format // parse default string format
val digits = "0123456789."
var prevUnit: DurationUnit? = null var prevUnit: DurationUnit? = null
var afterFirst = false var afterFirst = false
var allowSpaces = !isNegative var allowSpaces = !isNegative
@@ -1127,7 +1126,7 @@ private fun parseDuration(value: String, strictIso: Boolean): Duration {
index = value.skipWhile(index) { it == ' ' } index = value.skipWhile(index) { it == ' ' }
} }
afterFirst = true afterFirst = true
val component = value.substringWhile(index) { it in digits } val component = value.substringWhile(index) { it in '0'..'9' || it == '.' }
if (component.isEmpty()) throw IllegalArgumentException() if (component.isEmpty()) throw IllegalArgumentException()
index += component.length index += component.length
val unitName = value.substringWhile(index) { it in 'a'..'z' } val unitName = value.substringWhile(index) { it in 'a'..'z' }