aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-03-30 07:54:32 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-04-21 02:38:00 +0800
commit2df52edfbdc11375b26b6f425529b6b808d19f61 (patch)
tree6050f213ede6b771ab914e1f9380afd1fa698d88
parenta87dd17d0f485ae2738371020774fda68644ecea (diff)
downloaddexon-solidity-2df52edfbdc11375b26b6f425529b6b808d19f61.tar.gz
dexon-solidity-2df52edfbdc11375b26b6f425529b6b808d19f61.tar.zst
dexon-solidity-2df52edfbdc11375b26b6f425529b6b808d19f61.zip
Support new assembly output
-rw-r--r--libsolidity/interface/StandardCompiler.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index e12b6444..ada89dc3 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -263,9 +263,10 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
// EVM
Json::Value evmData(Json::objectValue);
// @TODO: add ir
- // @TODO: add assembly
- ostringstream unused;
- evmData["legacyAssembly"] = m_compilerStack.streamAssembly(unused, contractName, createSourceList(_input), true);
+ ostringstream tmp;
+ m_compilerStack.streamAssembly(tmp, contractName, createSourceList(_input), false);
+ evmData["assembly"] = tmp.str();
+ evmData["legacyAssembly"] = m_compilerStack.streamAssembly(tmp, contractName, createSourceList(_input), true);
evmData["methodIdentifiers"] = methodIdentifiers(m_compilerStack.contractDefinition(contractName));
// @TODO: add gasEstimates