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

Simplify contract lookup in CompileStack

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-10-18 23:17:06 +01:00
parent 2ce35b77be
commit 8d3cfa8cff
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libsolidity/interface/CompilerStack.cpp
View File

@ -764,11 +764,15 @@ CompilerStack::Contract const& CompilerStack::contract(string const& _contractNa
{ {
if (m_contracts.empty()) if (m_contracts.empty())
BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("No compiled contracts found.")); BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("No compiled contracts found."));
auto it = m_contracts.find(_contractName); auto it = m_contracts.find(_contractName);
if (it != m_contracts.end())
return it->second;
// To provide a measure of backward-compatibility, if a contract is not located by its // To provide a measure of backward-compatibility, if a contract is not located by its
// fully-qualified name, a lookup will be attempted purely on the contract's name to see // fully-qualified name, a lookup will be attempted purely on the contract's name to see
// if anything will satisfy. // if anything will satisfy.
if (it == m_contracts.end() && _contractName.find(":") == string::npos) if (_contractName.find(":") == string::npos)
{ {
for (auto const& contractEntry: m_contracts) for (auto const& contractEntry: m_contracts)
{ {
@ -779,12 +783,13 @@ CompilerStack::Contract const& CompilerStack::contract(string const& _contractNa
string foundName; string foundName;
getline(ss, source, ':'); getline(ss, source, ':');
getline(ss, foundName, ':'); getline(ss, foundName, ':');
if (foundName == _contractName) return contractEntry.second; if (foundName == _contractName)
return contractEntry.second;
} }
// If we get here, both lookup methods failed.
BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Contract " + _contractName + " not found."));
} }
return it->second;
// If we get here, both lookup methods failed.
BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Contract \"" + _contractName + "\" not found."));
} }
CompilerStack::Source const& CompilerStack::source(string const& _sourceName) const CompilerStack::Source const& CompilerStack::source(string const& _sourceName) const