Skip to content

Commit da18c9f

Browse files
jeannielynnmoultonjeannielynnmoulton
committed
Change variables named code_type to method_type
This is for variables that have been changed to java_method_typet from code_typet
1 parent f1bd41e commit da18c9f

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎jbmc/src/java_bytecode/expr2java.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ std::string expr2javat::convert_code_function_call(
5656
dest+='=';
5757
}
5858

59-
const java_method_typet &code_type =
59+
const java_method_typet &method_type =
6060
to_java_method_type(src.function().type());
6161

62-
bool has_this = code_type.has_this() && !src.arguments().empty();
62+
bool has_this = method_type.has_this() && !src.arguments().empty();
6363

6464
if(has_this)
6565
{
@@ -283,7 +283,7 @@ std::string expr2javat::convert_rec(
283283
return q+"byte"+d;
284284
else if(src.id()==ID_code)
285285
{
286-
const java_method_typet &code_type = to_java_method_type(src);
286+
const java_method_typet &method_type = to_java_method_type(src);
287287

288288
// Java doesn't really have syntax for function types,
289289
// so we make one up, loosely inspired by the syntax
@@ -292,7 +292,7 @@ std::string expr2javat::convert_rec(
292292
std::string dest="";
293293

294294
dest+='(';
295-
const java_method_typet::parameterst &parameters = code_type.parameters();
295+
const java_method_typet::parameterst &parameters = method_type.parameters();
296296

297297
for(java_method_typet::parameterst::const_iterator it = parameters.begin();
298298
it != parameters.end();
@@ -304,7 +304,7 @@ std::string expr2javat::convert_rec(
304304
dest+=convert(it->type());
305305
}
306306

307-
if(code_type.has_ellipsis())
307+
if(method_type.has_ellipsis())
308308
{
309309
if(!parameters.empty())
310310
dest+=", ";
@@ -313,7 +313,7 @@ std::string expr2javat::convert_rec(
313313

314314
dest+=')';
315315

316-
const typet &return_type = code_type.return_type();
316+
const typet &return_type = method_type.return_type();
317317
dest+=" -> "+convert(return_type);
318318

319319
return q + dest;

‎jbmc/src/java_bytecode/java_bytecode_convert_method.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,9 +1251,9 @@ codet java_bytecode_convert_methodt::convert_instructions(
12511251
id2string(arg0.get(ID_identifier))==
12521252
"java::org.cprover.CProver.assume:(Z)V")
12531253
{
1254-
const java_method_typet &code_type = to_java_method_type(arg0.type());
1254+
const java_method_typet &method_type = to_java_method_type(arg0.type());
12551255
INVARIANT(
1256-
code_type.parameters().size() == 1,
1256+
method_type.parameters().size() == 1,
12571257
"function expected to have exactly one parameter");
12581258
c = replace_call_to_cprover_assume(i_it->source_location, c);
12591259
}
@@ -2107,8 +2107,8 @@ void java_bytecode_convert_methodt::convert_invoke(
21072107
const bool is_virtual(
21082108
statement == "invokevirtual" || statement == "invokeinterface");
21092109

2110-
java_method_typet &code_type = to_java_method_type(arg0.type());
2111-
java_method_typet::parameterst &parameters(code_type.parameters());
2110+
java_method_typet &method_type = to_java_method_type(arg0.type());
2111+
java_method_typet::parameterst &parameters(method_type.parameters());
21122112

21132113
if(use_this)
21142114
{
@@ -2124,10 +2124,10 @@ void java_bytecode_convert_methodt::convert_invoke(
21242124
{
21252125
if(needed_lazy_methods)
21262126
needed_lazy_methods->add_needed_class(classname);
2127-
code_type.set_is_constructor();
2127+
method_type.set_is_constructor();
21282128
}
21292129
else
2130-
code_type.set(ID_java_super_method_call, true);
2130+
method_type.set(ID_java_super_method_call, true);
21312131
}
21322132
reference_typet object_ref_type = java_reference_type(thistype);
21332133
java_method_typet::parametert this_p(object_ref_type);
@@ -2172,7 +2172,7 @@ void java_bytecode_convert_methodt::convert_invoke(
21722172

21732173
// do some type adjustment for return values
21742174

2175-
const typet &return_type = code_type.return_type();
2175+
const typet &return_type = method_type.return_type();
21762176

21772177
if(return_type.id() != ID_empty)
21782178
{
@@ -2947,11 +2947,11 @@ optionalt<exprt> java_bytecode_convert_methodt::convert_invoke_dynamic(
29472947
const source_locationt &location,
29482948
const exprt &arg0)
29492949
{
2950-
const java_method_typet &code_type = to_java_method_type(arg0.type());
2950+
const java_method_typet &method_type = to_java_method_type(arg0.type());
29512951

29522952
const optionalt<symbolt> &lambda_method_symbol = get_lambda_method_symbol(
29532953
lambda_method_handles,
2954-
code_type.get_int(ID_java_lambda_method_handle_index));
2954+
method_type.get_int(ID_java_lambda_method_handle_index));
29552955
if(lambda_method_symbol.has_value())
29562956
debug() << "Converting invokedynamic for lambda: "
29572957
<< lambda_method_symbol.value().name << eom;
@@ -2960,11 +2960,11 @@ optionalt<exprt> java_bytecode_convert_methodt::convert_invoke_dynamic(
29602960
"type"
29612961
<< eom;
29622962

2963-
const java_method_typet::parameterst &parameters(code_type.parameters());
2963+
const java_method_typet::parameterst &parameters(method_type.parameters());
29642964

29652965
pop(parameters.size());
29662966

2967-
const typet &return_type = code_type.return_type();
2967+
const typet &return_type = method_type.return_type();
29682968

29692969
if(return_type.id() == ID_empty)
29702970
return {};
@@ -3023,11 +3023,11 @@ void java_bytecode_initialize_parameter_names(
30233023
{
30243024
// Obtain a std::vector of java_method_typet::parametert objects from the
30253025
// (function) type of the symbol
3026-
java_method_typet &code_type = to_java_method_type(method_symbol.type);
3027-
java_method_typet::parameterst &parameters = code_type.parameters();
3026+
java_method_typet &method_type = to_java_method_type(method_symbol.type);
3027+
java_method_typet::parameterst &parameters = method_type.parameters();
30283028

30293029
// Find number of parameters
3030-
unsigned slots_for_parameters = java_method_parameter_slots(code_type);
3030+
unsigned slots_for_parameters = java_method_parameter_slots(method_type);
30313031

30323032
// Find parameter names in the local variable table:
30333033
typedef std::pair<irep_idt, irep_idt> base_name_and_identifiert;

‎jbmc/src/java_bytecode/java_bytecode_typecheck_type.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ void java_bytecode_typecheckt::typecheck_type(typet &type)
3838
}
3939
else if(type.id()==ID_code)
4040
{
41-
java_method_typet &code_type = to_java_method_type(type);
42-
typecheck_type(code_type.return_type());
41+
java_method_typet &method_type = to_java_method_type(type);
42+
typecheck_type(method_type.return_type());
4343

44-
java_method_typet::parameterst &parameters = code_type.parameters();
44+
java_method_typet::parameterst &parameters = method_type.parameters();
4545

4646
for(java_method_typet::parameterst::iterator it = parameters.begin();
4747
it != parameters.end();

‎jbmc/src/java_bytecode/java_types.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,13 +974,13 @@ std::string pretty_java_type(const typet &type)
974974
return "?";
975975
}
976976

977-
std::string pretty_signature(const java_method_typet &code_type)
977+
std::string pretty_signature(const java_method_typet &method_type)
978978
{
979979
std::ostringstream result;
980980
result << '(';
981981

982982
bool first = true;
983-
for(const auto p : code_type.parameters())
983+
for(const auto p : method_type.parameters())
984984
{
985985
if(p.get_this())
986986
continue;

‎jbmc/unit/java-testing-utils/require_type.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct_union_typet::componentt require_type::require_component(
5454

5555
/// Checks a type is a code_type (i.e. a function)
5656
/// \param type: The type to check
57-
/// \return The cast version of the type code_type
57+
/// \return The cast version of the type method_type
5858
java_method_typet require_type::require_code(const typet &type)
5959
{
6060
REQUIRE(type.id() == ID_code);
@@ -70,9 +70,9 @@ java_method_typet require_type::require_code(const typet &type)
7070
java_method_typet
7171
require_type::require_code(const typet &type, const size_t num_params)
7272
{
73-
java_method_typet code_type = require_code(type);
74-
REQUIRE(code_type.parameters().size() == num_params);
75-
return code_type;
73+
java_method_typet method_type = require_code(type);
74+
REQUIRE(method_type.parameters().size() == num_params);
75+
return method_type;
7676
}
7777

7878
/// Verify that a function has a parameter of a specific name.

‎jbmc/unit/util/parameter_indices.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
void check_consistency(const symbolt &symbol)
1414
{
15-
const auto &code_type = to_java_method_type(symbol.type);
16-
auto parameter_ids = code_type.parameter_identifiers();
17-
auto parameter_indices = code_type.parameter_indices();
15+
const auto &method_type = to_java_method_type(symbol.type);
16+
auto parameter_ids = method_type.parameter_identifiers();
17+
auto parameter_indices = method_type.parameter_indices();
1818

1919
REQUIRE(parameter_ids.size() == parameter_indices.size());
2020
for(std::size_t i = 0; i < parameter_ids.size(); ++i)

0 commit comments

Comments
 (0)