Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Sources/App/PointerExtensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,16 @@ extension UnsafeRawBufferPointer {

var asciiToInt32: Int32 {
let ascii0 = Character("0").asciiValue!
var sign: Int32 = 1;
var ret: Int32 = 0;
for val in self {
if val == 45 {
ret = ret * -1
sign = -1
} else {
ret = ret * 10 + Int32(val - ascii0)
}
}
return ret
return ret * sign
}

var asciiToUInt32: UInt32 {
Expand All @@ -68,31 +69,30 @@ extension UnsafeRawBufferPointer {

var asciiToInt16: Int16 {
let ascii0 = Character("0").asciiValue!
var sign: Int16 = 1;
var ret: Int16 = 0;
for val in self {
if val == 45 {
ret = ret * -1
sign = -1
} else {
ret = ret * 10 + Int16(val - ascii0)
}
}
return ret
return ret * sign
}

var asciiToInt8: Int8 {
let ascii0 = Character("0").asciiValue!
var sign: Int8 = 1;
var ret: Int8 = 0;
if self.count > 2 {
print(self.string)
}
for val in self {
if val == 45 {
ret = ret * -1
sign = -1
} else {
ret = ret * 10 + Int8(val - ascii0)
}
}
return ret
return ret * sign
}

/*var asciiToInt: Int64 {
Expand Down
34 changes: 34 additions & 0 deletions Tests/AppTests/geocoding_apiTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,38 @@ final class geocoding_apiTests: XCTestCase {
XCTAssertEqual(GeocodingDatabase.Geonames.populationToRank(2_000_000), 1.0)
XCTAssertEqual(GeocodingDatabase.Geonames.populationToRank(10_000_000), 1.0)
}

func testAsciiToIntParsing() {
let zero = "0".data(using: .utf8)!
let neg8 = "-42".data(using: .utf8)!
let neg16 = "-233".data(using: .utf8)!
let neg32 = "-1234567".data(using: .utf8)!
let pos8 = "42".data(using: .utf8)!
let pos16 = "1234".data(using: .utf8)!
let pos32 = "1234567".data(using: .utf8)!

zero.withUnsafeBytes { ptr in
XCTAssertEqual(ptr.asciiToInt16, 0)
XCTAssertEqual(ptr.asciiToInt32, 0)
XCTAssertEqual(ptr.asciiToInt8, 0)
}
neg8.withUnsafeBytes { ptr in
XCTAssertEqual(ptr.asciiToInt8, -42)
}
neg16.withUnsafeBytes { ptr in
XCTAssertEqual(ptr.asciiToInt16, -233)
}
neg32.withUnsafeBytes { ptr in
XCTAssertEqual(ptr.asciiToInt32, -1_234_567)
}
pos8.withUnsafeBytes { ptr in
XCTAssertEqual(ptr.asciiToInt8, 42)
}
pos16.withUnsafeBytes { ptr in
XCTAssertEqual(ptr.asciiToInt16, 1234)
}
pos32.withUnsafeBytes { ptr in
XCTAssertEqual(ptr.asciiToInt32, 1_234_567)
}
}
}