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

Push the error instead of throwing it

Browse Source 
Throwing a CompilerError on multiple contract definition violates the
expectations of the test suite, which thinks that compile() will
return false if the code can't compile.  This brings contract
collision reporting in line with most of the other errors.
This commit is contained in:
Rhett Aultman 2016-12-11 23:58:01 -08:00 committed by Rhett Aultman
parent 8f25bd54e3
commit e3b0827721
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libsolidity/interface/CompilerStack.cpp
View File

@ -186,13 +186,24 @@ bool CompilerStack::parse()
{
const ContractDefinition* existingContract = m_contracts.find(contract->fullyQualifiedName())->second.contract;
if (contract != existingContract)
BOOST_THROW_EXCEPTION(CompilerError() <<
{
auto err = make_shared<Error>(Error::Type::DeclarationError);
*err <<
errinfo_sourceLocation(contract->location()) <<
errinfo_comment(contract->name() + " is already defined.") <<
errinfo_secondarySourceLocation(
SecondarySourceLocation().append("Previous definition is here:", existingContract->location())));
errinfo_comment(
"Contract/Library \"" + contract->name() + "\" declared twice "
) <<
errinfo_secondarySourceLocation(SecondarySourceLocation().append(
"The other declaration is here:", existingContract->location()));
m_errors.push_back(err);
noErrors = false;
}
}
else
{
m_contracts[contract->fullyQualifiedName()].contract = contract;
}
m_contracts[contract->fullyQualifiedName()].contract = contract;
}
if (!checkLibraryNameClashes())
@ -216,14 +227,27 @@ bool CompilerStack::parse()
if (m_contracts.find(contract->fullyQualifiedName()) != m_contracts.end())
{
const ContractDefinition* existingContract = m_contracts.find(contract->fullyQualifiedName())->second.contract;
if (contract != existingContract)
BOOST_THROW_EXCEPTION(CompilerError() <<
errinfo_sourceLocation(contract->location()) <<
errinfo_comment(contract->name() + " is already defined at "
+ *(existingContract->location().sourceName)));
}
m_contracts[contract->fullyQualifiedName()].contract = contract;
if (contract != existingContract)
{
auto err = make_shared<Error>(Error::Type::DeclarationError);
*err <<
errinfo_sourceLocation(contract->location()) <<
errinfo_comment(
"Contract/Library \"" + contract->name() + "\" declared twice "
) <<
errinfo_secondarySourceLocation(SecondarySourceLocation().append(
"The other declaration is here:", existingContract->location()));
m_errors.push_back(err);
noErrors = false;
}
}
else
{
m_contracts[contract->fullyQualifiedName()].contract = contract;
}
}
if (noErrors)