cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor: Combine bool and function pointer.

Browse Source
This commit is contained in:
chriseth 2017-05-02 14:25:37 +02:00
parent a6faa5acf3
commit e0266b79f3
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsolidity/analysis/StaticAnalyzer.cpp
View File

@ -49,7 +49,6 @@ void StaticAnalyzer::endVisit(ContractDefinition const&)
bool StaticAnalyzer::visit(FunctionDefinition const& _function) bool StaticAnalyzer::visit(FunctionDefinition const& _function)
{ {
if (_function.isImplemented()) if (_function.isImplemented())
m_inFunction = true;
m_currentFunction = &_function; m_currentFunction = &_function;
m_localVarUseCount.clear(); m_localVarUseCount.clear();
m_nonPayablePublic = _function.isPublic() && !_function.isPayable(); m_nonPayablePublic = _function.isPublic() && !_function.isPayable();
@ -58,7 +57,7 @@ bool StaticAnalyzer::visit(FunctionDefinition const& _function)
void StaticAnalyzer::endVisit(FunctionDefinition const&) void StaticAnalyzer::endVisit(FunctionDefinition const&)
{ {
m_inFunction = false; m_currentFunction = nullptr;
m_nonPayablePublic = false; m_nonPayablePublic = false;
for (auto const& var: m_localVarUseCount) for (auto const& var: m_localVarUseCount)
if (var.second == 0) if (var.second == 0)
@ -67,7 +66,7 @@ void StaticAnalyzer::endVisit(FunctionDefinition const&)
bool StaticAnalyzer::visit(Identifier const& _identifier) bool StaticAnalyzer::visit(Identifier const& _identifier)
{ {
if (m_inFunction) if (m_currentFunction)
{ {
if (auto var = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration)) 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) bool StaticAnalyzer::visit(VariableDeclaration const& _variable)
{ {
if (m_inFunction) if (m_currentFunction)
{ {
solAssert(_variable.isLocalVariable(), ""); solAssert(_variable.isLocalVariable(), "");
if (_variable.name() != "") if (_variable.name() != "")
@ -101,9 +100,9 @@ bool StaticAnalyzer::visit(Return const& _return)
{ {
// If the return has an expression, it counts as // If the return has an expression, it counts as
// a "use" of the return parameters. // a "use" of the return parameters.
if (m_inFunction && _return.expression() != NULL) if (m_currentFunction && _return.expression())
for (auto const& var: m_currentFunction->returnParameterList()->parameters()) for (auto const& var: m_currentFunction->returnParameters())
if (var->name() != "") if (!var->name().empty())
m_localVarUseCount[var.get()] += 1; m_localVarUseCount[var.get()] += 1;
return true; return true;
} }

3
libsolidity/analysis/StaticAnalyzer.h
View File

@ -76,8 +76,7 @@ private:
std::map<VariableDeclaration const*, int> m_localVarUseCount; std::map<VariableDeclaration const*, int> m_localVarUseCount;
const FunctionDefinition *m_currentFunction; FunctionDefinition const* m_currentFunction = nullptr;
bool m_inFunction = false;
}; };
} }