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 #3745 from ethereum/fixRecursion

Browse Source 
Fix invalid recursion errors for structs
This commit is contained in:
Alex Beregszaszi
2018-04-05 12:04:54 +02:00
committed by GitHub
parent c6da5c1650 8fdbd19a05
commit 36d6c27e68
19 changed files with 220 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityNameAndTypeResolution.cpp
-125
View File
@@ -92,61 +92,6 @@ BOOST_AUTO_TEST_CASE(reference_to_later_declaration)
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(struct_definition_directly_recursive)
{
char const* text = R"(
contract test {
struct MyStructName {
address addr;
MyStructName x;
}
}
)";
CHECK_ERROR(text, TypeError, "Recursive struct definition.");
}
BOOST_AUTO_TEST_CASE(struct_definition_indirectly_recursive)
{
char const* text = R"(
contract test {
struct MyStructName1 {
address addr;
uint256 count;
MyStructName2 x;
}
struct MyStructName2 {
MyStructName1 x;
}
}
)";
CHECK_ERROR(text, TypeError, "Recursive struct definition.");
}
BOOST_AUTO_TEST_CASE(struct_definition_not_really_recursive)
{
char const* text = R"(
contract test {
struct s1 { uint a; }
struct s2 { s1 x; s1 y; }
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(struct_definition_recursion_via_mapping)
{
char const* text = R"(
contract test {
struct MyStructName1 {
address addr;
uint256 count;
mapping(uint => MyStructName1) x;
}
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(type_inference_smoke_test)
{
char const* text = R"(
@@ -6222,44 +6167,6 @@ BOOST_AUTO_TEST_CASE(read_returned_struct)
)";
CHECK_WARNING(text, "Experimental features");
}
BOOST_AUTO_TEST_CASE(return_recursive_structs)
{
char const* text = R"(
contract C {
struct S { uint a; S[] sub; }
function f() returns (uint, S) {
}
}
)";
CHECK_ERROR(text, TypeError, "Internal or recursive type is not allowed for public or external functions.");
}
BOOST_AUTO_TEST_CASE(return_recursive_structs2)
{
char const* text = R"(
contract C {
struct S { uint a; S[2][] sub; }
function f() returns (uint, S) {
}
}
)";
CHECK_ERROR(text, TypeError, "Internal or recursive type is not allowed for public or external functions.");
}
BOOST_AUTO_TEST_CASE(return_recursive_structs3)
{
char const* text = R"(
contract C {
struct S { uint a; S[][][] sub; }
struct T { S s; }
function f() returns (uint x, T t) {
}
}
)";
CHECK_ERROR(text, TypeError, "Internal or recursive type is not allowed for public or external functions.");
}
BOOST_AUTO_TEST_CASE(address_checksum_type_deduction)
{
char const* text = R"(
@@ -6382,38 +6289,6 @@ BOOST_AUTO_TEST_CASE(address_methods)
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(cyclic_dependency_for_constants)
{
char const* text = R"(
contract C {
uint constant a = a;
}
)";
CHECK_ERROR(text, TypeError, "cyclic dependency via a");
text = R"(
contract C {
uint constant a = b * c;
uint constant b = 7;
uint constant c = b + uint(keccak256(d));
uint constant d = 2 + a;
}
)";
CHECK_ERROR_ALLOW_MULTI(text, TypeError, (std::vector<std::string>{
"a has a cyclic dependency via c",
"c has a cyclic dependency via d",
"d has a cyclic dependency via a"
}));
text = R"(
contract C {
uint constant a = b * c;
uint constant b = 7;
uint constant c = 4 + uint(keccak256(d));
uint constant d = 2 + b;
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(interface)
{
char const* text = R"(
test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol
+5
View File
@@ -0,0 +1,5 @@
contract C {
uint constant a = a;
}
// ----
// TypeError: The value of the constant a has a cyclic dependency via a.
test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol
+10
View File
@@ -0,0 +1,10 @@
contract C {
uint constant a = b * c;
uint constant b = 7;
uint constant c = b + uint(keccak256(d));
uint constant d = 2 + a;
}
// ----
// TypeError: The value of the constant a has a cyclic dependency via c.
// TypeError: The value of the constant c has a cyclic dependency via d.
// TypeError: The value of the constant d has a cyclic dependency via a.
test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol
+11
View File
@@ -0,0 +1,11 @@
contract C {
uint constant x = a;
uint constant a = b * c;
uint constant b = c;
uint constant c = b;
}
// ----
// TypeError: The value of the constant x has a cyclic dependency via a.
// TypeError: The value of the constant a has a cyclic dependency via b.
// TypeError: The value of the constant b has a cyclic dependency via c.
// TypeError: The value of the constant c has a cyclic dependency via b.
test/libsolidity/syntaxTests/constants/cyclic_dependency_4.sol
+6
View File
@@ -0,0 +1,6 @@
contract C {
uint constant a = b * c;
uint constant b = 7;
uint constant c = 4 + uint(keccak256(d));
uint constant d = 2 + b;
}
test/libsolidity/syntaxTests/structs/recursion/multi_struct_composition.sol
+15
View File
@@ -0,0 +1,15 @@
pragma experimental ABIEncoderV2;
contract C {
struct T { U u; V v; }
struct U { W w; }
struct V { W w; }
struct W { uint x; }
function f(T) public pure { }
}
// ----
// Warning: Experimental features are turned on. Do not use experimental features on live deployments.
test/libsolidity/syntaxTests/structs/recursion/parallel_structs.sol
+15
View File
@@ -0,0 +1,15 @@
pragma experimental ABIEncoderV2;
contract TestContract
{
struct SubStruct {
uint256 id;
}
struct TestStruct {
SubStruct subStruct1;
SubStruct subStruct2;
}
function addTestStruct(TestStruct) public pure {}
}
// ----
// Warning: Experimental features are turned on. Do not use experimental features on live deployments.
test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
struct S { uint a; S[] sub; }
function f() public pure returns (uint, S) {
}
}
// ----
// TypeError: Internal or recursive type is not allowed for public or external functions.
test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol
+7
View File
@@ -0,0 +1,7 @@
contract C {
struct S { uint a; S[2][] sub; }
function f() public pure returns (uint, S) {
}
}
// ----
// TypeError: Internal or recursive type is not allowed for public or external functions.
test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol
+8
View File
@@ -0,0 +1,8 @@
contract C {
struct S { uint a; S[][][] sub; }
struct T { S s; }
function f() public pure returns (uint x, T t) {
}
}
// ----
// TypeError: Internal or recursive type is not allowed for public or external functions.
test/libsolidity/syntaxTests/structs/recursion/struct_definition_directly_recursive.sol
+8
View File
@@ -0,0 +1,8 @@
contract Test {
struct MyStructName {
address addr;
MyStructName x;
}
}
// ----
// TypeError: Recursive struct definition.
test/libsolidity/syntaxTests/structs/recursion/struct_definition_indirectly_recursive.sol
+12
View File
@@ -0,0 +1,12 @@
contract Test {
struct MyStructName1 {
address addr;
uint256 count;
MyStructName2 x;
}
struct MyStructName2 {
MyStructName1 x;
}
}
// ----
// TypeError: Recursive struct definition.
test/libsolidity/syntaxTests/structs/recursion/struct_definition_not_really_recursive.sol
+4
View File
@@ -0,0 +1,4 @@
contract Test {
struct S1 { uint a; }
struct S2 { S1 x; S1 y; }
}
test/libsolidity/syntaxTests/structs/recursion/struct_definition_recursion_via_mapping.sol
+7
View File
@@ -0,0 +1,7 @@
contract Test {
struct MyStructName1 {
address addr;
uint256 count;
mapping(uint => MyStructName1) x;
}
}