Sven/MakeColors
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 4 Packages Wiki Activity Actions

Configure + run SwiftFormat

Browse source
This commit is contained in:
Sven Weidauer 2020-12-30 12:53:40 +01:00
parent 7d277a0e43
commit 1f6b55014a
10 changed files with 53 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Sources/LibMakeColors/Model/Color.swift
View file

@ -17,7 +17,7 @@ struct Color: CustomStringConvertible, Equatable {
}
var description: String {
return a != 0xFF ? String(format: "#%02X%02X%02X%02X", r, g, b, a): String(format: "#%02X%02X%02X", r, g, b)
a != 0xFF ? String(format: "#%02X%02X%02X%02X", r, g, b, a) : String(format: "#%02X%02X%02X", r, g, b)
}
}
@ -37,10 +37,10 @@ extension Dictionary where Key == String, Value == ColorDef {
case nil:
throw Errors.missingReference(name)
case .color(let color):
case let .color(color):
return color
case .reference(let referenced):
case let .reference(referenced):
return try resolve(referenced, visited: visited)
}
}
@ -56,5 +56,4 @@ extension Dictionary where Key == String, Value == ColorDef {
case let ((left, _), (right, _)): return left.localizedStandardCompare(right) == .orderedAscending
}
}
}

20
Sources/LibMakeColors/Model/Parser.swift
View file

@ -2,7 +2,7 @@ import Foundation
private extension CharacterSet {
static let hex = CharacterSet(charactersIn: "0123456789abcdef")
static let name = alphanumerics.union(CharacterSet.init(charactersIn: "_/"))
static let name = alphanumerics.union(CharacterSet(charactersIn: "_/"))
}
private extension Collection {
@ -16,22 +16,21 @@ private extension Collection {
}
}
extension Scanner {
func string(_ s: String) -> Bool {
return scanString(s) != nil
scanString(s) != nil
}
func color() -> Color? {
if string("#"), let digits = scanCharacters(from: .hex) {
switch digits.count {
case 3, 4: //rgb(a)
case 3, 4: // rgb(a)
let digits = digits.chunks(size: 1)
.compactMap { UInt8($0, radix: 16) }
.map { $0 << 4 | $0 }
return Color(digits)
case 6, 8: //rrggbb(aa)
case 6, 8: // rrggbb(aa)
let digits = digits.chunks(size: 2).compactMap { UInt8($0, radix: 16) }
return Color(digits)
@ -76,9 +75,11 @@ extension Scanner {
}
func colorLine() -> (String, ColorDef)? {
guard let name = self.name(),
let def = colorDef(),
endOfLine() else {
guard
let name = self.name(),
let def = colorDef(),
endOfLine()
else {
return nil
}
return (name, def)
@ -92,7 +93,6 @@ extension Scanner {
return true
}
func colorList() throws -> [String: ColorDef] {
var result: [String: ColorDef] = [:]
while !isAtEnd {
@ -121,5 +121,3 @@ extension Scanner {
return result
}
}