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

fixed the order of error msgs

Browse Source
This commit is contained in:
Liana Husikyan 2015-05-04 14:46:52 +02:00
parent 8b5fa857d7
commit 0d47ed82b1
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
NameAndTypeResolver.cpp
View File

@ -355,16 +355,29 @@ void DeclarationRegistrationHelper::registerDeclaration(Declaration& _declaratio
{ {
if (!m_scopes[m_currentScope].registerDeclaration(_declaration, !_declaration.isVisibleInContract())) if (!m_scopes[m_currentScope].registerDeclaration(_declaration, !_declaration.isVisibleInContract()))
{ {
SourceLocation firstDeclarationLocation;
SourceLocation secondDeclarationLocation;
if (_declaration.getLocation().start < m_scopes[m_currentScope].conflictingDeclaration(_declaration)->getLocation().start)
{
firstDeclarationLocation = _declaration.getLocation();
secondDeclarationLocation = m_scopes[m_currentScope].conflictingDeclaration(_declaration)->getLocation();
}
else
{
firstDeclarationLocation = m_scopes[m_currentScope].conflictingDeclaration(_declaration)->getLocation();
secondDeclarationLocation = _declaration.getLocation();
}
solAssert(m_scopes[m_currentScope].conflictingDeclaration(_declaration), ""); solAssert(m_scopes[m_currentScope].conflictingDeclaration(_declaration), "");
BOOST_THROW_EXCEPTION(DeclarationError() BOOST_THROW_EXCEPTION(DeclarationError()
<< errinfo_sourceLocation(_declaration.getLocation()) << errinfo_sourceLocation(secondDeclarationLocation)
<< errinfo_comment("Identifier already declared.") << errinfo_comment("Identifier already declared.")
<< errinfo_secondarySourceLocation(SecondarySourceLocation().append( << errinfo_secondarySourceLocation(SecondarySourceLocation().append(
"The previous declaration is here:", "The previous declaration is here:",
m_scopes[m_currentScope].conflictingDeclaration(_declaration)->getLocation()))); firstDeclarationLocation
)));
} }
//@todo the exception should also contain the location of the first declaration
_declaration.setScope(m_currentScope); _declaration.setScope(m_currentScope);
if (_opensScope) if (_opensScope)
enterNewSubScope(_declaration); enterNewSubScope(_declaration);