diff --git a/lib/std/zig/Ast.zig b/lib/std/zig/Ast.zig index c0c03c1c70c6624d6e21027e5e5cb45dad2e418b..e358ee80d6844c929ad0728dac1034fa22ae681d 100644 --- a/lib/std/zig/Ast.zig +++ b/lib/std/zig/Ast.zig @@ -1433,8 +1433,8 @@ pub fn containerField(tree: Ast, node: Node.Index) full.ContainerField { return tree.fullContainerFieldComponents(.{ .main_token = main_token, .type_expr = data.lhs, + .align_expr = extra.align_expr, .value_expr = extra.value_expr, - .align_expr = extra.align_expr, .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or tree.tokens.items(.tag)[main_token + 1] != .colon, }); @@ -1447,8 +1447,8 @@ pub fn containerFieldInit(tree: Ast, node: Node.Index) full.ContainerField { return tree.fullContainerFieldComponents(.{ .main_token = main_token, .type_expr = data.lhs, + .align_expr = 0, .value_expr = data.rhs, - .align_expr = 0, .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or tree.tokens.items(.tag)[main_token + 1] != .colon, }); @@ -1461,8 +1461,8 @@ pub fn containerFieldAlign(tree: Ast, node: Node.Index) full.ContainerField { return tree.fullContainerFieldComponents(.{ .main_token = main_token, .type_expr = data.lhs, - .value_expr = 0, .align_expr = data.rhs, + .value_expr = 0, .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or tree.tokens.items(.tag)[main_token + 1] != .colon, }); @@ -2565,8 +2565,8 @@ pub const full = struct { pub const Components = struct { main_token: TokenIndex, type_expr: Node.Index, + align_expr: Node.Index, value_expr: Node.Index, - align_expr: Node.Index, tuple_like: bool, }; @@ -3427,8 +3427,8 @@ pub const Node = struct { }; pub const ArrayTypeSentinel = struct { + sentinel: Index, elem_type: Index, - sentinel: Index, }; pub const PtrType = struct { @@ -3458,8 +3458,8 @@ pub const Node = struct { }; pub const ContainerField = struct { + align_expr: Index, value_expr: Index, - align_expr: Index, }; pub const GlobalVarDecl = struct { diff --git a/lib/std/zig/Parse.zig b/lib/std/zig/Parse.zig index 4de1261ae79eed41a8bc3e35792ba26dc395e635..c0b775b8cf2b350f447a30137d7f00bbfd0f5900 100644 --- a/lib/std/zig/Parse.zig +++ b/lib/std/zig/Parse.zig @@ -919,8 +919,8 @@ fn expectContainerField(p: *Parse) !Node.Index { .data = .{ .lhs = type_expr, .rhs = try p.addExtra(Node.ContainerField{ + .align_expr = align_expr, .value_expr = value_expr, - .align_expr = align_expr, }), }, }); @@ -2049,8 +2049,8 @@ fn parseTypeExpr(p: *Parse) Error!Node.Index { .data = .{ .lhs = len_expr, .rhs = try p.addExtra(Node.ArrayTypeSentinel{ + .sentinel = sentinel, .elem_type = elem_type, - .sentinel = sentinel, }), }, });