Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zig fmt: fix rendering of align keyword of slice type

master
Andrew Kelley 2018-05-25 02:19:53 -04:00
parent 56cb7f1740
commit a630d3e851
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
std/zig/parser_test.zig
View File

@ -1,3 +1,12 @@
test "zig fmt: slice align" {
try testCanonical(
\\const A = struct {
\\ items: []align(A) T,
\\};
\\
);
}
test "zig fmt: first thing in file is line comment" {
try testTransform(
\\comptime {

12
std/zig/render.zig
View File

@ -268,10 +268,10 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
ast.Node.PrefixOp.Op.AddrOf => |addr_of_info| {
try renderToken(tree, stream, prefix_op_node.op_token, indent, Space.None); // &
if (addr_of_info.align_info) |align_info| {
const align_token = tree.nextToken(prefix_op_node.op_token);
try renderToken(tree, stream, align_token, indent, Space.None); // align
const lparen_token = tree.prevToken(align_info.node.firstToken());
const align_token = tree.prevToken(lparen_token);
try renderToken(tree, stream, align_token, indent, Space.None); // align
try renderToken(tree, stream, lparen_token, indent, Space.None); // (
try renderExpression(allocator, stream, tree, indent, align_info.node, Space.None);
@ -305,10 +305,10 @@ fn renderExpression(allocator: &mem.Allocator, stream: var, tree: &ast.Tree, ind
try renderToken(tree, stream, tree.nextToken(prefix_op_node.op_token), indent, Space.None); // ]
if (addr_of_info.align_info) |align_info| {
const align_token = tree.nextToken(prefix_op_node.op_token);
try renderToken(tree, stream, align_token, indent, Space.None); // align
const lparen_token = tree.prevToken(align_info.node.firstToken());
const align_token = tree.prevToken(lparen_token);
try renderToken(tree, stream, align_token, indent, Space.None); // align
try renderToken(tree, stream, lparen_token, indent, Space.None); // (
try renderExpression(allocator, stream, tree, indent, align_info.node, Space.None);