Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/InternPool.zig
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,12 @@ pub const Key = union(enum) {
return @intCast(u32, field_index);
}
// Auto-numbered enum. Convert `int_tag_val` to field index.
switch (ip.indexToKey(int_tag_val).int.storage) {
.u64 => |x| {
if (x >= self.names.len) return null;
return @intCast(u32, x);
},
.i64, .big_int => return null, // out of range
const field_index = switch (ip.indexToKey(int_tag_val).int.storage) {
inline .u64, .i64 => |x| std.math.cast(u32, x) orelse return null,
.big_int => |x| x.to(u32) catch return null,
.lazy_align, .lazy_size => unreachable,
}
};
return if (field_index < self.names.len) field_index else null;
}
};

Expand Down
15 changes: 15 additions & 0 deletions test/behavior/enum.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1197,3 +1197,18 @@ test "enum tag from a local variable" {
const i = @enumFromInt(S.Int(u32), 0);
try std.testing.expect(@intFromEnum(i) == 0);
}

test "auto-numbered enum with signed tag type" {
const E = enum(i32) { a, b };

try std.testing.expectEqual(@as(i32, 0), @intFromEnum(E.a));
try std.testing.expectEqual(@as(i32, 1), @intFromEnum(E.b));
try std.testing.expectEqual(E.a, @enumFromInt(E, 0));
try std.testing.expectEqual(E.b, @enumFromInt(E, 1));
try std.testing.expectEqual(E.a, @enumFromInt(E, @as(i32, 0)));
try std.testing.expectEqual(E.b, @enumFromInt(E, @as(i32, 1)));
try std.testing.expectEqual(E.a, @enumFromInt(E, @as(u32, 0)));
try std.testing.expectEqual(E.b, @enumFromInt(E, @as(u32, 1)));
try std.testing.expectEqualStrings("a", @tagName(E.a));
try std.testing.expectEqualStrings("b", @tagName(E.b));
}