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

Allow constant integer variables as array lengths.

Browse Source
This commit is contained in:
Balajiganapathi S
2017-11-22 01:41:46 +00:00
committed by Alex Beregszaszi
parent 5c9e273d02
commit 165857b1d4
5 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityEndToEndTest.cpp
+18
View File
@@ -2345,6 +2345,24 @@ BOOST_AUTO_TEST_CASE(constructor_static_array_argument)
ABI_CHECK(callContractFunction("b(uint256)", u256(2)), encodeArgs(u256(4)));
}
BOOST_AUTO_TEST_CASE(constant_var_as_array_length)
{
char const* sourceCode = R"(
contract C {
uint constant LEN = 3;
uint[LEN] public a;
function C(uint[LEN] _a) {
a = _a;
}
}
)";
compileAndRun(sourceCode, 0, "C", encodeArgs(u256(1), u256(2), u256(3)));
ABI_CHECK(callContractFunction("a(uint256)", u256(0)), encodeArgs(u256(1)));
ABI_CHECK(callContractFunction("a(uint256)", u256(1)), encodeArgs(u256(2)));
ABI_CHECK(callContractFunction("a(uint256)", u256(2)), encodeArgs(u256(3)));
}
BOOST_AUTO_TEST_CASE(functions_called_by_constructor)
{
char const* sourceCode = R"(
test/libsolidity/SolidityNameAndTypeResolution.cpp
+23 -1
View File
@@ -2107,7 +2107,7 @@ BOOST_AUTO_TEST_CASE(array_with_nonconstant_length)
function f(uint a) public { uint8[a] x; }
}
)";
CHECK_ERROR(text, TypeError, "Invalid array length, expected integer literal.");
CHECK_ERROR(text, TypeError, "Identifier must be declared constant");
}
BOOST_AUTO_TEST_CASE(array_with_negative_length)
@@ -7263,6 +7263,28 @@ BOOST_AUTO_TEST_CASE(array_length_not_convertible_to_integer)
CHECK_ERROR(text, TypeError, "Invalid array length, expected integer literal.");
}
BOOST_AUTO_TEST_CASE(array_length_constant_var)
{
char const* text = R"(
contract C {
uint constant LEN = 10;
uint[LEN] ids;
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(array_length_non_integer_constant_var)
{
char const* text = R"(
contract C {
bool constant LEN = true;
uint[LEN] ids;
}
)";
CHECK_ERROR(text, TypeError, "Invalid array length, expected integer literal.");
}
BOOST_AUTO_TEST_CASE(array_length_invalid_expression)
{
char const* text = R"(