| ... | @@ -6,17 +6,15 @@ const Writer = std.Io.Writer; | ... | @@ -6,17 +6,15 @@ const Writer = std.Io.Writer; |
| 6 | const Reader = std.Io.Reader; | 6 | const Reader = std.Io.Reader; |
| 7 | | 7 | |
| 8 | /// An accumulating buffer for LZ sequences | 8 | /// An accumulating buffer for LZ sequences |
| 9 | pub const LzAccumBuffer = struct { | 9 | pub const AccumBuffer = struct { |
| 10 | /// Buffer | 10 | /// Buffer |
| 11 | buf: ArrayList(u8), | 11 | buf: ArrayList(u8), |
| 12 | | | |
| 13 | /// Buffer memory limit | 12 | /// Buffer memory limit |
| 14 | memlimit: usize, | 13 | memlimit: usize, |
| 15 | | | |
| 16 | /// Total number of bytes sent through the buffer | 14 | /// Total number of bytes sent through the buffer |
| 17 | len: usize, | 15 | len: usize, |
| 18 | | 16 | |
| 19 | pub fn init(memlimit: usize) LzAccumBuffer { | 17 | pub fn init(memlimit: usize) AccumBuffer { |
| 20 | return .{ | 18 | return .{ |
| 21 | .buf = .{}, | 19 | .buf = .{}, |
| 22 | .memlimit = memlimit, | 20 | .memlimit = memlimit, |
| ... | @@ -24,20 +22,20 @@ pub const LzAccumBuffer = struct { | ... | @@ -24,20 +22,20 @@ pub const LzAccumBuffer = struct { |
| 24 | }; | 22 | }; |
| 25 | } | 23 | } |
| 26 | | 24 | |
| 27 | pub fn appendByte(self: *LzAccumBuffer, allocator: Allocator, byte: u8) !void { | 25 | pub fn appendByte(self: *AccumBuffer, allocator: Allocator, byte: u8) !void { |
| 28 | try self.buf.append(allocator, byte); | 26 | try self.buf.append(allocator, byte); |
| 29 | self.len += 1; | 27 | self.len += 1; |
| 30 | } | 28 | } |
| 31 | | 29 | |
| 32 | /// Reset the internal dictionary | 30 | /// Reset the internal dictionary |
| 33 | pub fn reset(self: *LzAccumBuffer, writer: *Writer) !void { | 31 | pub fn reset(self: *AccumBuffer, writer: *Writer) !void { |
| 34 | try writer.writeAll(self.buf.items); | 32 | try writer.writeAll(self.buf.items); |
| 35 | self.buf.clearRetainingCapacity(); | 33 | self.buf.clearRetainingCapacity(); |
| 36 | self.len = 0; | 34 | self.len = 0; |
| 37 | } | 35 | } |
| 38 | | 36 | |
| 39 | /// Retrieve the last byte or return a default | 37 | /// Retrieve the last byte or return a default |
| 40 | pub fn lastOr(self: LzAccumBuffer, lit: u8) u8 { | 38 | pub fn lastOr(self: AccumBuffer, lit: u8) u8 { |
| 41 | const buf_len = self.buf.items.len; | 39 | const buf_len = self.buf.items.len; |
| 42 | return if (buf_len == 0) | 40 | return if (buf_len == 0) |
| 43 | lit | 41 | lit |
| ... | @@ -46,7 +44,7 @@ pub const LzAccumBuffer = struct { | ... | @@ -46,7 +44,7 @@ pub const LzAccumBuffer = struct { |
| 46 | } | 44 | } |
| 47 | | 45 | |
| 48 | /// Retrieve the n-th last byte | 46 | /// Retrieve the n-th last byte |
| 49 | pub fn lastN(self: LzAccumBuffer, dist: usize) !u8 { | 47 | pub fn lastN(self: AccumBuffer, dist: usize) !u8 { |
| 50 | const buf_len = self.buf.items.len; | 48 | const buf_len = self.buf.items.len; |
| 51 | if (dist > buf_len) { | 49 | if (dist > buf_len) { |
| 52 | return error.CorruptInput; | 50 | return error.CorruptInput; |
| ... | @@ -57,7 +55,7 @@ pub const LzAccumBuffer = struct { | ... | @@ -57,7 +55,7 @@ pub const LzAccumBuffer = struct { |
| 57 | | 55 | |
| 58 | /// Append a literal | 56 | /// Append a literal |
| 59 | pub fn appendLiteral( | 57 | pub fn appendLiteral( |
| 60 | self: *LzAccumBuffer, | 58 | self: *AccumBuffer, |
| 61 | allocator: Allocator, | 59 | allocator: Allocator, |
| 62 | lit: u8, | 60 | lit: u8, |
| 63 | writer: *Writer, | 61 | writer: *Writer, |
| ... | @@ -72,7 +70,7 @@ pub const LzAccumBuffer = struct { | ... | @@ -72,7 +70,7 @@ pub const LzAccumBuffer = struct { |
| 72 | | 70 | |
| 73 | /// Fetch an LZ sequence (length, distance) from inside the buffer | 71 | /// Fetch an LZ sequence (length, distance) from inside the buffer |
| 74 | pub fn appendLz( | 72 | pub fn appendLz( |
| 75 | self: *LzAccumBuffer, | 73 | self: *AccumBuffer, |
| 76 | allocator: Allocator, | 74 | allocator: Allocator, |
| 77 | len: usize, | 75 | len: usize, |
| 78 | dist: usize, | 76 | dist: usize, |
| ... | @@ -95,12 +93,12 @@ pub const LzAccumBuffer = struct { | ... | @@ -95,12 +93,12 @@ pub const LzAccumBuffer = struct { |
| 95 | self.len += len; | 93 | self.len += len; |
| 96 | } | 94 | } |
| 97 | | 95 | |
| 98 | pub fn finish(self: *LzAccumBuffer, writer: *Writer) !void { | 96 | pub fn finish(self: *AccumBuffer, writer: *Writer) !void { |
| 99 | try writer.writeAll(self.buf.items); | 97 | try writer.writeAll(self.buf.items); |
| 100 | self.buf.clearRetainingCapacity(); | 98 | self.buf.clearRetainingCapacity(); |
| 101 | } | 99 | } |
| 102 | | 100 | |
| 103 | pub fn deinit(self: *LzAccumBuffer, allocator: Allocator) void { | 101 | pub fn deinit(self: *AccumBuffer, allocator: Allocator) void { |
| 104 | self.buf.deinit(allocator); | 102 | self.buf.deinit(allocator); |
| 105 | self.* = undefined; | 103 | self.* = undefined; |
| 106 | } | 104 | } |
| ... | @@ -109,59 +107,43 @@ pub const LzAccumBuffer = struct { | ... | @@ -109,59 +107,43 @@ pub const LzAccumBuffer = struct { |
| 109 | pub const Decode = struct { | 107 | pub const Decode = struct { |
| 110 | lzma_decode: lzma.Decode, | 108 | lzma_decode: lzma.Decode, |
| 111 | | 109 | |
| 112 | pub fn init(allocator: Allocator) !Decode { | 110 | pub fn init(gpa: Allocator) !Decode { |
| 113 | return Decode{ | 111 | return .{ .lzma_decode = try lzma.Decode.init(gpa, .{ .lc = 0, .lp = 0, .pb = 0 }) }; |
| 114 | .lzma_decode = try lzma.Decode.init( | | |
| 115 | allocator, | | |
| 116 | .{ | | |
| 117 | .lc = 0, | | |
| 118 | .lp = 0, | | |
| 119 | .pb = 0, | | |
| 120 | }, | | |
| 121 | null, | | |
| 122 | ), | | |
| 123 | }; | | |
| 124 | } | 112 | } |
| 125 | | 113 | |
| 126 | pub fn deinit(self: *Decode, allocator: Allocator) void { | 114 | pub fn deinit(self: *Decode, gpa: Allocator) void { |
| 127 | self.lzma_decode.deinit(allocator); | 115 | self.lzma_decode.deinit(gpa); |
| 128 | self.* = undefined; | 116 | self.* = undefined; |
| 129 | } | 117 | } |
| 130 | | 118 | |
| 131 | pub fn decompress( | 119 | pub fn decompress(d: *Decode, reader: *Reader, allocating: *Writer.Allocating) !void { |
| 132 | self: *Decode, | 120 | const gpa = allocating.allocator; |
| 133 | allocator: Allocator, | 121 | |
| 134 | reader: *Reader, | 122 | var accum = AccumBuffer.init(std.math.maxInt(usize)); |
| 135 | writer: *Writer, | 123 | defer accum.deinit(gpa); |
| 136 | ) !void { | | |
| 137 | var accum = LzAccumBuffer.init(std.math.maxInt(usize)); | | |
| 138 | defer accum.deinit(allocator); | | |
| 139 | | 124 | |
| 140 | while (true) { | 125 | while (true) { |
| 141 | const status = try reader.readByte(); | 126 | const status = try reader.takeByte(); |
| 142 | | 127 | |
| 143 | switch (status) { | 128 | switch (status) { |
| 144 | 0 => break, | 129 | 0 => break, |
| 145 | 1 => try parseUncompressed(allocator, reader, writer, &accum, true), | 130 | 1 => try parseUncompressed(reader, allocating, &accum, true), |
| 146 | 2 => try parseUncompressed(allocator, reader, writer, &accum, false), | 131 | 2 => try parseUncompressed(reader, allocating, &accum, false), |
| 147 | else => try self.parseLzma(allocator, reader, writer, &accum, status), | 132 | else => try d.parseLzma(reader, allocating, &accum, status), |
| 148 | } | 133 | } |
| 149 | } | 134 | } |
| 150 | | 135 | |
| 151 | try accum.finish(writer); | 136 | try accum.finish(&allocating.writer); |
| 152 | } | 137 | } |
| 153 | | 138 | |
| 154 | fn parseLzma( | 139 | fn parseLzma( |
| 155 | self: *Decode, | 140 | d: *Decode, |
| 156 | allocator: Allocator, | | |
| 157 | reader: *Reader, | 141 | reader: *Reader, |
| 158 | writer: *Writer, | 142 | allocating: *Writer.Allocating, |
| 159 | accum: *LzAccumBuffer, | 143 | accum: *AccumBuffer, |
| 160 | status: u8, | 144 | status: u8, |
| 161 | ) !void { | 145 | ) !void { |
| 162 | if (status & 0x80 == 0) { | 146 | if (status & 0x80 == 0) return error.CorruptInput; |
| 163 | return error.CorruptInput; | | |
| 164 | } | | |
| 165 | | 147 | |
| 166 | const Reset = struct { | 148 | const Reset = struct { |
| 167 | dict: bool, | 149 | dict: bool, |
| ... | @@ -169,23 +151,23 @@ pub const Decode = struct { | ... | @@ -169,23 +151,23 @@ pub const Decode = struct { |
| 169 | props: bool, | 151 | props: bool, |
| 170 | }; | 152 | }; |
| 171 | | 153 | |
| 172 | const reset = switch ((status >> 5) & 0x3) { | 154 | const reset: Reset = switch ((status >> 5) & 0x3) { |
| 173 | 0 => Reset{ | 155 | 0 => .{ |
| 174 | .dict = false, | 156 | .dict = false, |
| 175 | .state = false, | 157 | .state = false, |
| 176 | .props = false, | 158 | .props = false, |
| 177 | }, | 159 | }, |
| 178 | 1 => Reset{ | 160 | 1 => .{ |
| 179 | .dict = false, | 161 | .dict = false, |
| 180 | .state = true, | 162 | .state = true, |
| 181 | .props = false, | 163 | .props = false, |
| 182 | }, | 164 | }, |
| 183 | 2 => Reset{ | 165 | 2 => .{ |
| 184 | .dict = false, | 166 | .dict = false, |
| 185 | .state = true, | 167 | .state = true, |
| 186 | .props = true, | 168 | .props = true, |
| 187 | }, | 169 | }, |
| 188 | 3 => Reset{ | 170 | 3 => .{ |
| 189 | .dict = true, | 171 | .dict = true, |
| 190 | .state = true, | 172 | .state = true, |
| 191 | .props = true, | 173 | .props = true, |
| ... | @@ -196,24 +178,24 @@ pub const Decode = struct { | ... | @@ -196,24 +178,24 @@ pub const Decode = struct { |
| 196 | const unpacked_size = blk: { | 178 | const unpacked_size = blk: { |
| 197 | var tmp: u64 = status & 0x1F; | 179 | var tmp: u64 = status & 0x1F; |
| 198 | tmp <<= 16; | 180 | tmp <<= 16; |
| 199 | tmp |= try reader.readInt(u16, .big); | 181 | tmp |= try reader.takeInt(u16, .big); |
| 200 | break :blk tmp + 1; | 182 | break :blk tmp + 1; |
| 201 | }; | 183 | }; |
| 202 | | 184 | |
| 203 | const packed_size = blk: { | 185 | const packed_size = blk: { |
| 204 | const tmp: u17 = try reader.readInt(u16, .big); | 186 | const tmp: u17 = try reader.takeInt(u16, .big); |
| 205 | break :blk tmp + 1; | 187 | break :blk tmp + 1; |
| 206 | }; | 188 | }; |
| 207 | | 189 | |
| 208 | if (reset.dict) { | 190 | if (reset.dict) try accum.reset(&allocating.writer); |
| 209 | try accum.reset(writer); | 191 | |
| 210 | } | 192 | const ld = &d.lzma_decode; |
| 211 | | 193 | |
| 212 | if (reset.state) { | 194 | if (reset.state) { |
| 213 | var new_props = self.lzma_decode.properties; | 195 | var new_props = ld.properties; |
| 214 | | 196 | |
| 215 | if (reset.props) { | 197 | if (reset.props) { |
| 216 | var props = try reader.readByte(); | 198 | var props = try reader.takeByte(); |
| 217 | if (props >= 225) { | 199 | if (props >= 225) { |
| 218 | return error.CorruptInput; | 200 | return error.CorruptInput; |
| 219 | } | 201 | } |
| ... | @@ -231,38 +213,44 @@ pub const Decode = struct { | ... | @@ -231,38 +213,44 @@ pub const Decode = struct { |
| 231 | new_props = .{ .lc = lc, .lp = lp, .pb = pb }; | 213 | new_props = .{ .lc = lc, .lp = lp, .pb = pb }; |
| 232 | } | 214 | } |
| 233 | | 215 | |
| 234 | try self.lzma_decode.resetState(allocator, new_props); | 216 | try ld.resetState(allocating.allocator, new_props); |
| 235 | } | 217 | } |
| 236 | | 218 | |
| 237 | self.lzma_decode.unpacked_size = unpacked_size + accum.len; | 219 | var range_decoder = try lzma.RangeDecoder.init(reader); |
| 238 | | 220 | |
| 239 | var counter = std.io.countingReader(reader); | 221 | while (true) { |
| 240 | const counter_reader = counter.reader(); | 222 | if (accum.len >= unpacked_size) break; |
| 241 | | 223 | if (range_decoder.isFinished()) break; |
| 242 | var rangecoder = try lzma.RangeDecoder.init(counter_reader); | 224 | switch (try ld.process(reader, allocating, accum, &range_decoder)) { |
| 243 | while (try self.lzma_decode.process(allocator, counter_reader, writer, accum, &rangecoder) == .continue_) {} | 225 | .more => continue, |
| 244 | | 226 | .finished => break, |
| 245 | if (counter.bytes_read != packed_size) { | 227 | } |
| 246 | return error.CorruptInput; | | |
| 247 | } | 228 | } |
| | 229 | if (accum.len != unpacked_size) return error.DecompressedSizeMismatch; |
| | 230 | |
| | 231 | // TODO restore this error |
| | 232 | //if (counter.bytes_read != packed_size) { |
| | 233 | // return error.CorruptInput; |
| | 234 | //} |
| | 235 | _ = packed_size; |
| 248 | } | 236 | } |
| 249 | | 237 | |
| 250 | fn parseUncompressed( | 238 | fn parseUncompressed( |
| 251 | allocator: Allocator, | | |
| 252 | reader: *Reader, | 239 | reader: *Reader, |
| 253 | writer: *Writer, | 240 | allocating: *Writer.Allocating, |
| 254 | accum: *LzAccumBuffer, | 241 | accum: *AccumBuffer, |
| 255 | reset_dict: bool, | 242 | reset_dict: bool, |
| 256 | ) !void { | 243 | ) !void { |
| 257 | const unpacked_size = @as(u17, try reader.readInt(u16, .big)) + 1; | 244 | const unpacked_size = @as(u17, try reader.takeInt(u16, .big)) + 1; |
| 258 | | 245 | |
| 259 | if (reset_dict) { | 246 | if (reset_dict) try accum.reset(&allocating.writer); |
| 260 | try accum.reset(writer); | 247 | |
| 261 | } | 248 | const gpa = allocating.allocator; |
| 262 | | 249 | |
| 263 | var i: @TypeOf(unpacked_size) = 0; | 250 | var i = unpacked_size; |
| 264 | while (i < unpacked_size) : (i += 1) { | 251 | while (i != 0) { |
| 265 | try accum.appendByte(allocator, try reader.readByte()); | 252 | try accum.appendByte(gpa, try reader.takeByte()); |
| | 253 | i -= 1; |
| 266 | } | 254 | } |
| 267 | } | 255 | } |
| 268 | }; | 256 | }; |
| ... | @@ -273,13 +261,13 @@ test "decompress hello world stream" { | ... | @@ -273,13 +261,13 @@ test "decompress hello world stream" { |
| 273 | | 261 | |
| 274 | const gpa = std.testing.allocator; | 262 | const gpa = std.testing.allocator; |
| 275 | | 263 | |
| 276 | var stream: std.Io.Reader = .fixed(compressed); | 264 | var decode = try Decode.init(gpa); |
| 277 | | | |
| 278 | var decode = try Decode.init(gpa, &stream); | | |
| 279 | defer decode.deinit(gpa); | 265 | defer decode.deinit(gpa); |
| 280 | | 266 | |
| 281 | const result = try decode.reader.allocRemaining(gpa, .unlimited); | 267 | var stream: std.Io.Reader = .fixed(compressed); |
| 282 | defer gpa.free(result); | 268 | var result: std.Io.Writer.Allocating = .init(gpa); |
| | 269 | defer result.deinit(); |
| 283 | | 270 | |
| 284 | try std.testing.expectEqualStrings(expected, result); | 271 | try decode.decompress(&stream, &result); |
| | 272 | try std.testing.expectEqualStrings(expected, result.written()); |
| 285 | } | 273 | } |