Skip to content

Commit b709fa9

Browse files
committed
Revert "To revert: language-is-a-messaget"
This reverts commit 1cff071125598991da21b65bdf8650a61538d853.
1 parent 739a125 commit b709fa9

40 files changed

+56
-296
lines changed

jbmc/src/janalyzer/janalyzer_parse_options.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ janalyzer_parse_optionst::janalyzer_parse_optionst(int argc, const char **argv)
6060
void janalyzer_parse_optionst::register_languages()
6161
{
6262
// Need ansi C language for __CPROVER_rounding_mode
63-
register_language(new_ansi_c_language, get_message_handler());
64-
register_language(new_java_bytecode_language, get_message_handler());
63+
register_language(new_ansi_c_language);
64+
register_language(new_java_bytecode_language);
6565
}
6666

6767
void janalyzer_parse_optionst::get_command_line_options(optionst &options)

jbmc/src/java_bytecode/java_bytecode_language.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,9 +1542,9 @@ void java_bytecode_languaget::show_parse(
15421542
}
15431543
}
15441544

1545-
std::unique_ptr<languaget> new_java_bytecode_language(message_handlert &message_handler)
1545+
std::unique_ptr<languaget> new_java_bytecode_language()
15461546
{
1547-
return std::make_unique<java_bytecode_languaget>(message_handler);
1547+
return std::make_unique<java_bytecode_languaget>();
15481548
}
15491549

15501550
bool java_bytecode_languaget::from_expr(

jbmc/src/java_bytecode/java_bytecode_language.h

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -293,34 +293,15 @@ class java_bytecode_languaget:public languaget
293293

294294
virtual ~java_bytecode_languaget();
295295
java_bytecode_languaget(
296-
<<<<<<< HEAD
297296
std::unique_ptr<select_pointer_typet> pointer_type_selector)
298297
: object_factory_parameters(),
299-
=======
300-
std::unique_ptr<select_pointer_typet> pointer_type_selector,
301-
message_handlert &message_handler):
302-
languaget(message_handler),
303-
java_class_loader(message_handler),
304-
language_options_initialized(false),
305-
threading_support(false),
306-
assume_inputs_non_null(false),
307-
object_factory_parameters(),
308-
max_user_array_length(0),
309-
lazy_methods_mode(lazy_methods_modet::LAZY_METHODS_MODE_EAGER),
310-
string_refinement_enabled(false),
311-
throw_runtime_exceptions(false),
312-
assert_uncaught_exceptions(false),
313-
throw_assertion_error(false),
314-
nondet_static(false),
315-
>>>>>>> To revert: language-is-a-messaget
316298
pointer_type_selector(std::move(pointer_type_selector))
317299
{
318300
}
319301

320-
explicit java_bytecode_languaget(message_handlert &message_handler):
302+
java_bytecode_languaget():
321303
java_bytecode_languaget(
322-
std::unique_ptr<select_pointer_typet>(new select_pointer_typet()),
323-
message_handler)
304+
std::unique_ptr<select_pointer_typet>(new select_pointer_typet()))
324305
{
325306
}
326307

@@ -342,13 +323,9 @@ class java_bytecode_languaget:public languaget
342323
message_handlert &message_handler) override;
343324

344325
std::unique_ptr<languaget> new_language() override
345-
<<<<<<< HEAD
346326
{
347327
return std::make_unique<java_bytecode_languaget>();
348328
}
349-
=======
350-
{ return util_make_unique<java_bytecode_languaget>(get_message_handler()); }
351-
>>>>>>> 7dd2c65f34... To revert: language-is-a-messaget
352329

353330
std::string id() const override { return "java"; }
354331
std::string description() const override { return "Java Bytecode"; }
@@ -422,7 +399,7 @@ class java_bytecode_languaget:public languaget
422399
void initialize_class_loader(message_handlert &);
423400
};
424401

425-
std::unique_ptr<languaget> new_java_bytecode_language(message_handlert &message_handler);
402+
std::unique_ptr<languaget> new_java_bytecode_language();
426403

427404
void parse_java_language_options(const cmdlinet &cmd, optionst &options);
428405

jbmc/src/java_bytecode/java_class_loader.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ class java_class_loadert : public java_class_loader_baset
3636
typedef std::function<std::vector<irep_idt>(const irep_idt &)>
3737
get_extra_class_refs_functiont;
3838

39-
explicit java_class_loadert(message_handlert &message_handler)
40-
: java_class_loader_baset(message_handler)
39+
java_class_loadert()
4140
{
4241
}
4342

jbmc/src/java_bytecode/java_class_loader_base.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ struct java_bytecode_parse_treet;
2222
class java_class_loader_baset
2323
{
2424
public:
25-
explicit java_class_loader_baset(message_handlert &message_handler)
26-
: messaget(message_handler)
27-
{
28-
}
29-
3025
/// Clear all classpath entries
3126
void clear_classpath()
3227
{

jbmc/src/java_bytecode/java_string_library_preprocess.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ class symbolt;
3737
class java_string_library_preprocesst
3838
{
3939
public:
40-
explicit java_string_library_preprocesst(message_handlert &message_handler)
41-
: messaget(message_handler),
42-
char_type(java_char_type()),
40+
java_string_library_preprocesst()
41+
: char_type(java_char_type()),
4342
index_type(java_int_type()),
4443
refined_string_type(index_type, pointer_type(char_type))
4544
{

jbmc/src/java_bytecode/lazy_goto_model.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ lazy_goto_modelt::lazy_goto_modelt(
4949
driver_program_can_generate_function_body,
5050
driver_program_generate_function_body,
5151
message_handler),
52-
language_files(message_handler),
5352
post_process_function(post_process_function),
5453
post_process_functions(post_process_functions),
5554
driver_program_can_generate_function_body(

jbmc/src/jbmc/jbmc_parse_options.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,8 @@ int jbmc_parse_optionst::doit()
414414
break;
415415
}
416416

417-
register_language(new_ansi_c_language, get_message_handler());
418-
register_language(new_java_bytecode_language, get_message_handler());
417+
register_language(new_ansi_c_language);
418+
register_language(new_java_bytecode_language);
419419

420420
if(!((cmdline.isset("jar") && cmdline.args.empty()) ||
421421
(cmdline.isset("gb") && cmdline.args.empty()) ||

jbmc/src/jdiff/jdiff_languages.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Author: Peter Schrammel
1717

1818
void jdiff_parse_optionst::register_languages()
1919
{
20-
register_language(new_java_bytecode_language, get_message_handler());
20+
register_language(new_java_bytecode_language);
2121
}

jbmc/unit/java-testing-utils/load_java_class.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ symbol_tablet load_java_class_lazy(
3636
const std::string &class_path,
3737
const std::string &main)
3838
{
39-
std::unique_ptr<languaget> lang = new_java_bytecode_language(null_message_handler);
39+
std::unique_ptr<languaget> lang = new_java_bytecode_language();
4040

4141
return load_java_class(java_class_name, class_path, main, std::move(lang));
4242
}
@@ -187,7 +187,7 @@ goto_modelt load_goto_model_from_java_class(
187187
for(const auto &option : command_line_options)
188188
command_line.add_option(option.first, option.second);
189189

190-
std::unique_ptr<languaget> lang = new_java_bytecode_language(null_message_handler);
190+
std::unique_ptr<languaget> lang = new_java_bytecode_language();
191191

192192
return load_goto_model_from_java_class(
193193
java_class_name, class_path, main, std::move(lang), command_line);

0 commit comments

Comments
 (0)