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

Make sure "value" error hint is only displayed in the right context

Browse Source 
Before, the hint would be shown for any "value" member, even a user-specified one.
This commit is contained in:
Mathias Baumann 2019-02-12 16:09:16 +01:00
parent d32670760c
commit 093b9ced97
11 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libsolidity/analysis/TypeChecker.cpp
View File

@ -2046,20 +2046,24 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
}
string errorMsg = "Member \"" + memberName + "\" not found or not visible "
"after argument-dependent lookup in " + exprType->toString() + ".";
if (memberName == "value")
{
errorMsg.pop_back();
errorMsg += " - did you forget the \"payable\" modifier?";
}
else if (auto const& funType = dynamic_pointer_cast<FunctionType const>(exprType))
if (auto const& funType = dynamic_pointer_cast<FunctionType const>(exprType))
{
auto const& t = funType->returnParameterTypes();
if (t.size() == 1)
if (
t.front()->category() == Type::Category::Contract ||
t.front()->category() == Type::Category::Struct
)
errorMsg += " Did you intend to call the function?";
if (memberName == "value")
{
if (funType->kind() == FunctionType::Kind::Creation)
errorMsg = "Constructor for " + t.front()->toString() + " must be payable for member \"value\" to be available.";
else
errorMsg = "Member \"value\" is only available for payable functions.";
}
else if (
t.size() == 1 &&
(t.front()->category() == Type::Category::Struct ||
t.front()->category() == Type::Category::Contract)
)
errorMsg += " Did you intend to call the function?";
}
else if (exprType->category() == Type::Category::Contract)
{

2
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -471,7 +471,7 @@ BOOST_AUTO_TEST_CASE(address_staticcall_value)
}
}
)";
CHECK_ERROR(sourceCode, TypeError, "Member \"value\" not found or not visible after argument-dependent lookup");
CHECK_ERROR(sourceCode, TypeError, "Member \"value\" is only available for payable functions.");
}
}

7
test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol Normal file
View File

@ -0,0 +1,7 @@
contract C {
// Tests that we don't get a wrong error about constructors
function f() public view returns (C) { return this; }
function g() public { this.f.value(); }
}
// ----
// TypeError: (155-167): Member "value" is only available for payable functions.

2
test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
View File

@ -5,4 +5,4 @@ contract C {
}
}
// ----
// TypeError: (94-101): Member "value" not found or not visible after argument-dependent lookup in function (uint256) external returns (uint256) - did you forget the "payable" modifier?
// TypeError: (94-101): Member "value" is only available for payable functions.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol
View File

@ -5,4 +5,4 @@ contract test {
}
}
// ----
// TypeError: (87-96): Member "value" not found or not visible after argument-dependent lookup in function () - did you forget the "payable" modifier?
// TypeError: (87-96): Member "value" is only available for payable functions.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
View File

@ -3,4 +3,4 @@ contract test {
function f() public { (new receiver()).nopay.value(10)(); }
}
// ----
// TypeError: (91-119): Member "value" not found or not visible after argument-dependent lookup in function () external - did you forget the "payable" modifier?
// TypeError: (91-119): Member "value" is only available for payable functions.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
View File

@ -8,4 +8,4 @@ contract D {
}
}
// ----
// TypeError: (106-119): Member "value" not found or not visible after argument-dependent lookup in function () returns (contract C) - did you forget the "payable" modifier?
// TypeError: (106-119): Constructor for contract C must be payable for member "value" to be available.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol
View File

@ -4,4 +4,4 @@ contract C {
}
}
// ----
// TypeError: (47-62): Member "value" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32) - did you forget the "payable" modifier?
// TypeError: (47-62): Member "value" is only available for payable functions.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol
View File

@ -4,4 +4,4 @@ contract C {
}
}
// ----
// TypeError: (47-59): Member "value" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32) - did you forget the "payable" modifier?
// TypeError: (47-59): Member "value" is only available for payable functions.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol
View File

@ -4,4 +4,4 @@ contract C {
}
}
// ----
// TypeError: (47-62): Member "value" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes20) - did you forget the "payable" modifier?
// TypeError: (47-62): Member "value" is only available for payable functions.

2
test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol
View File

@ -4,4 +4,4 @@ contract C {
}
}
// ----
// TypeError: (47-62): Member "value" not found or not visible after argument-dependent lookup in function (bytes32,uint8,bytes32,bytes32) pure returns (address) - did you forget the "payable" modifier?
// TypeError: (47-62): Member "value" is only available for payable functions.