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

Mmoved _CSVUnkeyedDecoder.pop implementation to .decode(_:T) method

This commit is contained in:
Caleb Kleveter 2018-05-08 10:22:15 -05:00
parent e24a584d93
commit e66f1917be
No known key found for this signature in database
GPG Key ID: 30A5A6F3A0ED7EDA
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/CSV/Coder/Decoder/_CSVUnKeyedDecoder.swift
View File

@ -19,14 +19,6 @@ final class _CSVUnkeyedDecoder: UnkeyedDecodingContainer {
return self.currentIndex >= (self.count ?? 0)
}
func pop()throws -> [String: String] {
guard let row = next() else {
throw DecodingError.valueNotFound([String: String?].self, DecodingError.Context(codingPath: self.codingPath, debugDescription: "No row exists at the current index"))
}
self.currentIndex += 1
return row
}
func decodeNil() throws -> Bool {
return self.isAtEnd
}
@ -52,7 +44,11 @@ final class _CSVUnkeyedDecoder: UnkeyedDecodingContainer {
}
func decode<T>(_ type: T.Type) throws -> T where T : Decodable {
let decoder = try _CSVDecoder(row: self.pop(), path: self.codingPath)
defer { self.currentIndex += 1 }
guard let row = next() else {
throw DecodingError.valueNotFound([String: String?].self, DecodingError.Context(codingPath: self.codingPath, debugDescription: "No row exists at the current index"))
}
let decoder = _CSVDecoder(row: row, path: self.codingPath)
return try T(from: decoder)
}