aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorRhett Aultman <roadriverrail@gmail.com>2016-11-19 11:29:08 +0800
committerRhett Aultman <rhett.aultman@meraki.net>2017-01-17 01:32:57 +0800
commitb24ca4fa236ccc89600d30206172baf3eee386a7 (patch)
treeda2a89e60a258f34e6b3d0edf852a923012ff82b /libsolidity
parentf3a84eab91a6f05cfe58e260f206f9af51811313 (diff)
downloaddexon-solidity-b24ca4fa236ccc89600d30206172baf3eee386a7.tar
dexon-solidity-b24ca4fa236ccc89600d30206172baf3eee386a7.tar.gz
dexon-solidity-b24ca4fa236ccc89600d30206172baf3eee386a7.tar.bz2
dexon-solidity-b24ca4fa236ccc89600d30206172baf3eee386a7.tar.lz
dexon-solidity-b24ca4fa236ccc89600d30206172baf3eee386a7.tar.xz
dexon-solidity-b24ca4fa236ccc89600d30206172baf3eee386a7.tar.zst
dexon-solidity-b24ca4fa236ccc89600d30206172baf3eee386a7.zip
Fix tab, drop stupid '!!!', change error message.
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/interface/CompilerStack.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 5d4ccd92..dded81f5 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -183,10 +183,10 @@ bool CompilerStack::parse()
if (m_contracts.find(contract->name()) != m_contracts.end())
{
const ContractDefinition* existingContract = m_contracts.find(contract->name())->second.contract;
- if (contract != existingContract)
+ if (contract != existingContract)
BOOST_THROW_EXCEPTION(CompilerError() <<
errinfo_sourceLocation(contract->location()) <<
- errinfo_comment(contract->name() + " conflicts with contract at "
+ errinfo_comment(contract->name() + " is already defined at "
+ *(existingContract->location().sourceName)));
}
m_contracts[contract->name()].contract = contract;
@@ -216,7 +216,7 @@ bool CompilerStack::parse()
if (contract != existingContract)
BOOST_THROW_EXCEPTION(CompilerError() <<
errinfo_sourceLocation(contract->location()) <<
- errinfo_comment(contract->name() + " conflicts with!!! contract at "
+ errinfo_comment(contract->name() + " is already defined at "
+ *(existingContract->location().sourceName)));
}