Skip to content

Add support for "After The Weekend" and "Before The Weekend" expressions #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mihxil merged 2 commits into from
Feb 23, 2026
Merged

Add support for "After The Weekend" and "Before The Weekend" expressions #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3a7708
Initial plan
Copilot Feb 23, 2026
5a45eab
Add support for After/Before The Weekend expressions
Copilot Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/antlr3/org/natty/generated/DateParser.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,18 @@ relative_date
| (THE WHITE_SPACE)? relative_date_span WHITE_SPACE AFTER WHITE_SPACE NEXT
-> ^(RELATIVE_DATE ^(SEEK DIRECTION[">"] SEEK_BY["by_day"] INT["2"] relative_date_span))

// after the weekend -> next monday
// Note: "weekend" is lexed as SATURDAY token (see DateLexer.g); the result is the
// Monday following the upcoming weekend, matching "after the weekend" semantics.
| AFTER WHITE_SPACE THE WHITE_SPACE SATURDAY
-> ^(RELATIVE_DATE ^(SEEK DIRECTION[">"] SEEK_BY["by_day"] INT["1"] ^(DAY_OF_WEEK INT["2"])))

// before the weekend -> next friday
// Note: "weekend" is lexed as SATURDAY token (see DateLexer.g); the result is the
// Friday immediately preceding the upcoming weekend.
| BEFORE WHITE_SPACE THE WHITE_SPACE SATURDAY
-> ^(RELATIVE_DATE ^(SEEK DIRECTION[">"] SEEK_BY["by_day"] INT["1"] ^(DAY_OF_WEEK INT["6"])))

// today, tomorrow
| named_relative_date

Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/natty/DateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ public void testRelative() throws Exception {
validateDate(reference, "4 mondays from now", 3, 28, 2011);
validateDate(reference, "4 mondays from today", 3, 28, 2011);
validateDate(reference, "next weekend", 3, 12, 2011);
// "after the weekend" returns the Monday following the upcoming weekend (Mar 5-6)
validateDate(reference, "after the weekend", 3, 7, 2011);
validateDate(reference, "After The Weekend", 3, 7, 2011);
// "before the weekend" returns the Friday immediately before the upcoming weekend (Mar 5-6)
validateDate(reference, "before the weekend", 3, 4, 2011);
validateDate(reference, "Before The Weekend", 3, 4, 2011);
validateDate(reference, "six mondays ago", 1, 17, 2011);
validateDate(reference, "last monday", 2, 21, 2011);
validateDate(reference, "last mon", 2, 21, 2011);
Expand Down