archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 02:44:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

std.debug: fix printLineFromFile

Browse source 
by using streamDelimiter and discardDelimiter functions that don't
depend on the buffer size being large enough
This commit is contained in:
Andrew Kelley 2025-12-19 12:10:21 -08:00
parent ac11b82738
commit 1381f9f612
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/std/debug.zig
View file

@ -1203,23 +1203,21 @@ fn printLineFromFile(io: Io, writer: *Writer, source_location: SourceLocation) !
const cwd: Io.Dir = .cwd();
var file = try cwd.openFile(io, source_location.file_name, .{});
defer file.close(io);
// TODO fstat and make sure that the file has the correct size
var buffer: [4096]u8 = undefined;
var file_reader: File.Reader = .init(file, io, &buffer);
var line_index: usize = 0;
while (try file_reader.interface.takeDelimiter('\n')) |line| {
const r = &file_reader.interface;
while (true) {
line_index += 1;
if (line_index == source_location.line) {
// TODO delete hard tabs from the language
mem.replaceScalar(u8, line, '\t', ' ');
try writer.writeAll(line);
// Make sure printing last line of file inserts extra newline.
_ = try r.streamDelimiterEnding(writer, '\n');
try writer.writeByte('\n');
return;
}
_ = try r.discardDelimiterInclusive('\n');
}
return error.EndOfStream;
}
test printLineFromFile {