mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge remote-tracking branch 'ethereum/develop' into HEAD
Conflicts: libsolidity/Compiler.cpp test/solidityCompiler.cpp
This commit is contained in:
commit
e30d3f8d53
@ -290,10 +290,10 @@ ASTPointer<Statement> Parser::parseStatement()
|
|||||||
// We have a variable definition if we get a keyword that specifies a type name, or
|
// We have a variable definition if we get a keyword that specifies a type name, or
|
||||||
// in the case of a user-defined type, we have two identifiers following each other.
|
// in the case of a user-defined type, we have two identifiers following each other.
|
||||||
if (m_scanner->getCurrentToken() == Token::MAPPING ||
|
if (m_scanner->getCurrentToken() == Token::MAPPING ||
|
||||||
m_scanner->getCurrentToken() == Token::VAR ||
|
m_scanner->getCurrentToken() == Token::VAR ||
|
||||||
Token::isElementaryTypeName(m_scanner->getCurrentToken()) ||
|
((Token::isElementaryTypeName(m_scanner->getCurrentToken()) ||
|
||||||
(m_scanner->getCurrentToken() == Token::IDENTIFIER &&
|
m_scanner->getCurrentToken() == Token::IDENTIFIER) &&
|
||||||
m_scanner->peekNextToken() == Token::IDENTIFIER))
|
m_scanner->peekNextToken() == Token::IDENTIFIER))
|
||||||
statement = parseVariableDefinition();
|
statement = parseVariableDefinition();
|
||||||
else // "ordinary" expression statement
|
else // "ordinary" expression statement
|
||||||
statement = parseExpressionStatement();
|
statement = parseExpressionStatement();
|
||||||
|
Loading…
Reference in New Issue
Block a user