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

Allow mappings of arrays as arguments and return values of internal functions.

Browse Source
This commit is contained in:
Daniel Kirchner 2018-08-13 16:25:28 +02:00
parent 4ae59acc09
commit 341128962f
13 changed files with 101 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsolidity/analysis/TypeChecker.cpp
View File

@ -631,10 +631,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
{
if (
!type(*var)->canLiveOutsideStorage() &&
!(
(_function.visibility() <= FunctionDefinition::Visibility::Internal) &&
type(*var)->category() == Type::Category::Mapping
)
!(_function.visibility() <= FunctionDefinition::Visibility::Internal)
)
m_errorReporter.typeError(var->location(), "Type is required to live outside storage.");
if (_function.visibility() >= FunctionDefinition::Visibility::Public && !(type(*var)->interfaceType(isLibraryFunction)))

30
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -1571,6 +1571,36 @@ BOOST_AUTO_TEST_CASE(mapping_internal_argument)
ABI_CHECK(callContractFunction("get(uint8)", byte(1)), encodeArgs(byte(10), byte(11)));
}
BOOST_AUTO_TEST_CASE(mapping_array_internal_argument)
{
char const* sourceCode = R"(
contract test {
mapping(uint8 => uint8)[2] a;
mapping(uint8 => uint8)[2] b;
function set_internal(mapping(uint8 => uint8)[2] storage m, uint8 key, uint8 value1, uint8 value2) internal returns (uint8, uint8) {
uint8 oldValue1 = m[0][key];
uint8 oldValue2 = m[1][key];
m[0][key] = value1;
m[1][key] = value2;
return (oldValue1, oldValue2);
}
function set(uint8 key, uint8 value_a1, uint8 value_a2, uint8 value_b1, uint8 value_b2) public returns (uint8 old_a1, uint8 old_a2, uint8 old_b1, uint8 old_b2) {
(old_a1, old_a2) = set_internal(a, key, value_a1, value_a2);
(old_b1, old_b2) = set_internal(b, key, value_b1, value_b2);
}
function get(uint8 key) public returns (uint8, uint8, uint8, uint8) {
return (a[0][key], a[1][key], b[0][key], b[1][key]);
}
}
)";
compileAndRun(sourceCode);
ABI_CHECK(callContractFunction("set(uint8,uint8,uint8,uint8,uint8)", byte(1), byte(21), byte(22), byte(42), byte(43)), encodeArgs(byte(0), byte(0), byte(0), byte(0)));
ABI_CHECK(callContractFunction("get(uint8)", byte(1)), encodeArgs(byte(21), byte(22), byte(42), byte(43)));
ABI_CHECK(callContractFunction("set(uint8,uint8,uint8,uint8,uint8)", byte(1), byte(10), byte(30), byte(11), byte(31)), encodeArgs(byte(21), byte(22), byte(42), byte(43)));
ABI_CHECK(callContractFunction("get(uint8)", byte(1)), encodeArgs(byte(10), byte(30), byte(11), byte(31)));
}
BOOST_AUTO_TEST_CASE(mapping_internal_return)
{
char const* sourceCode = R"(

6
test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol Normal file
View File

@ -0,0 +1,6 @@
contract C {
function f(mapping(uint => uint)[] storage) external pure {
}
}
// ----
// TypeError: (28-51): Location has to be calldata for external functions (remove the "memory" or "storage" keyword).

5
test/libsolidity/syntaxTests/types/mapping/array_argument_internal.sol Normal file
View File

@ -0,0 +1,5 @@
contract C {
function f(mapping(uint => uint)[] storage) internal pure {
}
}
// ----

5
test/libsolidity/syntaxTests/types/mapping/array_argument_private.sol Normal file
View File

@ -0,0 +1,5 @@
contract C {
function f(mapping(uint => uint)[] storage) private pure {
}
}
// ----

6
test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol Normal file
View File

@ -0,0 +1,6 @@
contract C {
function f(mapping(uint => uint)[] storage) public pure {
}
}
// ----
// TypeError: (28-51): Location has to be memory for publicly visible functions (remove the "storage" or "calldata" keyword).

6
test/libsolidity/syntaxTests/types/mapping/library_array_argument_external.sol Normal file
View File

@ -0,0 +1,6 @@
library L {
function f(mapping(uint => uint)[] storage) external pure {
}
}
// ----
// TypeError: (27-50): Type is required to live outside storage.

4
test/libsolidity/syntaxTests/types/mapping/library_array_argument_internal.sol Normal file
View File

@ -0,0 +1,4 @@
library L {
function f(mapping(uint => uint)[] storage) internal pure {
}
}

4
test/libsolidity/syntaxTests/types/mapping/library_array_argument_private.sol Normal file
View File

@ -0,0 +1,4 @@
library L {
function f(mapping(uint => uint)[] storage) private pure {
}
}

6
test/libsolidity/syntaxTests/types/mapping/library_array_argument_public.sol Normal file
View File

@ -0,0 +1,6 @@
library L {
function f(mapping(uint => uint)[] storage) public pure {
}
}
// ----
// TypeError: (27-50): Type is required to live outside storage.

6
test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol Normal file
View File

@ -0,0 +1,6 @@
contract C {
function f() external pure returns (mapping(uint=>uint)[] storage m) {
}
}
// ----
// TypeError: (53-84): Location has to be memory for publicly visible functions (remove the "storage" or "calldata" keyword).

16
test/libsolidity/syntaxTests/types/mapping/mapping_array_return_internal.sol Normal file
View File

@ -0,0 +1,16 @@
contract C {
mapping(uint=>uint)[] m;
function f() internal view returns (mapping(uint=>uint)[] storage) {
return m;
}
function g() private view returns (mapping(uint=>uint)[] storage) {
return m;
}
function h() internal view returns (mapping(uint=>uint)[] storage r) {
r = m;
}
function i() private view returns (mapping(uint=>uint)[] storage r) {
(r,r) = (m,m);
}
}
// ----

6
test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol Normal file
View File

@ -0,0 +1,6 @@
contract C {
function f() public pure returns (mapping(uint=>uint)[] storage m) {
}
}
// ----
// TypeError: (51-82): Location has to be memory for publicly visible functions (remove the "storage" or "calldata" keyword).