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

ForStatement typecheck and initExpression is a Statement

Browse Source
This commit is contained in:
Lefteris Karapetsas 2014-12-16 13:20:50 +01:00
parent 90e39c04d6
commit 062b51e7bd
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AST.cpp
View File

@ -132,8 +132,12 @@ void WhileStatement::checkTypeRequirements()
void ForStatement::checkTypeRequirements() void ForStatement::checkTypeRequirements()
{ {
// LTODO if (m_initExpression)
m_condExpression->expectType(BoolType()); m_initExpression->checkTypeRequirements();
if (m_condExpression)
m_condExpression->expectType(BoolType());
if (m_loopExpression)
m_loopExpression->checkTypeRequirements();
m_body->checkTypeRequirements(); m_body->checkTypeRequirements();
} }

4
AST.h
View File

@ -513,7 +513,7 @@ class ForStatement: public BreakableStatement
{ {
public: public:
ForStatement(Location const& _location, ForStatement(Location const& _location,
ASTPointer<ASTNode> const& _initExpression, ASTPointer<Statement> const& _initExpression,
ASTPointer<Expression> const& _conditionExpression, ASTPointer<Expression> const& _conditionExpression,
ASTPointer<ExpressionStatement> const& _loopExpression, ASTPointer<ExpressionStatement> const& _loopExpression,
ASTPointer<Statement> const& _body): ASTPointer<Statement> const& _body):
@ -527,7 +527,7 @@ public:
virtual void checkTypeRequirements() override; virtual void checkTypeRequirements() override;
private: private:
ASTPointer<ASTNode> m_initExpression; ASTPointer<Statement> m_initExpression;
ASTPointer<Expression> m_condExpression; ASTPointer<Expression> m_condExpression;
ASTPointer<ExpressionStatement> m_loopExpression; ASTPointer<ExpressionStatement> m_loopExpression;
ASTPointer<Statement> m_body; ASTPointer<Statement> m_body;

4
Parser.cpp
View File

@ -374,7 +374,7 @@ ASTPointer<WhileStatement> Parser::parseWhileStatement()
ASTPointer<ForStatement> Parser::parseForStatement() ASTPointer<ForStatement> Parser::parseForStatement()
{ {
ASTNodeFactory nodeFactory(*this); ASTNodeFactory nodeFactory(*this);
ASTPointer<ASTNode> initExpression; ASTPointer<Statement> initExpression;
ASTPointer<Expression> conditionExpression; ASTPointer<Expression> conditionExpression;
ASTPointer<ExpressionStatement> loopExpression; ASTPointer<ExpressionStatement> loopExpression;
expectToken(Token::FOR); expectToken(Token::FOR);
@ -401,7 +401,7 @@ ASTPointer<ForStatement> Parser::parseForStatement()
body); body);
} }
ASTPointer<ASTNode> Parser::parseVardefOrExprstatement() ASTPointer<Statement> Parser::parseVardefOrExprstatement()
{ {
if (peekVariableDefinition()) if (peekVariableDefinition())
return parseVariableDefinition(); return parseVariableDefinition();

2
Parser.h
View File

@ -60,7 +60,7 @@ private:
ASTPointer<IfStatement> parseIfStatement(); ASTPointer<IfStatement> parseIfStatement();
ASTPointer<WhileStatement> parseWhileStatement(); ASTPointer<WhileStatement> parseWhileStatement();
ASTPointer<ForStatement> parseForStatement(); ASTPointer<ForStatement> parseForStatement();
ASTPointer<ASTNode> parseVardefOrExprstatement(); ASTPointer<Statement> parseVardefOrExprstatement();
ASTPointer<VariableDefinition> parseVariableDefinition(); ASTPointer<VariableDefinition> parseVariableDefinition();
ASTPointer<ExpressionStatement> parseExpressionStatement(); ASTPointer<ExpressionStatement> parseExpressionStatement();
ASTPointer<Expression> parseExpression(); ASTPointer<Expression> parseExpression();