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

This commit is contained in:
Paweł Bylica 2015-03-12 13:39:40 +01:00
commit 7e015ae723
2 changed files with 2 additions and 8 deletions

View File

@ -272,7 +272,7 @@ bool CommandLineInterface::processInput()
while (!cin.eof())
{
getline(cin, s);
m_sourceCodes["<stdin>"].append(s);
m_sourceCodes["<stdin>"].append(s + '\n');
}
}
else
@ -345,18 +345,11 @@ bool CommandLineInterface::processInput()
void CommandLineInterface::handleAst(string const& _argStr)
{
string title;
string suffix;
if (_argStr == g_argAstStr)
{
title = "Syntax trees:";
suffix = ".ast";
}
else if (_argStr == g_argAstJson)
{
title = "JSON AST:";
suffix = ".json";
}
else
BOOST_THROW_EXCEPTION(InternalCompilerError() << errinfo_comment("Illegal argStr for AST"));

View File

@ -10,6 +10,7 @@ RUN apt-get install -qy automake libtool yasm scons
RUN useradd -ms /bin/bash user
USER user
ENV HOME /home/user
WORKDIR /home/user
# Emscripten SDK