cerc-io/solidity
16
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

Fix interface type conversion internal to structs.

Browse Source
This commit is contained in:
chriseth 2017-06-13 10:51:49 +02:00 committed by Alex Beregszaszi
parent 823e67bf40
commit 36a90289e6
4 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/ast/Types.cpp
View File

@ -1783,6 +1783,8 @@ TypePointer StructType::interfaceType(bool _inLibrary) const
if (_inLibrary && location() == DataLocation::Storage) if (_inLibrary && location() == DataLocation::Storage)
return shared_from_this(); return shared_from_this();
else if (!recursive()) else if (!recursive())
// TODO this might not be enough, we have to convert all members to
// their interfaceType
return copyForLocation(DataLocation::Memory, true); return copyForLocation(DataLocation::Memory, true);
else else
return TypePointer(); return TypePointer();
@ -1805,7 +1807,9 @@ string StructType::signatureInExternalFunction(bool _structsByName) const
auto memberTypeStrings = memberTypes | boost::adaptors::transformed([&](TypePointer _t) -> string auto memberTypeStrings = memberTypes | boost::adaptors::transformed([&](TypePointer _t) -> string
{ {
solAssert(_t, "Parameter should have external type."); solAssert(_t, "Parameter should have external type.");
return _t->signatureInExternalFunction(_structsByName); auto t = _t->interfaceType(_structsByName);
solAssert(t, "");
return t->signatureInExternalFunction(_structsByName);
}); });
return "(" + boost::algorithm::join(memberTypeStrings, ",") + ")"; return "(" + boost::algorithm::join(memberTypeStrings, ",") + ")";
} }

4
libsolidity/interface/ABI.cpp
View File

@ -152,7 +152,9 @@ Json::Value ABI::formatType(string const& _name, Type const& _type, bool _forLib
for (auto const& member: structType->members(nullptr)) for (auto const& member: structType->members(nullptr))
{ {
solAssert(member.type, ""); solAssert(member.type, "");
ret["type"].append(formatType(member.name, *member.type, _forLibrary)); auto t = member.type->interfaceType(_forLibrary);
solAssert(t, "");
ret["type"].append(formatType(member.name, *t, _forLibrary));
} }
} }
else else

36
test/libsolidity/SolidityABIJSON.cpp
View File

@ -980,6 +980,42 @@ BOOST_AUTO_TEST_CASE(return_structs)
checkInterface(text, interface); checkInterface(text, interface);
} }
BOOST_AUTO_TEST_CASE(return_structs_with_contracts)
{
char const* text = R"(
contract C {
struct S { C[] x; C y; }
function f() returns (S s, C c) {
}
}
)";
char const* interface = R"(
[
{
"constant" : false,
"payable": false,
"inputs": [],
"name": "f",
"outputs" : [{
"name" : "s",
"type" : [{
"name" : "x",
"type" : "address[]"
}, {
"name" : "y",
"type" : "address"
}]
}, {
"name" : "c",
"type" : "address"
}],
"type" : "function"
}
]
)";
checkInterface(text, interface);
}
BOOST_AUTO_TEST_CASE(event_structs) BOOST_AUTO_TEST_CASE(event_structs)
{ {
char const* text = R"( char const* text = R"(

6
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -609,7 +609,7 @@ BOOST_AUTO_TEST_CASE(external_structs)
struct Nested { X[2][] a; mapping(uint => uint) m; uint y; } struct Nested { X[2][] a; mapping(uint => uint) m; uint y; }
struct X { bytes32 x; Test t; Empty[] e; } struct X { bytes32 x; Test t; Empty[] e; }
function f(ActionChoices, uint, Empty) external {} function f(ActionChoices, uint, Empty) external {}
function g(Nested) external {} function g(Test, Nested) external {}
function h(function(Nested) external returns (uint)[]) external {} function h(function(Nested) external returns (uint)[]) external {}
function i(Nested[]) external {} function i(Nested[]) external {}
} }
@ -620,10 +620,8 @@ BOOST_AUTO_TEST_CASE(external_structs)
{ {
auto functions = contract->definedFunctions(); auto functions = contract->definedFunctions();
BOOST_REQUIRE(!functions.empty()); BOOST_REQUIRE(!functions.empty());
for (auto const& f: functions)
cout << f->externalSignature() << endl;
BOOST_CHECK_EQUAL("f(uint8,uint256,())", functions[0]->externalSignature()); BOOST_CHECK_EQUAL("f(uint8,uint256,())", functions[0]->externalSignature());
BOOST_CHECK_EQUAL("g(((bytes32,address,()[])[2][],uint256))", functions[1]->externalSignature()); BOOST_CHECK_EQUAL("g(address,((bytes32,address,()[])[2][],uint256))", functions[1]->externalSignature());
BOOST_CHECK_EQUAL("h(function[])", functions[2]->externalSignature()); BOOST_CHECK_EQUAL("h(function[])", functions[2]->externalSignature());
BOOST_CHECK_EQUAL("i(((bytes32,address,()[])[2][],uint256)[])", functions[3]->externalSignature()); BOOST_CHECK_EQUAL("i(((bytes32,address,()[])[2][],uint256)[])", functions[3]->externalSignature());
} }