diff options
author | chriseth <c@ethdev.com> | 2016-01-21 02:23:23 +0800 |
---|---|---|
committer | chriseth <c@ethdev.com> | 2016-01-21 02:23:23 +0800 |
commit | 67c855c583042ddee6261a9921239a3afd086c14 (patch) | |
tree | 4b1860c54315b75490c21b417c2b082a59a60275 /libsolidity | |
parent | d21c4276b33ced75055e2fc6a37ac8019e95f032 (diff) | |
parent | cb3e07acfcbd9a77b27bfbac600a40cd2725594b (diff) | |
download | dexon-solidity-67c855c583042ddee6261a9921239a3afd086c14.tar dexon-solidity-67c855c583042ddee6261a9921239a3afd086c14.tar.gz dexon-solidity-67c855c583042ddee6261a9921239a3afd086c14.tar.bz2 dexon-solidity-67c855c583042ddee6261a9921239a3afd086c14.tar.lz dexon-solidity-67c855c583042ddee6261a9921239a3afd086c14.tar.xz dexon-solidity-67c855c583042ddee6261a9921239a3afd086c14.tar.zst dexon-solidity-67c855c583042ddee6261a9921239a3afd086c14.zip |
Merge pull request #356 from guanqun/break-not-in-loop
check whether break/continue is in the loop
Diffstat (limited to 'libsolidity')
-rw-r--r-- | libsolidity/analysis/SyntaxChecker.cpp | 80 | ||||
-rw-r--r-- | libsolidity/analysis/SyntaxChecker.h | 61 | ||||
-rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 6 | ||||
-rw-r--r-- | libsolidity/interface/Exceptions.cpp | 3 | ||||
-rw-r--r-- | libsolidity/interface/Exceptions.h | 1 |
5 files changed, 151 insertions, 0 deletions
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp new file mode 100644 index 00000000..e94ce9fe --- /dev/null +++ b/libsolidity/analysis/SyntaxChecker.cpp @@ -0,0 +1,80 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <memory> +#include <libsolidity/ast/AST.h> +#include <libsolidity/analysis/SyntaxChecker.h> + +using namespace std; +using namespace dev; +using namespace dev::solidity; + + +bool SyntaxChecker::checkSyntax(SourceUnit const& _sourceUnit) +{ + _sourceUnit.accept(*this); + return m_errors.empty(); +} + +void SyntaxChecker::syntaxError(SourceLocation const& _location, std::string const& _description) +{ + auto err = make_shared<Error>(Error::Type::SyntaxError); + *err << + errinfo_sourceLocation(_location) << + errinfo_comment(_description); + + m_errors.push_back(err); +} + +bool SyntaxChecker::visit(WhileStatement const&) +{ + m_inLoopDepth++; + return true; +} + +void SyntaxChecker::endVisit(WhileStatement const&) +{ + m_inLoopDepth--; +} + +bool SyntaxChecker::visit(ForStatement const&) +{ + m_inLoopDepth++; + return true; +} + +void SyntaxChecker::endVisit(ForStatement const&) +{ + m_inLoopDepth--; +} + +bool SyntaxChecker::visit(Continue const& _continueStatement) +{ + if (m_inLoopDepth <= 0) + // we're not in a for/while loop, report syntax error + syntaxError(_continueStatement.location(), "\"continue\" has to be in a \"for\" or \"while\" loop."); + return true; +} + +bool SyntaxChecker::visit(Break const& _breakStatement) +{ + if (m_inLoopDepth <= 0) + // we're not in a for/while loop, report syntax error + syntaxError(_breakStatement.location(), "\"break\" has to be in a \"for\" or \"while\" loop."); + return true; +} + diff --git a/libsolidity/analysis/SyntaxChecker.h b/libsolidity/analysis/SyntaxChecker.h new file mode 100644 index 00000000..c836d49f --- /dev/null +++ b/libsolidity/analysis/SyntaxChecker.h @@ -0,0 +1,61 @@ +/* + This file is part of cpp-ethereum. + + cpp-ethereum is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + cpp-ethereum is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. +*/ + +#pragma once + +#include <libsolidity/analysis/TypeChecker.h> +#include <libsolidity/ast/Types.h> +#include <libsolidity/ast/ASTAnnotations.h> +#include <libsolidity/ast/ASTForward.h> +#include <libsolidity/ast/ASTVisitor.h> + +namespace dev +{ +namespace solidity +{ + +/** + * The module that performs syntax analysis on the AST: + * - whether continue/break is in a for/while loop. + */ +class SyntaxChecker: private ASTConstVisitor +{ +public: + /// @param _errors the reference to the list of errors and warnings to add them found during type checking. + SyntaxChecker(ErrorList& _errors): m_errors(_errors) {} + + bool checkSyntax(SourceUnit const& _sourceUnit); + +private: + /// Adds a new error to the list of errors. + void syntaxError(SourceLocation const& _location, std::string const& _description); + + virtual bool visit(WhileStatement const& _whileStatement) override; + virtual void endVisit(WhileStatement const& _whileStatement) override; + virtual bool visit(ForStatement const& _forStatement) override; + virtual void endVisit(ForStatement const& _forStatement) override; + + virtual bool visit(Continue const& _continueStatement) override; + virtual bool visit(Break const& _breakStatement) override; + + ErrorList& m_errors; + + int m_inLoopDepth = 0; +}; + +} +} diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 9ddc345d..83459183 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -30,6 +30,7 @@ #include <libsolidity/analysis/NameAndTypeResolver.h> #include <libsolidity/analysis/TypeChecker.h> #include <libsolidity/analysis/DocStringAnalyser.h> +#include <libsolidity/analysis/SyntaxChecker.h> #include <libsolidity/codegen/Compiler.h> #include <libsolidity/interface/CompilerStack.h> #include <libsolidity/interface/InterfaceHandler.h> @@ -133,6 +134,11 @@ bool CompilerStack::parse() resolveImports(); bool noErrors = true; + SyntaxChecker syntaxChecker(m_errors); + for (Source const* source: m_sourceOrder) + if (!syntaxChecker.checkSyntax(*source->ast)) + noErrors = false; + DocStringAnalyser docStringAnalyser(m_errors); for (Source const* source: m_sourceOrder) if (!docStringAnalyser.analyseDocStrings(*source->ast)) diff --git a/libsolidity/interface/Exceptions.cpp b/libsolidity/interface/Exceptions.cpp index 465c3d2f..6d72520b 100644 --- a/libsolidity/interface/Exceptions.cpp +++ b/libsolidity/interface/Exceptions.cpp @@ -39,6 +39,9 @@ Error::Error(Type _type): m_type(_type) case Type::ParserError: m_typeName = "Parser Error"; break; + case Type::SyntaxError: + m_typeName = "Syntax Error"; + break; case Type::TypeError: m_typeName = "Type Error"; break; diff --git a/libsolidity/interface/Exceptions.h b/libsolidity/interface/Exceptions.h index 14be3c3d..07835320 100644 --- a/libsolidity/interface/Exceptions.h +++ b/libsolidity/interface/Exceptions.h @@ -47,6 +47,7 @@ public: DocstringParsingError, ParserError, TypeError, + SyntaxError, Why3TranslatorError, Warning }; |