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 remote-tracking branch 'origin/develop' into breaking

Browse Source
This commit is contained in:
chriseth
2020-07-08 09:37:14 +02:00
parent 41e1e34211 ad5ae2eefe
commit 64b6524bdb
34 changed files with 278 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/syntaxTests/inheritance/override/calldata_memory_conflict.sol
+4 -4
View File
@@ -16,7 +16,7 @@ contract B is A {
function i(uint[] memory) public override payable {}
}
// ----
// DeclarationError 1686: (300-353): Function with same name and arguments defined twice.
// DeclarationError 1686: (358-419): Function with same name and arguments defined twice.
// DeclarationError 1686: (424-485): Function with same name and arguments defined twice.
// DeclarationError 1686: (490-546): Function with same name and arguments defined twice.
// DeclarationError 1686: (300-353): Function with same name and parameter types defined twice.
// DeclarationError 1686: (358-419): Function with same name and parameter types defined twice.
// DeclarationError 1686: (424-485): Function with same name and parameter types defined twice.
// DeclarationError 1686: (490-546): Function with same name and parameter types defined twice.
test/libsolidity/syntaxTests/inheritance/override/internal_external.sol
+1 -1
View File
@@ -3,4 +3,4 @@ contract A {
function f(uint[] memory) internal pure {}
}
// ----
// DeclarationError 1686: (17-61): Function with same name and arguments defined twice.
// DeclarationError 1686: (17-61): Function with same name and parameter types defined twice.