mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-11 16:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Andrew Kelley 2025-07-15 21:56:10 -07:00
parent 89adf9cf5c
commit cea82a4b94
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/std/zig/Ast/Render.zig
View File

@ -10,14 +10,14 @@ const Writer = std.io.Writer;
const Render = @This(); const Render = @This();
const indent_delta = 4;
const asm_indent_delta = 2;
gpa: Allocator, gpa: Allocator,
ais: *AutoIndentingStream, ais: *AutoIndentingStream,
tree: Ast, tree: Ast,
fixups: Fixups, fixups: Fixups,
const indent_delta = 4;
const asm_indent_delta = 2;
pub const Error = error{ pub const Error = error{
/// Ran out of memory allocating call stack frames to complete rendering. /// Ran out of memory allocating call stack frames to complete rendering.
OutOfMemory, OutOfMemory,
@ -83,9 +83,9 @@ pub const Fixups = struct {
} }
}; };
pub fn renderTree(gpa: Allocator, bw: *Writer, tree: Ast, fixups: Fixups) Error!void { pub fn renderTree(gpa: Allocator, w: *Writer, tree: Ast, fixups: Fixups) Error!void {
assert(tree.errors.len == 0); // Cannot render an invalid tree. assert(tree.errors.len == 0); // Cannot render an invalid tree.
var auto_indenting_stream: AutoIndentingStream = .init(gpa, bw, indent_delta); var auto_indenting_stream: AutoIndentingStream = .init(gpa, w, indent_delta);
defer auto_indenting_stream.deinit(); defer auto_indenting_stream.deinit();
var r: Render = .{ var r: Render = .{
.gpa = gpa, .gpa = gpa,
@ -2131,7 +2131,7 @@ fn renderArrayInit(
const sub_expr_buffer_starts = try gpa.alloc(usize, section_exprs.len + 1); const sub_expr_buffer_starts = try gpa.alloc(usize, section_exprs.len + 1);
defer gpa.free(sub_expr_buffer_starts); defer gpa.free(sub_expr_buffer_starts);
var auto_indenting_stream: AutoIndentingStream = .init(gpa, &sub_expr_buffer.interface, indent_delta); var auto_indenting_stream: AutoIndentingStream = .init(gpa, &sub_expr_buffer.writer, indent_delta);
defer auto_indenting_stream.deinit(); defer auto_indenting_stream.deinit();
var sub_render: Render = .{ var sub_render: Render = .{
.gpa = r.gpa, .gpa = r.gpa,
@ -3116,11 +3116,11 @@ fn anythingBetween(tree: Ast, start_token: Ast.TokenIndex, end_token: Ast.TokenI
return false; return false;
} }
fn writeFixingWhitespace(bw: *Writer, slice: []const u8) Error!void { fn writeFixingWhitespace(w: *Writer, slice: []const u8) Error!void {
for (slice) |byte| switch (byte) { for (slice) |byte| switch (byte) {
'\t' => try bw.splatByteAll(' ', indent_delta), '\t' => try w.splatByteAll(' ', indent_delta),
'\r' => {}, '\r' => {},
else => try bw.writeByte(byte), else => try w.writeByte(byte),
}; };
} }
@ -3281,9 +3281,9 @@ const AutoIndentingStream = struct {
indent_count: usize, indent_count: usize,
}; };
pub fn init(gpa: Allocator, bw: *Writer, starting_indent_delta: usize) AutoIndentingStream { pub fn init(gpa: Allocator, w: *Writer, starting_indent_delta: usize) AutoIndentingStream {
return .{ return .{
.underlying_writer = bw, .underlying_writer = w,
.indent_delta = starting_indent_delta, .indent_delta = starting_indent_delta,
.indent_stack = .init(gpa), .indent_stack = .init(gpa),
.space_stack = .init(gpa), .space_stack = .init(gpa),