Skip to content

codegen: generate type_identities as const #856

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

Closed
ab9rf wants to merge 1 commit into from
Closed

codegen: generate type_identities as const #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Bitfield.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ sub render_bitfield_core {
emit "static const bitfield_item_info bits[bit_count];";
} "template<> struct ${export_prefix}bitfield_$traits_name ", ";";
emit_block {
emit "static bitfield_identity identity;";
emit "static bitfield_identity *get() { return &identity; }";
emit "static const bitfield_identity identity;";
emit "static const bitfield_identity *get() { return &identity; }";
} "template<> struct ${export_prefix}identity_$traits_name ", ";";
header_ref("Export.h");
header_ref("DataDefs.h");
Expand All @@ -112,7 +112,7 @@ sub render_bitfield_core {
$lines[-1] =~ s/,$//;
} "const bitfield_item_info bitfield_${traits_name}::bits[bit_count] = ", ";";

emit "bitfield_identity identity_${traits_name}::identity(",
emit "const bitfield_identity identity_${traits_name}::identity(",
"sizeof($full_name), ",
type_identity_reference($tag,-parent => 1), ', ',
"\"$name\", bitfield_${traits_name}::bit_count, bitfield_${traits_name}::bits);";
Expand Down
10 changes: 5 additions & 5 deletions Enum.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ sub render_enum_tables($$$$$$) {

with_emit_traits {
emit_block {
emit "static enum_identity identity;";
emit "static enum_identity *get() { return &identity; }";
emit "const static enum_identity identity;";
emit "const static enum_identity *get() { return &identity; }";
} "template<> struct ${export_prefix}identity_$traits_name ", ";";
header_ref("Export.h");
header_ref("DataDefs.h");
Expand Down Expand Up @@ -175,7 +175,7 @@ sub render_enum_tables($$$$$$) {
for (my $i = 0; $i < @anames; $i++) {
emit "$atypes[$i] $anames[$i];";
}
emit "static struct_identity _identity;";
emit "const static struct_identity _identity;";
} "struct attr_entry_type ", ";";
emit "static const attr_entry_type attr_table[", $count, "+1];";
emit "static const attr_entry_type &attrs(enum_type value);";
Expand Down Expand Up @@ -296,7 +296,7 @@ sub render_enum_tables($$$$$$) {
@field_defs = @field_meta;
} $entry_type;

emit "struct_identity ${entry_type}::_identity(",
emit "const struct_identity ${entry_type}::_identity(",
"sizeof($entry_type), NULL, ",
type_identity_reference($tag), ', ',
"\"_attr_entry_type\", NULL, $ftable);";
Expand All @@ -306,7 +306,7 @@ sub render_enum_tables($$$$$$) {
$atable_meta = "&${entry_type}::_identity";
}

emit "enum_identity identity_${traits_name}::identity(",
emit "const enum_identity identity_${traits_name}::identity(",
"sizeof($full_name), ",
type_identity_reference($tag,-parent => 1), ', ',
"\"$name\", TID($base_type), $base, ",
Expand Down
14 changes: 7 additions & 7 deletions StructFields.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,14 +671,14 @@ sub emit_struct_fields($$;%) {

with_emit_traits {
emit_block {
emit "static $identity_type identity;";
emit "static $identity_type *get() { return &identity; }";
emit "static const $identity_type identity;";
emit "static const $identity_type *get() { return &identity; }";
} "template<> struct ${export_prefix}$traits_name ", ";";
};

with_emit_static {
my $ftable = render_field_metadata $tag, $full_name, @fields, %info;
emit "$identity_type ${traits_name}::identity(",
emit "const $identity_type ${traits_name}::identity(",
"sizeof($full_name), &allocator_fn<${full_name}>, ",
type_identity_reference($tag,-parent => 1), ', ',
"\"$name\", NULL, $ftable);";
Expand Down Expand Up @@ -707,13 +707,13 @@ sub emit_struct_fields($$;%) {
my $inherits = $flags{-inherits};
my $original_name = $tag->getAttribute('original-name');

emit "static $identity_type _identity;";
emit "static const $identity_type _identity;";

with_emit_static {
local @simple_inits;
my @ctor_lines = with_emit {
if ($flags{-class}) {
$ctor_args = "virtual_identity *_id";
$ctor_args = "const virtual_identity *_id";
$ctor_arg_init = " = &".$name."::_identity";
push @simple_inits, "$flags{-inherits}(_id)" if $flags{-inherits};
emit "_identity.adjust_vtable(this, _id);";
Expand Down Expand Up @@ -747,14 +747,14 @@ sub emit_struct_fields($$;%) {
my $ftable = render_field_metadata $tag, $full_name, @fields, %info;

if ($flags{-class}) {
emit "virtual_identity ${full_name}::_identity(",
emit "const virtual_identity ${full_name}::_identity(",
"sizeof($full_name), &${alloc_fn}<${full_name}>, ",
"\"$name\", ",
($original_name ? "\"$original_name\"" : 'NULL'), ', ',
($inherits ? "&${inherits}::_identity" : 'NULL'), ', ',
"$ftable);";
} else {
emit "$identity_type ${full_name}::_identity(",
emit "const $identity_type ${full_name}::_identity(",
"sizeof($full_name), &allocator_fn<${full_name}>, ",
type_identity_reference($tag,-parent => 1), ', ',
"\"$name\", ",
Expand Down
Loading