From 82e1225c6f8a6ee59f373c07a7873b373acb19dc Mon Sep 17 00:00:00 2001
From: Scott Gasch <scott@gasch.org>
Date: Wed, 8 Jun 2022 17:23:33 -0700
Subject: Improve dateparse and make string_utils.extract_date.

---
 dateparse/dateparse_utils.g4 | 1 +
 dateparse/dateparse_utils.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'dateparse')

diff --git a/dateparse/dateparse_utils.g4 b/dateparse/dateparse_utils.g4
index 4701299..364aa0f 100644
--- a/dateparse/dateparse_utils.g4
+++ b/dateparse/dateparse_utils.g4
@@ -57,6 +57,7 @@ singleDateExpr
     | nthWeekdayInMonthMaybeYearExpr
     | firstLastWeekdayInMonthMaybeYearExpr
     | deltaDateExprRelativeToTodayImplied
+    | dayName (SPACE|ddiv)+ monthDayMaybeYearExpr (SPACE|ddiv)* singleTimeExpr*
     | dayName
     ;
 
diff --git a/dateparse/dateparse_utils.py b/dateparse/dateparse_utils.py
index ee2bbd9..2e6eabd 100755
--- a/dateparse/dateparse_utils.py
+++ b/dateparse/dateparse_utils.py
@@ -348,7 +348,7 @@ class DateParser(dateparse_utilsListener):
                 return 5
 
     def _parse_normal_date(self) -> datetime.date:
-        if 'dow' in self.context:
+        if 'dow' in self.context and 'month' not in self.context:
             d = self.today
             while d.weekday() != self.context['dow']:
                 d += datetime.timedelta(days=1)
-- 
cgit v1.3