Merge remote-tracking branch 'upstream/develop' into evmjit

This commit is contained in:
Paweł Bylica 2015-03-06 15:34:02 +01:00
commit dec565f882

View File

@ -424,13 +424,13 @@ void CommandLineInterface::actOnInput()
if (outputToStdout(choice)) if (outputToStdout(choice))
{ {
cout << "EVM assembly:" << endl; cout << "EVM assembly:" << endl;
m_compiler->streamAssembly(cout, contract); m_compiler->streamAssembly(cout, contract, m_sourceCodes);
} }
if (outputToFile(choice)) if (outputToFile(choice))
{ {
ofstream outFile(contract + ".evm"); ofstream outFile(contract + ".evm");
m_compiler->streamAssembly(outFile, contract); m_compiler->streamAssembly(outFile, contract, m_sourceCodes);
outFile.close(); outFile.close();
} }
} }