1 files changed, 120 insertions, 184 deletions

diff --git a/lldb/source/Interpreter/CommandReturnObject.cpp b/lldb/source/Interpreter/CommandReturnObject.cpp
index b083c7f69f1..c289fd793a8 100644
--- a/lldb/source/Interpreter/CommandReturnObject.cpp
+++ b/lldb/source/Interpreter/CommandReturnObject.cpp
@@ -19,218 +19,154 @@
 using namespace lldb;
 using namespace lldb_private;
 
-static void
-DumpStringToStreamWithNewline (Stream &strm, const std::string &s, bool add_newline_if_empty)
-{
-    bool add_newline = false;
-    if (s.empty())
-    {
-        add_newline = add_newline_if_empty;
-    }
-    else
-    {
-        // We already checked for empty above, now make sure there is a newline
-        // in the error, and if there isn't one, add one.
-        strm.Write(s.c_str(), s.size());
-
-        const char last_char = *s.rbegin();
-        add_newline = last_char != '\n' && last_char != '\r';
-
-    }
-    if (add_newline)
-        strm.EOL();
-}
-
-
-CommandReturnObject::CommandReturnObject () :
-    m_out_stream (),
-    m_err_stream (),
-    m_status (eReturnStatusStarted),
-    m_did_change_process_state (false),
-    m_interactive (true),
-    m_abnormal_stop_was_expected(false)
-{
-}
-
-CommandReturnObject::~CommandReturnObject ()
-{
-}
-
-void
-CommandReturnObject::AppendErrorWithFormat (const char *format, ...)
-{
-    if (!format)
-        return;
-    va_list args;
-    va_start (args, format);
-    StreamString sstrm;
-    sstrm.PrintfVarArg(format, args);
-    va_end (args);
-
-    
-    const std::string &s = sstrm.GetString();
-    if (!s.empty())
-    {
-        Stream &error_strm = GetErrorStream();
-        error_strm.PutCString ("error: ");
-        DumpStringToStreamWithNewline (error_strm, s, false);
-    }
-}
-
-void
-CommandReturnObject::AppendMessageWithFormat (const char *format, ...)
-{
-    if (!format)
-        return;
-    va_list args;
-    va_start (args, format);
-    StreamString sstrm;
-    sstrm.PrintfVarArg(format, args);
-    va_end (args);
-
-    GetOutputStream().Printf("%s", sstrm.GetData());
-}
-
-void
-CommandReturnObject::AppendWarningWithFormat (const char *format, ...)
-{
-    if (!format)
-        return;
-    va_list args;
-    va_start (args, format);
-    StreamString sstrm;
-    sstrm.PrintfVarArg(format, args);
-    va_end (args);
-
-    GetErrorStream().Printf("warning: %s", sstrm.GetData());
-}
-
-void
-CommandReturnObject::AppendMessage (const char *in_string)
-{
-    if (!in_string)
-        return;
-    GetOutputStream().Printf("%s\n", in_string);
-}
-
-void
-CommandReturnObject::AppendWarning (const char *in_string)
-{
-    if (!in_string || *in_string == '\0')
-        return;
-    GetErrorStream().Printf("warning: %s\n", in_string);
+static void DumpStringToStreamWithNewline(Stream &strm, const std::string &s,
+                                          bool add_newline_if_empty) {
+  bool add_newline = false;
+  if (s.empty()) {
+    add_newline = add_newline_if_empty;
+  } else {
+    // We already checked for empty above, now make sure there is a newline
+    // in the error, and if there isn't one, add one.
+    strm.Write(s.c_str(), s.size());
+
+    const char last_char = *s.rbegin();
+    add_newline = last_char != '\n' && last_char != '\r';
+  }
+  if (add_newline)
+    strm.EOL();
+}
+
+CommandReturnObject::CommandReturnObject()
+    : m_out_stream(), m_err_stream(), m_status(eReturnStatusStarted),
+      m_did_change_process_state(false), m_interactive(true),
+      m_abnormal_stop_was_expected(false) {}
+
+CommandReturnObject::~CommandReturnObject() {}
+
+void CommandReturnObject::AppendErrorWithFormat(const char *format, ...) {
+  if (!format)
+    return;
+  va_list args;
+  va_start(args, format);
+  StreamString sstrm;
+  sstrm.PrintfVarArg(format, args);
+  va_end(args);
+
+  const std::string &s = sstrm.GetString();
+  if (!s.empty()) {
+    Stream &error_strm = GetErrorStream();
+    error_strm.PutCString("error: ");
+    DumpStringToStreamWithNewline(error_strm, s, false);
+  }
+}
+
+void CommandReturnObject::AppendMessageWithFormat(const char *format, ...) {
+  if (!format)
+    return;
+  va_list args;
+  va_start(args, format);
+  StreamString sstrm;
+  sstrm.PrintfVarArg(format, args);
+  va_end(args);
+
+  GetOutputStream().Printf("%s", sstrm.GetData());
+}
+
+void CommandReturnObject::AppendWarningWithFormat(const char *format, ...) {
+  if (!format)
+    return;
+  va_list args;
+  va_start(args, format);
+  StreamString sstrm;
+  sstrm.PrintfVarArg(format, args);
+  va_end(args);
+
+  GetErrorStream().Printf("warning: %s", sstrm.GetData());
+}
+
+void CommandReturnObject::AppendMessage(const char *in_string) {
+  if (!in_string)
+    return;
+  GetOutputStream().Printf("%s\n", in_string);
+}
+
+void CommandReturnObject::AppendWarning(const char *in_string) {
+  if (!in_string || *in_string == '\0')
+    return;
+  GetErrorStream().Printf("warning: %s\n", in_string);
 }
 
 // Similar to AppendWarning, but do not prepend 'warning: ' to message, and
 // don't append "\n" to the end of it.
 
-void
-CommandReturnObject::AppendRawWarning (const char *in_string)
-{
-    if (in_string && in_string[0])
-        GetErrorStream().PutCString(in_string);
+void CommandReturnObject::AppendRawWarning(const char *in_string) {
+  if (in_string && in_string[0])
+    GetErrorStream().PutCString(in_string);
 }
 
-void
-CommandReturnObject::AppendError (const char *in_string)
-{
-    if (!in_string || *in_string == '\0')
-        return;
-    GetErrorStream().Printf ("error: %s\n", in_string);
+void CommandReturnObject::AppendError(const char *in_string) {
+  if (!in_string || *in_string == '\0')
+    return;
+  GetErrorStream().Printf("error: %s\n", in_string);
 }
 
-void
-CommandReturnObject::SetError (const Error &error, const char *fallback_error_cstr)
-{
-    const char *error_cstr = error.AsCString();
-    if (error_cstr == nullptr)
-        error_cstr = fallback_error_cstr;
-    SetError(error_cstr);
+void CommandReturnObject::SetError(const Error &error,
+                                   const char *fallback_error_cstr) {
+  const char *error_cstr = error.AsCString();
+  if (error_cstr == nullptr)
+    error_cstr = fallback_error_cstr;
+  SetError(error_cstr);
 }
 
-void
-CommandReturnObject::SetError (const char *error_cstr)
-{
-    if (error_cstr)
-    {
-        AppendError (error_cstr);
-        SetStatus (eReturnStatusFailed);
-    }
+void CommandReturnObject::SetError(const char *error_cstr) {
+  if (error_cstr) {
+    AppendError(error_cstr);
+    SetStatus(eReturnStatusFailed);
+  }
 }
 
 // Similar to AppendError, but do not prepend 'Error: ' to message, and
 // don't append "\n" to the end of it.
 
-void
-CommandReturnObject::AppendRawError (const char *in_string)
-{
-    if (in_string && in_string[0])
-        GetErrorStream().PutCString(in_string);
+void CommandReturnObject::AppendRawError(const char *in_string) {
+  if (in_string && in_string[0])
+    GetErrorStream().PutCString(in_string);
 }
 
-void
-CommandReturnObject::SetStatus (ReturnStatus status)
-{
-    m_status = status;
-}
-
-ReturnStatus
-CommandReturnObject::GetStatus ()
-{
-    return m_status;
-}
+void CommandReturnObject::SetStatus(ReturnStatus status) { m_status = status; }
 
-bool
-CommandReturnObject::Succeeded ()
-{
-    return m_status <= eReturnStatusSuccessContinuingResult;
-}
+ReturnStatus CommandReturnObject::GetStatus() { return m_status; }
 
-bool
-CommandReturnObject::HasResult ()
-{
-    return (m_status == eReturnStatusSuccessFinishResult ||
-            m_status == eReturnStatusSuccessContinuingResult);
+bool CommandReturnObject::Succeeded() {
+  return m_status <= eReturnStatusSuccessContinuingResult;
 }
 
-void
-CommandReturnObject::Clear()
-{
-    lldb::StreamSP stream_sp;
-    stream_sp = m_out_stream.GetStreamAtIndex (eStreamStringIndex);
-    if (stream_sp)
-        static_cast<StreamString *>(stream_sp.get())->Clear();
-    stream_sp = m_err_stream.GetStreamAtIndex (eStreamStringIndex);
-    if (stream_sp)
-        static_cast<StreamString *>(stream_sp.get())->Clear();
-    m_status = eReturnStatusStarted;
-    m_did_change_process_state = false;
-    m_interactive = true;
+bool CommandReturnObject::HasResult() {
+  return (m_status == eReturnStatusSuccessFinishResult ||
+          m_status == eReturnStatusSuccessContinuingResult);
 }
 
-bool
-CommandReturnObject::GetDidChangeProcessState ()
-{
-    return m_did_change_process_state;
+void CommandReturnObject::Clear() {
+  lldb::StreamSP stream_sp;
+  stream_sp = m_out_stream.GetStreamAtIndex(eStreamStringIndex);
+  if (stream_sp)
+    static_cast<StreamString *>(stream_sp.get())->Clear();
+  stream_sp = m_err_stream.GetStreamAtIndex(eStreamStringIndex);
+  if (stream_sp)
+    static_cast<StreamString *>(stream_sp.get())->Clear();
+  m_status = eReturnStatusStarted;
+  m_did_change_process_state = false;
+  m_interactive = true;
 }
 
-void
-CommandReturnObject::SetDidChangeProcessState (bool b)
-{
-    m_did_change_process_state = b;
-}
-
-
-bool
-CommandReturnObject::GetInteractive () const
-{
-    return m_interactive;
+bool CommandReturnObject::GetDidChangeProcessState() {
+  return m_did_change_process_state;
 }
 
-void
-CommandReturnObject::SetInteractive (bool b)
-{
-    m_interactive = b;
+void CommandReturnObject::SetDidChangeProcessState(bool b) {
+  m_did_change_process_state = b;
 }
 
+bool CommandReturnObject::GetInteractive() const { return m_interactive; }
 
+void CommandReturnObject::SetInteractive(bool b) { m_interactive = b; }