aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/interface/CompilerStack.cpp
diff options
context:
space:
mode:
authorYoichi Hirai <i@yoichihirai.com>2017-07-27 17:28:08 +0800
committerGitHub <noreply@github.com>2017-07-27 17:28:08 +0800
commit85b338a019869e2142110c17a45de0ce83c1d742 (patch)
treeec2c6c3d80199981c902f5adf832146826247e5d /libsolidity/interface/CompilerStack.cpp
parentb68591c468841d85c43088fe9ff824654b1f6459 (diff)
parent9982e73dcef31898d3ff78910a68dfdb1fa01ae9 (diff)
downloaddexon-solidity-85b338a019869e2142110c17a45de0ce83c1d742.tar
dexon-solidity-85b338a019869e2142110c17a45de0ce83c1d742.tar.gz
dexon-solidity-85b338a019869e2142110c17a45de0ce83c1d742.tar.bz2
dexon-solidity-85b338a019869e2142110c17a45de0ce83c1d742.tar.lz
dexon-solidity-85b338a019869e2142110c17a45de0ce83c1d742.tar.xz
dexon-solidity-85b338a019869e2142110c17a45de0ce83c1d742.tar.zst
dexon-solidity-85b338a019869e2142110c17a45de0ce83c1d742.zip
Merge pull request #2643 from ethereum/compilerstack
Reorder CompilerStack to be in logical order
Diffstat (limited to 'libsolidity/interface/CompilerStack.cpp')
-rw-r--r--libsolidity/interface/CompilerStack.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index f06dd4d7..e96e0126 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -252,16 +252,6 @@ bool CompilerStack::parseAndAnalyze()
return parse() && analyze();
}
-vector<string> CompilerStack::contractNames() const
-{
- if (m_stackState < AnalysisSuccessful)
- BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful."));
- vector<string> contractNames;
- for (auto const& contract: m_contracts)
- contractNames.push_back(contract.first);
- return contractNames;
-}
-
bool CompilerStack::compile()
{
if (m_stackState < AnalysisSuccessful)
@@ -288,6 +278,16 @@ void CompilerStack::link()
}
}
+vector<string> CompilerStack::contractNames() const
+{
+ if (m_stackState < AnalysisSuccessful)
+ BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful."));
+ vector<string> contractNames;
+ for (auto const& contract: m_contracts)
+ contractNames.push_back(contract.first);
+ return contractNames;
+}
+
eth::AssemblyItems const* CompilerStack::assemblyItems(string const& _contractName) const
{
Contract const& currentContract = contract(_contractName);