code style improvements
This commit is contained in:
@@ -98,7 +98,8 @@ public:
|
|||||||
list({ *this }) -= list({ right });
|
list({ *this }) -= list({ right });
|
||||||
}
|
}
|
||||||
|
|
||||||
void applyRemovals() {
|
void applyRemovals()
|
||||||
|
{
|
||||||
map<passes, set<passes>> to_process, processed;
|
map<passes, set<passes>> to_process, processed;
|
||||||
to_process[name] = {};
|
to_process[name] = {};
|
||||||
|
|
||||||
@@ -106,18 +107,21 @@ public:
|
|||||||
{
|
{
|
||||||
map<passes, set<passes>> to_process_next;
|
map<passes, set<passes>> to_process_next;
|
||||||
|
|
||||||
for (const auto& pass : to_process) {
|
for (const auto& pass : to_process)
|
||||||
|
{
|
||||||
auto processed_it = processed.find(pass.first);
|
auto processed_it = processed.find(pass.first);
|
||||||
auto& done_removals = processed_it != processed.end() ? processed_it->second : processed[pass.first];
|
auto& done_removals = processed_it != processed.end() ? processed_it->second : processed[pass.first];
|
||||||
|
|
||||||
set<passes> removals_to_do;
|
set<passes> removals_to_do;
|
||||||
bool process_pass = false;
|
bool process_pass = false;
|
||||||
|
|
||||||
if (processed_it == processed.end()) {
|
if (processed_it == processed.end())
|
||||||
|
{
|
||||||
removals_to_do = done_removals = pass.second;
|
removals_to_do = done_removals = pass.second;
|
||||||
process_pass = true;
|
process_pass = true;
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
const auto& needed_removals = pass.second;
|
const auto& needed_removals = pass.second;
|
||||||
|
|
||||||
set_difference(needed_removals.begin(), needed_removals.end(), done_removals.begin(), done_removals.end(),
|
set_difference(needed_removals.begin(), needed_removals.end(), done_removals.begin(), done_removals.end(),
|
||||||
@@ -127,12 +131,14 @@ public:
|
|||||||
done_removals.insert(removals_to_do.begin(), removals_to_do.end());
|
done_removals.insert(removals_to_do.begin(), removals_to_do.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (process_pass) {
|
if (process_pass)
|
||||||
|
{
|
||||||
processed[pass.first] = pass.second;
|
processed[pass.first] = pass.second;
|
||||||
|
|
||||||
auto removals_it = passRemovals.find(pass.first);
|
auto removals_it = passRemovals.find(pass.first);
|
||||||
|
|
||||||
if (removals_it != passRemovals.end()) {
|
if (removals_it != passRemovals.end())
|
||||||
|
{
|
||||||
auto& removals_saved = removals_it->second;
|
auto& removals_saved = removals_it->second;
|
||||||
|
|
||||||
set<passes> add;
|
set<passes> add;
|
||||||
@@ -145,10 +151,12 @@ public:
|
|||||||
|
|
||||||
auto deps_it = passDeps->find(pass.first);
|
auto deps_it = passDeps->find(pass.first);
|
||||||
|
|
||||||
if (deps_it != passDeps->end()) {
|
if (deps_it != passDeps->end())
|
||||||
|
{
|
||||||
auto& deps = deps_it->second;
|
auto& deps = deps_it->second;
|
||||||
|
|
||||||
for (auto dep_it = deps.begin(); dep_it != deps.end();) {
|
for (auto dep_it = deps.begin(); dep_it != deps.end();)
|
||||||
|
{
|
||||||
if (removals_to_do.find(*dep_it) == removals_to_do.end())
|
if (removals_to_do.find(*dep_it) == removals_to_do.end())
|
||||||
to_process_next[*(dep_it++)].insert(removals_to_do.begin(), removals_to_do.end());
|
to_process_next[*(dep_it++)].insert(removals_to_do.begin(), removals_to_do.end());
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user