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/interface | |
| 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/interface')
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 6 | ||||
| -rw-r--r-- | libsolidity/interface/Exceptions.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/interface/Exceptions.h | 1 |
3 files changed, 10 insertions, 0 deletions
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 }; |