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 branch 'develop' into utf8-strict-parser

Browse Source
This commit is contained in:
chriseth
2017-06-27 14:37:45 +02:00
committed by GitHub
parent ec15df2aa7 bc31d4969c
commit e715dd0b7e
10 changed files with 223 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityEndToEndTest.cpp
+32
View File
@@ -4483,6 +4483,38 @@ BOOST_AUTO_TEST_CASE(array_copy_including_mapping)
BOOST_CHECK(storageEmpty(m_contractAddress));
}
BOOST_AUTO_TEST_CASE(swap_in_storage_overwrite)
{
// This tests a swap in storage which does not work as one
// might expect because we do not have temporary storage.
// (x, y) = (y, x) is the same as
// y = x;
// x = y;
char const* sourceCode = R"(
contract c {
struct S { uint a; uint b; }
S public x;
S public y;
function set() {
x.a = 1; x.b = 2;
y.a = 3; y.b = 4;
}
function swap() {
(x, y) = (y, x);
}
}
)";
compileAndRun(sourceCode);
BOOST_CHECK(callContractFunction("x()") == encodeArgs(u256(0), u256(0)));
BOOST_CHECK(callContractFunction("y()") == encodeArgs(u256(0), u256(0)));
BOOST_CHECK(callContractFunction("set()") == encodeArgs());
BOOST_CHECK(callContractFunction("x()") == encodeArgs(u256(1), u256(2)));
BOOST_CHECK(callContractFunction("y()") == encodeArgs(u256(3), u256(4)));
BOOST_CHECK(callContractFunction("swap()") == encodeArgs());
BOOST_CHECK(callContractFunction("x()") == encodeArgs(u256(1), u256(2)));
BOOST_CHECK(callContractFunction("y()") == encodeArgs(u256(1), u256(2)));
}
BOOST_AUTO_TEST_CASE(pass_dynamic_arguments_to_the_base)
{
char const* sourceCode = R"(
test/libsolidity/SolidityNameAndTypeResolution.cpp
+119
View File
@@ -554,6 +554,51 @@ BOOST_AUTO_TEST_CASE(comparison_bitop_precedence)
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(comparison_of_function_types)
{
char const* text = R"(
contract C {
function f() returns (bool ret) {
return this.f < this.f;
}
}
)";
CHECK_ERROR(text, TypeError, "Operator < not compatible");
text = R"(
contract C {
function f() returns (bool ret) {
return f < f;
}
}
)";
CHECK_ERROR(text, TypeError, "Operator < not compatible");
text = R"(
contract C {
function f() returns (bool ret) {
return f == f;
}
function g() returns (bool ret) {
return f != f;
}
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(comparison_of_mapping_types)
{
char const* text = R"(
contract C {
mapping(uint => uint) x;
function f() returns (bool ret) {
var y = x;
return x == y;
}
}
)";
CHECK_ERROR(text, TypeError, "Operator == not compatible");
}
BOOST_AUTO_TEST_CASE(function_no_implementation)
{
ASTPointer<SourceUnit> sourceUnit;
@@ -5771,6 +5816,80 @@ BOOST_AUTO_TEST_CASE(pure_statement_check_for_regular_for_loop)
success(text);
}
BOOST_AUTO_TEST_CASE(warn_multiple_storage_storage_copies)
{
char const* text = R"(
contract C {
struct S { uint a; uint b; }
S x; S y;
function f() {
(x, y) = (y, x);
}
}
)";
CHECK_WARNING(text, "This assignment performs two copies to storage.");
}
BOOST_AUTO_TEST_CASE(warn_multiple_storage_storage_copies_fill_right)
{
char const* text = R"(
contract C {
struct S { uint a; uint b; }
S x; S y;
function f() {
(x, y, ) = (y, x, 1, 2);
}
}
)";
CHECK_WARNING(text, "This assignment performs two copies to storage.");
}
BOOST_AUTO_TEST_CASE(warn_multiple_storage_storage_copies_fill_left)
{
char const* text = R"(
contract C {
struct S { uint a; uint b; }
S x; S y;
function f() {
(,x, y) = (1, 2, y, x);
}
}
)";
CHECK_WARNING(text, "This assignment performs two copies to storage.");
}
BOOST_AUTO_TEST_CASE(nowarn_swap_memory)
{
char const* text = R"(
contract C {
struct S { uint a; uint b; }
function f() {
S memory x;
S memory y;
(x, y) = (y, x);
}
}
)";
CHECK_SUCCESS_NO_WARNINGS(text);
}
BOOST_AUTO_TEST_CASE(nowarn_swap_storage_pointers)
{
char const* text = R"(
contract C {
struct S { uint a; uint b; }
S x; S y;
function f() {
S storage x_local = x;
S storage y_local = y;
S storage z_local = x;
(x, y_local, x_local, z_local) = (y, x_local, y_local, y);
}
}
)";
CHECK_SUCCESS_NO_WARNINGS(text);
}
BOOST_AUTO_TEST_CASE(warn_unused_local)
{
char const* text = R"(