Rename BitReader.intFromBits(count:) to BitReader.int(fromBits:)

Author: tsolomko

Sources/BitReader.swift

@@ -15,8 +15,7 @@ public protocol BitReader: class {
 
     func bits(count: Int) -> [UInt8]
 
-    // TODO: Rename?
-    func intFromBits(count: Int) -> Int
+    func int(fromBits count: Int) -> Int
 
     // TODO: Describe, that it doesn't check for the end.
     func align()

Sources/LsbBitReader.swift

@@ -26,10 +26,9 @@ public final class LsbBitReader: ByteReader, BitReader {
         return bit
     }
 
-    public func intFromBits(count: Int) -> Int {
-        guard count > 0 else {
-            return 0
-        }
+    public func int(fromBits count: Int) -> Int {
+        guard count > 0
+            else { return 0 }
 
         var result = 0
         for i in 0..<count {
@@ -50,9 +49,9 @@ public final class LsbBitReader: ByteReader, BitReader {
     }
 
     public func align() {
-        guard self.bitMask != 1 else {
-            return
-        }
+        guard self.bitMask != 1
+            else { return }
+
         self.bitMask = 1
         self.offset += 1
     }

Sources/MsbBitReader.swift

@@ -26,10 +26,9 @@ public final class MsbBitReader: ByteReader, BitReader {
         return bit
     }
 
-    public func intFromBits(count: Int) -> Int {
-        guard count > 0 else {
-            return 0
-        }
+    public func int(fromBits count: Int) -> Int {
+        guard count > 0
+            else { return 0 }
 
         var result = 0
         for i in 0..<count {
@@ -50,9 +49,9 @@ public final class MsbBitReader: ByteReader, BitReader {
     }
 
     public func align() {
-        guard self.bitMask != 128 else {
-            return
-        }
+        guard self.bitMask != 128
+            else { return }
+
         self.bitMask = 128
         self.offset += 1
     }

Tests/BitByteDataTests/LsbBitReaderTests.swift

@@ -43,10 +43,10 @@ class LsbBitReaderTests: XCTestCase {
     func testIntFromBits() {
         let bitReader = LsbBitReader(data: LsbBitReaderTests.data)
 
-        var num = bitReader.intFromBits(count: 3)
+        var num = bitReader.int(fromBits: 3)
         XCTAssertEqual(num, 2)
 
-        num = bitReader.intFromBits(count: 8)
+        num = bitReader.int(fromBits: 8)
         XCTAssertEqual(num, 203)
 
         XCTAssertFalse(bitReader.isAligned)

Tests/BitByteDataTests/MsbBitReaderTests.swift

@@ -43,10 +43,10 @@ class MsbBitReaderTests: XCTestCase {
     func testIntFromBits() {
         let bitReader = MsbBitReader(data: MsbBitReaderTests.data)
 
-        var num = bitReader.intFromBits(count: 3)
+        var num = bitReader.int(fromBits: 3)
         XCTAssertEqual(num, 2)
 
-        num = bitReader.intFromBits(count: 8)
+        num = bitReader.int(fromBits: 8)
         XCTAssertEqual(num, 214)
 
         XCTAssertFalse(bitReader.isAligned)