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 #7705 from ethereum/list-overloads-7146

Browse Source 
List candidates when overload failed
This commit is contained in:
chriseth 2019-11-13 17:35:37 +01:00 committed by GitHub
commit c4441bac5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -9,6 +9,7 @@ Compiler Features:
* SMTChecker: Add break/continue support to the CHC engine. * SMTChecker: Add break/continue support to the CHC engine.
* SMTChecker: Support assignments to multi-dimensional arrays and mappings. * SMTChecker: Support assignments to multi-dimensional arrays and mappings.
* SMTChecker: Support inheritance and function overriding. * SMTChecker: Support inheritance and function overriding.
* TypeChecker: List possible candidates when overload resolution fails
* EWasm: Experimental EWasm binary output. * EWasm: Experimental EWasm binary output.

15
libsolidity/analysis/TypeChecker.cpp
View File

@ -2352,12 +2352,19 @@ bool TypeChecker::visit(Identifier const& _identifier)
if (functionType->canTakeArguments(*annotation.arguments)) if (functionType->canTakeArguments(*annotation.arguments))
candidates.push_back(declaration); candidates.push_back(declaration);
} }
if (candidates.empty()) if (candidates.size() == 1)
m_errorReporter.fatalTypeError(_identifier.location(), "No matching declaration found after argument-dependent lookup.");
else if (candidates.size() == 1)
annotation.referencedDeclaration = candidates.front(); annotation.referencedDeclaration = candidates.front();
else else
m_errorReporter.fatalTypeError(_identifier.location(), "No unique declaration found after argument-dependent lookup."); {
SecondarySourceLocation ssl;
for (Declaration const* declaration: annotation.overloadedDeclarations)
ssl.append("Candidate:", declaration->location());
if (candidates.empty())
m_errorReporter.fatalTypeError(_identifier.location(), ssl, "No matching declaration found after argument-dependent lookup.");
else
m_errorReporter.fatalTypeError(_identifier.location(), ssl, "No unique declaration found after argument-dependent lookup.");
}
} }
} }
solAssert( solAssert(