diff --git a/src/Class.zig b/src/Class.zig index d244335..e0d0244 100644 --- a/src/Class.zig +++ b/src/Class.zig @@ -57,7 +57,7 @@ pub fn parse(input: *std.Io.Reader, allocator: std.mem.Allocator) (ParseError || var constant_pool: ConstantPool = try .parse(input, allocator); errdefer constant_pool.deinit(allocator); - const access_flags: ClassAccessFlags = .{ .mask = try input.takeInt(u16, .big) }; + const access_flags: ClassAccessFlags = .from(try input.takeInt(u16, .big)); const this_class = try input.takeInt(u16, .big); const super_class = try input.takeInt(u16, .big); diff --git a/src/Class/AttributeInfo.zig b/src/Class/AttributeInfo.zig index ceadc65..45eec02 100644 --- a/src/Class/AttributeInfo.zig +++ b/src/Class/AttributeInfo.zig @@ -1200,7 +1200,7 @@ pub const InnerClasses = struct { .inner_class_info_index = try input.takeInt(u16, .big), .outer_class_info_index = try input.takeInt(u16, .big), .inner_name_index = try input.takeInt(u16, .big), - .inner_class_access_flags = .{ .mask = try input.takeInt(u16, .big) }, + .inner_class_access_flags = .from(try input.takeInt(u16, .big)), }; } @@ -2491,7 +2491,7 @@ pub const MethodParameters = struct { for (parameters) |*parameter| { parameter.* = .{ .name_index = try input.takeInt(u16, .big), - .access_flags = .{ .mask = try input.takeInt(u16, .big) }, + .access_flags = .from(try input.takeInt(u16, .big)), }; } @@ -2695,7 +2695,7 @@ pub const Module = struct { pub fn parse(input: *std.Io.Reader, allocator: std.mem.Allocator) ParseError!Self { const module_name_index = try input.takeInt(u16, .big); - const module_flags: ModuleFlags = .{ .mask = try input.takeInt(u16, .big) }; + const module_flags: ModuleFlags = .from(try input.takeInt(u16, .big)); const module_version_index = try input.takeInt(u16, .big); const requires_count = try input.takeInt(u16, .big); @@ -2703,7 +2703,7 @@ pub const Module = struct { errdefer allocator.free(requires); for (requires) |*r| { const requires_index = try input.takeInt(u16, .big); - const requires_flags: Requires.RequiresFlags = .{ .mask = try input.takeInt(u16, .big) }; + const requires_flags: Requires.RequiresFlags = .from(try input.takeInt(u16, .big)); const requires_version_index = try input.takeInt(u16, .big); r.* = .{ .requires_index = requires_index, @@ -2717,7 +2717,7 @@ pub const Module = struct { errdefer allocator.free(exports); for (exports) |*e| { const exports_index = try input.takeInt(u16, .big); - const exports_flags: Exports.ExportsFlags = .{ .mask = try input.takeInt(u16, .big) }; + const exports_flags: Exports.ExportsFlags = .from(try input.takeInt(u16, .big)); const exports_to_count = try input.takeInt(u16, .big); const exports_to_indeces = try allocator.alloc(u16, exports_to_count); errdefer allocator.free(exports_to_indeces); @@ -2736,7 +2736,7 @@ pub const Module = struct { errdefer allocator.free(opens); for (opens) |*o| { const opens_index = try input.takeInt(u16, .big); - const opens_flags: Opens.OpensFlags = .{ .mask = try input.takeInt(u16, .big) }; + const opens_flags: Opens.OpensFlags = .from(try input.takeInt(u16, .big)); const opens_to_count = try input.takeInt(u16, .big); const opens_to_indeces = try allocator.alloc(u16, opens_to_count); errdefer allocator.free(opens_to_indeces); diff --git a/src/Class/FieldInfo.zig b/src/Class/FieldInfo.zig index 46746e6..fb16e55 100644 --- a/src/Class/FieldInfo.zig +++ b/src/Class/FieldInfo.zig @@ -27,7 +27,7 @@ pub const FieldAccessFlags = EnumFlags(enum(u16) { }); pub fn parse(input: *std.Io.Reader, constant_pool: ConstantPool, allocator: std.mem.Allocator) !Self { - const access_flags: FieldAccessFlags = .{ .mask = try input.takeInt(u16, .big) }; + const access_flags: FieldAccessFlags = .from(try input.takeInt(u16, .big)); const name_index = try input.takeInt(u16, .big); const descriptor_index = try input.takeInt(u16, .big); const attributes = try Class.parseAttributes(input, constant_pool, allocator); diff --git a/src/Class/MethodInfo.zig b/src/Class/MethodInfo.zig index 2650061..7d97300 100644 --- a/src/Class/MethodInfo.zig +++ b/src/Class/MethodInfo.zig @@ -30,7 +30,7 @@ pub const MethodAccessFlags = EnumFlags(enum(u16) { }); pub fn parse(input: *std.Io.Reader, constant_pool: ConstantPool, allocator: std.mem.Allocator) !Self { - const access_flags: MethodAccessFlags = .{ .mask = try input.takeInt(u16, .big) }; + const access_flags: MethodAccessFlags = .from(try input.takeInt(u16, .big)); const name_index = try input.takeInt(u16, .big); const descriptor_index = try input.takeInt(u16, .big); const attributes = try Class.parseAttributes(input, constant_pool, allocator); diff --git a/src/EnumFlags.zig b/src/EnumFlags.zig index 9b5da99..80c7e40 100644 --- a/src/EnumFlags.zig +++ b/src/EnumFlags.zig @@ -10,6 +10,12 @@ pub fn EnumFlags(comptime E: type) type { pub const empty: Self = .{ .data = 0 }; + pub fn from(mask: BackingInt) Self { + return .{ + .mask = mask, + }; + } + pub fn contains(self: Self, flag: E) bool { return (self.mask & @intFromEnum(flag)) != 0; }