aboutsummaryrefslogtreecommitdiffstats
path: root/DeclarationContainer.h
diff options
context:
space:
mode:
authorLiana Husikyan <liana@ethdev.com>2015-05-07 16:12:27 +0800
committerLiana Husikyan <liana@ethdev.com>2015-05-08 23:51:52 +0800
commit115c22c0e001fd0f9c440c45b33009bfe99697f8 (patch)
treec014363b1b8491a16f65b0a6c2a22cab4a8dc884 /DeclarationContainer.h
parent4fdfbaa3674a1597d1f192075700ac5951772193 (diff)
downloaddexon-solidity-115c22c0e001fd0f9c440c45b33009bfe99697f8.tar
dexon-solidity-115c22c0e001fd0f9c440c45b33009bfe99697f8.tar.gz
dexon-solidity-115c22c0e001fd0f9c440c45b33009bfe99697f8.tar.bz2
dexon-solidity-115c22c0e001fd0f9c440c45b33009bfe99697f8.tar.lz
dexon-solidity-115c22c0e001fd0f9c440c45b33009bfe99697f8.tar.xz
dexon-solidity-115c22c0e001fd0f9c440c45b33009bfe99697f8.tar.zst
dexon-solidity-115c22c0e001fd0f9c440c45b33009bfe99697f8.zip
changed the way of resolving declarations. now the cleanup of function duplications in libsolidity/NameAndTypeResolver.cpp(WIP)
Diffstat (limited to 'DeclarationContainer.h')
-rw-r--r--DeclarationContainer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/DeclarationContainer.h b/DeclarationContainer.h
index 94545eef..0f0b5717 100644
--- a/DeclarationContainer.h
+++ b/DeclarationContainer.h
@@ -48,17 +48,17 @@ public:
/// @param _update if true, replaces a potential declaration that is already present
/// @returns false if the name was already declared.
bool registerDeclaration(Declaration const& _declaration, bool _invisible = false, bool _update = false);
- std::set<Declaration const*> resolveName(ASTString const& _name, bool _recursive = false) const;
+ std::vector<Declaration const*> resolveName(ASTString const& _name, bool _recursive = false) const;
Declaration const* getEnclosingDeclaration() const { return m_enclosingDeclaration; }
- std::map<ASTString, std::set<Declaration const*>> const& getDeclarations() const { return m_declarations; }
+ std::map<ASTString, std::vector<Declaration const*>> const& getDeclarations() const { return m_declarations; }
/// @returns whether declaration is valid, and if not also returns previous declaration.
Declaration const* conflictingDeclaration(Declaration const& _declaration) const;
private:
Declaration const* m_enclosingDeclaration;
DeclarationContainer const* m_enclosingContainer;
- std::map<ASTString, std::set<Declaration const*>> m_declarations;
- std::map<ASTString, std::set<Declaration const*>> m_invisibleDeclarations;
+ std::map<ASTString, std::vector<Declaration const*>> m_declarations;
+ std::map<ASTString, std::vector<Declaration const*>> m_invisibleDeclarations;
};
}