diff options
| author | chriseth <chris@ethereum.org> | 2017-01-18 21:28:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-18 21:28:00 +0800 |
| commit | 005e1908854fe26611a175640fad87b430609d16 (patch) | |
| tree | 7a9f257478ce326508dd56d42fe9dfd8a7d998eb /libsolidity/ast | |
| parent | 4f4963131bd969fa063a3aad980139dad2034087 (diff) | |
| parent | 94b092d87c051e8846f5d61eaa1a4581b6588c71 (diff) | |
| download | dexon-solidity-005e1908854fe26611a175640fad87b430609d16.tar.gz dexon-solidity-005e1908854fe26611a175640fad87b430609d16.tar.zst dexon-solidity-005e1908854fe26611a175640fad87b430609d16.zip | |
Merge pull request #1397 from roadriverrail/contract_collision
Error out when contracts collide on name
Diffstat (limited to 'libsolidity/ast')
| -rw-r--r-- | libsolidity/ast/AST.cpp | 1 | ||||
| -rw-r--r-- | libsolidity/ast/AST.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp index 3db4627a..fcd6e38c 100644 --- a/libsolidity/ast/AST.cpp +++ b/libsolidity/ast/AST.cpp @@ -191,7 +191,6 @@ void ContractDefinition::setUserDocumentation(Json::Value const& _userDocumentat m_userDocumentation = _userDocumentation; } - vector<Declaration const*> const& ContractDefinition::inheritableMembers() const { if (!m_inheritableMembers) diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h index e9df2e7d..d11a246c 100644 --- a/libsolidity/ast/AST.h +++ b/libsolidity/ast/AST.h @@ -165,6 +165,7 @@ public: /// @returns the source name this declaration is present in. /// Can be combined with annotation().canonicalName to form a globally unique name. std::string sourceUnitName() const; + std::string fullyQualifiedName() const { return sourceUnitName() + ":" + name(); } virtual bool isLValue() const { return false; } virtual bool isPartOfExternalInterface() const { return false; } |