cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CommandLineInterface.cpp
View File

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

1
docker_emscripten/Dockerfile
View File

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