diff options
| author | chriseth <chris@ethereum.org> | 2018-08-06 18:59:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 18:59:16 +0800 |
| commit | 9d03de1f250cecad2c5c796beb10d96c3c9b15cd (patch) | |
| tree | ea93d83315c48f07b2efaf0d73c3b4a3b6f29d2e /test/libsolidity/SolidityEndToEndTest.cpp | |
| parent | 13d3006376c826495bad8a4c648e68a359fa1b41 (diff) | |
| parent | cbae02b514d7a9dd3845f2f731caec7defa29a66 (diff) | |
| download | dexon-solidity-9d03de1f250cecad2c5c796beb10d96c3c9b15cd.tar dexon-solidity-9d03de1f250cecad2c5c796beb10d96c3c9b15cd.tar.gz dexon-solidity-9d03de1f250cecad2c5c796beb10d96c3c9b15cd.tar.bz2 dexon-solidity-9d03de1f250cecad2c5c796beb10d96c3c9b15cd.tar.lz dexon-solidity-9d03de1f250cecad2c5c796beb10d96c3c9b15cd.tar.xz dexon-solidity-9d03de1f250cecad2c5c796beb10d96c3c9b15cd.tar.zst dexon-solidity-9d03de1f250cecad2c5c796beb10d96c3c9b15cd.zip | |
Merge pull request #4671 from ethereum/mappingTupleAssignment
Disallow assignments to mappings within tuple assignments; allow for local variables.
Diffstat (limited to 'test/libsolidity/SolidityEndToEndTest.cpp')
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 45a56b22..066e97e6 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -1478,6 +1478,73 @@ BOOST_AUTO_TEST_CASE(multi_level_mapping) testContractAgainstCpp("f(uint256,uint256,uint256)", f, u256(5), u256(4), u256(0)); } +BOOST_AUTO_TEST_CASE(mapping_local_assignment) +{ + char const* sourceCode = R"( + contract test { + mapping(uint8 => uint8) m1; + mapping(uint8 => uint8) m2; + function f() public returns (uint8, uint8, uint8, uint8) { + mapping(uint8 => uint8) storage m = m1; + m[1] = 42; + + m = m2; + m[2] = 21; + + return (m1[1], m1[2], m2[1], m2[2]); + } + } + )"; + compileAndRun(sourceCode); + + ABI_CHECK(callContractFunction("f()"), encodeArgs(byte(42), byte(0), byte(0), byte(21))); +} + +BOOST_AUTO_TEST_CASE(mapping_local_tuple_assignment) +{ + char const* sourceCode = R"( + contract test { + mapping(uint8 => uint8) m1; + mapping(uint8 => uint8) m2; + function f() public returns (uint8, uint8, uint8, uint8) { + mapping(uint8 => uint8) storage m = m1; + m[1] = 42; + + uint8 v; + (m, v) = (m2, 21); + m[2] = v; + + return (m1[1], m1[2], m2[1], m2[2]); + } + } + )"; + compileAndRun(sourceCode); + + ABI_CHECK(callContractFunction("f()"), encodeArgs(byte(42), byte(0), byte(0), byte(21))); +} + +BOOST_AUTO_TEST_CASE(mapping_local_compound_assignment) +{ + char const* sourceCode = R"( + contract test { + mapping(uint8 => uint8) m1; + mapping(uint8 => uint8) m2; + function f() public returns (uint8, uint8, uint8, uint8) { + mapping(uint8 => uint8) storage m = m1; + m[1] = 42; + + (m = m2)[2] = 21; + + return (m1[1], m1[2], m2[1], m2[2]); + } + } + )"; + compileAndRun(sourceCode); + + ABI_CHECK(callContractFunction("f()"), encodeArgs(byte(42), byte(0), byte(0), byte(21))); +} + + BOOST_AUTO_TEST_CASE(structs) { char const* sourceCode = R"( |