cerc-io/solidity
10
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 #3272 from ethereum/suggest-structs

Browse Source 
Suggest the experimental ABI encoder if using structs as function parameters
This commit is contained in:
chriseth 2017-12-11 11:58:53 +01:00 committed by GitHub
commit 4a1f18c951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@ -4,6 +4,8 @@ Features:
* Inline Assembly: Issue warning for using jump labels (already existed for jump instructions). * Inline Assembly: Issue warning for using jump labels (already existed for jump instructions).
Bugfixes: Bugfixes:
* Type Checker: Suggest the experimental ABI encoder if using ``struct``s as function parameters
(instead of an internal compiler error).
### 0.4.19 (2017-11-30) ### 0.4.19 (2017-11-30)

11
libsolidity/analysis/TypeChecker.cpp
View File

@ -570,6 +570,17 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
m_errorReporter.typeError(var->location(), "Type is required to live outside storage."); m_errorReporter.typeError(var->location(), "Type is required to live outside storage.");
if (_function.visibility() >= FunctionDefinition::Visibility::Public && !(type(*var)->interfaceType(isLibraryFunction))) if (_function.visibility() >= FunctionDefinition::Visibility::Public && !(type(*var)->interfaceType(isLibraryFunction)))
m_errorReporter.fatalTypeError(var->location(), "Internal or recursive type is not allowed for public or external functions."); m_errorReporter.fatalTypeError(var->location(), "Internal or recursive type is not allowed for public or external functions.");
if (
_function.visibility() > FunctionDefinition::Visibility::Internal &&
type(*var)->category() == Type::Category::Struct &&
!type(*var)->dataStoredIn(DataLocation::Storage) &&
!_function.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2)
)
m_errorReporter.typeError(
var->location(),
"Structs are only supported in the new experimental ABI encoder. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature."
);
var->accept(*this); var->accept(*this);
} }

1
test/libsolidity/SMTChecker.cpp
View File

@ -94,6 +94,7 @@ BOOST_AUTO_TEST_CASE(warn_on_typecast)
BOOST_AUTO_TEST_CASE(warn_on_struct) BOOST_AUTO_TEST_CASE(warn_on_struct)
{ {
string text = R"( string text = R"(
pragma experimental ABIEncoderV2;
contract C { contract C {
struct A { uint a; uint b; } struct A { uint a; uint b; }
function f() public pure returns (A) { function f() public pure returns (A) {

3
test/libsolidity/SolidityABIJSON.cpp
View File

@ -942,6 +942,7 @@ BOOST_AUTO_TEST_CASE(function_type)
BOOST_AUTO_TEST_CASE(return_structs) BOOST_AUTO_TEST_CASE(return_structs)
{ {
char const* text = R"( char const* text = R"(
pragma experimental ABIEncoderV2;
contract C { contract C {
struct S { uint a; T[] sub; } struct S { uint a; T[] sub; }
struct T { uint[2] x; } struct T { uint[2] x; }
@ -991,6 +992,7 @@ BOOST_AUTO_TEST_CASE(return_structs)
BOOST_AUTO_TEST_CASE(return_structs_with_contracts) BOOST_AUTO_TEST_CASE(return_structs_with_contracts)
{ {
char const* text = R"( char const* text = R"(
pragma experimental ABIEncoderV2;
contract C { contract C {
struct S { C[] x; C y; } struct S { C[] x; C y; }
function f() returns (S s, C c) { function f() returns (S s, C c) {
@ -1090,6 +1092,7 @@ BOOST_AUTO_TEST_CASE(event_structs)
BOOST_AUTO_TEST_CASE(structs_in_libraries) BOOST_AUTO_TEST_CASE(structs_in_libraries)
{ {
char const* text = R"( char const* text = R"(
pragma experimental ABIEncoderV2;
library L { library L {
struct S { uint a; T[] sub; bytes b; } struct S { uint a; T[] sub; bytes b; }
struct T { uint[2] x; } struct T { uint[2] x; }

4
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -602,6 +602,7 @@ BOOST_AUTO_TEST_CASE(enum_external_type)
BOOST_AUTO_TEST_CASE(external_structs) BOOST_AUTO_TEST_CASE(external_structs)
{ {
char const* text = R"( char const* text = R"(
pragma experimental ABIEncoderV2;
contract Test { contract Test {
enum ActionChoices { GoLeft, GoRight, GoStraight, Sit } enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
struct Empty {} struct Empty {}
@ -629,6 +630,7 @@ BOOST_AUTO_TEST_CASE(external_structs)
BOOST_AUTO_TEST_CASE(external_structs_in_libraries) BOOST_AUTO_TEST_CASE(external_structs_in_libraries)
{ {
char const* text = R"( char const* text = R"(
pragma experimental ABIEncoderV2;
library Test { library Test {
enum ActionChoices { GoLeft, GoRight, GoStraight, Sit } enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
struct Empty {} struct Empty {}
@ -3511,6 +3513,7 @@ BOOST_AUTO_TEST_CASE(using_for_not_used)
BOOST_AUTO_TEST_CASE(library_memory_struct) BOOST_AUTO_TEST_CASE(library_memory_struct)
{ {
char const* text = R"( char const* text = R"(
pragma experimental ABIEncoderV2;
library c { library c {
struct S { uint x; } struct S { uint x; }
function f() public returns (S ) {} function f() public returns (S ) {}
@ -5696,6 +5699,7 @@ BOOST_AUTO_TEST_CASE(constructible_internal_constructor)
BOOST_AUTO_TEST_CASE(return_structs) BOOST_AUTO_TEST_CASE(return_structs)
{ {
char const* text = R"( char const* text = R"(
pragma experimental ABIEncoderV2;
contract C { contract C {
struct S { uint a; T[] sub; } struct S { uint a; T[] sub; }
struct T { uint[] x; } struct T { uint[] x; }