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

delete for function types

Browse Source
This commit is contained in:
chriseth 2016-11-09 09:36:38 +01:00
parent c9f9b2ab4d
commit f21f794f3c
4 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsolidity/ast/Types.cpp
View File

@ -1897,6 +1897,13 @@ bool FunctionType::operator==(Type const& _other) const
return true; return true;
} }
TypePointer FunctionType::unaryOperatorResult(Token::Value _operator) const
{
if (_operator == Token::Value::Delete)
return make_shared<TupleType>();
return TypePointer();
}
string FunctionType::toString(bool _short) const string FunctionType::toString(bool _short) const
{ {
string name = "function ("; string name = "function (";

1
libsolidity/ast/Types.h
View File

@ -892,6 +892,7 @@ public:
TypePointer selfType() const; TypePointer selfType() const;
virtual bool operator==(Type const& _other) const override; virtual bool operator==(Type const& _other) const override;
virtual TypePointer unaryOperatorResult(Token::Value _operator) const override;
virtual std::string toString(bool _short) const override; virtual std::string toString(bool _short) const override;
virtual unsigned calldataEncodedSize(bool _padded) const override; virtual unsigned calldataEncodedSize(bool _padded) const override;
virtual bool canBeStored() const override { return m_location == Location::Internal || m_location == Location::External; } virtual bool canBeStored() const override { return m_location == Location::Internal || m_location == Location::External; }

19
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -7960,7 +7960,7 @@ BOOST_AUTO_TEST_CASE(function_memory_array)
BOOST_CHECK(callContractFunction("test(uint256,uint256)", u256(10), u256(5)) == encodeArgs()); BOOST_CHECK(callContractFunction("test(uint256,uint256)", u256(10), u256(5)) == encodeArgs());
} }
BOOST_AUTO_TEST_CASE(function_delete) BOOST_AUTO_TEST_CASE(function_delete_storage)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
contract C { contract C {
@ -7987,6 +7987,23 @@ BOOST_AUTO_TEST_CASE(function_delete)
BOOST_CHECK(callContractFunction("ca()") == encodeArgs()); BOOST_CHECK(callContractFunction("ca()") == encodeArgs());
} }
BOOST_AUTO_TEST_CASE(function_delete_stack)
{
char const* sourceCode = R"(
contract C {
function a() returns (uint) { return 7; }
function test() returns (uint) {
y = a;
delete y;
y();
}
}
)";
compileAndRun(sourceCode, 0, "C");
BOOST_CHECK(callContractFunction("test()") == encodeArgs());
}
BOOST_AUTO_TEST_CASE(copy_function_storage_array) BOOST_AUTO_TEST_CASE(copy_function_storage_array)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(

45
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -4256,6 +4256,51 @@ BOOST_AUTO_TEST_CASE(function_type_arrays)
BOOST_CHECK(success(text)); BOOST_CHECK(success(text));
} }
BOOST_AUTO_TEST_CASE(delete_function_type)
{
char const* text = R"(
contract C {
function(uint) external returns (uint) x;
function(uint) internal returns (uint) y;
function f() {
delete x;
var a = y;
delete a;
delete y;
var c = f;
delete c;
function(uint) internal returns (uint) g;
delete g;
}
}
)";
BOOST_CHECK(success(text));
}
BOOST_AUTO_TEST_CASE(delete_function_type_invalid)
{
char const* text = R"(
contract C {
function f() {
delete f;
}
}
)";
BOOST_CHECK(expectError(text, false) == Error::Type::TypeError);
}
BOOST_AUTO_TEST_CASE(delete_external_function_type_invalid)
{
char const* text = R"(
contract C {
function f() {
delete this.f;
}
}
)";
BOOST_CHECK(expectError(text, false) == Error::Type::TypeError);
}
BOOST_AUTO_TEST_CASE(invalid_fixed_point_literal) BOOST_AUTO_TEST_CASE(invalid_fixed_point_literal)
{ {
char const* text = R"( char const* text = R"(