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

Some more tests and typos fixed.

Browse Source
This commit is contained in:
chriseth 2015-10-13 12:22:57 +02:00
parent deebc7e860
commit 13d7bc4ee8
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/ASTAnnotations.h
View File

@ -86,7 +86,7 @@ struct UserDefinedTypeNameAnnotation: TypeNameAnnotation
struct VariableDeclarationStatementAnnotation: ASTAnnotation
{
/// Information about which component of the vaule is assigned to which variable.
/// Information about which component of the value is assigned to which variable.
/// The pointer can be null to signify that the component is discarded.
std::vector<VariableDeclaration const*> assignments;
};

5
libsolidity/Types.cpp
View File

@ -1244,8 +1244,9 @@ string TupleType::toString(bool _short) const
u256 TupleType::storageSize() const
{
BOOST_THROW_EXCEPTION(
InternalCompilerError()
<< errinfo_comment("Storage size of non-storable tuple type requested."));
InternalCompilerError() <<
errinfo_comment("Storage size of non-storable tuple type requested.")
);
}
unsigned TupleType::sizeOnStack() const

25
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -2411,11 +2411,14 @@ BOOST_AUTO_TEST_CASE(multi_variable_declaration_wildcards_fine)
contract C {
function three() returns (uint, uint, uint);
function two() returns (uint, uint);
function none();
function f() {
var (a,) = three();
var (b,c,) = two();
var (,d) = three();
var (,e,g) = two();
var (,,) = three();
var () = none();
}
)";
BOOST_CHECK_NO_THROW(parseAndAnalyseReturnError(text));
@ -2464,6 +2467,28 @@ BOOST_AUTO_TEST_CASE(multi_variable_declaration_wildcards_fail_4)
SOLIDITY_CHECK_ERROR_TYPE(parseAndAnalyseReturnError(text), TypeError);
}
BOOST_AUTO_TEST_CASE(multi_variable_declaration_wildcards_fail_5)
{
char const* text = R"(
contract C {
function one() returns (uint);
function f() { var (,) = one(); }
}
)";
SOLIDITY_CHECK_ERROR_TYPE(parseAndAnalyseReturnError(text), TypeError);
}
BOOST_AUTO_TEST_CASE(multi_variable_declaration_wildcards_fail_6)
{
char const* text = R"(
contract C {
function two() returns (uint, uint);
function f() { var (a, b, c) = two(); }
}
)";
SOLIDITY_CHECK_ERROR_TYPE(parseAndAnalyseReturnError(text), TypeError);
}
BOOST_AUTO_TEST_SUITE_END()
}

2
test/libsolidity/SolidityParser.cpp
View File

@ -945,6 +945,8 @@ BOOST_AUTO_TEST_CASE(multi_variable_declaration)
var (f,) = 4;
var (x,,) = g();
var (,y,) = g();
var () = g();
var (,,) = g();
}
function g() returns (uint, uint, uint) {}
}