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

Parsing is complete

Browse Source
This commit is contained in:
RJ Catalano 2015-12-16 13:17:41 -06:00
parent 0ba24a5289
commit de969945ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/parsing/Parser.cpp
View File

@ -1043,9 +1043,9 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
m_scanner->next(); m_scanner->next();
vector<ASTPointer<Expression>> components; vector<ASTPointer<Expression>> components;
Token::Value oppositeToken = (token == Token::LParen ? Token::RParen : Token::RBrack); Token::Value oppositeToken = (token == Token::LParen ? Token::RParen : Token::RBrack);
bool isArray = (token == Token::RBrace ? true : false); bool isArray = (token == Token::LBrack ? true : false);
if (isArray && (m_scanner->currentToken() == Token::Comma)) if (isArray && (m_scanner->currentToken() == Token::Comma))
fatalParserError("Expected value in array cell after '[' ."); fatalParserError(std::string("Expected value in array cell after '[' ."));
if (m_scanner->currentToken() != oppositeToken) if (m_scanner->currentToken() != oppositeToken)
while (true) while (true)
{ {
@ -1057,7 +1057,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
break; break;
else if (m_scanner->currentToken() == Token::Comma) else if (m_scanner->currentToken() == Token::Comma)
if (isArray && (m_scanner->peekNextToken() == (Token::Comma || oppositeToken))) if (isArray && (m_scanner->peekNextToken() == (Token::Comma || oppositeToken)))
fatalParserError("Expected value in array cell after ',' ."); fatalParserError(std::string("Expected value in array cell after ',' ."));
m_scanner->next(); m_scanner->next();
} }
nodeFactory.markEndPosition(); nodeFactory.markEndPosition();