dnrops
/
Yams
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Constructor.swift 

to reuse code by extending FixedWidthInteger
This commit is contained in:
JP Simard 2017-11-01 18:14:39 -07:00
parent 5d0fb7e62c
commit efe8f946e7
No known key found for this signature in database
GPG Key ID: 184C3F2916202C58
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Sources/Yams/Constructor.swift
View File

@ -173,15 +173,15 @@ extension ScalarConstructible where Self: FloatingPoint & SexagesimalConvertible
default:
scalar = scalar.replacingOccurrences(of: "_", with: "")
if scalar.contains(":") {
return Self.init(sexagesimal: scalar)
return Self(sexagesimal: scalar)
}
return .create(from: scalar)
}
}
}
extension Int: ScalarConstructible {
public static func construct(from node: Node) -> Int? {
extension FixedWidthInteger where Self: SexagesimalConvertible {
fileprivate static func _construct(from node: Node) -> Self? {
assert(node.isScalar) // swiftlint:disable:next force_unwrapping
let scalarWithSign = node.scalar!.string.replacingOccurrences(of: "_", with: "")
if scalarWithSign == "0" {
@ -189,6 +189,9 @@ extension Int: ScalarConstructible {
}
let negative = scalarWithSign.hasPrefix("-")
guard isSigned || !negative else { return nil }
let signPrefix = negative ? "-" : ""
let hasSign = negative || scalarWithSign.hasPrefix("+")
@ -201,39 +204,24 @@ extension Int: ScalarConstructible {
let scalar = scalarWithSign.substring(from: hasSign ? 1 : 0)
for (prefix, radix) in prefixToRadix where scalar.hasPrefix(prefix) {
return Int(signPrefix + scalar.substring(from: prefix.count), radix: radix)
return Self(signPrefix + scalar.substring(from: prefix.count), radix: radix)
}
if scalar.contains(":") {
return Int(sexagesimal: scalarWithSign)
return Self(sexagesimal: scalarWithSign)
}
return Int(scalarWithSign)
return Self(scalarWithSign)
}
}
extension Int: ScalarConstructible {
public static func construct(from node: Node) -> Int? {
return _construct(from: node)
}
}
extension UInt: ScalarConstructible {
public static func construct(from node: Node) -> UInt? {
assert(node.isScalar) // swiftlint:disable:next force_unwrapping
let scalarWithSign = node.scalar!.string.replacingOccurrences(of: "_", with: "")
if scalarWithSign == "0" {
return 0
}
guard !scalarWithSign.hasPrefix("-") else { return nil }
let prefixToRadix: [(String, Int)] = [
("0x", 16),
("0b", 2),
("0o", 8),
("0", 8)
]
let scalar = scalarWithSign.substring(from: scalarWithSign.hasPrefix("+") ? 1 : 0)
for (prefix, radix) in prefixToRadix where scalar.hasPrefix(prefix) {
return UInt(scalar.substring(from: prefix.count), radix: radix)
}
if scalar.contains(":") {
return UInt(sexagesimal: scalarWithSign)
}
return UInt(scalarWithSign)
return _construct(from: node)
}
}
@ -395,13 +383,13 @@ extension SexagesimalConvertible {
extension SexagesimalConvertible where Self: LosslessStringConvertible {
public static func create(from string: String) -> Self? {
return Self.init(string)
return Self(string)
}
}
extension SexagesimalConvertible where Self: FixedWidthInteger {
public static func create(from string: String) -> Self? {
return Self.init(string, radix: 10)
return Self(string, radix: 10)
}
}