From 4522c804f342707ec2bb86a19735a4084108d96d Mon Sep 17 00:00:00 2001 From: Leonardo Alt Date: Mon, 3 Sep 2018 18:17:59 +0200 Subject: Disallow single statement var decl in if/while/for without blocks --- libsolidity/analysis/SyntaxChecker.cpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'libsolidity/analysis/SyntaxChecker.cpp') diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp index ac4fa72b..1b5c00c4 100644 --- a/libsolidity/analysis/SyntaxChecker.cpp +++ b/libsolidity/analysis/SyntaxChecker.cpp @@ -138,9 +138,25 @@ void SyntaxChecker::endVisit(ModifierDefinition const& _modifier) m_placeholderFound = false; } -bool SyntaxChecker::visit(WhileStatement const&) +void SyntaxChecker::checkSingleStatementVariableDeclaration(ASTNode const* _statement) +{ + auto varDecl = dynamic_cast(_statement); + if (varDecl) + m_errorReporter.syntaxError(_statement->location(), "Invalid variable declaration. Please declare it inside a block."); +} + +bool SyntaxChecker::visit(IfStatement const& _ifStatement) +{ + checkSingleStatementVariableDeclaration(&_ifStatement.trueStatement()); + if (Statement const* _statement = _ifStatement.falseStatement()) + checkSingleStatementVariableDeclaration(_statement); + return true; +} + +bool SyntaxChecker::visit(WhileStatement const& _whileStatement) { m_inLoopDepth++; + checkSingleStatementVariableDeclaration(&_whileStatement.body()); return true; } @@ -149,9 +165,10 @@ void SyntaxChecker::endVisit(WhileStatement const&) m_inLoopDepth--; } -bool SyntaxChecker::visit(ForStatement const&) +bool SyntaxChecker::visit(ForStatement const& _forStatement) { m_inLoopDepth++; + checkSingleStatementVariableDeclaration(&_forStatement.body()); return true; } -- cgit v1.2.3 From 17176871ab4903498be0f9d62997ca1a9ace04d8 Mon Sep 17 00:00:00 2001 From: Leonardo Alt Date: Tue, 4 Sep 2018 11:48:58 +0200 Subject: Changed error message and added tests --- libsolidity/analysis/SyntaxChecker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libsolidity/analysis/SyntaxChecker.cpp') diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp index 1b5c00c4..ab883a21 100644 --- a/libsolidity/analysis/SyntaxChecker.cpp +++ b/libsolidity/analysis/SyntaxChecker.cpp @@ -142,7 +142,7 @@ void SyntaxChecker::checkSingleStatementVariableDeclaration(ASTNode const* _stat { auto varDecl = dynamic_cast(_statement); if (varDecl) - m_errorReporter.syntaxError(_statement->location(), "Invalid variable declaration. Please declare it inside a block."); + m_errorReporter.syntaxError(_statement->location(), "Variable declarations can only be used inside blocks."); } bool SyntaxChecker::visit(IfStatement const& _ifStatement) -- cgit v1.2.3 From ac8892e0e3ab4e0152ba74c5857b79aec54e7f1b Mon Sep 17 00:00:00 2001 From: Leonardo Alt Date: Tue, 4 Sep 2018 12:14:04 +0200 Subject: Review suggestions --- libsolidity/analysis/SyntaxChecker.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libsolidity/analysis/SyntaxChecker.cpp') diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp index ab883a21..0bc20f2e 100644 --- a/libsolidity/analysis/SyntaxChecker.cpp +++ b/libsolidity/analysis/SyntaxChecker.cpp @@ -138,25 +138,25 @@ void SyntaxChecker::endVisit(ModifierDefinition const& _modifier) m_placeholderFound = false; } -void SyntaxChecker::checkSingleStatementVariableDeclaration(ASTNode const* _statement) +void SyntaxChecker::checkSingleStatementVariableDeclaration(ASTNode const& _statement) { - auto varDecl = dynamic_cast(_statement); + auto varDecl = dynamic_cast(&_statement); if (varDecl) - m_errorReporter.syntaxError(_statement->location(), "Variable declarations can only be used inside blocks."); + m_errorReporter.syntaxError(_statement.location(), "Variable declarations can only be used inside blocks."); } bool SyntaxChecker::visit(IfStatement const& _ifStatement) { - checkSingleStatementVariableDeclaration(&_ifStatement.trueStatement()); + checkSingleStatementVariableDeclaration(_ifStatement.trueStatement()); if (Statement const* _statement = _ifStatement.falseStatement()) - checkSingleStatementVariableDeclaration(_statement); + checkSingleStatementVariableDeclaration(*_statement); return true; } bool SyntaxChecker::visit(WhileStatement const& _whileStatement) { m_inLoopDepth++; - checkSingleStatementVariableDeclaration(&_whileStatement.body()); + checkSingleStatementVariableDeclaration(_whileStatement.body()); return true; } @@ -168,7 +168,7 @@ void SyntaxChecker::endVisit(WhileStatement const&) bool SyntaxChecker::visit(ForStatement const& _forStatement) { m_inLoopDepth++; - checkSingleStatementVariableDeclaration(&_forStatement.body()); + checkSingleStatementVariableDeclaration(_forStatement.body()); return true; } -- cgit v1.2.3