diff options
author | chriseth <chris@ethereum.org> | 2017-08-28 19:06:30 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-28 19:06:30 +0800 |
commit | 5bd6254449ec08d93973ef9b070d56e3a745c8ea (patch) | |
tree | c937c50c5340e2b67f10675df80fa703feee364d | |
parent | d15cde2aa88f39f67025bd40168f219232dad1d6 (diff) | |
parent | 8e5f9c59814f7e8b3b390965b17d9b867d36d544 (diff) | |
download | dexon-solidity-5bd6254449ec08d93973ef9b070d56e3a745c8ea.tar.gz dexon-solidity-5bd6254449ec08d93973ef9b070d56e3a745c8ea.tar.zst dexon-solidity-5bd6254449ec08d93973ef9b070d56e3a745c8ea.zip |
Merge pull request #2825 from ethereum/contract-unused-natspec
Removed unused natspec members of ContractDefinition
-rw-r--r-- | libsolidity/ast/AST.cpp | 20 | ||||
-rw-r--r-- | libsolidity/ast/AST.h | 10 | ||||
-rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 3 |
3 files changed, 0 insertions, 33 deletions
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp index 7f4dea0e..2e4ae72a 100644 --- a/libsolidity/ast/AST.cpp +++ b/libsolidity/ast/AST.cpp @@ -218,26 +218,6 @@ vector<pair<FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::inter return *m_interfaceFunctionList; } -Json::Value const& ContractDefinition::devDocumentation() const -{ - return m_devDocumentation; -} - -Json::Value const& ContractDefinition::userDocumentation() const -{ - return m_userDocumentation; -} - -void ContractDefinition::setDevDocumentation(Json::Value const& _devDocumentation) -{ - m_devDocumentation = _devDocumentation; -} - -void ContractDefinition::setUserDocumentation(Json::Value const& _userDocumentation) -{ - 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 4592a190..cecc2f04 100644 --- a/libsolidity/ast/AST.h +++ b/libsolidity/ast/AST.h @@ -392,12 +392,6 @@ public: /// Returns the fallback function or nullptr if no fallback function was specified. FunctionDefinition const* fallbackFunction() const; - Json::Value const& userDocumentation() const; - void setUserDocumentation(Json::Value const& _userDocumentation); - - Json::Value const& devDocumentation() const; - void setDevDocumentation(Json::Value const& _devDocumentation); - virtual TypePointer type() const override; virtual ContractDefinitionAnnotation& annotation() const override; @@ -409,10 +403,6 @@ private: std::vector<ASTPointer<ASTNode>> m_subNodes; ContractKind m_contractKind; - // parsed Natspec documentation of the contract. - Json::Value m_userDocumentation; - Json::Value m_devDocumentation; - std::vector<ContractDefinition const*> m_linearizedBaseContracts; mutable std::unique_ptr<std::vector<std::pair<FixedHash<4>, FunctionTypePointer>>> m_interfaceFunctionList; mutable std::unique_ptr<std::vector<EventDefinition const*>> m_interfaceEvents; diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 7e4518b9..259694da 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -188,9 +188,6 @@ bool CompilerStack::analyze() if (!resolver.updateDeclaration(*m_globalContext->currentSuper())) return false; if (!resolver.resolveNamesAndTypes(*contract)) return false; - contract->setDevDocumentation(Natspec::devDocumentation(*contract)); - contract->setUserDocumentation(Natspec::userDocumentation(*contract)); - // Note that we now reference contracts by their fully qualified names, and // thus contracts can only conflict if declared in the same source file. This // already causes a double-declaration error elsewhere, so we do not report |