Skip to content

Commit 3a46525

Browse files
author
thk123
committed
Renaming generic_tag to generic_name since not a tag
1 parent 58f8482 commit 3a46525

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/java_bytecode/generate_java_generic_type.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ symbolt generate_java_generic_typet::operator()(
4242
const java_generic_class_typet &generic_class_definition =
4343
to_java_generic_class_type(to_java_class_type(pointer_subtype));
4444

45-
const irep_idt new_tag =
46-
build_generic_tag(existing_generic_type, generic_class_definition);
45+
const irep_idt generic_name =
46+
build_generic_name(existing_generic_type, generic_class_definition);
4747
struct_union_typet::componentst replacement_components =
4848
generic_class_definition.components();
4949

@@ -74,7 +74,7 @@ symbolt generate_java_generic_typet::operator()(
7474
"All components in the original class should be in the new class");
7575

7676
const java_specialized_generic_class_typet new_java_class{
77-
new_tag,
77+
generic_name,
7878
generic_class_definition.get_tag(),
7979
replacement_components,
8080
existing_generic_type.generic_type_arguments()};
@@ -90,7 +90,7 @@ symbolt generate_java_generic_typet::operator()(
9090
<< " already exists" << messaget::eom;
9191
}
9292

93-
const auto expected_symbol="java::"+id2string(new_tag);
93+
const auto expected_symbol="java::"+id2string(generic_name);
9494
auto symbol=symbol_table.lookup(expected_symbol);
9595
INVARIANT(symbol, "New class not created");
9696
return *symbol;
@@ -188,7 +188,7 @@ typet generate_java_generic_typet::substitute_type(
188188
/// \param existing_generic_type The type we want to concretise
189189
/// \param original_class
190190
/// \return A tag for the new generic we want a unique tag for.
191-
irep_idt generate_java_generic_typet::build_generic_tag(
191+
irep_idt generate_java_generic_typet::build_generic_name(
192192
const java_generic_typet &existing_generic_type,
193193
const java_class_typet &original_class) const
194194
{

src/java_bytecode/generate_java_generic_type.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class generate_java_generic_typet
2323
const java_generic_typet &existing_generic_type,
2424
symbol_tablet &symbol_table) const;
2525
private:
26-
irep_idt build_generic_tag(
26+
irep_idt build_generic_name(
2727
const java_generic_typet &existing_generic_type,
2828
const java_class_typet &original_class) const;
2929

0 commit comments

Comments
 (0)