Skip to content

Remove unused parameters message_handler, ns #2464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2018
Merged

Remove unused parameters message_handler, ns #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions jbmc/src/janalyzer/janalyzer_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
if(options.get_bool_option("show"))
{
result = static_show_domain(
goto_model, *analyzer, options, get_message_handler(), out);
goto_model, *analyzer, options, out);
}
else if(options.get_bool_option("verify"))
{
Expand All @@ -603,17 +603,17 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
else if(options.get_bool_option("unreachable-instructions"))
{
result = static_unreachable_instructions(
goto_model, *analyzer, options, get_message_handler(), out);
goto_model, *analyzer, options, out);
}
else if(options.get_bool_option("unreachable-functions"))
{
result = static_unreachable_functions(
goto_model, *analyzer, options, get_message_handler(), out);
goto_model, *analyzer, options, out);
}
else if(options.get_bool_option("reachable-functions"))
{
result = static_reachable_functions(
goto_model, *analyzer, options, get_message_handler(), out);
goto_model, *analyzer, options, out);
}
else
{
Expand Down
4 changes: 0 additions & 4 deletions src/goto-analyzer/goto_analyzer_parse_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,6 @@ int goto_analyzer_parse_optionst::perform_analysis(const optionst &options)
result = static_show_domain(goto_model,
*analyzer,
options,
get_message_handler(),
out);
}
else if(options.get_bool_option("verify"))
Expand All @@ -653,23 +652,20 @@ int goto_analyzer_parse_optionst::perform_analysis(const optionst &options)
result = static_unreachable_instructions(goto_model,
*analyzer,
options,
get_message_handler(),
out);
}
else if(options.get_bool_option("unreachable-functions"))
{
result = static_unreachable_functions(goto_model,
*analyzer,
options,
get_message_handler(),
out);
}
else if(options.get_bool_option("reachable-functions"))
{
result = static_reachable_functions(goto_model,
*analyzer,
options,
get_message_handler(),
out);
}
else
Expand Down
2 changes: 0 additions & 2 deletions src/goto-analyzer/static_show_domain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ Author: Martin Brain, [email protected]
/// \param goto_model: the program analyzed
/// \param ai: the abstract interpreter after it has been run to fix point
/// \param options: the parsed user options
/// \param message_handler: the system message handler
/// \param out: output stream for the printing
/// \return: false on success with the domain printed to out
bool static_show_domain(
const goto_modelt &goto_model,
const ai_baset &ai,
const optionst &options,
message_handlert &message_handler,
std::ostream &out)
{
if(options.get_bool_option("json"))
Expand Down
1 change: 0 additions & 1 deletion src/goto-analyzer/static_show_domain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ bool static_show_domain(
const goto_modelt &,
const ai_baset &,
const optionst &,
message_handlert &,
std::ostream &);

#endif // CPROVER_GOTO_ANALYZER_STATIC_SHOW_DOMAIN_H
6 changes: 1 addition & 5 deletions src/goto-analyzer/unreachable_instructions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ static void output_dead_plain(
}

static void add_to_xml(
const namespacet &ns,
const goto_programt &goto_program,
const dead_mapt &dead_map,
xmlt &dest)
Expand Down Expand Up @@ -206,7 +205,6 @@ bool static_unreachable_instructions(
const goto_modelt &goto_model,
const ai_baset &ai,
const optionst &options,
message_handlert &message_handler,
std::ostream &out)
{
json_arrayt json_result;
Expand All @@ -231,7 +229,7 @@ bool static_unreachable_instructions(
}
else if(options.get_bool_option("xml"))
{
add_to_xml(ns, f_it->second.body, dead_map, xml_result);
add_to_xml(f_it->second.body, dead_map, xml_result);
}
else
{
Expand Down Expand Up @@ -431,7 +429,6 @@ bool static_unreachable_functions(
const goto_modelt &goto_model,
const ai_baset &ai,
const optionst &options,
message_handlert &message_handler,
std::ostream &out)
{
std::unordered_set<irep_idt> called =
Expand All @@ -446,7 +443,6 @@ bool static_reachable_functions(
const goto_modelt &goto_model,
const ai_baset &ai,
const optionst &options,
message_handlert &message_handler,
std::ostream &out)
{
std::unordered_set<irep_idt> called =
Expand Down
3 changes: 0 additions & 3 deletions src/goto-analyzer/unreachable_instructions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,18 @@ bool static_unreachable_instructions(
const goto_modelt &,
const ai_baset &,
const optionst &,
message_handlert &,
std::ostream &);

bool static_unreachable_functions(
const goto_modelt &,
const ai_baset &,
const optionst &,
message_handlert &,
std::ostream &);

bool static_reachable_functions(
const goto_modelt &,
const ai_baset &,
const optionst &,
message_handlert &,
std::ostream &);

#endif // CPROVER_GOTO_ANALYZER_UNREACHABLE_INSTRUCTIONS_H