aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-05-02 21:17:10 +0800
committerGitHub <noreply@github.com>2017-05-02 21:17:10 +0800
commitf42a9a9408cf92258104e0839b700640f5edd06c (patch)
treeba7fdacc4de86d8f31584ade416e95a8844a15cb
parentd8b76e1ecaf19e921e6a757a094e3ce3c2b02bbd (diff)
parente9954eb325a6e7f50327448918043e6ef74941cb (diff)
downloaddexon-solidity-f42a9a9408cf92258104e0839b700640f5edd06c.tar.gz
dexon-solidity-f42a9a9408cf92258104e0839b700640f5edd06c.tar.zst
dexon-solidity-f42a9a9408cf92258104e0839b700640f5edd06c.zip
Merge pull request #2198 from ethereum/conditionalCompilerStateReset
conditional reset of compilerState-Enum
-rw-r--r--libsolidity/interface/CompilerStack.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 79855060..9c9c9614 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -80,8 +80,11 @@ void CompilerStack::setRemappings(vector<string> const& _remappings)
void CompilerStack::reset(bool _keepSources)
{
if (_keepSources)
+ {
+ m_stackState = SourcesSet;
for (auto sourcePair: m_sources)
sourcePair.second.reset();
+ }
else
{
m_sources.clear();
@@ -161,7 +164,7 @@ bool CompilerStack::parse()
bool CompilerStack::analyze()
{
- if (m_stackState < ParsingSuccessful)
+ if (m_stackState != ParsingSuccessful)
return false;
resolveImports();