Fix currentByte property of bit readers having incorrect value after byte-reading operations were used

Author: tsolomko

Sources/LsbBitReader.swift

@@ -270,6 +270,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func byte() -> UInt8 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.byte()
     }
 
@@ -281,6 +282,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func bytes(count: Int) -> [UInt8] {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.bytes(count: count)
     }
 
@@ -293,6 +295,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func int(fromBytes count: Int) -> Int {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.int(fromBytes: count)
     }
 
@@ -304,6 +307,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func uint64() -> UInt64 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint64(fromBytes: 8)
     }
 
@@ -316,6 +320,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func uint64(fromBytes count: Int) -> UInt64 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint64(fromBytes: count)
     }
 
@@ -327,6 +332,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func uint32() -> UInt32 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint32(fromBytes: 4)
     }
 
@@ -339,6 +345,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func uint32(fromBytes count: Int) -> UInt32 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint32(fromBytes: count)
     }
 
@@ -350,6 +357,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func uint16() -> UInt16 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint16(fromBytes: 2)
     }
 
@@ -362,6 +370,7 @@ public final class LsbBitReader: ByteReader, BitReader {
      */
     public override func uint16(fromBytes count: Int) -> UInt16 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint16(fromBytes: count)
     }
 

Sources/MsbBitReader.swift

@@ -270,6 +270,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func byte() -> UInt8 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.byte()
     }
 
@@ -281,6 +282,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func bytes(count: Int) -> [UInt8] {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.bytes(count: count)
     }
 
@@ -293,6 +295,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func int(fromBytes count: Int) -> Int {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.int(fromBytes: count)
     }
 
@@ -304,6 +307,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func uint64() -> UInt64 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint64(fromBytes: 8)
     }
 
@@ -316,6 +320,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func uint64(fromBytes count: Int) -> UInt64 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint64(fromBytes: count)
     }
 
@@ -327,6 +332,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func uint32() -> UInt32 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint32(fromBytes: 4)
     }
 
@@ -339,6 +345,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func uint32(fromBytes count: Int) -> UInt32 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint32(fromBytes: count)
     }
 
@@ -350,6 +357,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func uint16() -> UInt16 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint16(fromBytes: 2)
     }
 
@@ -362,6 +370,7 @@ public final class MsbBitReader: ByteReader, BitReader {
      */
     public override func uint16(fromBytes count: Int) -> UInt16 {
         precondition(isAligned, "BitReader is not aligned.")
+        defer { self.currentByte = self.ptr[self._offset] }
         return super.uint16(fromBytes: count)
     }