Refactor: Combine bool and function pointer.

2 files changed, 8 insertions, 10 deletions

diff --git a/libsolidity/analysis/StaticAnalyzer.cpp b/libsolidity/analysis/StaticAnalyzer.cpp
index 21c97c3b..26e77283 100644
--- a/libsolidity/analysis/StaticAnalyzer.cpp
+++ b/libsolidity/analysis/StaticAnalyzer.cpp
@@ -49,8 +49,7 @@ void StaticAnalyzer::endVisit(ContractDefinition const&)
 bool StaticAnalyzer::visit(FunctionDefinition const& _function)
 {
 	if (_function.isImplemented())
-		m_inFunction = true;
-	m_currentFunction = &_function;
+		m_currentFunction = &_function;
 	m_localVarUseCount.clear();
 	m_nonPayablePublic = _function.isPublic() && !_function.isPayable();
 	return true;
@@ -58,7 +57,7 @@ bool StaticAnalyzer::visit(FunctionDefinition const& _function)
 
 void StaticAnalyzer::endVisit(FunctionDefinition const&)
 {
-	m_inFunction = false;
+	m_currentFunction = nullptr;
 	m_nonPayablePublic = false;
 	for (auto const& var: m_localVarUseCount)
 		if (var.second == 0)
@@ -67,7 +66,7 @@ void StaticAnalyzer::endVisit(FunctionDefinition const&)
 
 bool StaticAnalyzer::visit(Identifier const& _identifier)
 {
-	if (m_inFunction)
+	if (m_currentFunction)
 	{
 		if (auto var = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
 		{
@@ -81,7 +80,7 @@ bool StaticAnalyzer::visit(Identifier const& _identifier)
 
 bool StaticAnalyzer::visit(VariableDeclaration const& _variable)
 {
-	if (m_inFunction)
+	if (m_currentFunction)
 	{
 		solAssert(_variable.isLocalVariable(), "");
 		if (_variable.name() != "")
@@ -101,9 +100,9 @@ bool StaticAnalyzer::visit(Return const& _return)
 {
 	// If the return has an expression, it counts as
 	// a "use" of the return parameters.
-	if (m_inFunction && _return.expression() != NULL)
-		for (auto const& var: m_currentFunction->returnParameterList()->parameters())
-			if (var->name() != "")
+	if (m_currentFunction && _return.expression())
+		for (auto const& var: m_currentFunction->returnParameters())
+			if (!var->name().empty())
 				m_localVarUseCount[var.get()] += 1;
 	return true;
 }
diff --git a/libsolidity/analysis/StaticAnalyzer.h b/libsolidity/analysis/StaticAnalyzer.h
index c1ff6b24..cf2e2175 100644
--- a/libsolidity/analysis/StaticAnalyzer.h
+++ b/libsolidity/analysis/StaticAnalyzer.h
@@ -76,8 +76,7 @@ private:
 
 	std::map<VariableDeclaration const*, int> m_localVarUseCount;
 
-	const FunctionDefinition *m_currentFunction;
-	bool m_inFunction = false;
+	FunctionDefinition const* m_currentFunction = nullptr;
 };
 
 }