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

Simplify interface checks for FunctionDefinition

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-03-17 17:01:13 +00:00
parent 2067a00f22
commit 96c09fcbcd
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libsolidity/analysis/TypeChecker.cpp
View File

@ -457,18 +457,17 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
dynamic_cast<ContractDefinition const&>(*_function.scope()).annotation().linearizedBaseContracts : dynamic_cast<ContractDefinition const&>(*_function.scope()).annotation().linearizedBaseContracts :
vector<ContractDefinition const*>() vector<ContractDefinition const*>()
); );
if (_function.isImplemented()) if (m_scope->contractKind() == ContractDefinition::ContractKind::Interface)
{ {
if (m_scope->contractKind() == ContractDefinition::ContractKind::Interface) if (_function.isImplemented())
typeError(_function.location(), "Functions in interfaces cannot have an implementation."); typeError(_function.location(), "Functions in interfaces cannot have an implementation.");
_function.body().accept(*this); if (_function.visibility() < FunctionDefinition::Visibility::Public)
}
if (_function.visibility() < FunctionDefinition::Visibility::Public)
if (m_scope->contractKind() == ContractDefinition::ContractKind::Interface)
typeError(_function.location(), "Functions in interfaces cannot be internal or private."); typeError(_function.location(), "Functions in interfaces cannot be internal or private.");
if (_function.isConstructor()) if (_function.isConstructor())
if (m_scope->contractKind() == ContractDefinition::ContractKind::Interface)
typeError(_function.location(), "Constructor cannot be defined in interfaces."); typeError(_function.location(), "Constructor cannot be defined in interfaces.");
}
if (_function.isImplemented())
_function.body().accept(*this);
return false; return false;
} }