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

stage2: print valid filename in error messages

Browse Source
This commit is contained in:
J.C. Moyer 2021-06-28 17:31:47 -04:00 committed by Andrew Kelley
parent 7140bb64e1
commit d84b386f60
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Compilation.zig
View File

@ -402,10 +402,10 @@ pub const AllErrors = struct {
const source = try module_note.src_loc.file_scope.getSource(module.gpa);
const byte_offset = try module_note.src_loc.byteOffset(module.gpa);
const loc = std.zig.findLineColumn(source, byte_offset);
const sub_file_path = module_note.src_loc.file_scope.sub_file_path;
const file_path = try module_note.src_loc.file_scope.fullPath(&arena.allocator);
note.* = .{
.src = .{
.src_path = try arena.allocator.dupe(u8, sub_file_path),
.src_path = file_path,
.msg = try arena.allocator.dupe(u8, module_note.msg),
.byte_offset = byte_offset,
.line = @intCast(u32, loc.line),
@ -425,10 +425,10 @@ pub const AllErrors = struct {
const source = try module_err_msg.src_loc.file_scope.getSource(module.gpa);
const byte_offset = try module_err_msg.src_loc.byteOffset(module.gpa);
const loc = std.zig.findLineColumn(source, byte_offset);
const sub_file_path = module_err_msg.src_loc.file_scope.sub_file_path;
const file_path = try module_err_msg.src_loc.file_scope.fullPath(&arena.allocator);
try errors.append(.{
.src = .{
.src_path = try arena.allocator.dupe(u8, sub_file_path),
.src_path = file_path,
.msg = try arena.allocator.dupe(u8, module_err_msg.msg),
.byte_offset = byte_offset,
.line = @intCast(u32, loc.line),
@ -479,7 +479,7 @@ pub const AllErrors = struct {
note.* = .{
.src = .{
.src_path = try arena.dupe(u8, file.sub_file_path),
.src_path = try file.fullPath(arena),
.msg = try arena.dupe(u8, msg),
.byte_offset = byte_offset,
.line = @intCast(u32, loc.line),
@ -505,7 +505,7 @@ pub const AllErrors = struct {
try errors.append(.{
.src = .{
.src_path = try arena.dupe(u8, file.sub_file_path),
.src_path = try file.fullPath(arena),
.msg = try arena.dupe(u8, msg),
.byte_offset = byte_offset,
.line = @intCast(u32, loc.line),

5
src/Module.zig
View File

@ -1111,6 +1111,11 @@ pub const Scope = struct {
return buf.toOwnedSliceSentinel(0);
}
/// Returns the full path to this file relative to its package.
pub fn fullPath(file: File, ally: *Allocator) ![]u8 {
return file.pkg.root_src_directory.join(ally, &[_][]const u8{file.sub_file_path});
}
pub fn dumpSrc(file: *File, src: LazySrcLoc) void {
const loc = std.zig.findLineColumn(file.source.bytes, src);
std.debug.print("{s}:{d}:{d}\n", .{ file.sub_file_path, loc.line + 1, loc.column + 1 });

12
src/main.zig
View File

@ -3117,6 +3117,9 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
.root_decl = null,
};
file.pkg = try Package.create(gpa, null, file.sub_file_path);
defer file.pkg.destroy(gpa);
file.zir = try AstGen.generate(gpa, file.tree);
file.zir_loaded = true;
defer file.zir.deinit(gpa);
@ -3309,6 +3312,9 @@ fn fmtPathFile(
.root_decl = null,
};
file.pkg = try Package.create(fmt.gpa, null, file.sub_file_path);
defer file.pkg.destroy(fmt.gpa);
if (stat.size > max_src_size)
return error.FileTooBig;
@ -3901,6 +3907,9 @@ pub fn cmdAstCheck(
file.stat_size = source.len;
}
file.pkg = try Package.create(gpa, null, file.sub_file_path);
defer file.pkg.destroy(gpa);
file.tree = try std.zig.parse(gpa, file.source);
file.tree_loaded = true;
defer file.tree.deinit(gpa);
@ -4017,6 +4026,9 @@ pub fn cmdChangelist(
.root_decl = null,
};
file.pkg = try Package.create(gpa, null, file.sub_file_path);
defer file.pkg.destroy(gpa);
const source = try arena.allocSentinel(u8, @intCast(usize, stat.size), 0);
const amt = try f.readAll(source);
if (amt != stat.size)