Remove redundant get_ui() method

ui_message_handler.get_ui() already does the same thing, and is more
explicit.
This commit is contained in:
Romain Brenguier 2019-04-16 07:39:28 +01:00
parent 6c8954b8db
commit 4268bee456
6 changed files with 11 additions and 23 deletions

View File

@ -389,7 +389,7 @@ int janalyzer_parse_optionst::doit()
show_goto_functions(
goto_model,
log.get_message_handler(),
get_ui(),
ui_message_handler.get_ui(),
cmdline.isset("list-goto-functions"));
return CPROVER_EXIT_SUCCESS;
}
@ -519,7 +519,8 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
if(cmdline.isset("show-properties"))
{
show_properties(goto_model, log.get_message_handler(), get_ui());
show_properties(
goto_model, log.get_message_handler(), ui_message_handler.get_ui());
return CPROVER_EXIT_SUCCESS;
}

View File

@ -171,11 +171,6 @@ protected:
virtual int perform_analysis(const optionst &options);
ai_baset *build_analyzer(const optionst &, const namespacet &ns);
ui_message_handlert::uit get_ui()
{
return ui_message_handler.get_ui();
}
};
#endif // CPROVER_JANALYZER_JANALYZER_PARSE_OPTIONS_H

View File

@ -424,7 +424,7 @@ int goto_analyzer_parse_optionst::doit()
show_goto_functions(
goto_model,
log.get_message_handler(),
get_ui(),
ui_message_handler.get_ui(),
cmdline.isset("list-goto-functions"));
return CPROVER_EXIT_SUCCESS;
}
@ -553,7 +553,8 @@ int goto_analyzer_parse_optionst::perform_analysis(const optionst &options)
if(cmdline.isset("show-properties"))
{
show_properties(goto_model, log.get_message_handler(), get_ui());
show_properties(
goto_model, log.get_message_handler(), ui_message_handler.get_ui());
return CPROVER_EXIT_SUCCESS;
}

View File

@ -174,11 +174,6 @@ protected:
virtual int perform_analysis(const optionst &options);
ai_baset *build_analyzer(const optionst &, const namespacet &ns);
ui_message_handlert::uit get_ui()
{
return ui_message_handler.get_ui();
}
};
#endif // CPROVER_GOTO_ANALYZER_GOTO_ANALYZER_PARSE_OPTIONS_H

View File

@ -268,7 +268,7 @@ int goto_instrument_parse_optionst::doit()
namespacet ns(goto_model.symbol_table);
value_set_analysist value_set_analysis(ns);
value_set_analysis(goto_model.goto_functions);
show_value_sets(get_ui(), goto_model, value_set_analysis);
show_value_sets(ui_message_handler.get_ui(), goto_model, value_set_analysis);
return CPROVER_EXIT_SUCCESS;
}
@ -564,7 +564,8 @@ int goto_instrument_parse_optionst::doit()
cmdline.isset("show-properties"))
{
const namespacet ns(goto_model.symbol_table);
show_properties(goto_model, log.get_message_handler(), get_ui());
show_properties(
goto_model, log.get_message_handler(), ui_message_handler.get_ui());
return CPROVER_EXIT_SUCCESS;
}
@ -584,7 +585,7 @@ int goto_instrument_parse_optionst::doit()
if(cmdline.isset("show-loops"))
{
show_loop_ids(get_ui(), goto_model);
show_loop_ids(ui_message_handler.get_ui(), goto_model);
return CPROVER_EXIT_SUCCESS;
}
@ -637,7 +638,7 @@ int goto_instrument_parse_optionst::doit()
if(cmdline.isset("show-locations"))
{
show_locations(get_ui(), goto_model);
show_locations(ui_message_handler.get_ui(), goto_model);
return CPROVER_EXIT_SUCCESS;
}

View File

@ -147,11 +147,6 @@ protected:
bool remove_returns_done;
goto_modelt goto_model;
ui_message_handlert::uit get_ui()
{
return ui_message_handler.get_ui();
}
};
#endif // CPROVER_GOTO_INSTRUMENT_GOTO_INSTRUMENT_PARSE_OPTIONS_H