authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 23:48:33-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 23:48:33-07:00
log32ff9d802b6337bc10765d879cfd52e6b78ea532
treeb4162159535fb16464ca47ad85924cf2a0954ff7
parent09c954a663ffee83b7aac2a22a56e3e4effc8360

sync

1 files changed, 6 insertions(+), 6 deletions(-)

lib/std/zig/AstGen.zig+6-6
...@@ -11291,7 +11291,7 @@ fn parseStrLit(...@@ -11291,7 +11291,7 @@ fn parseStrLit(
11291 const result = r: {11291 const result = r: {
11292 var aw: std.io.Writer.Allocating = .fromArrayList(astgen.gpa, buf);11292 var aw: std.io.Writer.Allocating = .fromArrayList(astgen.gpa, buf);
11293 defer buf.* = aw.toArrayList();11293 defer buf.* = aw.toArrayList();
11294 break :r std.zig.string_literal.parseWrite(&aw.interface, raw_string) catch |err| switch (err) {11294 break :r std.zig.string_literal.parseWrite(&aw.writer, raw_string) catch |err| switch (err) {
11295 error.WriteFailed => return error.OutOfMemory,11295 error.WriteFailed => return error.OutOfMemory,
11296 };11296 };
11297 };11297 };
...@@ -13741,7 +13741,7 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {...@@ -13741,7 +13741,7 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {
1374113741
13742 var msg: std.io.Writer.Allocating = .init(gpa);13742 var msg: std.io.Writer.Allocating = .init(gpa);
13743 defer msg.deinit();13743 defer msg.deinit();
13744 const msg_bw = &msg.interface;13744 const msg_w = &msg.writer;
1374513745
13746 var notes: std.ArrayListUnmanaged(u32) = .empty;13746 var notes: std.ArrayListUnmanaged(u32) = .empty;
13747 defer notes.deinit(gpa);13747 defer notes.deinit(gpa);
...@@ -13775,19 +13775,19 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {...@@ -13775,19 +13775,19 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {
13775 .extra = .{ .offset = bad_off },13775 .extra = .{ .offset = bad_off },
13776 };13776 };
13777 msg.clearRetainingCapacity();13777 msg.clearRetainingCapacity();
13778 tree.renderError(ast_err, msg_bw) catch return error.OutOfMemory;13778 tree.renderError(ast_err, msg_w) catch return error.OutOfMemory;
13779 return try astgen.appendErrorTokNotesOff(tok, bad_off, "{s}", .{msg.getWritten()}, notes.items);13779 return try astgen.appendErrorTokNotesOff(tok, bad_off, "{s}", .{msg.getWritten()}, notes.items);
13780 }13780 }
1378113781
13782 var cur_err = tree.errors[0];13782 var cur_err = tree.errors[0];
13783 for (tree.errors[1..]) |err| {13783 for (tree.errors[1..]) |err| {
13784 if (err.is_note) {13784 if (err.is_note) {
13785 tree.renderError(err, msg_bw) catch return error.OutOfMemory;13785 tree.renderError(err, msg_w) catch return error.OutOfMemory;
13786 try notes.append(gpa, try astgen.errNoteTok(err.token, "{s}", .{msg.getWritten()}));13786 try notes.append(gpa, try astgen.errNoteTok(err.token, "{s}", .{msg.getWritten()}));
13787 } else {13787 } else {
13788 // Flush error13788 // Flush error
13789 const extra_offset = tree.errorOffset(cur_err);13789 const extra_offset = tree.errorOffset(cur_err);
13790 tree.renderError(cur_err, msg_bw) catch return error.OutOfMemory;13790 tree.renderError(cur_err, msg_w) catch return error.OutOfMemory;
13791 try astgen.appendErrorTokNotesOff(cur_err.token, extra_offset, "{s}", .{msg.getWritten()}, notes.items);13791 try astgen.appendErrorTokNotesOff(cur_err.token, extra_offset, "{s}", .{msg.getWritten()}, notes.items);
13792 notes.clearRetainingCapacity();13792 notes.clearRetainingCapacity();
13793 cur_err = err;13793 cur_err = err;
...@@ -13801,7 +13801,7 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {...@@ -13801,7 +13801,7 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {
1380113801
13802 // Flush error13802 // Flush error
13803 const extra_offset = tree.errorOffset(cur_err);13803 const extra_offset = tree.errorOffset(cur_err);
13804 tree.renderError(cur_err, msg_bw) catch return error.OutOfMemory;13804 tree.renderError(cur_err, msg_w) catch return error.OutOfMemory;
13805 try astgen.appendErrorTokNotesOff(cur_err.token, extra_offset, "{s}", .{msg.getWritten()}, notes.items);13805 try astgen.appendErrorTokNotesOff(cur_err.token, extra_offset, "{s}", .{msg.getWritten()}, notes.items);
13806}13806}
1380713807