cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11311 from anurag-git/issue_10738-3

Browse Source 
Use range-v3 loops(remove_erase, remove_erase_if)
This commit is contained in:
chriseth 2021-04-26 14:18:15 +02:00 committed by GitHub
commit d9df3d50e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libyul/optimiser/ControlFlowSimplifier.cpp
View File

@ -25,7 +25,7 @@
#include <libsolutil/CommonData.h>
#include <libsolutil/Visitor.h>
#include <boost/range/algorithm_ext/erase.hpp>
#include <range/v3/action/remove_if.hpp>
using namespace std;
using namespace solidity;
@ -52,7 +52,7 @@ ExpressionStatement makeDiscardCall(
void removeEmptyDefaultFromSwitch(Switch& _switchStmt)
{
boost::remove_erase_if(
ranges::actions::remove_if(
_switchStmt.cases,
[](Case const& _case) { return !_case.value && _case.body.statements.empty(); }
);
@ -69,7 +69,7 @@ void removeEmptyCasesFromSwitch(Switch& _switchStmt)
if (hasDefault)
return;
boost::remove_erase_if(
ranges::actions::remove_if(
_switchStmt.cases,
[](Case const& _case) { return _case.body.statements.empty(); }
);

1
libyul/optimiser/DataFlowAnalyzer.cpp
View File

@ -32,7 +32,6 @@
#include <libsolutil/CommonData.h>
#include <libsolutil/cxx20.h>
#include <boost/range/algorithm_ext/erase.hpp>
#include <variant>
#include <range/v3/view/reverse.hpp>

2
libyul/optimiser/FunctionGrouper.cpp
View File

@ -24,8 +24,6 @@
#include <libyul/AST.h>
#include <boost/range/algorithm_ext/erase.hpp>
using namespace std;
using namespace solidity;
using namespace solidity::yul;

4
libyul/optimiser/OptimizerUtilities.cpp
View File

@ -29,7 +29,7 @@
#include <liblangutil/Token.h>
#include <libsolutil/CommonData.h>
#include <boost/range/algorithm_ext/erase.hpp>
#include <range/v3/action/remove_if.hpp>
using namespace std;
using namespace solidity;
@ -42,7 +42,7 @@ void yul::removeEmptyBlocks(Block& _block)
auto isEmptyBlock = [](Statement const& _st) -> bool {
return holds_alternative<Block>(_st) && std::get<Block>(_st).statements.empty();
};
boost::range::remove_erase_if(_block.statements, isEmptyBlock);
ranges::actions::remove_if(_block.statements, isEmptyBlock);
}
bool yul::isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifier)

4
libyul/optimiser/RedundantAssignEliminator.cpp
View File

@ -27,7 +27,7 @@
#include <libsolutil/CommonData.h>
#include <boost/range/algorithm_ext/erase.hpp>
#include <range/v3/action/remove_if.hpp>
using namespace std;
using namespace solidity;
@ -307,7 +307,7 @@ void RedundantAssignEliminator::finalize(YulString _variable, RedundantAssignEli
void AssignmentRemover::operator()(Block& _block)
{
boost::range::remove_erase_if(_block.statements, [&](Statement const& _statement) -> bool {
ranges::actions::remove_if(_block.statements, [&](Statement const& _statement) -> bool {
return holds_alternative<Assignment>(_statement) && m_toRemove.count(&std::get<Assignment>(_statement));
});

2
libyul/optimiser/StructuralSimplifier.cpp
View File

@ -22,8 +22,6 @@
#include <libsolutil/CommonData.h>
#include <libsolutil/Visitor.h>
#include <boost/range/algorithm_ext/erase.hpp>
using namespace std;
using namespace solidity;
using namespace solidity::yul;

6
libyul/optimiser/Suite.cpp
View File

@ -73,10 +73,10 @@
#include <libsolutil/CommonData.h>
#include <boost/range/algorithm_ext/erase.hpp>
#include <libyul/CompilabilityChecker.h>
#include <range/v3/view/map.hpp>
#include <range/v3/action/remove.hpp>
using namespace std;
using namespace solidity;
@ -312,8 +312,8 @@ void OptimiserSuite::runSequence(string const& _stepAbbreviations, Block& _ast)
validateSequence(_stepAbbreviations);
string input = _stepAbbreviations;
boost::remove_erase(input, ' ');
boost::remove_erase(input, '\n');
ranges::actions::remove(input, ' ');
ranges::actions::remove(input, '\n');
auto abbreviationsToSteps = [](string const& _sequence) -> vector<string>
{

7
test/tools/ossfuzz/protoToYul.cpp
View File

@ -27,7 +27,8 @@
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/range/algorithm_ext/erase.hpp>
#include <range/v3/action/remove_if.hpp>
#include <algorithm>
@ -61,7 +62,7 @@ string ProtoConverter::createHex(string const& _hexBytes)
string tmp{_hexBytes};
if (!tmp.empty())
{
boost::range::remove_erase_if(tmp, [=](char c) -> bool {
ranges::actions::remove_if(tmp, [=](char c) -> bool {
return !std::isxdigit(c);
});
tmp = tmp.substr(0, 64);
@ -83,7 +84,7 @@ string ProtoConverter::createAlphaNum(string const& _strBytes)
string tmp{_strBytes};
if (!tmp.empty())
{
boost::range::remove_erase_if(tmp, [=](char c) -> bool {
ranges::actions::remove_if(tmp, [=](char c) -> bool {
return !(std::isalpha(c) || std::isdigit(c));
});
tmp = tmp.substr(0, 32);