From 8cd5eed17dce30d704ca7187e350e588d896c658 Mon Sep 17 00:00:00 2001 From: chriseth Date: Mon, 20 Apr 2015 14:57:56 +0200 Subject: Styling. --- DeclarationContainer.cpp | 14 +++++--------- NameAndTypeResolver.cpp | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/DeclarationContainer.cpp b/DeclarationContainer.cpp index 565f71df..5f8d24e3 100644 --- a/DeclarationContainer.cpp +++ b/DeclarationContainer.cpp @@ -24,10 +24,9 @@ #include #include -namespace dev -{ -namespace solidity -{ +using namespace std; +using namespace dev; +using namespace dev::solidity; bool DeclarationContainer::registerDeclaration(Declaration const& _declaration, bool _invisible, bool _update) { @@ -62,7 +61,7 @@ bool DeclarationContainer::registerDeclaration(Declaration const& _declaration, return true; } -std::set DeclarationContainer::resolveName(ASTString const& _name, bool _recursive) const +set DeclarationContainer::resolveName(ASTString const& _name, bool _recursive) const { solAssert(!_name.empty(), "Attempt to resolve empty name."); auto result = m_declarations.find(_name); @@ -70,8 +69,5 @@ std::set DeclarationContainer::resolveName(ASTString const& return result->second; if (_recursive && m_enclosingContainer) return m_enclosingContainer->resolveName(_name, true); - return std::set({}); -} - -} + return set({}); } diff --git a/NameAndTypeResolver.cpp b/NameAndTypeResolver.cpp index 1c527b89..a286934a 100644 --- a/NameAndTypeResolver.cpp +++ b/NameAndTypeResolver.cpp @@ -31,7 +31,7 @@ namespace dev namespace solidity { -NameAndTypeResolver::NameAndTypeResolver(std::vector const& _globals) +NameAndTypeResolver::NameAndTypeResolver(vector const& _globals) { for (Declaration const* declaration: _globals) m_scopes[nullptr].registerDeclaration(*declaration); @@ -119,7 +119,7 @@ set NameAndTypeResolver::resolveName(ASTString const& _name, { auto iterator = m_scopes.find(_scope); if (iterator == end(m_scopes)) - return std::set({}); + return set({}); return iterator->second.resolveName(_name, false); } @@ -415,11 +415,17 @@ bool ReferencesResolver::visit(UserDefinedTypeName& _typeName) { auto declarations = m_resolver.getNameFromCurrentScope(_typeName.getName()); if (declarations.empty()) - BOOST_THROW_EXCEPTION(DeclarationError() << errinfo_sourceLocation(_typeName.getLocation()) - << errinfo_comment("Undeclared identifier.")); + BOOST_THROW_EXCEPTION( + DeclarationError() << + errinfo_sourceLocation(_typeName.getLocation()) << + errinfo_comment("Undeclared identifier.") + ); else if (declarations.size() > 1) - BOOST_THROW_EXCEPTION(DeclarationError() << errinfo_sourceLocation(_typeName.getLocation()) - << errinfo_comment("Duplicate identifier.")); + BOOST_THROW_EXCEPTION( + DeclarationError() << + errinfo_sourceLocation(_typeName.getLocation()) << + errinfo_comment("Duplicate identifier.") + ); else _typeName.setReferencedDeclaration(**declarations.begin()); return false; -- cgit v1.2.3