jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Times module cosmetic changes (#9770)

Browse source
This commit is contained in:
Oscar Nihlgård 2018-11-20 22:56:25 +01:00 • committed by Andreas Rumpf
commit b4a42386d9
1 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

55
lib/pure/times.nim
View file

@ -745,8 +745,7 @@ proc abs*(a: Duration): Duration =
initDuration(seconds = abs(a.seconds), nanoseconds = -a.nanosecond) initDuration(seconds = abs(a.seconds), nanoseconds = -a.nanosecond)
proc toTime*(dt: DateTime): Time {.tags: [], raises: [], benign.} = proc toTime*(dt: DateTime): Time {.tags: [], raises: [], benign.} =
## Converts a broken-down time structure to ## Converts a ``DateTime`` to a ``Time`` representing the same point in time.
## calendar time representation.
let epochDay = toEpochday(dt.monthday, dt.month, dt.year) let epochDay = toEpochday(dt.monthday, dt.month, dt.year)
var seconds = epochDay * secondsInDay var seconds = epochDay * secondsInDay
seconds.inc dt.hour * secondsInHour seconds.inc dt.hour * secondsInHour
@ -1047,7 +1046,7 @@ proc local*(t: Time): DateTime =
t.inZone(local()) t.inZone(local())
proc getTime*(): Time {.tags: [TimeEffect], benign.} = proc getTime*(): Time {.tags: [TimeEffect], benign.} =
## Gets the current time as a ``Time`` with nanosecond resolution. ## Gets the current time as a ``Time`` with up to nanosecond resolution.
when defined(JS): when defined(JS):
let millis = newDate().getTime() let millis = newDate().getTime()
let seconds = convert(Milliseconds, Seconds, millis) let seconds = convert(Milliseconds, Seconds, millis)
@ -1141,16 +1140,16 @@ proc `-`*(ti1, ti2: TimeInterval): TimeInterval =
result = ti1 + (-ti2) result = ti1 + (-ti2)
proc getDateStr*(): string {.rtl, extern: "nt$1", tags: [TimeEffect].} = proc getDateStr*(): string {.rtl, extern: "nt$1", tags: [TimeEffect].} =
## Gets the current date as a string of the format ``YYYY-MM-DD``. ## Gets the current local date as a string of the format ``YYYY-MM-DD``.
var ti = now() var dt = now()
result = $ti.year & '-' & intToStr(ord(ti.month), 2) & result = $dt.year & '-' & intToStr(ord(dt.month), 2) &
'-' & intToStr(ti.monthday, 2) '-' & intToStr(dt.monthday, 2)
proc getClockStr*(): string {.rtl, extern: "nt$1", tags: [TimeEffect].} = proc getClockStr*(): string {.rtl, extern: "nt$1", tags: [TimeEffect].} =
## Gets the current clock time as a string of the format ``HH:MM:SS``. ## Gets the current local clock time as a string of the format ``HH:MM:SS``.
var ti = now() var dt = now()
result = intToStr(ti.hour, 2) & ':' & intToStr(ti.minute, 2) & result = intToStr(dt.hour, 2) & ':' & intToStr(dt.minute, 2) &
':' & intToStr(ti.second, 2) ':' & intToStr(dt.second, 2)
proc toParts* (ti: TimeInterval): TimeIntervalParts = proc toParts* (ti: TimeInterval): TimeIntervalParts =
## Converts a `TimeInterval` into an array consisting of its time units, ## Converts a `TimeInterval` into an array consisting of its time units,
@ -1382,7 +1381,6 @@ proc `==`*(a, b: DateTime): bool =
## Returns true if ``a == b``, that is if both dates represent the same point in time. ## Returns true if ``a == b``, that is if both dates represent the same point in time.
return a.toTime == b.toTime return a.toTime == b.toTime
proc isStaticInterval(interval: TimeInterval): bool = proc isStaticInterval(interval: TimeInterval): bool =
interval.years == 0 and interval.months == 0 and interval.years == 0 and interval.months == 0 and
interval.days == 0 and interval.weeks == 0 interval.days == 0 and interval.weeks == 0
@ -1397,28 +1395,20 @@ proc evaluateStaticInterval(interval: TimeInterval): Duration =
hours = interval.hours) hours = interval.hours)
proc between*(startDt, endDt: DateTime): TimeInterval = proc between*(startDt, endDt: DateTime): TimeInterval =
## Evaluate difference between two dates in ``TimeInterval`` format, so, it ## Gives the difference between ``startDt`` and ``endDt`` as a
## will be relative. ## ``TimeInterval``.
## ##
## **Warning:** It's not recommended to use ``between`` for ``DateTime's`` in ## **Warning:** This proc currently gives very few guarantees about the
## different ``TimeZone's``. ## result. ``a + between(a, b) == b`` is **not** true in general
## ``a + between(a, b) == b`` is only guaranteed when ``a`` and ``b`` are in UTC. ## (it's always true when UTC is used however). Neither is it guaranteed that
## all components in the result will have the same sign. The behavior of this
## proc might change in the future.
runnableExamples: runnableExamples:
var a = initDateTime(year = 2018, month = Month(3), monthday = 25, var a = initDateTime(25, mMar, 2015, 12, 0, 0, utc())
hour = 0, minute = 59, second = 59, nanosecond = 1, var b = initDateTime(1, mApr, 2017, 15, 0, 15, utc())
zone = utc()).local var ti = initTimeInterval(years = 2, days = 7, hours = 3, seconds = 15)
var b = initDateTime(year = 2018, month = Month(3), monthday = 25, doAssert between(a, b) == ti
hour = 1, minute = 1, second = 1, nanosecond = 0, doAssert between(a, b) == -between(b, a)
zone = utc()).local
doAssert between(a, b) == initTimeInterval(
nanoseconds=999, milliseconds=999, microseconds=999, seconds=1, minutes=1)
a = parse("2018-01-09T00:00:00+00:00", "yyyy-MM-dd'T'HH:mm:sszzz", utc())
b = parse("2018-01-10T23:00:00-02:00", "yyyy-MM-dd'T'HH:mm:sszzz")
doAssert between(a, b) == initTimeInterval(hours=1, days=2)
## Though, here correct answer should be 1 day 25 hours (cause this day in
## this tz is actually 26 hours). That's why operating different TZ is
## discouraged
var startDt = startDt.utc() var startDt = startDt.utc()
var endDt = endDt.utc() var endDt = endDt.utc()
@ -1546,7 +1536,6 @@ proc `*=`*[T: TimesMutableTypes, U](a: var T, b: U) =
var dur = initDuration(seconds = 1) var dur = initDuration(seconds = 1)
dur *= 5 dur *= 5
doAssert dur == initDuration(seconds = 5) doAssert dur == initDuration(seconds = 5)
a = a * b a = a * b
# #