cerc-io/solidity
15
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

Minor changes from review.

Browse Source
This commit is contained in:
chriseth 2017-09-13 17:29:27 +02:00
parent 66c01301fe
commit e2f30ce9ca
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsolidity/analysis/ViewPureChecker.cpp
View File

@ -108,12 +108,7 @@ bool ViewPureChecker::check()
{ {
SourceUnit const* source = dynamic_cast<SourceUnit const*>(node.get()); SourceUnit const* source = dynamic_cast<SourceUnit const*>(node.get());
solAssert(source, ""); solAssert(source, "");
for (auto const& topLevelNode: source->nodes()) contracts += source->filteredNodes<ContractDefinition>(source->nodes());
{
ContractDefinition const* contract = dynamic_cast<ContractDefinition const*>(topLevelNode.get());
if (contract)
contracts.push_back(contract);
}
} }
// Check modifiers first to infer their state mutability. // Check modifiers first to infer their state mutability.
@ -146,7 +141,6 @@ void ViewPureChecker::endVisit(FunctionDefinition const& _funDef)
_funDef.isImplemented() && _funDef.isImplemented() &&
!_funDef.isConstructor() && !_funDef.isConstructor() &&
!_funDef.isFallback() && !_funDef.isFallback() &&
!_funDef.isConstructor() &&
!_funDef.annotation().superFunction !_funDef.annotation().superFunction
) )
m_errorReporter.warning( m_errorReporter.warning(
@ -207,7 +201,7 @@ void ViewPureChecker::endVisit(Identifier const& _identifier)
void ViewPureChecker::endVisit(InlineAssembly const& _inlineAssembly) void ViewPureChecker::endVisit(InlineAssembly const& _inlineAssembly)
{ {
AssemblyViewPureChecker{ AssemblyViewPureChecker{
[=](StateMutability _mut, SourceLocation const& _loc) { reportMutability(_mut, _loc); } [=](StateMutability _mutability, SourceLocation const& _location) { reportMutability(_mutability, _location); }
}(_inlineAssembly.operations()); }(_inlineAssembly.operations());
} }
@ -230,7 +224,7 @@ void ViewPureChecker::reportMutability(StateMutability _mutability, SourceLocati
solAssert(false, ""); solAssert(false, "");
if (m_currentFunction->stateMutability() == StateMutability::View) if (m_currentFunction->stateMutability() == StateMutability::View)
// Change this to error with 0.5.0 // TODO Change this to error with 0.5.0
m_errorReporter.warning(_location, text); m_errorReporter.warning(_location, text);
else if (m_currentFunction->stateMutability() == StateMutability::Pure) else if (m_currentFunction->stateMutability() == StateMutability::Pure)
{ {