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 #1727 from ethereum/fixtuples

Browse Source 
Do now allow declaring variables with inferred empty tuple type.
This commit is contained in:
Yoichi Hirai 2017-03-02 16:27:39 +01:00 committed by GitHub
commit 11195360f6
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -13,6 +13,7 @@ Bugfixes:
* Type system: Fix a crash caused by continuing on fatal errors in the code. * Type system: Fix a crash caused by continuing on fatal errors in the code.
* Type system: Disallow arrays with negative length. * Type system: Disallow arrays with negative length.
* Type system: Fix a crash related to invalid binary operators. * Type system: Fix a crash related to invalid binary operators.
* Type system: Disallow ``var`` declaration with empty tuple type.
* Type system: Correctly convert function argument types to pointers for member functions. * Type system: Correctly convert function argument types to pointers for member functions.
* Inline assembly: Charge one stack slot for non-value types during analysis. * Inline assembly: Charge one stack slot for non-value types during analysis.
* Assembly output: Print source location before the operation it refers to instead of after. * Assembly output: Print source location before the operation it refers to instead of after.

5
libsolidity/analysis/TypeChecker.cpp
View File

@ -824,6 +824,11 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
else else
solAssert(false, ""); solAssert(false, "");
} }
else if (*var.annotation().type == TupleType())
typeError(
var.location(),
"Cannot declare variable with void (empty tuple) type."
);
var.accept(*this); var.accept(*this);
} }
else else

13
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -2950,6 +2950,19 @@ BOOST_AUTO_TEST_CASE(multi_variable_declaration_wildcards_fail_6)
CHECK_ERROR(text, TypeError, ""); CHECK_ERROR(text, TypeError, "");
} }
BOOST_AUTO_TEST_CASE(tuple_assignment_from_void_function)
{
char const* text = R"(
contract C {
function f() { }
function g() {
var (x,) = (f(), f());
}
}
)";
CHECK_ERROR(text, TypeError, "Cannot declare variable with void (empty tuple) type.");
}
BOOST_AUTO_TEST_CASE(member_access_parser_ambiguity) BOOST_AUTO_TEST_CASE(member_access_parser_ambiguity)
{ {
char const* text = R"( char const* text = R"(