mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 08:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FixedBufferStream: match file semantics more by clamping pos

Browse Source
This commit is contained in:
Andrew Kelley 2020-03-11 16:14:12 -04:00
parent 04626c176b
commit 6892865ba7
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/std/io/fixed_buffer_stream.zig
View File

@ -76,21 +76,22 @@ pub fn FixedBufferStream(comptime Buffer: type) type {
} }
pub fn seekTo(self: *Self, pos: u64) SeekError!void { pub fn seekTo(self: *Self, pos: u64) SeekError!void {
const usize_pos = std.math.cast(usize, pos) catch std.math.maxInt(usize); self.pos = if (std.math.cast(usize, pos)) |x| x else |_| self.buffer.len;
self.pos = usize_pos;
} }
pub fn seekBy(self: *Self, amt: i64) SeekError!void { pub fn seekBy(self: *Self, amt: i64) SeekError!void {
if (amt < 0) { if (amt < 0) {
const abs_amt = std.math.cast(usize, -amt) catch std.math.maxInt(usize); const abs_amt = std.math.absCast(amt);
if (abs_amt > self.pos) { const abs_amt_usize = std.math.cast(usize, abs_amt) catch std.math.maxInt(usize);
if (abs_amt_usize > self.pos) {
self.pos = 0; self.pos = 0;
} else { } else {
self.pos -= abs_amt; self.pos -= abs_amt_usize;
} }
} else { } else {
const usize_amt = std.math.cast(usize, amt) catch std.math.maxInt(usize); const amt_usize = std.math.cast(usize, amt) catch std.math.maxInt(usize);
self.pos = std.math.add(usize, self.pos, usize_amt) catch std.math.maxInt(usize); const new_pos = std.math.add(usize, self.pos, amt_usize) catch std.math.maxInt(usize);
self.pos = std.math.min(self.buffer.len, new_pos);
} }
} }
@ -102,7 +103,6 @@ pub fn FixedBufferStream(comptime Buffer: type) type {
return self.pos; return self.pos;
} }
/// Asserts that the seek pos is within the buffer range.
pub fn getWritten(self: Self) []const u8 { pub fn getWritten(self: Self) []const u8 {
return self.buffer[0..self.pos]; return self.buffer[0..self.pos];
} }