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 TypeChecker::visit(FunctionDefinition const&).

Browse Source
This commit is contained in:
Daniel Kirchner 2019-01-17 16:37:36 +01:00
parent a766efc79f
commit b7a86a124d
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libsolidity/analysis/TypeChecker.cpp
View File

@ -299,32 +299,40 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
if (!_function.isConstructor() && !_function.isFallback() && !_function.isPartOfExternalInterface()) if (!_function.isConstructor() && !_function.isFallback() && !_function.isPartOfExternalInterface())
m_errorReporter.typeError(_function.location(), "Internal functions cannot be payable."); m_errorReporter.typeError(_function.location(), "Internal functions cannot be payable.");
} }
for (ASTPointer<VariableDeclaration> const& var: _function.parameters() + _function.returnParameters()) auto checkArgumentAndReturnParameter = [&](VariableDeclaration const& var) {
if (type(var)->category() == Type::Category::Mapping)
{ {
if (type(*var)->category() == Type::Category::Mapping) if (!type(var)->dataStoredIn(DataLocation::Storage))
{ m_errorReporter.typeError(var.location(), "Mapping types can only have a data location of \"storage\"." );
if (!type(*var)->dataStoredIn(DataLocation::Storage))
m_errorReporter.typeError(var->location(), "Mapping types can only have a data location of \"storage\"." );
else if (!isLibraryFunction && _function.isPublic()) else if (!isLibraryFunction && _function.isPublic())
m_errorReporter.typeError(var->location(), "Mapping types for parameters or return variables can only be used in internal or library functions."); m_errorReporter.typeError(var.location(), "Mapping types for parameters or return variables can only be used in internal or library functions.");
} }
else else
{ {
if (!type(*var)->canLiveOutsideStorage() && _function.isPublic()) if (!type(var)->canLiveOutsideStorage() && _function.isPublic())
m_errorReporter.typeError(var->location(), "Type is required to live outside storage."); m_errorReporter.typeError(var.location(), "Type is required to live outside storage.");
if (_function.isPublic() && !(type(*var)->interfaceType(isLibraryFunction))) if (_function.isPublic() && !(type(var)->interfaceType(isLibraryFunction)))
m_errorReporter.fatalTypeError(var->location(), "Internal or recursive type is not allowed for public or external functions."); m_errorReporter.fatalTypeError(var.location(), "Internal or recursive type is not allowed for public or external functions.");
} }
if ( if (
_function.isPublic() && _function.isPublic() &&
!_function.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2) && !_function.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2) &&
!typeSupportedByOldABIEncoder(*type(*var)) !typeSupportedByOldABIEncoder(*type(var))
) )
m_errorReporter.typeError( m_errorReporter.typeError(
var->location(), var.location(),
"This type is only supported in the new experimental ABI encoder. " "This type is only supported in the new experimental ABI encoder. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature." "Use \"pragma experimental ABIEncoderV2;\" to enable the feature."
); );
};
for (ASTPointer<VariableDeclaration> const& var: _function.parameters())
{
checkArgumentAndReturnParameter(*var);
var->accept(*this);
}
for (ASTPointer<VariableDeclaration> const& var: _function.returnParameters())
{
checkArgumentAndReturnParameter(*var);
var->accept(*this); var->accept(*this);
} }
set<Declaration const*> modifiers; set<Declaration const*> modifiers;