Skip to content

generate enum traits as constexpr #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 25, 2025
Merged

generate enum traits as constexpr #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5457803
generate enum traits as `constexpr`
ab9rf Nov 24, 2025
40526c1
Merge branch 'master' into constexpr-codegen
ab9rf Nov 25, 2025
cc8bbcf
fix typo
ab9rf Nov 25, 2025
22416cc
use `using` instead of `typedef`
ab9rf Nov 25, 2025
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
14 changes: 7 additions & 7 deletions Enum.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,18 @@ sub render_enum_tables($$$$$$) {

with_emit_traits {
emit_block {
emit "static const bool is_complex = " . ($complex ? 'true' : 'false') . ";";
emit "typedef $base_type base_type;";
emit "typedef $full_name enum_type;";
emit "static const base_type first_item_value = $base;";
emit "static const base_type last_item_value = $last_value;";
emit "static constexpr bool is_complex = " . ($complex ? 'true' : 'false') . ";";
emit "using base_type = $base_type;";
emit "using enum_type = $full_name;";
emit "static constexpr base_type first_item_value = $base;";
emit "static constexpr base_type last_item_value = $last_value;";
# Cast the enum to integer in order to avoid GCC <= 4.5 assuming the value range is correct.
emit_block {
emit "return (value >= first_item_value && ",
"value <= last_item_value);";
} "static inline bool is_valid(base_type value) ";
emit "static const enum_type first_item = (enum_type)first_item_value;";
emit "static const enum_type last_item = (enum_type)last_item_value;";
emit "static constexpr enum_type first_item = (enum_type)first_item_value;";
emit "static constexpr enum_type last_item = (enum_type)last_item_value;";
emit "static const char *const key_table[", $count, "];";
if ($complex) {
emit "static const DFHack::enum_identity::ComplexData complex;";
Expand Down
3 changes: 3 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ Template for new versions:

# Future

## Structures
- updated codegen to generate enum trait constants as ``constexpr``

## Structures

# 53.06-r1
Expand Down