Fix #6

Author: Justin Kolb

README.md

@@ -170,7 +170,7 @@ try writer.write(arrayOfMyType, as: MyArray<MyType>.self)
 To use the `Lilliput` library in a SwiftPM project, add the following line to the dependencies in your `Package.swift` file:
 
 ```swift
-.package(url: "https://github.com/jkolb/Lilliput.git", from: "10.0.0"),
+.package(url: "https://github.com/jkolb/Lilliput.git", from: "11.0.0"),
 ```
 
 Finally, include `"Lilliput"` as a dependency for your target:
@@ -179,7 +179,7 @@ Finally, include `"Lilliput"` as a dependency for your target:
 let package = Package(
     // name, platforms, products, etc.
     dependencies: [
-        .package(url: "https://github.com/jkolb/Lilliput.git", from: "10.0.0"),
+        .package(url: "https://github.com/jkolb/Lilliput.git", from: "11.0.0"),
         // other dependencies
     ],
     targets: [

Sources/Lilliput/ByteBuffer.swift

@@ -13,34 +13,36 @@ public final class ByteBuffer {
         bytes.deallocate()
     }
 
-    @inlinable public subscript(bounds: Range<Int>) -> UnsafeMutableRawBufferPointer {
-        return UnsafeMutableRawBufferPointer(rebasing: bytes[bounds])
+    @inlinable public func slice<T>(_ bounds: Range<Int>, body: (UnsafeMutableRawBufferPointer) throws -> T) rethrows -> T {
+        return try body(UnsafeMutableRawBufferPointer(rebasing: bytes[bounds]))
     }
 
-    @inlinable public subscript<R>(r: R) -> UnsafeMutableRawBufferPointer where R : RangeExpression, Int == R.Bound {
-        return self[r.relative(to: bytes.indices)]
+    @inlinable public func slice<R: RangeExpression, T>(_ r: R, body: (UnsafeMutableRawBufferPointer) throws -> T) rethrows -> T where Int == R.Bound {
+        return try slice(r.relative(to: bytes.indices), body: body)
     }
 
-    @inlinable public subscript(x: (UnboundedRange_) -> ()) -> UnsafeMutableRawBufferPointer {
-        return bytes
+    @inlinable public func slice<T>(_ x: (UnboundedRange_) -> (), body: (UnsafeMutableRawBufferPointer) throws -> T) rethrows -> T {
+        return try body(bytes)
     }
 
-    @inlinable public subscript(start: Int , count countValue: Int) -> UnsafeMutableRawBufferPointer {
-        return UnsafeMutableRawBufferPointer(rebasing: UnsafeMutableRawBufferPointer(rebasing: bytes[start...])[..<countValue])
+    @inlinable public func slice<T>(start: Int , count: Int, body: (UnsafeMutableRawBufferPointer) throws -> T) rethrows -> T {
+        return try body(UnsafeMutableRawBufferPointer(rebasing: UnsafeMutableRawBufferPointer(rebasing: bytes[start...])[..<count]))
     }
 }
 
 extension ByteBuffer : CollectionByteDecoder {
     @inlinable public static func decode<R: ByteReader>(from reader: inout R, count: Int) throws -> ByteBuffer {
         let buffer = ByteBuffer(count: count)
-        buffer[...].copyMemory(from: try reader.read(count).buffer)
+        try buffer.slice(...) { $0.copyMemory(from: try reader.read(count).buffer) }
         return buffer
     }
 }
 
 extension ByteBuffer : ByteEncoder {
-    @inlinable public static func encode<W>(_ value: ByteBuffer, to writer: inout W) throws where W : ByteWriter {
-        let span = ByteSpan(value[...])
-        try writer.write(span)
+    @inlinable public static func encode<W>(_ buffer: ByteBuffer, to writer: inout W) throws where W : ByteWriter {
+        try buffer.slice(...) {
+            let span = ByteSpan($0)
+            try writer.write(span)
+        }
     }
 }

Sources/Lilliput/ByteReader.swift

@@ -22,10 +22,6 @@ public extension ByteReader {
         return span.count
     }
 
-    public init(_ byteBuffer: ByteBuffer) {
-        self.init(byteBuffer[...])
-    }
-    
     public init(_ buffer: UnsafeMutableRawBufferPointer) {
         self.init(span: ByteSpan(buffer))
     }

Sources/Lilliput/ByteWriter.swift

@@ -44,10 +44,6 @@ public extension ByteWriter {
         return span.count
     }
 
-    public init(_ byteBuffer: ByteBuffer) {
-        self.init(byteBuffer[...])
-    }
-    
     public init(_ buffer: UnsafeMutableRawBufferPointer) {
         self.init(span: MutableByteSpan(buffer))
     }

Sources/Lilliput/FileDescriptor+ByteBuffer.swift

@@ -2,34 +2,50 @@ import SystemPackage
 
 public extension FileDescriptor {
     @inlinable func read(into buffer: ByteBuffer, retryOnInterrupt: Bool = true) throws -> Int {
-        return try read(into: buffer[...], retryOnInterrupt:  retryOnInterrupt)
+        return try buffer.slice(...) { bytes in
+            return try read(into: bytes, retryOnInterrupt:  retryOnInterrupt)
+        }
     }
 
     @inlinable func readAll(into buffer: ByteBuffer, retryOnInterrupt: Bool = true) throws {
-        return try readAll(into: buffer[...], retryOnInterrupt: retryOnInterrupt)
+        return try buffer.slice(...) { bytes in
+            return try readAll(into: bytes, retryOnInterrupt:  retryOnInterrupt)
+        }
     }
 
     @inlinable func read(fromAbsoluteOffset offset: Int64, into buffer: ByteBuffer, retryOnInterrupt: Bool = true) throws -> Int {
-        return try read(fromAbsoluteOffset: offset, into: buffer[...], retryOnInterrupt: retryOnInterrupt)
+        return try buffer.slice(...) { bytes in
+            return try read(fromAbsoluteOffset: offset, into: bytes, retryOnInterrupt:  retryOnInterrupt)
+        }
     }
 
     @inlinable func readAll(fromAbsoluteOffset offset: Int64, into buffer: ByteBuffer, retryOnInterrupt: Bool = true) throws {
-        return try readAll(fromAbsoluteOffset: offset, into: buffer[...], retryOnInterrupt: retryOnInterrupt)
+        return try buffer.slice(...) { bytes in
+            return try readAll(fromAbsoluteOffset: offset, into: bytes, retryOnInterrupt:  retryOnInterrupt)
+        }
     }
 
     @inlinable func write(_ buffer: ByteBuffer, retryOnInterrupt: Bool = true) throws -> Int {
-        return try write(UnsafeRawBufferPointer(buffer[...]), retryOnInterrupt: retryOnInterrupt)
+        return try buffer.slice(...) { bytes in
+            return try write(UnsafeRawBufferPointer(bytes), retryOnInterrupt: retryOnInterrupt)
+        }
     }
 
     @inlinable func write(toAbsoluteOffset offset: Int64, _ buffer: ByteBuffer, retryOnInterrupt: Bool = true) throws -> Int {
-        return try write(toAbsoluteOffset: offset, UnsafeRawBufferPointer(buffer[...]), retryOnInterrupt: retryOnInterrupt)
+        return try buffer.slice(...) { bytes in
+            return try write(toAbsoluteOffset: offset, UnsafeRawBufferPointer(bytes), retryOnInterrupt: retryOnInterrupt)
+        }
     }
 
     @inlinable func writeAll(_ buffer: ByteBuffer) throws {
-        try writeAll(buffer[...])
+        return try buffer.slice(...) { bytes in
+            try writeAll(bytes)
+        }
     }
 
     @inlinable func writeAll(toAbsoluteOffset offset: Int64, _ buffer: ByteBuffer) throws {
-        try writeAll(toAbsoluteOffset: offset, buffer[...])
+        return try buffer.slice(...) { bytes in
+            try writeAll(toAbsoluteOffset: offset, bytes)
+        }
     }
 }