cerc-io/solidity
10
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

Solidity ForStatements expressions are now optional

Browse Source
This commit is contained in:
Lefteris Karapetsas 2014-12-16 09:51:51 +01:00
parent 3f2600bb31
commit 90e39c04d6
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AST_accept.h
View File

@ -271,8 +271,11 @@ void ForStatement::accept(ASTVisitor& _visitor)
{ {
if (_visitor.visit(*this)) if (_visitor.visit(*this))
{ {
if (m_initExpression)
m_initExpression->accept(_visitor); m_initExpression->accept(_visitor);
if (m_condExpression)
m_condExpression->accept(_visitor); m_condExpression->accept(_visitor);
if (m_loopExpression)
m_loopExpression->accept(_visitor); m_loopExpression->accept(_visitor);
m_body->accept(_visitor); m_body->accept(_visitor);
} }
@ -283,8 +286,11 @@ void ForStatement::accept(ASTConstVisitor& _visitor) const
{ {
if (_visitor.visit(*this)) if (_visitor.visit(*this))
{ {
if (m_initExpression)
m_initExpression->accept(_visitor); m_initExpression->accept(_visitor);
if (m_condExpression)
m_condExpression->accept(_visitor); m_condExpression->accept(_visitor);
if (m_loopExpression)
m_loopExpression->accept(_visitor); m_loopExpression->accept(_visitor);
m_body->accept(_visitor); m_body->accept(_visitor);
} }

17
Parser.cpp
View File

@ -374,14 +374,25 @@ ASTPointer<WhileStatement> Parser::parseWhileStatement()
ASTPointer<ForStatement> Parser::parseForStatement() ASTPointer<ForStatement> Parser::parseForStatement()
{ {
ASTNodeFactory nodeFactory(*this); ASTNodeFactory nodeFactory(*this);
ASTPointer<ASTNode> initExpression;
ASTPointer<Expression> conditionExpression;
ASTPointer<ExpressionStatement> loopExpression;
expectToken(Token::FOR); expectToken(Token::FOR);
expectToken(Token::LPAREN); expectToken(Token::LPAREN);
ASTPointer<ASTNode> initExpression = parseVardefOrExprstatement();
// LTODO: Maybe here have some predicate like peekExpression() instead of checking for semicolon and RPAREN?
if (m_scanner->getCurrentToken() != Token::SEMICOLON)
initExpression = parseVardefOrExprstatement();
expectToken(Token::SEMICOLON); expectToken(Token::SEMICOLON);
ASTPointer<Expression> conditionExpression = parseExpression();
if (m_scanner->getCurrentToken() != Token::SEMICOLON)
conditionExpression = parseExpression();
expectToken(Token::SEMICOLON); expectToken(Token::SEMICOLON);
ASTPointer<ExpressionStatement> loopExpression = parseExpressionStatement();
if (m_scanner->getCurrentToken() != Token::RPAREN)
loopExpression = parseExpressionStatement();
expectToken(Token::RPAREN); expectToken(Token::RPAREN);
ASTPointer<Statement> body = parseStatement(); ASTPointer<Statement> body = parseStatement();
nodeFactory.setEndPositionFromNode(body); nodeFactory.setEndPositionFromNode(body);
return nodeFactory.createNode<ForStatement>(initExpression, return nodeFactory.createNode<ForStatement>(initExpression,

2
grammar.txt
View File

@ -20,7 +20,7 @@ Statement = IfStatement | WhileStatement | Block |
IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )? IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )?
WhileStatement = 'while' '(' Expression ')' Statement WhileStatement = 'while' '(' Expression ')' Statement
ForStatement = 'for' '(' VardefOrExpressionstatement ';' Expression ';' Expressionstatement ')' Statement ForStatement = 'for' '(' (VardefOrExpressionstatement)? ';' (Expression)? ';' (Expressionstatement)? ')' Statement
Continue = 'continue' ';' Continue = 'continue' ';'
Break = 'break' ';' Break = 'break' ';'
Return = 'return' Expression? ';' Return = 'return' Expression? ';'