| author |  Andrew Kelley <andrew@ziglang.org> 2021-02-09 22:42:00-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-02-09 22:42:00-07:00 |
| log | fa5fcdd7343b8e759971ea14adead830b1f7c616 |
| tree | b9d0ae701885f7787dc1751089642ae97340cdcb |
| parent | 9d87e6aeb8dd9c46b10483c31a392d7dac8a7dc4 |
zig fmt: fix regression with many container members
3 files changed, 19 insertions(+), 22 deletions(-)
lib
lib/std/zig/ast.zig+1-1
| ... | @@ -1409,7 +1409,7 @@ pub const Tree = struct { | ... | @@ -1409,7 +1409,7 @@ pub const Tree = struct { |
| 1409 | return tree.fullContainerDecl(.{ | 1409 | return tree.fullContainerDecl(.{ |
| 1410 | .main_token = main_token, | 1410 | .main_token = main_token, |
| 1411 | .enum_token = main_token + 2, // union lparen enum | 1411 | .enum_token = main_token + 2, // union lparen enum |
| 1412 | .members = tree.extra_data[data.lhs..data.rhs], | 1412 | .members = tree.extra_data[members_range.start..members_range.end], |
| 1413 | .arg = data.lhs, | 1413 | .arg = data.lhs, |
| 1414 | }); | 1414 | }); |
| 1415 | } | 1415 | } |
lib/std/zig/parse.zig+1-4
| ... | @@ -3609,10 +3609,7 @@ const Parser = struct { | ... | @@ -3609,10 +3609,7 @@ const Parser = struct { |
| 3609 | .main_token = main_token, | 3609 | .main_token = main_token, |
| 3610 | .data = .{ | 3610 | .data = .{ |
| 3611 | .lhs = enum_tag_expr, | 3611 | .lhs = enum_tag_expr, |
| 3612 | .rhs = try p.addExtra(Node.SubRange{ | 3612 | .rhs = try p.addExtra(members_span), |
| 3613 | .start = members_span.start, | ||
| 3614 | .end = members_span.end, | ||
| 3615 | }), | ||
| 3616 | }, | 3613 | }, |
| 3617 | }); | 3614 | }); |
| 3618 | } else { | 3615 | } else { |
lib/std/zig/parser_test.zig+17-17
| ... | @@ -734,23 +734,23 @@ test "zig fmt: while else err prong with no block" { | ... | @@ -734,23 +734,23 @@ test "zig fmt: while else err prong with no block" { |
| 734 | ); | 734 | ); |
| 735 | } | 735 | } |
| 736 | 736 | ||
| 737 | //test "zig fmt: tagged union with enum values" { | 737 | test "zig fmt: tagged union with enum values" { |
| 738 | // try testCanonical( | 738 | try testCanonical( |
| 739 | // \\const MultipleChoice2 = union(enum(u32)) { | 739 | \\const MultipleChoice2 = union(enum(u32)) { |
| 740 | // \\ Unspecified1: i32, | 740 | \\ Unspecified1: i32, |
| 741 | // \\ A: f32 = 20, | 741 | \\ A: f32 = 20, |
| 742 | // \\ Unspecified2: void, | 742 | \\ Unspecified2: void, |
| 743 | // \\ B: bool = 40, | 743 | \\ B: bool = 40, |
| 744 | // \\ Unspecified3: i32, | 744 | \\ Unspecified3: i32, |
| 745 | // \\ C: i8 = 60, | 745 | \\ C: i8 = 60, |
| 746 | // \\ Unspecified4: void, | 746 | \\ Unspecified4: void, |
| 747 | // \\ D: void = 1000, | 747 | \\ D: void = 1000, |
| 748 | // \\ Unspecified5: i32, | 748 | \\ Unspecified5: i32, |
| 749 | // \\}; | 749 | \\}; |
| 750 | // \\ | 750 | \\ |
| 751 | // ); | 751 | ); |
| 752 | //} | 752 | } |
| 753 | // | 753 | |
| 754 | //test "zig fmt: allowzero pointer" { | 754 | //test "zig fmt: allowzero pointer" { |
| 755 | // try testCanonical( | 755 | // try testCanonical( |
| 756 | // \\const T = [*]allowzero const u8; | 756 | // \\const T = [*]allowzero const u8; |