diff options
| author | Federico Bond <federicobond@gmail.com> | 2017-08-09 05:58:06 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-12 00:28:48 +0800 |
| commit | a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c (patch) | |
| tree | 785f44a497e3033e2163bd751f7660478a9f47bc | |
| parent | 5b26e2bcee5f0cf3243fdcda53b47739f10158bb (diff) | |
| download | dexon-solidity-a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c.tar dexon-solidity-a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c.tar.gz dexon-solidity-a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c.tar.bz2 dexon-solidity-a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c.tar.lz dexon-solidity-a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c.tar.xz dexon-solidity-a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c.tar.zst dexon-solidity-a8c047f48d61a3f27ea37f3b677cc4b1f3cbff3c.zip | |
Enforce commas in tuple syntax
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 5 | ||||
| -rw-r--r-- | test/libsolidity/SolidityParser.cpp | 12 |
3 files changed, 16 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md index 3f3d2e98..4609da92 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ Features: * Metadata: Store experimental flag in metadata CBOR. Bugfixes: + * Parser: Enforce commas between array and tuple elements. ### 0.4.15 (2017-08-08) diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index a6d6e025..066e3a29 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -1300,10 +1300,11 @@ ASTPointer<Expression> Parser::parsePrimaryExpression() parserError("Expected expression (inline array elements cannot be omitted)."); else components.push_back(ASTPointer<Expression>()); + if (m_scanner->currentToken() == oppositeToken) break; - else if (m_scanner->currentToken() == Token::Comma) - m_scanner->next(); + + expectToken(Token::Comma); } nodeFactory.markEndPosition(); expectToken(oppositeToken); diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index 2be824d6..3890ca21 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -1187,6 +1187,18 @@ BOOST_AUTO_TEST_CASE(tuples) BOOST_CHECK(successParse(text)); } +BOOST_AUTO_TEST_CASE(tuples_without_commas) +{ + char const* text = R"( + contract C { + function f() { + var a = (2 2); + } + } + )"; + CHECK_PARSE_ERROR(text, "Expected token Comma"); +} + BOOST_AUTO_TEST_CASE(member_access_parser_ambiguity) { char const* text = R"( |