Skip to content

Commit 21a33fa

Browse files
author
thk123
committed
Renaming to_java_generic_class_type to remove spurious s
1 parent 94ffce3 commit 21a33fa

11 files changed

+41
-44
lines changed

‎src/java_bytecode/generate_java_generic_type.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ symbolt generate_java_generic_typet::operator()(
4848
{
4949
if(is_java_generic_parameter(component.type()))
5050
{
51-
auto replacement_type_param=
52-
to_java_generics_class_type(replacement_type);
51+
auto replacement_type_param =
52+
to_java_generic_class_type(replacement_type);
5353

5454
auto component_identifier=
5555
to_java_generic_parameter(component.type()).type_variable()

‎src/java_bytecode/java_bytecode_convert_class.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void java_bytecode_convert_classt::convert(const classt &c)
9797
java_class_typet class_type;
9898
if(c.signature.has_value() && c.signature.value()[0]=='<')
9999
{
100-
java_generics_class_typet generic_class_type;
100+
java_generic_class_typet generic_class_type;
101101
#ifdef DEBUG
102102
std::cout << "INFO: found generic class signature "
103103
<< c.signature.value()

‎src/java_bytecode/java_types.h

+18-21
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,12 @@ inline java_generic_typet &to_java_generic_type(typet &type)
254254
/// vector of java_generic_type variables.
255255
///
256256
/// For example, a class definition `class MyGenericClass<T>`
257-
class java_generics_class_typet:public java_class_typet
257+
class java_generic_class_typet : public java_class_typet
258258
{
259259
public:
260260
typedef std::vector<java_generic_parametert> generic_typest;
261261

262-
java_generics_class_typet()
262+
java_generic_class_typet()
263263
{
264264
set(ID_C_java_generics_class_type, true);
265265
}
@@ -277,27 +277,27 @@ class java_generics_class_typet:public java_class_typet
277277

278278
/// \param type: the type to check
279279
/// \return true if type is a java class type with generics
280-
inline bool is_java_generics_class_type(const typet &type)
280+
inline bool is_java_generic_class_type(const typet &type)
281281
{
282282
return type.get_bool(ID_C_java_generics_class_type);
283283
}
284284

285285
/// \param type: the type to check
286286
/// \return cast of type to java_generics_class_typet
287-
inline const java_generics_class_typet &to_java_generics_class_type(
288-
const java_class_typet &type)
287+
inline const java_generic_class_typet &
288+
to_java_generic_class_type(const java_class_typet &type)
289289
{
290-
PRECONDITION(is_java_generics_class_type(type));
291-
return static_cast<const java_generics_class_typet &>(type);
290+
PRECONDITION(is_java_generic_class_type(type));
291+
return static_cast<const java_generic_class_typet &>(type);
292292
}
293293

294294
/// \param type: source type
295295
/// \return cast of type into a java class type with generics
296-
inline java_generics_class_typet &to_java_generics_class_type(
297-
java_class_typet &type)
296+
inline java_generic_class_typet &
297+
to_java_generic_class_type(java_class_typet &type)
298298
{
299-
PRECONDITION(is_java_generics_class_type(type));
300-
return static_cast<java_generics_class_typet &>(type);
299+
PRECONDITION(is_java_generic_class_type(type));
300+
return static_cast<java_generic_class_typet &>(type);
301301
}
302302

303303
/// Access information of instantiated type params of java instantiated type.
@@ -318,9 +318,8 @@ inline const typet &java_generic_get_inst_type(
318318
/// \param index: the index of the type variable
319319
/// \param type: the type from which to extract the type variable
320320
/// \return the name of the generic type variable of t at the given index
321-
inline const irep_idt &java_generics_class_type_var(
322-
size_t index,
323-
const java_generics_class_typet &type)
321+
inline const irep_idt &
322+
java_generic_class_type_var(size_t index, const java_generic_class_typet &type)
324323
{
325324
const std::vector<java_generic_parametert> &gen_types=type.generic_types();
326325

@@ -334,13 +333,11 @@ inline const irep_idt &java_generics_class_type_var(
334333
/// \param index: the index of the type variable
335334
/// \param t: the type from which to extract the type bound
336335
/// \return the type of the bound of the type variable
337-
inline const typet &java_generics_class_type_bound(
338-
size_t index,
339-
const typet &t)
336+
inline const typet &java_generic_class_type_bound(size_t index, const typet &t)
340337
{
341-
PRECONDITION(is_java_generics_class_type(t));
342-
const java_generics_class_typet &type=
343-
to_java_generics_class_type(to_java_class_type(t));
338+
PRECONDITION(is_java_generic_class_type(t));
339+
const java_generic_class_typet &type =
340+
to_java_generic_class_type(to_java_class_type(t));
344341
const std::vector<java_generic_parametert> &gen_types=type.generic_types();
345342

346343
PRECONDITION(index<gen_types.size());
@@ -381,7 +378,7 @@ inline typet java_type_from_string_with_exception(
381378
/// \param identifier The string identifier of the type of the component.
382379
/// \return Optional with the size if the identifier was found.
383380
inline const optionalt<size_t> java_generics_get_index_for_subtype(
384-
const java_generics_class_typet &t,
381+
const java_generic_class_typet &t,
385382
const irep_idt &identifier)
386383
{
387384
const std::vector<java_generic_parametert> &gen_types=

‎unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SCENARIO(
3232
THEN("The symbol type should be generic")
3333
{
3434
const symbolt &class_symbol = new_symbol_table.lookup_ref(inner_name);
35-
const java_generics_class_typet &java_generics_class_type =
35+
const java_generic_class_typet &java_generic_class_type =
3636
require_type::require_java_generic_class(
3737
class_symbol.type, {inner_name + "::E"});
3838

@@ -56,7 +56,7 @@ SCENARIO(
5656
{
5757
const symbolt &class_symbol =
5858
new_symbol_table.lookup_ref(boundedinner_name);
59-
const java_generics_class_typet &java_generics_class_type =
59+
const java_generic_class_typet &java_generic_class_type =
6060
require_type::require_java_generic_class(
6161
class_symbol.type, {boundedinner_name + "::NUM"});
6262

@@ -96,7 +96,7 @@ SCENARIO(
9696
const symbolt &class_symbol =
9797
new_symbol_table.lookup_ref(doubleboundedinner_name);
9898
// TODO the symbol should be generic - TG-1349
99-
// const java_generics_class_typet &java_generics_class_type =
99+
// const java_generic_class_typet &java_generic_class_type =
100100
// require_type::require_java_generic_class(
101101
// class_symbol.type, {doubleboundedinner_name + "::T"});
102102

@@ -125,7 +125,7 @@ SCENARIO(
125125
{
126126
const symbolt &class_symbol =
127127
new_symbol_table.lookup_ref(twoelementinner_name);
128-
const java_generics_class_typet &java_generics_class_type =
128+
const java_generic_class_typet &java_generic_class_type =
129129
require_type::require_java_generic_class(
130130
class_symbol.type,
131131
{twoelementinner_name + "::K", twoelementinner_name + "::V"});

‎unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SCENARIO(
4444
REQUIRE(new_symbol_table.has_symbol(class_prefix));
4545

4646
const symbolt &derived_symbol = new_symbol_table.lookup_ref(class_prefix);
47-
const java_generics_class_typet &derived_class_type =
47+
const java_generic_class_typet &derived_class_type =
4848
require_type::require_java_generic_class(
4949
derived_symbol.type, {class_prefix + "::T"});
5050

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ SCENARIO(
2121
REQUIRE(new_symbol_table.has_symbol(class_prefix));
2222

2323
const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
24-
const java_generics_class_typet &java_generic_class =
24+
const java_generic_class_typet &java_generic_class =
2525
require_type::require_java_generic_class(
2626
class_symbol.type, {class_prefix + "::T"});
2727

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SCENARIO(
2626
REQUIRE(new_symbol_table.has_symbol(class_prefix));
2727

2828
const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
29-
const java_generics_class_typet &java_generics_class =
29+
const java_generic_class_typet &java_generic_class =
3030
require_type::require_java_generic_class(
3131
class_symbol.type, {class_prefix + "::T"});
3232

@@ -79,7 +79,7 @@ SCENARIO(
7979
REQUIRE(new_symbol_table.has_symbol(class_prefix));
8080

8181
const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
82-
const java_generics_class_typet &java_generics_class =
82+
const java_generic_class_typet &java_generic_class =
8383
require_type::require_java_generic_class(
8484
class_symbol.type, {class_prefix + "::T", class_prefix + "::U"});
8585

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SCENARIO(
2525
{
2626
REQUIRE(new_symbol_table.has_symbol(class_prefix));
2727
const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
28-
const java_generics_class_typet &java_generic_class =
28+
const java_generic_class_typet &java_generic_class =
2929
require_type::require_java_generic_class(
3030
class_symbol.type, {class_prefix + "::T"});
3131

‎unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SCENARIO(
2626
REQUIRE(new_symbol_table.has_symbol(class_prefix));
2727

2828
const symbolt &class_symbol = new_symbol_table.lookup_ref(class_prefix);
29-
const java_generics_class_typet &java_generics_class_type =
29+
const java_generic_class_typet &java_generic_class_type =
3030
require_type::require_java_generic_class(
3131
class_symbol.type, {class_prefix + "::T", class_prefix + "::S"});
3232

‎unit/testing-utils/require_type.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,15 @@ class_typet require_complete_class(const typet &class_type)
234234
/// Verify that a class is a complete, valid java generic class.
235235
/// \param class_type: the class
236236
/// \return: A reference to the java generic class type.
237-
java_generics_class_typet
237+
java_generic_class_typet
238238
require_type::require_java_generic_class(const typet &class_type)
239239
{
240240
const class_typet &class_class_type = require_complete_class(class_type);
241241
java_class_typet java_class_type = to_java_class_type(class_class_type);
242242

243-
REQUIRE(is_java_generics_class_type(java_class_type));
244-
java_generics_class_typet java_generic_class_type =
245-
to_java_generics_class_type(java_class_type);
243+
REQUIRE(is_java_generic_class_type(java_class_type));
244+
java_generic_class_typet java_generic_class_type =
245+
to_java_generic_class_type(java_class_type);
246246

247247
return java_generic_class_type;
248248
}
@@ -252,14 +252,14 @@ require_type::require_java_generic_class(const typet &class_type)
252252
/// \param class_type: the class
253253
/// \param type_variables: vector of type variables
254254
/// \return: A reference to the java generic class type.
255-
java_generics_class_typet require_type::require_java_generic_class(
255+
java_generic_class_typet require_type::require_java_generic_class(
256256
const typet &class_type,
257257
const std::initializer_list<irep_idt> &type_variables)
258258
{
259-
const java_generics_class_typet java_generic_class_type =
259+
const java_generic_class_typet java_generic_class_type =
260260
require_type::require_java_generic_class(class_type);
261261

262-
const java_generics_class_typet::generic_typest &generic_type_vars =
262+
const java_generic_class_typet::generic_typest &generic_type_vars =
263263
java_generic_class_type.generic_types();
264264
REQUIRE(generic_type_vars.size() == type_variables.size());
265265
REQUIRE(
@@ -285,7 +285,7 @@ require_type::require_java_non_generic_class(const typet &class_type)
285285
const class_typet &class_class_type = require_complete_class(class_type);
286286
java_class_typet java_class_type = to_java_class_type(class_class_type);
287287

288-
REQUIRE(!is_java_generics_class_type(java_class_type));
288+
REQUIRE(!is_java_generic_class_type(java_class_type));
289289

290290
return java_class_type;
291291
}

‎unit/testing-utils/require_type.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ const typet &require_java_non_generic_type(
6767
const typet &type,
6868
const optionalt<symbol_typet> &expect_subtype);
6969

70-
java_generics_class_typet require_java_generic_class(const typet &class_type);
70+
java_generic_class_typet require_java_generic_class(const typet &class_type);
7171

72-
java_generics_class_typet require_java_generic_class(
72+
java_generic_class_typet require_java_generic_class(
7373
const typet &class_type,
7474
const std::initializer_list<irep_idt> &type_variables);
7575

0 commit comments

Comments
 (0)