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

Allows struct array in soltest function.

Browse Source
This commit is contained in:
Erik Kundt 2019-03-07 16:58:51 +01:00 committed by Daniel Kirchner
parent 4d8c57006b
commit cd9c0914cb
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -20,6 +20,7 @@ Bugfixes:
Build System: Build System:
* Soltest: Add support for arrays in function signatures. * Soltest: Add support for arrays in function signatures.
* Soltest: Add support for struct arrays in function signatures.
### 0.5.5 (2019-03-05) ### 0.5.5 (2019-03-05)

13
test/libsolidity/util/TestFileParser.cpp
View File

@ -318,10 +318,8 @@ string TestFileParser::parseIdentifierOrTuple()
{ {
string identOrTuple; string identOrTuple;
if (accept(Token::Identifier)) auto parseArrayDimensions = [&]()
{ {
identOrTuple = m_scanner.currentLiteral();
expect(Token::Identifier);
while (accept(Token::LBrack)) while (accept(Token::LBrack))
{ {
identOrTuple += formatToken(Token::LBrack); identOrTuple += formatToken(Token::LBrack);
@ -331,6 +329,13 @@ string TestFileParser::parseIdentifierOrTuple()
identOrTuple += formatToken(Token::RBrack); identOrTuple += formatToken(Token::RBrack);
expect(Token::RBrack); expect(Token::RBrack);
} }
};
if (accept(Token::Identifier))
{
identOrTuple = m_scanner.currentLiteral();
expect(Token::Identifier);
parseArrayDimensions();
return identOrTuple; return identOrTuple;
} }
expect(Token::LParen); expect(Token::LParen);
@ -345,6 +350,8 @@ string TestFileParser::parseIdentifierOrTuple()
} }
expect(Token::RParen); expect(Token::RParen);
identOrTuple += formatToken(Token::RParen); identOrTuple += formatToken(Token::RParen);
parseArrayDimensions();
return identOrTuple; return identOrTuple;
} }

17
test/libsolidity/util/TestFileParserTests.cpp
View File

@ -474,6 +474,23 @@ BOOST_AUTO_TEST_CASE(call_signature_array)
testFunctionCall(calls.at(2), Mode::SingleLine, "f(uint256[3][][],uint8[9])", false); testFunctionCall(calls.at(2), Mode::SingleLine, "f(uint256[3][][],uint8[9])", false);
} }
BOOST_AUTO_TEST_CASE(call_signature_struct_array)
{
char const* source = R"(
// f((uint256)[]) ->
// f((uint256)[3]) ->
// f((uint256, uint8)[3]) ->
// f((uint256)[3][][], (uint8, bool)[9]) ->
)";
auto const calls = parse(source);
BOOST_REQUIRE_EQUAL(calls.size(), 4);
testFunctionCall(calls.at(0), Mode::SingleLine, "f((uint256)[])", false);
testFunctionCall(calls.at(1), Mode::SingleLine, "f((uint256)[3])", false);
testFunctionCall(calls.at(2), Mode::SingleLine, "f((uint256,uint8)[3])", false);
testFunctionCall(calls.at(3), Mode::SingleLine, "f((uint256)[3][][],(uint8,bool)[9])", false);
}
BOOST_AUTO_TEST_CASE(call_signature_valid) BOOST_AUTO_TEST_CASE(call_signature_valid)
{ {
char const* source = R"( char const* source = R"(