mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-24 15:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
fn ⌃ ⌥ 2023-12-29 08:07:37 -08:00
parent 20cde3f480
commit 75b3feee05
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/std/zig/Ast.zig
View File

@ -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 {

4
lib/std/zig/Parse.zig
View File

@ -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,
}),
},
});