diff options
author | chriseth <c@ethdev.com> | 2015-10-13 05:02:35 +0800 |
---|---|---|
committer | chriseth <c@ethdev.com> | 2015-10-15 23:38:42 +0800 |
commit | 7ebd536e79215f06f5ce7e14591aa494d06032b6 (patch) | |
tree | cca1f7597e4c6ddd674db92337424b0fd412b501 /libsolidity/Parser.cpp | |
parent | 7ba42f470753f9af25531017f319cf94eb26d3f2 (diff) | |
download | dexon-solidity-7ebd536e79215f06f5ce7e14591aa494d06032b6.tar dexon-solidity-7ebd536e79215f06f5ce7e14591aa494d06032b6.tar.gz dexon-solidity-7ebd536e79215f06f5ce7e14591aa494d06032b6.tar.bz2 dexon-solidity-7ebd536e79215f06f5ce7e14591aa494d06032b6.tar.lz dexon-solidity-7ebd536e79215f06f5ce7e14591aa494d06032b6.tar.xz dexon-solidity-7ebd536e79215f06f5ce7e14591aa494d06032b6.tar.zst dexon-solidity-7ebd536e79215f06f5ce7e14591aa494d06032b6.zip |
Tuple expressions.
Diffstat (limited to 'libsolidity/Parser.cpp')
-rw-r--r-- | libsolidity/Parser.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/libsolidity/Parser.cpp b/libsolidity/Parser.cpp index ab2d0094..1bb16b84 100644 --- a/libsolidity/Parser.cpp +++ b/libsolidity/Parser.cpp @@ -806,6 +806,7 @@ ASTPointer<VariableDeclarationStatement> Parser::parseVariableDeclarationStateme ) { ASTNodeFactory varDeclNodeFactory(*this); + varDeclNodeFactory.markEndPosition(); ASTPointer<ASTString> name = expectIdentifierToken(); var = varDeclNodeFactory.createNode<VariableDeclaration>( ASTPointer<TypeName>(), @@ -1009,10 +1010,25 @@ ASTPointer<Expression> Parser::parsePrimaryExpression() break; case Token::LParen: { + // Tuple or parenthesized expression. + // Special cases: () is empty tuple type, (x) is not a real tuple, (x,) is one-dimensional tuple m_scanner->next(); - ASTPointer<Expression> expression = parseExpression(); + vector<ASTPointer<Expression>> components; + if (m_scanner->currentToken() != Token::RParen) + while (true) + { + if (m_scanner->currentToken() != Token::Comma && m_scanner->currentToken() != Token::RParen) + components.push_back(parseExpression()); + else + components.push_back(ASTPointer<Expression>()); + if (m_scanner->currentToken() == Token::RParen) + break; + else if (m_scanner->currentToken() == Token::Comma) + m_scanner->next(); + } + nodeFactory.markEndPosition(); expectToken(Token::RParen); - return expression; + return nodeFactory.createNode<TupleExpression>(components); } default: if (Token::isElementaryTypeName(token)) |