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