Commit cc525bc002e456cc735f66bc4d2c5267a10b6016 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-04-09 00:20:26-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-04-09 00:20:26-07:00
log	cc525bc002e456cc735f66bc4d2c5267a10b6016
tree	473870b356590dc0631e9a809403e180190d23e1
parent	c28d1fe1733eb150f956b1eb0d01d79496e7378c
parent	9a2de796bd0eb047ca9bd23940004f3b25ab6625

Merge pretty printing compile errors branch

4 files changed, 61 insertions(+), 13 deletions(-)

lib
- std
  - debug.zig
  - zig.zig
src
- Compilation.zig
- main.zig

lib/std/debug.zig+1-1

...	...	@@ -462,7 +462,7 @@ pub const TTY = struct {
462	462	// TODO give this a payload of file handle
463	463	windows_api,
464	464
465		fn setColor(conf: Config, out_stream: anytype, color: Color) void {
	465	pub fn setColor(conf: Config, out_stream: anytype, color: Color) void {
466	466	nosuspend switch (conf) {
467	467	.no_color => return,
468	468	.escape_codes => switch (color) {

lib/std/zig.zig+21-4

...	...	@@ -31,21 +31,38 @@ pub fn hashSrc(src: []const u8) SrcHash {
31	31	return out;
32	32	}
33	33
34		pub fn findLineColumn(source: []const u8, byte_offset: usize) struct { line: usize, column: usize } {
	34	pub const Loc = struct {
	35	line: usize,
	36	column: usize,
	37	/// Does not include the trailing newline.
	38	source_line: []const u8,
	39	};
	40
	41	pub fn findLineColumn(source: []const u8, byte_offset: usize) Loc {
35	42	var line: usize = 0;
36	43	var column: usize = 0;
37		for (source[0..byte_offset]) \|byte\| {
38		switch (byte) {
	44	var line_start: usize = 0;
	45	var i: usize = 0;
	46	while (i < byte_offset) : (i += 1) {
	47	switch (source[i]) {
39	48	'\n' => {
40	49	line += 1;
41	50	column = 0;
	51	line_start = i + 1;
42	52	},
43	53	else => {
44	54	column += 1;
45	55	},
46	56	}
47	57	}
48		return .{ .line = line, .column = column };
	58	while (i < source.len and source[i] != '\n') {
	59	i += 1;
	60	}
	61	return .{
	62	.line = line,
	63	.column = column,
	64	.source_line = source[line_start..i],
	65	};
49	66	}
50	67
51	68	pub fn lineDelta(source: []const u8, start: usize, end: usize) isize {

src/Compilation.zig+34-7

...	...	@@ -272,28 +272,52 @@ pub const AllErrors = struct {
272	272	line: u32,
273	273	column: u32,
274	274	byte_offset: u32,
	275	/// Does not include the trailing newline.
	276	source_line: ?[]const u8,
275	277	notes: []Message = &.{},
276	278	},
277	279	plain: struct {
278	280	msg: []const u8,
279	281	},
280	282
281		pub fn renderToStdErr(msg: Message) void {
282		return msg.renderToStdErrInner("error");
	283	pub fn renderToStdErr(msg: Message, ttyconf: std.debug.TTY.Config) void {
	284	const stderr_mutex = std.debug.getStderrMutex();
	285	const held = std.debug.getStderrMutex().acquire();
	286	defer held.release();
	287	const stderr = std.io.getStdErr();
	288	return msg.renderToStdErrInner(ttyconf, stderr, "error", .Red) catch return;
283	289	}
284	290
285		fn renderToStdErrInner(msg: Message, kind: []const u8) void {
	291	fn renderToStdErrInner(
	292	msg: Message,
	293	ttyconf: std.debug.TTY.Config,
	294	stderr_file: std.fs.File,
	295	kind: []const u8,
	296	color: std.debug.TTY.Color,
	297	) anyerror!void {
	298	const stderr = stderr_file.writer();
286	299	switch (msg) {
287	300	.src => \|src\| {
288		std.debug.print("{s}:{d}:{d}: {s}: {s}\n", .{
	301	try stderr.print("{s}:{d}:{d}: ", .{
289	302	src.src_path,
290	303	src.line + 1,
291	304	src.column + 1,
292		kind,
293		src.msg,
294	305	});
	306	ttyconf.setColor(stderr, color);
	307	try stderr.writeAll(kind);
	308	ttyconf.setColor(stderr, .Bold);
	309	try stderr.print(" {s}\n", .{src.msg});
	310	ttyconf.setColor(stderr, .Reset);
	311	if (src.source_line) \|line\| {
	312	try stderr.writeAll(line);
	313	try stderr.writeByte('\n');
	314	try stderr.writeByteNTimes(' ', src.column);
	315	ttyconf.setColor(stderr, .Green);
	316	try stderr.writeAll("^\n");
	317	ttyconf.setColor(stderr, .Reset);
	318	}
295	319	for (src.notes) \|note\| {
296		note.renderToStdErrInner("note");
	320	try note.renderToStdErrInner(ttyconf, stderr_file, "note", .Cyan);
297	321	}
298	322	},
299	323	.plain => \|plain\| {
...	...	@@ -327,6 +351,7 @@ pub const AllErrors = struct {
327	351	.byte_offset = byte_offset,
328	352	.line = @intCast(u32, loc.line),
329	353	.column = @intCast(u32, loc.column),
	354	.source_line = try arena.allocator.dupe(u8, loc.source_line),
330	355	},
331	356	};
332	357	}
...	...	@@ -342,6 +367,7 @@ pub const AllErrors = struct {
342	367	.line = @intCast(u32, loc.line),
343	368	.column = @intCast(u32, loc.column),
344	369	.notes = notes,
	370	.source_line = try arena.allocator.dupe(u8, loc.source_line),
345	371	},
346	372	});
347	373	}
...	...	@@ -1489,6 +1515,7 @@ pub fn getAllErrorsAlloc(self: *Compilation) !AllErrors {
1489	1515	.byte_offset = 0,
1490	1516	.line = err_msg.line,
1491	1517	.column = err_msg.column,
	1518	.source_line = null, // TODO
1492	1519	},
1493	1520	});
1494	1521	}

src/main.zig+5-1

...	...	@@ -2106,8 +2106,12 @@ fn updateModule(gpa: Allocator, comp: Compilation, hook: AfterUpdateHook) !voi
2106	2106	defer errors.deinit(comp.gpa);
2107	2107
2108	2108	if (errors.list.len != 0) {
	2109	const ttyconf: std.debug.TTY.Config = switch (comp.color) {
	2110	.auto, .on => std.debug.detectTTYConfig(),
	2111	.off => .no_color,
	2112	};
2109	2113	for (errors.list) \|full_err_msg\| {
2110		full_err_msg.renderToStdErr();
	2114	full_err_msg.renderToStdErr(ttyconf);
2111	2115	}
2112	2116	const log_text = comp.getCompileLogOutput();
2113	2117	if (log_text.len != 0) {