Rename JSONTransport to IOStreamTransport.

Author: chriseth

libsolidity/lsp/Transport.cpp

@@ -30,23 +30,23 @@
 using namespace std;
 using namespace solidity::lsp;
 
-JSONTransport::JSONTransport(istream& _in, ostream& _out):
+IOStreamTransport::IOStreamTransport(istream& _in, ostream& _out):
 	m_input{_in},
 	m_output{_out}
 {
 }
 
-JSONTransport::JSONTransport():
-	JSONTransport(cin, cout)
+IOStreamTransport::IOStreamTransport():
+	IOStreamTransport(cin, cout)
 {
 }
 
-bool JSONTransport::closed() const noexcept
+bool IOStreamTransport::closed() const noexcept
 {
 	return m_input.eof();
 }
 
-optional<Json::Value> JSONTransport::receive()
+optional<Json::Value> IOStreamTransport::receive()
 {
 	auto const headers = parseHeaders();
 	if (!headers)
@@ -75,30 +75,30 @@ optional<Json::Value> JSONTransport::receive()
 	return {move(jsonMessage)};
 }
 
-void JSONTransport::notify(string _method, Json::Value _message)
+void IOStreamTransport::notify(string _method, Json::Value _message)
 {
 	Json::Value json;
 	json["method"] = move(_method);
 	json["params"] = move(_message);
 	send(move(json));
 }
 
-void JSONTransport::reply(MessageID _id, Json::Value _message)
+void IOStreamTransport::reply(MessageID _id, Json::Value _message)
 {
 	Json::Value json;
 	json["result"] = move(_message);
 	send(move(json), _id);
 }
 
-void JSONTransport::error(MessageID _id, ErrorCode _code, string _message)
+void IOStreamTransport::error(MessageID _id, ErrorCode _code, string _message)
 {
 	Json::Value json;
 	json["error"]["code"] = static_cast<int>(_code);
 	json["error"]["message"] = move(_message);
 	send(move(json), _id);
 }
 
-void JSONTransport::send(Json::Value _json, MessageID _id)
+void IOStreamTransport::send(Json::Value _json, MessageID _id)
 {
 	solAssert(_json.isObject());
 	_json["jsonrpc"] = "2.0";
@@ -114,7 +114,7 @@ void JSONTransport::send(Json::Value _json, MessageID _id)
 	m_output.flush();
 }
 
-optional<map<string, string>> JSONTransport::parseHeaders()
+optional<map<string, string>> IOStreamTransport::parseHeaders()
 {
 	map<string, string> headers;
 

libsolidity/lsp/Transport.h

@@ -66,17 +66,17 @@ class Transport
 /**
  * LSP Transport using JSON-RPC over iostreams.
  */
-class JSONTransport: public Transport
+class IOStreamTransport: public Transport
 {
 public:
 	/// Constructs a standard stream transport layer.
 	///
 	/// @param _in for example std::cin (stdin)
 	/// @param _out for example std::cout (stdout)
-	JSONTransport(std::istream& _in, std::ostream& _out);
+	IOStreamTransport(std::istream& _in, std::ostream& _out);
 
 	// Constructs a JSON transport using standard I/O streams.
-	JSONTransport();
+	IOStreamTransport();
 
 	bool closed() const noexcept override;
 	std::optional<Json::Value> receive() override;

solc/CommandLineInterface.cpp

@@ -896,7 +896,7 @@ void CommandLineInterface::handleAst()
 
 void CommandLineInterface::serveLSP()
 {
-	lsp::JSONTransport transport;
+	lsp::IOStreamTransport transport;
 	if (!lsp::LanguageServer{transport}.run())
 		solThrow(CommandLineExecutionError, "LSP terminated abnormally.");
 }