aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Oosterhuis <frank.oosterhuis@getthere.nl>2021-02-16 11:37:47 +0100
committerFrank Oosterhuis <frank.oosterhuis@getthere.nl>2021-02-16 11:37:47 +0100
commitdb3d3298e10b3dcf63bf1e0f940e2f69af95eb38 (patch)
tree173fe226b4aef3e34e6ba48ab60723132546fa50
parent5e9f6a7f1a0a9da2ac250a53206aca5bc2eb2323 (diff)
downloadperlweeklychallenge-club-db3d3298e10b3dcf63bf1e0f940e2f69af95eb38.tar.gz
perlweeklychallenge-club-db3d3298e10b3dcf63bf1e0f940e2f69af95eb38.tar.bz2
perlweeklychallenge-club-db3d3298e10b3dcf63bf1e0f940e2f69af95eb38.zip
convert
-rw-r--r--challenge-100/frankivo/scala/FunTime.scala14
1 files changed, 8 insertions, 6 deletions
diff --git a/challenge-100/frankivo/scala/FunTime.scala b/challenge-100/frankivo/scala/FunTime.scala
index 0578ea6551..97ae8f09a5 100644
--- a/challenge-100/frankivo/scala/FunTime.scala
+++ b/challenge-100/frankivo/scala/FunTime.scala
@@ -39,14 +39,16 @@ object FunTime {
makeTime(hour, parsed._2)
}
+ def convert(time: String) : String = {
+ if (("(am|pm)$".r findFirstIn time).isDefined)
+ to24H(time)
+ else
+ to12H(time)
+ }
+
def main(args: Array[String]): Unit = {
examples
- .map(e => {
- if (("(am|pm)$".r findFirstIn e).isDefined)
- to24H(e)
- else
- to12H(e)
- })
+ .map(convert)
.foreach(println)
}
} \ No newline at end of file