From 777bb9b749d20c455654399283a15267421e70cd Mon Sep 17 00:00:00 2001 From: Altagos Date: Wed, 28 Jan 2026 15:28:18 +0100 Subject: [PATCH] clean up --- src/main.zig | 2 -- src/meta/root.zig | 29 ++++++++++------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/main.zig b/src/main.zig index a7b8be2..bb3b40a 100644 --- a/src/main.zig +++ b/src/main.zig @@ -57,8 +57,6 @@ pub fn main(init: std.process.Init) !void { var client = Client.init(allocator, io, .{ .auth = config.auth, - // .base_url = "http://localhost:4000/test", - // .base_url = "https://api.staging.spacetraders.io/v2", }); defer client.deinit(); diff --git a/src/meta/root.zig b/src/meta/root.zig index 03ce559..6940ed3 100644 --- a/src/meta/root.zig +++ b/src/meta/root.zig @@ -1,10 +1,10 @@ pub fn CombinedEnum(comptime parent: type) type { const parent_info = @typeInfo(parent).@"struct"; - var num_fields = 0; - var num_enums = 0; + comptime var num_fields = 0; + comptime var num_enums = 0; - for (parent_info.decls) |partial| { + inline for (parent_info.decls) |partial| { switch (@typeInfo(@field(parent, partial.name))) { .@"enum" => |e| { num_fields += e.fields.len; @@ -20,14 +20,14 @@ pub fn CombinedEnum(comptime parent: type) type { T: type, }; - var combined: [num_fields][:0]const u8 = undefined; - var combined_values: [num_fields]u8 = undefined; - var conv_map: [num_enums]ConversionMap = undefined; + comptime var combined: [num_fields][:0]const u8 = undefined; + comptime var combined_values: [num_fields]u8 = undefined; + comptime var conv_map: [num_enums]ConversionMap = undefined; - var idx = 0; - var i = 0; + comptime var idx = 0; + comptime var i = 0; - for (parent_info.decls) |partial| { + inline for (parent_info.decls) |partial| { switch (@typeInfo(@field(parent, partial.name))) { .@"enum" => |e| { conv_map[idx] = .{ @@ -48,12 +48,6 @@ pub fn CombinedEnum(comptime parent: type) type { } } - // const combined_enum = @Enum(std.builtin.Type{ .@"enum" = .{ - // .decls = &.{}, - // .fields = &combined, - // .tag_type = u8, - // .is_exhaustive = true, - // } }); const combined_enum = @Enum( u8, .nonexhaustive, @@ -61,13 +55,10 @@ pub fn CombinedEnum(comptime parent: type) type { &combined_values, ); - const combined_enums = num_enums; - const conv_map_const = conv_map; - return struct { pub const Combined = combined_enum; - const conversion_map: [combined_enums]ConversionMap = conv_map_const; + const conversion_map: [num_enums]ConversionMap = conv_map; pub fn originalType(value: @TypeOf(Combined)) type { const int_rep: u8 = @intFromEnum(value); -- 2.51.2