Merge remote-tracking branch 'origin/develop' into HEAD

libsolidity/ast/AST.h

@@ -246,7 +246,10 @@ public:
 
 	/// @returns the declared name.
 	ASTString const& name() const { return *m_name; }
+
+	/// @returns the location of the declared name itself or empty location if not available or unknown.
 	SourceLocation const& nameLocation() const noexcept { return m_nameLocation; }
+
 	bool noVisibilitySpecified() const { return m_visibility == Visibility::Default; }
 	Visibility visibility() const { return m_visibility == Visibility::Default ? defaultVisibility() : m_visibility; }
 	bool isPublic() const { return visibility() >= Visibility::Public; }

libsolidity/ast/Types.cpp

@@ -41,7 +41,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <boost/range/algorithm/copy.hpp>
 
 #include <range/v3/view/enumerate.hpp>
 #include <range/v3/view/reverse.hpp>
@@ -2563,6 +2562,11 @@ string UserDefinedValueType::toString(bool /* _short */) const
 	return *definition().annotation().canonicalName;
 }
 
+string UserDefinedValueType::canonicalName() const
+{
+	return *definition().annotation().canonicalName;
+}
+
 vector<tuple<string, Type const*>> UserDefinedValueType::makeStackItems() const
 {
 	return underlyingType().stackItems();

libsolidity/ast/Types.h

@@ -1141,7 +1141,7 @@ public:
 	}
 
 	std::string toString(bool _short) const override;
-	std::string canonicalName() const override { solAssert(false, ""); }
+	std::string canonicalName() const override;
 	std::string signatureInExternalFunction(bool) const override { solAssert(false, ""); }
 
 protected: