Skip to content

Remove-exceptions: make lambda types explicit #1968

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
Mar 27, 2018
Merged

Remove-exceptions: make lambda types explicit #1968

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
14 changes: 8 additions & 6 deletions src/goto-programs/remove_exceptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ class remove_exceptionst
typedef std::vector<std::pair<
irep_idt, goto_programt::targett>> catch_handlerst;
typedef std::vector<catch_handlerst> stack_catcht;
typedef std::function<bool(const irep_idt &)> function_may_throwt;

public:
typedef std::function<bool(const irep_idt &)> function_may_throwt;

explicit remove_exceptionst(
symbol_table_baset &_symbol_table,
function_may_throwt _function_may_throw,
Expand Down Expand Up @@ -570,10 +571,10 @@ void remove_exceptions(
const namespacet ns(symbol_table);
std::map<irep_idt, std::set<irep_idt>> exceptions_map;
uncaught_exceptions(goto_functions, ns, exceptions_map);
// NOLINTNEXTLINE
auto function_may_throw = [&exceptions_map](const irep_idt &id) {
return !exceptions_map[id].empty();
};
remove_exceptionst::function_may_throwt function_may_throw =
[&exceptions_map](const irep_idt &id) { // NOLINT(whitespace/braces)
return !exceptions_map[id].empty();
};
remove_exceptionst remove_exceptions(
symbol_table,
function_may_throw,
Expand All @@ -599,7 +600,8 @@ void remove_exceptions(
symbol_table_baset &symbol_table,
remove_exceptions_typest type)
{
auto any_function_may_throw = [](const irep_idt &id) { return true; };
remove_exceptionst::function_may_throwt any_function_may_throw =
[](const irep_idt &id) { return true; };

remove_exceptionst remove_exceptions(
symbol_table,
Expand Down