Skip to content

Commit 34c1adf

Browse files
committed
Remove inclRefTime from unreachableYear check
1 parent 0667a01 commit 34c1adf

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

next.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func NextTickAfter(expr string, start time.Time, inclRefTime bool) (time.Time, e
2929
}
3030

3131
segments, _ := Segments(expr)
32-
if len(segments) > 6 && isUnreachableYear(segments[6], next, inclRefTime, false) {
32+
if len(segments) > 6 && isUnreachableYear(segments[6], next, false) {
3333
return next, fmt.Errorf("unreachable year segment: %s", segments[6])
3434
}
3535

@@ -123,18 +123,12 @@ over:
123123

124124
var dashRe = regexp.MustCompile(`/.*$`)
125125

126-
func isUnreachableYear(year string, ref time.Time, incl bool, reverse bool) bool {
126+
func isUnreachableYear(year string, ref time.Time, reverse bool) bool {
127127
if year == "*" || year == "?" {
128128
return false
129129
}
130130

131-
edge, inc := ref.Year(), 1
132-
if !incl {
133-
if reverse {
134-
inc = -1
135-
}
136-
edge += inc
137-
}
131+
edge := ref.Year()
138132
for _, offset := range strings.Split(year, ",") {
139133
if strings.Index(offset, "*/") == 0 || strings.Index(offset, "0/") == 0 {
140134
return false

prev.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func PrevTickBefore(expr string, start time.Time, inclRefTime bool) (time.Time,
1919
}
2020

2121
segments, _ := Segments(expr)
22-
if len(segments) > 6 && isUnreachableYear(segments[6], prev, inclRefTime, true) {
22+
if len(segments) > 6 && isUnreachableYear(segments[6], prev, true) {
2323
return prev, fmt.Errorf("unreachable year segment: %s", segments[6])
2424
}
2525

0 commit comments

Comments
 (0)