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

Implement override checking

Browse Source
This commit is contained in:
Mathias Baumann
2019-10-30 17:31:33 +01:00
parent 5ff02c12e2
commit 6c6a9054b2
85 changed files with 965 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol
+1
View File
@@ -40,6 +40,7 @@ contract MultiSigWalletWithDailyLimit is MultiSigWallet {
/// @param transactionId Transaction ID.
function executeTransaction(uint transactionId)
public
override
notExecuted(transactionId)
{
Transaction storage tx = transactions[transactionId];
test/compilationTests/corion/premium.sol
+1 -1
View File
@@ -12,7 +12,7 @@ contract thirdPartyPContractAbstract {
contract ptokenDB is tokenDB {}
contract premium is module, safeMath {
function replaceModule(address payable addr) external returns (bool success) {
function replaceModule(address payable addr) external override returns (bool success) {
require( super.isModuleHandler(msg.sender) );
require( db.replaceOwner(addr) );
super._replaceModule(addr);
test/compilationTests/corion/provider.sol
+3 -3
View File
@@ -9,14 +9,14 @@ contract provider is module, safeMath, announcementTypes {
/*
module callbacks
*/
function connectModule() external returns (bool success) {
function connectModule() external override returns (bool success) {
require( super.isModuleHandler(msg.sender) );
super._connectModule();
(bool _success, uint256 currentSchellingRound) = moduleHandler(moduleHandlerAddress).getCurrentSchellingRoundID();
require( _success );
return true;
}
function transferEvent(address payable from, address payable to, uint256 value) external returns (bool success) {
function transferEvent(address payable from, address payable to, uint256 value) external override returns (bool success) {
/*
Transaction completed. This function is only available for the modulehandler.
It should be checked if the sender or the acceptor does not connect to the provider or it is not a provider itself if so than the change should be recorded.
@@ -31,7 +31,7 @@ contract provider is module, safeMath, announcementTypes {
transferEvent_(to, value, false);
return true;
}
function newSchellingRoundEvent(uint256 roundID, uint256 reward) external returns (bool success) {
function newSchellingRoundEvent(uint256 roundID, uint256 reward) external override returns (bool success) {
/*
New schelling round. This function is only available for the moduleHandler.
We are recording the new schelling round and we are storing the whole current quantity of the tokens.
test/compilationTests/corion/publisher.sol
+1 -1
View File
@@ -9,7 +9,7 @@ contract publisher is announcementTypes, module, safeMath {
/*
module callbacks
*/
function transferEvent(address payable from, address payable to, uint256 value) external returns (bool success) {
function transferEvent(address payable from, address payable to, uint256 value) external override returns (bool success) {
/*
Transaction completed. This function is available only for moduleHandler
If a transaction is carried out from or to an address which participated in the objection of an announcement, its objection purport is automatically set
test/compilationTests/corion/schelling.sol
+2 -2
View File
@@ -134,13 +134,13 @@ contract schelling is module, announcementTypes, schellingVars {
/*
module callbacks
*/
function replaceModule(address payable addr) external returns (bool) {
function replaceModule(address payable addr) external override returns (bool) {
require( super.isModuleHandler(msg.sender) );
require( db.replaceOwner(addr) );
super._replaceModule(addr);
return true;
}
function transferEvent(address payable from, address payable to, uint256 value) external returns (bool) {
function transferEvent(address payable from, address payable to, uint256 value) external override returns (bool) {
/*
Transaction completed. This function can be called only by the ModuleHandler.
If this contract is the receiver, the amount will be added to the prize pool of the current round.
test/compilationTests/corion/token.sol
+1 -1
View File
@@ -15,7 +15,7 @@ contract token is safeMath, module, announcementTypes {
/*
module callbacks
*/
function replaceModule(address payable addr) external returns (bool success) {
function replaceModule(address payable addr) external override returns (bool success) {
require( super.isModuleHandler(msg.sender) );
require( db.replaceOwner(addr) );
super._replaceModule(addr);
test/compilationTests/gnosis/Events/CategoricalEvent.sol
+2
View File
@@ -28,6 +28,7 @@ contract CategoricalEvent is Event {
/// @return Sender's winnings
function redeemWinnings()
public
override
returns (uint winnings)
{
// Winning outcome has to be set
@@ -45,6 +46,7 @@ contract CategoricalEvent is Event {
/// @return Event hash
function getEventHash()
public
override
view
returns (bytes32)
{
test/compilationTests/gnosis/Events/ScalarEvent.sol
+2
View File
@@ -47,6 +47,7 @@ contract ScalarEvent is Event {
/// @return Sender's winnings
function redeemWinnings()
public
override
returns (uint winnings)
{
// Winning outcome has to be set
@@ -79,6 +80,7 @@ contract ScalarEvent is Event {
/// @return Event hash
function getEventHash()
public
override
view
returns (bytes32)
{
test/compilationTests/gnosis/MarketMakers/LMSRMarketMaker.sol
+3
View File
@@ -24,6 +24,7 @@ contract LMSRMarketMaker is MarketMaker {
/// @return Cost
function calcCost(Market market, uint8 outcomeTokenIndex, uint outcomeTokenCount)
public
override
view
returns (uint cost)
{
@@ -59,6 +60,7 @@ contract LMSRMarketMaker is MarketMaker {
/// @return Profit
function calcProfit(Market market, uint8 outcomeTokenIndex, uint outcomeTokenCount)
public
override
view
returns (uint profit)
{
@@ -85,6 +87,7 @@ contract LMSRMarketMaker is MarketMaker {
/// @return Marginal price of an outcome as a fixed point number
function calcMarginalPrice(Market market, uint8 outcomeTokenIndex)
public
override
view
returns (uint price)
{
test/compilationTests/gnosis/Markets/StandardMarket.sol
+7
View File
@@ -56,6 +56,7 @@ contract StandardMarket is Market {
/// @param _funding Funding amount
function fund(uint _funding)
public
override
isCreator
atStage(Stages.MarketCreated)
{
@@ -70,6 +71,7 @@ contract StandardMarket is Market {
/// @dev Allows market creator to close the markets by transferring all remaining outcome tokens to the creator
function close()
override
public
isCreator
atStage(Stages.MarketFunded)
@@ -85,6 +87,7 @@ contract StandardMarket is Market {
/// @return Fee amount
function withdrawFees()
public
override
isCreator
returns (uint fees)
{
@@ -101,6 +104,7 @@ contract StandardMarket is Market {
/// @return Cost in collateral tokens
function buy(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint maxCost)
public
override
atStage(Stages.MarketFunded)
returns (uint cost)
{
@@ -131,6 +135,7 @@ contract StandardMarket is Market {
/// @return Profit in collateral tokens
function sell(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint minProfit)
public
override
atStage(Stages.MarketFunded)
returns (uint profit)
{
@@ -161,6 +166,7 @@ contract StandardMarket is Market {
/// @return Cost to short sell outcome in collateral tokens
function shortSell(uint8 outcomeTokenIndex, uint outcomeTokenCount, uint minProfit)
public
override
returns (uint cost)
{
// Buy all outcomes
@@ -186,6 +192,7 @@ contract StandardMarket is Market {
/// @return Fee for trade
function calcMarketFee(uint outcomeTokenCost)
public
override
view
returns (uint)
{
test/compilationTests/gnosis/Markets/StandardMarketFactory.sol
+1
View File
@@ -17,6 +17,7 @@ contract StandardMarketFactory is MarketFactory {
/// @return Market contract
function createMarket(Event eventContract, MarketMaker marketMaker, uint24 fee)
public
override
returns (Market market)
{
market = new StandardMarket(msg.sender, eventContract, marketMaker, fee);
test/compilationTests/gnosis/Oracles/CentralizedOracle.sol
+2
View File
@@ -72,6 +72,7 @@ contract CentralizedOracle is Oracle {
/// @return Is outcome set?
function isOutcomeSet()
public
override
view
returns (bool)
{
@@ -82,6 +83,7 @@ contract CentralizedOracle is Oracle {
/// @return Outcome
function getOutcome()
public
override
view
returns (int)
{
test/compilationTests/gnosis/Oracles/DifficultyOracle.sol
+2
View File
@@ -44,6 +44,7 @@ contract DifficultyOracle is Oracle {
/// @return Is outcome set?
function isOutcomeSet()
public
override
view
returns (bool)
{
@@ -55,6 +56,7 @@ contract DifficultyOracle is Oracle {
/// @return Outcome
function getOutcome()
public
override
view
returns (int)
{
test/compilationTests/gnosis/Oracles/FutarchyOracle.sol
+2
View File
@@ -151,6 +151,7 @@ contract FutarchyOracle is Oracle {
/// @return Is outcome set?
function isOutcomeSet()
public
override
view
returns (bool)
{
@@ -161,6 +162,7 @@ contract FutarchyOracle is Oracle {
/// @return Outcome
function getOutcome()
public
override
view
returns (int)
{
test/compilationTests/gnosis/Oracles/MajorityOracle.sol
+2
View File
@@ -70,6 +70,7 @@ contract MajorityOracle is Oracle {
/// @return Is outcome set?
function isOutcomeSet()
public
override
view
returns (bool)
{
@@ -81,6 +82,7 @@ contract MajorityOracle is Oracle {
/// @return Outcome
function getOutcome()
public
override
view
returns (int)
{
test/compilationTests/gnosis/Oracles/SignedMessageOracle.sol
+2
View File
@@ -84,6 +84,7 @@ contract SignedMessageOracle is Oracle {
/// @return Is outcome set?
function isOutcomeSet()
public
override
view
returns (bool)
{
@@ -94,6 +95,7 @@ contract SignedMessageOracle is Oracle {
/// @return Outcome
function getOutcome()
public
override
view
returns (int)
{
test/compilationTests/gnosis/Oracles/UltimateOracle.sol
+2
View File
@@ -174,6 +174,7 @@ contract UltimateOracle is Oracle {
/// @return Is outcome set?
function isOutcomeSet()
public
override
view
returns (bool)
{
@@ -185,6 +186,7 @@ contract UltimateOracle is Oracle {
/// @return Outcome
function getOutcome()
public
override
view
returns (int)
{
test/compilationTests/gnosis/Tokens/StandardToken.sol
+6
View File
@@ -23,6 +23,7 @@ contract StandardToken is Token {
/// @return Was transfer successful?
function transfer(address to, uint value)
public
override
returns (bool)
{
if ( !balances[msg.sender].safeToSub(value)
@@ -41,6 +42,7 @@ contract StandardToken is Token {
/// @return Was transfer successful?
function transferFrom(address from, address to, uint value)
public
override
returns (bool)
{
if ( !balances[from].safeToSub(value)
@@ -60,6 +62,7 @@ contract StandardToken is Token {
/// @return Was approval successful?
function approve(address spender, uint value)
public
override
returns (bool)
{
allowances[msg.sender][spender] = value;
@@ -73,6 +76,7 @@ contract StandardToken is Token {
/// @return Remaining allowance for spender
function allowance(address owner, address spender)
public
override
view
returns (uint)
{
@@ -84,6 +88,7 @@ contract StandardToken is Token {
/// @return Balance of owner
function balanceOf(address owner)
public
override
view
returns (uint)
{
@@ -94,6 +99,7 @@ contract StandardToken is Token {
/// @return Total supply
function totalSupply()
public
override
view
returns (uint)
{
test/contracts/AuctionRegistrar.cpp
+8 -8
View File
@@ -55,11 +55,11 @@ contract Registrar is NameRegister {
event PrimaryChanged(string indexed name, address indexed addr);
function owner(string memory _name) public view returns (address o_owner);
function addr(string memory _name) public view returns (address o_address);
function addr(string memory _name) public override view returns (address o_address);
function subRegistrar(string memory _name) public view returns (address o_subRegistrar);
function content(string memory _name) public view returns (bytes32 o_content);
function name(address _owner) public view returns (string memory o_name);
function name(address _owner) public override view returns (string memory o_name);
}
contract AuctionSystem {
@@ -119,7 +119,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
// TODO: Populate with hall-of-fame.
}
function onAuctionEnd(string memory _name) internal {
function onAuctionEnd(string memory _name) internal override {
Auction storage auction = m_auctions[_name];
Record storage record = m_toRecord[_name];
address previousOwner = record.owner;
@@ -204,11 +204,11 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
return true;
}
function owner(string memory _name) public view returns (address) { return m_toRecord[_name].owner; }
function addr(string memory _name) public view returns (address) { return m_toRecord[_name].primary; }
function subRegistrar(string memory _name) public view returns (address) { return m_toRecord[_name].subRegistrar; }
function content(string memory _name) public view returns (bytes32) { return m_toRecord[_name].content; }
function name(address _addr) public view returns (string memory o_name) { return m_toName[_addr]; }
function owner(string memory _name) public override view returns (address) { return m_toRecord[_name].owner; }
function addr(string memory _name) public override view returns (address) { return m_toRecord[_name].primary; }
function subRegistrar(string memory _name) public override view returns (address) { return m_toRecord[_name].subRegistrar; }
function content(string memory _name) public override view returns (bytes32) { return m_toRecord[_name].content; }
function name(address _addr) public override view returns (string memory o_name) { return m_toName[_addr]; }
mapping (address => string) m_toName;
mapping (string => Record) m_toRecord;
test/contracts/FixedFeeRegistrar.cpp
+4 -4
View File
@@ -111,10 +111,10 @@ contract FixedFeeRegistrar is Registrar {
o_content = rec.content;
o_owner = rec.owner;
}
function addr(string memory _name) public view returns (address) { return m_record(_name).addr; }
function subRegistrar(string memory _name) public view returns (address) { return m_record(_name).subRegistrar; }
function content(string memory _name) public view returns (bytes32) { return m_record(_name).content; }
function owner(string memory _name) public view returns (address) { return m_record(_name).owner; }
function addr(string memory _name) public override view returns (address) { return m_record(_name).addr; }
function subRegistrar(string memory _name) public override view returns (address) { return m_record(_name).subRegistrar; }
function content(string memory _name) public override view returns (bytes32) { return m_record(_name).content; }
function owner(string memory _name) public override view returns (address) { return m_record(_name).owner; }
Record[2**253] m_recordData;
function m_record(string memory _name) view internal returns (Record storage o_record) {
test/contracts/Wallet.cpp
+8 -5
View File
@@ -128,7 +128,7 @@ contract multiowned {
}
// Replaces an owner `_from` with another `_to`.
function changeOwner(address _from, address _to) onlymanyowners(keccak256(msg.data)) external {
function changeOwner(address _from, address _to) onlymanyowners(keccak256(msg.data)) public {
if (isOwner(_to)) return;
uint ownerIndex = m_ownerIndex[uint(_from)];
if (ownerIndex == 0) return;
@@ -347,7 +347,7 @@ contract multisig {
// FUNCTIONS
// TODO: document
function changeOwner(address _from, address _to) external;
function changeOwner(address _from, address _to) public;
function execute(address _to, uint _value, bytes calldata _data) external returns (bytes32);
function confirm(bytes32 _h) public returns (bool);
}
@@ -374,6 +374,9 @@ contract Wallet is multisig, multiowned, daylimit {
multiowned(_owners, _required) daylimit(_daylimit) {
}
function changeOwner(address _from, address _to) public override(multiowned, multisig) {
multiowned.changeOwner(_from, _to);
}
// destroys the contract sending everything to `_to`.
function kill(address payable _to) onlymanyowners(keccak256(msg.data)) external {
selfdestruct(_to);
@@ -390,7 +393,7 @@ contract Wallet is multisig, multiowned, daylimit {
// If not, goes into multisig process. We provide a hash on return to allow the sender to provide
// shortcuts for the other confirmations (allowing them to avoid replicating the _to, _value
// and _data arguments). They still get the option of using them if they want, anyways.
function execute(address _to, uint _value, bytes calldata _data) external onlyowner returns (bytes32 _r) {
function execute(address _to, uint _value, bytes calldata _data) external override onlyowner returns (bytes32 _r) {
// first, take the opportunity to check that we're under the daily limit.
if (underLimit(_value)) {
emit SingleTransact(msg.sender, _value, _to, _data);
@@ -410,7 +413,7 @@ contract Wallet is multisig, multiowned, daylimit {
// confirm a transaction through just the hash. we use the previous transactions map, m_txs, in order
// to determine the body of the transaction from the hash provided.
function confirm(bytes32 _h) onlymanyowners(_h) public returns (bool) {
function confirm(bytes32 _h) onlymanyowners(_h) public override returns (bool) {
if (m_txs[_h].to != 0x0000000000000000000000000000000000000000) {
m_txs[_h].to.call.value(m_txs[_h].value)(m_txs[_h].data);
emit MultiTransact(msg.sender, _h, m_txs[_h].value, m_txs[_h].to, m_txs[_h].data);
@@ -421,7 +424,7 @@ contract Wallet is multisig, multiowned, daylimit {
// INTERNAL METHODS
function clearPending() internal {
function clearPending() internal override {
uint length = m_pendingIndex.length;
for (uint i = 0; i < length; ++i)
delete m_txs[m_pendingIndex[i]];
test/externalTests/solc-js/DAO/DAO.sol
+24 -21
View File
@@ -397,7 +397,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
function receiveEther() public returns (bool) {
function receiveEther() public override returns (bool) {
return true;
}
@@ -409,7 +409,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
bytes memory _transactionData,
uint _debatingPeriod,
bool _newCurator
) onlyTokenholders public payable returns (uint _proposalID) {
) onlyTokenholders public override payable returns (uint _proposalID) {
// Sanity check
if (_newCurator && (
@@ -479,7 +479,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
address payable _recipient,
uint _amount,
bytes memory _transactionData
) public view returns (bool _codeChecksOut) {
) public override view returns (bool _codeChecksOut) {
Proposal storage p = proposals[_proposalID];
return p.proposalHash == keccak256(abi.encodePacked(_recipient, _amount, _transactionData));
}
@@ -488,7 +488,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
function vote(
uint _proposalID,
bool _supportsProposal
) onlyTokenholders public returns (uint _voteID) {
) onlyTokenholders public override returns (uint _voteID) {
Proposal storage p = proposals[_proposalID];
if (p.votedYes[msg.sender]
@@ -521,7 +521,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
function executeProposal(
uint _proposalID,
bytes memory _transactionData
) public returns (bool _success) {
) public override returns (bool _success) {
Proposal storage p = proposals[_proposalID];
@@ -622,7 +622,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
function splitDAO(
uint _proposalID,
address payable _newCurator
) onlyTokenholders public returns (bool _success) {
) onlyTokenholders public override returns (bool _success) {
Proposal storage p = proposals[_proposalID];
@@ -694,7 +694,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
return true;
}
function newContract(address payable _newContract) public {
function newContract(address payable _newContract) public override {
if (msg.sender != address(this) || !allowedRecipients[_newContract]) return;
// move all ether
(bool success,) = _newContract.call.value(address(this).balance)("");
@@ -710,7 +710,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
function retrieveDAOReward(bool _toMembers) external returns (bool _success) {
function retrieveDAOReward(bool _toMembers) external override returns (bool _success) {
DAO dao = DAO(msg.sender);
if ((rewardToken[msg.sender] * DAOrewardAccount.accumulatedInput()) /
@@ -735,12 +735,13 @@ contract DAO is DAOInterface, Token, TokenCreation {
return true;
}
function getMyReward() public returns (bool _success) {
function getMyReward() public override returns (bool _success) {
return withdrawRewardFor(msg.sender);
}
function withdrawRewardFor(address payable _account) noEther internal returns (bool _success) {
function withdrawRewardFor(address payable _account) noEther internal
override returns (bool _success) {
if ((balanceOf(_account) * rewardAccount.accumulatedInput()) / totalSupply < paidOut[_account])
revert();
@@ -756,7 +757,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
function transfer(address _to, uint256 _value) public returns (bool success) {
function transfer(address _to, uint256 _value) public override returns (bool success) {
if (isFueled
&& now > closingTime
&& !isBlocked(msg.sender)
@@ -771,14 +772,15 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
function transferWithoutReward(address _to, uint256 _value) public returns (bool success) {
function transferWithoutReward(address _to, uint256 _value) public override returns (bool success) {
if (!getMyReward())
revert();
return transfer(_to, _value);
}
function transferFrom(address _from, address _to, uint256 _value) public returns (bool success) {
function transferFrom(address _from, address _to, uint256 _value) public
override returns (bool success) {
if (isFueled
&& now > closingTime
&& !isBlocked(_from)
@@ -797,7 +799,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
address payable _from,
address _to,
uint256 _value
) public returns (bool success) {
) public override returns (bool success) {
if (!withdrawRewardFor(_from))
revert();
@@ -820,7 +822,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
function changeProposalDeposit(uint _proposalDeposit) external {
function changeProposalDeposit(uint _proposalDeposit) external override {
if (msg.sender != address(this) || _proposalDeposit > (actualBalance() + rewardToken[address(this)])
/ maxDepositDivisor) {
@@ -830,7 +832,8 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
function changeAllowedRecipients(address _recipient, bool _allowed) external returns (bool _success) {
function changeAllowedRecipients(address _recipient, bool _allowed) external
override returns (bool _success) {
if (msg.sender != curator)
revert();
allowedRecipients[_recipient] = _allowed;
@@ -862,7 +865,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
function halveMinQuorum() public returns (bool _success) {
function halveMinQuorum() public override returns (bool _success) {
// this can only be called after `quorumHalvingPeriod` has passed or at anytime after
// fueling by the curator with a delay of at least `minProposalDebatePeriod`
// between the calls
@@ -891,16 +894,16 @@ contract DAO is DAOInterface, Token, TokenCreation {
);
}
function numberOfProposals() public view returns (uint _numberOfProposals) {
function numberOfProposals() public view override returns (uint _numberOfProposals) {
// Don't count index 0. It's used by isBlocked() and exists from start
return proposals.length - 1;
}
function getNewDAOAddress(uint _proposalID) public view returns (address _newDAO) {
function getNewDAOAddress(uint _proposalID) public override view returns (address _newDAO) {
return address(proposals[_proposalID].splitData[0].newDAO);
}
function isBlocked(address _account) internal returns (bool) {
function isBlocked(address _account) internal override returns (bool) {
if (blocked[_account] == 0)
return false;
Proposal storage p = proposals[blocked[_account]];
@@ -912,7 +915,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
}
}
function unblockMe() public returns (bool) {
function unblockMe() public override returns (bool) {
return isBlocked(msg.sender);
}
}
test/externalTests/solc-js/DAO/ManagedAccount.sol
+1 -1
View File
@@ -54,7 +54,7 @@ contract ManagedAccount is ManagedAccountInterface{
accumulatedInput += msg.value;
}
function payOut(address payable _recipient, uint _amount) public returns (bool) {
function payOut(address payable _recipient, uint _amount) public override returns (bool) {
if (msg.sender != owner || (payOwnerOnly && _recipient != owner))
revert();
(bool success,) = _recipient.call.value(_amount)("");
test/externalTests/solc-js/DAO/Token.sol
+5 -5
View File
@@ -94,11 +94,11 @@ contract Token is TokenInterface {
// inadvertently also transferred ether
modifier noEther() {if (msg.value > 0) revert(); _; }
function balanceOf(address _owner) public view returns (uint256 balance) {
function balanceOf(address _owner) public override view returns (uint256 balance) {
return balances[_owner];
}
function transfer(address _to, uint256 _amount) public returns (bool success) {
function transfer(address _to, uint256 _amount) public override returns (bool success) {
if (balances[msg.sender] >= _amount && _amount > 0) {
balances[msg.sender] -= _amount;
balances[_to] += _amount;
@@ -113,7 +113,7 @@ contract Token is TokenInterface {
address _from,
address _to,
uint256 _amount
) public returns (bool success) {
) public override returns (bool success) {
if (balances[_from] >= _amount
&& allowed[_from][msg.sender] >= _amount
@@ -129,7 +129,7 @@ contract Token is TokenInterface {
}
}
function approve(address _spender, uint256 _amount) public returns (bool success) {
function approve(address _spender, uint256 _amount) public override returns (bool success) {
allowed[msg.sender][_spender] = _amount;
emit Approval(msg.sender, _spender, _amount);
return true;
@@ -144,7 +144,7 @@ contract Token is TokenInterface {
return true;
}
function allowance(address _owner, address _spender) public view returns (uint256 remaining) {
function allowance(address _owner, address _spender) public override view returns (uint256 remaining) {
return allowed[_owner][_spender];
}
}
test/externalTests/solc-js/DAO/TokenCreation.sol
+4 -3
View File
@@ -100,7 +100,8 @@ contract TokenCreation is TokenCreationInterface, Token {
}
function createTokenProxy(address payable _tokenHolder) payable public returns (bool success) {
function createTokenProxy(address payable _tokenHolder) payable public
override returns (bool success) {
if (now < closingTime && msg.value > 0
&& (privateCreation == 0x0000000000000000000000000000000000000000 || privateCreation == msg.sender)) {
@@ -119,7 +120,7 @@ contract TokenCreation is TokenCreationInterface, Token {
revert();
}
function refund() public {
function refund() public override {
if (now > closingTime && !isFueled) {
// Get extraBalance - will only succeed when called for the first time
if (address(extraBalance).balance >= extraBalance.accumulatedInput())
@@ -136,7 +137,7 @@ contract TokenCreation is TokenCreationInterface, Token {
}
}
function divisor() public view returns (uint divisor) {
function divisor() public override view returns (uint divisor) {
// The number of (base unit) tokens per wei is calculated
// as `msg.value` * 20 / `divisor`
// The fueling period starts with a 1:1 ratio
test/libsolidity/Metadata.cpp
+2 -2
View File
@@ -219,14 +219,14 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
pragma solidity >=0.0;
import "./A";
contract B is A {
function g(function(uint) external returns (uint) x) public {}
function g(function(uint) external returns (uint) x) public override {}
}
)";
char const* sourceCodeC = R"(
pragma solidity >=0.0;
import "./B";
contract C is B {
function g(function(uint) external returns (uint) x) public {}
function g(function(uint) external returns (uint) x) public override {}
}
)";
compilerStack.setSources({
test/libsolidity/SolidityEndToEndTest.cpp
+23 -21
View File
@@ -2113,7 +2113,7 @@ BOOST_AUTO_TEST_CASE(virtual_function_calls)
function g() public returns (uint i) { return 1; }
}
contract Derived is Base {
function g() public returns (uint i) { return 2; }
function g() public override returns (uint i) { return 2; }
}
)";
ALSO_VIA_YUL(
@@ -2175,10 +2175,10 @@ BOOST_AUTO_TEST_CASE(explicit_base_class)
{
char const* sourceCode = R"(
contract BaseBase { function g() public returns (uint r) { return 1; } }
contract Base is BaseBase { function g() public returns (uint r) { return 2; } }
contract Base is BaseBase { function g() public override returns (uint r) { return 2; } }
contract Derived is Base {
function f() public returns (uint r) { return BaseBase.g(); }
function g() public returns (uint r) { return 3; }
function g() public override returns (uint r) { return 3; }
}
)";
compileAndRun(sourceCode, 0, "Derived");
@@ -2243,7 +2243,7 @@ BOOST_AUTO_TEST_CASE(virtual_function_usage_in_constructor_arguments)
}
contract Derived is Base() {
function getA() public returns (uint r) { return m_a; }
function overridden() public returns (uint r) { return 2; }
function overridden() public override returns (uint r) { return 2; }
}
)";
compileAndRun(sourceCode, 0, "Derived");
@@ -2335,7 +2335,7 @@ BOOST_AUTO_TEST_CASE(function_modifier_overriding)
modifier mod { _; }
}
contract C is A {
modifier mod { if (false) _; }
modifier mod override { if (false) _; }
}
)";
compileAndRun(sourceCode);
@@ -2356,8 +2356,8 @@ BOOST_AUTO_TEST_CASE(function_modifier_calling_functions_in_creation_context)
function getData() public returns (uint r) { return data; }
}
contract C is A {
modifier mod1 { f4(); _; }
function f3() public { data |= 0x300; }
modifier mod1 override { f4(); _; }
function f3() public override { data |= 0x300; }
function f4() public { data |= 0x4000; }
}
)";
@@ -2375,7 +2375,7 @@ BOOST_AUTO_TEST_CASE(function_modifier_for_constructor)
function getData() public returns (uint r) { return data; }
}
contract C is A {
modifier mod1 { data |= 4; _; }
modifier mod1 override { data |= 4; _; }
}
)";
compileAndRun(sourceCode);
@@ -2483,9 +2483,9 @@ BOOST_AUTO_TEST_CASE(super)
{
char const* sourceCode = R"(
contract A { function f() public returns (uint r) { return 1; } }
contract B is A { function f() public returns (uint r) { return super.f() | 2; } }
contract C is A { function f() public returns (uint r) { return super.f() | 4; } }
contract D is B, C { function f() public returns (uint r) { return super.f() | 8; } }
contract B is A { function f() public override returns (uint r) { return super.f() | 2; } }
contract C is A { function f() public override returns (uint r) { return super.f() | 4; } }
contract D is B, C { function f() public override(B, C) returns (uint r) { return super.f() | 8; } }
)";
compileAndRun(sourceCode, 0, "D");
ABI_CHECK(callContractFunction("f()"), encodeArgs(1 | 2 | 4 | 8));
@@ -2495,9 +2495,9 @@ BOOST_AUTO_TEST_CASE(super_in_constructor)
{
char const* sourceCode = R"(
contract A { function f() public returns (uint r) { return 1; } }
contract B is A { function f() public returns (uint r) { return super.f() | 2; } }
contract C is A { function f() public returns (uint r) { return super.f() | 4; } }
contract D is B, C { uint data; constructor() public { data = super.f() | 8; } function f() public returns (uint r) { return data; } }
contract B is A { function f() public override returns (uint r) { return super.f() | 2; } }
contract C is A { function f() public override returns (uint r) { return super.f() | 4; } }
contract D is B, C { uint data; constructor() public { data = super.f() | 8; } function f() public override (B, C) returns (uint r) { return data; } }
)";
compileAndRun(sourceCode, 0, "D");
ABI_CHECK(callContractFunction("f()"), encodeArgs(1 | 2 | 4 | 8));
@@ -6018,9 +6018,11 @@ BOOST_AUTO_TEST_CASE(proper_order_of_overwriting_of_attributes)
contract init_fix is init, fix {
function checkOk() public returns (bool) { return ok; }
function isOk() public override (init, fix) returns (bool) { return super.isOk(); }
}
contract fix_init is fix, init {
function checkOk() public returns (bool) { return ok; }
function isOk() public override (init, fix) returns (bool) { return super.isOk(); }
}
)";
compileAndRun(sourceCode, 0, "init_fix");
@@ -7983,7 +7985,7 @@ BOOST_AUTO_TEST_CASE(inherited_function) {
char const* sourceCode = R"(
contract A { function f() internal returns (uint) { return 1; } }
contract B is A {
function f() internal returns (uint) { return 2; }
function f() internal override returns (uint) { return 2; }
function g() public returns (uint) {
return A.f();
}
@@ -7998,7 +8000,7 @@ BOOST_AUTO_TEST_CASE(inherited_function_calldata_memory) {
char const* sourceCode = R"(
contract A { function f(uint[] calldata a) external returns (uint) { return a[0]; } }
contract B is A {
function f(uint[] memory a) public returns (uint) { return a[1]; }
function f(uint[] memory a) public override returns (uint) { return a[1]; }
function g() public returns (uint) {
uint[] memory m = new uint[](2);
m[0] = 42;
@@ -8015,7 +8017,7 @@ BOOST_AUTO_TEST_CASE(inherited_function_calldata_memory) {
BOOST_AUTO_TEST_CASE(inherited_function_calldata_memory_interface) {
char const* sourceCode = R"(
interface I { function f(uint[] calldata a) external returns (uint); }
contract A is I { function f(uint[] memory a) public returns (uint) { return 42; } }
contract A is I { function f(uint[] memory a) public override returns (uint) { return 42; } }
contract B {
function f(uint[] memory a) public returns (uint) { return a[1]; }
function g() public returns (uint) {
@@ -8032,7 +8034,7 @@ BOOST_AUTO_TEST_CASE(inherited_function_calldata_memory_interface) {
BOOST_AUTO_TEST_CASE(inherited_function_calldata_calldata_interface) {
char const* sourceCode = R"(
interface I { function f(uint[] calldata a) external returns (uint); }
contract A is I { function f(uint[] calldata a) external returns (uint) { return 42; } }
contract A is I { function f(uint[] calldata a) external override returns (uint) { return 42; } }
contract B {
function f(uint[] memory a) public returns (uint) { return a[1]; }
function g() public returns (uint) {
@@ -12471,7 +12473,7 @@ BOOST_AUTO_TEST_CASE(interface_contract)
}
contract A is I {
function f() public returns (bool) {
function f() public override returns (bool) {
return g();
}
@@ -14479,7 +14481,7 @@ BOOST_AUTO_TEST_CASE(external_public_override)
function f() external returns (uint) { return 1; }
}
contract B is A {
function f() public returns (uint) { return 2; }
function f() public override returns (uint) { return 2; }
function g() public returns (uint) { return f(); }
}
)";
@@ -14647,7 +14649,7 @@ BOOST_AUTO_TEST_CASE(contract_name)
}
}
contract D is C {
function name() public pure returns (string memory) {
function name() public override pure returns (string memory) {
return type(D).name;
}
function name2() public pure returns (string memory) {
test/libsolidity/SolidityNameAndTypeResolution.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE(abstract_contract)
SourceUnit const* sourceUnit = nullptr;
char const* text = R"(
contract base { function foo() public; }
contract derived is base { function foo() public {} }
contract derived is base { function foo() public override {} }
)";
sourceUnit = parseAndAnalyse(text);
std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
test/libsolidity/SolidityTypes.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
// TypeType is tested with contract
auto emptyParams = make_shared<ParameterList>(SourceLocation(), std::vector<ASTPointer<VariableDeclaration>>());
ModifierDefinition mod(SourceLocation{}, make_shared<string>("modif"), {}, emptyParams, {});
ModifierDefinition mod(SourceLocation{}, make_shared<string>("modif"), {}, emptyParams, {}, {});
BOOST_CHECK_EQUAL(ModifierType(mod).identifier(), "t_modifier$__$");
SourceUnit su({}, {});
test/libsolidity/semanticTests/functionCall/base_base_overload.sol
+2 -2
View File
@@ -11,11 +11,11 @@ contract BaseBase {
}
contract Base is BaseBase {
function init(uint a, uint b) public {
function init(uint a, uint b) public override {
x = a;
y = b;
}
function init(uint a) public {
function init(uint a) public override {
x = a;
}
}
test/libsolidity/semanticTests/viaYul/virtual_functions.sol
+1 -1
View File
@@ -19,7 +19,7 @@ contract C is X {
// explicit call via base
//x = super.g();
}
function g() public returns (uint x) {
function g() public override returns (uint x) {
x = 3;
}
}
test/libsolidity/syntaxTests/inheritance/override/add_view.sol
+1
View File
@@ -1,4 +1,5 @@
contract B { function f() public {} }
contract C is B { function f() public view {} }
// ----
// TypeError: (56-83): Overriding function is missing 'override' specifier.
// TypeError: (56-83): Overriding function changes state mutability from "nonpayable" to "view".
test/libsolidity/syntaxTests/inheritance/override/calldata_memory.sol
+4 -4
View File
@@ -6,8 +6,8 @@ contract A {
function i(uint[] calldata) external payable {}
}
contract B is A {
function f(uint[] memory) public pure {}
function g(uint[] memory) public view { dummy; }
function h(uint[] memory) public { dummy = 42; }
function i(uint[] memory) public payable {}
function f(uint[] memory) public override pure {}
function g(uint[] memory) public override view { dummy; }
function h(uint[] memory) public override { dummy = 42; }
function i(uint[] memory) public override payable {}
}
test/libsolidity/syntaxTests/inheritance/override/calldata_memory_conflict.sol
+12 -16
View File
@@ -6,21 +6,17 @@ contract A {
function i(uint[] calldata) external payable {}
}
contract B is A {
function f(uint[] calldata) external pure {}
function g(uint[] calldata) external view { dummy; }
function h(uint[] calldata) external { dummy = 42; }
function i(uint[] calldata) external payable {}
function f(uint[] memory) public pure {}
function g(uint[] memory) public view { dummy; }
function h(uint[] memory) public { dummy = 42; }
function i(uint[] memory) public payable {}
function f(uint[] calldata) external override pure {}
function g(uint[] calldata) external override view { dummy; }
function h(uint[] calldata) external override { dummy = 42; }
function i(uint[] calldata) external override payable {}
function f(uint[] memory) public override pure {}
function g(uint[] memory) public override view { dummy; }
function h(uint[] memory) public override { dummy = 42; }
function i(uint[] memory) public override payable {}
}
// ----
// DeclarationError: (268-312): Function with same name and arguments defined twice.
// DeclarationError: (317-369): Function with same name and arguments defined twice.
// DeclarationError: (374-426): Function with same name and arguments defined twice.
// DeclarationError: (431-478): Function with same name and arguments defined twice.
// TypeError: (268-312): Overriding function visibility differs.
// TypeError: (317-369): Overriding function visibility differs.
// TypeError: (374-426): Overriding function visibility differs.
// TypeError: (431-478): Overriding function visibility differs.
// DeclarationError: (268-321): Function with same name and arguments defined twice.
// DeclarationError: (326-387): Function with same name and arguments defined twice.
// DeclarationError: (392-453): Function with same name and arguments defined twice.
// DeclarationError: (458-514): Function with same name and arguments defined twice.
test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface.sol
+4 -4
View File
@@ -6,8 +6,8 @@ interface I {
}
contract C is I {
uint dummy;
function f(uint[] memory) public pure {}
function g(uint[] memory) public view { dummy; }
function h(uint[] memory) public { dummy = 42; }
function i(uint[] memory) public payable {}
function f(uint[] memory) public override pure {}
function g(uint[] memory) public override view { dummy; }
function h(uint[] memory) public override { dummy = 42; }
function i(uint[] memory) public override payable {}
}
test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_instantiate.sol
+2 -2
View File
@@ -2,11 +2,11 @@ interface I {
function f(uint[] calldata) external pure;
}
contract A is I {
function f(uint[] memory) public pure {}
function f(uint[] memory) public override pure {}
}
contract C {
function f() public {
I i = I(new A());
i.f(new uint[](1));
}
}
}
test/libsolidity/syntaxTests/inheritance/override/calldata_memory_interface_struct.sol
+4 -4
View File
@@ -8,10 +8,10 @@ interface I {
}
contract C is I {
uint dummy;
function f(S memory) public pure {}
function g(S memory) public view { dummy; }
function h(S memory) public { dummy = 42; }
function i(S memory) public payable {}
function f(S memory) public override pure {}
function g(S memory) public override view { dummy; }
function h(S memory) public override { dummy = 42; }
function i(S memory) public override payable {}
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
test/libsolidity/syntaxTests/inheritance/override/calldata_memory_struct.sol
+4 -4
View File
@@ -8,10 +8,10 @@ contract A {
function i(S calldata) external payable {}
}
contract B is A {
function f(S memory) public pure {}
function g(S memory) public view { dummy; }
function h(S memory) public { dummy = 42; }
function i(S memory) public payable {}
function f(S memory) public override pure {}
function g(S memory) public override view { dummy; }
function h(S memory) public override { dummy = 42; }
function i(S memory) public override payable {}
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
test/libsolidity/syntaxTests/inheritance/override/change_return_types_in_interface.sol
+1
View File
@@ -7,4 +7,5 @@ contract B is I {
function f() public pure returns (uint, uint) {}
}
// ----
// TypeError: (182-230): Overriding function is missing 'override' specifier.
// TypeError: (182-230): Overriding function return types differ.
test/libsolidity/syntaxTests/inheritance/override/external_turns_public_no_params.sol
+1 -1
View File
@@ -2,6 +2,6 @@ contract A {
function f() external pure {}
}
contract B is A {
function f() public pure {
function f() public override pure {
}
}
test/libsolidity/syntaxTests/inheritance/override/internal_external.sol
-1
View File
@@ -4,4 +4,3 @@ contract A {
}
// ----
// DeclarationError: (17-61): Function with same name and arguments defined twice.
// TypeError: (17-61): Overriding function visibility differs.
test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol
+1 -1
View File
@@ -6,4 +6,4 @@ contract B {
}
contract C is A, B {}
// ----
// TypeError: (81-123): Overriding function visibility differs.
// TypeError: (126-147): Derived contract must override function "f". Function with the same name and parameter types defined in two or more base classes.
test/libsolidity/syntaxTests/inheritance/override/override.sol
+7 -1
View File
@@ -1,5 +1,11 @@
contract X {
contract A {
int public testvar;
function test() internal returns (uint256);
function test2() internal returns (uint256);
}
contract X is A {
int public override testvar;
function test() internal override returns (uint256);
function test2() internal override(A) returns (uint256);
}
// ----
test/libsolidity/syntaxTests/inheritance/override/override_ambiguous.sol
+14
View File
@@ -0,0 +1,14 @@
contract A {
int public testvar;
function foo() internal returns (uint256);
}
contract B {
function foo() internal returns (uint256);
function test() internal returns (uint256);
}
contract X is A, B {
int public override testvar;
function test() internal override returns (uint256);
}
// ----
// TypeError: (184-290): Derived contract must override function "foo". Function with the same name and parameter types defined in two or more base classes.
test/libsolidity/syntaxTests/inheritance/override/override_base_base.sol
+20
View File
@@ -0,0 +1,20 @@
contract A {
function foo() internal returns (uint256);
}
contract B is A {
function foo() internal override returns (uint256);
}
contract C is B {
function foo() internal override returns (uint256);
}
contract D is C {
function foo() internal override returns (uint256);
}
contract X is D {
function foo() internal override returns (uint256);
}
// ----
test/libsolidity/syntaxTests/inheritance/override/override_multiple.sol
+14 -2
View File
@@ -1,9 +1,21 @@
contract A {
int public testvar;
function foo() internal returns (uint256);
function test(uint8 _a) internal returns (uint256);
}
contract B {
function foo() internal returns (uint256);
function test() internal returns (uint256);
}
contract C {
function foo() internal returns (uint256);
}
contract X {
contract D {
function foo() internal returns (uint256);
}
contract X is A, B, C, D {
int public override testvar;
function test() internal override returns (uint256);
function foo() internal override(X, A) returns (uint256);
function foo() internal override(A, B, C, D) returns (uint256);
}
// ----
test/libsolidity/syntaxTests/inheritance/override/override_multiple2.sol
+15
View File
@@ -0,0 +1,15 @@
contract A {
int public testvar;
function foo() internal returns (uint256);
function test(uint8 _a) internal returns (uint256);
}
contract B {
function foo() internal returns (uint256);
}
contract C is A {
}
contract D is A, B, C {
function foo() internal override(A, B) returns (uint256);
}
// ----
test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol
+26
View File
@@ -0,0 +1,26 @@
contract A {
int public testvar;
function foo() internal returns (uint256);
function test(uint8 _a) internal returns (uint256);
}
contract B {
function foo() internal returns (uint256);
function test() internal returns (uint256);
}
contract C {
function foo() internal returns (uint256);
}
contract D {
function foo() internal returns (uint256);
function test() internal returns (uint256);
}
contract X is A, B, C, D {
int public override testvar;
function test() internal override(B, D, D) returns (uint256);
function foo() internal override(A, C, B, B, B, D ,D) returns (uint256);
}
// ----
// TypeError: (498-499): Duplicate contract "D" found in override list of "test".
// TypeError: (563-564): Duplicate contract "B" found in override list of "foo".
// TypeError: (566-567): Duplicate contract "B" found in override list of "foo".
// TypeError: (572-573): Duplicate contract "D" found in override list of "foo".
test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol
+24
View File
@@ -0,0 +1,24 @@
contract A {
int public testvar;
function foo() internal returns (uint256);
function test(uint8 _a) internal returns (uint256);
}
contract B {
function foo() internal returns (uint256);
function test() internal returns (uint256);
}
contract C {
function foo() internal returns (uint256);
}
contract D {
function foo() internal returns (uint256);
function test() internal returns (uint256);
}
contract X is A, B, C, D {
int public override testvar;
function test() internal override(B, D, C) returns (uint256);
function foo() internal override(A, C) returns (uint256);
}
// ----
// TypeError: (483-500): Invalid contract specified in override list: C.
// TypeError: (545-559): Function needs to specify overridden contracts B and D.
test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol
+6
View File
@@ -0,0 +1,6 @@
contract A {
int public testvar;
function foo() internal override(N, Z) returns (uint256);
}
// ----
// DeclarationError: (68-69): Identifier not found or not unique.
test/libsolidity/syntaxTests/inheritance/override/override_return_mismatch.sol
+14
View File
@@ -0,0 +1,14 @@
contract A {
int public testvar;
function foo() internal returns (uint256);
}
contract B {
function foo() internal returns (uint8);
function test() internal returns (uint256);
}
contract X is A, B {
int public override testvar;
function test() internal override returns (uint256);
}
// ----
// TypeError: (182-288): Derived contract must override function "foo". Function with the same name and parameter types defined in two or more base classes.
test/libsolidity/syntaxTests/inheritance/override/override_shared_base.sol
+15
View File
@@ -0,0 +1,15 @@
contract I {
function set() public {}
}
contract A is I {
uint a;
function set() public override { a = 1; super.set(); a = 2; }
}
contract B is I {
uint b;
function set() public override { b = 1; super.set(); b = 2; }
}
contract X is A, B {
function set() public override(A, B) { super.set(); }
}
test/libsolidity/syntaxTests/inheritance/override/override_shared_base_partial.sol
+10
View File
@@ -0,0 +1,10 @@
contract I {
function f() external {}
}
contract A is I {
function f() external override {}
}
contract B is I {}
contract C is A, B {
function f() external override(A, I) {}
}
test/libsolidity/syntaxTests/inheritance/override/override_shared_base_simple.sol
+6
View File
@@ -0,0 +1,6 @@
contract I {
function f() external {}
}
contract A is I {}
contract B is I {}
contract C is A, B {}
test/libsolidity/syntaxTests/inheritance/override/remove_view.sol
+1
View File
@@ -1,4 +1,5 @@
contract B { function f() public view {} }
contract C is B { function f() public {} }
// ----
// TypeError: (61-83): Overriding function is missing 'override' specifier.
// TypeError: (61-83): Overriding function changes state mutability from "view" to "nonpayable".
test/libsolidity/syntaxTests/inheritance/super_on_external.sol
+2 -2
View File
@@ -2,9 +2,9 @@ contract A {
function f() external pure {}
}
contract B is A {
function f() public pure {
function f() public override pure {
super.f();
}
}
// ----
// TypeError: (106-113): Member "f" not found or not visible after argument-dependent lookup in contract super B.
// TypeError: (115-122): Member "f" not found or not visible after argument-dependent lookup in contract super B.
test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol
+1
View File
@@ -1,4 +1,5 @@
contract A { modifier mod(uint a) { _; } }
contract B is A { modifier mod(uint8 a) { _; } }
// ----
// TypeError: (61-89): Overriding modifier is missing 'override' specifier.
// TypeError: (61-89): Override changes modifier signature.
test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract A { modifier mod(uint a) { _; } }
contract B is A { function mod(uint a) public { } }
// ----
// DeclarationError: (61-92): Identifier already declared.
// TypeError: (13-40): Override changes modifier to function.
// TypeError: (61-92): Override changes modifier to function.
test/libsolidity/syntaxTests/nameAndTypeResolution/030_redeclare_implemented_abstract_function_as_abstract.sol
+3 -2
View File
@@ -1,5 +1,6 @@
contract base { function foo() public; }
contract derived is base { function foo() public {} }
contract derived is base { function foo() public override {} }
contract wrong is derived { function foo() public; }
// ----
// TypeError: (123-145): Redeclaring an already implemented function as abstract
// TypeError: (132-154): Overriding function is missing 'override' specifier.
// TypeError: (132-154): Redeclaring an already implemented function as abstract
test/libsolidity/syntaxTests/nameAndTypeResolution/055_inheritance_diamond_basic.sol
+2 -1
View File
@@ -2,6 +2,7 @@ contract root { function rootFunction() public {} }
contract inter1 is root { function f() public {} }
contract inter2 is root { function f() public {} }
contract derived is root, inter2, inter1 {
function g() public { f(); rootFunction(); }
function g() public { f(); rootFunction(); }
function f() override(inter1, inter2) public {}
}
// ----
test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol
+1
View File
@@ -1,4 +1,5 @@
contract B { function f() internal {} }
contract C is B { function f() public {} }
// ----
// TypeError: (58-80): Overriding function is missing 'override' specifier.
// TypeError: (58-80): Overriding function visibility differs.
test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol
+1 -1
View File
@@ -1,5 +1,5 @@
contract A { function f() public { uint8 x = C(0).g(); } }
contract B { function f() public {} function g() public returns (uint8) {} }
contract C is A, B { }
contract C is A, B { function f() public override (A, B) { A.f(); } }
// ----
// Warning: (35-42): Unused local variable.
test/libsolidity/syntaxTests/nameAndTypeResolution/079_fallback_function_inheritance.sol
+1 -1
View File
@@ -3,5 +3,5 @@ contract A {
function() external { x = 1; }
}
contract C is A {
function() external { x = 2; }
function() override external { x = 2; }
}
test/libsolidity/syntaxTests/nameAndTypeResolution/149_test_for_bug_override_function_with_bytearray_type.sol
+1 -1
View File
@@ -2,7 +2,7 @@ contract Vehicle {
function f(bytes calldata) external returns (uint256 r) {r = 1;}
}
contract Bike is Vehicle {
function f(bytes calldata) external returns (uint256 r) {r = 42;}
function f(bytes calldata) override external returns (uint256 r) {r = 42;}
}
// ----
// Warning: (23-87): Function state mutability can be restricted to pure
test/libsolidity/syntaxTests/nameAndTypeResolution/181_override_changes_return_types.sol
+2 -2
View File
@@ -2,7 +2,7 @@ contract base {
function f(uint a) public returns (uint) { }
}
contract test is base {
function f(uint a) public returns (uint8) { }
function f(uint a) public override returns (uint8) { }
}
// ----
// TypeError: (95-140): Overriding function return types differ.
// TypeError: (95-149): Overriding function return types differ.
test/libsolidity/syntaxTests/nameAndTypeResolution/182_equal_overload.sol
-1
View File
@@ -4,4 +4,3 @@ contract C {
}
// ----
// DeclarationError: (17-66): Function with same name and arguments defined twice.
// TypeError: (17-66): Overriding function return types differ.
test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol
+1
View File
@@ -1,4 +1,5 @@
contract B { function f() payable public {} }
contract C is B { function f() public {} }
// ----
// TypeError: (64-86): Overriding function is missing 'override' specifier.
// TypeError: (64-86): Overriding function changes state mutability from "payable" to "nonpayable".
test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol
+1
View File
@@ -1,4 +1,5 @@
contract B { function f() public {} }
contract C is B { function f() payable public {} }
// ----
// TypeError: (56-86): Overriding function is missing 'override' specifier.
// TypeError: (56-86): Overriding function changes state mutability from "nonpayable" to "payable".
test/libsolidity/syntaxTests/nameAndTypeResolution/423_using_interface.sol
+1 -1
View File
@@ -2,7 +2,7 @@ interface I {
function f() external;
}
contract C is I {
function f() public {
function f() public override {
}
}
// ----
test/libsolidity/syntaxTests/nameAndTypeResolution/424_using_interface_complex.sol
+1 -1
View File
@@ -5,7 +5,7 @@ interface I {
function() external;
}
contract C is I {
function f() public {
function f() public override {
}
}
// ----
test/libsolidity/syntaxTests/nameAndTypeResolution/425_interface_implement_public_contract.sol
+1 -1
View File
@@ -2,6 +2,6 @@ interface I {
function f() external;
}
contract C is I {
function f() public {
function f() public override {
}
}
test/libsolidity/syntaxTests/unimplemented_super_function.sol
+2 -2
View File
@@ -2,7 +2,7 @@ contract a {
function f() public;
}
contract b is a {
function f() public { super.f(); }
function f() public override { super.f(); }
}
// ----
// TypeError: (84-91): Member "f" not found or not visible after argument-dependent lookup in contract super b.
// TypeError: (93-100): Member "f" not found or not visible after argument-dependent lookup in contract super b.
test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol
+3 -3
View File
@@ -2,11 +2,11 @@ contract a {
function f() public;
}
contract b is a {
function f() public { super.f(); }
function f() public override { super.f(); }
}
contract c is a,b {
// No error here.
function f() public { super.f(); }
function f() public override(a, b) { super.f(); }
}
// ----
// TypeError: (84-91): Member "f" not found or not visible after argument-dependent lookup in contract super b.
// TypeError: (93-100): Member "f" not found or not visible after argument-dependent lookup in contract super b.
test/libsolidity/syntaxTests/viewPureChecker/interface.sol
+1 -1
View File
@@ -2,5 +2,5 @@ interface D {
function f() view external;
}
contract C is D {
function f() view external {}
function f() override view external {}
}
test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol
+6 -6
View File
@@ -4,13 +4,13 @@ contract D {
function g() public pure {}
}
contract C1 is D {
function f() public {}
function g() public view {}
function f() public override {}
function g() public override view {}
}
contract C2 is D {
function g() public {}
function g() public override {}
}
// ----
// TypeError: (118-140): Overriding function changes state mutability from "view" to "nonpayable".
// TypeError: (145-172): Overriding function changes state mutability from "pure" to "view".
// TypeError: (198-220): Overriding function changes state mutability from "pure" to "nonpayable".
// TypeError: (118-149): Overriding function changes state mutability from "view" to "nonpayable".
// TypeError: (154-190): Overriding function changes state mutability from "pure" to "view".
// TypeError: (216-247): Overriding function changes state mutability from "pure" to "nonpayable".
test/libsolidity/syntaxTests/viewPureChecker/overriding_no_restrict_warning.sol
+1 -1
View File
@@ -3,5 +3,5 @@ contract D {
function f() public { x = 2; }
}
contract C is D {
function f() public {}
function f() public override {}
}