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 pull request #4067 from ethereum/050

Browse Source 
[BREAKING] Version 0.5.0
This commit is contained in:
chriseth
2018-05-23 18:11:20 +02:00
committed by GitHub
parent 6d08341942 87a8385832
commit 5ee2ce353e
25 changed files with 274 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/ABIDecoderTests.cpp
+1 -1
View File
@@ -579,7 +579,7 @@ BOOST_AUTO_TEST_CASE(struct_simple)
a = s.a;
b = s.b;
c = s.c;
d = uint(s.d);
d = uint16(s.d);
}
}
)";
test/libsolidity/SMTChecker.cpp
-29
View File
@@ -388,35 +388,6 @@ BOOST_AUTO_TEST_CASE(bool_simple)
}
)";
CHECK_SUCCESS_NO_WARNINGS(text);
text = R"(
contract C {
function f(bool x) public pure {
bool y;
assert(x <= y);
}
}
)";
CHECK_WARNING(text, "Assertion violation happens here");
text = R"(
contract C {
function f(bool x) public pure {
bool y;
assert(x >= y);
}
}
)";
CHECK_SUCCESS_NO_WARNINGS(text);
text = R"(
contract C {
function f(bool x) public pure {
require(x);
bool y;
assert(x > y);
assert(y < x);
}
}
)";
CHECK_SUCCESS_NO_WARNINGS(text);
}
BOOST_AUTO_TEST_CASE(bool_int_mixed)
test/libsolidity/SolidityEndToEndTest.cpp
+42 -21
View File
@@ -483,6 +483,27 @@ BOOST_AUTO_TEST_CASE(do_while_loop)
testContractAgainstCppOnRange("f(uint256)", do_while_loop_cpp, 0, 5);
}
BOOST_AUTO_TEST_CASE(do_while_loop_continue)
{
char const* sourceCode = R"(
contract test {
function f() public pure returns(uint r) {
uint i = 0;
do
{
if (i > 0) return 0;
i++;
continue;
} while (false);
return 42;
}
}
)";
compileAndRun(sourceCode);
ABI_CHECK(callContractFunction("f()"), encodeArgs(42));
}
BOOST_AUTO_TEST_CASE(nested_loops)
{
// tests that break and continue statements in nested loops jump to the correct place
@@ -1668,7 +1689,7 @@ BOOST_AUTO_TEST_CASE(convert_fixed_bytes_to_uint_smaller_size)
char const* sourceCode = R"(
contract Test {
function bytesToUint(bytes4 s) returns (uint16 h) {
return uint16(s);
return uint16(uint32(s));
}
}
)";
@@ -1684,7 +1705,7 @@ BOOST_AUTO_TEST_CASE(convert_fixed_bytes_to_uint_greater_size)
char const* sourceCode = R"(
contract Test {
function bytesToUint(bytes4 s) returns (uint64 h) {
return uint64(s);
return uint64(uint32(s));
}
}
)";
@@ -1731,7 +1752,7 @@ BOOST_AUTO_TEST_CASE(convert_uint_to_fixed_bytes_smaller_size)
char const* sourceCode = R"(
contract Test {
function uintToBytes(uint32 h) returns (bytes2 s) {
return bytes2(h);
return bytes2(uint16(h));
}
}
)";
@@ -1747,7 +1768,7 @@ BOOST_AUTO_TEST_CASE(convert_uint_to_fixed_bytes_greater_size)
char const* sourceCode = R"(
contract Test {
function UintToBytes(uint16 h) returns (bytes8 s) {
return bytes8(h);
return bytes8(uint64(h));
}
}
)";
@@ -3138,7 +3159,7 @@ BOOST_AUTO_TEST_CASE(event)
function deposit(bytes32 _id, bool _manually) payable {
if (_manually) {
bytes32 s = 0x19dacbf83c5de6658e14cbf7bcae5c15eca2eedecf1c66fbca928e4d351bea0f;
log3(bytes32(msg.value), s, bytes32(msg.sender), _id);
log3(bytes32(msg.value), s, bytes32(uint256(msg.sender)), _id);
} else {
Deposit(msg.sender, _id, msg.value);
}
@@ -3535,7 +3556,7 @@ BOOST_AUTO_TEST_CASE(event_indexed_string)
event E(string indexed r, uint[4] indexed t);
function deposit() {
bytes(x).length = 90;
for (uint i = 0; i < 90; i++)
for (uint8 i = 0; i < 90; i++)
bytes(x)[i] = byte(i);
y[0] = 4;
y[1] = 5;
@@ -4767,7 +4788,7 @@ BOOST_AUTO_TEST_CASE(array_copy_different_packing)
function test() returns (bytes10 a, bytes10 b, bytes10 c, bytes10 d, bytes10 e) {
data1.length = 9;
for (uint i = 0; i < data1.length; ++i)
data1[i] = bytes8(i);
data1[i] = bytes8(uint64(i));
data2 = data1;
a = data2[1];
b = data2[2];
@@ -4795,7 +4816,7 @@ BOOST_AUTO_TEST_CASE(array_copy_target_simple)
bytes17[10] data2; // 1 per slot, no offset counter
function test() returns (bytes17 a, bytes17 b, bytes17 c, bytes17 d, bytes17 e) {
for (uint i = 0; i < data1.length; ++i)
data1[i] = bytes8(i);
data1[i] = bytes8(uint64(i));
data2[8] = data2[9] = 2;
data2 = data1;
a = data2[1];
@@ -4827,14 +4848,14 @@ BOOST_AUTO_TEST_CASE(array_copy_target_leftover)
uint i;
for (i = 0; i < data2.length; ++i)
data2[i] = 0xffff;
check = uint(data2[31]) * 0x10000 | uint(data2[14]);
check = uint(uint16(data2[31])) * 0x10000 | uint(uint16(data2[14]));
for (i = 0; i < data1.length; ++i)
data1[i] = byte(uint8(1 + i));
data2 = data1;
for (i = 0; i < 16; ++i)
res1 |= uint(data2[i]) * 0x10000**i;
res1 |= uint(uint16(data2[i])) * 0x10000**i;
for (i = 0; i < 16; ++i)
res2 |= uint(data2[16 + i]) * 0x10000**i;
res2 |= uint(uint16(data2[16 + i])) * 0x10000**i;
}
}
)";
@@ -4860,7 +4881,7 @@ BOOST_AUTO_TEST_CASE(array_copy_target_leftover2)
data1[2] = 3;
data1[3] = 4;
for (uint i = 0; i < data2.length; ++i)
data2[i] = bytes10(0xffff00 | (1 + i));
data2[i] = bytes10(uint80(0xffff00 | (1 + i)));
data2 = data1;
r1 = data2[3];
r2 = data2[4];
@@ -5074,7 +5095,7 @@ BOOST_AUTO_TEST_CASE(byte_array_push_transition)
contract c {
bytes data;
function test() returns (uint) {
for (uint i = 1; i < 40; i++)
for (uint8 i = 1; i < 40; i++)
{
data.push(byte(i));
if (data.length != i) return 0x1000 + i;
@@ -5120,11 +5141,11 @@ BOOST_AUTO_TEST_CASE(bytes_index_access)
contract c {
bytes data;
function direct(bytes arg, uint index) external returns (uint) {
return uint(arg[index]);
return uint(uint8(arg[index]));
}
function storageCopyRead(bytes arg, uint index) external returns (uint) {
data = arg;
return uint(data[index]);
return uint(uint8(data[index]));
}
function storageWrite() external returns (uint) {
data.length = 35;
@@ -5135,7 +5156,7 @@ BOOST_AUTO_TEST_CASE(bytes_index_access)
data[31] |= 8;
data[30] = 1;
data[32] = 3;
return uint(data[30]) * 0x100 | uint(data[31]) * 0x10 | uint(data[32]);
return uint(uint8(data[30])) * 0x100 | uint(uint8(data[31])) * 0x10 | uint(uint8(data[32]));
}
}
)";
@@ -5158,7 +5179,7 @@ BOOST_AUTO_TEST_CASE(bytes_delete_element)
function test1() external returns (bool) {
data.length = 100;
for (uint i = 0; i < data.length; i++)
data[i] = byte(i);
data[i] = byte(uint8(i));
delete data[94];
delete data[96];
delete data[98];
@@ -7517,7 +7538,7 @@ BOOST_AUTO_TEST_CASE(short_strings)
if (data1[0] != "1") return 10;
if (data1[4] != "4") return 11;
for (uint i = 0; i < data1.length; i ++)
data1[i] = byte(i * 3);
data1[i] = byte(uint8(i * 3));
if (data1[4] != 4 * 3) return 12;
if (data1[67] != 67 * 3) return 13;
// change length: long -> short
@@ -8333,7 +8354,7 @@ BOOST_AUTO_TEST_CASE(fixed_bytes_index_access)
function g(bytes32 x) returns (uint) {
data = [x[0], x[1], x[2]];
data[0] = "12345";
return uint(data[0][4]);
return uint(uint8(data[0][4]));
}
}
)";
@@ -8391,7 +8412,7 @@ BOOST_AUTO_TEST_CASE(inline_assembly_memory_access)
function test() returns (bytes) {
bytes memory x = new bytes(5);
for (uint i = 0; i < x.length; ++i)
x[i] = byte(i + 1);
x[i] = byte(uint8(i + 1));
assembly { mstore(add(x, 32), "12345678901234567890123456789012") }
return x;
}
@@ -8911,7 +8932,7 @@ BOOST_AUTO_TEST_CASE(cleanup_bytes_types)
function f(bytes2 a, uint16 x) returns (uint) {
if (a != "ab") return 1;
if (x != 0x0102) return 2;
if (bytes3(x) != 0x0102) return 3;
if (bytes3(uint24(x)) != 0x0102) return 3;
return 0;
}
}
test/libsolidity/SolidityNameAndTypeResolution.cpp
-13
View File
@@ -3858,19 +3858,6 @@ BOOST_AUTO_TEST_CASE(conditional_with_all_types)
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(index_access_for_bytes)
{
char const* text = R"(
contract C {
bytes20 x;
function f(bytes16 b) public {
b[uint(x[2])];
}
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(uint7_and_uintM_as_identifier)
{
char const* text = R"(
test/libsolidity/SolidityOptimizer.cpp
+1 -1
View File
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(array_copy)
data1[i] = msg.data[i];
data2 = data1;
l = data2.length;
y = uint(data2[x]);
y = uint(uint40(data2[x]));
}
}
)";
test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol
+2 -7
View File
@@ -23,13 +23,8 @@ contract C {
}
function k() internal view returns (S storage c) {
do {
if (s.f) {
continue;
break;
}
else {
c = s;
}
c = s;
continue;
} while(false);
}
}
test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_warn.sol
+17
View File
@@ -21,6 +21,15 @@ contract C {
do {
if (s.f) {
break;
}
else {
c = s;
}
} while(false);
}
function i() internal view returns (S storage c) {
do {
if (s.f) {
continue;
}
else {
@@ -28,8 +37,16 @@ contract C {
}
} while(false);
}
function j() internal view returns (S storage c) {
do {
continue;
c = s;
} while(false);
}
}
// ----
// Warning: (87-98): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.
// Warning: (223-234): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.
// Warning: (440-451): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.
// Warning: (654-665): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.
// Warning: (871-882): This variable is of storage pointer type and might be returned without assignment. This can cause storage corruption. Assign the variable (potentially from itself) to remove this warning.
test/libsolidity/syntaxTests/types/bool_ops.sol
+53
View File
@@ -0,0 +1,53 @@
contract C {
function f(bool a, bool b) public pure {
bool c;
// OK
c = !a;
c = !b;
c = a == b;
c = a != b;
c = a || b;
c = a && b;
// Not OK
c = a > b;
c = a < b;
c = a >= b;
c = a <= b;
c = a & b;
c = a | b;
c = a ^ b;
c = ~a;
c = ~b;
c = a + b;
c = a - b;
c = -a;
c = -b;
c = a * b;
c = a / b;
c = a ** b;
c = a % b;
c = a << b;
c = a >> b;
}
}
// ----
// TypeError: (231-236): Operator > not compatible with types bool and bool
// TypeError: (250-255): Operator < not compatible with types bool and bool
// TypeError: (269-275): Operator >= not compatible with types bool and bool
// TypeError: (289-295): Operator <= not compatible with types bool and bool
// TypeError: (309-314): Operator & not compatible with types bool and bool
// TypeError: (328-333): Operator | not compatible with types bool and bool
// TypeError: (347-352): Operator ^ not compatible with types bool and bool
// TypeError: (366-368): Unary operator ~ cannot be applied to type bool
// TypeError: (382-384): Unary operator ~ cannot be applied to type bool
// TypeError: (398-403): Operator + not compatible with types bool and bool
// TypeError: (417-422): Operator - not compatible with types bool and bool
// TypeError: (436-438): Unary operator - cannot be applied to type bool
// TypeError: (452-454): Unary operator - cannot be applied to type bool
// TypeError: (468-473): Operator * not compatible with types bool and bool
// TypeError: (487-492): Operator / not compatible with types bool and bool
// TypeError: (506-512): Operator ** not compatible with types bool and bool
// TypeError: (526-531): Operator % not compatible with types bool and bool
// TypeError: (545-551): Operator << not compatible with types bool and bool
// TypeError: (565-571): Operator >> not compatible with types bool and bool
test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f() public pure returns(uint256) {
return uint256(bytes1(''));
}
}
// ----
// TypeError: (76-95): Explicit type conversion not allowed from "bytes1" to "uint256".
test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f() public pure returns(uint32) {
return uint32(bytes32(''));
}
}
// ----
// TypeError: (75-94): Explicit type conversion not allowed from "bytes32" to "uint32".
test/libsolidity/syntaxTests/types/bytes_to_contract.sol
+2 -2
View File
@@ -1,7 +1,7 @@
contract C {
function f() public pure {
C(bytes20(0x1234));
C(bytes20(uint160(0x1234)));
}
}
// ----
// TypeError: (64-82): Explicit type conversion not allowed from "bytes20" to "contract C".
// TypeError: (64-91): Explicit type conversion not allowed from "bytes20" to "contract C".
test/libsolidity/syntaxTests/types/bytes_to_uint_same_size.sol
+20
View File
@@ -0,0 +1,20 @@
contract C {
function f() public pure returns (uint256) {
return uint256(bytes32(uint256(0)));
}
function g() public pure returns (uint128) {
return uint128(bytes16(uint128(0)));
}
function h() public pure returns (uint64) {
return uint64(bytes8(uint64(0)));
}
function i() public pure returns (uint32) {
return uint32(bytes4(uint32(0)));
}
function j() public pure returns (uint16) {
return uint16(bytes2(uint16(0)));
}
function k() public pure returns (uint8) {
return uint8(bytes1(uint8(0)));
}
}
test/libsolidity/syntaxTests/types/index_access_for_bytes.sol
+6
View File
@@ -0,0 +1,6 @@
contract C {
bytes20 x;
function f(bytes16 b) public view {
b[uint8(x[2])];
}
}
test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f() public pure returns(bytes1) {
return bytes1(uint256(0));
}
}
// ----
// TypeError: (75-93): Explicit type conversion not allowed from "uint256" to "bytes1".
test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
function f() public pure returns(bytes32) {
return bytes32(uint32(0));
}
}
// ----
// TypeError: (76-94): Explicit type conversion not allowed from "uint32" to "bytes32".