Accept `address payable` during parsing.

This commit is contained in:
Daniel Kirchner
2018-09-11 14:52:23 +02:00
parent 7d5c139816
commit 1ce3581a52
25 changed files with 285 additions and 12 deletions
@@ -0,0 +1,5 @@
contract C {
address constant payable b = address(0);
}
// ----
// ParserError: (34-41): Expected identifier but got 'payable'
@@ -0,0 +1,4 @@
contract C {
function f(address) public pure returns (address) {}
function g(address payable) public pure returns (address payable) {}
}
@@ -0,0 +1,26 @@
contract C {
address view m_a;
address pure m_b;
address view[] m_c;
mapping(uint => address view) m_d;
function f() public pure {
address view a;
address pure b;
a; b;
}
function g(address view) public pure {}
function h(address pure) public pure {}
function i() public pure returns (address view) {}
function j() public pure returns (address pure) {}
}
// ----
// TypeError: (14-26): Address types can only be payable or non-payable.
// TypeError: (33-45): Address types can only be payable or non-payable.
// TypeError: (52-64): Address types can only be payable or non-payable.
// TypeError: (89-101): Address types can only be payable or non-payable.
// TypeError: (195-207): Address types can only be payable or non-payable.
// TypeError: (236-248): Address types can only be payable or non-payable.
// TypeError: (300-312): Address types can only be payable or non-payable.
// TypeError: (352-364): Address types can only be payable or non-payable.
// TypeError: (138-150): Address types can only be payable or non-payable.
// TypeError: (156-168): Address types can only be payable or non-payable.
@@ -0,0 +1,3 @@
contract C {
address payable constant a = address(0);
}
@@ -0,0 +1,7 @@
contract C {
function f() public pure {
address payable a = address payable(this);
}
}
// ----
// ParserError: (80-87): Expected ';' but got 'payable'
@@ -0,0 +1,6 @@
contract C {
function (address payable) view internal returns (address payable) f;
function g(function (address payable) payable external returns (address payable)) public payable returns (function (address payable) payable external returns (address payable)) {
function (address payable) payable external returns (address payable) h; h;
}
}
@@ -0,0 +1,5 @@
library L {
}
contract C {
using L for address payable;
}
@@ -0,0 +1,11 @@
contract C {
mapping(uint => address payable) m;
mapping(uint => address payable[]) n;
function f() public view {
address payable a;
address payable[] memory b;
mapping(uint => address payable) storage c = m;
mapping(uint => address payable[]) storage d = n;
a; b; c; d;
}
}
@@ -0,0 +1,8 @@
contract C {
address payable a;
address payable public b;
address payable[] c;
address payable[] public d;
mapping(uint => address payable) e;
mapping(uint => address payable[]) f;
}
@@ -0,0 +1,8 @@
contract C {
struct S {
address payable a;
address payable[] b;
mapping(uint => address payable) c;
mapping(uint => address payable[]) d;
}
}
@@ -0,0 +1,7 @@
contract C {
function f() public pure {
address payable;
}
}
// ----
// ParserError: (67-68): Expected identifier but got ';'
@@ -0,0 +1,5 @@
contract C {
address public payable a;
}
// ----
// ParserError: (32-39): Expected identifier but got 'payable'
@@ -0,0 +1,29 @@
contract C {
bool payable a;
string payable b;
int payable c;
int256 payable d;
uint payable e;
uint256 payable f;
byte payable g;
bytes payable h;
bytes32 payable i;
fixed payable j;
fixed80x80 payable k;
ufixed payable l;
ufixed80x80 payable m;
}
// ----
// ParserError: (22-29): State mutability can only be specified for address types.
// ParserError: (44-51): State mutability can only be specified for address types.
// ParserError: (63-70): State mutability can only be specified for address types.
// ParserError: (85-92): State mutability can only be specified for address types.
// ParserError: (105-112): State mutability can only be specified for address types.
// ParserError: (128-135): State mutability can only be specified for address types.
// ParserError: (148-155): State mutability can only be specified for address types.
// ParserError: (169-176): State mutability can only be specified for address types.
// ParserError: (192-199): State mutability can only be specified for address types.
// ParserError: (213-220): State mutability can only be specified for address types.
// ParserError: (239-246): State mutability can only be specified for address types.
// ParserError: (261-268): State mutability can only be specified for address types.
// ParserError: (288-295): State mutability can only be specified for address types.
@@ -0,0 +1,29 @@
contract C {
function a(bool payable) public pure {}
function b(string payable) public pure {}
function c(int payable) public pure {}
function d(int256 payable) public pure {}
function e(uint payable) public pure {}
function f(uint256 payable) public pure {}
function g(byte payable) public pure {}
function h(bytes payable) public pure {}
function i(bytes32 payable) public pure {}
function j(fixed payable) public pure {}
function k(fixed80x80 payable) public pure {}
function l(ufixed payable) public pure {}
function m(ufixed80x80 payable) public pure {}
}
// ----
// ParserError: (33-40): State mutability can only be specified for address types.
// ParserError: (79-86): State mutability can only be specified for address types.
// ParserError: (122-129): State mutability can only be specified for address types.
// ParserError: (168-175): State mutability can only be specified for address types.
// ParserError: (212-219): State mutability can only be specified for address types.
// ParserError: (259-266): State mutability can only be specified for address types.
// ParserError: (303-310): State mutability can only be specified for address types.
// ParserError: (348-355): State mutability can only be specified for address types.
// ParserError: (395-402): State mutability can only be specified for address types.
// ParserError: (440-447): State mutability can only be specified for address types.
// ParserError: (490-497): State mutability can only be specified for address types.
// ParserError: (536-543): State mutability can only be specified for address types.
// ParserError: (587-594): State mutability can only be specified for address types.
@@ -0,0 +1,31 @@
contract C {
function f() public pure {
bool payable a;
string payable b;
int payable c;
int256 payable d;
uint payable e;
uint256 payable f;
byte payable g;
bytes payable h;
bytes32 payable i;
fixed payable j;
fixed80x80 payable k;
ufixed payable l;
ufixed80x80 payable m;
}
}
// ----
// ParserError: (57-64): State mutability can only be specified for address types.
// ParserError: (83-90): State mutability can only be specified for address types.
// ParserError: (106-113): State mutability can only be specified for address types.
// ParserError: (132-139): State mutability can only be specified for address types.
// ParserError: (156-163): State mutability can only be specified for address types.
// ParserError: (183-190): State mutability can only be specified for address types.
// ParserError: (207-214): State mutability can only be specified for address types.
// ParserError: (232-239): State mutability can only be specified for address types.
// ParserError: (259-266): State mutability can only be specified for address types.
// ParserError: (284-291): State mutability can only be specified for address types.
// ParserError: (314-321): State mutability can only be specified for address types.
// ParserError: (340-347): State mutability can only be specified for address types.
// ParserError: (371-378): State mutability can only be specified for address types.
@@ -0,0 +1,29 @@
contract C {
function a() public pure returns (bool payable) {}
function b() public pure returns (string payable) {}
function c() public pure returns (int payable) {}
function d() public pure returns (int256 payable) {}
function e() public pure returns (uint payable) {}
function f() public pure returns (uint256 payable) {}
function g() public pure returns (byte payable) {}
function h() public pure returns (bytes payable) {}
function i() public pure returns (bytes32 payable) {}
function j() public pure returns (fixed payable) {}
function k() public pure returns (fixed80x80 payable) {}
function l() public pure returns (ufixed payable) {}
function m() public pure returns (ufixed80x80 payable) {}
}
// ----
// ParserError: (56-63): State mutability can only be specified for address types.
// ParserError: (113-120): State mutability can only be specified for address types.
// ParserError: (167-174): State mutability can only be specified for address types.
// ParserError: (224-231): State mutability can only be specified for address types.
// ParserError: (279-286): State mutability can only be specified for address types.
// ParserError: (337-344): State mutability can only be specified for address types.
// ParserError: (392-399): State mutability can only be specified for address types.
// ParserError: (448-455): State mutability can only be specified for address types.
// ParserError: (506-513): State mutability can only be specified for address types.
// ParserError: (562-569): State mutability can only be specified for address types.
// ParserError: (623-630): State mutability can only be specified for address types.
// ParserError: (680-687): State mutability can only be specified for address types.
// ParserError: (742-749): State mutability can only be specified for address types.
@@ -0,0 +1,5 @@
contract C {
mapping(address payable => uint) m;
}
// ----
// ParserError: (33-40): Expected '=>' but got 'payable'
@@ -0,0 +1,5 @@
contract C {
function f() public pure returns(address payable[] memory m) {
m = new address payable[](10);
}
}
@@ -2,4 +2,4 @@ contract test {
uint payable x;
}
// ----
// ParserError: (22-29): Expected identifier but got 'payable'
// ParserError: (22-29): State mutability can only be specified for address types.