diff options
| author | chriseth <chris@ethereum.org> | 2017-07-06 02:40:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 02:40:25 +0800 |
| commit | 2dd9070a4f8426fb16a4d611f21ed0f98f670195 (patch) | |
| tree | 3bcad988c1928a23964eaba16dae59cb4cdd869c | |
| parent | e3f2771771a322fce93fbe4fc32659cd50354de4 (diff) | |
| parent | da48bcc51e56d7a088b8e21c45aa12299babbd39 (diff) | |
| download | dexon-solidity-2dd9070a4f8426fb16a4d611f21ed0f98f670195.tar dexon-solidity-2dd9070a4f8426fb16a4d611f21ed0f98f670195.tar.gz dexon-solidity-2dd9070a4f8426fb16a4d611f21ed0f98f670195.tar.bz2 dexon-solidity-2dd9070a4f8426fb16a4d611f21ed0f98f670195.tar.lz dexon-solidity-2dd9070a4f8426fb16a4d611f21ed0f98f670195.tar.xz dexon-solidity-2dd9070a4f8426fb16a4d611f21ed0f98f670195.tar.zst dexon-solidity-2dd9070a4f8426fb16a4d611f21ed0f98f670195.zip | |
Merge pull request #2527 from ethereum/onlyASTIfAnalysisSuccessful
Only output AST if the analysis was successful.
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/interface/StandardCompiler.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md index de4207a9..80e85858 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ ### 0.4.13 (unreleased) Bugfixes: + * Compiler Interface: Only output AST if analysis was successful. * Code Generator: Correctly unregister modifier variables. * Error Output: Do not omit the error type. diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp index 1f51851d..15bb7592 100644 --- a/libsolidity/interface/StandardCompiler.cpp +++ b/libsolidity/interface/StandardCompiler.cpp @@ -357,7 +357,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input) if (errors.size() > 0) output["errors"] = errors; - bool parsingSuccess = m_compilerStack.state() >= CompilerStack::State::ParsingSuccessful; + bool analysisSuccess = m_compilerStack.state() >= CompilerStack::State::AnalysisSuccessful; bool compilationSuccess = m_compilerStack.state() == CompilerStack::State::CompilationSuccessful; /// Inconsistent state - stop here to receive error reports from users @@ -366,7 +366,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input) output["sources"] = Json::objectValue; unsigned sourceIndex = 0; - for (auto const& source: parsingSuccess ? m_compilerStack.sourceNames() : vector<string>()) + for (auto const& source: analysisSuccess ? m_compilerStack.sourceNames() : vector<string>()) { Json::Value sourceResult = Json::objectValue; sourceResult["id"] = sourceIndex++; |