authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-01-03 11:43:48+01:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-01-03 11:49:42+01:00
loge6485282d36d58e24b812ee6dd76e97d25658dc6
treee4239c22d896ccc1540c4c27dd036860f7f5843f
parent7b375a1c4a88d7751bd2d5e713108a16df9cb103

Better logic for last-param rendering

2 files changed, 5 insertions(+), 10 deletions(-)

lib/std/zig/parser_test.zig+2-8
...@@ -29,14 +29,8 @@ test "zig fmt: c pointer type" {...@@ -29,14 +29,8 @@ test "zig fmt: c pointer type" {
29test "zig fmt: builtin call with trailing comma" {29test "zig fmt: builtin call with trailing comma" {
30 try testCanonical(30 try testCanonical(
31 \\pub fn main() void {31 \\pub fn main() void {
32 \\ _ = @intToPtr(32 \\ @breakpoint();
33 \\ a,33 \\ _ = @boolToInt(a);
34 \\ b,
35 \\ );
36 \\ _ = @ptrCast(
37 \\ a,
38 \\ b,
39 \\ );
40 \\ _ = @call(34 \\ _ = @call(
41 \\ a,35 \\ a,
42 \\ b,36 \\ b,
lib/std/zig/render.zig+3-2
...@@ -1264,7 +1264,9 @@ fn renderExpression(...@@ -1264,7 +1264,9 @@ fn renderExpression(
1264 }1264 }
12651265
1266 const src_params_trailing_comma = blk: {1266 const src_params_trailing_comma = blk: {
1267 const maybe_comma = tree.prevToken(builtin_call.rparen_token);1267 if (builtin_call.params.len < 2) break :blk false;
1268 const last_node = builtin_call.params.at(builtin_call.params.len - 1).*;
1269 const maybe_comma = tree.nextToken(last_node.lastToken());
1268 break :blk tree.tokens.at(maybe_comma).id == .Comma;1270 break :blk tree.tokens.at(maybe_comma).id == .Comma;
1269 };1271 };
12701272
...@@ -1277,7 +1279,6 @@ fn renderExpression(...@@ -1277,7 +1279,6 @@ fn renderExpression(
1277 var it = builtin_call.params.iterator(0);1279 var it = builtin_call.params.iterator(0);
1278 while (it.next()) |param_node| {1280 while (it.next()) |param_node| {
1279 try renderExpression(allocator, stream, tree, indent, start_col, param_node.*, Space.None);1281 try renderExpression(allocator, stream, tree, indent, start_col, param_node.*, Space.None);
1280 // try renderParamDecl(allocator, stream, tree, indent, start_col, param_node.*, Space.None);
12811282
1282 if (it.peek() != null) {1283 if (it.peek() != null) {
1283 const comma_token = tree.nextToken(param_node.*.lastToken());1284 const comma_token = tree.nextToken(param_node.*.lastToken());