diff options
| author | Liana Husikyan <liana@ethdev.com> | 2015-04-17 22:13:34 +0800 |
|---|---|---|
| committer | Liana Husikyan <liana@ethdev.com> | 2015-04-17 23:41:50 +0800 |
| commit | 104c5bca078ba31a128e298efb48f1349efaae08 (patch) | |
| tree | 4f7666ab8c59a24f6d79309b627b526dcac6a807 /CommandLineInterface.cpp | |
| parent | 3dcc0f089331e060c4f5ead49740bfd8f1f80aab (diff) | |
| download | dexon-solidity-104c5bca078ba31a128e298efb48f1349efaae08.tar dexon-solidity-104c5bca078ba31a128e298efb48f1349efaae08.tar.gz dexon-solidity-104c5bca078ba31a128e298efb48f1349efaae08.tar.bz2 dexon-solidity-104c5bca078ba31a128e298efb48f1349efaae08.tar.lz dexon-solidity-104c5bca078ba31a128e298efb48f1349efaae08.tar.xz dexon-solidity-104c5bca078ba31a128e298efb48f1349efaae08.tar.zst dexon-solidity-104c5bca078ba31a128e298efb48f1349efaae08.zip | |
initial output for asm-json flag.
Conflicts:
libevmcore/Assembly.cpp
Diffstat (limited to 'CommandLineInterface.cpp')
| -rw-r--r-- | CommandLineInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CommandLineInterface.cpp b/CommandLineInterface.cpp index d21839f1..cb924d9b 100644 --- a/CommandLineInterface.cpp +++ b/CommandLineInterface.cpp @@ -419,9 +419,9 @@ void CommandLineInterface::actOnInput() cout << endl << "======= " << contract << " =======" << endl; // 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)) { cout << "EVM assembly:" << endl; |