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

Use zip.

Browse Source
This commit is contained in:
chriseth 2021-01-11 20:54:28 +01:00
parent 67d21a87c5
commit b9de0c6155
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libsolidity/analysis/TypeChecker.cpp
View File

@ -39,6 +39,8 @@
#include <boost/algorithm/string/predicate.hpp>
#include <boost/range/adaptor/reversed.hpp>
#include <range/v3/view/zip.hpp>
#include <memory>
#include <vector>
@ -980,18 +982,17 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
to_string(parameters.size()) +
" variables."
);
size_t len = min(returnTypes.size(), parameters.size());
for (size_t i = 0; i < len; ++i)
for (auto&& [parameter, returnType]: ranges::views::zip(parameters, returnTypes))
{
solAssert(returnTypes[i], "");
if (parameters[i] && *parameters[i]->annotation().type != *returnTypes[i])
solAssert(returnType, "");
if (parameter && *parameter->annotation().type != *returnType)
m_errorReporter.typeError(
6509_error,
parameters[i]->location(),
parameter->location(),
"Invalid type, expected " +
returnTypes[i]->toString(false) +
returnType->toString(false) +
" but got " +
parameters[i]->annotation().type->toString() +
parameter->annotation().type->toString() +
"."
);
}