dnrops
/
GeoIP2-swift
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally got a concept on how to program this in a non-convoluted way. 

- Extended UInt8 with a nice and juicy bitmask helper function
- Foundation for a ControlByte type

Signed-off-by: Adam Rocska <adam.rocska@adams.solutions>
This commit is contained in:
Adam Rocska 2020-04-30 13:27:23 +02:00
parent 5ee582ca93
commit b020fb2944
4 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Sources/MaxMindDBReader/ControlByte.swift Normal file
View File

@ -0,0 +1,17 @@
import Foundation
struct ControlByte {
let type: DataType
init?(firstByte: UInt8, secondByte: UInt8 = 0b0000_0000) {
let typeDefinitionOnFirstByte = firstByte &>> 5
guard let type = typeDefinitionOnFirstByte != 0b0000_0000
? DataType(rawValue: typeDefinitionOnFirstByte)
: DataType(rawValue: secondByte + 7)
else {
return nil
}
self.type = type
}
}

9
Sources/MaxMindDBReader/UInt8.swift Normal file
View File

@ -0,0 +1,9 @@
import Foundation
extension UInt8 {
@inlinable func areBitsSet(bitMask: UInt8) -> Bool {
return (self & bitMask) > 0
}
}

33
Tests/MaxMindDBReaderTests/ControlByteTest.swift Normal file
View File

@ -0,0 +1,33 @@
import Foundation
import XCTest
@testable import MaxMindDBReader
class ControlByteTest: XCTestCase {
func testInit() {
let dataTypes = (1...255).compactMap({ DataType(rawValue: $0) })
let nonExtendedTypes = dataTypes.filter({ $0.rawValue <= 7 }).map({ $0.rawValue })
let extendedTypes = dataTypes.filter({ $0.rawValue > 7 }).map({ $0.rawValue })
precondition(nonExtendedTypes.count > 0, "nonExtendedTypes can't be empty.")
precondition(extendedTypes.count > 0, "extendedTypes can't be empty.")
for nonExtendedType in nonExtendedTypes {
XCTAssertEqual(
DataType(rawValue: nonExtendedType),
ControlByte(firstByte: nonExtendedType &<< 5)?.type
)
XCTAssertEqual(
DataType(rawValue: nonExtendedType),
ControlByte(
firstByte: nonExtendedType &<< 5,
secondByte: 0b1111_1111
)?.type
)
}
for extendedType in extendedTypes {
XCTAssertEqual(
DataType(rawValue: extendedType),
ControlByte(firstByte: 0b0000_0000, secondByte: extendedType - 7)?.type
)
}
}
}

34
Tests/MaxMindDBReaderTests/UInt8Test.swift Normal file
View File

@ -0,0 +1,34 @@
import Foundation
import XCTest
@testable import MaxMindDBReader
class UInt8Test: XCTestCase {
func testAreBitsSet() {
XCTAssertTrue(UInt8(0b0010_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b0110_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b1110_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b1111_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b1111_1000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b1111_1100).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b1111_1110).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b1111_1111).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b0000_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b0100_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b1100_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b1101_0000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b1101_1000).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b1101_1100).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b1101_1110).areBitsSet(bitMask: 0b0010_0000))
XCTAssertFalse(UInt8(0b1101_1111).areBitsSet(bitMask: 0b0010_0000))
XCTAssertTrue(UInt8(0b1100_0000).areBitsSet(bitMask: 0b1100_0000))
XCTAssertTrue(UInt8(0b1110_0000).areBitsSet(bitMask: 0b1100_0000))
XCTAssertTrue(UInt8(0b1111_0000).areBitsSet(bitMask: 0b1100_0000))
XCTAssertTrue(UInt8(0b1111_1000).areBitsSet(bitMask: 0b1100_0000))
XCTAssertTrue(UInt8(0b1111_1100).areBitsSet(bitMask: 0b1100_0000))
XCTAssertTrue(UInt8(0b1111_1110).areBitsSet(bitMask: 0b1100_0000))
XCTAssertTrue(UInt8(0b1111_1111).areBitsSet(bitMask: 0b1100_0000))
}
}