1 files changed, 18 insertions, 18 deletions

diff --git a/lllc/main.cpp b/lllc/main.cpp
index 912ce16a..5679bc2b 100644
--- a/lllc/main.cpp
+++ b/lllc/main.cpp
@@ -35,15 +35,15 @@ using namespace dev::solidity;
 using namespace dev::eth;
 
 static string const VersionString =
-        string(ETH_PROJECT_VERSION) +
-        (string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) +
-        (string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + string(SOL_VERSION_BUILDINFO));
+	string(ETH_PROJECT_VERSION) +
+	(string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) +
+	(string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + string(SOL_VERSION_BUILDINFO));
 
 static void help()
 {
 	cout
 		<< "Usage lllc [OPTIONS] <file>" << endl
-        << "Options:" << endl
+		<< "Options:" << 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
 		<< "    -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
 		<< "    -h,--help  Show this help message and exit." << endl
 		<< "    -V,--version  Show the version and exit." << endl;
-        exit(0);
+	exit(0);
 }
 
 static void version()
 {
-	cout << "LLLC, the Lovely Little Language Compiler " << endl;
+	cout << "LLLC, the Lovely Little Language Compiler" << endl;
 	cout << "Version: " << VersionString << endl;
 	exit(0);
 }
@@ -118,39 +118,39 @@ int main(int argc, char** argv)
 
 	string src;
 	if (infile.empty())
-	{
-		string s;
-		while (!cin.eof())
-		{
-			getline(cin, s);
-			src.append(s);
-		}
-	}
+		src = readStandardInput();
 	else
-		src = contentsString(infile);
+		src = readFileAsString(infile);
 
 	vector<string> errors;
 	if (src.empty())
+	{
 		errors.push_back("Empty file.");
+	}
 	else if (mode == Disassemble)
 	{
 		cout << disassemble(fromHex(src)) << endl;
 	}
 	else if (mode == Binary || mode == Hex)
 	{
-		auto bs = compileLLL(src, optimise ? true : false, &errors, contentsString);
+		auto bs = compileLLL(src, optimise ? true : false, &errors, readFileAsString);
 		if (mode == Hex)
 			cout << toHex(bs) << endl;
 		else if (mode == Binary)
 			cout.write((char const*)bs.data(), bs.size());
 	}
 	else if (mode == ParseTree)
+	{
 		cout << parseLLL(src) << endl;
+	}
 	else if (mode == Assembly)
-		cout << compileLLLToAsm(src, optimise ? true : false, &errors, contentsString) << endl;
+	{
+		cout << compileLLLToAsm(src, optimise ? true : false, &errors, readFileAsString) << endl;
+	}
+
 	for (auto const& i: errors)
 		cerr << i << endl;
-	if ( errors.size() )
+	if (errors.size())
 		return 1;
 	return 0;
 }