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

Move constructor checks.

Browse Source
This commit is contained in:
chriseth 2018-11-29 18:26:53 +01:00
parent b610be4882
commit 2a85152463
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsolidity/analysis/ContractLevelChecker.cpp
View File

@ -40,6 +40,7 @@ bool ContractLevelChecker::check(ContractDefinition const& _contract)
checkIllegalOverrides(_contract); checkIllegalOverrides(_contract);
checkAbstractFunctions(_contract); checkAbstractFunctions(_contract);
checkBaseConstructorArguments(_contract); checkBaseConstructorArguments(_contract);
checkConstructor(_contract);
return Error::containsOnlyWarnings(m_errorReporter.errors()); return Error::containsOnlyWarnings(m_errorReporter.errors());
} }
@ -339,3 +340,22 @@ void ContractLevelChecker::annotateBaseConstructorArguments(
} }
} }
void ContractLevelChecker::checkConstructor(ContractDefinition const& _contract)
{
FunctionDefinition const* constructor = _contract.constructor();
if (!constructor)
return;
if (!constructor->returnParameters().empty())
m_errorReporter.typeError(constructor->returnParameterList()->location(), "Non-empty \"returns\" directive for constructor.");
if (constructor->stateMutability() != StateMutability::NonPayable && constructor->stateMutability() != StateMutability::Payable)
m_errorReporter.typeError(
constructor->location(),
"Constructor must be payable or non-payable, but is \"" +
stateMutabilityToString(constructor->stateMutability()) +
"\"."
);
if (constructor->visibility() != FunctionDefinition::Visibility::Public && constructor->visibility() != FunctionDefinition::Visibility::Internal)
m_errorReporter.typeError(constructor->location(), "Constructor must be public or internal.");
}

1
libsolidity/analysis/ContractLevelChecker.h
View File

@ -70,6 +70,7 @@ private:
FunctionDefinition const* _baseConstructor, FunctionDefinition const* _baseConstructor,
ASTNode const* _argumentNode ASTNode const* _argumentNode
); );
void checkConstructor(ContractDefinition const& _contract);
langutil::ErrorReporter& m_errorReporter; langutil::ErrorReporter& m_errorReporter;
}; };

16
libsolidity/analysis/TypeChecker.cpp
View File

@ -90,22 +90,6 @@ bool TypeChecker::visit(ContractDefinition const& _contract)
ASTNode::listAccept(_contract.baseContracts(), *this); ASTNode::listAccept(_contract.baseContracts(), *this);
FunctionDefinition const* function = _contract.constructor();
if (function)
{
if (!function->returnParameters().empty())
m_errorReporter.typeError(function->returnParameterList()->location(), "Non-empty \"returns\" directive for constructor.");
if (function->stateMutability() != StateMutability::NonPayable && function->stateMutability() != StateMutability::Payable)
m_errorReporter.typeError(
function->location(),
"Constructor must be payable or non-payable, but is \"" +
stateMutabilityToString(function->stateMutability()) +
"\"."
);
if (function->visibility() != FunctionDefinition::Visibility::Public && function->visibility() != FunctionDefinition::Visibility::Internal)
m_errorReporter.typeError(function->location(), "Constructor must be public or internal.");
}
for (FunctionDefinition const* function: _contract.definedFunctions()) for (FunctionDefinition const* function: _contract.definedFunctions())
if (function->isFallback()) if (function->isFallback())
{ {