Skip to content

Commit d44a284

Browse files
NeedleInAJayStackNeedleInAJayStack
committed
refactor: Removes init param names where awkward
1 parent 9511147 commit d44a284

File tree

15 files changed

+95
-95
lines changed

15 files changed

+95
-95
lines changed

‎Sources/Haystack/IO/ZincReader.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public class ZincReader {
6464
case "M": return marker
6565
case "R": return remove
6666
case "NA": return na
67-
case "NaN": return Number(val: .nan)
68-
case "INF": return Number(val: .infinity)
67+
case "NaN": return Number(.nan)
68+
case "INF": return Number(.infinity)
6969
default:
7070
throw ZincReaderError.UnexpectedId(id)
7171
}
@@ -79,7 +79,7 @@ public class ZincReader {
7979
if cur == .minus, peek == .id, peekVal.equals("INF") {
8080
try consume(.minus)
8181
try consume(.id)
82-
return Number(val: -1.0 * .infinity)
82+
return Number(-1.0 * .infinity)
8383
}
8484

8585
if cur == .lbracket {
@@ -123,7 +123,7 @@ public class ZincReader {
123123
guard let refVal = curVal as? String, let dis = peekVal as? String else {
124124
throw ZincReaderError.InvalidRef
125125
}
126-
val = Ref(val: refVal, dis: dis)
126+
val = Ref(refVal, dis: dis)
127127
try consume(.ref)
128128
}
129129
try consume()

‎Sources/Haystack/IO/ZincTokenizer.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class ZincTokenizer {
132132
guard let int = Int(s, radix: 16) else {
133133
throw ZincTokenizerError.invalidHex(s)
134134
}
135-
self.val = Number(val: Double(int))
135+
self.val = Number(Double(int))
136136
return .num
137137
}
138138

@@ -253,15 +253,15 @@ class ZincTokenizer {
253253
guard let double = Double(s) else {
254254
throw ZincTokenizerError.invalidNumberLiteral(s)
255255
}
256-
self.val = Number(val: double)
256+
self.val = Number(double)
257257
return .num
258258
}
259259
let doubleStr = s[..<unitIndex]
260260
let unitStr = s[unitIndex...]
261261
guard let double = Double(doubleStr) else {
262262
throw ZincTokenizerError.invalidNumberLiteral(s)
263263
}
264-
self.val = Number(val: double, unit: String(unitStr))
264+
self.val = Number(double, unit: String(unitStr))
265265
return .num
266266
}
267267

@@ -301,7 +301,7 @@ class ZincTokenizer {
301301
guard !s.isEmpty else {
302302
throw ZincTokenizerError.invalidEmptySymbol
303303
}
304-
self.val = Symbol(val: s)
304+
self.val = Symbol(s)
305305
return .symbol
306306
}
307307

@@ -316,7 +316,7 @@ class ZincTokenizer {
316316
break
317317
}
318318
}
319-
self.val = Ref(val: s)
319+
self.val = Ref(s)
320320
return .ref
321321
}
322322

@@ -347,7 +347,7 @@ class ZincTokenizer {
347347
try consume()
348348
}
349349
}
350-
self.val = Uri(val: s)
350+
self.val = Uri(s)
351351
return .uri
352352
}
353353

‎Sources/Haystack/Number.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public struct Number: Val {
66
public let val: Double
77
public let unit: String?
88

9-
public init(val: Double, unit: String? = nil) {
9+
public init(_ val: Double, unit: String? = nil) {
1010
self.val = val
1111
self.unit = unit
1212
}

‎Sources/Haystack/Ref.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public struct Ref: Val {
1818
public let val: String
1919
public let dis: String?
2020

21-
public init(val: String, dis: String? = nil) {
21+
public init(_ val: String, dis: String? = nil) {
2222
self.val = val
2323
self.dis = dis
2424
}

‎Sources/Haystack/Symbol.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public struct Symbol: Val {
55

66
public let val: String
77

8-
public init(val: String) {
8+
public init(_ val: String) {
99
self.val = val
1010
}
1111

‎Sources/Haystack/Uri.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public struct Uri: Val {
55

66
public let val: String
77

8-
public init(val: String) {
8+
public init(_ val: String) {
99
self.val = val
1010
}
1111

‎Tests/HaystackTests/DictTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ final class DictTests: XCTestCase {
66
let value: Dict = [
77
"bool": true,
88
"str": "abc",
9-
"number": Number(val: 42, unit: "furloghs"),
9+
"number": Number(42, unit: "furloghs"),
1010
"dict": Dict([
1111
"bool": false,
1212
"str": "xyz"
@@ -35,7 +35,7 @@ final class DictTests: XCTestCase {
3535
Dict([
3636
"bool": true,
3737
"str": "abc",
38-
"number": Number(val: 42, unit: "furloghs"),
38+
"number": Number(42, unit: "furloghs"),
3939
"dict": Dict([
4040
"bool": false,
4141
"str": "xyz"
@@ -94,7 +94,7 @@ final class DictTests: XCTestCase {
9494
Dict([
9595
"bool": true,
9696
"str": "abc",
97-
"number": Number(val: 42, unit: "furloghs"),
97+
"number": Number(42, unit: "furloghs"),
9898
"dict": Dict([
9999
"bool": false,
100100
"str": "xyz"
@@ -103,7 +103,7 @@ final class DictTests: XCTestCase {
103103
Dict([
104104
"bool": true,
105105
"str": "abc",
106-
"number": Number(val: 42, unit: "furloghs"),
106+
"number": Number(42, unit: "furloghs"),
107107
"dict": Dict([
108108
"bool": false,
109109
"str": "xyz"
@@ -114,7 +114,7 @@ final class DictTests: XCTestCase {
114114
Dict([
115115
"bool": true,
116116
"str": "abc",
117-
"number": Number(val: 42, unit: "furloghs"),
117+
"number": Number(42, unit: "furloghs"),
118118
"dict": Dict([
119119
"bool": false,
120120
"str": "xyz"
@@ -123,7 +123,7 @@ final class DictTests: XCTestCase {
123123
Dict([
124124
"bool": true,
125125
"str": "abc",
126-
"number": Number(val: 42, unit: "furloghs"),
126+
"number": Number(42, unit: "furloghs"),
127127
"dict": Dict([
128128
"bool": true,
129129
"str": "xyz"

‎Tests/HaystackTests/GridTests.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ final class GridTests: XCTestCase {
99
.addCol(name: "equip")
1010
.addCol(name: "siteRef")
1111
.addCol(name: "installed")
12-
.addRow(["RTU-1", marker, Ref(val: "153c-699a", dis: "HQ"), Date(year: 2005, month: 6, day: 1)])
13-
.addRow(["RTU-2", marker, Ref(val: "153c-699b", dis: "Library"), Date(year: 1997, month: 7, day: 12)])
12+
.addRow(["RTU-1", marker, Ref("153c-699a", dis: "HQ"), Date(year: 2005, month: 6, day: 1)])
13+
.addRow(["RTU-2", marker, Ref("153c-699b", dis: "Library"), Date(year: 1997, month: 7, day: 12)])
1414
.toGrid()
1515
let jsonString = #"{"_kind":"grid","meta":{"foo":"bar"},"cols":[{"name":"dis","meta":{"dis":"Equip Name"}},{"name":"equip"},{"name":"siteRef"},{"name":"installed"}],"rows":[{"dis":"RTU-1","equip":{"_kind":"marker"},"siteRef":{"_kind":"ref","val":"153c-699a","dis":"HQ"},"installed":{"_kind":"date","val":"2005-06-01"}},{"dis": "RTU-2","equip":{"_kind":"marker"},"siteRef":{"_kind":"ref","val":"153c-699b","dis":"Library"},"installed":{"_kind":"date","val":"1997-07-12"}}]}"#
1616

@@ -37,8 +37,8 @@ final class GridTests: XCTestCase {
3737
.addCol(name: "equip")
3838
.addCol(name: "siteRef")
3939
.addCol(name: "installed")
40-
.addRow(["RTU-1", marker, Ref(val: "153c-699a", dis: "HQ"), Date(year: 2005, month: 6, day: 1)])
41-
.addRow(["RTU-2", marker, Ref(val: "153c-699b", dis: "Library"), Date(year: 1997, month: 7, day: 12)])
40+
.addRow(["RTU-1", marker, Ref("153c-699a", dis: "HQ"), Date(year: 2005, month: 6, day: 1)])
41+
.addRow(["RTU-2", marker, Ref("153c-699b", dis: "Library"), Date(year: 1997, month: 7, day: 12)])
4242
.toGrid()
4343
.toZinc(),
4444
"""
@@ -57,17 +57,17 @@ final class GridTests: XCTestCase {
5757
.addCol(name: "equip")
5858
.addCol(name: "siteRef")
5959
.addCol(name: "managed")
60-
.addRow(["RTU-1", marker, Ref(val: "153c-699a", dis: "HQ"), true])
61-
.addRow(["RTU-2", marker, Ref(val: "153c-699b", dis: "Library"), false])
60+
.addRow(["RTU-1", marker, Ref("153c-699a", dis: "HQ"), true])
61+
.addRow(["RTU-2", marker, Ref("153c-699b", dis: "Library"), false])
6262

6363
let builder2 = try GridBuilder()
6464
.setMeta(["ver": "3.0", "foo": "bar"])
6565
.addCol(name: "dis", meta: ["dis": "Equip Name"])
6666
.addCol(name: "equip")
6767
.addCol(name: "siteRef")
6868
.addCol(name: "managed")
69-
.addRow(["RTU-1", marker, Ref(val: "153c-699a", dis: "HQ"), false])
70-
.addRow(["RTU-2", marker, Ref(val: "153c-699b", dis: "Library"), false])
69+
.addRow(["RTU-1", marker, Ref("153c-699a", dis: "HQ"), false])
70+
.addRow(["RTU-2", marker, Ref("153c-699b", dis: "Library"), false])
7171

7272

7373
// Test basic

‎Tests/HaystackTests/IO/ZincReaderTests.swift‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class ZincReaderTests: XCTestCase {
2525
meta: [:],
2626
cols: [("a", nil), ("b", nil)],
2727
rows: [
28-
[Symbol(val: "foo"), Symbol(val: "a-b")]
28+
[Symbol("foo"), Symbol("a-b")]
2929
]
3030
)
3131
}
@@ -80,8 +80,8 @@ final class ZincReaderTests: XCTestCase {
8080
meta: [:],
8181
cols: [("a", nil), ("b", nil)],
8282
rows: [
83-
[Number(val: 1), Number(val: 2)],
84-
[Number(val: 3), Number(val: 4)],
83+
[Number(1), Number(2)],
84+
[Number(3), Number(4)],
8585
]
8686
)
8787

@@ -101,13 +101,13 @@ final class ZincReaderTests: XCTestCase {
101101
meta: [:],
102102
cols: [("a", nil), ("b", nil), ("c", nil), ("d", nil)],
103103
rows: [
104-
[true, false, null, Number(val: -99)],
105-
[Number(val: 2.3), Number(val: -5e-10), Number(val: 2.4e20), Number(val: 123e-10)],
104+
[true, false, null, Number(-99)],
105+
[Number(2.3), Number(-5e-10), Number(2.4e20), Number(123e-10)],
106106
["", "a", "\" \\ \t \n \r", "\u{abcd}"],
107-
[Uri(val: "path"), Ref(val: "12cbb082-0c02ae73"), Number(val: 4, unit: "s"), Number(val: -2.5, unit: "min")],
107+
[Uri("path"), Ref("12cbb082-0c02ae73"), Number(4, unit: "s"), Number(-2.5, unit: "min")],
108108
[marker, remove, null, null], // Bin not supported.
109109
[Date(year: 2009, month: 12, day: 31), Time(hour: 23, minute: 59, second: 1), Time(hour: 1, minute: 2, second: 3, millisecond: 123), DateTime(year: 2009, month: 2, day: 3, hour: 4, minute: 5, second: 6)],
110-
[Number(val: .infinity), Number(val: -1 * .infinity), "", Number(val: .nan)],
110+
[Number(.infinity), Number(-1 * .infinity), "", Number(.nan)],
111111
[Coord(lat: 12, lng: -34), Coord(lat: 0.123, lng: -0.789), Coord(lat: 84.5, lng: -77.45), Coord(lat: -90, lng: 180)],
112112
]
113113
)
@@ -124,9 +124,9 @@ final class ZincReaderTests: XCTestCase {
124124
meta: [:],
125125
cols: [("foo", nil)],
126126
rows: [
127-
[Uri(val: "foo$20bar")],
128-
[Uri(val: "foo`bar")],
129-
[Uri(val: "file \\#2")],
127+
[Uri("foo$20bar")],
128+
[Uri("foo`bar")],
129+
[Uri("file \\#2")],
130130
["$15"],
131131
]
132132
)
@@ -143,10 +143,10 @@ final class ZincReaderTests: XCTestCase {
143143
meta: [:],
144144
cols: [("a", nil), ("b", nil)],
145145
rows: [
146-
[Number(val: -3.1, unit: "kg"), Number(val: 4, unit: "kg")],
147-
[Number(val: 5, unit: "%"), Number(val: 3.2, unit: "%")],
148-
[Number(val: 5, unit: "kWh/ft\u{00b2}"), Number(val: -15, unit: "kWh/m\u{00b2}")],
149-
[Number(val: 123e+12, unit: "kJ/kg_dry"), Number(val: 74, unit: "\u{0394}\u{0b0F}")],
146+
[Number(-3.1, unit: "kg"), Number(4, unit: "kg")],
147+
[Number(5, unit: "%"), Number(3.2, unit: "%")],
148+
[Number(5, unit: "kWh/ft\u{00b2}"), Number(-15, unit: "kWh/m\u{00b2}")],
149+
[Number(123e+12, unit: "kJ/kg_dry"), Number(74, unit: "\u{0394}\u{0b0F}")],
150150
]
151151
)
152152

@@ -164,12 +164,12 @@ final class ZincReaderTests: XCTestCase {
164164
meta: [:],
165165
cols: [("a", nil), ("b", nil), ("c", nil)],
166166
rows: [
167-
[null, Number(val: 1), Number(val: 2)],
168-
[Number(val: 3), null, Number(val: 5)],
169-
[Number(val: 6), Number(val: 7000), null],
170-
[null, null, Number(val: 10)],
167+
[null, Number(1), Number(2)],
168+
[Number(3), null, Number(5)],
169+
[Number(6), Number(7000), null],
170+
[null, null, Number(10)],
171171
[null, null, null],
172-
[Number(val: 14), null, null],
172+
[Number(14), null, null],
173173
]
174174
)
175175

@@ -214,14 +214,14 @@ final class ZincReaderTests: XCTestCase {
214214
],
215215
cols: [("a", nil)],
216216
rows: [
217-
[Number(val: 3.814697265625E-6)],
217+
[Number(3.814697265625E-6)],
218218
[DateTime(year: 2010, month: 12, day: 18, hour: 14, minute: 11, second: 30, millisecond: 924)],
219219
[DateTime(year: 2010, month: 12, day: 18, hour: 14, minute: 11, second: 30, millisecond: 925)],
220220
[DateTime(year: 2010, month: 12, day: 18, hour: 14, minute: 11, second: 30, millisecond: 925, timezone: "London")],
221-
[Number(val: 45, unit: "$")],
222-
[Number(val: 33, unit: "\u{00a3}")],
223-
[Ref(val: "12cbb08e-0c02ae73")],
224-
[Number(val: 7.15625E-4, unit: "kWh/ft\u{00b2}")],
221+
[Number(45, unit: "$")],
222+
[Number(33, unit: "\u{00a3}")],
223+
[Ref("12cbb08e-0c02ae73")],
224+
[Number(7.15625E-4, unit: "kWh/ft\u{00b2}")],
225225
[remove],
226226
[na],
227227
]

‎Tests/HaystackTests/IO/ZincTokenizerTests.swift‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,29 @@ final class ZincTokenizerTests: XCTestCase {
1515
}
1616

1717
func testNum() throws {
18-
try XCTAssertEqualTokensAndVals(zinc: "5", expected: [(.num, Number(val: 5))])
19-
try XCTAssertEqualTokensAndVals(zinc: "0x1234_abcd", expected: [(.num, Number(val: 0x1234abcd))])
18+
try XCTAssertEqualTokensAndVals(zinc: "5", expected: [(.num, Number(5))])
19+
try XCTAssertEqualTokensAndVals(zinc: "0x1234_abcd", expected: [(.num, Number(0x1234abcd))])
2020
}
2121

2222
func testFloats() throws {
23-
try XCTAssertEqualTokensAndVals(zinc: "5.0", expected: [(.num, Number(val: 5))])
24-
try XCTAssertEqualTokensAndVals(zinc: "5.42", expected: [(.num, Number(val: 5.42))])
25-
try XCTAssertEqualTokensAndVals(zinc: "123.2e32", expected: [(.num, Number(val: 123.2e32))])
26-
try XCTAssertEqualTokensAndVals(zinc: "123.2e+32", expected: [(.num, Number(val: 123.2e+32))])
27-
try XCTAssertEqualTokensAndVals(zinc: "2_123.2e+32", expected: [(.num, Number(val: 2_123.2e+32))])
28-
try XCTAssertEqualTokensAndVals(zinc: "4.2e-7", expected: [(.num, Number(val: 4.2e-7))])
23+
try XCTAssertEqualTokensAndVals(zinc: "5.0", expected: [(.num, Number(5))])
24+
try XCTAssertEqualTokensAndVals(zinc: "5.42", expected: [(.num, Number(5.42))])
25+
try XCTAssertEqualTokensAndVals(zinc: "123.2e32", expected: [(.num, Number(123.2e32))])
26+
try XCTAssertEqualTokensAndVals(zinc: "123.2e+32", expected: [(.num, Number(123.2e+32))])
27+
try XCTAssertEqualTokensAndVals(zinc: "2_123.2e+32", expected: [(.num, Number(2_123.2e+32))])
28+
try XCTAssertEqualTokensAndVals(zinc: "4.2e-7", expected: [(.num, Number(4.2e-7))])
2929
}
3030

3131
func testNumberWithUnits() throws {
32-
try XCTAssertEqualTokensAndVals(zinc: "-40ms", expected: [(.num, Number(val: -40, unit: "ms"))])
33-
try XCTAssertEqualTokensAndVals(zinc: "1sec", expected: [(.num, Number(val: 1, unit: "sec"))])
34-
try XCTAssertEqualTokensAndVals(zinc: "5hr", expected: [(.num, Number(val: 5, unit: "hr"))])
35-
try XCTAssertEqualTokensAndVals(zinc: "2.5day", expected: [(.num, Number(val: 2.5, unit: "day"))])
36-
try XCTAssertEqualTokensAndVals(zinc: "12%", expected: [(.num, Number(val: 12, unit: "%"))])
37-
try XCTAssertEqualTokensAndVals(zinc: "987_foo", expected: [(.num, Number(val: 987, unit: "_foo"))])
38-
try XCTAssertEqualTokensAndVals(zinc: "-1.2m/s", expected: [(.num, Number(val: -1.2, unit: "m/s"))])
39-
try XCTAssertEqualTokensAndVals(zinc: #"12kWh/ft\u00B2"#, expected: [(.num, Number(val: 12, unit: "kWh/ft\u{00B2}"))])
40-
try XCTAssertEqualTokensAndVals(zinc: "3_000.5J/kg_dry", expected: [(.num, Number(val: 3000.5, unit: "J/kg_dry"))])
32+
try XCTAssertEqualTokensAndVals(zinc: "-40ms", expected: [(.num, Number(-40, unit: "ms"))])
33+
try XCTAssertEqualTokensAndVals(zinc: "1sec", expected: [(.num, Number(1, unit: "sec"))])
34+
try XCTAssertEqualTokensAndVals(zinc: "5hr", expected: [(.num, Number(5, unit: "hr"))])
35+
try XCTAssertEqualTokensAndVals(zinc: "2.5day", expected: [(.num, Number(2.5, unit: "day"))])
36+
try XCTAssertEqualTokensAndVals(zinc: "12%", expected: [(.num, Number(12, unit: "%"))])
37+
try XCTAssertEqualTokensAndVals(zinc: "987_foo", expected: [(.num, Number(987, unit: "_foo"))])
38+
try XCTAssertEqualTokensAndVals(zinc: "-1.2m/s", expected: [(.num, Number(-1.2, unit: "m/s"))])
39+
try XCTAssertEqualTokensAndVals(zinc: #"12kWh/ft\u00B2"#, expected: [(.num, Number(12, unit: "kWh/ft\u{00B2}"))])
40+
try XCTAssertEqualTokensAndVals(zinc: "3_000.5J/kg_dry", expected: [(.num, Number(3000.5, unit: "J/kg_dry"))])
4141
}
4242

4343
func testStrings() throws {
@@ -98,13 +98,13 @@ final class ZincTokenizerTests: XCTestCase {
9898
}
9999

100100
func testRef() throws {
101-
try XCTAssertEqualTokensAndVals(zinc: "@125b780e-0684e169", expected: [(.ref, Ref(val: "125b780e-0684e169"))])
102-
try XCTAssertEqualTokensAndVals(zinc: "@demo:_:-.~", expected: [(.ref, Ref(val: "demo:_:-.~"))])
101+
try XCTAssertEqualTokensAndVals(zinc: "@125b780e-0684e169", expected: [(.ref, Ref("125b780e-0684e169"))])
102+
try XCTAssertEqualTokensAndVals(zinc: "@demo:_:-.~", expected: [(.ref, Ref("demo:_:-.~"))])
103103
}
104104

105105
func testUri() throws {
106-
try XCTAssertEqualTokensAndVals(zinc: "`http://foo/`", expected: [(.uri, Uri(val: "http://foo/"))])
107-
try XCTAssertEqualTokensAndVals(zinc: "`_ \\n \\\\ \\`_`", expected: [(.uri, Uri(val: "_ \n \\\\ `_"))])
106+
try XCTAssertEqualTokensAndVals(zinc: "`http://foo/`", expected: [(.uri, Uri("http://foo/"))])
107+
try XCTAssertEqualTokensAndVals(zinc: "`_ \\n \\\\ \\`_`", expected: [(.uri, Uri("_ \n \\\\ `_"))])
108108
}
109109

110110
func testWhitespace() throws {

0 commit comments

Comments
 (0)