Commit bb848dbeee
Changed files (8)
lib/std/io/auto_indenting_stream.zig
@@ -5,13 +5,13 @@ const assert = std.debug.assert;
/// Automatically inserts indentation of written data by keeping
/// track of the current indentation level
-pub fn AutoIndentingStream(comptime WriterType: type) type {
+pub fn AutoIndentingStream(comptime UnderlyingWriter: type) type {
return struct {
const Self = @This();
- pub const Error = WriterType.Error;
+ pub const Error = UnderlyingWriter.Error;
pub const Writer = io.Writer(*Self, Error, write);
- writer_pointer: *WriterType,
+ underlying_writer: UnderlyingWriter,
indent_count: usize = 0,
indent_delta: usize,
@@ -20,10 +20,6 @@ pub fn AutoIndentingStream(comptime WriterType: type) type {
applied_indent: usize = 0, // the most recently applied indent
indent_next_line: usize = 0, // not used until the next line
- pub fn init(indent_delta: usize, writer_pointer: *WriterType) Self {
- return Self{ .writer_pointer = writer_pointer, .indent_delta = indent_delta };
- }
-
pub fn writer(self: *Self) Writer {
return .{ .context = self };
}
@@ -55,7 +51,7 @@ pub fn AutoIndentingStream(comptime WriterType: type) type {
if (bytes.len == 0)
return @as(usize, 0);
- try self.writer_pointer.writer().writeAll(bytes);
+ try self.underlying_writer.writeAll(bytes);
if (bytes[bytes.len - 1] == '\n')
self.resetLine();
return bytes.len;
@@ -115,7 +111,7 @@ pub fn AutoIndentingStream(comptime WriterType: type) type {
fn applyIndent(self: *Self) Error!void {
const current_indent = self.currentIndent();
if (self.current_line_empty and current_indent > 0) {
- try self.writer_pointer.writer().writeByteNTimes(' ', current_indent);
+ try self.underlying_writer.writeByteNTimes(' ', current_indent);
self.applied_indent = current_indent;
}
@@ -143,8 +139,10 @@ pub fn AutoIndentingStream(comptime WriterType: type) type {
pub fn autoIndentingStream(
indent_delta: usize,
- underlying_stream: anytype,
-) AutoIndentingStream(@TypeOf(underlying_stream).Child) {
- comptime assert(@typeInfo(@TypeOf(underlying_stream)) == .Pointer);
- return AutoIndentingStream(@TypeOf(underlying_stream).Child).init(indent_delta, underlying_stream);
+ underlying_writer: anytype,
+) AutoIndentingStream(@TypeOf(underlying_writer)) {
+ return AutoIndentingStream(@TypeOf(underlying_writer)){
+ .underlying_writer = underlying_writer,
+ .indent_delta = indent_delta,
+ };
}
lib/std/io/change_detection_stream.zig
@@ -10,19 +10,11 @@ pub fn ChangeDetectionStream(comptime WriterType: type) type {
pub const Error = WriterType.Error;
pub const Writer = io.Writer(*Self, Error, write);
- anything_changed: bool = false,
- writer_pointer: *const WriterType,
+ anything_changed: bool,
+ underlying_writer: WriterType,
source_index: usize,
source: []const u8,
- pub fn init(source: []const u8, writer_pointer: *const WriterType) Self {
- return Self{
- .writer_pointer = writer_pointer,
- .source_index = 0,
- .source = source,
- };
- }
-
pub fn writer(self: *Self) Writer {
return .{ .context = self };
}
@@ -41,7 +33,7 @@ pub fn ChangeDetectionStream(comptime WriterType: type) type {
}
}
- return self.writer_pointer.write(bytes);
+ return self.underlying_writer.write(bytes);
}
pub fn changeDetected(self: *Self) bool {
@@ -52,8 +44,12 @@ pub fn ChangeDetectionStream(comptime WriterType: type) type {
pub fn changeDetectionStream(
source: []const u8,
- underlying_stream: anytype,
-) ChangeDetectionStream(@TypeOf(underlying_stream).Child) {
- comptime assert(@typeInfo(@TypeOf(underlying_stream)) == .Pointer);
- return ChangeDetectionStream(@TypeOf(underlying_stream).Child).init(source, underlying_stream);
+ underlying_writer: anytype,
+) ChangeDetectionStream(@TypeOf(underlying_writer)) {
+ return ChangeDetectionStream(@TypeOf(underlying_writer)){
+ .anything_changed = false,
+ .underlying_writer = underlying_writer,
+ .source_index = 0,
+ .source = source,
+ };
}
lib/std/io/find_byte_out_stream.zig
@@ -4,24 +4,16 @@ const assert = std.debug.assert;
/// An OutStream that returns whether the given character has been written to it.
/// The contents are not written to anything.
-pub fn FindByteOutStream(comptime WriterType: type) type {
+pub fn FindByteOutStream(comptime UnderlyingWriter: type) type {
return struct {
const Self = @This();
- pub const Error = WriterType.Error;
+ pub const Error = UnderlyingWriter.Error;
pub const Writer = io.Writer(*Self, Error, write);
- writer_pointer: *const WriterType,
+ underlying_writer: UnderlyingWriter,
byte_found: bool,
byte: u8,
- pub fn init(byte: u8, writer_pointer: *const WriterType) Self {
- return Self{
- .writer_pointer = writer_pointer,
- .byte = byte,
- .byte_found = false,
- };
- }
-
pub fn writer(self: *Self) Writer {
return .{ .context = self };
}
@@ -34,11 +26,15 @@ pub fn FindByteOutStream(comptime WriterType: type) type {
break :blk false;
};
}
- return self.writer_pointer.writer().write(bytes);
+ return self.underlying_writer.write(bytes);
}
};
}
-pub fn findByteOutStream(byte: u8, underlying_stream: anytype) FindByteOutStream(@TypeOf(underlying_stream).Child) {
- comptime assert(@typeInfo(@TypeOf(underlying_stream)) == .Pointer);
- return FindByteOutStream(@TypeOf(underlying_stream).Child).init(byte, underlying_stream);
+
+pub fn findByteOutStream(byte: u8, underlying_writer: anytype) FindByteOutStream(@TypeOf(underlying_writer)) {
+ return FindByteOutStream(@TypeOf(underlying_writer)){
+ .underlying_writer = underlying_writer,
+ .byte = byte,
+ .byte_found = false,
+ };
}
lib/std/io/writer.zig
@@ -18,10 +18,6 @@ pub fn Writer(
const Self = @This();
pub const Error = WriteError;
- pub fn writer(self: *const Self) Self {
- return self.*;
- }
-
pub fn write(self: Self, bytes: []const u8) Error!usize {
return writeFn(self.context, bytes);
}
lib/std/zig/parser_test.zig
@@ -3364,7 +3364,7 @@ fn testParse(source: []const u8, allocator: *mem.Allocator, anything_changed: *b
errdefer buffer.deinit();
const outStream = buffer.outStream();
- anything_changed.* = try std.zig.render(allocator, &outStream, tree);
+ anything_changed.* = try std.zig.render(allocator, outStream, tree);
return buffer.toOwnedSlice();
}
fn testTransform(source: []const u8, expected_source: []const u8) !void {
lib/std/zig/render.zig
@@ -19,13 +19,12 @@ pub const Error = error{
};
/// Returns whether anything changed
-pub fn render(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tree) (meta.Child(@TypeOf(stream)).Error || Error)!bool {
+pub fn render(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tree) (@TypeOf(stream).Error || Error)!bool {
// cannot render an invalid tree
std.debug.assert(tree.errors.len == 0);
- var s = stream.*;
- var change_detection_stream = std.io.changeDetectionStream(tree.source, &s);
- var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &change_detection_stream);
+ var change_detection_stream = std.io.changeDetectionStream(tree.source, stream);
+ var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, change_detection_stream.writer());
try renderRoot(allocator, &auto_indenting_stream, tree);
@@ -34,19 +33,19 @@ pub fn render(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tree) (meta
fn renderRoot(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
// render all the line comments at the beginning of the file
for (tree.token_ids) |token_id, i| {
if (token_id != .LineComment) break;
const token_loc = tree.token_locs[i];
- try stream.writer().print("{}\n", .{mem.trimRight(u8, tree.tokenSliceLoc(token_loc), " ")});
+ try ais.writer().print("{}\n", .{mem.trimRight(u8, tree.tokenSliceLoc(token_loc), " ")});
const next_token = tree.token_locs[i + 1];
const loc = tree.tokenLocationLoc(token_loc.end, next_token);
if (loc.line >= 2) {
- try stream.insertNewline();
+ try ais.insertNewline();
}
}
@@ -110,7 +109,7 @@ fn renderRoot(
// If there's no next reformatted `decl`, just copy the
// remaining input tokens and bail out.
const start = tree.token_locs[copy_start_token_index].start;
- try copyFixingWhitespace(stream, tree.source[start..]);
+ try copyFixingWhitespace(ais, tree.source[start..]);
return;
}
decl = root_decls[decl_i];
@@ -151,25 +150,25 @@ fn renderRoot(
const start = tree.token_locs[copy_start_token_index].start;
const end = tree.token_locs[copy_end_token_index].start;
- try copyFixingWhitespace(stream, tree.source[start..end]);
+ try copyFixingWhitespace(ais, tree.source[start..end]);
}
- try renderTopLevelDecl(allocator, stream, tree, decl);
+ try renderTopLevelDecl(allocator, ais, tree, decl);
decl_i += 1;
if (decl_i >= root_decls.len) return;
- try renderExtraNewline(tree, stream, root_decls[decl_i]);
+ try renderExtraNewline(tree, ais, root_decls[decl_i]);
}
}
-fn renderExtraNewline(tree: *ast.Tree, stream: anytype, node: *ast.Node) @TypeOf(stream.*).Error!void {
- return renderExtraNewlineToken(tree, stream, node.firstToken());
+fn renderExtraNewline(tree: *ast.Tree, ais: anytype, node: *ast.Node) @TypeOf(ais.*).Error!void {
+ return renderExtraNewlineToken(tree, ais, node.firstToken());
}
fn renderExtraNewlineToken(
tree: *ast.Tree,
- stream: anytype,
+ ais: anytype,
first_token: ast.TokenIndex,
-) @TypeOf(stream.*).Error!void {
+) @TypeOf(ais.*).Error!void {
var prev_token = first_token;
if (prev_token == 0) return;
var newline_threshold: usize = 2;
@@ -182,27 +181,27 @@ fn renderExtraNewlineToken(
const prev_token_end = tree.token_locs[prev_token - 1].end;
const loc = tree.tokenLocation(prev_token_end, first_token);
if (loc.line >= newline_threshold) {
- try stream.insertNewline();
+ try ais.insertNewline();
}
}
-fn renderTopLevelDecl(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tree, decl: *ast.Node) (@TypeOf(stream.*).Error || Error)!void {
- try renderContainerDecl(allocator, stream, tree, decl, .Newline);
+fn renderTopLevelDecl(allocator: *mem.Allocator, ais: anytype, tree: *ast.Tree, decl: *ast.Node) (@TypeOf(ais.*).Error || Error)!void {
+ try renderContainerDecl(allocator, ais, tree, decl, .Newline);
}
-fn renderContainerDecl(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tree, decl: *ast.Node, space: Space) (@TypeOf(stream.*).Error || Error)!void {
+fn renderContainerDecl(allocator: *mem.Allocator, ais: anytype, tree: *ast.Tree, decl: *ast.Node, space: Space) (@TypeOf(ais.*).Error || Error)!void {
switch (decl.tag) {
.FnProto => {
const fn_proto = @fieldParentPtr(ast.Node.FnProto, "base", decl);
- try renderDocComments(tree, stream, fn_proto, fn_proto.getDocComments());
+ try renderDocComments(tree, ais, fn_proto, fn_proto.getDocComments());
if (fn_proto.getBodyNode()) |body_node| {
- try renderExpression(allocator, stream, tree, decl, .Space);
- try renderExpression(allocator, stream, tree, body_node, space);
+ try renderExpression(allocator, ais, tree, decl, .Space);
+ try renderExpression(allocator, ais, tree, body_node, space);
} else {
- try renderExpression(allocator, stream, tree, decl, .None);
- try renderToken(tree, stream, tree.nextToken(decl.lastToken()), space);
+ try renderExpression(allocator, ais, tree, decl, .None);
+ try renderToken(tree, ais, tree.nextToken(decl.lastToken()), space);
}
},
@@ -210,35 +209,35 @@ fn renderContainerDecl(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tr
const use_decl = @fieldParentPtr(ast.Node.Use, "base", decl);
if (use_decl.visib_token) |visib_token| {
- try renderToken(tree, stream, visib_token, .Space); // pub
+ try renderToken(tree, ais, visib_token, .Space); // pub
}
- try renderToken(tree, stream, use_decl.use_token, .Space); // usingnamespace
- try renderExpression(allocator, stream, tree, use_decl.expr, .None);
- try renderToken(tree, stream, use_decl.semicolon_token, space); // ;
+ try renderToken(tree, ais, use_decl.use_token, .Space); // usingnamespace
+ try renderExpression(allocator, ais, tree, use_decl.expr, .None);
+ try renderToken(tree, ais, use_decl.semicolon_token, space); // ;
},
.VarDecl => {
const var_decl = @fieldParentPtr(ast.Node.VarDecl, "base", decl);
- try renderDocComments(tree, stream, var_decl, var_decl.getDocComments());
- try renderVarDecl(allocator, stream, tree, var_decl);
+ try renderDocComments(tree, ais, var_decl, var_decl.getDocComments());
+ try renderVarDecl(allocator, ais, tree, var_decl);
},
.TestDecl => {
const test_decl = @fieldParentPtr(ast.Node.TestDecl, "base", decl);
- try renderDocComments(tree, stream, test_decl, test_decl.doc_comments);
- try renderToken(tree, stream, test_decl.test_token, .Space);
- try renderExpression(allocator, stream, tree, test_decl.name, .Space);
- try renderExpression(allocator, stream, tree, test_decl.body_node, space);
+ try renderDocComments(tree, ais, test_decl, test_decl.doc_comments);
+ try renderToken(tree, ais, test_decl.test_token, .Space);
+ try renderExpression(allocator, ais, tree, test_decl.name, .Space);
+ try renderExpression(allocator, ais, tree, test_decl.body_node, space);
},
.ContainerField => {
const field = @fieldParentPtr(ast.Node.ContainerField, "base", decl);
- try renderDocComments(tree, stream, field, field.doc_comments);
+ try renderDocComments(tree, ais, field, field.doc_comments);
if (field.comptime_token) |t| {
- try renderToken(tree, stream, t, .Space); // comptime
+ try renderToken(tree, ais, t, .Space); // comptime
}
const src_has_trailing_comma = blk: {
@@ -251,67 +250,67 @@ fn renderContainerDecl(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tr
const last_token_space: Space = if (src_has_trailing_comma) .None else space;
if (field.type_expr == null and field.value_expr == null) {
- try renderToken(tree, stream, field.name_token, last_token_space); // name
+ try renderToken(tree, ais, field.name_token, last_token_space); // name
} else if (field.type_expr != null and field.value_expr == null) {
- try renderToken(tree, stream, field.name_token, .None); // name
- try renderToken(tree, stream, tree.nextToken(field.name_token), .Space); // :
+ try renderToken(tree, ais, field.name_token, .None); // name
+ try renderToken(tree, ais, tree.nextToken(field.name_token), .Space); // :
if (field.align_expr) |align_value_expr| {
- try renderExpression(allocator, stream, tree, field.type_expr.?, .Space); // type
+ try renderExpression(allocator, ais, tree, field.type_expr.?, .Space); // type
const lparen_token = tree.prevToken(align_value_expr.firstToken());
const align_kw = tree.prevToken(lparen_token);
const rparen_token = tree.nextToken(align_value_expr.lastToken());
- try renderToken(tree, stream, align_kw, .None); // align
- try renderToken(tree, stream, lparen_token, .None); // (
- try renderExpression(allocator, stream, tree, align_value_expr, .None); // alignment
- try renderToken(tree, stream, rparen_token, last_token_space); // )
+ try renderToken(tree, ais, align_kw, .None); // align
+ try renderToken(tree, ais, lparen_token, .None); // (
+ try renderExpression(allocator, ais, tree, align_value_expr, .None); // alignment
+ try renderToken(tree, ais, rparen_token, last_token_space); // )
} else {
- try renderExpression(allocator, stream, tree, field.type_expr.?, last_token_space); // type
+ try renderExpression(allocator, ais, tree, field.type_expr.?, last_token_space); // type
}
} else if (field.type_expr == null and field.value_expr != null) {
- try renderToken(tree, stream, field.name_token, .Space); // name
- try renderToken(tree, stream, tree.nextToken(field.name_token), .Space); // =
- try renderExpression(allocator, stream, tree, field.value_expr.?, last_token_space); // value
+ try renderToken(tree, ais, field.name_token, .Space); // name
+ try renderToken(tree, ais, tree.nextToken(field.name_token), .Space); // =
+ try renderExpression(allocator, ais, tree, field.value_expr.?, last_token_space); // value
} else {
- try renderToken(tree, stream, field.name_token, .None); // name
- try renderToken(tree, stream, tree.nextToken(field.name_token), .Space); // :
+ try renderToken(tree, ais, field.name_token, .None); // name
+ try renderToken(tree, ais, tree.nextToken(field.name_token), .Space); // :
if (field.align_expr) |align_value_expr| {
- try renderExpression(allocator, stream, tree, field.type_expr.?, .Space); // type
+ try renderExpression(allocator, ais, tree, field.type_expr.?, .Space); // type
const lparen_token = tree.prevToken(align_value_expr.firstToken());
const align_kw = tree.prevToken(lparen_token);
const rparen_token = tree.nextToken(align_value_expr.lastToken());
- try renderToken(tree, stream, align_kw, .None); // align
- try renderToken(tree, stream, lparen_token, .None); // (
- try renderExpression(allocator, stream, tree, align_value_expr, .None); // alignment
- try renderToken(tree, stream, rparen_token, .Space); // )
+ try renderToken(tree, ais, align_kw, .None); // align
+ try renderToken(tree, ais, lparen_token, .None); // (
+ try renderExpression(allocator, ais, tree, align_value_expr, .None); // alignment
+ try renderToken(tree, ais, rparen_token, .Space); // )
} else {
- try renderExpression(allocator, stream, tree, field.type_expr.?, .Space); // type
+ try renderExpression(allocator, ais, tree, field.type_expr.?, .Space); // type
}
- try renderToken(tree, stream, tree.prevToken(field.value_expr.?.firstToken()), .Space); // =
- try renderExpression(allocator, stream, tree, field.value_expr.?, last_token_space); // value
+ try renderToken(tree, ais, tree.prevToken(field.value_expr.?.firstToken()), .Space); // =
+ try renderExpression(allocator, ais, tree, field.value_expr.?, last_token_space); // value
}
if (src_has_trailing_comma) {
const comma = tree.nextToken(field.lastToken());
- try renderToken(tree, stream, comma, space);
+ try renderToken(tree, ais, comma, space);
}
},
.Comptime => {
assert(!decl.requireSemiColon());
- try renderExpression(allocator, stream, tree, decl, space);
+ try renderExpression(allocator, ais, tree, decl, space);
},
.DocComment => {
const comment = @fieldParentPtr(ast.Node.DocComment, "base", decl);
const kind = tree.token_ids[comment.first_line];
- try renderToken(tree, stream, comment.first_line, .Newline);
+ try renderToken(tree, ais, comment.first_line, .Newline);
var tok_i = comment.first_line + 1;
while (true) : (tok_i += 1) {
const tok_id = tree.token_ids[tok_i];
if (tok_id == kind) {
- try renderToken(tree, stream, tok_i, .Newline);
+ try renderToken(tree, ais, tok_i, .Newline);
} else if (tok_id == .LineComment) {
continue;
} else {
@@ -325,11 +324,11 @@ fn renderContainerDecl(allocator: *mem.Allocator, stream: anytype, tree: *ast.Tr
fn renderExpression(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
base: *ast.Node,
space: Space,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
switch (base.tag) {
.Identifier,
.IntegerLiteral,
@@ -343,18 +342,18 @@ fn renderExpression(
.UndefinedLiteral,
=> {
const casted_node = base.cast(ast.Node.OneToken).?;
- return renderToken(tree, stream, casted_node.token, space);
+ return renderToken(tree, ais, casted_node.token, space);
},
.AnyType => {
const any_type = base.castTag(.AnyType).?;
if (mem.eql(u8, tree.tokenSlice(any_type.token), "var")) {
// TODO remove in next release cycle
- try stream.writer().writeAll("anytype");
- if (space == .Comma) try stream.writer().writeAll(",\n");
+ try ais.writer().writeAll("anytype");
+ if (space == .Comma) try ais.writer().writeAll(",\n");
return;
}
- return renderToken(tree, stream, any_type.token, space);
+ return renderToken(tree, ais, any_type.token, space);
},
.Block, .LabeledBlock => {
@@ -384,65 +383,65 @@ fn renderExpression(
};
if (block.label) |label| {
- try renderToken(tree, stream, label, Space.None);
- try renderToken(tree, stream, tree.nextToken(label), Space.Space);
+ try renderToken(tree, ais, label, Space.None);
+ try renderToken(tree, ais, tree.nextToken(label), Space.Space);
}
if (block.statements.len == 0) {
- stream.pushIndentNextLine();
- defer stream.popIndent();
- try renderToken(tree, stream, block.lbrace, Space.None);
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
+ try renderToken(tree, ais, block.lbrace, Space.None);
} else {
- stream.pushIndentNextLine();
- defer stream.popIndent();
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
- try renderToken(tree, stream, block.lbrace, Space.Newline);
+ try renderToken(tree, ais, block.lbrace, Space.Newline);
for (block.statements) |statement, i| {
- try renderStatement(allocator, stream, tree, statement);
+ try renderStatement(allocator, ais, tree, statement);
if (i + 1 < block.statements.len) {
- try renderExtraNewline(tree, stream, block.statements[i + 1]);
+ try renderExtraNewline(tree, ais, block.statements[i + 1]);
}
}
}
- return renderToken(tree, stream, block.rbrace, space);
+ return renderToken(tree, ais, block.rbrace, space);
},
.Defer => {
const defer_node = @fieldParentPtr(ast.Node.Defer, "base", base);
- try renderToken(tree, stream, defer_node.defer_token, Space.Space);
+ try renderToken(tree, ais, defer_node.defer_token, Space.Space);
if (defer_node.payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Space);
+ try renderExpression(allocator, ais, tree, payload, Space.Space);
}
- return renderExpression(allocator, stream, tree, defer_node.expr, space);
+ return renderExpression(allocator, ais, tree, defer_node.expr, space);
},
.Comptime => {
const comptime_node = @fieldParentPtr(ast.Node.Comptime, "base", base);
- try renderToken(tree, stream, comptime_node.comptime_token, Space.Space);
- return renderExpression(allocator, stream, tree, comptime_node.expr, space);
+ try renderToken(tree, ais, comptime_node.comptime_token, Space.Space);
+ return renderExpression(allocator, ais, tree, comptime_node.expr, space);
},
.Nosuspend => {
const nosuspend_node = @fieldParentPtr(ast.Node.Nosuspend, "base", base);
if (mem.eql(u8, tree.tokenSlice(nosuspend_node.nosuspend_token), "noasync")) {
// TODO: remove this
- try stream.writer().writeAll("nosuspend ");
+ try ais.writer().writeAll("nosuspend ");
} else {
- try renderToken(tree, stream, nosuspend_node.nosuspend_token, Space.Space);
+ try renderToken(tree, ais, nosuspend_node.nosuspend_token, Space.Space);
}
- return renderExpression(allocator, stream, tree, nosuspend_node.expr, space);
+ return renderExpression(allocator, ais, tree, nosuspend_node.expr, space);
},
.Suspend => {
const suspend_node = @fieldParentPtr(ast.Node.Suspend, "base", base);
if (suspend_node.body) |body| {
- try renderToken(tree, stream, suspend_node.suspend_token, Space.Space);
- return renderExpression(allocator, stream, tree, body, space);
+ try renderToken(tree, ais, suspend_node.suspend_token, Space.Space);
+ return renderExpression(allocator, ais, tree, body, space);
} else {
- return renderToken(tree, stream, suspend_node.suspend_token, space);
+ return renderToken(tree, ais, suspend_node.suspend_token, space);
}
},
@@ -450,21 +449,21 @@ fn renderExpression(
const infix_op_node = @fieldParentPtr(ast.Node.Catch, "base", base);
const op_space = Space.Space;
- try renderExpression(allocator, stream, tree, infix_op_node.lhs, op_space);
+ try renderExpression(allocator, ais, tree, infix_op_node.lhs, op_space);
const after_op_space = blk: {
const same_line = tree.tokensOnSameLine(infix_op_node.op_token, tree.nextToken(infix_op_node.op_token));
break :blk if (same_line) op_space else Space.Newline;
};
- try renderToken(tree, stream, infix_op_node.op_token, after_op_space);
+ try renderToken(tree, ais, infix_op_node.op_token, after_op_space);
if (infix_op_node.payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Space);
+ try renderExpression(allocator, ais, tree, payload, Space.Space);
}
- stream.pushIndentOneShot();
- return renderExpression(allocator, stream, tree, infix_op_node.rhs, space);
+ ais.pushIndentOneShot();
+ return renderExpression(allocator, ais, tree, infix_op_node.rhs, space);
},
.Add,
@@ -516,16 +515,16 @@ fn renderExpression(
.Period, .ErrorUnion, .Range => Space.None,
else => Space.Space,
};
- try renderExpression(allocator, stream, tree, infix_op_node.lhs, op_space);
+ try renderExpression(allocator, ais, tree, infix_op_node.lhs, op_space);
const after_op_space = blk: {
const loc = tree.tokenLocation(tree.token_locs[infix_op_node.op_token].end, tree.nextToken(infix_op_node.op_token));
break :blk if (loc.line == 0) op_space else Space.Newline;
};
- try renderToken(tree, stream, infix_op_node.op_token, after_op_space);
- stream.pushIndentOneShot();
- return renderExpression(allocator, stream, tree, infix_op_node.rhs, space);
+ try renderToken(tree, ais, infix_op_node.op_token, after_op_space);
+ ais.pushIndentOneShot();
+ return renderExpression(allocator, ais, tree, infix_op_node.rhs, space);
},
.BitNot,
@@ -536,8 +535,8 @@ fn renderExpression(
.AddressOf,
=> {
const casted_node = @fieldParentPtr(ast.Node.SimplePrefixOp, "base", base);
- try renderToken(tree, stream, casted_node.op_token, Space.None);
- return renderExpression(allocator, stream, tree, casted_node.rhs, space);
+ try renderToken(tree, ais, casted_node.op_token, Space.None);
+ return renderExpression(allocator, ais, tree, casted_node.rhs, space);
},
.Try,
@@ -545,15 +544,15 @@ fn renderExpression(
.Await,
=> {
const casted_node = @fieldParentPtr(ast.Node.SimplePrefixOp, "base", base);
- try renderToken(tree, stream, casted_node.op_token, Space.Space);
- return renderExpression(allocator, stream, tree, casted_node.rhs, space);
+ try renderToken(tree, ais, casted_node.op_token, Space.Space);
+ return renderExpression(allocator, ais, tree, casted_node.rhs, space);
},
.ArrayType => {
const array_type = @fieldParentPtr(ast.Node.ArrayType, "base", base);
return renderArrayType(
allocator,
- stream,
+ ais,
tree,
array_type.op_token,
array_type.rhs,
@@ -566,7 +565,7 @@ fn renderExpression(
const array_type = @fieldParentPtr(ast.Node.ArrayTypeSentinel, "base", base);
return renderArrayType(
allocator,
- stream,
+ ais,
tree,
array_type.op_token,
array_type.rhs,
@@ -580,111 +579,111 @@ fn renderExpression(
const ptr_type = @fieldParentPtr(ast.Node.PtrType, "base", base);
const op_tok_id = tree.token_ids[ptr_type.op_token];
switch (op_tok_id) {
- .Asterisk, .AsteriskAsterisk => try stream.writer().writeByte('*'),
+ .Asterisk, .AsteriskAsterisk => try ais.writer().writeByte('*'),
.LBracket => if (tree.token_ids[ptr_type.op_token + 2] == .Identifier)
- try stream.writer().writeAll("[*c")
+ try ais.writer().writeAll("[*c")
else
- try stream.writer().writeAll("[*"),
+ try ais.writer().writeAll("[*"),
else => unreachable,
}
if (ptr_type.ptr_info.sentinel) |sentinel| {
const colon_token = tree.prevToken(sentinel.firstToken());
- try renderToken(tree, stream, colon_token, Space.None); // :
+ try renderToken(tree, ais, colon_token, Space.None); // :
const sentinel_space = switch (op_tok_id) {
.LBracket => Space.None,
else => Space.Space,
};
- try renderExpression(allocator, stream, tree, sentinel, sentinel_space);
+ try renderExpression(allocator, ais, tree, sentinel, sentinel_space);
}
switch (op_tok_id) {
.Asterisk, .AsteriskAsterisk => {},
- .LBracket => try stream.writer().writeByte(']'),
+ .LBracket => try ais.writer().writeByte(']'),
else => unreachable,
}
if (ptr_type.ptr_info.allowzero_token) |allowzero_token| {
- try renderToken(tree, stream, allowzero_token, Space.Space); // allowzero
+ try renderToken(tree, ais, allowzero_token, Space.Space); // allowzero
}
if (ptr_type.ptr_info.align_info) |align_info| {
const lparen_token = tree.prevToken(align_info.node.firstToken());
const align_token = tree.prevToken(lparen_token);
- try renderToken(tree, stream, align_token, Space.None); // align
- try renderToken(tree, stream, lparen_token, Space.None); // (
+ try renderToken(tree, ais, align_token, Space.None); // align
+ try renderToken(tree, ais, lparen_token, Space.None); // (
- try renderExpression(allocator, stream, tree, align_info.node, Space.None);
+ try renderExpression(allocator, ais, tree, align_info.node, Space.None);
if (align_info.bit_range) |bit_range| {
const colon1 = tree.prevToken(bit_range.start.firstToken());
const colon2 = tree.prevToken(bit_range.end.firstToken());
- try renderToken(tree, stream, colon1, Space.None); // :
- try renderExpression(allocator, stream, tree, bit_range.start, Space.None);
- try renderToken(tree, stream, colon2, Space.None); // :
- try renderExpression(allocator, stream, tree, bit_range.end, Space.None);
+ try renderToken(tree, ais, colon1, Space.None); // :
+ try renderExpression(allocator, ais, tree, bit_range.start, Space.None);
+ try renderToken(tree, ais, colon2, Space.None); // :
+ try renderExpression(allocator, ais, tree, bit_range.end, Space.None);
const rparen_token = tree.nextToken(bit_range.end.lastToken());
- try renderToken(tree, stream, rparen_token, Space.Space); // )
+ try renderToken(tree, ais, rparen_token, Space.Space); // )
} else {
const rparen_token = tree.nextToken(align_info.node.lastToken());
- try renderToken(tree, stream, rparen_token, Space.Space); // )
+ try renderToken(tree, ais, rparen_token, Space.Space); // )
}
}
if (ptr_type.ptr_info.const_token) |const_token| {
- try renderToken(tree, stream, const_token, Space.Space); // const
+ try renderToken(tree, ais, const_token, Space.Space); // const
}
if (ptr_type.ptr_info.volatile_token) |volatile_token| {
- try renderToken(tree, stream, volatile_token, Space.Space); // volatile
+ try renderToken(tree, ais, volatile_token, Space.Space); // volatile
}
- return renderExpression(allocator, stream, tree, ptr_type.rhs, space);
+ return renderExpression(allocator, ais, tree, ptr_type.rhs, space);
},
.SliceType => {
const slice_type = @fieldParentPtr(ast.Node.SliceType, "base", base);
- try renderToken(tree, stream, slice_type.op_token, Space.None); // [
+ try renderToken(tree, ais, slice_type.op_token, Space.None); // [
if (slice_type.ptr_info.sentinel) |sentinel| {
const colon_token = tree.prevToken(sentinel.firstToken());
- try renderToken(tree, stream, colon_token, Space.None); // :
- try renderExpression(allocator, stream, tree, sentinel, Space.None);
- try renderToken(tree, stream, tree.nextToken(sentinel.lastToken()), Space.None); // ]
+ try renderToken(tree, ais, colon_token, Space.None); // :
+ try renderExpression(allocator, ais, tree, sentinel, Space.None);
+ try renderToken(tree, ais, tree.nextToken(sentinel.lastToken()), Space.None); // ]
} else {
- try renderToken(tree, stream, tree.nextToken(slice_type.op_token), Space.None); // ]
+ try renderToken(tree, ais, tree.nextToken(slice_type.op_token), Space.None); // ]
}
if (slice_type.ptr_info.allowzero_token) |allowzero_token| {
- try renderToken(tree, stream, allowzero_token, Space.Space); // allowzero
+ try renderToken(tree, ais, allowzero_token, Space.Space); // allowzero
}
if (slice_type.ptr_info.align_info) |align_info| {
const lparen_token = tree.prevToken(align_info.node.firstToken());
const align_token = tree.prevToken(lparen_token);
- try renderToken(tree, stream, align_token, Space.None); // align
- try renderToken(tree, stream, lparen_token, Space.None); // (
+ try renderToken(tree, ais, align_token, Space.None); // align
+ try renderToken(tree, ais, lparen_token, Space.None); // (
- try renderExpression(allocator, stream, tree, align_info.node, Space.None);
+ try renderExpression(allocator, ais, tree, align_info.node, Space.None);
if (align_info.bit_range) |bit_range| {
const colon1 = tree.prevToken(bit_range.start.firstToken());
const colon2 = tree.prevToken(bit_range.end.firstToken());
- try renderToken(tree, stream, colon1, Space.None); // :
- try renderExpression(allocator, stream, tree, bit_range.start, Space.None);
- try renderToken(tree, stream, colon2, Space.None); // :
- try renderExpression(allocator, stream, tree, bit_range.end, Space.None);
+ try renderToken(tree, ais, colon1, Space.None); // :
+ try renderExpression(allocator, ais, tree, bit_range.start, Space.None);
+ try renderToken(tree, ais, colon2, Space.None); // :
+ try renderExpression(allocator, ais, tree, bit_range.end, Space.None);
const rparen_token = tree.nextToken(bit_range.end.lastToken());
- try renderToken(tree, stream, rparen_token, Space.Space); // )
+ try renderToken(tree, ais, rparen_token, Space.Space); // )
} else {
const rparen_token = tree.nextToken(align_info.node.lastToken());
- try renderToken(tree, stream, rparen_token, Space.Space); // )
+ try renderToken(tree, ais, rparen_token, Space.Space); // )
}
}
if (slice_type.ptr_info.const_token) |const_token| {
- try renderToken(tree, stream, const_token, Space.Space);
+ try renderToken(tree, ais, const_token, Space.Space);
}
if (slice_type.ptr_info.volatile_token) |volatile_token| {
- try renderToken(tree, stream, volatile_token, Space.Space);
+ try renderToken(tree, ais, volatile_token, Space.Space);
}
- return renderExpression(allocator, stream, tree, slice_type.rhs, space);
+ return renderExpression(allocator, ais, tree, slice_type.rhs, space);
},
.ArrayInitializer, .ArrayInitializerDot => {
@@ -713,33 +712,33 @@ fn renderExpression(
if (exprs.len == 0) {
switch (lhs) {
- .dot => |dot| try renderToken(tree, stream, dot, Space.None),
- .node => |node| try renderExpression(allocator, stream, tree, node, Space.None),
+ .dot => |dot| try renderToken(tree, ais, dot, Space.None),
+ .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
}
{
- stream.pushIndent();
- defer stream.popIndent();
- try renderToken(tree, stream, lbrace, Space.None);
+ ais.pushIndent();
+ defer ais.popIndent();
+ try renderToken(tree, ais, lbrace, Space.None);
}
- return renderToken(tree, stream, rtoken, space);
+ return renderToken(tree, ais, rtoken, space);
}
if (exprs.len == 1 and tree.token_ids[exprs[0].*.lastToken() + 1] == .RBrace) {
const expr = exprs[0];
switch (lhs) {
- .dot => |dot| try renderToken(tree, stream, dot, Space.None),
- .node => |node| try renderExpression(allocator, stream, tree, node, Space.None),
+ .dot => |dot| try renderToken(tree, ais, dot, Space.None),
+ .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
}
- try renderToken(tree, stream, lbrace, Space.None);
- try renderExpression(allocator, stream, tree, expr, Space.None);
- return renderToken(tree, stream, rtoken, space);
+ try renderToken(tree, ais, lbrace, Space.None);
+ try renderExpression(allocator, ais, tree, expr, Space.None);
+ return renderToken(tree, ais, rtoken, space);
}
switch (lhs) {
- .dot => |dot| try renderToken(tree, stream, dot, Space.None),
- .node => |node| try renderExpression(allocator, stream, tree, node, Space.None),
+ .dot => |dot| try renderToken(tree, ais, dot, Space.None),
+ .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
}
// scan to find row size
@@ -781,9 +780,9 @@ fn renderExpression(
var expr_widths = widths[0 .. widths.len - row_size];
var column_widths = widths[widths.len - row_size ..];
- // Null stream for counting the printed length of each expression
+ // Null ais for counting the printed length of each expression
var counting_stream = std.io.countingOutStream(std.io.null_out_stream);
- var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &counting_stream);
+ var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, counting_stream.writer());
for (exprs) |expr, i| {
counting_stream.bytes_written = 0;
@@ -795,23 +794,23 @@ fn renderExpression(
}
{
- stream.pushIndentNextLine();
- defer stream.popIndent();
- try renderToken(tree, stream, lbrace, Space.Newline);
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
+ try renderToken(tree, ais, lbrace, Space.Newline);
var col: usize = 1;
for (exprs) |expr, i| {
if (i + 1 < exprs.len) {
const next_expr = exprs[i + 1];
- try renderExpression(allocator, stream, tree, expr, Space.None);
+ try renderExpression(allocator, ais, tree, expr, Space.None);
const comma = tree.nextToken(expr.*.lastToken());
if (col != row_size) {
- try renderToken(tree, stream, comma, Space.Space); // ,
+ try renderToken(tree, ais, comma, Space.Space); // ,
const padding = column_widths[i % row_size] - expr_widths[i];
- try stream.writer().writeByteNTimes(' ', padding);
+ try ais.writer().writeByteNTimes(' ', padding);
col += 1;
continue;
@@ -819,32 +818,32 @@ fn renderExpression(
col = 1;
if (tree.token_ids[tree.nextToken(comma)] != .MultilineStringLiteralLine) {
- try renderToken(tree, stream, comma, Space.Newline); // ,
+ try renderToken(tree, ais, comma, Space.Newline); // ,
} else {
- try renderToken(tree, stream, comma, Space.None); // ,
+ try renderToken(tree, ais, comma, Space.None); // ,
}
- try renderExtraNewline(tree, stream, next_expr);
+ try renderExtraNewline(tree, ais, next_expr);
} else {
- try renderExpression(allocator, stream, tree, expr, Space.Comma); // ,
+ try renderExpression(allocator, ais, tree, expr, Space.Comma); // ,
}
}
}
- return renderToken(tree, stream, rtoken, space);
+ return renderToken(tree, ais, rtoken, space);
} else {
- try renderToken(tree, stream, lbrace, Space.Space);
+ try renderToken(tree, ais, lbrace, Space.Space);
for (exprs) |expr, i| {
if (i + 1 < exprs.len) {
const next_expr = exprs[i + 1];
- try renderExpression(allocator, stream, tree, expr, Space.None);
+ try renderExpression(allocator, ais, tree, expr, Space.None);
const comma = tree.nextToken(expr.*.lastToken());
- try renderToken(tree, stream, comma, Space.Space); // ,
+ try renderToken(tree, ais, comma, Space.Space); // ,
} else {
- try renderExpression(allocator, stream, tree, expr, Space.Space);
+ try renderExpression(allocator, ais, tree, expr, Space.Space);
}
}
- return renderToken(tree, stream, rtoken, space);
+ return renderToken(tree, ais, rtoken, space);
}
},
@@ -874,17 +873,17 @@ fn renderExpression(
if (field_inits.len == 0) {
switch (lhs) {
- .dot => |dot| try renderToken(tree, stream, dot, Space.None),
- .node => |node| try renderExpression(allocator, stream, tree, node, Space.None),
+ .dot => |dot| try renderToken(tree, ais, dot, Space.None),
+ .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
}
{
- stream.pushIndentNextLine();
- defer stream.popIndent();
- try renderToken(tree, stream, lbrace, Space.None);
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
+ try renderToken(tree, ais, lbrace, Space.None);
}
- return renderToken(tree, stream, rtoken, space);
+ return renderToken(tree, ais, rtoken, space);
}
const src_has_trailing_comma = blk: {
@@ -900,8 +899,8 @@ fn renderExpression(
const expr_outputs_one_line = blk: {
// render field expressions until a LF is found
for (field_inits) |field_init| {
- var find_stream = std.io.findByteOutStream('\n', &std.io.null_out_stream);
- var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, &find_stream);
+ var find_stream = std.io.findByteOutStream('\n', std.io.null_out_stream);
+ var auto_indenting_stream = std.io.autoIndentingStream(indent_delta, find_stream.writer());
try renderExpression(allocator, &auto_indenting_stream, tree, field_init, Space.None);
if (find_stream.byte_found) break :blk false;
@@ -925,78 +924,78 @@ fn renderExpression(
}
switch (lhs) {
- .dot => |dot| try renderToken(tree, stream, dot, Space.None),
- .node => |node| try renderExpression(allocator, stream, tree, node, Space.None),
+ .dot => |dot| try renderToken(tree, ais, dot, Space.None),
+ .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
}
- try renderToken(tree, stream, lbrace, Space.Space);
- try renderExpression(allocator, stream, tree, &field_init.base, Space.Space);
- return renderToken(tree, stream, rtoken, space);
+ try renderToken(tree, ais, lbrace, Space.Space);
+ try renderExpression(allocator, ais, tree, &field_init.base, Space.Space);
+ return renderToken(tree, ais, rtoken, space);
}
if (!src_has_trailing_comma and src_same_line and expr_outputs_one_line) {
// render all on one line, no trailing comma
switch (lhs) {
- .dot => |dot| try renderToken(tree, stream, dot, Space.None),
- .node => |node| try renderExpression(allocator, stream, tree, node, Space.None),
+ .dot => |dot| try renderToken(tree, ais, dot, Space.None),
+ .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
}
- try renderToken(tree, stream, lbrace, Space.Space);
+ try renderToken(tree, ais, lbrace, Space.Space);
for (field_inits) |field_init, i| {
if (i + 1 < field_inits.len) {
- try renderExpression(allocator, stream, tree, field_init, Space.None);
+ try renderExpression(allocator, ais, tree, field_init, Space.None);
const comma = tree.nextToken(field_init.lastToken());
- try renderToken(tree, stream, comma, Space.Space);
+ try renderToken(tree, ais, comma, Space.Space);
} else {
- try renderExpression(allocator, stream, tree, field_init, Space.Space);
+ try renderExpression(allocator, ais, tree, field_init, Space.Space);
}
}
- return renderToken(tree, stream, rtoken, space);
+ return renderToken(tree, ais, rtoken, space);
}
{
switch (lhs) {
- .dot => |dot| try renderToken(tree, stream, dot, Space.None),
- .node => |node| try renderExpression(allocator, stream, tree, node, Space.None),
+ .dot => |dot| try renderToken(tree, ais, dot, Space.None),
+ .node => |node| try renderExpression(allocator, ais, tree, node, Space.None),
}
- stream.pushIndentNextLine();
- defer stream.popIndent();
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
- try renderToken(tree, stream, lbrace, Space.Newline);
+ try renderToken(tree, ais, lbrace, Space.Newline);
for (field_inits) |field_init, i| {
if (i + 1 < field_inits.len) {
const next_field_init = field_inits[i + 1];
- try renderExpression(allocator, stream, tree, field_init, Space.None);
+ try renderExpression(allocator, ais, tree, field_init, Space.None);
const comma = tree.nextToken(field_init.lastToken());
- try renderToken(tree, stream, comma, Space.Newline);
+ try renderToken(tree, ais, comma, Space.Newline);
- try renderExtraNewline(tree, stream, next_field_init);
+ try renderExtraNewline(tree, ais, next_field_init);
} else {
- try renderExpression(allocator, stream, tree, field_init, Space.Comma);
+ try renderExpression(allocator, ais, tree, field_init, Space.Comma);
}
}
}
- return renderToken(tree, stream, rtoken, space);
+ return renderToken(tree, ais, rtoken, space);
},
.Call => {
const call = @fieldParentPtr(ast.Node.Call, "base", base);
if (call.async_token) |async_token| {
- try renderToken(tree, stream, async_token, Space.Space);
+ try renderToken(tree, ais, async_token, Space.Space);
}
- try renderExpression(allocator, stream, tree, call.lhs, Space.None);
+ try renderExpression(allocator, ais, tree, call.lhs, Space.None);
const lparen = tree.nextToken(call.lhs.lastToken());
if (call.params_len == 0) {
- try renderToken(tree, stream, lparen, Space.None);
- return renderToken(tree, stream, call.rtoken, space);
+ try renderToken(tree, ais, lparen, Space.None);
+ return renderToken(tree, ais, call.rtoken, space);
}
const src_has_trailing_comma = blk: {
@@ -1005,41 +1004,41 @@ fn renderExpression(
};
if (src_has_trailing_comma) {
- try renderToken(tree, stream, lparen, Space.Newline);
+ try renderToken(tree, ais, lparen, Space.Newline);
const params = call.params();
for (params) |param_node, i| {
- stream.pushIndent();
- defer stream.popIndent();
+ ais.pushIndent();
+ defer ais.popIndent();
if (i + 1 < params.len) {
const next_node = params[i + 1];
- try renderExpression(allocator, stream, tree, param_node, Space.None);
+ try renderExpression(allocator, ais, tree, param_node, Space.None);
const comma = tree.nextToken(param_node.lastToken());
- try renderToken(tree, stream, comma, Space.Newline); // ,
- try renderExtraNewline(tree, stream, next_node);
+ try renderToken(tree, ais, comma, Space.Newline); // ,
+ try renderExtraNewline(tree, ais, next_node);
} else {
- try renderExpression(allocator, stream, tree, param_node, Space.Comma);
+ try renderExpression(allocator, ais, tree, param_node, Space.Comma);
}
}
- return renderToken(tree, stream, call.rtoken, space);
+ return renderToken(tree, ais, call.rtoken, space);
}
- try renderToken(tree, stream, lparen, Space.None); // (
+ try renderToken(tree, ais, lparen, Space.None); // (
const params = call.params();
for (params) |param_node, i| {
- if (param_node.*.tag == .MultilineStringLiteral) stream.pushIndentOneShot();
+ if (param_node.*.tag == .MultilineStringLiteral) ais.pushIndentOneShot();
- try renderExpression(allocator, stream, tree, param_node, Space.None);
+ try renderExpression(allocator, ais, tree, param_node, Space.None);
if (i + 1 < params.len) {
const next_param = params[i + 1];
const comma = tree.nextToken(param_node.lastToken());
- try renderToken(tree, stream, comma, Space.Space);
+ try renderToken(tree, ais, comma, Space.Space);
}
}
- return renderToken(tree, stream, call.rtoken, space);
+ return renderToken(tree, ais, call.rtoken, space);
},
.ArrayAccess => {
@@ -1048,25 +1047,25 @@ fn renderExpression(
const lbracket = tree.nextToken(suffix_op.lhs.lastToken());
const rbracket = tree.nextToken(suffix_op.index_expr.lastToken());
- try renderExpression(allocator, stream, tree, suffix_op.lhs, Space.None);
- try renderToken(tree, stream, lbracket, Space.None); // [
+ try renderExpression(allocator, ais, tree, suffix_op.lhs, Space.None);
+ try renderToken(tree, ais, lbracket, Space.None); // [
const starts_with_comment = tree.token_ids[lbracket + 1] == .LineComment;
const ends_with_comment = tree.token_ids[rbracket - 1] == .LineComment;
{
const new_space = if (ends_with_comment) Space.Newline else Space.None;
- stream.pushIndent();
- defer stream.popIndent();
- try renderExpression(allocator, stream, tree, suffix_op.index_expr, new_space);
+ ais.pushIndent();
+ defer ais.popIndent();
+ try renderExpression(allocator, ais, tree, suffix_op.index_expr, new_space);
}
- if (starts_with_comment) try stream.maybeInsertNewline();
- return renderToken(tree, stream, rbracket, space); // ]
+ if (starts_with_comment) try ais.maybeInsertNewline();
+ return renderToken(tree, ais, rbracket, space); // ]
},
.Slice => {
const suffix_op = base.castTag(.Slice).?;
- try renderExpression(allocator, stream, tree, suffix_op.lhs, Space.None);
+ try renderExpression(allocator, ais, tree, suffix_op.lhs, Space.None);
const lbracket = tree.prevToken(suffix_op.start.firstToken());
const dotdot = tree.nextToken(suffix_op.start.lastToken());
@@ -1076,33 +1075,33 @@ fn renderExpression(
const after_start_space = if (after_start_space_bool) Space.Space else Space.None;
const after_op_space = if (suffix_op.end != null) after_start_space else Space.None;
- try renderToken(tree, stream, lbracket, Space.None); // [
- try renderExpression(allocator, stream, tree, suffix_op.start, after_start_space);
- try renderToken(tree, stream, dotdot, after_op_space); // ..
+ try renderToken(tree, ais, lbracket, Space.None); // [
+ try renderExpression(allocator, ais, tree, suffix_op.start, after_start_space);
+ try renderToken(tree, ais, dotdot, after_op_space); // ..
if (suffix_op.end) |end| {
const after_end_space = if (suffix_op.sentinel != null) Space.Space else Space.None;
- try renderExpression(allocator, stream, tree, end, after_end_space);
+ try renderExpression(allocator, ais, tree, end, after_end_space);
}
if (suffix_op.sentinel) |sentinel| {
const colon = tree.prevToken(sentinel.firstToken());
- try renderToken(tree, stream, colon, Space.None); // :
- try renderExpression(allocator, stream, tree, sentinel, Space.None);
+ try renderToken(tree, ais, colon, Space.None); // :
+ try renderExpression(allocator, ais, tree, sentinel, Space.None);
}
- return renderToken(tree, stream, suffix_op.rtoken, space); // ]
+ return renderToken(tree, ais, suffix_op.rtoken, space); // ]
},
.Deref => {
const suffix_op = base.castTag(.Deref).?;
- try renderExpression(allocator, stream, tree, suffix_op.lhs, Space.None);
- return renderToken(tree, stream, suffix_op.rtoken, space); // .*
+ try renderExpression(allocator, ais, tree, suffix_op.lhs, Space.None);
+ return renderToken(tree, ais, suffix_op.rtoken, space); // .*
},
.UnwrapOptional => {
const suffix_op = base.castTag(.UnwrapOptional).?;
- try renderExpression(allocator, stream, tree, suffix_op.lhs, Space.None);
- try renderToken(tree, stream, tree.prevToken(suffix_op.rtoken), Space.None); // .
- return renderToken(tree, stream, suffix_op.rtoken, space); // ?
+ try renderExpression(allocator, ais, tree, suffix_op.lhs, Space.None);
+ try renderToken(tree, ais, tree.prevToken(suffix_op.rtoken), Space.None); // .
+ return renderToken(tree, ais, suffix_op.rtoken, space); // ?
},
.Break => {
@@ -1111,152 +1110,152 @@ fn renderExpression(
const maybe_label = flow_expr.getLabel();
if (maybe_label == null and maybe_rhs == null) {
- return renderToken(tree, stream, flow_expr.ltoken, space); // break
+ return renderToken(tree, ais, flow_expr.ltoken, space); // break
}
- try renderToken(tree, stream, flow_expr.ltoken, Space.Space); // break
+ try renderToken(tree, ais, flow_expr.ltoken, Space.Space); // break
if (maybe_label) |label| {
const colon = tree.nextToken(flow_expr.ltoken);
- try renderToken(tree, stream, colon, Space.None); // :
+ try renderToken(tree, ais, colon, Space.None); // :
if (maybe_rhs == null) {
- return renderToken(tree, stream, label, space); // label
+ return renderToken(tree, ais, label, space); // label
}
- try renderToken(tree, stream, label, Space.Space); // label
+ try renderToken(tree, ais, label, Space.Space); // label
}
- return renderExpression(allocator, stream, tree, maybe_rhs.?, space);
+ return renderExpression(allocator, ais, tree, maybe_rhs.?, space);
},
.Continue => {
const flow_expr = base.castTag(.Continue).?;
if (flow_expr.getLabel()) |label| {
- try renderToken(tree, stream, flow_expr.ltoken, Space.Space); // continue
+ try renderToken(tree, ais, flow_expr.ltoken, Space.Space); // continue
const colon = tree.nextToken(flow_expr.ltoken);
- try renderToken(tree, stream, colon, Space.None); // :
- return renderToken(tree, stream, label, space); // label
+ try renderToken(tree, ais, colon, Space.None); // :
+ return renderToken(tree, ais, label, space); // label
} else {
- return renderToken(tree, stream, flow_expr.ltoken, space); // continue
+ return renderToken(tree, ais, flow_expr.ltoken, space); // continue
}
},
.Return => {
const flow_expr = base.castTag(.Return).?;
if (flow_expr.getRHS()) |rhs| {
- try renderToken(tree, stream, flow_expr.ltoken, Space.Space);
- return renderExpression(allocator, stream, tree, rhs, space);
+ try renderToken(tree, ais, flow_expr.ltoken, Space.Space);
+ return renderExpression(allocator, ais, tree, rhs, space);
} else {
- return renderToken(tree, stream, flow_expr.ltoken, space);
+ return renderToken(tree, ais, flow_expr.ltoken, space);
}
},
.Payload => {
const payload = @fieldParentPtr(ast.Node.Payload, "base", base);
- try renderToken(tree, stream, payload.lpipe, Space.None);
- try renderExpression(allocator, stream, tree, payload.error_symbol, Space.None);
- return renderToken(tree, stream, payload.rpipe, space);
+ try renderToken(tree, ais, payload.lpipe, Space.None);
+ try renderExpression(allocator, ais, tree, payload.error_symbol, Space.None);
+ return renderToken(tree, ais, payload.rpipe, space);
},
.PointerPayload => {
const payload = @fieldParentPtr(ast.Node.PointerPayload, "base", base);
- try renderToken(tree, stream, payload.lpipe, Space.None);
+ try renderToken(tree, ais, payload.lpipe, Space.None);
if (payload.ptr_token) |ptr_token| {
- try renderToken(tree, stream, ptr_token, Space.None);
+ try renderToken(tree, ais, ptr_token, Space.None);
}
- try renderExpression(allocator, stream, tree, payload.value_symbol, Space.None);
- return renderToken(tree, stream, payload.rpipe, space);
+ try renderExpression(allocator, ais, tree, payload.value_symbol, Space.None);
+ return renderToken(tree, ais, payload.rpipe, space);
},
.PointerIndexPayload => {
const payload = @fieldParentPtr(ast.Node.PointerIndexPayload, "base", base);
- try renderToken(tree, stream, payload.lpipe, Space.None);
+ try renderToken(tree, ais, payload.lpipe, Space.None);
if (payload.ptr_token) |ptr_token| {
- try renderToken(tree, stream, ptr_token, Space.None);
+ try renderToken(tree, ais, ptr_token, Space.None);
}
- try renderExpression(allocator, stream, tree, payload.value_symbol, Space.None);
+ try renderExpression(allocator, ais, tree, payload.value_symbol, Space.None);
if (payload.index_symbol) |index_symbol| {
const comma = tree.nextToken(payload.value_symbol.lastToken());
- try renderToken(tree, stream, comma, Space.Space);
- try renderExpression(allocator, stream, tree, index_symbol, Space.None);
+ try renderToken(tree, ais, comma, Space.Space);
+ try renderExpression(allocator, ais, tree, index_symbol, Space.None);
}
- return renderToken(tree, stream, payload.rpipe, space);
+ return renderToken(tree, ais, payload.rpipe, space);
},
.GroupedExpression => {
const grouped_expr = @fieldParentPtr(ast.Node.GroupedExpression, "base", base);
- try renderToken(tree, stream, grouped_expr.lparen, Space.None);
+ try renderToken(tree, ais, grouped_expr.lparen, Space.None);
{
- stream.pushIndentOneShot();
- try renderExpression(allocator, stream, tree, grouped_expr.expr, Space.None);
+ ais.pushIndentOneShot();
+ try renderExpression(allocator, ais, tree, grouped_expr.expr, Space.None);
}
- return renderToken(tree, stream, grouped_expr.rparen, space);
+ return renderToken(tree, ais, grouped_expr.rparen, space);
},
.FieldInitializer => {
const field_init = @fieldParentPtr(ast.Node.FieldInitializer, "base", base);
- try renderToken(tree, stream, field_init.period_token, Space.None); // .
- try renderToken(tree, stream, field_init.name_token, Space.Space); // name
- try renderToken(tree, stream, tree.nextToken(field_init.name_token), Space.Space); // =
- return renderExpression(allocator, stream, tree, field_init.expr, space);
+ try renderToken(tree, ais, field_init.period_token, Space.None); // .
+ try renderToken(tree, ais, field_init.name_token, Space.Space); // name
+ try renderToken(tree, ais, tree.nextToken(field_init.name_token), Space.Space); // =
+ return renderExpression(allocator, ais, tree, field_init.expr, space);
},
.ContainerDecl => {
const container_decl = @fieldParentPtr(ast.Node.ContainerDecl, "base", base);
if (container_decl.layout_token) |layout_token| {
- try renderToken(tree, stream, layout_token, Space.Space);
+ try renderToken(tree, ais, layout_token, Space.Space);
}
switch (container_decl.init_arg_expr) {
.None => {
- try renderToken(tree, stream, container_decl.kind_token, Space.Space); // union
+ try renderToken(tree, ais, container_decl.kind_token, Space.Space); // union
},
.Enum => |enum_tag_type| {
- try renderToken(tree, stream, container_decl.kind_token, Space.None); // union
+ try renderToken(tree, ais, container_decl.kind_token, Space.None); // union
const lparen = tree.nextToken(container_decl.kind_token);
const enum_token = tree.nextToken(lparen);
- try renderToken(tree, stream, lparen, Space.None); // (
- try renderToken(tree, stream, enum_token, Space.None); // enum
+ try renderToken(tree, ais, lparen, Space.None); // (
+ try renderToken(tree, ais, enum_token, Space.None); // enum
if (enum_tag_type) |expr| {
- try renderToken(tree, stream, tree.nextToken(enum_token), Space.None); // (
- try renderExpression(allocator, stream, tree, expr, Space.None);
+ try renderToken(tree, ais, tree.nextToken(enum_token), Space.None); // (
+ try renderExpression(allocator, ais, tree, expr, Space.None);
const rparen = tree.nextToken(expr.lastToken());
- try renderToken(tree, stream, rparen, Space.None); // )
- try renderToken(tree, stream, tree.nextToken(rparen), Space.Space); // )
+ try renderToken(tree, ais, rparen, Space.None); // )
+ try renderToken(tree, ais, tree.nextToken(rparen), Space.Space); // )
} else {
- try renderToken(tree, stream, tree.nextToken(enum_token), Space.Space); // )
+ try renderToken(tree, ais, tree.nextToken(enum_token), Space.Space); // )
}
},
.Type => |type_expr| {
- try renderToken(tree, stream, container_decl.kind_token, Space.None); // union
+ try renderToken(tree, ais, container_decl.kind_token, Space.None); // union
const lparen = tree.nextToken(container_decl.kind_token);
const rparen = tree.nextToken(type_expr.lastToken());
- try renderToken(tree, stream, lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, type_expr, Space.None);
- try renderToken(tree, stream, rparen, Space.Space); // )
+ try renderToken(tree, ais, lparen, Space.None); // (
+ try renderExpression(allocator, ais, tree, type_expr, Space.None);
+ try renderToken(tree, ais, rparen, Space.Space); // )
},
}
if (container_decl.fields_and_decls_len == 0) {
{
- stream.pushIndentNextLine();
- defer stream.popIndent();
- try renderToken(tree, stream, container_decl.lbrace_token, Space.None); // {
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
+ try renderToken(tree, ais, container_decl.lbrace_token, Space.None); // {
}
- return renderToken(tree, stream, container_decl.rbrace_token, space); // }
+ return renderToken(tree, ais, container_decl.rbrace_token, space); // }
}
const src_has_trailing_comma = blk: {
@@ -1287,39 +1286,39 @@ fn renderExpression(
if (src_has_trailing_comma or !src_has_only_fields) {
// One declaration per line
- stream.pushIndentNextLine();
- defer stream.popIndent();
- try renderToken(tree, stream, container_decl.lbrace_token, .Newline); // {
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
+ try renderToken(tree, ais, container_decl.lbrace_token, .Newline); // {
for (fields_and_decls) |decl, i| {
- try renderContainerDecl(allocator, stream, tree, decl, .Newline);
+ try renderContainerDecl(allocator, ais, tree, decl, .Newline);
if (i + 1 < fields_and_decls.len) {
- try renderExtraNewline(tree, stream, fields_and_decls[i + 1]);
+ try renderExtraNewline(tree, ais, fields_and_decls[i + 1]);
}
}
} else if (src_has_newline) {
// All the declarations on the same line, but place the items on
// their own line
- try renderToken(tree, stream, container_decl.lbrace_token, .Newline); // {
+ try renderToken(tree, ais, container_decl.lbrace_token, .Newline); // {
- stream.pushIndent();
- defer stream.popIndent();
+ ais.pushIndent();
+ defer ais.popIndent();
for (fields_and_decls) |decl, i| {
const space_after_decl: Space = if (i + 1 >= fields_and_decls.len) .Newline else .Space;
- try renderContainerDecl(allocator, stream, tree, decl, space_after_decl);
+ try renderContainerDecl(allocator, ais, tree, decl, space_after_decl);
}
} else {
// All the declarations on the same line
- try renderToken(tree, stream, container_decl.lbrace_token, .Space); // {
+ try renderToken(tree, ais, container_decl.lbrace_token, .Space); // {
for (fields_and_decls) |decl| {
- try renderContainerDecl(allocator, stream, tree, decl, .Space);
+ try renderContainerDecl(allocator, ais, tree, decl, .Space);
}
}
- return renderToken(tree, stream, container_decl.rbrace_token, space); // }
+ return renderToken(tree, ais, container_decl.rbrace_token, space); // }
},
.ErrorSetDecl => {
@@ -1328,9 +1327,9 @@ fn renderExpression(
const lbrace = tree.nextToken(err_set_decl.error_token);
if (err_set_decl.decls_len == 0) {
- try renderToken(tree, stream, err_set_decl.error_token, Space.None);
- try renderToken(tree, stream, lbrace, Space.None);
- return renderToken(tree, stream, err_set_decl.rbrace_token, space);
+ try renderToken(tree, ais, err_set_decl.error_token, Space.None);
+ try renderToken(tree, ais, lbrace, Space.None);
+ return renderToken(tree, ais, err_set_decl.rbrace_token, space);
}
if (err_set_decl.decls_len == 1) blk: {
@@ -1344,13 +1343,13 @@ fn renderExpression(
break :blk;
}
- try renderToken(tree, stream, err_set_decl.error_token, Space.None); // error
- try renderToken(tree, stream, lbrace, Space.None); // {
- try renderExpression(allocator, stream, tree, node, Space.None);
- return renderToken(tree, stream, err_set_decl.rbrace_token, space); // }
+ try renderToken(tree, ais, err_set_decl.error_token, Space.None); // error
+ try renderToken(tree, ais, lbrace, Space.None); // {
+ try renderExpression(allocator, ais, tree, node, Space.None);
+ return renderToken(tree, ais, err_set_decl.rbrace_token, space); // }
}
- try renderToken(tree, stream, err_set_decl.error_token, Space.None); // error
+ try renderToken(tree, ais, err_set_decl.error_token, Space.None); // error
const src_has_trailing_comma = blk: {
const maybe_comma = tree.prevToken(err_set_decl.rbrace_token);
@@ -1359,64 +1358,64 @@ fn renderExpression(
if (src_has_trailing_comma) {
{
- stream.pushIndent();
- defer stream.popIndent();
+ ais.pushIndent();
+ defer ais.popIndent();
- try renderToken(tree, stream, lbrace, Space.Newline); // {
+ try renderToken(tree, ais, lbrace, Space.Newline); // {
const decls = err_set_decl.decls();
for (decls) |node, i| {
if (i + 1 < decls.len) {
- try renderExpression(allocator, stream, tree, node, Space.None);
- try renderToken(tree, stream, tree.nextToken(node.lastToken()), Space.Newline); // ,
+ try renderExpression(allocator, ais, tree, node, Space.None);
+ try renderToken(tree, ais, tree.nextToken(node.lastToken()), Space.Newline); // ,
- try renderExtraNewline(tree, stream, decls[i + 1]);
+ try renderExtraNewline(tree, ais, decls[i + 1]);
} else {
- try renderExpression(allocator, stream, tree, node, Space.Comma);
+ try renderExpression(allocator, ais, tree, node, Space.Comma);
}
}
}
- return renderToken(tree, stream, err_set_decl.rbrace_token, space); // }
+ return renderToken(tree, ais, err_set_decl.rbrace_token, space); // }
} else {
- try renderToken(tree, stream, lbrace, Space.Space); // {
+ try renderToken(tree, ais, lbrace, Space.Space); // {
const decls = err_set_decl.decls();
for (decls) |node, i| {
if (i + 1 < decls.len) {
- try renderExpression(allocator, stream, tree, node, Space.None);
+ try renderExpression(allocator, ais, tree, node, Space.None);
const comma_token = tree.nextToken(node.lastToken());
assert(tree.token_ids[comma_token] == .Comma);
- try renderToken(tree, stream, comma_token, Space.Space); // ,
- try renderExtraNewline(tree, stream, decls[i + 1]);
+ try renderToken(tree, ais, comma_token, Space.Space); // ,
+ try renderExtraNewline(tree, ais, decls[i + 1]);
} else {
- try renderExpression(allocator, stream, tree, node, Space.Space);
+ try renderExpression(allocator, ais, tree, node, Space.Space);
}
}
- return renderToken(tree, stream, err_set_decl.rbrace_token, space); // }
+ return renderToken(tree, ais, err_set_decl.rbrace_token, space); // }
}
},
.ErrorTag => {
const tag = @fieldParentPtr(ast.Node.ErrorTag, "base", base);
- try renderDocComments(tree, stream, tag, tag.doc_comments);
- return renderToken(tree, stream, tag.name_token, space); // name
+ try renderDocComments(tree, ais, tag, tag.doc_comments);
+ return renderToken(tree, ais, tag.name_token, space); // name
},
.MultilineStringLiteral => {
const multiline_str_literal = @fieldParentPtr(ast.Node.MultilineStringLiteral, "base", base);
{
- const locked_indents = stream.lockOneShotIndent();
+ const locked_indents = ais.lockOneShotIndent();
defer {
var i: u8 = 0;
- while (i < locked_indents) : (i += 1) stream.popIndent();
+ while (i < locked_indents) : (i += 1) ais.popIndent();
}
- try stream.maybeInsertNewline();
+ try ais.maybeInsertNewline();
- for (multiline_str_literal.lines()) |t| try renderToken(tree, stream, t, Space.None);
+ for (multiline_str_literal.lines()) |t| try renderToken(tree, ais, t, Space.None);
}
},
@@ -1425,9 +1424,9 @@ fn renderExpression(
// TODO remove after 0.7.0 release
if (mem.eql(u8, tree.tokenSlice(builtin_call.builtin_token), "@OpaqueType"))
- return stream.writer().writeAll("@Type(.Opaque)");
+ return ais.writer().writeAll("@Type(.Opaque)");
- try renderToken(tree, stream, builtin_call.builtin_token, Space.None); // @name
+ try renderToken(tree, ais, builtin_call.builtin_token, Space.None); // @name
const src_params_trailing_comma = blk: {
if (builtin_call.params_len < 2) break :blk false;
@@ -1439,30 +1438,30 @@ fn renderExpression(
const lparen = tree.nextToken(builtin_call.builtin_token);
if (!src_params_trailing_comma) {
- try renderToken(tree, stream, lparen, Space.None); // (
+ try renderToken(tree, ais, lparen, Space.None); // (
// render all on one line, no trailing comma
const params = builtin_call.params();
for (params) |param_node, i| {
- try renderExpression(allocator, stream, tree, param_node, Space.None);
+ try renderExpression(allocator, ais, tree, param_node, Space.None);
if (i + 1 < params.len) {
const comma_token = tree.nextToken(param_node.lastToken());
- try renderToken(tree, stream, comma_token, Space.Space); // ,
+ try renderToken(tree, ais, comma_token, Space.Space); // ,
}
}
} else {
// one param per line
- stream.pushIndent();
- defer stream.popIndent();
- try renderToken(tree, stream, lparen, Space.Newline); // (
+ ais.pushIndent();
+ defer ais.popIndent();
+ try renderToken(tree, ais, lparen, Space.Newline); // (
for (builtin_call.params()) |param_node| {
- try renderExpression(allocator, stream, tree, param_node, Space.Comma);
+ try renderExpression(allocator, ais, tree, param_node, Space.Comma);
}
}
- return renderToken(tree, stream, builtin_call.rparen_token, space); // )
+ return renderToken(tree, ais, builtin_call.rparen_token, space); // )
},
.FnProto => {
@@ -1472,24 +1471,24 @@ fn renderExpression(
const visib_token = tree.token_ids[visib_token_index];
assert(visib_token == .Keyword_pub or visib_token == .Keyword_export);
- try renderToken(tree, stream, visib_token_index, Space.Space); // pub
+ try renderToken(tree, ais, visib_token_index, Space.Space); // pub
}
if (fn_proto.getExternExportInlineToken()) |extern_export_inline_token| {
if (fn_proto.getIsExternPrototype() == null)
- try renderToken(tree, stream, extern_export_inline_token, Space.Space); // extern/export/inline
+ try renderToken(tree, ais, extern_export_inline_token, Space.Space); // extern/export/inline
}
if (fn_proto.getLibName()) |lib_name| {
- try renderExpression(allocator, stream, tree, lib_name, Space.Space);
+ try renderExpression(allocator, ais, tree, lib_name, Space.Space);
}
const lparen = if (fn_proto.getNameToken()) |name_token| blk: {
- try renderToken(tree, stream, fn_proto.fn_token, Space.Space); // fn
- try renderToken(tree, stream, name_token, Space.None); // name
+ try renderToken(tree, ais, fn_proto.fn_token, Space.Space); // fn
+ try renderToken(tree, ais, name_token, Space.None); // name
break :blk tree.nextToken(name_token);
} else blk: {
- try renderToken(tree, stream, fn_proto.fn_token, Space.Space); // fn
+ try renderToken(tree, ais, fn_proto.fn_token, Space.Space); // fn
break :blk tree.nextToken(fn_proto.fn_token);
};
assert(tree.token_ids[lparen] == .LParen);
@@ -1516,45 +1515,45 @@ fn renderExpression(
};
if (!src_params_trailing_comma) {
- try renderToken(tree, stream, lparen, Space.None); // (
+ try renderToken(tree, ais, lparen, Space.None); // (
// render all on one line, no trailing comma
for (fn_proto.params()) |param_decl, i| {
- try renderParamDecl(allocator, stream, tree, param_decl, Space.None);
+ try renderParamDecl(allocator, ais, tree, param_decl, Space.None);
if (i + 1 < fn_proto.params_len or fn_proto.getVarArgsToken() != null) {
const comma = tree.nextToken(param_decl.lastToken());
- try renderToken(tree, stream, comma, Space.Space); // ,
+ try renderToken(tree, ais, comma, Space.Space); // ,
}
}
if (fn_proto.getVarArgsToken()) |var_args_token| {
- try renderToken(tree, stream, var_args_token, Space.None);
+ try renderToken(tree, ais, var_args_token, Space.None);
}
} else {
// one param per line
- stream.pushIndent();
- defer stream.popIndent();
- try renderToken(tree, stream, lparen, Space.Newline); // (
+ ais.pushIndent();
+ defer ais.popIndent();
+ try renderToken(tree, ais, lparen, Space.Newline); // (
for (fn_proto.params()) |param_decl| {
- try renderParamDecl(allocator, stream, tree, param_decl, Space.Comma);
+ try renderParamDecl(allocator, ais, tree, param_decl, Space.Comma);
}
if (fn_proto.getVarArgsToken()) |var_args_token| {
- try renderToken(tree, stream, var_args_token, Space.Comma);
+ try renderToken(tree, ais, var_args_token, Space.Comma);
}
}
- try renderToken(tree, stream, rparen, Space.Space); // )
+ try renderToken(tree, ais, rparen, Space.Space); // )
if (fn_proto.getAlignExpr()) |align_expr| {
const align_rparen = tree.nextToken(align_expr.lastToken());
const align_lparen = tree.prevToken(align_expr.firstToken());
const align_kw = tree.prevToken(align_lparen);
- try renderToken(tree, stream, align_kw, Space.None); // align
- try renderToken(tree, stream, align_lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, align_expr, Space.None);
- try renderToken(tree, stream, align_rparen, Space.Space); // )
+ try renderToken(tree, ais, align_kw, Space.None); // align
+ try renderToken(tree, ais, align_lparen, Space.None); // (
+ try renderExpression(allocator, ais, tree, align_expr, Space.None);
+ try renderToken(tree, ais, align_rparen, Space.Space); // )
}
if (fn_proto.getSectionExpr()) |section_expr| {
@@ -1562,10 +1561,10 @@ fn renderExpression(
const section_lparen = tree.prevToken(section_expr.firstToken());
const section_kw = tree.prevToken(section_lparen);
- try renderToken(tree, stream, section_kw, Space.None); // section
- try renderToken(tree, stream, section_lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, section_expr, Space.None);
- try renderToken(tree, stream, section_rparen, Space.Space); // )
+ try renderToken(tree, ais, section_kw, Space.None); // section
+ try renderToken(tree, ais, section_lparen, Space.None); // (
+ try renderExpression(allocator, ais, tree, section_expr, Space.None);
+ try renderToken(tree, ais, section_rparen, Space.Space); // )
}
if (fn_proto.getCallconvExpr()) |callconv_expr| {
@@ -1573,23 +1572,23 @@ fn renderExpression(
const callconv_lparen = tree.prevToken(callconv_expr.firstToken());
const callconv_kw = tree.prevToken(callconv_lparen);
- try renderToken(tree, stream, callconv_kw, Space.None); // callconv
- try renderToken(tree, stream, callconv_lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, callconv_expr, Space.None);
- try renderToken(tree, stream, callconv_rparen, Space.Space); // )
+ try renderToken(tree, ais, callconv_kw, Space.None); // callconv
+ try renderToken(tree, ais, callconv_lparen, Space.None); // (
+ try renderExpression(allocator, ais, tree, callconv_expr, Space.None);
+ try renderToken(tree, ais, callconv_rparen, Space.Space); // )
} else if (fn_proto.getIsExternPrototype() != null) {
- try stream.writer().writeAll("callconv(.C) ");
+ try ais.writer().writeAll("callconv(.C) ");
} else if (fn_proto.getIsAsync() != null) {
- try stream.writer().writeAll("callconv(.Async) ");
+ try ais.writer().writeAll("callconv(.Async) ");
}
switch (fn_proto.return_type) {
.Explicit => |node| {
- return renderExpression(allocator, stream, tree, node, space);
+ return renderExpression(allocator, ais, tree, node, space);
},
.InferErrorSet => |node| {
- try renderToken(tree, stream, tree.prevToken(node.firstToken()), Space.None); // !
- return renderExpression(allocator, stream, tree, node, space);
+ try renderToken(tree, ais, tree.prevToken(node.firstToken()), Space.None); // !
+ return renderExpression(allocator, ais, tree, node, space);
},
.Invalid => unreachable,
}
@@ -1599,11 +1598,11 @@ fn renderExpression(
const anyframe_type = @fieldParentPtr(ast.Node.AnyFrameType, "base", base);
if (anyframe_type.result) |result| {
- try renderToken(tree, stream, anyframe_type.anyframe_token, Space.None); // anyframe
- try renderToken(tree, stream, result.arrow_token, Space.None); // ->
- return renderExpression(allocator, stream, tree, result.return_type, space);
+ try renderToken(tree, ais, anyframe_type.anyframe_token, Space.None); // anyframe
+ try renderToken(tree, ais, result.arrow_token, Space.None); // ->
+ return renderExpression(allocator, ais, tree, result.return_type, space);
} else {
- return renderToken(tree, stream, anyframe_type.anyframe_token, space); // anyframe
+ return renderToken(tree, ais, anyframe_type.anyframe_token, space); // anyframe
}
},
@@ -1612,38 +1611,38 @@ fn renderExpression(
.Switch => {
const switch_node = @fieldParentPtr(ast.Node.Switch, "base", base);
- try renderToken(tree, stream, switch_node.switch_token, Space.Space); // switch
- try renderToken(tree, stream, tree.nextToken(switch_node.switch_token), Space.None); // (
+ try renderToken(tree, ais, switch_node.switch_token, Space.Space); // switch
+ try renderToken(tree, ais, tree.nextToken(switch_node.switch_token), Space.None); // (
const rparen = tree.nextToken(switch_node.expr.lastToken());
const lbrace = tree.nextToken(rparen);
if (switch_node.cases_len == 0) {
- try renderExpression(allocator, stream, tree, switch_node.expr, Space.None);
- try renderToken(tree, stream, rparen, Space.Space); // )
- try renderToken(tree, stream, lbrace, Space.None); // {
- return renderToken(tree, stream, switch_node.rbrace, space); // }
+ try renderExpression(allocator, ais, tree, switch_node.expr, Space.None);
+ try renderToken(tree, ais, rparen, Space.Space); // )
+ try renderToken(tree, ais, lbrace, Space.None); // {
+ return renderToken(tree, ais, switch_node.rbrace, space); // }
}
- try renderExpression(allocator, stream, tree, switch_node.expr, Space.None);
- try renderToken(tree, stream, rparen, Space.Space); // )
+ try renderExpression(allocator, ais, tree, switch_node.expr, Space.None);
+ try renderToken(tree, ais, rparen, Space.Space); // )
{
- stream.pushIndentNextLine();
- defer stream.popIndent();
- try renderToken(tree, stream, lbrace, Space.Newline); // {
+ ais.pushIndentNextLine();
+ defer ais.popIndent();
+ try renderToken(tree, ais, lbrace, Space.Newline); // {
const cases = switch_node.cases();
for (cases) |node, i| {
- try renderExpression(allocator, stream, tree, node, Space.Comma);
+ try renderExpression(allocator, ais, tree, node, Space.Comma);
if (i + 1 < cases.len) {
- try renderExtraNewline(tree, stream, cases[i + 1]);
+ try renderExtraNewline(tree, ais, cases[i + 1]);
}
}
}
- return renderToken(tree, stream, switch_node.rbrace, space); // }
+ return renderToken(tree, ais, switch_node.rbrace, space); // }
},
.SwitchCase => {
@@ -1660,41 +1659,41 @@ fn renderExpression(
const items = switch_case.items();
for (items) |node, i| {
if (i + 1 < items.len) {
- try renderExpression(allocator, stream, tree, node, Space.None);
+ try renderExpression(allocator, ais, tree, node, Space.None);
const comma_token = tree.nextToken(node.lastToken());
- try renderToken(tree, stream, comma_token, Space.Space); // ,
- try renderExtraNewline(tree, stream, items[i + 1]);
+ try renderToken(tree, ais, comma_token, Space.Space); // ,
+ try renderExtraNewline(tree, ais, items[i + 1]);
} else {
- try renderExpression(allocator, stream, tree, node, Space.Space);
+ try renderExpression(allocator, ais, tree, node, Space.Space);
}
}
} else {
const items = switch_case.items();
for (items) |node, i| {
if (i + 1 < items.len) {
- try renderExpression(allocator, stream, tree, node, Space.None);
+ try renderExpression(allocator, ais, tree, node, Space.None);
const comma_token = tree.nextToken(node.lastToken());
- try renderToken(tree, stream, comma_token, Space.Newline); // ,
- try renderExtraNewline(tree, stream, items[i + 1]);
+ try renderToken(tree, ais, comma_token, Space.Newline); // ,
+ try renderExtraNewline(tree, ais, items[i + 1]);
} else {
- try renderExpression(allocator, stream, tree, node, Space.Comma);
+ try renderExpression(allocator, ais, tree, node, Space.Comma);
}
}
}
- try renderToken(tree, stream, switch_case.arrow_token, Space.Space); // =>
+ try renderToken(tree, ais, switch_case.arrow_token, Space.Space); // =>
if (switch_case.payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Space);
+ try renderExpression(allocator, ais, tree, payload, Space.Space);
}
- return renderExpression(allocator, stream, tree, switch_case.expr, space);
+ return renderExpression(allocator, ais, tree, switch_case.expr, space);
},
.SwitchElse => {
const switch_else = @fieldParentPtr(ast.Node.SwitchElse, "base", base);
- return renderToken(tree, stream, switch_else.token, space);
+ return renderToken(tree, ais, switch_else.token, space);
},
.Else => {
const else_node = @fieldParentPtr(ast.Node.Else, "base", base);
@@ -1703,19 +1702,19 @@ fn renderExpression(
const same_line = body_is_block or tree.tokensOnSameLine(else_node.else_token, else_node.body.lastToken());
const after_else_space = if (same_line or else_node.payload != null) Space.Space else Space.Newline;
- try renderToken(tree, stream, else_node.else_token, after_else_space);
+ try renderToken(tree, ais, else_node.else_token, after_else_space);
if (else_node.payload) |payload| {
const payload_space = if (same_line) Space.Space else Space.Newline;
- try renderExpression(allocator, stream, tree, payload, payload_space);
+ try renderExpression(allocator, ais, tree, payload, payload_space);
}
if (same_line) {
- return renderExpression(allocator, stream, tree, else_node.body, space);
+ return renderExpression(allocator, ais, tree, else_node.body, space);
} else {
- stream.pushIndent();
- defer stream.popIndent();
- return renderExpression(allocator, stream, tree, else_node.body, space);
+ ais.pushIndent();
+ defer ais.popIndent();
+ return renderExpression(allocator, ais, tree, else_node.body, space);
}
},
@@ -1723,17 +1722,17 @@ fn renderExpression(
const while_node = @fieldParentPtr(ast.Node.While, "base", base);
if (while_node.label) |label| {
- try renderToken(tree, stream, label, Space.None); // label
- try renderToken(tree, stream, tree.nextToken(label), Space.Space); // :
+ try renderToken(tree, ais, label, Space.None); // label
+ try renderToken(tree, ais, tree.nextToken(label), Space.Space); // :
}
if (while_node.inline_token) |inline_token| {
- try renderToken(tree, stream, inline_token, Space.Space); // inline
+ try renderToken(tree, ais, inline_token, Space.Space); // inline
}
- try renderToken(tree, stream, while_node.while_token, Space.Space); // while
- try renderToken(tree, stream, tree.nextToken(while_node.while_token), Space.None); // (
- try renderExpression(allocator, stream, tree, while_node.condition, Space.None);
+ try renderToken(tree, ais, while_node.while_token, Space.Space); // while
+ try renderToken(tree, ais, tree.nextToken(while_node.while_token), Space.None); // (
+ try renderExpression(allocator, ais, tree, while_node.condition, Space.None);
const cond_rparen = tree.nextToken(while_node.condition.lastToken());
@@ -1755,12 +1754,12 @@ fn renderExpression(
{
const rparen_space = if (while_node.payload != null or while_node.continue_expr != null) Space.Space else block_start_space;
- try renderToken(tree, stream, cond_rparen, rparen_space); // )
+ try renderToken(tree, ais, cond_rparen, rparen_space); // )
}
if (while_node.payload) |payload| {
const payload_space = Space.Space; //if (while_node.continue_expr != null) Space.Space else block_start_space;
- try renderExpression(allocator, stream, tree, payload, payload_space);
+ try renderExpression(allocator, ais, tree, payload, payload_space);
}
if (while_node.continue_expr) |continue_expr| {
@@ -1768,22 +1767,22 @@ fn renderExpression(
const lparen = tree.prevToken(continue_expr.firstToken());
const colon = tree.prevToken(lparen);
- try renderToken(tree, stream, colon, Space.Space); // :
- try renderToken(tree, stream, lparen, Space.None); // (
+ try renderToken(tree, ais, colon, Space.Space); // :
+ try renderToken(tree, ais, lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, continue_expr, Space.None);
+ try renderExpression(allocator, ais, tree, continue_expr, Space.None);
- try renderToken(tree, stream, rparen, block_start_space); // )
+ try renderToken(tree, ais, rparen, block_start_space); // )
}
{
- if (!body_is_block) stream.pushIndent();
- defer if (!body_is_block) stream.popIndent();
- try renderExpression(allocator, stream, tree, while_node.body, after_body_space);
+ if (!body_is_block) ais.pushIndent();
+ defer if (!body_is_block) ais.popIndent();
+ try renderExpression(allocator, ais, tree, while_node.body, after_body_space);
}
if (while_node.@"else") |@"else"| {
- return renderExpression(allocator, stream, tree, &@"else".base, space);
+ return renderExpression(allocator, ais, tree, &@"else".base, space);
}
},
@@ -1791,17 +1790,17 @@ fn renderExpression(
const for_node = @fieldParentPtr(ast.Node.For, "base", base);
if (for_node.label) |label| {
- try renderToken(tree, stream, label, Space.None); // label
- try renderToken(tree, stream, tree.nextToken(label), Space.Space); // :
+ try renderToken(tree, ais, label, Space.None); // label
+ try renderToken(tree, ais, tree.nextToken(label), Space.Space); // :
}
if (for_node.inline_token) |inline_token| {
- try renderToken(tree, stream, inline_token, Space.Space); // inline
+ try renderToken(tree, ais, inline_token, Space.Space); // inline
}
- try renderToken(tree, stream, for_node.for_token, Space.Space); // for
- try renderToken(tree, stream, tree.nextToken(for_node.for_token), Space.None); // (
- try renderExpression(allocator, stream, tree, for_node.array_expr, Space.None);
+ try renderToken(tree, ais, for_node.for_token, Space.Space); // for
+ try renderToken(tree, ais, tree.nextToken(for_node.for_token), Space.None); // (
+ try renderExpression(allocator, ais, tree, for_node.array_expr, Space.None);
const rparen = tree.nextToken(for_node.array_expr.lastToken());
@@ -1809,10 +1808,10 @@ fn renderExpression(
const src_one_line_to_body = !body_is_block and tree.tokensOnSameLine(rparen, for_node.body.firstToken());
const body_on_same_line = body_is_block or src_one_line_to_body;
- try renderToken(tree, stream, rparen, Space.Space); // )
+ try renderToken(tree, ais, rparen, Space.Space); // )
const space_after_payload = if (body_on_same_line) Space.Space else Space.Newline;
- try renderExpression(allocator, stream, tree, for_node.payload, space_after_payload); // |x|
+ try renderExpression(allocator, ais, tree, for_node.payload, space_after_payload); // |x|
const space_after_body = blk: {
if (for_node.@"else") |@"else"| {
@@ -1828,13 +1827,13 @@ fn renderExpression(
};
{
- if (!body_on_same_line) stream.pushIndent();
- defer if (!body_on_same_line) stream.popIndent();
- try renderExpression(allocator, stream, tree, for_node.body, space_after_body); // { body }
+ if (!body_on_same_line) ais.pushIndent();
+ defer if (!body_on_same_line) ais.popIndent();
+ try renderExpression(allocator, ais, tree, for_node.body, space_after_body); // { body }
}
if (for_node.@"else") |@"else"| {
- return renderExpression(allocator, stream, tree, &@"else".base, space); // else
+ return renderExpression(allocator, ais, tree, &@"else".base, space); // else
}
},
@@ -1844,29 +1843,29 @@ fn renderExpression(
const lparen = tree.nextToken(if_node.if_token);
const rparen = tree.nextToken(if_node.condition.lastToken());
- try renderToken(tree, stream, if_node.if_token, Space.Space); // if
- try renderToken(tree, stream, lparen, Space.None); // (
+ try renderToken(tree, ais, if_node.if_token, Space.Space); // if
+ try renderToken(tree, ais, lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, if_node.condition, Space.None); // condition
+ try renderExpression(allocator, ais, tree, if_node.condition, Space.None); // condition
const body_is_if_block = if_node.body.tag == .If;
const body_is_block = nodeIsBlock(if_node.body);
if (body_is_if_block) {
- try renderExtraNewline(tree, stream, if_node.body);
+ try renderExtraNewline(tree, ais, if_node.body);
} else if (body_is_block) {
const after_rparen_space = if (if_node.payload == null) Space.BlockStart else Space.Space;
- try renderToken(tree, stream, rparen, after_rparen_space); // )
+ try renderToken(tree, ais, rparen, after_rparen_space); // )
if (if_node.payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.BlockStart); // |x|
+ try renderExpression(allocator, ais, tree, payload, Space.BlockStart); // |x|
}
if (if_node.@"else") |@"else"| {
- try renderExpression(allocator, stream, tree, if_node.body, Space.SpaceOrOutdent);
- return renderExpression(allocator, stream, tree, &@"else".base, space);
+ try renderExpression(allocator, ais, tree, if_node.body, Space.SpaceOrOutdent);
+ return renderExpression(allocator, ais, tree, &@"else".base, space);
} else {
- return renderExpression(allocator, stream, tree, if_node.body, space);
+ return renderExpression(allocator, ais, tree, if_node.body, space);
}
}
@@ -1874,121 +1873,121 @@ fn renderExpression(
if (src_has_newline) {
const after_rparen_space = if (if_node.payload == null) Space.Newline else Space.Space;
- try renderToken(tree, stream, rparen, after_rparen_space); // )
+ try renderToken(tree, ais, rparen, after_rparen_space); // )
if (if_node.payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Newline);
+ try renderExpression(allocator, ais, tree, payload, Space.Newline);
}
if (if_node.@"else") |@"else"| {
const else_is_block = nodeIsBlock(@"else".body);
{
- stream.pushIndent();
- defer stream.popIndent();
- try renderExpression(allocator, stream, tree, if_node.body, Space.Newline);
+ ais.pushIndent();
+ defer ais.popIndent();
+ try renderExpression(allocator, ais, tree, if_node.body, Space.Newline);
}
if (else_is_block) {
- try renderToken(tree, stream, @"else".else_token, Space.Space); // else
+ try renderToken(tree, ais, @"else".else_token, Space.Space); // else
if (@"else".payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Space);
+ try renderExpression(allocator, ais, tree, payload, Space.Space);
}
- return renderExpression(allocator, stream, tree, @"else".body, space);
+ return renderExpression(allocator, ais, tree, @"else".body, space);
} else {
const after_else_space = if (@"else".payload == null) Space.Newline else Space.Space;
- try renderToken(tree, stream, @"else".else_token, after_else_space); // else
+ try renderToken(tree, ais, @"else".else_token, after_else_space); // else
if (@"else".payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Newline);
+ try renderExpression(allocator, ais, tree, payload, Space.Newline);
}
- stream.pushIndent();
- defer stream.popIndent();
- return renderExpression(allocator, stream, tree, @"else".body, space);
+ ais.pushIndent();
+ defer ais.popIndent();
+ return renderExpression(allocator, ais, tree, @"else".body, space);
}
} else {
- stream.pushIndent();
- defer stream.popIndent();
- return renderExpression(allocator, stream, tree, if_node.body, space);
+ ais.pushIndent();
+ defer ais.popIndent();
+ return renderExpression(allocator, ais, tree, if_node.body, space);
}
}
// Single line if statement
- try renderToken(tree, stream, rparen, Space.Space); // )
+ try renderToken(tree, ais, rparen, Space.Space); // )
if (if_node.payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Space);
+ try renderExpression(allocator, ais, tree, payload, Space.Space);
}
if (if_node.@"else") |@"else"| {
- try renderExpression(allocator, stream, tree, if_node.body, Space.Space);
- try renderToken(tree, stream, @"else".else_token, Space.Space);
+ try renderExpression(allocator, ais, tree, if_node.body, Space.Space);
+ try renderToken(tree, ais, @"else".else_token, Space.Space);
if (@"else".payload) |payload| {
- try renderExpression(allocator, stream, tree, payload, Space.Space);
+ try renderExpression(allocator, ais, tree, payload, Space.Space);
}
- return renderExpression(allocator, stream, tree, @"else".body, space);
+ return renderExpression(allocator, ais, tree, @"else".body, space);
} else {
- return renderExpression(allocator, stream, tree, if_node.body, space);
+ return renderExpression(allocator, ais, tree, if_node.body, space);
}
},
.Asm => {
const asm_node = @fieldParentPtr(ast.Node.Asm, "base", base);
- try renderToken(tree, stream, asm_node.asm_token, Space.Space); // asm
+ try renderToken(tree, ais, asm_node.asm_token, Space.Space); // asm
if (asm_node.volatile_token) |volatile_token| {
- try renderToken(tree, stream, volatile_token, Space.Space); // volatile
- try renderToken(tree, stream, tree.nextToken(volatile_token), Space.None); // (
+ try renderToken(tree, ais, volatile_token, Space.Space); // volatile
+ try renderToken(tree, ais, tree.nextToken(volatile_token), Space.None); // (
} else {
- try renderToken(tree, stream, tree.nextToken(asm_node.asm_token), Space.None); // (
+ try renderToken(tree, ais, tree.nextToken(asm_node.asm_token), Space.None); // (
}
asmblk: {
- stream.pushIndent();
- defer stream.popIndent();
+ ais.pushIndent();
+ defer ais.popIndent();
if (asm_node.outputs.len == 0 and asm_node.inputs.len == 0 and asm_node.clobbers.len == 0) {
- try renderExpression(allocator, stream, tree, asm_node.template, Space.None);
+ try renderExpression(allocator, ais, tree, asm_node.template, Space.None);
break :asmblk;
}
- try renderExpression(allocator, stream, tree, asm_node.template, Space.Newline);
+ try renderExpression(allocator, ais, tree, asm_node.template, Space.Newline);
- stream.setIndentDelta(asm_indent_delta);
- defer stream.setIndentDelta(indent_delta);
+ ais.setIndentDelta(asm_indent_delta);
+ defer ais.setIndentDelta(indent_delta);
const colon1 = tree.nextToken(asm_node.template.lastToken());
const colon2 = if (asm_node.outputs.len == 0) blk: {
- try renderToken(tree, stream, colon1, Space.Newline); // :
+ try renderToken(tree, ais, colon1, Space.Newline); // :
break :blk tree.nextToken(colon1);
} else blk: {
- try renderToken(tree, stream, colon1, Space.Space); // :
+ try renderToken(tree, ais, colon1, Space.Space); // :
- stream.pushIndent();
- defer stream.popIndent();
+ ais.pushIndent();
+ defer ais.popIndent();
for (asm_node.outputs) |*asm_output, i| {
if (i + 1 < asm_node.outputs.len) {
const next_asm_output = asm_node.outputs[i + 1];
- try renderAsmOutput(allocator, stream, tree, asm_output, Space.None);
+ try renderAsmOutput(allocator, ais, tree, asm_output, Space.None);
const comma = tree.prevToken(next_asm_output.firstToken());
- try renderToken(tree, stream, comma, Space.Newline); // ,
- try renderExtraNewlineToken(tree, stream, next_asm_output.firstToken());
+ try renderToken(tree, ais, comma, Space.Newline); // ,
+ try renderExtraNewlineToken(tree, ais, next_asm_output.firstToken());
} else if (asm_node.inputs.len == 0 and asm_node.clobbers.len == 0) {
- try renderAsmOutput(allocator, stream, tree, asm_output, Space.Newline);
+ try renderAsmOutput(allocator, ais, tree, asm_output, Space.Newline);
break :asmblk;
} else {
- try renderAsmOutput(allocator, stream, tree, asm_output, Space.Newline);
+ try renderAsmOutput(allocator, ais, tree, asm_output, Space.Newline);
const comma_or_colon = tree.nextToken(asm_output.lastToken());
break :blk switch (tree.token_ids[comma_or_colon]) {
.Comma => tree.nextToken(comma_or_colon),
@@ -2000,25 +1999,25 @@ fn renderExpression(
};
const colon3 = if (asm_node.inputs.len == 0) blk: {
- try renderToken(tree, stream, colon2, Space.Newline); // :
+ try renderToken(tree, ais, colon2, Space.Newline); // :
break :blk tree.nextToken(colon2);
} else blk: {
- try renderToken(tree, stream, colon2, Space.Space); // :
- stream.pushIndent();
- defer stream.popIndent();
+ try renderToken(tree, ais, colon2, Space.Space); // :
+ ais.pushIndent();
+ defer ais.popIndent();
for (asm_node.inputs) |*asm_input, i| {
if (i + 1 < asm_node.inputs.len) {
const next_asm_input = &asm_node.inputs[i + 1];
- try renderAsmInput(allocator, stream, tree, asm_input, Space.None);
+ try renderAsmInput(allocator, ais, tree, asm_input, Space.None);
const comma = tree.prevToken(next_asm_input.firstToken());
- try renderToken(tree, stream, comma, Space.Newline); // ,
- try renderExtraNewlineToken(tree, stream, next_asm_input.firstToken());
+ try renderToken(tree, ais, comma, Space.Newline); // ,
+ try renderExtraNewlineToken(tree, ais, next_asm_input.firstToken());
} else if (asm_node.clobbers.len == 0) {
- try renderAsmInput(allocator, stream, tree, asm_input, Space.Newline);
+ try renderAsmInput(allocator, ais, tree, asm_input, Space.Newline);
break :asmblk;
} else {
- try renderAsmInput(allocator, stream, tree, asm_input, Space.Newline);
+ try renderAsmInput(allocator, ais, tree, asm_input, Space.Newline);
const comma_or_colon = tree.nextToken(asm_input.lastToken());
break :blk switch (tree.token_ids[comma_or_colon]) {
.Comma => tree.nextToken(comma_or_colon),
@@ -2029,29 +2028,29 @@ fn renderExpression(
unreachable;
};
- try renderToken(tree, stream, colon3, Space.Space); // :
- stream.pushIndent();
- defer stream.popIndent();
+ try renderToken(tree, ais, colon3, Space.Space); // :
+ ais.pushIndent();
+ defer ais.popIndent();
for (asm_node.clobbers) |clobber_node, i| {
if (i + 1 >= asm_node.clobbers.len) {
- try renderExpression(allocator, stream, tree, clobber_node, Space.Newline);
+ try renderExpression(allocator, ais, tree, clobber_node, Space.Newline);
break :asmblk;
} else {
- try renderExpression(allocator, stream, tree, clobber_node, Space.None);
+ try renderExpression(allocator, ais, tree, clobber_node, Space.None);
const comma = tree.nextToken(clobber_node.lastToken());
- try renderToken(tree, stream, comma, Space.Space); // ,
+ try renderToken(tree, ais, comma, Space.Space); // ,
}
}
}
- return renderToken(tree, stream, asm_node.rparen, space);
+ return renderToken(tree, ais, asm_node.rparen, space);
},
.EnumLiteral => {
const enum_literal = @fieldParentPtr(ast.Node.EnumLiteral, "base", base);
- try renderToken(tree, stream, enum_literal.dot, Space.None); // .
- return renderToken(tree, stream, enum_literal.name, space); // name
+ try renderToken(tree, ais, enum_literal.dot, Space.None); // .
+ return renderToken(tree, ais, enum_literal.name, space); // name
},
.ContainerField,
@@ -2065,14 +2064,14 @@ fn renderExpression(
fn renderArrayType(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
lbracket: ast.TokenIndex,
rhs: *ast.Node,
len_expr: *ast.Node,
opt_sentinel: ?*ast.Node,
space: Space,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
const rbracket = tree.nextToken(if (opt_sentinel) |sentinel|
sentinel.lastToken()
else
@@ -2083,97 +2082,97 @@ fn renderArrayType(
const new_space = if (ends_with_comment) Space.Newline else Space.None;
{
const do_indent = (starts_with_comment or ends_with_comment);
- if (do_indent) stream.pushIndent();
- defer if (do_indent) stream.popIndent();
+ if (do_indent) ais.pushIndent();
+ defer if (do_indent) ais.popIndent();
- try renderToken(tree, stream, lbracket, Space.None); // [
- try renderExpression(allocator, stream, tree, len_expr, new_space);
+ try renderToken(tree, ais, lbracket, Space.None); // [
+ try renderExpression(allocator, ais, tree, len_expr, new_space);
if (starts_with_comment) {
- try stream.maybeInsertNewline();
+ try ais.maybeInsertNewline();
}
if (opt_sentinel) |sentinel| {
const colon_token = tree.prevToken(sentinel.firstToken());
- try renderToken(tree, stream, colon_token, Space.None); // :
- try renderExpression(allocator, stream, tree, sentinel, Space.None);
+ try renderToken(tree, ais, colon_token, Space.None); // :
+ try renderExpression(allocator, ais, tree, sentinel, Space.None);
}
if (starts_with_comment) {
- try stream.maybeInsertNewline();
+ try ais.maybeInsertNewline();
}
}
- try renderToken(tree, stream, rbracket, Space.None); // ]
+ try renderToken(tree, ais, rbracket, Space.None); // ]
- return renderExpression(allocator, stream, tree, rhs, space);
+ return renderExpression(allocator, ais, tree, rhs, space);
}
fn renderAsmOutput(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
asm_output: *const ast.Node.Asm.Output,
space: Space,
-) (@TypeOf(stream.*).Error || Error)!void {
- try stream.writer().writeAll("[");
- try renderExpression(allocator, stream, tree, asm_output.symbolic_name, Space.None);
- try stream.writer().writeAll("] ");
- try renderExpression(allocator, stream, tree, asm_output.constraint, Space.None);
- try stream.writer().writeAll(" (");
+) (@TypeOf(ais.*).Error || Error)!void {
+ try ais.writer().writeAll("[");
+ try renderExpression(allocator, ais, tree, asm_output.symbolic_name, Space.None);
+ try ais.writer().writeAll("] ");
+ try renderExpression(allocator, ais, tree, asm_output.constraint, Space.None);
+ try ais.writer().writeAll(" (");
switch (asm_output.kind) {
ast.Node.Asm.Output.Kind.Variable => |variable_name| {
- try renderExpression(allocator, stream, tree, &variable_name.base, Space.None);
+ try renderExpression(allocator, ais, tree, &variable_name.base, Space.None);
},
ast.Node.Asm.Output.Kind.Return => |return_type| {
- try stream.writer().writeAll("-> ");
- try renderExpression(allocator, stream, tree, return_type, Space.None);
+ try ais.writer().writeAll("-> ");
+ try renderExpression(allocator, ais, tree, return_type, Space.None);
},
}
- return renderToken(tree, stream, asm_output.lastToken(), space); // )
+ return renderToken(tree, ais, asm_output.lastToken(), space); // )
}
fn renderAsmInput(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
asm_input: *const ast.Node.Asm.Input,
space: Space,
-) (@TypeOf(stream.*).Error || Error)!void {
- try stream.writer().writeAll("[");
- try renderExpression(allocator, stream, tree, asm_input.symbolic_name, Space.None);
- try stream.writer().writeAll("] ");
- try renderExpression(allocator, stream, tree, asm_input.constraint, Space.None);
- try stream.writer().writeAll(" (");
- try renderExpression(allocator, stream, tree, asm_input.expr, Space.None);
- return renderToken(tree, stream, asm_input.lastToken(), space); // )
+) (@TypeOf(ais.*).Error || Error)!void {
+ try ais.writer().writeAll("[");
+ try renderExpression(allocator, ais, tree, asm_input.symbolic_name, Space.None);
+ try ais.writer().writeAll("] ");
+ try renderExpression(allocator, ais, tree, asm_input.constraint, Space.None);
+ try ais.writer().writeAll(" (");
+ try renderExpression(allocator, ais, tree, asm_input.expr, Space.None);
+ return renderToken(tree, ais, asm_input.lastToken(), space); // )
}
fn renderVarDecl(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
var_decl: *ast.Node.VarDecl,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
if (var_decl.getVisibToken()) |visib_token| {
- try renderToken(tree, stream, visib_token, Space.Space); // pub
+ try renderToken(tree, ais, visib_token, Space.Space); // pub
}
if (var_decl.getExternExportToken()) |extern_export_token| {
- try renderToken(tree, stream, extern_export_token, Space.Space); // extern
+ try renderToken(tree, ais, extern_export_token, Space.Space); // extern
if (var_decl.getLibName()) |lib_name| {
- try renderExpression(allocator, stream, tree, lib_name, Space.Space); // "lib"
+ try renderExpression(allocator, ais, tree, lib_name, Space.Space); // "lib"
}
}
if (var_decl.getComptimeToken()) |comptime_token| {
- try renderToken(tree, stream, comptime_token, Space.Space); // comptime
+ try renderToken(tree, ais, comptime_token, Space.Space); // comptime
}
if (var_decl.getThreadLocalToken()) |thread_local_token| {
- try renderToken(tree, stream, thread_local_token, Space.Space); // threadlocal
+ try renderToken(tree, ais, thread_local_token, Space.Space); // threadlocal
}
- try renderToken(tree, stream, var_decl.mut_token, Space.Space); // var
+ try renderToken(tree, ais, var_decl.mut_token, Space.Space); // var
const name_space = if (var_decl.getTypeNode() == null and
(var_decl.getAlignNode() != null or
@@ -2182,92 +2181,92 @@ fn renderVarDecl(
Space.Space
else
Space.None;
- try renderToken(tree, stream, var_decl.name_token, name_space);
+ try renderToken(tree, ais, var_decl.name_token, name_space);
if (var_decl.getTypeNode()) |type_node| {
- try renderToken(tree, stream, tree.nextToken(var_decl.name_token), Space.Space);
+ try renderToken(tree, ais, tree.nextToken(var_decl.name_token), Space.Space);
const s = if (var_decl.getAlignNode() != null or
var_decl.getSectionNode() != null or
var_decl.getInitNode() != null) Space.Space else Space.None;
- try renderExpression(allocator, stream, tree, type_node, s);
+ try renderExpression(allocator, ais, tree, type_node, s);
}
if (var_decl.getAlignNode()) |align_node| {
const lparen = tree.prevToken(align_node.firstToken());
const align_kw = tree.prevToken(lparen);
const rparen = tree.nextToken(align_node.lastToken());
- try renderToken(tree, stream, align_kw, Space.None); // align
- try renderToken(tree, stream, lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, align_node, Space.None);
+ try renderToken(tree, ais, align_kw, Space.None); // align
+ try renderToken(tree, ais, lparen, Space.None); // (
+ try renderExpression(allocator, ais, tree, align_node, Space.None);
const s = if (var_decl.getSectionNode() != null or var_decl.getInitNode() != null) Space.Space else Space.None;
- try renderToken(tree, stream, rparen, s); // )
+ try renderToken(tree, ais, rparen, s); // )
}
if (var_decl.getSectionNode()) |section_node| {
const lparen = tree.prevToken(section_node.firstToken());
const section_kw = tree.prevToken(lparen);
const rparen = tree.nextToken(section_node.lastToken());
- try renderToken(tree, stream, section_kw, Space.None); // linksection
- try renderToken(tree, stream, lparen, Space.None); // (
- try renderExpression(allocator, stream, tree, section_node, Space.None);
+ try renderToken(tree, ais, section_kw, Space.None); // linksection
+ try renderToken(tree, ais, lparen, Space.None); // (
+ try renderExpression(allocator, ais, tree, section_node, Space.None);
const s = if (var_decl.getInitNode() != null) Space.Space else Space.None;
- try renderToken(tree, stream, rparen, s); // )
+ try renderToken(tree, ais, rparen, s); // )
}
if (var_decl.getInitNode()) |init_node| {
const s = if (init_node.tag == .MultilineStringLiteral) Space.None else Space.Space;
- try renderToken(tree, stream, var_decl.getEqToken().?, s); // =
- stream.pushIndentOneShot();
- try renderExpression(allocator, stream, tree, init_node, Space.None);
+ try renderToken(tree, ais, var_decl.getEqToken().?, s); // =
+ ais.pushIndentOneShot();
+ try renderExpression(allocator, ais, tree, init_node, Space.None);
}
- try renderToken(tree, stream, var_decl.semicolon_token, Space.Newline);
+ try renderToken(tree, ais, var_decl.semicolon_token, Space.Newline);
}
fn renderParamDecl(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
param_decl: ast.Node.FnProto.ParamDecl,
space: Space,
-) (@TypeOf(stream.*).Error || Error)!void {
- try renderDocComments(tree, stream, param_decl, param_decl.doc_comments);
+) (@TypeOf(ais.*).Error || Error)!void {
+ try renderDocComments(tree, ais, param_decl, param_decl.doc_comments);
if (param_decl.comptime_token) |comptime_token| {
- try renderToken(tree, stream, comptime_token, Space.Space);
+ try renderToken(tree, ais, comptime_token, Space.Space);
}
if (param_decl.noalias_token) |noalias_token| {
- try renderToken(tree, stream, noalias_token, Space.Space);
+ try renderToken(tree, ais, noalias_token, Space.Space);
}
if (param_decl.name_token) |name_token| {
- try renderToken(tree, stream, name_token, Space.None);
- try renderToken(tree, stream, tree.nextToken(name_token), Space.Space); // :
+ try renderToken(tree, ais, name_token, Space.None);
+ try renderToken(tree, ais, tree.nextToken(name_token), Space.Space); // :
}
switch (param_decl.param_type) {
- .any_type, .type_expr => |node| try renderExpression(allocator, stream, tree, node, space),
+ .any_type, .type_expr => |node| try renderExpression(allocator, ais, tree, node, space),
}
}
fn renderStatement(
allocator: *mem.Allocator,
- stream: anytype,
+ ais: anytype,
tree: *ast.Tree,
base: *ast.Node,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
switch (base.tag) {
.VarDecl => {
const var_decl = @fieldParentPtr(ast.Node.VarDecl, "base", base);
- try renderVarDecl(allocator, stream, tree, var_decl);
+ try renderVarDecl(allocator, ais, tree, var_decl);
},
else => {
if (base.requireSemiColon()) {
- try renderExpression(allocator, stream, tree, base, Space.None);
+ try renderExpression(allocator, ais, tree, base, Space.None);
const semicolon_index = tree.nextToken(base.lastToken());
assert(tree.token_ids[semicolon_index] == .Semicolon);
- try renderToken(tree, stream, semicolon_index, Space.Newline);
+ try renderToken(tree, ais, semicolon_index, Space.Newline);
} else {
- try renderExpression(allocator, stream, tree, base, Space.Newline);
+ try renderExpression(allocator, ais, tree, base, Space.Newline);
}
},
}
@@ -2286,19 +2285,19 @@ const Space = enum {
fn renderTokenOffset(
tree: *ast.Tree,
- stream: anytype,
+ ais: anytype,
token_index: ast.TokenIndex,
space: Space,
token_skip_bytes: usize,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
if (space == Space.BlockStart) {
// If placing the lbrace on the current line would cause an uggly gap then put the lbrace on the next line
- const new_space = if (stream.isLineOverIndented()) Space.Newline else Space.Space;
- return renderToken(tree, stream, token_index, new_space);
+ const new_space = if (ais.isLineOverIndented()) Space.Newline else Space.Space;
+ return renderToken(tree, ais, token_index, new_space);
}
var token_loc = tree.token_locs[token_index];
- try stream.writer().writeAll(mem.trimRight(u8, tree.tokenSliceLoc(token_loc)[token_skip_bytes..], " "));
+ try ais.writer().writeAll(mem.trimRight(u8, tree.tokenSliceLoc(token_loc)[token_skip_bytes..], " "));
if (space == Space.NoComment)
return;
@@ -2307,20 +2306,20 @@ fn renderTokenOffset(
var next_token_loc = tree.token_locs[token_index + 1];
if (space == Space.Comma) switch (next_token_id) {
- .Comma => return renderToken(tree, stream, token_index + 1, Space.Newline),
+ .Comma => return renderToken(tree, ais, token_index + 1, Space.Newline),
.LineComment => {
- try stream.writer().writeAll(", ");
- return renderToken(tree, stream, token_index + 1, Space.Newline);
+ try ais.writer().writeAll(", ");
+ return renderToken(tree, ais, token_index + 1, Space.Newline);
},
else => {
if (token_index + 2 < tree.token_ids.len and
tree.token_ids[token_index + 2] == .MultilineStringLiteralLine)
{
- try stream.writer().writeAll(",");
+ try ais.writer().writeAll(",");
return;
} else {
- try stream.writer().writeAll(",");
- try stream.insertNewline();
+ try ais.writer().writeAll(",");
+ try ais.insertNewline();
return;
}
},
@@ -2344,14 +2343,14 @@ fn renderTokenOffset(
if (next_token_id == .MultilineStringLiteralLine) {
return;
} else {
- try stream.insertNewline();
+ try ais.insertNewline();
return;
}
},
Space.Space, Space.SpaceOrOutdent => {
if (next_token_id == .MultilineStringLiteralLine)
return;
- try stream.writer().writeByte(' ');
+ try ais.writer().writeByte(' ');
return;
},
Space.NoComment, Space.Comma, Space.BlockStart => unreachable,
@@ -2368,7 +2367,7 @@ fn renderTokenOffset(
next_token_id = tree.token_ids[token_index + offset];
next_token_loc = tree.token_locs[token_index + offset];
if (next_token_id != .LineComment) {
- try stream.insertNewline();
+ try ais.insertNewline();
return;
}
},
@@ -2381,7 +2380,7 @@ fn renderTokenOffset(
var loc = tree.tokenLocationLoc(token_loc.end, next_token_loc);
if (loc.line == 0) {
- try stream.writer().print(" {}", .{mem.trimRight(u8, tree.tokenSliceLoc(next_token_loc), " ")});
+ try ais.writer().print(" {}", .{mem.trimRight(u8, tree.tokenSliceLoc(next_token_loc), " ")});
offset = 2;
token_loc = next_token_loc;
next_token_loc = tree.token_locs[token_index + offset];
@@ -2389,16 +2388,16 @@ fn renderTokenOffset(
if (next_token_id != .LineComment) {
switch (space) {
Space.None, Space.Space => {
- try stream.insertNewline();
+ try ais.insertNewline();
},
Space.SpaceOrOutdent => {
- try stream.insertNewline();
+ try ais.insertNewline();
},
Space.Newline => {
if (next_token_id == .MultilineStringLiteralLine) {
return;
} else {
- try stream.insertNewline();
+ try ais.insertNewline();
return;
}
},
@@ -2415,8 +2414,8 @@ fn renderTokenOffset(
// in generated code (loc.line == 0) so treat that case
// as though there was meant to be a newline between the tokens
var newline_count = if (loc.line <= 1) @as(u8, 1) else @as(u8, 2);
- while (newline_count > 0) : (newline_count -= 1) try stream.insertNewline();
- try stream.writer().writeAll(mem.trimRight(u8, tree.tokenSliceLoc(next_token_loc), " "));
+ while (newline_count > 0) : (newline_count -= 1) try ais.insertNewline();
+ try ais.writer().writeAll(mem.trimRight(u8, tree.tokenSliceLoc(next_token_loc), " "));
offset += 1;
token_loc = next_token_loc;
@@ -2428,15 +2427,15 @@ fn renderTokenOffset(
if (next_token_id == .MultilineStringLiteralLine) {
return;
} else {
- try stream.insertNewline();
+ try ais.insertNewline();
return;
}
},
Space.None, Space.Space => {
- try stream.insertNewline();
+ try ais.insertNewline();
},
Space.SpaceOrOutdent => {
- try stream.insertNewline();
+ try ais.insertNewline();
},
Space.NoNewline => {},
Space.NoComment, Space.Comma, Space.BlockStart => unreachable,
@@ -2449,38 +2448,38 @@ fn renderTokenOffset(
fn renderToken(
tree: *ast.Tree,
- stream: anytype,
+ ais: anytype,
token_index: ast.TokenIndex,
space: Space,
-) (@TypeOf(stream.*).Error || Error)!void {
- return renderTokenOffset(tree, stream, token_index, space, 0);
+) (@TypeOf(ais.*).Error || Error)!void {
+ return renderTokenOffset(tree, ais, token_index, space, 0);
}
fn renderDocComments(
tree: *ast.Tree,
- stream: anytype,
+ ais: anytype,
node: anytype,
doc_comments: ?*ast.Node.DocComment,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
const comment = doc_comments orelse return;
- return renderDocCommentsToken(tree, stream, comment, node.firstToken());
+ return renderDocCommentsToken(tree, ais, comment, node.firstToken());
}
fn renderDocCommentsToken(
tree: *ast.Tree,
- stream: anytype,
+ ais: anytype,
comment: *ast.Node.DocComment,
first_token: ast.TokenIndex,
-) (@TypeOf(stream.*).Error || Error)!void {
+) (@TypeOf(ais.*).Error || Error)!void {
var tok_i = comment.first_line;
while (true) : (tok_i += 1) {
switch (tree.token_ids[tok_i]) {
.DocComment, .ContainerDocComment => {
if (comment.first_line < first_token) {
- try renderToken(tree, stream, tok_i, Space.Newline);
+ try renderToken(tree, ais, tok_i, Space.Newline);
} else {
- try renderToken(tree, stream, tok_i, Space.NoComment);
- try stream.insertNewline();
+ try renderToken(tree, ais, tok_i, Space.NoComment);
+ try ais.insertNewline();
}
},
.LineComment => continue,
@@ -2552,10 +2551,10 @@ fn nodeCausesSliceOpSpace(base: *ast.Node) bool {
};
}
-fn copyFixingWhitespace(stream: anytype, slice: []const u8) @TypeOf(stream.*).Error!void {
+fn copyFixingWhitespace(ais: anytype, slice: []const u8) @TypeOf(ais.*).Error!void {
for (slice) |byte| switch (byte) {
- '\t' => try stream.writer().writeAll(" "),
+ '\t' => try ais.writer().writeAll(" "),
'\r' => {},
- else => try stream.writer().writeByte(byte),
+ else => try ais.writer().writeByte(byte),
};
}
src-self-hosted/main.zig
@@ -682,13 +682,13 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
process.exit(1);
}
if (check_flag) {
- const anything_changed = try std.zig.render(gpa, &io.null_out_stream, tree);
+ const anything_changed = try std.zig.render(gpa, io.null_out_stream, tree);
const code = if (anything_changed) @as(u8, 1) else @as(u8, 0);
process.exit(code);
}
const stdout = io.getStdOut().outStream();
- _ = try std.zig.render(gpa, &stdout, tree);
+ _ = try std.zig.render(gpa, stdout, tree);
return;
}
@@ -830,7 +830,7 @@ fn fmtPathFile(
}
if (check_mode) {
- const anything_changed = try std.zig.render(fmt.gpa, &io.null_out_stream, tree);
+ const anything_changed = try std.zig.render(fmt.gpa, io.null_out_stream, tree);
if (anything_changed) {
std.debug.print("{}\n", .{file_path});
fmt.any_error = true;
@@ -840,7 +840,7 @@ fn fmtPathFile(
try fmt.out_buffer.ensureCapacity(source_code.len);
fmt.out_buffer.items.len = 0;
const writer = fmt.out_buffer.writer();
- const anything_changed = try std.zig.render(fmt.gpa, &writer, tree);
+ const anything_changed = try std.zig.render(fmt.gpa, writer, tree);
if (!anything_changed)
return; // Good thing we didn't waste any file system access on this.
src-self-hosted/stage2.zig
@@ -151,7 +151,7 @@ export fn stage2_free_clang_errors(errors_ptr: [*]translate_c.ClangErrMsg, error
export fn stage2_render_ast(tree: *ast.Tree, output_file: *FILE) Error {
const c_out_stream = std.io.cOutStream(output_file);
- _ = std.zig.render(std.heap.c_allocator, &c_out_stream, tree) catch |e| switch (e) {
+ _ = std.zig.render(std.heap.c_allocator, c_out_stream, tree) catch |e| switch (e) {
error.WouldBlock => unreachable, // stage1 opens stuff in exclusively blocking mode
error.NotOpenForWriting => unreachable,
error.SystemResources => return .SystemResources,