authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 21:56:10-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 21:56:10-07:00
logcea82a4b94d3eec6e204df0f4bcb82a1446b24ec
treeb3474ebcee6c7ae5849bd7b0f9a78806d765d0f1
parent89adf9cf5ccb613926ac30248df05e6d4c9455dc

sync

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

lib/std/zig/Ast/Render.zig+11-11
...@@ -10,14 +10,14 @@ const Writer = std.io.Writer;...@@ -10,14 +10,14 @@ const Writer = std.io.Writer;
1010
11const Render = @This();11const Render = @This();
1212
13const indent_delta = 4;
14const asm_indent_delta = 2;
15
16gpa: Allocator,13gpa: Allocator,
17ais: *AutoIndentingStream,14ais: *AutoIndentingStream,
18tree: Ast,15tree: Ast,
19fixups: Fixups,16fixups: Fixups,
2017
18const indent_delta = 4;
19const asm_indent_delta = 2;
20
21pub const Error = error{21pub const Error = error{
22 /// Ran out of memory allocating call stack frames to complete rendering.22 /// Ran out of memory allocating call stack frames to complete rendering.
23 OutOfMemory,23 OutOfMemory,
...@@ -83,9 +83,9 @@ pub const Fixups = struct {...@@ -83,9 +83,9 @@ pub const Fixups = struct {
83 }83 }
84};84};
8585
86pub fn renderTree(gpa: Allocator, bw: *Writer, tree: Ast, fixups: Fixups) Error!void {86pub fn renderTree(gpa: Allocator, w: *Writer, tree: Ast, fixups: Fixups) Error!void {
87 assert(tree.errors.len == 0); // Cannot render an invalid tree.87 assert(tree.errors.len == 0); // Cannot render an invalid tree.
88 var auto_indenting_stream: AutoIndentingStream = .init(gpa, bw, indent_delta);88 var auto_indenting_stream: AutoIndentingStream = .init(gpa, w, indent_delta);
89 defer auto_indenting_stream.deinit();89 defer auto_indenting_stream.deinit();
90 var r: Render = .{90 var r: Render = .{
91 .gpa = gpa,91 .gpa = gpa,
...@@ -2131,7 +2131,7 @@ fn renderArrayInit(...@@ -2131,7 +2131,7 @@ fn renderArrayInit(
2131 const sub_expr_buffer_starts = try gpa.alloc(usize, section_exprs.len + 1);2131 const sub_expr_buffer_starts = try gpa.alloc(usize, section_exprs.len + 1);
2132 defer gpa.free(sub_expr_buffer_starts);2132 defer gpa.free(sub_expr_buffer_starts);
21332133
2134 var auto_indenting_stream: AutoIndentingStream = .init(gpa, &sub_expr_buffer.interface, indent_delta);2134 var auto_indenting_stream: AutoIndentingStream = .init(gpa, &sub_expr_buffer.writer, indent_delta);
2135 defer auto_indenting_stream.deinit();2135 defer auto_indenting_stream.deinit();
2136 var sub_render: Render = .{2136 var sub_render: Render = .{
2137 .gpa = r.gpa,2137 .gpa = r.gpa,
...@@ -3116,11 +3116,11 @@ fn anythingBetween(tree: Ast, start_token: Ast.TokenIndex, end_token: Ast.TokenI...@@ -3116,11 +3116,11 @@ fn anythingBetween(tree: Ast, start_token: Ast.TokenIndex, end_token: Ast.TokenI
3116 return false;3116 return false;
3117}3117}
31183118
3119fn writeFixingWhitespace(bw: *Writer, slice: []const u8) Error!void {3119fn writeFixingWhitespace(w: *Writer, slice: []const u8) Error!void {
3120 for (slice) |byte| switch (byte) {3120 for (slice) |byte| switch (byte) {
3121 '\t' => try bw.splatByteAll(' ', indent_delta),3121 '\t' => try w.splatByteAll(' ', indent_delta),
3122 '\r' => {},3122 '\r' => {},
3123 else => try bw.writeByte(byte),3123 else => try w.writeByte(byte),
3124 };3124 };
3125}3125}
31263126
...@@ -3281,9 +3281,9 @@ const AutoIndentingStream = struct {...@@ -3281,9 +3281,9 @@ const AutoIndentingStream = struct {
3281 indent_count: usize,3281 indent_count: usize,
3282 };3282 };
32833283
3284 pub fn init(gpa: Allocator, bw: *Writer, starting_indent_delta: usize) AutoIndentingStream {3284 pub fn init(gpa: Allocator, w: *Writer, starting_indent_delta: usize) AutoIndentingStream {
3285 return .{3285 return .{
3286 .underlying_writer = bw,3286 .underlying_writer = w,
3287 .indent_delta = starting_indent_delta,3287 .indent_delta = starting_indent_delta,
3288 .indent_stack = .init(gpa),3288 .indent_stack = .init(gpa),
3289 .space_stack = .init(gpa),3289 .space_stack = .init(gpa),