Rename isSelfSufficient to isVisibleAsUnqualifiedName

Author: a3d4

libsolidity/analysis/DeclarationContainer.cpp

@@ -121,7 +121,7 @@ bool DeclarationContainer::registerDeclaration(
 		if (conflictingDeclaration(_declaration, _name))
 			return false;
 
-		if (m_enclosingContainer && _declaration.isNameSelfSufficient())
+		if (m_enclosingContainer && _declaration.isVisibleAsUnqualifiedName())
 			m_homonymCandidates.emplace_back(*_name, _location ? _location : &_declaration.location());
 	}
 
@@ -144,16 +144,16 @@ vector<Declaration const*> DeclarationContainer::resolveName(
 	ASTString const& _name,
 	bool _recursive,
 	bool _alsoInvisible,
-	bool _onlySelfSufficientNames
+	bool _onlyVisibleAsUnqualifiedNames
 ) const
 {
 	solAssert(!_name.empty(), "Attempt to resolve empty name.");
 	vector<Declaration const*> result;
 
-	auto filter = [&result, &_onlySelfSufficientNames](vector<Declaration const*> _declarations) {
-		_onlySelfSufficientNames ?
+	auto filter = [&result, &_onlyVisibleAsUnqualifiedNames](vector<Declaration const*> _declarations) {
+		_onlyVisibleAsUnqualifiedNames ?
 			copy_if(_declarations.cbegin(), _declarations.cend(), back_inserter(result), [](auto& _declaration) {
-				return _declaration->isNameSelfSufficient();
+				return _declaration->isVisibleAsUnqualifiedName();
 			}) :
 			copy(_declarations.cbegin(), _declarations.cend(), back_inserter(result));
 	};

libsolidity/analysis/DeclarationContainer.h

@@ -60,7 +60,7 @@ class DeclarationContainer
 		ASTString const& _name,
 		bool _recursive = false,
 		bool _alsoInvisible = false,
-		bool _onlySelfSufficientNames = false
+		bool _onlyVisibleAsUnqualifiedNames = false
 	) const;
 	ASTNode const* enclosingNode() const { return m_enclosingNode; }
 	DeclarationContainer const* enclosingContainer() const { return m_enclosingContainer; }

libsolidity/ast/AST.cpp

@@ -498,14 +498,14 @@ bool Declaration::isEventParameter() const
 	return dynamic_cast<EventDefinition const*>(scope());
 }
 
-bool Declaration::isNameSelfSufficient() const
+bool Declaration::isVisibleAsUnqualifiedName() const
 {
 	if (!scope())
 		return true;
 	if (isStructMember() || isEnumValue() || isEventParameter())
 		return false;
 	if (auto functionDefinition = dynamic_cast<FunctionDefinition const*>(scope()))
-		if (!functionDefinition->hasBody())
+		if (!functionDefinition->isImplemented())
 			return false; // parameter of a function without body
 	return true;
 }

libsolidity/ast/AST.h

@@ -272,7 +272,7 @@ class Declaration: public ASTNode, public Scopable
 	/// Usually the name alone can be used to refer to the corresponding entity.
 	/// But, for example, struct member names or enum member names require a prefix.
 	/// Another example is event parameter names, which do not participate in any proper scope.
-	bool isNameSelfSufficient() const;
+	bool isVisibleAsUnqualifiedName() const;
 
 	/// @returns the type of expressions referencing this declaration.
 	/// This can only be called once types of variable declarations have already been resolved.