cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify assembly printing in CLI

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-09-11 15:18:56 +01:00
parent bbfb16cf5c
commit bd6510d99a
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
solc/CommandLineInterface.cpp
View File

@ -1147,26 +1147,19 @@ void CommandLineInterface::outputCompilationResults()
// do we need EVM assembly? // do we need EVM assembly?
if (m_args.count(g_argAsm) || m_args.count(g_argAsmJson)) if (m_args.count(g_argAsm) || m_args.count(g_argAsmJson))
{ {
string ret;
if (m_args.count(g_argAsmJson))
ret = dev::jsonPrettyPrint(m_compiler->assemblyJSON(contract, m_sourceCodes));
else
ret = m_compiler->assemblyString(contract, m_sourceCodes);
if (m_args.count(g_argOutputDir)) if (m_args.count(g_argOutputDir))
{ {
if (m_args.count(g_argAsmJson) createFile(m_compiler->filesystemFriendlyName(contract) + (m_args.count(g_argAsmJson) ? "_evm.json" : ".evm"), ret);
{
Json::Value ret = m_compiler->assemblyJSON(contract, m_sourceCodes);
createFile(m_compiler->filesystemFriendlyName(contract) + "_evm.json", dev::jsonPrettyPrint(ret));
} }
else else
{ {
string ret = m_compiler->assemblyString(contract, m_sourceCodes); cout << "EVM assembly:" << endl << ret << endl;
createFile(m_compiler->filesystemFriendlyName(contract) + ".evm", ret));
}
}
else
{
cout << "EVM assembly:" << endl;
if (m_args.count(g_argAsmJson)
cout << m_compiler->assemblyJSON(contract, m_sourceCodes);
else
cout << m_compiler->assemblyString(contract, m_sourceCodes);
} }
} }