Skip to content

Commit 0e8d5a5

Browse files
oscbysprooscbyspro
committed
Cleanup
1 parent 8ea4862 commit 0e8d5a5

File tree

12 files changed

+56
-96
lines changed

12 files changed

+56
-96
lines changed

‎Sources/DiffableTextKit/Models/Symbol.swift‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,10 @@ extension Sequence where Element == Symbol {
7070
@inlinable public func nonvirtuals() -> String {
7171
String(lazy.nonvirtuals())
7272
}
73-
}
74-
75-
//*============================================================================*
76-
// MARK: * Symbol x Sequence x Lazy [...]
77-
//*============================================================================*
78-
79-
extension LazySequenceProtocol where Element == Symbol {
8073

8174
/// A lazy sequence of nonvirtual characters.
82-
@inlinable public func nonvirtuals() -> LazyMapSequence<LazyFilterSequence<Elements>, Character> {
75+
@inlinable public func nonvirtuals() -> LazyMapSequence<LazyFilterSequence
76+
<Self.Elements>, Character> where Self: LazySequenceProtocol {
8377
filter({!$0.attribute.contains(.virtual)}).map({$0.character})
8478
}
8579
}

‎Sources/DiffableTextKit/Models/Synchronize.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/// A message describing synchronization behavior.
1515
@frozen public struct Synchronize: OptionSet {
1616

17-
/// Requires that input and output values are equal.
17+
/// Requires input and output values to be equal.
1818
public static let invariant = Self(rawValue: 1 << 0)
1919

2020
//=------------------------------------------------------------------------=

‎Sources/DiffableTextKit/Utilities/Capacity.swift‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Sources/DiffableTextKit/Utilities/Count.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@
88
//=----------------------------------------------------------------------------=
99

1010
//*============================================================================*
11-
// MARK: * Count [...]
11+
// MARK: * Count
1212
//*============================================================================*
1313

1414
public extension Sequence {
1515

16+
//=------------------------------------------------------------------------=
17+
// MARK: Predicate
18+
//=------------------------------------------------------------------------=
19+
1620
@inlinable func count(where predicate: (Element) throws -> Bool) rethrows -> Int {
1721
var S0 = 0; for S1 in self { if try predicate(S1) { S0 += 1 } }; return S0
1822
}

‎Sources/DiffableTextKit/Utilities/Slice.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@
88
//=----------------------------------------------------------------------------=
99

1010
//*============================================================================*
11-
// MARK: * Slice [...]
11+
// MARK: * Slice
1212
//*============================================================================*
1313

1414
extension BidirectionalCollection {
1515

16+
//=------------------------------------------------------------------------=
17+
// MARK: Suffix
18+
//=------------------------------------------------------------------------=
19+
1620
@inlinable public func suffix(while predicate: (Element) throws -> Bool) rethrows -> SubSequence {
1721
try self[startOfSuffix(while: predicate)...]
1822
}

‎Sources/DiffableTextKitXNumber/Tokens/Digit.swift‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,20 @@ import Foundation
1919
// MARK: Instances
2020
//=------------------------------------------------------------------------=
2121

22-
@usableFromInline static let zero = Self(ascii: 48) // "0"
23-
@usableFromInline static let one = Self(ascii: 49) // "1"
24-
@usableFromInline static let two = Self(ascii: 50) // "2"
25-
@usableFromInline static let three = Self(ascii: 51) // "3"
26-
@usableFromInline static let four = Self(ascii: 52) // "4"
27-
@usableFromInline static let five = Self(ascii: 53) // "5"
28-
@usableFromInline static let six = Self(ascii: 54) // "6"
29-
@usableFromInline static let seven = Self(ascii: 55) // "7"
30-
@usableFromInline static let eight = Self(ascii: 56) // "8"
31-
@usableFromInline static let nine = Self(ascii: 57) // "9"
32-
33-
@usableFromInline static let allCases = (48 ..< 58).map(Self.init)
22+
@usableFromInline static let zero = Self(ascii: "0")
23+
@usableFromInline static let one = Self(ascii: "1")
24+
@usableFromInline static let two = Self(ascii: "2")
25+
@usableFromInline static let three = Self(ascii: "3")
26+
@usableFromInline static let four = Self(ascii: "4")
27+
@usableFromInline static let five = Self(ascii: "5")
28+
@usableFromInline static let six = Self(ascii: "6")
29+
@usableFromInline static let seven = Self(ascii: "7")
30+
@usableFromInline static let eight = Self(ascii: "8")
31+
@usableFromInline static let nine = Self(ascii: "9")
32+
33+
@usableFromInline static let allCases = [
34+
zero, one, two, three, four,
35+
five, six, seven, eight, nine]
3436

3537
//=------------------------------------------------------------------------=
3638
// MARK: State
@@ -42,7 +44,9 @@ import Foundation
4244
// MARK: Initializers
4345
//=------------------------------------------------------------------------=
4446

45-
private init(ascii: UInt8) { self.ascii = ascii }
47+
private init(ascii: Unicode.Scalar) {
48+
self.ascii = UInt8(ascii:ascii)
49+
}
4650

4751
//=------------------------------------------------------------------------=
4852
// MARK: Utilities

‎Sources/DiffableTextKitXNumber/Tokens/Number.swift‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,14 @@ import DiffableTextKit
114114
//=------------------------------------------------------------------------=
115115

116116
@inlinable var ascii: [UInt8] {
117-
let size = integer.count+fraction.count+2
118-
return Array<UInt8>.init(capacity: size){
119-
$0.append(sign.ascii)
120-
$0.append(contentsOf: integer.ascii)
121-
guard let separator else { return }
122-
$0.append(separator.ascii)
123-
$0.append(contentsOf: fraction.ascii)}
117+
var ascii = [UInt8]()
118+
ascii.reserveCapacity(integer.count+fraction.count+2)
119+
ascii.append(sign.ascii)
120+
ascii.append(contentsOf: integer .ascii )
121+
guard let separator else { return ascii }
122+
ascii.append(separator.ascii)
123+
ascii.append(contentsOf: fraction.ascii )
124+
return ascii
124125
}
125126

126127
//=------------------------------------------------------------------------=

‎Sources/DiffableTextKitXNumber/Tokens/Separator.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import Foundation
1919
// MARK: Instances
2020
//=------------------------------------------------------------------------=
2121

22-
@usableFromInline static let grouping = Self(ascii: 44) // ","
23-
@usableFromInline static let fraction = Self(ascii: 46) // "."
22+
@usableFromInline static let grouping = Self(ascii: ",")
23+
@usableFromInline static let fraction = Self(ascii: ".")
2424

2525
@usableFromInline static let allCases = [grouping, fraction]
2626

@@ -34,7 +34,9 @@ import Foundation
3434
// MARK: Initializers
3535
//=------------------------------------------------------------------------=
3636

37-
private init(ascii: UInt8) { self.ascii = ascii }
37+
private init(ascii: Unicode.Scalar) {
38+
self.ascii = UInt8(ascii:ascii)
39+
}
3840

3941
//=------------------------------------------------------------------------=
4042
// MARK: Utilities

‎Sources/DiffableTextKitXNumber/Tokens/Sign.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import Foundation
1919
// MARK: Instances
2020
//=------------------------------------------------------------------------=
2121

22-
@usableFromInline static let positive = Self(ascii: 43) // "+"
23-
@usableFromInline static let negative = Self(ascii: 45) // "-"
22+
@usableFromInline static let positive = Self(ascii: "+")
23+
@usableFromInline static let negative = Self(ascii: "-")
2424

2525
@usableFromInline static let allCases = [positive, negative]
2626

@@ -34,7 +34,9 @@ import Foundation
3434
// MARK: Initializers
3535
//=------------------------------------------------------------------------=
3636

37-
private init(ascii: UInt8) { self.ascii = ascii }
37+
private init(ascii: Unicode.Scalar) {
38+
self.ascii = UInt8(ascii:ascii)
39+
}
3840

3941
//=------------------------------------------------------------------------=
4042
// MARK: Transformations

‎Sources/DiffableTextKitXUIKit/DiffableTextField.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
197197
//=----------------------------------=
198198
// Marked
199199
//=----------------------------------=
200-
if let _ = view.markedTextRange {
200+
if let _ = view.markedTextRange {
201201
//=------------------------------=
202202
// Push
203203
//=------------------------------=
@@ -228,7 +228,9 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
228228
//=--------------------------------------------------------------------=
229229

230230
@inlinable public func textFieldShouldReturn(_ view: UITextField) -> Bool {
231-
self.downstream.dismiss(); self.sidestream.onSubmit?(); return true
231+
self.downstream.dismiss()
232+
self.sidestream.onSubmit?()
233+
return true
232234
}
233235

234236
@inlinable public func textFieldDidBeginEditing(_ view: UITextField) {
@@ -260,7 +262,7 @@ public struct DiffableTextField<Style: DiffableTextStyle>: UIViewRepresentable {
260262
//=----------------------------------=
261263
} catch let reason {
262264
Brrr.unsynchronizable << Info(reason)
263-
Brrr.dismiss << Info(["reentrant view updates are prohibited"])
265+
Brrr.dismiss << Info(["cyclical view updates are prohibited"])
264266
//=------------------------------=
265267
// Task
266268
//=------------------------------=

0 commit comments

Comments
 (0)