Skip to content

Commit

Permalink
fixes #13558: toDateTime buggy on 29th, 30th and 31th of each month; …
Browse files Browse the repository at this point in the history
…breaking change: do not use `now` to compute result, was undocumented and non-sensical (#13565)
  • Loading branch information
timotheecour authored Mar 11, 2020
1 parent f5f9243 commit 281e02f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
and shouldn't be conflated with `"."`; use -d:nimOldRelativePathBehavior to restore the old
behavior
- `joinPath(a,b)` now honors trailing slashes in `b` (or `a` if `b` = "")
- `times.parse` now only uses input to compute its result, and not `now`:
`parse("2020", "YYYY", utc())` is now `2020-01-01T00:00:00Z` instead of
`2020-03-02T00:00:00Z` if run on 03-02; it also doesn't crash anymore when
used on 29th, 30th, 31st of each month.

### Breaking changes in the compiler

Expand Down
16 changes: 3 additions & 13 deletions lib/pure/times.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2248,19 +2248,9 @@ proc parsePattern(input: string, pattern: FormatPattern, i: var int,

proc toDateTime(p: ParsedTime, zone: Timezone, f: TimeFormat,
input: string): DateTime =
var month = mJan
var year: int
var monthday: int
# `now()` is an expensive call, so we avoid it when possible
(year, month, monthday) =
if p.year.isNone or p.month.isNone or p.monthday.isNone:
let n = now()
(p.year.get(n.year),
p.month.get(n.month.int).Month,
p.monthday.get(n.monthday))
else:
(p.year.get(), p.month.get().Month, p.monthday.get())

var year = p.year.get(0)
var month = p.month.get(1).Month
var monthday = p.monthday.get(1)
year =
case p.era
of eraUnknown:
Expand Down

0 comments on commit 281e02f

Please sign in to comment.