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 {...@@ -1433,8 +1433,8 @@ pub fn containerField(tree: Ast, node: Node.Index) full.ContainerField {
1433 return tree.fullContainerFieldComponents(.{1433 return tree.fullContainerFieldComponents(.{
1434 .main_token = main_token,1434 .main_token = main_token,
1435 .type_expr = data.lhs,1435 .type_expr = data.lhs,
1436 .value_expr = extra.value_expr,
1437 .align_expr = extra.align_expr,1436 .align_expr = extra.align_expr,
1437 .value_expr = extra.value_expr,
1438 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or1438 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or
1439 tree.tokens.items(.tag)[main_token + 1] != .colon,1439 tree.tokens.items(.tag)[main_token + 1] != .colon,
1440 });1440 });
...@@ -1447,8 +1447,8 @@ pub fn containerFieldInit(tree: Ast, node: Node.Index) full.ContainerField {...@@ -1447,8 +1447,8 @@ pub fn containerFieldInit(tree: Ast, node: Node.Index) full.ContainerField {
1447 return tree.fullContainerFieldComponents(.{1447 return tree.fullContainerFieldComponents(.{
1448 .main_token = main_token,1448 .main_token = main_token,
1449 .type_expr = data.lhs,1449 .type_expr = data.lhs,
1450 .value_expr = data.rhs,
1451 .align_expr = 0,1450 .align_expr = 0,
1451 .value_expr = data.rhs,
1452 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or1452 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or
1453 tree.tokens.items(.tag)[main_token + 1] != .colon,1453 tree.tokens.items(.tag)[main_token + 1] != .colon,
1454 });1454 });
...@@ -1461,8 +1461,8 @@ pub fn containerFieldAlign(tree: Ast, node: Node.Index) full.ContainerField {...@@ -1461,8 +1461,8 @@ pub fn containerFieldAlign(tree: Ast, node: Node.Index) full.ContainerField {
1461 return tree.fullContainerFieldComponents(.{1461 return tree.fullContainerFieldComponents(.{
1462 .main_token = main_token,1462 .main_token = main_token,
1463 .type_expr = data.lhs,1463 .type_expr = data.lhs,
1464 .value_expr = 0,
1465 .align_expr = data.rhs,1464 .align_expr = data.rhs,
1465 .value_expr = 0,
1466 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or1466 .tuple_like = tree.tokens.items(.tag)[main_token] != .identifier or
1467 tree.tokens.items(.tag)[main_token + 1] != .colon,1467 tree.tokens.items(.tag)[main_token + 1] != .colon,
1468 });1468 });
...@@ -2565,8 +2565,8 @@ pub const full = struct {...@@ -2565,8 +2565,8 @@ pub const full = struct {
2565 pub const Components = struct {2565 pub const Components = struct {
2566 main_token: TokenIndex,2566 main_token: TokenIndex,
2567 type_expr: Node.Index,2567 type_expr: Node.Index,
2568 value_expr: Node.Index,
2569 align_expr: Node.Index,2568 align_expr: Node.Index,
2569 value_expr: Node.Index,
2570 tuple_like: bool,2570 tuple_like: bool,
2571 };2571 };
25722572
...@@ -3427,8 +3427,8 @@ pub const Node = struct {...@@ -3427,8 +3427,8 @@ pub const Node = struct {
3427 };3427 };
34283428
3429 pub const ArrayTypeSentinel = struct {3429 pub const ArrayTypeSentinel = struct {
3430 elem_type: Index,
3431 sentinel: Index,3430 sentinel: Index,
3431 elem_type: Index,
3432 };3432 };
34333433
3434 pub const PtrType = struct {3434 pub const PtrType = struct {
...@@ -3458,8 +3458,8 @@ pub const Node = struct {...@@ -3458,8 +3458,8 @@ pub const Node = struct {
3458 };3458 };
34593459
3460 pub const ContainerField = struct {3460 pub const ContainerField = struct {
3461 value_expr: Index,
3462 align_expr: Index,3461 align_expr: Index,
3462 value_expr: Index,
3463 };3463 };
34643464
3465 pub const GlobalVarDecl = struct {3465 pub const GlobalVarDecl = struct {
lib/std/zig/Parse.zig+2-2
...@@ -919,8 +919,8 @@ fn expectContainerField(p: *Parse) !Node.Index {...@@ -919,8 +919,8 @@ fn expectContainerField(p: *Parse) !Node.Index {
919 .data = .{919 .data = .{
920 .lhs = type_expr,920 .lhs = type_expr,
921 .rhs = try p.addExtra(Node.ContainerField{921 .rhs = try p.addExtra(Node.ContainerField{
922 .value_expr = value_expr,
923 .align_expr = align_expr,922 .align_expr = align_expr,
923 .value_expr = value_expr,
924 }),924 }),
925 },925 },
926 });926 });
...@@ -2049,8 +2049,8 @@ fn parseTypeExpr(p: *Parse) Error!Node.Index {...@@ -2049,8 +2049,8 @@ fn parseTypeExpr(p: *Parse) Error!Node.Index {
2049 .data = .{2049 .data = .{
2050 .lhs = len_expr,2050 .lhs = len_expr,
2051 .rhs = try p.addExtra(Node.ArrayTypeSentinel{2051 .rhs = try p.addExtra(Node.ArrayTypeSentinel{
2052 .elem_type = elem_type,
2053 .sentinel = sentinel,2052 .sentinel = sentinel,
2053 .elem_type = elem_type,
2054 }),2054 }),
2055 },2055 },
2056 });2056 });