Merge pull request #49 from ijt/issue/48/oct-nov

Issue/48/oct nov

Author: ijt

v2/parse.go

@@ -223,19 +223,25 @@ func parseImplicitRange(s string, now time.Time, dir Direction) (r Range, parsed
 	code := ""
 	for sow < len(s) {
 		prevD := d
-		c, ok := parseDateWord(&d, w)
+		wCode, ok := parseDateWord(&d, w)
 		if !ok {
 			d = prevD
 			break
 		}
+		// If the date word just parsed is one of the things already parsed
+		// for this date then don't accept it and stop parsing.
+		if strings.ContainsAny(code, wCode) {
+			d = prevD
+			break
+		}
 		// "d" has to come either at the beginning or after a month name,
 		// or we ignore it and consider the implicit range to have ended
 		// one word before.
-		if c == "d" && !(len(code) == 0 || code[len(code)-1] == 'm') {
+		if wCode == "d" && !(len(code) == 0 || code[len(code)-1] == 'm') {
 			d = prevD
 			break
 		}
-		code = code + c
+		code = code + wCode
 		eolgw = eow
 		sow, eow, w = findSignalNoise(s, eow)
 	}

v2/parse_test.go

@@ -165,7 +165,6 @@ func TestParseRange_fail(t *testing.T) {
 func Test_parseImplicitRange(t *testing.T) {
 	type args struct {
 		s   string
-		ls  string
 		now time.Time
 		dir Direction
 	}
@@ -179,20 +178,27 @@ func Test_parseImplicitRange(t *testing.T) {
 		{
 			name: "small int after year is ignored",
 			args: args{
-				s:  "Jan 2017 1",
-				ls: "jan 2017 1",
+				s: "Jan 2017 1",
 			},
 			wantR:      truncateMonth(time.Date(2017, time.January, 1, 0, 0, 0, 0, time.UTC)),
 			wantParsed: "Jan 2017",
 		},
 		{
 			name: "small int before year at beginning causes failure",
 			args: args{
-				s:  "1 2017 Jan",
-				ls: "1 2017 jan",
+				s: "1 2017 Jan",
 			},
 			wantErr: true,
 		},
+		{
+			name: "oct nov",
+			args: args{
+				s:   "oct nov",
+				now: time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC),
+			},
+			wantR:      truncateMonth(time.Date(2023, 10, 1, 0, 0, 0, 0, time.UTC)),
+			wantParsed: "oct",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {