cerc-io/solidity
10
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 #10744 from ethereum/useDropEx

Browse Source 
Use drop_exactly.
This commit is contained in:
Daniel Kirchner 2021-01-12 17:11:54 +01:00 committed by GitHub
commit 162b1508da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/analysis/TypeChecker.cpp
View File

@ -34,12 +34,14 @@
#include <libsolutil/Algorithms.h> #include <libsolutil/Algorithms.h>
#include <libsolutil/StringUtils.h> #include <libsolutil/StringUtils.h>
#include <libsolutil/Views.h>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/range/adaptor/reversed.hpp> #include <boost/range/adaptor/reversed.hpp>
#include <range/v3/view/zip.hpp> #include <range/v3/view/zip.hpp>
#include <range/v3/view/drop_exactly.hpp>
#include <memory> #include <memory>
#include <vector> #include <vector>
@ -1001,9 +1003,8 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
TryCatchClause const* panicClause = nullptr; TryCatchClause const* panicClause = nullptr;
TryCatchClause const* errorClause = nullptr; TryCatchClause const* errorClause = nullptr;
TryCatchClause const* lowLevelClause = nullptr; TryCatchClause const* lowLevelClause = nullptr;
for (size_t i = 1; i < _tryStatement.clauses().size(); ++i) for (auto const& clause: _tryStatement.clauses() | ranges::views::drop_exactly(1) | views::dereferenceChecked)
{ {
TryCatchClause const& clause = *_tryStatement.clauses()[i];
if (clause.errorName() == "") if (clause.errorName() == "")
{ {
if (lowLevelClause) if (lowLevelClause)

1
libsolutil/CMakeLists.txt
View File

@ -34,6 +34,7 @@ set(sources
UTF8.cpp UTF8.cpp
UTF8.h UTF8.h
vector_ref.h vector_ref.h
Views.h
Visitor.h Visitor.h
Whiskers.cpp Whiskers.cpp
Whiskers.h Whiskers.h

39
libsolutil/Views.h Normal file
View File

@ -0,0 +1,39 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
// SPDX-License-Identifier: GPL-3.0
#pragma once
#include <range/v3/view/transform.hpp>
#include <liblangutil/Exceptions.h>
namespace solidity::util::views
{
static constexpr auto dereference = ranges::views::transform([](auto&& x) -> decltype(auto) { return *x; });
static constexpr auto dereferenceChecked = ranges::views::transform(
[](auto&& x) -> decltype(auto)
{
solAssert(x, "");
return *x;
}
);
}