zig

commit 75b3feee05eb8b08fc6441a7e45fd9269ae7bee4 (tree)
parent 20cde3f480462a3b609131dd118623978c26bace
Author: fn ⌃ ⌥ <70830482+FnControlOption@users.noreply.github.com>
Date:   Fri, 29 Dec 2023 08:07:37 -0800

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

Diffstat:
M
lib/std/zig/Ast.zig
 | 
12
++++++------
M
lib/std/zig/Parse.zig
 | 
4
++--

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git 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,
-        .value_expr = extra.value_expr,
         .align_expr = extra.align_expr,
+        .value_expr = extra.value_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,
-        .value_expr = data.rhs,
         .align_expr = 0,
+        .value_expr = data.rhs,
         .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,
-            value_expr: Node.Index,
             align_expr: Node.Index,
+            value_expr: Node.Index,
             tuple_like: bool,
         };
 
@@ -3427,8 +3427,8 @@ pub const Node = struct {
     };
 
     pub const ArrayTypeSentinel = struct {
-        elem_type: Index,
         sentinel: Index,
+        elem_type: Index,
     };
 
     pub const PtrType = struct {
@@ -3458,8 +3458,8 @@ pub const Node = struct {
     };
 
     pub const ContainerField = struct {
-        value_expr: Index,
         align_expr: Index,
+        value_expr: Index,
     };
 
     pub const GlobalVarDecl = struct {
diff --git 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{
-                    .value_expr = value_expr,
                     .align_expr = align_expr,
+                    .value_expr = value_expr,
                 }),
             },
         });
@@ -2049,8 +2049,8 @@ fn parseTypeExpr(p: *Parse) Error!Node.Index {
                             .data = .{
                                 .lhs = len_expr,
                                 .rhs = try p.addExtra(Node.ArrayTypeSentinel{
-                                    .elem_type = elem_type,
                                     .sentinel = sentinel,
+                                    .elem_type = elem_type,
                                 }),
                             },
                         });