From 901a20b63d756b137ddd5c5b3381ce316853ee4c Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Thu, 16 Apr 2020 19:37:07 -0700
Subject: [PATCH] assertValidDate checks for sentinel month

---
 lib/pure/times.nim      |  9 +++++++--
 tests/stdlib/ttimes.nim | 11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/pure/times.nim b/lib/pure/times.nim
index 81f9bc6840f23..7060fa69c4116 100644
--- a/lib/pure/times.nim
+++ b/lib/pure/times.nim
@@ -672,7 +672,7 @@ proc getDaysInYear*(year: int): int =
 
 proc assertValidDate(monthday: MonthdayRange, month: Month, year: int)
     {.inline.} =
-  assert monthday <= getDaysInMonth(month, year),
+  assert monthday > 0 and monthday <= getDaysInMonth(month, year),
     $year & "-" & intToStr(ord(month), 2) & "-" & $monthday &
       " is not a valid date"
 
@@ -1578,9 +1578,14 @@ proc `<=`*(a, b: DateTime): bool =
   ## Returns true if ``a`` happened before or at the same time as ``b``.
   return a.toTime <= b.toTime
 
+proc isDefault[T](a: T): bool =
+  system.`==`(a, default(T))
+
 proc `==`*(a, b: DateTime): bool =
   ## Returns true if ``a`` and ``b`` represent the same point in time.
-  return a.toTime == b.toTime
+  if a.isDefault: b.isDefault
+  elif b.isDefault: false
+  else: a.toTime == b.toTime
 
 proc isStaticInterval(interval: TimeInterval): bool =
   interval.years == 0 and interval.months == 0 and
diff --git a/tests/stdlib/ttimes.nim b/tests/stdlib/ttimes.nim
index 58c56812f6a24..a8da15f3d8889 100644
--- a/tests/stdlib/ttimes.nim
+++ b/tests/stdlib/ttimes.nim
@@ -615,14 +615,19 @@ suite "ttimes":
       doAssert between(x, y) == 1.months + 1.weeks
 
   test "default DateTime": # https://github.com/nim-lang/RFCs/issues/211
+    var num = 0
+    for ai in Month: num.inc
+    doAssert num == 12
+
     var a: DateTime
     doAssert a == DateTime.default
     doAssert ($a).len > 0 # no crash
     doAssert a.month.Month.ord == 0
     doAssert a.month.Month == cast[Month](0)
-    var num = 0
-    for ai in Month: num.inc
-    doAssert num == 12
+    doAssert a.monthday == 0
+
+    doAssertRaises(AssertionError): discard getDayOfWeek(a.monthday, a.month, a.year)
+    doAssertRaises(AssertionError): discard a.toTime
 
   test "inX procs":
     doAssert initDuration(seconds = 1).inSeconds == 1