diff options
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/ast/AST.h | 4 | ||||
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h index 372f78a2..964c83fa 100644 --- a/libsolidity/ast/AST.h +++ b/libsolidity/ast/AST.h @@ -1150,10 +1150,12 @@ public: virtual void accept(ASTConstVisitor& _visitor) const override; std::vector<ASTPointer<Expression>> const& components() const { return m_components; } + bool isInlineArray() const { return m_isArray; } private: std::vector<ASTPointer<Expression>> m_components; - bool isInlineArray() const { return m_isArray; } + bool m_isArray; + }; /** diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index 149948f7..cb5968e9 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -1037,11 +1037,13 @@ ASTPointer<Expression> Parser::parsePrimaryExpression() case Token::LParen: case Token::LBrack: { - // Tuple or parenthesized expression. - // Special cases: () is empty tuple type, (x) is not a real tuple, (x,) is one-dimensional tuple + // Tuple/parenthesized expression or inline array/bracketed expression. + // Special cases: ()/[] is empty tuple/array type, (x)/[] is not a real tuple/array, + // (x,) is one-dimensional tuple m_scanner->next(); vector<ASTPointer<Expression>> components; - Token::Value oppositeToken = (token == LParen ? Token::RParen : Token::RBrack); + Token::Value oppositeToken = (token == Token::LParen ? Token::RParen : Token::RBrack); + bool isArray = (token == Token::LParen ? false : true); if (m_scanner->currentToken() != Token::RParen) while (true) @@ -1057,7 +1059,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression() } nodeFactory.markEndPosition(); expectToken(oppositeToken); - return nodeFactory.createNode<TupleExpression>(components); + return nodeFactory.createNode<TupleExpression>(components, isArray); } default: |