initial output for asm-json flag.

Conflicts:
	libevmcore/Assembly.cpp
This commit is contained in:
Liana Husikyan 2015-04-17 16:13:34 +02:00
parent 3dcc0f0893
commit 104c5bca07

View File

@ -419,9 +419,9 @@ void CommandLineInterface::actOnInput()
cout << endl << "======= " << contract << " =======" << endl; cout << endl << "======= " << contract << " =======" << endl;
// do we need EVM assembly? // do we need EVM assembly?
if (m_args.count(g_argAsmStr)) if (m_args.count(g_argAsmStr) || m_args.count(g_argAsmJsonStr))
{ {
auto choice = m_args[g_argAsmStr].as<OutputType>(); auto choice = m_args.count(g_argAsmStr) ? m_args[g_argAsmStr].as<OutputType>() : m_args[g_argAsmJsonStr].as<OutputType>();
if (outputToStdout(choice)) if (outputToStdout(choice))
{ {
cout << "EVM assembly:" << endl; cout << "EVM assembly:" << endl;