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

renamed getter functions

Browse Source
This commit is contained in:
LianaHus
2015-09-08 13:12:00 +02:00
parent 6f4a39c183
commit 1b5e6fc9e7
51 changed files with 1615 additions and 1608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/DeclarationContainer.cpp
+12 -12
View File
@@ -30,13 +30,13 @@ using namespace dev::solidity;
Declaration const* DeclarationContainer::conflictingDeclaration(Declaration const& _declaration) const
{
ASTString const& name(_declaration.getName());
solAssert(!name.empty(), "");
ASTString const& declarationName(_declaration.name());
solAssert(!declarationName.empty(), "");
vector<Declaration const*> declarations;
if (m_declarations.count(name))
declarations += m_declarations.at(name);
if (m_invisibleDeclarations.count(name))
declarations += m_invisibleDeclarations.at(name);
if (m_declarations.count(declarationName))
declarations += m_declarations.at(declarationName);
if (m_invisibleDeclarations.count(declarationName))
declarations += m_invisibleDeclarations.at(declarationName);
if (dynamic_cast<FunctionDefinition const*>(&_declaration))
{
@@ -53,23 +53,23 @@ Declaration const* DeclarationContainer::conflictingDeclaration(Declaration cons
bool DeclarationContainer::registerDeclaration(Declaration const& _declaration, bool _invisible, bool _update)
{
ASTString const& name(_declaration.getName());
if (name.empty())
ASTString const& declarationName(_declaration.name());
if (declarationName.empty())
return true;
if (_update)
{
solAssert(!dynamic_cast<FunctionDefinition const*>(&_declaration), "Attempt to update function definition.");
m_declarations.erase(name);
m_invisibleDeclarations.erase(name);
m_declarations.erase(declarationName);
m_invisibleDeclarations.erase(declarationName);
}
else if (conflictingDeclaration(_declaration))
return false;
if (_invisible)
m_invisibleDeclarations[name].push_back(&_declaration);
m_invisibleDeclarations[declarationName].push_back(&_declaration);
else
m_declarations[name].push_back(&_declaration);
m_declarations[declarationName].push_back(&_declaration);
return true;
}