CLI tweaks.

libsolidity/CompilerStack.cpp

@@ -141,15 +141,15 @@ void CompilerStack::streamAssembly(ostream& _outStream, string const& _contractN
 
 string const& CompilerStack::getInterface(string const& _contractName) const
 {
-	return getJsonDocumentation(_contractName, DocumentationType::ABI_INTERFACE);
+	return getMetadata(_contractName, DocumentationType::ABI_INTERFACE);
 }
 
 string const& CompilerStack::getSolidityInterface(string const& _contractName) const
 {
-	return getJsonDocumentation(_contractName, DocumentationType::ABI_SOLIDITY_INTERFACE);
+	return getMetadata(_contractName, DocumentationType::ABI_SOLIDITY_INTERFACE);
 }
 
-string const& CompilerStack::getJsonDocumentation(string const& _contractName, DocumentationType _type) const
+string const& CompilerStack::getMetadata(string const& _contractName, DocumentationType _type) const
 {
 	if (!m_parseSuccessful)
 		BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Parsing was not successful."));

libsolidity/CompilerStack.h

@@ -90,7 +90,7 @@ public:
 	/// Prerequisite: Successful call to parse or compile.
 	/// @param type The type of the documentation to get.
 	/// Can be one of 4 types defined at @c DocumentationType
-	std::string const& getJsonDocumentation(std::string const& _contractName, DocumentationType _type) const;
+	std::string const& getMetadata(std::string const& _contractName, DocumentationType _type) const;
 
 	/// @returns the previously used scanner, useful for counting lines during error reporting.
 	Scanner const& getScanner(std::string const& _sourceName = "") const;

solc/CommandLineInterface.cpp

@@ -160,7 +160,7 @@ void CommandLineInterface::handleMeta(DocumentationType _type, string const& _co
 	case DocumentationType::ABI_INTERFACE:
 		argName = g_argAbiStr;
 		suffix = ".abi";
-		title = "Contract ABI";
+		title = "Contract JSON ABI";
 		break;
 	case DocumentationType::ABI_SOLIDITY_INTERFACE:
 		argName = g_argSolAbiStr;
@@ -188,7 +188,7 @@ void CommandLineInterface::handleMeta(DocumentationType _type, string const& _co
 		if (outputToStdout(choice))
 		{
 			cout << title << endl;
-			cout << m_compiler.getMetadata(_contract, _type);
+			cout << m_compiler.getMetadata(_contract, _type) << endl;
 		}
 
 		if (outputToFile(choice))