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

Indentation fixes in lllc

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-10-18 12:32:34 +01:00
parent fda8499c15
commit f67d34e4ec
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lllc/main.cpp
View File

@ -35,15 +35,15 @@ using namespace dev::solidity;
using namespace dev::eth; using namespace dev::eth;
static string const VersionString = static string const VersionString =
string(ETH_PROJECT_VERSION) + string(ETH_PROJECT_VERSION) +
(string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) + (string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) +
(string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + string(SOL_VERSION_BUILDINFO)); (string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + string(SOL_VERSION_BUILDINFO));
static void help() static void help()
{ {
cout cout
<< "Usage lllc [OPTIONS] <file>" << endl << "Usage lllc [OPTIONS] <file>" << endl
<< "Options:" << endl << "Options:" << endl
<< " -b,--binary Parse, compile and assemble; output byte code in binary." << endl << " -b,--binary Parse, compile and assemble; output byte code in binary." << endl
<< " -x,--hex Parse, compile and assemble; output byte code in hex." << endl << " -x,--hex Parse, compile and assemble; output byte code in hex." << endl
<< " -a,--assembly Only parse and compile; show assembly." << endl << " -a,--assembly Only parse and compile; show assembly." << endl
@ -51,12 +51,12 @@ static void help()
<< " -o,--optimise Turn on/off the optimiser; off by default." << endl << " -o,--optimise Turn on/off the optimiser; off by default." << endl
<< " -h,--help Show this help message and exit." << endl << " -h,--help Show this help message and exit." << endl
<< " -V,--version Show the version and exit." << endl; << " -V,--version Show the version and exit." << endl;
exit(0); exit(0);
} }
static void version() static void version()
{ {
cout << "LLLC, the Lovely Little Language Compiler " << endl; cout << "LLLC, the Lovely Little Language Compiler" << endl;
cout << "Version: " << VersionString << endl; cout << "Version: " << VersionString << endl;
exit(0); exit(0);
} }
@ -131,7 +131,9 @@ int main(int argc, char** argv)
vector<string> errors; vector<string> errors;
if (src.empty()) if (src.empty())
{
errors.push_back("Empty file."); errors.push_back("Empty file.");
}
else if (mode == Disassemble) else if (mode == Disassemble)
{ {
cout << disassemble(fromHex(src)) << endl; cout << disassemble(fromHex(src)) << endl;
@ -145,12 +147,17 @@ int main(int argc, char** argv)
cout.write((char const*)bs.data(), bs.size()); cout.write((char const*)bs.data(), bs.size());
} }
else if (mode == ParseTree) else if (mode == ParseTree)
{
cout << parseLLL(src) << endl; cout << parseLLL(src) << endl;
}
else if (mode == Assembly) else if (mode == Assembly)
{
cout << compileLLLToAsm(src, optimise ? true : false, &errors, contentsString) << endl; cout << compileLLLToAsm(src, optimise ? true : false, &errors, contentsString) << endl;
}
for (auto const& i: errors) for (auto const& i: errors)
cerr << i << endl; cerr << i << endl;
if ( errors.size() ) if (errors.size())
return 1; return 1;
return 0; return 0;
} }