Merge pull request #2814 from ethereum/natspec-cleanup

Remove unused statements from the Natspec headers

2 files changed, 1 insertions, 28 deletions

diff --git a/libsolidity/analysis/DocStringAnalyser.cpp b/libsolidity/analysis/DocStringAnalyser.cpp
index 9a846b31..d08c4eb5 100644
--- a/libsolidity/analysis/DocStringAnalyser.cpp
+++ b/libsolidity/analysis/DocStringAnalyser.cpp
@@ -72,7 +72,7 @@ void DocStringAnalyser::handleCallable(
 	DocumentedAnnotation& _annotation
 )
 {
-	static const set<string> validTags = set<string>{"author", "dev", "notice", "return", "param", "why3"};
+	static const set<string> validTags = set<string>{"author", "dev", "notice", "return", "param"};
 	parseDocStrings(_node, _annotation, validTags, "functions");
 
 	set<string> validParams;
diff --git a/libsolidity/interface/Natspec.h b/libsolidity/interface/Natspec.h
index 9ac3efea..0701f821 100644
--- a/libsolidity/interface/Natspec.h
+++ b/libsolidity/interface/Natspec.h
@@ -36,27 +36,8 @@ namespace solidity
 
 // Forward declarations
 class ContractDefinition;
-class Type;
-using TypePointer = std::shared_ptr<Type const>;
 struct DocTag;
 
-enum class DocTagType: uint8_t
-{
-	None = 0,
-	Dev,
-	Notice,
-	Param,
-	Return,
-	Author,
-	Title
-};
-
-enum class CommentOwner
-{
-	Contract,
-	Function
-};
-
 class Natspec
 {
 public:
@@ -71,14 +52,6 @@ public:
 	static Json::Value devDocumentation(ContractDefinition const& _contractDef);
 
 private:
-	/// @returns a json value suitable for a list of types in function input or output
-	/// parameters or other places. If @a _forLibrary is true, complex types are referenced
-	/// by name, otherwise they are anonymously expanded.
-	static Json::Value formatTypeList(
-		std::vector<std::string> const& _names,
-		std::vector<TypePointer> const& _types,
-		bool _forLibrary
-	);
 	/// @returns concatenation of all content under the given tag name.
 	static std::string extractDoc(std::multimap<std::string, DocTag> const& _tags, std::string const& _name);
 };