diff options
| author | chriseth <c@ethdev.com> | 2015-04-20 20:57:56 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-04-20 21:29:04 +0800 |
| commit | 8cd5eed17dce30d704ca7187e350e588d896c658 (patch) | |
| tree | c7b6ea03de69b9f398a4f050731b8cbec3d7664a | |
| parent | 7a467bbf07a3b7dd8a05c4205b636273d0ece341 (diff) | |
| download | dexon-solidity-8cd5eed17dce30d704ca7187e350e588d896c658.tar dexon-solidity-8cd5eed17dce30d704ca7187e350e588d896c658.tar.gz dexon-solidity-8cd5eed17dce30d704ca7187e350e588d896c658.tar.bz2 dexon-solidity-8cd5eed17dce30d704ca7187e350e588d896c658.tar.lz dexon-solidity-8cd5eed17dce30d704ca7187e350e588d896c658.tar.xz dexon-solidity-8cd5eed17dce30d704ca7187e350e588d896c658.tar.zst dexon-solidity-8cd5eed17dce30d704ca7187e350e588d896c658.zip | |
Styling.
| -rw-r--r-- | DeclarationContainer.cpp | 14 | ||||
| -rw-r--r-- | 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 <libsolidity/AST.h> #include <libsolidity/Types.h> -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<Declaration const*> DeclarationContainer::resolveName(ASTString const& _name, bool _recursive) const +set<Declaration const*> 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<Declaration const*> DeclarationContainer::resolveName(ASTString const& return result->second; if (_recursive && m_enclosingContainer) return m_enclosingContainer->resolveName(_name, true); - return std::set<Declaration const*>({}); -} - -} + return set<Declaration const*>({}); } 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<Declaration const*> const& _globals) +NameAndTypeResolver::NameAndTypeResolver(vector<Declaration const*> const& _globals) { for (Declaration const* declaration: _globals) m_scopes[nullptr].registerDeclaration(*declaration); @@ -119,7 +119,7 @@ set<Declaration const*> NameAndTypeResolver::resolveName(ASTString const& _name, { auto iterator = m_scopes.find(_scope); if (iterator == end(m_scopes)) - return std::set<Declaration const*>({}); + return set<Declaration const*>({}); 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; |