Merge pull request #6184 from tadeokondrak/TrailerFlags-update

std.meta.TrailerFlags: use @Type to improve API

1 files changed, 23 insertions, 23 deletions

diff --git a/src-self-hosted/Module.zig b/src-self-hosted/Module.zig
index dd4e8fea1e..c476c307d2 100644
--- a/src-self-hosted/Module.zig
+++ b/src-self-hosted/Module.zig
@@ -1256,8 +1256,8 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             };
             defer fn_type_scope.instructions.deinit(self.gpa);
 
-            decl.is_pub = fn_proto.getTrailer("visib_token") != null;
-            const body_node = fn_proto.getTrailer("body_node") orelse
+            decl.is_pub = fn_proto.getVisibToken() != null;
+            const body_node = fn_proto.getBodyNode() orelse
                 return self.failTok(&fn_type_scope.base, fn_proto.fn_token, "TODO implement extern functions", .{});
 
             const param_decls = fn_proto.params();
@@ -1276,19 +1276,19 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
                 };
                 param_types[i] = try astgen.expr(self, &fn_type_scope.base, type_type_rl, param_type_node);
             }
-            if (fn_proto.getTrailer("var_args_token")) |var_args_token| {
+            if (fn_proto.getVarArgsToken()) |var_args_token| {
                 return self.failTok(&fn_type_scope.base, var_args_token, "TODO implement var args", .{});
             }
-            if (fn_proto.getTrailer("lib_name")) |lib_name| {
+            if (fn_proto.getLibName()) |lib_name| {
                 return self.failNode(&fn_type_scope.base, lib_name, "TODO implement function library name", .{});
             }
-            if (fn_proto.getTrailer("align_expr")) |align_expr| {
+            if (fn_proto.getAlignExpr()) |align_expr| {
                 return self.failNode(&fn_type_scope.base, align_expr, "TODO implement function align expression", .{});
             }
-            if (fn_proto.getTrailer("section_expr")) |sect_expr| {
+            if (fn_proto.getSectionExpr()) |sect_expr| {
                 return self.failNode(&fn_type_scope.base, sect_expr, "TODO implement function section expression", .{});
             }
-            if (fn_proto.getTrailer("callconv_expr")) |callconv_expr| {
+            if (fn_proto.getCallconvExpr()) |callconv_expr| {
                 return self.failNode(
                     &fn_type_scope.base,
                     callconv_expr,
@@ -1430,10 +1430,10 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
                 self.bin_file.freeDecl(decl);
             }
 
-            if (fn_proto.getTrailer("extern_export_inline_token")) |maybe_export_token| {
+            if (fn_proto.getExternExportInlineToken()) |maybe_export_token| {
                 if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                     const export_src = tree.token_locs[maybe_export_token].start;
-                    const name_loc = tree.token_locs[fn_proto.getTrailer("name_token").?];
+                    const name_loc = tree.token_locs[fn_proto.getNameToken().?];
                     const name = tree.tokenSliceLoc(name_loc);
                     // The scope needs to have the decl in it.
                     try self.analyzeExport(&block_scope.base, export_src, name, decl);
@@ -1460,37 +1460,37 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             };
             defer block_scope.instructions.deinit(self.gpa);
 
-            decl.is_pub = var_decl.getTrailer("visib_token") != null;
+            decl.is_pub = var_decl.getVisibToken() != null;
             const is_extern = blk: {
-                const maybe_extern_token = var_decl.getTrailer("extern_export_token") orelse
+                const maybe_extern_token = var_decl.getExternExportToken() orelse
                     break :blk false;
                 if (tree.token_ids[maybe_extern_token] != .Keyword_extern) break :blk false;
-                if (var_decl.getTrailer("init_node")) |some| {
+                if (var_decl.getInitNode()) |some| {
                     return self.failNode(&block_scope.base, some, "extern variables have no initializers", .{});
                 }
                 break :blk true;
             };
-            if (var_decl.getTrailer("lib_name")) |lib_name| {
+            if (var_decl.getLibName()) |lib_name| {
                 assert(is_extern);
                 return self.failNode(&block_scope.base, lib_name, "TODO implement function library name", .{});
             }
             const is_mutable = tree.token_ids[var_decl.mut_token] == .Keyword_var;
-            const is_threadlocal = if (var_decl.getTrailer("thread_local_token")) |some| blk: {
+            const is_threadlocal = if (var_decl.getThreadLocalToken()) |some| blk: {
                 if (!is_mutable) {
                     return self.failTok(&block_scope.base, some, "threadlocal variable cannot be constant", .{});
                 }
                 break :blk true;
             } else false;
-            assert(var_decl.getTrailer("comptime_token") == null);
-            if (var_decl.getTrailer("align_node")) |align_expr| {
+            assert(var_decl.getComptimeToken() == null);
+            if (var_decl.getAlignNode()) |align_expr| {
                 return self.failNode(&block_scope.base, align_expr, "TODO implement function align expression", .{});
             }
-            if (var_decl.getTrailer("section_node")) |sect_expr| {
+            if (var_decl.getSectionNode()) |sect_expr| {
                 return self.failNode(&block_scope.base, sect_expr, "TODO implement function section expression", .{});
             }
 
             const explicit_type = blk: {
-                const type_node = var_decl.getTrailer("type_node") orelse
+                const type_node = var_decl.getTypeNode() orelse
                     break :blk null;
 
                 // Temporary arena for the zir instructions.
@@ -1517,7 +1517,7 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             };
 
             var var_type: Type = undefined;
-            const value: ?Value = if (var_decl.getTrailer("init_node")) |init_node| blk: {
+            const value: ?Value = if (var_decl.getInitNode()) |init_node| blk: {
                 var gen_scope_arena = std.heap.ArenaAllocator.init(self.gpa);
                 defer gen_scope_arena.deinit();
                 var gen_scope: Scope.GenZIR = .{
@@ -1602,7 +1602,7 @@ fn astGenAndAnalyzeDecl(self: *Module, decl: *Decl) !bool {
             decl.analysis = .complete;
             decl.generation = self.generation;
 
-            if (var_decl.getTrailer("extern_export_token")) |maybe_export_token| {
+            if (var_decl.getExternExportToken()) |maybe_export_token| {
                 if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                     const export_src = tree.token_locs[maybe_export_token].start;
                     const name_loc = tree.token_locs[var_decl.name_token];
@@ -1768,7 +1768,7 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
     for (decls) |src_decl, decl_i| {
         if (src_decl.cast(ast.Node.FnProto)) |fn_proto| {
             // We will create a Decl for it regardless of analysis status.
-            const name_tok = fn_proto.getTrailer("name_token") orelse {
+            const name_tok = fn_proto.getNameToken() orelse {
                 @panic("TODO missing function name");
             };
 
@@ -1804,7 +1804,7 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
             } else {
                 const new_decl = try self.createNewDecl(&root_scope.base, name, decl_i, name_hash, contents_hash);
                 root_scope.decls.appendAssumeCapacity(new_decl);
-                if (fn_proto.getTrailer("extern_export_inline_token")) |maybe_export_token| {
+                if (fn_proto.getExternExportInlineToken()) |maybe_export_token| {
                     if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                         self.work_queue.writeItemAssumeCapacity(.{ .analyze_decl = new_decl });
                     }
@@ -1831,7 +1831,7 @@ fn analyzeRootSrcFile(self: *Module, root_scope: *Scope.File) !void {
             } else {
                 const new_decl = try self.createNewDecl(&root_scope.base, name, decl_i, name_hash, contents_hash);
                 root_scope.decls.appendAssumeCapacity(new_decl);
-                if (var_decl.getTrailer("extern_export_token")) |maybe_export_token| {
+                if (var_decl.getExternExportToken()) |maybe_export_token| {
                     if (tree.token_ids[maybe_export_token] == .Keyword_export) {
                         self.work_queue.writeItemAssumeCapacity(.{ .analyze_decl = new_decl });
                     }