authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-23 18:33:13-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-02-23 18:33:13-07:00
log4420fe97bebbecfb595c8acad255c3f3747bcaef
treeeb08870277ff3507530cc0cd6302a7e3a9b8e3f2
parent988f1c6a6f075e63d0ab2dc8f6e802a67b4a0902

zig fmt: for loop with ptr payload and index

2 files changed, 15 insertions(+), 3 deletions(-)

lib/std/zig/parser_test.zig+12
...@@ -4152,6 +4152,18 @@ test "zig fmt: space after top level doc comment" {...@@ -4152,6 +4152,18 @@ test "zig fmt: space after top level doc comment" {
4152 );4152 );
4153}4153}
41544154
4155test "zig fmt: for loop with ptr payload and index" {
4156 try testCanonical(
4157 \\test {
4158 \\ for (self.entries.items) |*item, i| {}
4159 \\ for (self.entries.items) |*item, i|
4160 \\ a = b;
4161 \\ for (self.entries.items) |*item, i| a = b;
4162 \\}
4163 \\
4164 );
4165}
4166
4155test "zig fmt: error for invalid bit range" {4167test "zig fmt: error for invalid bit range" {
4156 try testError(4168 try testError(
4157 \\var x: []align(0:0:0)u8 = bar;4169 \\var x: []align(0:0:0)u8 = bar;
lib/std/zig/render.zig+3-3
...@@ -1040,7 +1040,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full....@@ -1040,7 +1040,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full.
1040 if (token_tags[ident + 1] == .comma) {1040 if (token_tags[ident + 1] == .comma) {
1041 try renderToken(ais, tree, ident + 1, .space); // ,1041 try renderToken(ais, tree, ident + 1, .space); // ,
1042 try renderToken(ais, tree, ident + 2, .none); // index1042 try renderToken(ais, tree, ident + 2, .none); // index
1043 break :blk payload_token + 3;1043 break :blk ident + 3;
1044 } else {1044 } else {
1045 break :blk ident + 1;1045 break :blk ident + 1;
1046 }1046 }
...@@ -1102,7 +1102,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full....@@ -1102,7 +1102,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full.
1102 if (token_tags[ident + 1] == .comma) {1102 if (token_tags[ident + 1] == .comma) {
1103 try renderToken(ais, tree, ident + 1, .space); // ,1103 try renderToken(ais, tree, ident + 1, .space); // ,
1104 try renderToken(ais, tree, ident + 2, .none); // index1104 try renderToken(ais, tree, ident + 2, .none); // index
1105 break :blk payload_token + 3;1105 break :blk ident + 3;
1106 } else {1106 } else {
1107 break :blk ident + 1;1107 break :blk ident + 1;
1108 }1108 }
...@@ -1177,7 +1177,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full....@@ -1177,7 +1177,7 @@ fn renderWhile(gpa: *Allocator, ais: *Ais, tree: ast.Tree, while_node: ast.full.
1177 if (token_tags[ident + 1] == .comma) {1177 if (token_tags[ident + 1] == .comma) {
1178 try renderToken(ais, tree, ident + 1, .space); // ,1178 try renderToken(ais, tree, ident + 1, .space); // ,
1179 try renderToken(ais, tree, ident + 2, .none); // index1179 try renderToken(ais, tree, ident + 2, .none); // index
1180 break :blk payload_token + 3;1180 break :blk ident + 3;
1181 } else {1181 } else {
1182 break :blk ident + 1;1182 break :blk ident + 1;
1183 }1183 }