| author |  Andrew Kelley <andrew@ziglang.org> 2021-02-09 21:17:43-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-02-09 21:17:43-07:00 |
| log | 25bcf4eb99d367965b0f699faff5d3fd1d991941 |
| tree | f2bbf26bdbf031d5e3edfc708038e96a8fe28994 |
| parent | 7295d4b8079b5cf3fcdbb81dd9e129f3f0f139aa |
zig fmt: grouped expressions
2 files changed, 12 insertions(+), 11 deletions(-)
lib
lib/std/zig/parser_test.zig+7
| ... | @@ -291,6 +291,13 @@ test "zig fmt: break from block" { | ... | @@ -291,6 +291,13 @@ test "zig fmt: break from block" { |
| 291 | ); | 291 | ); |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | test "zig fmt: grouped expressions (parentheses)" { | ||
| 295 | try testCanonical( | ||
| 296 | \\const r = (x + y) * (a + b); | ||
| 297 | \\ | ||
| 298 | ); | ||
| 299 | } | ||
| 300 | |||
| 294 | //test "zig fmt: c pointer type" { | 301 | //test "zig fmt: c pointer type" { |
| 295 | // try testCanonical( | 302 | // try testCanonical( |
| 296 | // \\pub extern fn repro() [*c]const u8; | 303 | // \\pub extern fn repro() [*c]const u8; |
lib/std/zig/render.zig+5-11
| ... | @@ -517,17 +517,11 @@ fn renderExpression(ais: *Ais, tree: ast.Tree, node: ast.Node.Index, space: Spac | ... | @@ -517,17 +517,11 @@ fn renderExpression(ais: *Ais, tree: ast.Tree, node: ast.Node.Index, space: Spac |
| 517 | } | 517 | } |
| 518 | }, | 518 | }, |
| 519 | 519 | ||
| 520 | .GroupedExpression => unreachable, // TODO | 520 | .GroupedExpression => { |
| 521 | //.GroupedExpression => { | 521 | try renderToken(ais, tree, main_tokens[node], .None); |
| 522 | // const grouped_expr = @fieldParentPtr(ast.Node.GroupedExpression, "base", base); | 522 | try renderExpression(ais, tree, datas[node].lhs, .None); |
| 523 | 523 | return renderToken(ais, tree, datas[node].rhs, space); | |
| 524 | // try renderToken(ais, tree, grouped_expr.lparen, Space.None); | 524 | }, |
| 525 | // { | ||
| 526 | // ais.pushIndentOneShot(); | ||
| 527 | // try renderExpression(ais, tree, grouped_expr.expr, Space.None); | ||
| 528 | // } | ||
| 529 | // return renderToken(ais, tree, grouped_expr.rparen, space); | ||
| 530 | //}, | ||
| 531 | 525 | ||
| 532 | .ContainerDecl, | 526 | .ContainerDecl, |
| 533 | .ContainerDeclComma, | 527 | .ContainerDeclComma, |