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

Duration: parse explicit positive values parenthesized

Browse Source
This commit is contained in:
Ilya Gorbunov
2021-07-08 10:00:59 +03:00
committed by Space
parent 682cb8e34a
commit 5072653957
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/time/Duration.kt
+6 -4
View File
@@ -1074,7 +1074,8 @@ private fun parseDuration(value: String, strictIso: Boolean): Duration {
when (value[index]) { when (value[index]) {
'+', '-' -> index++ '+', '-' -> index++
} }
val isNegative = value.startsWith('-') val hasSign = index > 0
val isNegative = hasSign && value.startsWith('-')
when { when {
length <= index -> length <= index ->
throw IllegalArgumentException("No components") throw IllegalArgumentException("No components")
@@ -1116,8 +1117,8 @@ private fun parseDuration(value: String, strictIso: Boolean): Duration {
// parse default string format // parse default string format
var prevUnit: DurationUnit? = null var prevUnit: DurationUnit? = null
var afterFirst = false var afterFirst = false
var allowSpaces = !isNegative var allowSpaces = !hasSign
if (isNegative && value[index] == '(' && value.last() == ')') { if (hasSign && value[index] == '(' && value.last() == ')') {
allowSpaces = true allowSpaces = true
if (++index == --length) throw IllegalArgumentException("No components") if (++index == --length) throw IllegalArgumentException("No components")
} }
@@ -1158,7 +1159,8 @@ private fun parseOverLongIsoComponent(value: String): Long {
// all chars are digits, but more than ceiling(log10(MAX_MILLIS / 1000)) of them // all chars are digits, but more than ceiling(log10(MAX_MILLIS / 1000)) of them
return if (value[0] == '-') Long.MIN_VALUE else Long.MAX_VALUE return if (value[0] == '-') Long.MIN_VALUE else Long.MAX_VALUE
} }
return value.toLong() // TODO: replace with just toLong after min JDK becomes 8
return if (value.startsWith("+")) value.drop(1).toLong() else value.toLong()
} }
libraries/stdlib/test/time/DurationTest.kt
+11 -6
View File
@@ -492,13 +492,13 @@ class DurationTest {
test(Duration.minutes(2) + Duration.milliseconds(500), "PT2M0.500S") test(Duration.minutes(2) + Duration.milliseconds(500), "PT2M0.500S")
test(Duration.milliseconds(90_500), "PT1M30.500S") test(Duration.milliseconds(90_500), "PT1M30.500S")
// negative // with sign
test(-Duration.days(1) + Duration.minutes(15), "-PT23H45M", "PT-23H-45M", "PT-24H15M") test(-Duration.days(1) + Duration.minutes(15), "-PT23H45M", "PT-23H-45M", "+PT-24H+15M")
test(-Duration.days(1) - Duration.minutes(15), "-PT24H15M", "PT-24H-15M", "-PT25H-45M") test(-Duration.days(1) - Duration.minutes(15), "-PT24H15M", "PT-24H-15M", "-PT25H-45M")
test(Duration.ZERO, "PT0S", "P1DT-24H", "PT-1H60M", "-PT1M-60S") test(Duration.ZERO, "PT0S", "P1DT-24H", "+PT-1H+60M", "-PT1M-60S")
// infinite // infinite
test(Duration.INFINITE, "PT9999999999999H", "PT10000000000000H", "-PT-9999999999999H", "-PT-1234567890123456789012S") test(Duration.INFINITE, "PT9999999999999H", "PT+10000000000000H", "-PT-9999999999999H", "-PT-1234567890123456789012S")
test(-Duration.INFINITE, "-PT9999999999999H", "-PT10000000000000H", "PT-1234567890123456789012S") test(-Duration.INFINITE, "-PT9999999999999H", "-PT10000000000000H", "PT-1234567890123456789012S")
} }
@@ -600,9 +600,12 @@ class DurationTest {
for (string in expected) { for (string in expected) {
testParsing(string, duration) testParsing(string, duration)
if (duration.isPositive() && duration.isFinite()) { if (duration.isPositive() && duration.isFinite()) {
testParsing("+($string)", duration)
testParsing("-($string)", -duration) testParsing("-($string)", -duration)
if (' ' !in string) if (' ' !in string) {
testParsing("+$string", duration)
testParsing("-$string", -duration) testParsing("-$string", -duration)
}
} }
} }
} }
@@ -682,7 +685,9 @@ class DurationTest {
"1234567890123456789012ns", "Inf", "-Infinity value", "1234567890123456789012ns", "Inf", "-Infinity value",
"1s ", " 1s", "1s ", " 1s",
"1d 1m 1h", "1s 2s", "1d 1m 1h", "1s 2s",
"-12m 15s", "-12m -15s", "(12m 30s)", "-()", "()", "-(12m 30s", "-12m 15s", "-12m -15s", "-()", "-(12m 30s",
"+12m 15s", "+12m +15s", "+()", "+(12m 30s",
"()", "(12m 30s)",
"12.5m 11.5s", ".2s", "0.1553.39m", "12.5m 11.5s", ".2s", "0.1553.39m",
"P+12+34D", "P12-34D", "PT1234567890-1234567890S", "P+12+34D", "P12-34D", "PT1234567890-1234567890S",
" P1D", "PT1S ", " P1D", "PT1S ",