Skip to content

Commit dea98c9

Browse files
joshuawright11joshuawright11
committed
Fix compile warnings
1 parent 53dd8de commit dea98c9

File tree

4 files changed

+45
-45
lines changed

4 files changed

+45
-45
lines changed

‎Sources/Cron/DatePattern.swift

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public struct DatePattern {
5959
guard let second: Token = ts.count > 1 ? ts[1] : nil else {
6060
switch (first) {
6161
case .wildcard: return .any
62-
case .number(let num): return .number(num.0)
62+
case .number(let num, _): return .number(num)
6363
case .h: return .hash
6464
case .l: return .lastDayOfMonth
6565
case .lW: return .lastWeekdayOfMonth
@@ -70,35 +70,35 @@ public struct DatePattern {
7070

7171
guard let third: Token = ts.count > 2 ? ts[2] : nil else {
7272
switch (first, second) {
73-
case let (.slash, .number(step)):
74-
return .step(.any, step.0)
75-
case let (.number(dow), .l):
76-
guard 0...7 ~= dow.0 else {
73+
case let (.slash, .number(stepNum, _)):
74+
return .step(.any, stepNum)
75+
case let (.number(dowNum, _), .l):
76+
guard 0...7 ~= dowNum else {
7777
throw InternalError.parseError
7878
}
79-
return .lastDayOfWeek(DayOfWeek(rawValue: dow.0 % 7)!)
80-
case let (.number(num), .w):
81-
return .weekday(num.0)
79+
return .lastDayOfWeek(DayOfWeek(rawValue: dowNum % 7)!)
80+
case let (.number(num, _), .w):
81+
return .weekday(num)
8282
default:
8383
throw InternalError.parseError
8484
}
8585
}
8686

8787
guard let forth: Token = ts.count > 3 ? ts[3] : nil else {
8888
switch (first, second, third) {
89-
case let (.number(begin), .hyphen, .number(end)):
90-
return .range(begin.0, end.0)
91-
case let (.wildcard, .slash, .number(step)):
92-
return .step(.any, step.0)
93-
case let (.number(num), .slash, .number(step)):
94-
return .step(.number(num.0), step.0)
95-
case let (.h, .hyphen, .number(step)):
96-
return .step(.hash, step.0)
97-
case let (.number(dow), .numberSign, .number(num)):
98-
guard 0...7 ~= dow.0 else {
89+
case let (.number(beginNum, _), .hyphen, .number(endNum, _)):
90+
return .range(beginNum, endNum)
91+
case let (.wildcard, .slash, .number(stepNum, _)):
92+
return .step(.any, stepNum)
93+
case let (.number(num, _), .slash, .number(stepNum, _)):
94+
return .step(.number(num), stepNum)
95+
case let (.h, .hyphen, .number(stepNum, _)):
96+
return .step(.hash, stepNum)
97+
case let (.number(dowNum, _), .numberSign, .number(num, _)):
98+
guard 0...7 ~= dowNum else {
9999
throw InternalError.parseError
100100
}
101-
return .nthDayOfWeek(DayOfWeek(rawValue: dow.0 % 7)!, num.0)
101+
return .nthDayOfWeek(DayOfWeek(rawValue: dowNum % 7)!, num)
102102
default:
103103
throw InternalError.parseError
104104
}
@@ -110,17 +110,17 @@ public struct DatePattern {
110110

111111
guard let sixth: Token = ts.count > 5 ? ts[5] : nil else {
112112
switch (first, second, third, forth, fifth) {
113-
case let (.number(begin), .hyphen, .number(end), .slash, .number(step)):
114-
return .step(.range(begin.0, end.0), step.0)
113+
case let (.number(beginNum, _), .hyphen, .number(endNum, _), .slash, .number(stepNum, _)):
114+
return .step(.range(beginNum, endNum), stepNum)
115115
default:
116116
throw InternalError.parseError
117117
}
118118
}
119119

120120
guard let seventh: Token = ts.count > 6 ? ts[6] : nil else {
121121
switch (first, second, third, forth, fifth, sixth) {
122-
case let (.h, .openParen, .number(begin), .hyphen, .number(end), .closeParen):
123-
return .rangedHash(begin.0, end.0)
122+
case let (.h, .openParen, .number(beginNum, _), .hyphen, .number(endNum, _), .closeParen):
123+
return .rangedHash(beginNum, endNum)
124124
default:
125125
throw InternalError.parseError
126126
}
@@ -132,8 +132,8 @@ public struct DatePattern {
132132

133133
guard let _: Token = ts.count > 8 ? ts[8] : nil else {
134134
switch (first, second, third, forth, fifth, sixth, seventh, eighth) {
135-
case let (.h, .openParen, .number(begin), .hyphen, .number(end), .closeParen, .slash, .number(step)):
136-
return .step(.rangedHash(begin.0, end.0), step.0)
135+
case let (.h, .openParen, .number(beginNum, _), .hyphen, .number(endNum, _), .closeParen, .slash, .number(stepNum, _)):
136+
return .step(.rangedHash(beginNum, endNum), stepNum)
137137
default:
138138
throw InternalError.parseError
139139
}

‎Sources/Cron/FieldPattern.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ extension FieldPattern {
8585
if let e = getWorkDays().dropFirst(n).first {
8686
return .number(e)
8787
}
88-
return .none
88+
return NumberSet.none
8989
default:
9090
return nil
9191
}
@@ -121,12 +121,12 @@ extension FieldPattern {
121121
if let e = getDoWDays(dw).dropFirst(n).first {
122122
return .number(e)
123123
}
124-
return .none
124+
return NumberSet.none
125125
case .number(let dw):
126126
if let e = getDoWDays(DayOfWeek(rawValue: dw)!).first {
127127
return .step(e, 7)
128128
}
129-
return .none
129+
return NumberSet.none
130130
case .range(let begin, let end): // MON-FRI
131131
let ret = (begin...end).reduce(.none) { NumberSet.or($0, .step($1, 7)) }
132132
print(ret)
@@ -155,7 +155,7 @@ extension FieldPattern {
155155
case .hash: return .number(Int(hash % Int64(max)))
156156
case .rangedHash(let b, let e):
157157
guard b < e else {
158-
return .none
158+
return NumberSet.none
159159
}
160160
return .number(Int(Int64(hash) % Int64(e - b) + Int64(b)))
161161
default:

‎Sources/Cron/NumberSet.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ extension NumberSet {
2828
case .none : return false
2929
case .any : return true
3030
case .number(let v) : return v == n
31-
case .range(let (begin, end)) : return begin <= n && n <= end
32-
case .step(let (offset, step)) : return 0 == (n - offset) % step
33-
case .or(let (a, b)) : return a.contains(n) || b.contains(n)
34-
case .and(let (a, b)) : return a.contains(n) && b.contains(n)
31+
case let .range(begin, end) : return begin <= n && n <= end
32+
case let .step(offset, step) : return 0 == (n - offset) % step
33+
case let .or(a, b) : return a.contains(n) || b.contains(n)
34+
case let .and(a, b) : return a.contains(n) && b.contains(n)
3535
}
3636
}
3737
}
@@ -65,14 +65,14 @@ extension NumberSet {
6565
case .step(let offset, let step):
6666
let d = Int(ceil(Double(n + 1 - offset) / Double(step)))
6767
return d * step + offset
68-
case .or(let (a, b)):
68+
case let .or(a, b):
6969
switch (a.next(n), b.next(n)) {
7070
case (let x?, let y?): return min(x, y)
7171
case (let x?, nil ): return x
7272
case (nil , let y?): return y
7373
case (nil , nil ): return nil
7474
}
75-
case .and(let (a, b)):
75+
case let .and(a, b):
7676
return _next_and(a, b, a.next(n), b.next(n))
7777
}
7878
}

‎Tests/CronTests/ParserTests.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ extension Token: Equatable {}
127127

128128
public func == (lhs: Token, rhs: Token) -> Bool {
129129
switch (lhs, rhs) {
130-
case (.number(let (a, b)), .number(let (c, d))): return a == c && b == d
130+
case (let .number(a, b), let .number(c, d)): return a == c && b == d
131131
case (.wildcard, .wildcard): return true
132132
case (.slash, .slash): return true
133133
case (.hyphen, .hyphen): return true
@@ -149,16 +149,16 @@ public func == (lhs: FieldPattern, rhs: FieldPattern) -> Bool {
149149
case (.any, .any): return true
150150
case (.number(let a), .number(let b)): return a == b
151151
case (.hash, .hash): return true
152-
case (.rangedHash(let a), .rangedHash(let b)): return a.0 == b.0 && a.1 == b.1
153-
case (.step(let a), .step(let b)): return a.0 == b.0 && a.1 == b.1
154-
case (.range(let a), .range(let b)): return a.0 == b.0 && a.1 == b.1
152+
case (let .rangedHash(a1, a2), let .rangedHash(b1, b2)): return a1 == b1 && a2 == b2
153+
case (let .step(a1, a2), let .step(b1, b2)): return a1 == b1 && a2 == b2
154+
case (let .range(a1, a2), let .range(b1, b2)): return a1 == b1 && a2 == b2
155155

156156
case (.lastDayOfMonth, .lastDayOfMonth): return true
157157
case (.lastWeekdayOfMonth, .lastWeekdayOfMonth): return true
158158
case (.weekday(let a), .weekday(let b)): return a == b
159159

160-
case (.lastDayOfWeek(let a), .lastDayOfWeek(let b)): return a == b
161-
case (.nthDayOfWeek(let a), .nthDayOfWeek(let b)): return a.0 == b.0 && a.1 == b.1
160+
case (let .lastDayOfWeek(a), let .lastDayOfWeek(b)): return a == b
161+
case (let .nthDayOfWeek(a1, a2), let .nthDayOfWeek(b1, b2)): return a1 == b1 && a2 == b2
162162

163163
//case Or
164164

@@ -173,10 +173,10 @@ public func == (lhs: NumberSet, rhs: NumberSet) -> Bool {
173173
switch (lhs, rhs) {
174174
case (.any, .any): return true
175175
case (.number(let a), .number(let b)): return a == b
176-
case (.range(let a), .range(let b)): return a.0 == b.0 && a.1 == b.1
177-
case (.step(let a), .step(let b)): return a.0 == b.0 && a.1 == b.1
178-
case (.or(let a), .or(let b)): return a.0 == b.0 && a.1 == b.1
179-
case (.and(let a), .and(let b)): return a.0 == b.0 && a.1 == b.1
176+
case (let .range(a1, a2), let .range(b1, b2)): return a1 == b1 && a2 == b2
177+
case (let .step(a1, a2), let .step(b1, b2)): return a1 == b1 && a2 == b2
178+
case (let .or(a1, a2), let .or(b1, b2)): return a1 == b1 && a2 == b2
179+
case (let .and(a1, a2), let .and(b1, b2)): return a1 == b1 && a2 == b2
180180
default: return false
181181
}
182182
}

0 commit comments

Comments
 (0)