Styling issues and new class name for the CLI

solc/SolContext.cpp → solc/CommandLineInterface.cpp

@@ -17,9 +17,9 @@
 /**
  * @author Lefteris <lefteris@ethdev.com>
  * @date 2014
- * Solidity compiler context class.
+ * Solidity command line interface.
  */
-#include "SolContext.h"
+#include "CommandLineInterface.h"
 
 #include <string>
 #include <iostream>
@@ -77,7 +77,6 @@ static inline bool outputToStdout(OutputType type)
 	return type == OutputType::STDOUT || type == OutputType::BOTH;
 }
 
-
 static std::istream& operator>>(std::istream& _in, OutputType& io_output)
 {
 	std::string token;
@@ -93,7 +92,7 @@ static std::istream& operator>>(std::istream& _in, OutputType& io_output)
 	return _in;
 }
 
-void SolContext::handleBytecode(string const& _argName,
+void CommandLineInterface::handleBytecode(string const& _argName,
 										  string const& _title,
 										  string const& _contract,
 										  string const& _suffix)
@@ -126,7 +125,7 @@ void SolContext::handleBytecode(string const& _argName,
 	}
 }
 
-void SolContext::handleJson(DocumentationType _type,
+void CommandLineInterface::handleJson(DocumentationType _type,
 									  string const& _contract)
 {
 	std::string argName;
@@ -172,16 +171,7 @@ void SolContext::handleJson(DocumentationType _type,
 	}
 }
 
-
+bool CommandLineInterface::parseArguments(int argc, char** argv)
-
-
-
-
-
-
-
-
-bool SolContext::parseArguments(int argc, char** argv)
 {
 #define OUTPUT_TYPE_STR "Legal values:\n"				\
 		"\tstdout: Print it to standard output\n"		\
@@ -241,7 +231,7 @@ bool SolContext::parseArguments(int argc, char** argv)
 	return true;
 }
 
-bool SolContext::processInput()
+bool CommandLineInterface::processInput()
 {
 	if (!m_args.count("input-file"))
 	{
@@ -302,7 +292,7 @@ bool SolContext::processInput()
 	return true;
 }
 
-void SolContext::actOnInput()
+void CommandLineInterface::actOnInput()
 {
 	// do we need AST output?
 	if (m_args.count("ast"))

solc/SolContext.h → solc/CommandLineInterface.h

@@ -17,7 +17,7 @@
 /**
  * @author Lefteris <lefteris@ethdev.com>
  * @date 2014
- * Solidity compiler context class.
+ * Solidity command line interface.
  */
 #pragma once
 
@@ -40,10 +40,10 @@ enum class OutputType: uint8_t
 	BOTH
 };
 
-class SolContext
+class CommandLineInterface
 {
 public:
-    SolContext() {}
+	CommandLineInterface() {}
 
 	/// Parse command line arguments and return false if we should not continue
 	bool parseArguments(int argc, char** argv);

solc/main.cpp

@@ -20,19 +20,16 @@
  * Solidity commandline compiler.
  */
 
-
+#include "CommandLineInterface.h"
-#include "SolContext.h"
-
-
 
 int main(int argc, char** argv)
 {
-    dev::solidity::SolContext ctx;
+	dev::solidity::CommandLineInterface cli;
-    if (!ctx.parseArguments(argc, argv))
+	if (!cli.parseArguments(argc, argv))
 		return 1;
-    if (!ctx.processInput())
+	if (!cli.processInput())
 		return 1;
-    ctx.actOnInput();
+	cli.actOnInput();
 
 	return 0;
 }