authorgravatar for fncontroloption@noreply.codeberg.orgFnControlOption <fncontroloption@noreply.codeberg.org> 2023-12-29 08:07:37-08:00
committergravatar for fncontroloption@noreply.codeberg.orgFnControlOption <fncontroloption@noreply.codeberg.org> 2023-12-29 08:07:37-08:00
log75b3feee05eb8b08fc6441a7e45fd9269ae7bee4
tree6b361acf290612e47b4f379f5641d84c4aae5495
parent20cde3f480462a3b609131dd118623978c26bace

std.zig.Ast: Reorder fields to reflect position in source

2 files changed, 8 insertions(+), 8 deletions(-)

lib/std/zig/Ast.zig+6-6
......@@ -1433,8 +1433,8 @@ pub fn containerField(tree: Ast, node: Node.Index) full.ContainerField {
14331433 return tree.fullContainerFieldComponents(.{
14341434 .main_token = main_token,
14351435 .type_expr = data.lhs,
1436 .value_expr = extra.value_expr,
14371436 .align_expr = extra.align_expr,
1437 .value_expr = extra.value_expr,
14381438 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or
14391439 tree.tokens.items(.tag)[main_token + 1] != .colon,
14401440 });
......@@ -1447,8 +1447,8 @@ pub fn containerFieldInit(tree: Ast, node: Node.Index) full.ContainerField {
14471447 return tree.fullContainerFieldComponents(.{
14481448 .main_token = main_token,
14491449 .type_expr = data.lhs,
1450 .value_expr = data.rhs,
14511450 .align_expr = 0,
1451 .value_expr = data.rhs,
14521452 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or
14531453 tree.tokens.items(.tag)[main_token + 1] != .colon,
14541454 });
......@@ -1461,8 +1461,8 @@ pub fn containerFieldAlign(tree: Ast, node: Node.Index) full.ContainerField {
14611461 return tree.fullContainerFieldComponents(.{
14621462 .main_token = main_token,
14631463 .type_expr = data.lhs,
1464 .value_expr = 0,
14651464 .align_expr = data.rhs,
1465 .value_expr = 0,
14661466 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or
14671467 tree.tokens.items(.tag)[main_token + 1] != .colon,
14681468 });
......@@ -2565,8 +2565,8 @@ pub const full = struct {
25652565 pub const Components = struct {
25662566 main_token: TokenIndex,
25672567 type_expr: Node.Index,
2568 value_expr: Node.Index,
25692568 align_expr: Node.Index,
2569 value_expr: Node.Index,
25702570 tuple_like: bool,
25712571 };
25722572
......@@ -3427,8 +3427,8 @@ pub const Node = struct {
34273427 };
34283428
34293429 pub const ArrayTypeSentinel = struct {
3430 elem_type: Index,
34313430 sentinel: Index,
3431 elem_type: Index,
34323432 };
34333433
34343434 pub const PtrType = struct {
......@@ -3458,8 +3458,8 @@ pub const Node = struct {
34583458 };
34593459
34603460 pub const ContainerField = struct {
3461 value_expr: Index,
34623461 align_expr: Index,
3462 value_expr: Index,
34633463 };
34643464
34653465 pub const GlobalVarDecl = struct {
lib/std/zig/Parse.zig+2-2
......@@ -919,8 +919,8 @@ fn expectContainerField(p: *Parse) !Node.Index {
919919 .data = .{
920920 .lhs = type_expr,
921921 .rhs = try p.addExtra(Node.ContainerField{
922 .value_expr = value_expr,
923922 .align_expr = align_expr,
923 .value_expr = value_expr,
924924 }),
925925 },
926926 });
......@@ -2049,8 +2049,8 @@ fn parseTypeExpr(p: *Parse) Error!Node.Index {
20492049 .data = .{
20502050 .lhs = len_expr,
20512051 .rhs = try p.addExtra(Node.ArrayTypeSentinel{
2052 .elem_type = elem_type,
20532052 .sentinel = sentinel,
2053 .elem_type = elem_type,
20542054 }),
20552055 },
20562056 });