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

now is compiling and passing soltest...but I think there may be a few more things to do

Browse Source
This commit is contained in:
RJ Catalano 2015-12-15 12:22:52 -06:00
parent 5a462afd03
commit aebce8a1d5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/ast/AST.h
View File

@ -1150,10 +1150,12 @@ public:
virtual void accept(ASTConstVisitor& _visitor) const override; virtual void accept(ASTConstVisitor& _visitor) const override;
std::vector<ASTPointer<Expression>> const& components() const { return m_components; } std::vector<ASTPointer<Expression>> const& components() const { return m_components; }
bool isInlineArray() const { return m_isArray; }
private: private:
std::vector<ASTPointer<Expression>> m_components; std::vector<ASTPointer<Expression>> m_components;
bool isInlineArray() const { return m_isArray; } bool m_isArray;
}; };
/** /**

10
libsolidity/parsing/Parser.cpp
View File

@ -1037,11 +1037,13 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
case Token::LParen: case Token::LParen:
case Token::LBrack: case Token::LBrack:
{ {
// Tuple or parenthesized expression. // Tuple/parenthesized expression or inline array/bracketed expression.
// Special cases: () is empty tuple type, (x) is not a real tuple, (x,) is one-dimensional tuple // Special cases: ()/[] is empty tuple/array type, (x)/[] is not a real tuple/array,
// (x,) is one-dimensional tuple
m_scanner->next(); m_scanner->next();
vector<ASTPointer<Expression>> components; 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) if (m_scanner->currentToken() != Token::RParen)
while (true) while (true)
@ -1057,7 +1059,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
} }
nodeFactory.markEndPosition(); nodeFactory.markEndPosition();
expectToken(oppositeToken); expectToken(oppositeToken);
return nodeFactory.createNode<TupleExpression>(components); return nodeFactory.createNode<TupleExpression>(components, isArray);
} }
default: default: