cerc-io/solidity
11
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

fixup! Syntax changes for catching custom errors.

Browse Source
This commit is contained in:
chriseth
2021-02-02 17:05:49 +01:00
parent b6183edd18
commit 6fd0cf547e
10 changed files with 142 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/TypeChecker.cpp
+15 -12
View File
@@ -1007,7 +1007,7 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
"This try statement already has a low-level catch clause."
);
lowLevelClause = &clause;
if (clause.parameters() && !clause.parameters()->parameters().empty())
if (clause.parameters())
{
if (
clause.parameters()->parameters().size() != 1 ||
@@ -1072,7 +1072,6 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
else
{
solAssert(clause.kind() == TryCatchClause::Kind::UserDefined, "");
solAssert(*clause.errorName().annotation().requiredLookup == VirtualLookup::Static, "");
ErrorDefinition const* error = dynamic_cast<ErrorDefinition const*>(clause.errorName().annotation().referencedDeclaration);
if (!error)
{
@@ -1091,16 +1090,20 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
!clause.parameters() ||
clause.parameters()->parameters().size() != error->parameters().size()
)
m_errorReporter.typeError(1271_error, clause.location(), "Expected `catch Panic(uint ...) { ... }`.");
else
for (auto&& [varDecl, parameter]: ranges::views::zip(clause.parameters()->parameters(), error->parameters()))
if (*varDecl->type() != *parameter->type())
m_errorReporter.typeError(
63958_error,
varDecl->location(),
("Expected a parameter of type \"" + parameter->type()->toString(true) + "\" ") +
("but got \"" + varDecl->type()->toString(true) + "\"")
);
m_errorReporter.typeError(
4873_error,
clause.location(),
("Expected " + to_string(error->parameters().size()) + " parameters for error \"") +
(error->name() + "\" but got " + to_string(clause.parameters()->parameters().size()) + ".")
);
for (auto&& [varDecl, parameter]: ranges::views::zip(clause.parameters()->parameters(), error->parameters()))
if (*varDecl->type() != *parameter->type())
m_errorReporter.typeError(
63958_error,
varDecl->location(),
("Expected a parameter of type \"" + parameter->type()->toString(true) + "\" ") +
("but got \"" + varDecl->type()->toString(true) + "\"")
);
}
}
}