Merge pull request #13685 from ethereum/graph-naming-corrections

Graph naming corrections

Author: ekpyron

libsolidity/ast/AST.h

@@ -663,13 +663,13 @@ class UsingForDirective: public ASTNode
 	UsingForDirective(
 		int64_t _id,
 		SourceLocation const& _location,
-		std::vector<ASTPointer<IdentifierPath>> _functions,
+		std::vector<ASTPointer<IdentifierPath>> _functionsOrLibrary,
 		bool _usesBraces,
 		ASTPointer<TypeName> _typeName,
 		bool _global
 	):
 		ASTNode(_id, _location),
-		m_functions(_functions),
+		m_functionsOrLibrary(std::move(_functionsOrLibrary)),
 		m_usesBraces(_usesBraces),
 		m_typeName(std::move(_typeName)),
 		m_global{_global}
@@ -683,13 +683,13 @@ class UsingForDirective: public ASTNode
 	TypeName const* typeName() const { return m_typeName.get(); }
 
 	/// @returns a list of functions or the single library.
-	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functions; }
+	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functionsOrLibrary; }
 	bool usesBraces() const { return m_usesBraces; }
 	bool global() const { return m_global; }
 
 private:
 	/// Either the single library or a list of functions.
-	std::vector<ASTPointer<IdentifierPath>> m_functions;
+	std::vector<ASTPointer<IdentifierPath>> m_functionsOrLibrary;
 	bool m_usesBraces;
 	ASTPointer<TypeName> m_typeName;
 	bool m_global = false;

libsolidity/ast/AST_accept.h

@@ -194,7 +194,7 @@ void UsingForDirective::accept(ASTVisitor& _visitor)
 {
 	if (_visitor.visit(*this))
 	{
-		listAccept(functionsOrLibrary(), _visitor);
+		listAccept(m_functionsOrLibrary, _visitor);
 		if (m_typeName)
 			m_typeName->accept(_visitor);
 	}
@@ -205,7 +205,7 @@ void UsingForDirective::accept(ASTConstVisitor& _visitor) const
 {
 	if (_visitor.visit(*this))
 	{
-		listAccept(functionsOrLibrary(), _visitor);
+		listAccept(m_functionsOrLibrary, _visitor);
 		if (m_typeName)
 			m_typeName->accept(_visitor);
 	}

test/libsolidity/analysis/FunctionCallGraph.cpp

@@ -1673,7 +1673,7 @@ BOOST_AUTO_TEST_CASE(using_for)
 		contract C {
 			using L for S;
 
-			function test() public {
+			function pub() public {
 				S memory s = S(42);
 
 				s.ext();
@@ -1693,8 +1693,8 @@ BOOST_AUTO_TEST_CASE(using_for)
 			{"Entry", "function L.ext(struct S)"},
 		}},
 		{"C", {
-			{"Entry", "function C.test()"},
-			{"function C.test()", "function L.inr(struct S)"},
+			{"Entry", "function C.pub()"},
+			{"function C.pub()", "function L.inr(struct S)"},
 		}},
 	};
 

test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol

@@ -6,5 +6,4 @@ contract C {
         y;
     }
 }
-// ---
 // ----