From 104c5bca078ba31a128e298efb48f1349efaae08 Mon Sep 17 00:00:00 2001
From: Liana Husikyan <liana@ethdev.com>
Date: Fri, 17 Apr 2015 16:13:34 +0200
Subject: [PATCH] initial output for asm-json flag.

Conflicts:
	libevmcore/Assembly.cpp
---
 CommandLineInterface.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CommandLineInterface.cpp b/CommandLineInterface.cpp
index d21839f14..cb924d9b5 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;