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

Merge pull request #15 from yaslab/feature/speed-up 

Speed up
This commit is contained in:
Yasuhiro Hatta 2016-11-04 21:38:08 +09:00 committed by GitHub
parent 143a9b9740 485738a95c
commit b6733645a7
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/BinaryReader.swift
View File

@ -45,9 +45,9 @@ internal class BinaryReader {
private let endian: Endian
private let closeOnDeinit: Bool
private var buffer = [UInt8](repeating: 0, count: 4)
private var buffer = malloc(4).assumingMemoryBound(to: UInt8.self)
private var tempBuffer = [UInt8](repeating: 0, count: 4)
private var tempBuffer = malloc(4).assumingMemoryBound(to: UInt8.self)
private let tempBufferSize = 4
private var tempBufferOffset = 0
@ -65,8 +65,8 @@ internal class BinaryReader {
throw CSVError.cannotOpenFile
}
let readCount = stream.read(&tempBuffer, maxLength: tempBufferSize)
if let (e, l) = readBOM(buffer: &tempBuffer, length: readCount) {
let readCount = stream.read(tempBuffer, maxLength: tempBufferSize)
if let (e, l) = readBOM(buffer: tempBuffer, length: readCount) {
if endian != .unknown && endian != e {
throw CSVError.stringEndianMismatch
}
@ -83,6 +83,8 @@ internal class BinaryReader {
if closeOnDeinit && stream.streamStatus != .closed {
stream.close()
}
free(buffer)
free(tempBuffer)
}
internal var hasBytesAvailable: Bool {
@ -108,7 +110,7 @@ internal class BinaryReader {
internal func readUInt8() throws -> UInt8 {
let bufferSize = 1
let length = try readStream(&buffer, maxLength: bufferSize)
let length = try readStream(buffer, maxLength: bufferSize)
if length < 0 {
throw CSVError.streamErrorHasOccurred(error: stream.streamError!)
}
@ -120,14 +122,14 @@ internal class BinaryReader {
internal func readUInt16() throws -> UInt16 {
let bufferSize = 2
let length = try readStream(&buffer, maxLength: bufferSize)
let length = try readStream(buffer, maxLength: bufferSize)
if length < 0 {
throw CSVError.streamErrorHasOccurred(error: stream.streamError!)
}
if length != bufferSize {
throw CSVError.stringEncodingMismatch
}
return try UnsafePointer(buffer).withMemoryRebound(to: UInt16.self, capacity: 1) {
return try buffer.withMemoryRebound(to: UInt16.self, capacity: 1) {
switch endian {
case .big:
return CFSwapInt16BigToHost($0[0])
@ -141,14 +143,14 @@ internal class BinaryReader {
internal func readUInt32() throws -> UInt32 {
let bufferSize = 4
let length = try readStream(&buffer, maxLength: bufferSize)
let length = try readStream(buffer, maxLength: bufferSize)
if length < 0 {
throw CSVError.streamErrorHasOccurred(error: stream.streamError!)
}
if length != bufferSize {
throw CSVError.stringEncodingMismatch
}
return try UnsafePointer(buffer).withMemoryRebound(to: UInt32.self, capacity: 1) {
return try buffer.withMemoryRebound(to: UInt32.self, capacity: 1) {
switch endian {
case .big:
return CFSwapInt32BigToHost($0[0])

21
Sources/CSV.swift
View File

@ -19,6 +19,7 @@ public class CSV {
private let config: CSVConfiguration
private var back: UnicodeScalar? = nil
private var fieldBuffer = String.UnicodeScalarView()
private var currentRowIndex: Int = 0
private var currentFieldIndex: Int = 0
@ -157,7 +158,7 @@ public class CSV {
}
private func readField(quoted: Bool) -> (String, Bool) {
var field = ""
fieldBuffer.removeAll(keepingCapacity: true)
while let c = moveNext() {
if quoted {
@ -179,19 +180,19 @@ public class CSV {
}
}
// END ROW
return (field, true)
return (String(fieldBuffer), true)
} else if cNext == config.delimiter {
// END FIELD
return (field, false)
return (String(fieldBuffer), false)
} else if cNext == DQUOTE {
// ESC
field.append(String(DQUOTE))
fieldBuffer.append(DQUOTE)
} else {
// ERROR?
field.append(String(c))
fieldBuffer.append(c)
}
} else {
field.append(String(c))
fieldBuffer.append(c)
}
} else {
if c == CR || c == LF {
@ -202,18 +203,18 @@ public class CSV {
}
}
// END ROW
return (field, true)
return (String(fieldBuffer), true)
} else if c == config.delimiter {
// END FIELD
return (field, false)
return (String(fieldBuffer), false)
} else {
field.append(String(c))
fieldBuffer.append(c)
}
}
}
// END FILE
return (field, true)
return (String(fieldBuffer), true)
}
private func moveNext() -> UnicodeScalar? {