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

Merge pull request #5486 from ethereum/allowExternalPublicOverride

Browse Source 
Allow external public override
This commit is contained in:
chriseth
2018-11-26 14:26:55 +01:00
committed by GitHub
parent 9ac7c748f8 ac5803bf3e
commit 7921e5f0b9
6 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/analysis/TypeChecker.cpp
+6 -9
View File
@@ -413,16 +413,14 @@ void TypeChecker::checkFunctionOverride(FunctionDefinition const& _function, Fun
if (_function.visibility() != _super.visibility())
{
// visibility is enforced to be external in interfaces, but a contract can override that with public
if (
_super.inContractKind() == ContractDefinition::ContractKind::Interface &&
_function.inContractKind() != ContractDefinition::ContractKind::Interface &&
// Visibility change from external to public is fine.
// Any other change is disallowed.
if (!(
_super.visibility() == FunctionDefinition::Visibility::External &&
_function.visibility() == FunctionDefinition::Visibility::Public
)
return;
overrideError(_function, _super, "Overriding function visibility differs.");
))
overrideError(_function, _super, "Overriding function visibility differs.");
}
else if (_function.stateMutability() != _super.stateMutability())
overrideError(
_function,
@@ -433,7 +431,6 @@ void TypeChecker::checkFunctionOverride(FunctionDefinition const& _function, Fun
stateMutabilityToString(_function.stateMutability()) +
"\"."
);
else if (functionType != superType)
overrideError(_function, _super, "Overriding function return types differ.");
}