diff options
author | djuju <julfaber@gmail.com> | 2017-04-28 21:24:59 +0800 |
---|---|---|
committer | djuju <julfaber@gmail.com> | 2017-04-28 21:24:59 +0800 |
commit | 45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0 (patch) | |
tree | 69610e339fa440620a3da1e8bc84effe59898d75 | |
parent | 5fd7942173a71f1cf7ca1cae0dcde1905482f004 (diff) | |
download | dexon-solidity-45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0.tar dexon-solidity-45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0.tar.gz dexon-solidity-45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0.tar.bz2 dexon-solidity-45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0.tar.lz dexon-solidity-45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0.tar.xz dexon-solidity-45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0.tar.zst dexon-solidity-45f8c5aa882ecc18f073984cd4d34a6c8be7e5e0.zip |
enumchecks not working
-rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 42 | ||||
-rw-r--r-- | libsolidity/interface/CompilerStack.h | 9 | ||||
-rw-r--r-- | test/libsolidity/StandardCompiler.cpp | 3 |
3 files changed, 39 insertions, 15 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index 56f7b064..303784ca 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -57,7 +57,7 @@ using namespace dev; using namespace dev::solidity; CompilerStack::CompilerStack(ReadFile::Callback const& _readFile): - m_readFile(_readFile), m_success(false) {} + m_readFile(_readFile), m_stackState(Empty) {} void CompilerStack::setRemappings(vector<string> const& _remappings) { @@ -79,7 +79,6 @@ void CompilerStack::setRemappings(vector<string> const& _remappings) void CompilerStack::reset(bool _keepSources) { - m_success = false; if (_keepSources) for (auto sourcePair: m_sources) sourcePair.second.reset(); @@ -94,6 +93,7 @@ void CompilerStack::reset(bool _keepSources) m_sourceOrder.clear(); m_contracts.clear(); m_errors.clear(); + m_stackState = Empty; } bool CompilerStack::addSource(string const& _name, string const& _content, bool _isLibrary) @@ -102,6 +102,7 @@ bool CompilerStack::addSource(string const& _name, string const& _content, bool reset(true); m_sources[_name].scanner = make_shared<Scanner>(CharStream(_content), _name); m_sources[_name].isLibrary = _isLibrary; + m_stackState = SourcesSet; return existed; } @@ -114,9 +115,10 @@ void CompilerStack::setSource(string const& _sourceCode) bool CompilerStack::parse() { //reset + if(m_stackState < SourcesSet) + return false; m_errors.clear(); ASTNode::resetID(); - m_success = false; if (SemVerVersion{string(VersionString)}.isPrerelease()) { @@ -148,14 +150,20 @@ bool CompilerStack::parse() } } } - return Error::containsOnlyWarnings(m_errors); + if (Error::containsOnlyWarnings(m_errors)) + { + m_stackState = ParsingSuccessful; + return true; + } + else + return false; } bool CompilerStack::analyze() { - if (m_sources.empty()) - BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("There are no sources to be analyzed.")); - + if (m_stackState < SourcesSet) + return false; + //BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("No Sources Set to be analyzed.")); resolveImports(); bool noErrors = true; @@ -240,8 +248,13 @@ bool CompilerStack::analyze() noErrors = false; } - m_success = noErrors; - return m_success; + if (noErrors) + { + m_stackState = AnalysisSuccessful; + return true; + } + else + return false; } bool CompilerStack::parse(string const& _sourceCode) @@ -263,7 +276,7 @@ bool CompilerStack::parseAndAnalyze(std::string const& _sourceCode) vector<string> CompilerStack::contractNames() const { - if (!m_success) + if (m_stackState != AnalysisSuccessful) BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful.")); vector<string> contractNames; for (auto const& contract: m_contracts) @@ -274,7 +287,7 @@ vector<string> CompilerStack::contractNames() const bool CompilerStack::compile(bool _optimize, unsigned _runs, map<string, h160> const& _libraries) { - if (!m_success) + if (m_stackState < AnalysisSuccessful) if (!parseAndAnalyze()) return false; @@ -288,6 +301,7 @@ bool CompilerStack::compile(bool _optimize, unsigned _runs, map<string, h160> co if (auto contract = dynamic_cast<ContractDefinition const*>(node.get())) compileContract(*contract, compiledContracts); this->link(); + m_stackState = CompilationSuccessful; return true; } @@ -435,7 +449,7 @@ Json::Value const& CompilerStack::interface(string const& _contractName) const Json::Value const& CompilerStack::metadata(string const& _contractName, DocumentationType _type) const { - if (!m_success) + if (m_stackState == CompilationSuccessful) BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful.")); return metadata(contract(_contractName), _type); @@ -443,7 +457,7 @@ Json::Value const& CompilerStack::metadata(string const& _contractName, Document Json::Value const& CompilerStack::metadata(Contract const& _contract, DocumentationType _type) const { - if (!m_success) + if (m_stackState != CompilationSuccessful) BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful.")); solAssert(_contract.contract, ""); @@ -474,7 +488,7 @@ Json::Value const& CompilerStack::metadata(Contract const& _contract, Documentat string const& CompilerStack::onChainMetadata(string const& _contractName) const { - if (!m_success) + if (m_stackState != CompilationSuccessful) BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful.")); return contract(_contractName).onChainMetadata; diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h index 9a3221e5..c1d344ca 100644 --- a/libsolidity/interface/CompilerStack.h +++ b/libsolidity/interface/CompilerStack.h @@ -236,6 +236,13 @@ private: mutable std::unique_ptr<std::string const> sourceMapping; mutable std::unique_ptr<std::string const> runtimeSourceMapping; }; + enum State { + Empty, + SourcesSet, + ParsingSuccessful, + AnalysisSuccessful, + CompilationSuccessful + }; /// Loads the missing sources from @a _ast (named @a _path) using the callback /// @a m_readFile and stores the absolute paths of all imports in the AST annotations. @@ -276,7 +283,6 @@ private: /// list of path prefix remappings, e.g. mylibrary: github.com/ethereum = /usr/local/ethereum /// "context:prefix=target" std::vector<Remapping> m_remappings; - bool m_success; std::map<std::string const, Source> m_sources; std::shared_ptr<GlobalContext> m_globalContext; std::map<ASTNode const*, std::shared_ptr<DeclarationContainer>> m_scopes; @@ -285,6 +291,7 @@ private: std::string m_formalTranslation; ErrorList m_errors; bool m_metadataLiteralSources = false; + State m_stackState = Empty; }; } diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp index 9b53e841..f480ba6f 100644 --- a/test/libsolidity/StandardCompiler.cpp +++ b/test/libsolidity/StandardCompiler.cpp @@ -68,7 +68,10 @@ bool containsAtMostWarnings(Json::Value const& _compilerResult) BOOST_REQUIRE(error.isObject()); BOOST_REQUIRE(error["severity"].isString()); if (error["severity"].asString() != "warning") + { + cout << error << std::endl; return false; + } } return true; |