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

Fix false positive test for type(S).typehash and update error messages

Browse Source
This commit is contained in:
Anton Bukov 2023-05-07 00:06:27 +03:00
parent e8a311268d
commit 8c1a9af76a
10 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/analysis/TypeChecker.cpp
View File

@ -329,7 +329,7 @@ TypePointers TypeChecker::typeCheckMetaTypeFunctionAndRetrieveReturnType(Functio
4259_error,
arguments.front()->location(),
"Invalid type for argument in the function call. "
"An enum type, contract type or an integer type is required, but " +
"An enum type, contract type, struct type or an integer type is required, but " +
type(*arguments.front())->humanReadableName() + " provided."
);

2
test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
View File

@ -5,4 +5,4 @@ contract C {
}
}
// ----
// TypeError 4259: (93-98): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes storage pointer) provided.
// TypeError 4259: (93-98): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but type(bytes storage pointer) provided.

2
test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol
View File

@ -6,4 +6,4 @@ contract C {
}
}
// ----
// TypeError 4259: (126-139): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but error MyCustomError(uint256,bool) provided.
// TypeError 4259: (126-139): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but error MyCustomError(uint256,bool) provided.

2
test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol
View File

@ -6,4 +6,4 @@ contract C {
}
}
// ----
// TypeError 4259: (124-137): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but event MyCustomEvent(uint256) provided.
// TypeError 4259: (124-137): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but event MyCustomEvent(uint256) provided.

2
test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol
View File

@ -10,4 +10,4 @@ contract SuperTest is Other {
}
}
// ----
// TypeError 4259: (177-182): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super SuperTest) provided.
// TypeError 4259: (177-182): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but type(contract super SuperTest) provided.

2
test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol
View File

@ -14,4 +14,4 @@ abstract contract Test is ERC165 {
}
}
// ----
// TypeError 4259: (592-597): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super Test) provided.
// TypeError 4259: (592-597): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but type(contract super Test) provided.

2
test/libsolidity/syntaxTests/metaTypes/super_name.sol
View File

@ -50,4 +50,4 @@ contract D is B, C {
}
}
// ----
// TypeError 4259: (426-431): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super B) provided.
// TypeError 4259: (426-431): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but type(contract super B) provided.

2
test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol
View File

@ -4,4 +4,4 @@ contract Test {
}
}
// ----
// TypeError 4259: (65-75): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract Test) provided.
// TypeError 4259: (65-75): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but type(contract Test) provided.

5
test/libsolidity/syntaxTests/metaTypes/unsupported_arg_for_type.sol
View File

@ -1,9 +1,8 @@
contract Test {
struct S { uint x; }
function f() public pure {
// Unsupported for now, but might be supported in the future
type(S);
type(bytes32);
}
}
// ----
// TypeError 4259: (154-155): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(struct Test.S storage pointer) provided.
// TypeError 4259: (154-155): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but type(struct Test.S storage pointer) provided.

2
test/libsolidity/syntaxTests/tryCatch/no_special.sol
View File

@ -14,4 +14,4 @@ contract C {
// ----
// TypeError 5347: (72-76): Try can only be used with external function calls and contract creation calls.
// TypeError 2536: (119-128): Try can only be used with external function calls and contract creation calls.
// TypeError 4259: (176-183): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(address) provided.
// TypeError 4259: (176-183): Invalid type for argument in the function call. An enum type, contract type, struct type or an integer type is required, but type(address) provided.