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

Initial introduction of array slices with partial implementation for dynamic calldata arrays.

Browse Source
This commit is contained in:
Daniel Kirchner
2019-09-13 10:57:53 +02:00
parent 50ce3b0ac8
commit 4782c800ec
50 changed files with 659 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/semanticTests/abiDecodeV1/decode_slice.sol
+9
View File
@@ -0,0 +1,9 @@
contract C {
function f(uint256 a, uint256 b) external returns (uint256 c, uint256 d, uint256 e, uint256 f) {
(c, d) = abi.decode(msg.data[4:], (uint256, uint256));
e = abi.decode(msg.data[4 : 4 + 32], (uint256));
f = abi.decode(msg.data[4 + 32 : 4 + 32 + 32], (uint256));
}
}
// ----
// f(uint256,uint256): 42, 23 -> 42, 23, 42, 23
test/libsolidity/semanticTests/array/calldata_slice_access.sol
+44
View File
@@ -0,0 +1,44 @@
contract C {
function f(uint256[] calldata x, uint256 start, uint256 end) external pure {
x[start:end];
}
function g(uint256[] calldata x, uint256 start, uint256 end, uint256 index) external pure returns (uint256, uint256, uint256) {
return (x[start:end][index], x[start:][0:end-start][index], x[:end][start:][index]);
}
}
// ----
// f(uint256[],uint256,uint256): 0x80, 0, 0, 0, 1, 42 ->
// f(uint256[],uint256,uint256): 0x80, 0, 1, 0, 1, 42 ->
// f(uint256[],uint256,uint256): 0x80, 0, 2, 0, 1, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, 1, 0, 0, 1, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, 1, 1, 0, 1, 42 ->
// f(uint256[],uint256,uint256): 0x80, 1, 2, 0, 1, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, 2, 0, 0, 1, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, 2, 1, 0, 1, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, 2, 2, 0, 1, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, 0, 2, 1, 0, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, 1, 2, 0, 2, 42, 23 ->
// f(uint256[],uint256,uint256): 0x80, 1, 3, 0, 2, 42, 23 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, -1, 0, 0, 1, 42 -> FAILURE
// f(uint256[],uint256,uint256): 0x80, -1, -1, 0, 1, 42 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 0, 1, 42 -> 42, 42, 42
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 1, 1, 42 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 0, 0, 1, 42 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 1, 1, 0, 1, 42 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4201, 0x4201, 0x4201
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 5, 4, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 5, 5, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 1, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4202, 0x4202, 0x4202
// g(uint256[],uint256,uint256,uint256): 0x80, 1, 5, 3, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
// g(uint256[],uint256,uint256,uint256): 0x80, 1, 5, 4, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 5, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4201, 0x4201, 0x4201
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4201, 0x4201, 0x4201
// g(uint256[],uint256,uint256,uint256): 0x80, 0, 1, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 1, 2, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4202, 0x4202, 0x4202
// g(uint256[],uint256,uint256,uint256): 0x80, 1, 2, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 0, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> 0x4205, 0x4205, 0x4205
// g(uint256[],uint256,uint256,uint256): 0x80, 4, 5, 1, 5, 0x4201, 0x4202, 0x4203, 0x4204, 0x4205 -> FAILURE
test/libsolidity/syntaxTests/array/slice/bytes_calldata.sol
+5
View File
@@ -0,0 +1,5 @@
contract C {
function f(bytes calldata x) external pure {
x[1:2];
}
}
test/libsolidity/syntaxTests/array/slice/bytes_memory.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f(bytes memory x) public pure {
x[1:2];
}
}
// ----
// TypeError: (66-72): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/bytes_storage.sol
+8
View File
@@ -0,0 +1,8 @@
contract C {
bytes x;
function f() public view {
x[1:2];
}
}
// ----
// TypeError: (65-71): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/calldata_dynamic.sol
+5
View File
@@ -0,0 +1,5 @@
contract C {
function f(uint256[] calldata x) external pure {
x[1:2];
}
}
test/libsolidity/syntaxTests/array/slice/calldata_dynamic_access.sol
+9
View File
@@ -0,0 +1,9 @@
contract C {
function f(uint256[] calldata x) external pure {
x[1:2][0];
x[1:][0];
x[1:][1:2][0];
x[1:2][1:][0];
}
}
// ----
test/libsolidity/syntaxTests/array/slice/calldata_dynamic_convert_to_memory.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f(bytes calldata x) external {
bytes memory y = x[1:2];
}
}
// ----
// TypeError: (65-88): Type bytes calldata slice is not implicitly convertible to expected type bytes memory.
test/libsolidity/syntaxTests/array/slice/calldata_dynamic_encode.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f(uint256[] calldata x) external pure {
abi.encode(x[1:2]);
}
}
// ----
// TypeError: (85-91): This type cannot be encoded.
test/libsolidity/syntaxTests/array/slice/calldata_dynamic_forward.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f(bytes calldata x) external {
return this.f(x[1:2]);
}
}
// ----
// TypeError: (79-85): Invalid type for argument in function call. Invalid implicit conversion from bytes calldata slice to bytes memory requested.
test/libsolidity/syntaxTests/array/slice/calldata_static.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f(uint256[42] calldata x) external pure {
x[1:2];
}
}
// ----
// TypeError: (76-82): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f(uint256[] memory x) public pure {
x[1:2];
}
}
// ----
// TypeError: (70-76): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/memory_static.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f(uint256[42] memory x) public pure {
x[1:2];
}
}
// ----
// TypeError: (72-78): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/slice_literal.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f() public pure {
1[1:];
}
}
// ----
// TypeError: (52-57): Index range access is only possible for arrays and array slices.
test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol
+8
View File
@@ -0,0 +1,8 @@
contract C {
function f() public pure {
bytes memory y;
y[1:2];
}
}
// ----
// TypeError: (76-82): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol
+8
View File
@@ -0,0 +1,8 @@
contract C {
function f() public pure {
string memory y;
y[1:2];
}
}
// ----
// TypeError: (77-83): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/slice_string.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f() public pure {
""[1:];
}
}
// ----
// TypeError: (52-58): Index range access is only possible for arrays and array slices.
test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol
+8
View File
@@ -0,0 +1,8 @@
contract C {
uint256[] x;
function f() public view {
x[1:2];
}
}
// ----
// TypeError: (69-75): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/array/slice/storage_static.sol
+8
View File
@@ -0,0 +1,8 @@
contract C {
uint256[42] x;
function f() public view {
x[1:2];
}
}
// ----
// TypeError: (71-77): Index range access is only supported for dynamic calldata arrays.
test/libsolidity/syntaxTests/parsing/array_range_and_ternary.sol
+8
View File
@@ -0,0 +1,8 @@
contract C {
function f(bool cond, bytes calldata x) external pure {
bytes1 a = x[cond ? 1 : 2]; a;
abi.decode(x[cond ? 1 : 2 : ], (uint256));
abi.decode(x[cond ? 1 : 2 : cond ? 3 : 4], (uint256));
}
}
// ----
test/libsolidity/syntaxTests/parsing/array_range_conversion.sol
+14
View File
@@ -0,0 +1,14 @@
contract C {
function f() public pure {
uint[] memory x;
uint[1:](x);
uint[1:2](x);
uint[][1:](x);
}
}
// ----
// TypeError: (77-85): Types cannot be sliced.
// TypeError: (77-88): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
// TypeError: (98-107): Types cannot be sliced.
// TypeError: (98-110): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
// TypeError: (120-130): Types cannot be sliced.
test/libsolidity/syntaxTests/parsing/array_range_nested.sol
+12
View File
@@ -0,0 +1,12 @@
pragma experimental ABIEncoderV2;
contract C {
function f(uint256[][] calldata x) external pure {
x[0][1:2];
x[1:2][1:2];
uint256 a = x[1:2][1:2][1:][3:][0][2];
uint256 b = x[1:][3:4][1][1:][2:3][0];
a; b;
}
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
test/libsolidity/syntaxTests/parsing/array_range_no_start.sol
+6
View File
@@ -0,0 +1,6 @@
contract C {
function f(uint256[] calldata x) external pure {
x[:][:10];
}
}
// ----
test/libsolidity/syntaxTests/parsing/array_type_range.sol
+14
View File
@@ -0,0 +1,14 @@
contract C {
function f() public pure {
uint[][1:] memory x;
uint[][1:2] memory x;
uint[1:] memory x;
uint[1:2] memory x;
}
}
// ----
// ParserError: (52-62): Expected array length expression.
// ParserError: (81-92): Expected array length expression.
// ParserError: (111-119): Expected array length expression.
// ParserError: (138-147): Expected array length expression.
test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol
+1 -1
View File
@@ -4,5 +4,5 @@ contract C {
}
}
// ----
// TypeError: (57-61): Invalid type for argument in function call. Invalid implicit conversion from type(uint256) to bytes memory requested.
// TypeError: (57-61): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type type(uint256).
// TypeError: (63-67): The second argument to "abi.decode" has to be a tuple of types.