kemitix/skip
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases 3 Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Paul Campbell 2021-12-30 07:27:01 +00:00
parent 7a56c8a662
commit cc351d68ba
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main.zig
View file

@ -35,6 +35,19 @@ fn dumpInput(in: fs.File, out: fs.File, allocator: mem.Allocator) !void {
}
}
const LineIterator = struct {
reader: io.BufferedReader(4096, fs.File.Reader),
delimiter: u8,
allocator: mem.Allocator,
const Self = @This();
/// Caller owns returned memory
pub fn next(self: *Self) ?[]u8 {
return self.reader.reader().readUntilDelimiterOrEofAlloc(self.allocator, self.delimiter, 4096) catch null;
}
};
fn lineIterator(reader: fs.File.Reader, allocator: mem.Allocator) LineIterator {
return LineIterator {
.reader = io.bufferedReader(reader),
@ -62,19 +75,6 @@ test "lineIterator returns lines in buffer" {
try testing.expect(eof == null);
}
const LineIterator = struct {
reader: io.BufferedReader(4096, fs.File.Reader),
delimiter: u8,
allocator: mem.Allocator,
const Self = @This();
/// Caller owns returned memory
pub fn next(self: *Self) ?[]u8 {
return self.reader.reader().readUntilDelimiterOrEofAlloc(self.allocator, self.delimiter, 4096) catch null;
}
};
// trim annoying windows-only carriage return character
fn windowsSafe(line: []const u8) []const u8 {
if (os.tag == .windows) {